Version bump, drop old

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

4 files changed, 26 insertions, 72 deletions

diff --git a/x11-themes/gnome-icon-theme/ChangeLog b/x11-themes/gnome-icon-theme/ChangeLog
index 267d1a41a400..69b0e02816a1 100644
--- a/x11-themes/gnome-icon-theme/ChangeLog
+++ b/x11-themes/gnome-icon-theme/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-themes/gnome-icon-theme
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gnome-icon-theme/ChangeLog,v 1.236 2013/04/09 16:45:26 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gnome-icon-theme/ChangeLog,v 1.237 2013/05/13 20:23:44 pacho Exp $
+
+*gnome-icon-theme-3.8.2 (13 May 2013)
+
+  13 May 2013; Pacho Ramos <pacho@gentoo.org> +gnome-icon-theme-3.8.2.ebuild,
+  -gnome-icon-theme-2.30.3.ebuild, -gnome-icon-theme-3.4.0.ebuild:
+  Version bump, drop old
 
   09 Apr 2013; Agostino Sarubbo <ago@gentoo.org> gnome-icon-theme-3.6.2.ebuild:
   Stable for sh, wrt bug #458984
diff --git a/x11-themes/gnome-icon-theme/Manifest b/x11-themes/gnome-icon-theme/Manifest
index 1395131f1754..656c1afb697d 100644
--- a/x11-themes/gnome-icon-theme/Manifest
+++ b/x11-themes/gnome-icon-theme/Manifest
@@ -1,32 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX gnome-icon-theme-2.91.7-update-cache.patch 974 SHA256 861afa6884254c86d9df69cd23a7f6b63b08ea3dddc0ed128d5f34c7937bc42a SHA512 958b1cfebd1ea59991a988fee5b70a17a46f4130c00160d79af5f11cc459d7e580c1ef6a43253d199cbd7216c789b4ceb9ddb4a9f4b0477ce21a3b11b6443514 WHIRLPOOL 52138fff3ebc60b01efc3bdd239812f4f1220a6ab6d75d7f5cefff7edb07755d406f32d8234cf312282cff7585bbca1c614111154a6769de35554df820e7433d
-DIST gnome-icon-theme-2.30.3.tar.bz2 15984407 SHA256 417e2f9d77843a6dbdcb1f6fa70dd55992aae5621c6ad8a64e5baa3cb893dac7 SHA512 31c2f647d04e49a0d277a1aa76c899481f9e63f3adb3fcc7dbae58c752b265395f6f65451ac5b43384c6874df684d7cf5eeb95325a118aac64f3ed9e9d7fd41f WHIRLPOOL c513cde444724e69d33852204c198ea94abcb1ac405bfc32a0927844943ff8014747860ddfcc84274379fc30dc01587aaab411e3e72f6cce0c72a2e701d4f466
-DIST gnome-icon-theme-3.4.0.tar.xz 14732316 SHA256 0963524f488f48e8b982ca80c1b5207c4e0946ccb95c131b853c9ff448f8e159 SHA512 96fca59989cb982b3a23108c7ddd9cd27b3980b38c14a52f3e3b13eeaa52d91326de3bfa9539816efc7f337ae4abe4a438dcb30347975b310174177b28a9f4c0 WHIRLPOOL c687303c70093590b1f5cb759d524952093aa01c9979a5653de30772d2e2df60910b5c5feb63bdadc5becc0b6d940fbdb23247a8d0b844c7060e008dc7c8fb02
 DIST gnome-icon-theme-3.6.2.tar.xz 14486304 SHA256 314d5535c12af5d62ba0e51addd3457e39140fb149efb9769eacbcc0449f1045 SHA512 93778dd8d964f5da0f00c72a2b3bd9fc958c011b4b89c817c3ada9fed4dd14f557697ef2959d8993b2823586fbb6c6544d5c1de6507cc25b92912fd42b821f9e WHIRLPOOL b9397fa90c7bbff6e5ac859f9df6f7bbd5627bf4e09d1fe5d690f8da4f71107612556a14823b96198a98d3f37d33ff0971e7f219b4ce6a93867c8b54f9f2b7d0
 DIST gnome-icon-theme-3.8.0.tar.xz 16093696 SHA256 e4f7c73e33eb8693e3adbab7df60fbb5f6dd147116ac04d9bd26986e41071270 SHA512 45bcce0fa5f570399a9fefcced62099ab45da3bd3edb20d840af09da97750a03dbf31f171047bf61424325888fd27bff8e521011af9f3057a063ea5f940843b5 WHIRLPOOL 4be171b3d92687083175491c60495512c66fa4cda799443f5d6cd95f5afe514d65d99f25085874bc360b6426226e5305ae34b47141dd4eec921ada906297b525
