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

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

4 files changed, 22 insertions, 64 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/Manifest b/media-gfx/simple-scan/Manifest
index d68605dd7d0d..3f55773b8395 100644
--- a/media-gfx/simple-scan/Manifest
+++ b/media-gfx/simple-scan/Manifest
@@ -1,18 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST simple-scan-3.6.0.tar.gz 467028 SHA256 d00684d4697de6753b6633d7c87b9c067fdbf99b732da9007ea2bb6cbdad1cde SHA512 738c01401133f8716731d3167e118abd4c4f8fd7ff5ec83aa18b29de9388987454da8bdd7a7473d579876d67a57b954ec71e2872ffd0e4abd2b31baf96b9538c WHIRLPOOL 65081ba2511f0a66f969291997b87e5061cc8dc39857464faa4dd347330b22e7f9ca9acbaacf11f04baafb0f35764be7081320ba397de60760d1dca2f9f782d1
-DIST simple-scan-3.6.1.tar.gz 467017 SHA256 eaddabcd1183297fcf13628f1a23b7f9ace4de5315a6cf813549e3978ae5ac6e SHA512 579e3cc364096f370479a92e5c4da556dabfc37eed8a4516028d6d32684255d44ce425be774b49dd9891935ca187efecb9c6a16556ce23296783751f1890f51c WHIRLPOOL 96cce307d0ffa3345390f11bfd3374b5dce11db519674abb375b4f4c23aa87c5f4e5078df0a7f23a176cd7f28b5367007a4451947aff95301f9e9faaab7f9f9c
+DIST simple-scan-3.10.2.tar.xz 462416 SHA256 a98a580ee9df3b9eacb936a661c7166f91177d2fd5659e45292e622ad75286f0 SHA512 0ffc32a4cf80c41ed7fb61525ed01e49091dfccfe22e65b267aa2db947d86af17ecebcc48dc152c186cb472e5e0ee51609bd1b11fb134b149c961b5e8175ae88 WHIRLPOOL 1ccd1b8ec0144aa916984d9f7f8a10057c1ec261bc8934dc3f431e7ac61177aa67c12ac7095d8a5d622356d446dc0933c27e54958657180cfa43225a163ffe86
 DIST simple-scan-3.8.0.tar.xz 335972 SHA256 8df71e5f9e5db5c53217cb56b0e23b58dfe65bc174e873ad3ee576fbeccadc22 SHA512 886ae92ae935fe9ebfd8b3b47653ebee62c468afa45b1ec7d01edf7e1bb7604f142dad958cce018db2426b53310a1d623ed32ac47d8c431488cd0d68c6f29fd6 WHIRLPOOL 61ce512d8194ffa7b71047eda20a0a5033ffb39576f7d4a0a8c49e22b9af1fa3dde7f494ef048b4927193ac92209200ee4da00e44186c0984e3e874ac9e51b97
