Version bump, adds trophy and uninterruptible power supply icons. Correct license. Drop old.

Package-Manager: portage-2.2.0_alpha104/cvs/Linux x86_64

6 files changed, 53 insertions, 70 deletions

diff --git a/x11-themes/gnome-icon-theme-extras/Manifest b/x11-themes/gnome-icon-theme-extras/Manifest
index e3abd6b0147d..a89a2f90ca81 100644
--- a/x11-themes/gnome-icon-theme-extras/Manifest
+++ b/x11-themes/gnome-icon-theme-extras/Manifest
@@ -1,6 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST gnome-icon-theme-extras-2.30.1.tar.bz2 1997048 RMD160 b98e9944bee0d22586ca30bf0ddf1d2a38d29811 SHA1 50d8cf89e21025df152d89a4a14047a08449b654 SHA256 45db58ca52765b40a4a22bc8d70d05564c94697d252b8941bb5be76315f6508b
 DIST gnome-icon-theme-extras-3.0.0.tar.bz2 2118318 RMD160 4375f2ccc4b737d3d454507b13576bbb87bef34c SHA1 40dafb78cda7214a0589331c15047bce73e1fb16 SHA256 b9e4af7cb9cce3123da257f70223ee3fd78e0963a040386aaef449b111f862eb
+DIST gnome-icon-theme-extras-3.4.0.tar.xz 1664028 RMD160 a622253a25ecf70200b286fa4b8cffebb6b775e6 SHA1 12efb4324047ba0afc142906aa9bab1af916c3a8 SHA256 d54492c2fb685a983bce4dec24db5831a2828f6479c98fbcd93a1f8370b4c373
 EBUILD gnome-icon-theme-extras-2.30.1.ebuild 1252 RMD160 b0783ae1b117e32eed73c1c7567708c6c80e6fc4 SHA1 69bf22adecb60775a54b5f14dfe6862486164c6e SHA256 105a3c50a5945084081f00400979761643fe64a831c0fa65e8fa4b6ff4a47120
 EBUILD gnome-icon-theme-extras-3.0.0.ebuild 1251 RMD160 c0d0093f090faa3d4ea60784baefb1f1ea7f9620 SHA1 fca02b8a4d033ef5a075cfef1f4c623845658106 SHA256 6d28ac99cd2cf911bfabf3af6e8f6e2b118bfb3b8bcdc1fee59e7eaa77f34ecc
-MISC ChangeLog 1494 RMD160 bcd6353b21f9a98259c70c5230705824648f7f1d SHA1 9bf3ff620fcd9cdc1347779f970bd18062662059 SHA256 e8f87c35e4072aa68c0fa73a48e6c8eba153b79b5afaa17aab0517cc6ee2fb19
+EBUILD gnome-icon-theme-extras-3.4.0.ebuild 1058 RMD160 11d13cb875088ab3e6eed6bd5b6737d26cd7b9a7 SHA1 0ed0fc3400c8441dc484b53fe682b7d1f8223320 SHA256 a8cd08c393b78c7ad4eecbc4b3bfaab61d3ceed72b08efbbbf4396d4257b758a
+MISC ChangeLog 1692 RMD160 4434e930f8618e563ed10d328fd7f55cc283c884 SHA1 a08f34c0b2f2a559b903e9cc499f581dba4bb7aa SHA256 1d74a96bcae03635bd8644aad791deec97795bf9ed37ab2d103c476342a7aa55
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBAgAGBQJPsI5/AAoJEJ0WA1zPCt1hLU0H/2TIHIGHNFwl6WbuxOOo2tp0
+LRaRepHYULY5eQzJOAOzlmAPt7136ZT1J+0aj1cqQeitIIuDSC4uSKAbPe9cWWsh
+pcLqIED2d4CUxWbneNBV16C9vbq4qbJeErEnuFnsC6H1oHGoOOYjR7iGDNVazXRf
+22WbiyefJ24DEXK7W4pJM4aKwku817j7Exd/WAHwryyi1z9jg5oCgvQSCsEYardV
+paSduGIx/xA6CycDZsunUq3NLX9rSkSZe4sXxIgTOhLwHkRmEmpIxMEPyEnO3SHk
+lSb+LXhQ9B9DiwZ3WUqUW2OrleVLwFASGRRMxQJuaug/v3J5TKnAs61bEgmWxSQ=
+=nDMl
+-----END PGP SIGNATURE-----
diff --git a/x11-themes/gnome-icon-theme/ChangeLog b/x11-themes/gnome-icon-theme/ChangeLog
index 25ea23e35f97..9b585a42b265 100644
--- a/x11-themes/gnome-icon-theme/ChangeLog
+++ b/x11-themes/gnome-icon-theme/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-themes/gnome-icon-theme
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gnome-icon-theme/ChangeLog,v 1.213 2012/05/05 04:10:05 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gnome-icon-theme/ChangeLog,v 1.214 2012/05/14 04:47:46 tetromino Exp $
+
+*gnome-icon-theme-3.4.0 (14 May 2012)
+
+  14 May 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -gnome-icon-theme-2.91.7.ebuild, -gnome-icon-theme-3.0.0.ebuild,
+  gnome-icon-theme-3.2.1.2.ebuild, +gnome-icon-theme-3.4.0.ebuild:
+  Version bump, adds trophy and uninterruptible power supply icons. Correct
+  license. Drop old.
 
   05 May 2012; Jeff Horelick <jdhore@gentoo.org>
   gnome-icon-theme-2.30.3.ebuild, gnome-icon-theme-2.91.7.ebuild,
