Bump to 2.91.92, remove old

Package-Manager: portage-2.1.9.44/cvs/Linux x86_64

3 files changed, 19 insertions, 13 deletions

diff --git a/x11-themes/gnome-icon-theme/ChangeLog b/x11-themes/gnome-icon-theme/ChangeLog
index 8d6cb5158c54..12c7340537eb 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-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gnome-icon-theme/ChangeLog,v 1.195 2011/03/22 19:53:12 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gnome-icon-theme/ChangeLog,v 1.196 2011/03/23 05:08:19 nirbheek Exp $
+
+*gnome-icon-theme-2.91.92 (23 Mar 2011)
+
+  23 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
+  -gnome-icon-theme-2.91.6.ebuild, +gnome-icon-theme-2.91.92.ebuild:
+  Bump to 2.91.92, remove old
 
   22 Mar 2011; Brent Baude <ranger@gentoo.org>
   gnome-icon-theme-2.91.7.ebuild:
diff --git a/x11-themes/gnome-icon-theme/Manifest b/x11-themes/gnome-icon-theme/Manifest
index 3e6ad43232e7..1a424b4cc9bb 100644
--- a/x11-themes/gnome-icon-theme/Manifest
+++ b/x11-themes/gnome-icon-theme/Manifest
@@ -1,10 +1,10 @@
 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.6.tar.bz2 16016972 RMD160 ef3dc9b8bc172748f4141cfdcffe61ed3f2ed42d SHA1 452f61b8589d2970529d0ea41c4c215ca3bd4cdf SHA256 259fbe23e4d63e57c95cdb239e1f9117715bd7a5cc04e851f1c19a6f3160170a
 DIST gnome-icon-theme-2.91.7.tar.bz2 18258570 RMD160 17d8ac034c5ef5ecef163936c363c37e731d2c4d SHA1 231f8984bafd1c6aa81238eb93e981629a50b93e SHA256 cc8eddb8c751d1243bca2b444a226264fadeb79e3a642089d4632ac04ae3a93a
+DIST gnome-icon-theme-2.91.92.tar.bz2 18440244 RMD160 b42bf079b89944f60291ef023eeb4148220419c3 SHA1 18ab07de32eceda2de14259d46f123db7fa451d6 SHA256 c5c9eda41a976075f7d9bfa132dc2da3416a775cbd749ed2cb46b2450801c525
 DIST tango-gentoo-v1.1.tar.gz 29322 RMD160 c64d56b1b3e45f093c60eb6c0140b4297f4991c1 SHA1 0c119a4ede9c1ec42c8d7bb4a3a6a200fa8ca56f SHA256 518efa4257c8e689488399db23397a89f4dcd5990ce537ef6215860ad5606eb0
 EBUILD gnome-icon-theme-2.30.3.ebuild 962 RMD160 33eee2dfa1e10555ce7c7ac66a4049a05d33d397 SHA1 0d6a72f81c42d7d3e1b309c55d1bb23f56f030a1 SHA256 1ad1bb50df28f3ed1420fa11ca2c23e131a838eb1268d357cd76092b79906b28
-EBUILD gnome-icon-theme-2.91.6.ebuild 1629 RMD160 33c8e9d6709469932e244cde8de8877b6135e39e SHA1 a49769a9fe55aba778020fc285db54d329e04dde SHA256 c965ddd4698c25e5183922273e7a30e2355ab7e6f6d3f0c99dbc234f2195d785
 EBUILD gnome-icon-theme-2.91.7.ebuild 1692 RMD160 0837f99067ec981a1ec7124fa8e053369c8f6bdf SHA1 85609a9a64a1b2ddfd8415e602692fd6904805db SHA256 4c19d06b2e10ca34fadb6a46c39fdfa74546218ca63e391f5a5c9633ef34880a
-MISC ChangeLog 24682 RMD160 e769e1769298bc03677d9ff901c4d9b0f8bcd35f SHA1 a46c56a8b7278ff5169be96268bcf3bc57505a7a SHA256 0ef276fe62c115f130ad17ed12f73a77bbdf5126ac014da0adfc1808a9c73b86
+EBUILD gnome-icon-theme-2.91.92.ebuild 1704 RMD160 05258bf9e1b80db671b6f19286276f305a7ca579 SHA1 19640e194595535ca59cecec9feb8048a3d60b50 SHA256 5ed0f473d306092a161df7cc9a9b064a018e093b57e7398c8d07424f8134667e
+MISC ChangeLog 24879 RMD160 6b5d391b7c44a6e7d080ac14682ba1bb08ae0ed5 SHA1 38668b095ad256a607b60d0ef7323a28167765ec SHA256 571d85806e9229bb53310221ec43c521ef9647ad9e27005daa69bd27a90cc098
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
diff --git a/x11-themes/gnome-icon-theme/gnome-icon-theme-2.91.6.ebuild b/x11-themes/gnome-icon-theme/gnome-icon-theme-2.91.92.ebuild
index 4f09568bd286..52cc880b1b27 100644
--- a/x11-themes/gnome-icon-theme/gnome-icon-theme-2.91.6.ebuild
+++ b/x11-themes/gnome-icon-theme/gnome-icon-theme-2.91.92.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2011 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.6.ebuild,v 1.2 2011/02/21 21:14:24 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gnome-icon-theme/gnome-icon-theme-2.91.92.ebuild,v 1.1 2011/03/23 05:08:19 nirbheek Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
 
-inherit gnome2
+inherit gnome2 eutils autotools
 
-DESCRIPTION="GNOME 2 default icon themes"
+DESCRIPTION="GNOME default icon themes"
 HOMEPAGE="http://www.gnome.org/ http://people.freedesktop.org/~jimmac/icons/#git"
 
 SRC_URI="${SRC_URI}
@@ -36,6 +36,8 @@ pkg_setup() {
 }
 
 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 \
@@ -43,11 +45,9 @@ src_prepare() {
 			|| die "Copying gentoo logos failed"
 		done
 	fi
-}
 
-src_install() {
-	gnome2_src_install
-	# FIXME: 2.91.0 tries to install icon-theme.cache, recheck if still needed
-	# in future versions
-	rm -f "${ED}/usr/share/icons/gnome/icon-theme.cache" || die
+	# 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
 }