+DIST gnome-icon-theme-3.8.2.tar.xz 16627056 SHA256 1a7c518f9d824242389d456259c64c31cd3f15cc495042b022b513321e2de108 SHA512 fbade3910ba8d6cb5f79cd2ed07728a416967f1cc1f0bf221528808d5dbbb935996065dc4ae6f2ba806a2c6fc57202a6213d63435b13f5de66c0b881ac8f1fb3 WHIRLPOOL 62001ec0b52e980731dc58b42d92e9d9d893196fe47a2ada43d8022922afc163b1b53b5740141851714d4042be99c3b8b252afc4feed3bc9603daf9b13189f31
 DIST tango-gentoo-v1.1.tar.gz 29322 SHA256 518efa4257c8e689488399db23397a89f4dcd5990ce537ef6215860ad5606eb0 SHA512 87d47ddab68361db6d99866c51705dcb3e198f8345a1096859acf2c6cca5099dd23c7fb30d124f52c4933ea38fd45fadffbbe6ecbdfa84f5b60938a4824f9045 WHIRLPOOL 9e1635a505ea48f4fe8bdb3b8b3b43cfb9cf99e3204194c51361b198886e719921cfacbc15f9f6407aa7d0c4af178e24c74b998fc370fa2329040e5be1baf153
-EBUILD gnome-icon-theme-2.30.3.ebuild 953 SHA256 a8cde39194989f166dd75c91289c14a6d7e37a8a46fd39630d37a6ed33b4a423 SHA512 53e728cf8eacc10180f328495aa1badf0863c486c91a05d673b2e88ed5a25163a3e1b32815b4bb5a65353b8fd3a880914dc21beaf1c9e49621501bf975ac3560 WHIRLPOOL 6972de9cd8a50d82b033642693bcf2675c6f75ca3ba4f3629744f7fd0953cba7f2937b883017fe54b6485b04699eb33b3b8d0ae5571d4148493170820ce89dda
-EBUILD gnome-icon-theme-3.4.0.ebuild 1733 SHA256 f2011774ea81aa0b90f4a8e719ca3c37e547500ba910681b1e7d2e386f1f933a SHA512 e8c73df315f7a248a9f9e44b01688ced1e83e5545219410c89f92f6e20d1a340d4e47920e9ba31e7f800ab265908bc8ff0f82092fca22a501743da1645f62b3c WHIRLPOOL 3a3df11eaeced060bcc576762283a12447e9f7349bdfa2179875337498a7f815cd5ea868c913e0fa450ef168f98deff63548ec1f4ea398c826f3ab516d15ca43
 EBUILD gnome-icon-theme-3.6.2.ebuild 1664 SHA256 1b260cc681c73cec3f414fc4c9bc060e5002cb0ea28e5a632a80848daaa1c02f SHA512 f69ebe58fbaf74c809318f777561992481de1cbceb23fa3eb0588c449b15e4024645b6a0d0cc4bd8e9ad01a63b47fef12b97e82ef9ef49c0142910ebf3567e65 WHIRLPOOL b2a95a3256faa9f9acec9b5f824bcd01cba0ad8d9c32f610c38081e14e22d9956244c84b8818ee7231fcfb05680e22beb5d833c373f746a234568c036954ab0a
 EBUILD gnome-icon-theme-3.8.0.ebuild 1446 SHA256 3baf022a38649d0e94c719dadcf47316277b805a6aeacfb1c1c916952260527e SHA512 ad428cd274c53169028db4bdcb723ac8a13d1aaf30eb261564282441cdf5afade7f58d5b671c7b884383e61dd9cae128e2f28f6dd4a5c31a66bb93ecffecf408 WHIRLPOOL a5bac2afdf2ce29a3f3a2bc050865bcba15bd198395fa299ef8e28e00347245af02d05be20abea156b126c0b6c932bf1a948411a394cff1cda91f4ec6ee41b12