diff --git a/x11-themes/gnome-icon-theme/Manifest b/x11-themes/gnome-icon-theme/Manifest
index 231ec71b894b..c770034e897a 100644
--- a/x11-themes/gnome-icon-theme/Manifest
+++ b/x11-themes/gnome-icon-theme/Manifest
@@ -1,12 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gnome-icon-theme-2.91.7-update-cache.patch 974 RMD160 35323131227ede0add1deae2f9997ee9afabd15c SHA1 f0933f0a2963403bab1f0353290f99c1dc546a5b SHA256 861afa6884254c86d9df69cd23a7f6b63b08ea3dddc0ed128d5f34c7937bc42a
 DIST gnome-icon-theme-2.30.3.tar.bz2 15984407 RMD160 ffdd45c00ddff4854a4b979c539d9f12ed2dff6f SHA1 41c2c43480376f784f21487727e6c726ed60addf SHA256 417e2f9d77843a6dbdcb1f6fa70dd55992aae5621c6ad8a64e5baa3cb893dac7
-DIST gnome-icon-theme-2.91.7.tar.bz2 18258570 RMD160 17d8ac034c5ef5ecef163936c363c37e731d2c4d SHA1 231f8984bafd1c6aa81238eb93e981629a50b93e SHA256 cc8eddb8c751d1243bca2b444a226264fadeb79e3a642089d4632ac04ae3a93a
-DIST gnome-icon-theme-3.0.0.tar.bz2 18452743 RMD160 e3248f065a6f68c2dc8dce0985c1854694414b7f SHA1 6184f450c2d5b4892bb6dd4192c2174770f6fc95 SHA256 42da7c4ab1521e7beb1c26f5588c35a644ef57585754d8ceec427d9d7f94bb09
 DIST gnome-icon-theme-3.2.1.2.tar.xz 14010148 RMD160 3480be39b750ad16e4a935775f5fb436e2def993 SHA1 388e4dccebf809a8b3bd42886ed1610b844d7ed5 SHA256 ddd4e7599c42244055a59612ea8ea6153624d37d8e331bc0fb0337519000f476
+DIST gnome-icon-theme-3.4.0.tar.xz 14732316 RMD160 d4deef8f720d82dbb9f26e9ddec286a5fa091c09 SHA1 125869d67420afde1e9823db01b1abd85da7e8be SHA256 0963524f488f48e8b982ca80c1b5207c4e0946ccb95c131b853c9ff448f8e159
 DIST tango-gentoo-v1.1.tar.gz 29322 RMD160 c64d56b1b3e45f093c60eb6c0140b4297f4991c1 SHA1 0c119a4ede9c1ec42c8d7bb4a3a6a200fa8ca56f SHA256 518efa4257c8e689488399db23397a89f4dcd5990ce537ef6215860ad5606eb0
 EBUILD gnome-icon-theme-2.30.3.ebuild 953 RMD160 19541e84d18ef464f3c1fa76b07c9120b558a4d3 SHA1 69846c2d75bb1f1542cb8e251418c08f88c9b3d2 SHA256 a8cde39194989f166dd75c91289c14a6d7e37a8a46fd39630d37a6ed33b4a423
