Version bump (#501624 by Alessandro Capogna), drop old.

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

3 files changed, 16 insertions, 56 deletions

diff --git a/media-gfx/simple-scan/ChangeLog b/media-gfx/simple-scan/ChangeLog
index 4e30c6c1299d..2442e21d4729 100644
--- a/media-gfx/simple-scan/ChangeLog
+++ b/media-gfx/simple-scan/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/simple-scan
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/simple-scan/ChangeLog,v 1.31 2013/12/26 14:46:12 maekke Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/simple-scan/ChangeLog,v 1.32 2014/02/17 22:27:34 pacho Exp $
+
+*simple-scan-3.10.2 (17 Feb 2014)
+
+  17 Feb 2014; Pacho Ramos <pacho@gentoo.org> +simple-scan-3.10.2.ebuild,
+  -simple-scan-3.6.0.ebuild, -simple-scan-3.6.1.ebuild:
+  Version bump (#501624 by Alessandro Capogna), drop old.
 
   26 Dec 2013; Markus Meier <maekke@gentoo.org> simple-scan-3.8.0.ebuild:
   add ~arm, bug #489046
diff --git a/media-gfx/simple-scan/simple-scan-3.6.1.ebuild b/media-gfx/simple-scan/simple-scan-3.10.2.ebuild
index 3786cd45e2ab..dbb856d6dc4d 100644
--- a/media-gfx/simple-scan/simple-scan-3.6.1.ebuild
+++ b/media-gfx/simple-scan/simple-scan-3.10.2.ebuild
@@ -1,23 +1,24 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/simple-scan/simple-scan-3.6.1.ebuild,v 1.1 2013/08/26 21:11:00 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/simple-scan/simple-scan-3.10.2.ebuild,v 1.1 2014/02/17 22:27:34 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
 
-inherit gnome2
+inherit gnome2 versionator
 
 DESCRIPTION="Simple document scanning utility"
 HOMEPAGE="https://launchpad.net/simple-scan"
-SRC_URI="http://launchpad.net/${PN}/3.6/${PV}/+download/${P}.tar.gz"
+MY_PV=$(get_version_component_range 1-2)
+SRC_URI="http://launchpad.net/${PN}/${MY_PV}/${PV}/+download/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""
 
 COMMON_DEPEND="
-	>=dev-libs/glib-2.28:2
+	>=dev-libs/glib-2.32:2
 	>=media-gfx/sane-backends-1.0.20:=
 	>=sys-libs/zlib-1.2.3.1:=
 	virtual/jpeg:0=
@@ -39,7 +40,7 @@ DEPEND="${COMMON_DEPEND}
 "
 
 src_configure() {
-	DOCS="AUTHORS ChangeLog NEWS README"
+	DOCS="NEWS README.md"
 	gnome2_src_configure \
 		VALAC=$(type -P true) \
 		ITSTOOL=$(type -P true)
diff --git a/media-gfx/simple-scan/simple-scan-3.6.0.ebuild b/media-gfx/simple-scan/simple-scan-3.6.0.ebuild
deleted file mode 100644
index 3e7bf199943e..000000000000
--- a/media-gfx/simple-scan/simple-scan-3.6.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/simple-scan/simple-scan-3.6.0.ebuild,v 1.5 2013/08/05 09:41:50 ssuominen Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="Simple document scanning utility"
-HOMEPAGE="https://launchpad.net/simple-scan"
-SRC_URI="http://launchpad.net/${PN}/3.6/${PV}/+download/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.28:2
-	>=media-gfx/sane-backends-1.0.20:=
-	>=sys-libs/zlib-1.2.3.1:=
-	virtual/jpeg:0=
-	virtual/udev:=[gudev]
-	x11-libs/cairo:=
-	>=x11-libs/gtk+-3:3
-	|| (
-		>=x11-misc/colord-0.1.24:=[udev]
-		x11-misc/colord:=[scanner] )
-"
-RDEPEND="${COMMON_DEPEND}
-	x11-misc/xdg-utils
-	x11-themes/gnome-icon-theme
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/yelp-tools
-	>=dev-util/intltool-0.35.0
-	virtual/pkgconfig
-"
-
-src_configure() {
-	DOCS="AUTHORS ChangeLog NEWS README"
-	G2CONF="${G2CONF}
-		VALAC=$(type -P true)
-		ITSTOOL=$(type -P true)"
-	gnome2_src_configure
-}