-MISC ChangeLog 30459 SHA256 2c17ddec0e5277bb183d2268841450be1ba24a0650cb684d65feca94a9bc2f06 SHA512 a003e1c0ae1be27800f0120918ac805b2378829f49782c1c8f61f6e327eaec05e4c7b7722bac6c8b4cec925d71c5f7a68b54e0022e5ba2159346a3774f8e18ec WHIRLPOOL 78e59d546fff76606b931f1c1f72068d6030799e34e04d8e3eb6e0aab60ec3c4bd25b0d14718f32fa954a04f904ba02db6e09ed253940134e3220e291e845fca
+EBUILD gnome-icon-theme-3.8.2.ebuild 1424 SHA256 3b40c1421e03f783b104e842c2cde66c3ca8d25f1bf6fb4767e8c0f8c81bf5de SHA512 7e5d6b9893bbd2fbe0a7d7c8c32f513d0310382e8eb222da44ed173787328e96811b70428f0ea91d1cb42aba67337670f9a5f90faa62907bc55a34a9d83181bd WHIRLPOOL 0488f8b578e80aa5ba406d34c3c662ca2ef6b505ac298564f4f3a091d20692cf9ac4e8946860f8ffbad0a3aea9c8956ca7a84aa05abf4acfd114f2506a212c9f
+MISC ChangeLog 30671 SHA256 bb6a9fb9a89ce485a640cec063c4c3738cdfd4b6282a97d4431f4da62dbae441 SHA512 40fa75a329d584433e346d22cdeed0f3cd4c0160c850225255c363ec545cf5f956e5cdc1b4659bf899ffb115c027189a16ff61c2a26ea4a5d16b53c04f383932 WHIRLPOOL 58e0e1da0aa2f7437f5a7c7063230262dfdc7ad0a2398872058d8d07b1c1aa369c567a6c96da3b5b40815d6e6dfb555d84831055f45e2cbcff8393fe474adbfd
 MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRZEUPAAoJELp701BxlEWfuG4QALrya24Qi7V+vfGDW5gHZ6MN
-aFzFdHp9/YVfk7DceUB57nXdvFoHOtMVjHkwHGHRZHPaQGB9Tm8pjGc1NiUuaoyM
-OTKcKbR7KiRYNh3o6nnb53NDOBhsiH0HOztposXOCYFF38gZDoI9/tSzzfGaZdic
-gBRCcf/otOd+yUu0++fVn01WKmfZUHGCXbwAUgd9+HAE+pqpqJQzBpXi3P9fiY5b
-3AnmAWJQm634DaIojJSVQiX2/k/NxNYp/rCm/uOT+YKXv4twGXDtYHpJERRQbgwl
-/3Gl6m7R5i7ILjirYQT1vjDsv5VVcCJkSlxPgbtaCKeSvV5/5q1cL9Z39wzl3MI0
-OnLB8gLvS6G+R5jWDUg2tK2S12MUTeWdJtmH11FmjYkIO4GuD1vho2JDK52QcQla
-jAQE+1Uz4vKbxV8f204PrEkjb6sanMJ9DECNzjNjhzSZmK5Uya8H6FWXMLpSCSsa
-ciE7Xnpx4hPYPjDUTC4Yjim0OVQcVWchyQ0CclaxgG83LVp1m/XOVad3DxFnR+QR
-WKLzLhRb92ujrlnaGyo7uLo0/7E7+5FgJK5mCsYP0kmHAN34zf+T20RUyQD9/88K
-K2N+GhSZzYi/AKFKAWtAZudoYWV/aP/RRHYlzvNGvqbjLx8xJVyf36ZsBsANola4
-ep6XAZRYiqEhqDz9S/vz
-=brB/
+iEYEAREIAAYFAlGRS9EACgkQCaWpQKGI+9RXRQCfdDAQ8ih4t1T+/GtJDBNp6X6M
+gD4An39W4fPb9ZlcA+AUdXapfP+d0NhB
+=xZmK
 -----END PGP SIGNATURE-----