-EBUILD gnome-icon-theme-2.91.7.ebuild 1684 RMD160 66c261372c857997e725ec815720f8de1adc23d6 SHA1 518b393a0e5be51c99e967f4a2b1b54f6fac77a8 SHA256 7befc3a6f1ae700371402fe8eea1a15512a4dc8d0de7e5fccc1dc78a59ef6f2c
-EBUILD gnome-icon-theme-3.0.0.ebuild 1724 RMD160 0c5f9ee9d6a1a68011eec283c3a5ef77f4f248b9 SHA1 9eb82dca0967dc9c328ef0f7b80be28a9cd95e39 SHA256 e549571a7b84bf1ca7d3f4e80ee2c4dd69b5e55c7195989abbf7d0a8efafc7ee
-EBUILD gnome-icon-theme-3.2.1.2.ebuild 1726 RMD160 9116870c19634731c5cb67143d2bba1e7cef2c96 SHA1 8e9aa4b1ab10d524d1061cfca045d97ca4e4bb78 SHA256 ecd92474f664ed1d19ab6c9444e23c8ecc96607d8489d02633e434f0b7314edc
-MISC ChangeLog 27249 RMD160 f6a608a7cfdb859d7d688efa17a11f961a3f49a1 SHA1 e2b24ba6091791f662c486f5d3d2c443242902d3 SHA256 22333c631d56f89e9d8490fdecfd56f4d5843d51f9061b3390eafff88ef93239
+EBUILD gnome-icon-theme-3.2.1.2.ebuild 1736 RMD160 d8589fe5fb1ff7291f013c10613c8e5705702a83 SHA1 0b4bd7185fed07f15941ae2cd057dad3339e5b9a SHA256 09d6e815d4e379f7ba787fb10f807ee79a137bd0d408a4dd27466174b371547c
+EBUILD gnome-icon-theme-3.4.0.ebuild 1743 RMD160 0813f661b56dd908fc21d2aef6aa9355bcef1c66 SHA1 7b1be66d7201b26b6403fb2ae639b44ebb0a9dc5 SHA256 4445177e831263495c07ffe4f4856234fd790e61247980f889e257c7b3d39d67
+MISC ChangeLog 27582 RMD160 68104611f32f6d344c62306d94a3b3f3eecf5b6e SHA1 c7b893b91b7ede03174e82f9d3766189b4e26136 SHA256 566ee8e24aedb0ff1a92ee79b688140771a9e4c38c6a418f36021750b21c1bf7
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBAgAGBQJPsI54AAoJEJ0WA1zPCt1hiQ0H/25ONbX2ZO+pBzQ+pn2m4WAl
+BsKiX7FOsXskcofUXGwW0YXTJCR99Cw2zXDXV3Yc2YjWf3tpHEgO7zsF2UMIeUUB
+EK0aXa9Byz2eTaH+oZQEmcr06ripRJuGpSSfr++bygsW6KGHLcuKwKf+B7/1RyE7
+bfq23dfTpWqx8od3rmDuAocwvymIN4a5WrxWor+GmE8UIBKgxMsz5M4ap8NY71r8
+cW8BFqA0YX2o6j+Afl7J8Yzw4DhjsWI4+1bTNvIMaC/0+z49YrJgGiuKCz/P5aJK
+bKBqJ8SElx4Y6e0pwVBzTVL49j8+3pQuNeMh9sQ/HwueX0kh65i88spyLlCKWnM=
+=HfjV
+-----END PGP SIGNATURE-----
diff --git a/x11-themes/gnome-icon-theme/gnome-icon-theme-2.91.7.ebuild b/x11-themes/gnome-icon-theme/gnome-icon-theme-2.91.7.ebuild
deleted file mode 100644
index 116bb45c8bd2..000000000000
--- a/x11-themes/gnome-icon-theme/gnome-icon-theme-2.91.7.ebuild
+++ /dev/null
@@ -1,53 +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.91.7.ebuild,v 1.8 2012/05/05 04:10:05 jdhore Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-
-inherit gnome2 eutils autotools
-
-DESCRIPTION="GNOME default icon themes"
-HOMEPAGE="http://www.gnome.org/ http://people.freedesktop.org/~jimmac/icons/#git"
-
-SRC_URI="${SRC_URI}
-	branding? ( http://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )"
-
-LICENSE="LGPL-3 CCPL-Attribution-ShareAlike-3.0
-	branding? ( CCPL-Sampling-Plus-1.0 )"
-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="branding"
-
-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"
-
-# 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"
-}
-
-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 \
-			"${S}"/gnome//${i}x${i}/places/start-here.png \
-			|| die "Copying gentoo logos failed"
-		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"
-	intltoolize --force --copy --automake || die "intltoolize failed"
-	eautoreconf
-}
diff --git a/x11-themes/gnome-icon-theme/gnome-icon-theme-3.2.1.2.ebuild b/x11-themes/gnome-icon-theme/gnome-icon-theme-3.2.1.2.ebuild
index e0a8ce49880d..3548222356e4 100644
--- a/x11-themes/gnome-icon-theme/gnome-icon-theme-3.2.1.2.ebuild
+++ b/x11-themes/gnome-icon-theme/gnome-icon-theme-3.2.1.2.ebuild
@@ -1,6 +1,6 @@
 # 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-3.2.1.2.ebuild,v 1.8 2012/05/05 04:10:05 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gnome-icon-theme/gnome-icon-theme-3.2.1.2.ebuild,v 1.9 2012/05/14 04:47:46 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.gnome.org/ http://people.freedesktop.org/~jimmac/icons/#git
 SRC_URI="${SRC_URI}
 	branding? ( http://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )"
 
-LICENSE="LGPL-3 CCPL-Attribution-ShareAlike-3.0
+LICENSE="|| ( LGPL-3 CCPL-Attribution-ShareAlike-3.0 )
 	branding? ( CCPL-Sampling-Plus-1.0 )"
 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"
diff --git a/x11-themes/gnome-icon-theme/gnome-icon-theme-3.0.0.ebuild b/x11-themes/gnome-icon-theme/gnome-icon-theme-3.4.0.ebuild
index 0a2d000f54bf..00900894b488 100644
--- a/x11-themes/gnome-icon-theme/gnome-icon-theme-3.0.0.ebuild
+++ b/x11-themes/gnome-icon-theme/gnome-icon-theme-3.4.0.ebuild
@@ -1,8 +1,8 @@
 # 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-3.0.0.ebuild,v 1.9 2012/05/05 04:10:05 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gnome-icon-theme/gnome-icon-theme-3.4.0.ebuild,v 1.1 2012/05/14 04:47:46 tetromino Exp $
 
-EAPI="3"
+EAPI="4"
 GCONF_DEBUG="no"
 
 inherit gnome2 eutils autotools
@@ -13,18 +13,18 @@ HOMEPAGE="http://www.gnome.org/ http://people.freedesktop.org/~jimmac/icons/#git
 SRC_URI="${SRC_URI}
 	branding? ( http://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )"
 
-LICENSE="LGPL-3 CCPL-Attribution-ShareAlike-3.0
+LICENSE="|| ( LGPL-3 CCPL-Attribution-ShareAlike-3.0 )
 	branding? ( CCPL-Sampling-Plus-1.0 )"
 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"
+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="branding"
 
 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"
+	sys-devel/gettext
+	virtual/pkgconfig"
 
 # This ebuild does not install any binaries
 RESTRICT="binchecks strip"
@@ -34,7 +34,7 @@ pkg_setup() {
 	DOCS="AUTHORS NEWS TODO"
 	G2CONF="${G2CONF}
 		--enable-icon-mapping
-		GTK_UPDATE_ICON_CACHE=$(type -p true)"
+		GTK_UPDATE_ICON_CACHE=$(type -P true)"
 }
 
 src_prepare() {