-EBUILD simple-scan-3.6.0.ebuild 1071 SHA256 24a0e0e6a0a7bad27aa7126963014f513c4b54c40d73990152ef40db955290ea SHA512 5293c103b3306771cc908620d19407b63a3de4413413018d1b348d92b3bedb0a44ac5fb4c05fcbc41b9cfa29da24f863411e4472c504c44f0ed819fc5a398866 WHIRLPOOL 82d763bdaf952463656e89b2a556a5c16289c8f3e6d89ebd36e521043330a3eb890ad0dbd586491b14562f1e6ab2921d4726a817036ed64c985061a1574a2104
-EBUILD simple-scan-3.6.1.ebuild 1051 SHA256 f8f4033d750fa612062e33b08670cd58f06a750e68bd315c6993e9420e6dc341 SHA512 16a1a81a14710f02074d3f56ce76bd2a14f2ff2a8a3793f31feffea5c2d6c23e1787d366ea1093a2c08d724b8763f4a06ad3cacc045dace346c08d66d96fcd79 WHIRLPOOL c6959822e0312850e027b8faf1276480f5d593486344c6f459686b78203e99ecbd8ef227a7c84bb881690f09672ae161fd2dcfd9c4a6012bb9bfc26df4b26289
+EBUILD simple-scan-3.10.2.ebuild 1102 SHA256 9918137714897762d59c5831c79e7520c3302b04589caddfc44fc4f9390f908d SHA512 e3ceaf0ce20762c3959189fb38a434a59aa8be7c2826843a433ac7f2fe593b09f82a7686b938e4ba8523e84b0d8b2e4f6fa5f62e665b3164d36d52cb3019085e WHIRLPOOL 9951184e431ae221790a6247d87924ec7985511e2ee0f0389a13874db334d7846b80a2de08543f744fb3d512558f2288bd207d993d12d81ba23f71fe711f1a6a
 EBUILD simple-scan-3.8.0.ebuild 1059 SHA256 4289ea4d73f3ffaa7c0053c8bed6e95b3c8893dcbb9a5c9037a7fd9908e5dd7f SHA512 52242f401e45158e1b03cc2759fe85dbab4c477b04746f90a2614b93ac68552d09747481fb0106f7361e0d2349c6d095cc834df33cfa024232ebe83989c8b504 WHIRLPOOL 7015fe2bf6b6668f15058baf1858bc82b2a8aeab79f59b365c374e74105bbc186c328506fb921dc3a235a8093ca7b9c9ff19a17198960de19231f03d8403c42b
-MISC ChangeLog 5261 SHA256 54581f349b280952a9c5baa36671885f2c1646731636d752b6b5f6e162abeb33 SHA512 f4e8904d665d82d7a71e352a4151664737c60ad33c2c61041d99779f008cecd70bddd160dc0488cf8b3226cb66fc8125f38797a948138666feff24471a93d8d5 WHIRLPOOL 822b2188a2a86d4013b63e21cb65d00b1f2a2f7a1283ddd221079e8fd52633621e5de1c27c87ceb7fe060a12b8c410bf0a7300b5715254aff30cd8ba406f2d60
+MISC ChangeLog 5484 SHA256 49fa26b0df9457c42188d7357b04142f83176158fc5e98f073a83085a0a633d7 SHA512 38e2ae19174ec0b274d9906ef63af60b3f585548c4bd2e1beb921328106bc88e0b0d4c21cd91ca981e096f428f3a984c92df416e5f51893d1c94a41ecd22dd8d WHIRLPOOL 906bd1a47d4d69983d9e3dac7383711e4527a2075d412df6b3e17b73752f4133a4cbfb0ec4f486e6fdf9084b22bac72ff31e33e791238d0521cc3f850078949c
 MISC metadata.xml 523 SHA256 b3bdece8e1176f94935a25a02b3b04e08d1711f3d6c3fb0eea698d6b6a7ea36b SHA512 56a11e2acc24ce5e30f6db1e8a9cb95e6329a6d8453f92220b57aba71668f852a53761577c032a57a1aec558e20f46aa5d9ea4e18155ff0d906fa8521cb3cf8e WHIRLPOOL 796a6d7887932b08e12f1702b105e06ad4fd4e77fdd026a38a4af5732cedefbf119d56b6afda3eafeab2ac863c9db132d73dd081b91e42827c71c07941fe702a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlK8Qt0ACgkQkKaRLQcq0GL7zwCeJ6/xrMxoW9YAacIqzSLN3uX5
-wDoAn2M81NO1r8N8uYAf5MMcaFxkNvnI
-=NrNb
+iEYEAREIAAYFAlMCjNcACgkQCaWpQKGI+9Ra4ACeMBe31REQR90b1exajqPndvyH
+QeAAnA0a6Ew0fRwTPFbA6uVBpvYarMdz
+=7PYy
 -----END PGP SIGNATURE-----
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
-}