diff --git a/x11-themes/gnome-icon-theme/gnome-icon-theme-2.30.3.ebuild b/x11-themes/gnome-icon-theme/gnome-icon-theme-2.30.3.ebuild
deleted file mode 100644
index e7baf6e2c1b2..000000000000
--- a/x11-themes/gnome-icon-theme/gnome-icon-theme-2.30.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gnome-icon-theme/gnome-icon-theme-2.30.3.ebuild,v 1.9 2012/05/05 04:10:05 jdhore Exp $
-
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="GNOME 2 default icon themes"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=x11-themes/hicolor-icon-theme-0.10"
-DEPEND="${RDEPEND}
-	>=x11-misc/icon-naming-utils-0.8.7
-	virtual/pkgconfig
-	>=dev-util/intltool-0.40
-	sys-devel/gettext"
-# Upstream didn't give us a ChangeLog with 2.30
-DOCS="AUTHORS NEWS TODO"
-
-# This ebuild does not install any binaries
-RESTRICT="binchecks strip"
-
-# FIXME: double check potential LINGUAS problem
-pkg_setup() {
-	G2CONF="${G2CONF} --enable-icon-mapping"
-}
diff --git a/x11-themes/gnome-icon-theme/gnome-icon-theme-3.4.0.ebuild b/x11-themes/gnome-icon-theme/gnome-icon-theme-3.8.2.ebuild
index 350e46f14c54..1d6a60db52d3 100644
--- a/x11-themes/gnome-icon-theme/gnome-icon-theme-3.4.0.ebuild
+++ b/x11-themes/gnome-icon-theme/gnome-icon-theme-3.8.2.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gnome-icon-theme/gnome-icon-theme-3.4.0.ebuild,v 1.11 2013/02/07 22:50:36 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gnome-icon-theme/gnome-icon-theme-3.8.2.ebuild,v 1.1 2013/05/13 20:23:44 pacho Exp $
 
-EAPI="4"
+EAPI="5"
 GCONF_DEBUG="no"
 
-inherit gnome2 eutils autotools
+inherit gnome2
 
 DESCRIPTION="GNOME default icon theme"
 HOMEPAGE="http://www.gnome.org/ http://people.freedesktop.org/~jimmac/icons/#git"
@@ -16,30 +16,20 @@ SRC_URI="${SRC_URI}
 LICENSE="|| ( LGPL-3 CC-BY-SA-3.0 )
 	branding? ( CC-Sampling-Plus-1.0 )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="branding"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND=">=x11-themes/hicolor-icon-theme-0.10"
 DEPEND="${RDEPEND}
 	>=x11-misc/icon-naming-utils-0.8.7
 	>=dev-util/intltool-0.40
 	sys-devel/gettext
-	virtual/pkgconfig"
-
+	virtual/pkgconfig
+"
 # This ebuild does not install any binaries
 RESTRICT="binchecks strip"
 
-# FIXME: double check potential LINGUAS problem
-pkg_setup() {
-	DOCS="AUTHORS NEWS TODO"
-	G2CONF="${G2CONF}
-		--enable-icon-mapping
-		GTK_UPDATE_ICON_CACHE=$(type -P true)"
-}
-
 src_prepare() {
-	gnome2_src_prepare
-
 	if use branding; then
 		for i in 16 22 24 32 48; do
 			cp "${WORKDIR}"/tango-gentoo-v1.1/${i}x${i}/gentoo.png \
@@ -48,9 +38,11 @@ src_prepare() {
 		done
 	fi
 
-	# Revert upstream commit that is wrongly updating icon cache, upstream bug #642449
-	EPATCH_OPTS="-R" epatch "${FILESDIR}/${PN}-2.91.7-update-cache.patch"
+	gnome2_src_prepare
+}
 
-	eaclocal --force # workaround for weird autotools.eclass bug #438296, #419933
-	eautoreconf
+src_configure() {
+	gnome2_src_configure \
+		--enable-icon-mapping \
+		GTK_UPDATE_ICON_CACHE=$(type -P true)
 }