Version bump for Gnome 3.6. Drop old revisions.

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0xC6085806

3 files changed, 22 insertions, 18 deletions

diff --git a/x11-themes/gnome-icon-theme/ChangeLog b/x11-themes/gnome-icon-theme/ChangeLog
index 992002f0d05b..bd7beccc7a68 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gnome-icon-theme/ChangeLog,v 1.223 2012/10/28 16:38:26 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gnome-icon-theme/ChangeLog,v 1.224 2012/12/16 19:22:25 eva Exp $
+
+*gnome-icon-theme-3.6.2 (16 Dec 2012)
+
+  16 Dec 2012; Gilles Dartiguelongue <eva@gentoo.org>
+  -gnome-icon-theme-3.2.1.2.ebuild, +gnome-icon-theme-3.6.2.ebuild:
+  Version bump for Gnome 3.6. Drop old revisions.
 
   28 Oct 2012; Raúl Porcel <armin76@gentoo.org> gnome-icon-theme-3.4.0.ebuild:
   ia64/sh/sparc stable wrt #427544
diff --git a/x11-themes/gnome-icon-theme/Manifest b/x11-themes/gnome-icon-theme/Manifest
index 693cddf558ef..74ccaa6382e4 100644
--- a/x11-themes/gnome-icon-theme/Manifest
+++ b/x11-themes/gnome-icon-theme/Manifest
@@ -3,18 +3,18 @@ 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.2.1.2.tar.xz 14010148 SHA256 ddd4e7599c42244055a59612ea8ea6153624d37d8e331bc0fb0337519000f476 SHA512 eac994e375f08efa4833b8f292b29ddaa8e71db7888efb483afe5da3e6d350332906b3659e5b4c0ff78ef944fce366808351d4a43d7308e0297c71f6b49422fd WHIRLPOOL ccc897d2986b225beb770037bbfb53125e27a40a8433273e3269cf77a79045fee897289990ff678b449411054bb1bf1883e79807bf9d164ec17110549b55fb94
 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 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.2.1.2.ebuild 1750 SHA256 ead20ea2af1dea1a55f9510d8c2616058779e847f022722f376dc8aa8feda418 SHA512 0d07094e56b7b13569a8cdf2556675341bb7b31252e104f5a088343557e325cf8317ddda702a630bdf873a73272bd032aa31aa5834bbc8fa2b532b5b0767f97d WHIRLPOOL a1e92922082321d3f02e4830093abfb9f408074afa8aeaa54e00183754641e14fb426023ca8190060ded4d16dc0494ec064fba15d637cee5ab0474b3b0177a01
 EBUILD gnome-icon-theme-3.4.0.ebuild 1758 SHA256 c196d67de74ffab12569c95664537748867210ce5a6ec52d57119ca4467d6ede SHA512 2f3cab24390192e125e5e699eb9aed5948262271d3e2a59402053a65e941835a092ad52a4c51d7d35aad711e8f2fe7d4a78f130d39da659b70245e5e64fdf491 WHIRLPOOL eb2a9c259fcd088fea048ea15d367023a58339270b84c2844d9af57a4dbdd5860b90b16d7f58286cb084f48156d0ccba86a3b08792188303239cb30559152eec
-MISC ChangeLog 28793 SHA256 91e7b4f38ec3cf8d3fb64bcb529b838906c3c6c8308b485369801f2612850077 SHA512 3ee2689344360e5965f68a1e3fd170429dedf0bb90e9d9c0bf935e29ce5e43a1786169577b91f2c472ee76e26f56077b2561ac543c7ca01ac64a28f1b7541d61 WHIRLPOOL abb64c87165c69d17c02aa9d65f4b633667146614573f2374d704ffa2d452f8895cd7a250ec2aa1caf877855332aa1819aa2725959f60037c4dd12b9df09def4
+EBUILD gnome-icon-theme-3.6.2.ebuild 1682 SHA256 7f5bbb646ec2c721e31d39bb1b1a7a5e45fe431770fdadf14459a9c567ec911a SHA512 a3c7c2181c861a5f98510cf377001d22d14f052f1c7e22afa1c3ab637c090bd050f5c7ebb5f05d3e3e5e9ec3fac26544c6c68513f10c4f12bf1db18fe314bd64 WHIRLPOOL 598e732ebd076533bb3e47eb7a1825ce7f63a048318ab16302cfe9b438ffc8104b149936fdf2089644fafe4d2c0f4560ba7dabf5f2e71da03aee3923b3a3d31d
+MISC ChangeLog 29001 SHA256 f586be709d318d455eb6d8f465364d973c5752782a912825c5a209e2cb33bb9a SHA512 a2aa45f0ffb714d54325192a4ad4106b041c4286461db3b65a89283e3adbd0fc01e606f14f4dc5c71c87fe331607eb4a0d3c08f9ee9647bf7a148b6e7d121811 WHIRLPOOL f041e8cc6157b5f7b6c7a8582a6d5a9a1ee1df87e0ae9d20d70a5100f6666266b6c962cc0afdc78780069bea20b09e35b3df341ea7b971c57a661f968924e052
 MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlCNX4MACgkQuQc30/atMkBDnACffpgAKstV+jjE/GgEoK04tCHM
-dfkAnjcRax1Veox34GaSrRz8UR5a+CVO
-=nNKk
+iEYEAREIAAYFAlDOH3IACgkQ1fmVwcYIWAZ92gCg4C5l8/Zq02b/CTP6wrj518Ru
+bHoAoM7ROZw8sSNKwoi78+K7N7qSl5KD
+=hb42
 -----END PGP SIGNATURE-----
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.6.2.ebuild
index b32d2d24249f..cf851da082af 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.6.2.ebuild
@@ -1,11 +1,11 @@
 # 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.10 2012/10/16 21:45:05 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gnome-icon-theme/gnome-icon-theme-3.6.2.ebuild,v 1.1 2012/12/16 19:22:25 eva Exp $
 
-EAPI="4"
+EAPI="5"
 GCONF_DEBUG="no"
 
-inherit gnome2 eutils autotools
+inherit autotools eutils gnome2
 
 DESCRIPTION="GNOME default icon theme"
 HOMEPAGE="http://www.gnome.org/ http://people.freedesktop.org/~jimmac/icons/#git"
@@ -16,15 +16,15 @@ SRC_URI="${SRC_URI}
 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"
+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"
 
 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,12 +34,10 @@ 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() {
-	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 \
@@ -50,7 +48,7 @@ src_prepare() {
 
 	# Revert upstream commit that is wrongly updating icon cache, upstream bug #642449
 	EPATCH_OPTS="-R" epatch "${FILESDIR}/${PN}-2.91.7-update-cache.patch"
-
-	eaclocal --force # workaround for weird autotools.eclass bug #438296, #419933
 	eautoreconf
+
+	gnome2_src_prepare
 }