Revision bump to drop themes colliding with x11-themes/gnome-themes-standard, remove old.

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

3 files changed, 33 insertions, 22 deletions

diff --git a/x11-themes/gnome-themes/ChangeLog b/x11-themes/gnome-themes/ChangeLog
index d7200b1dab84..118a600056fc 100644
--- a/x11-themes/gnome-themes/ChangeLog
+++ b/x11-themes/gnome-themes/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-themes/gnome-themes
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gnome-themes/ChangeLog,v 1.247 2011/03/22 19:53:43 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gnome-themes/ChangeLog,v 1.248 2011/07/07 13:47:47 pacho Exp $
+
+*gnome-themes-2.32.1-r1 (07 Jul 2011)
+
+  07 Jul 2011; Pacho Ramos <pacho@gentoo.org> -gnome-themes-2.30.2.ebuild,
+  +gnome-themes-2.32.1-r1.ebuild:
+  Revision bump to drop themes colliding with x11-themes/gnome-themes-standard,
+  remove old.
 
   22 Mar 2011; Brent Baude <ranger@gentoo.org> gnome-themes-2.32.1.ebuild:
   Marking gnome-themes-2.32.1 ppc stable for bug 353436
diff --git a/x11-themes/gnome-themes/Manifest b/x11-themes/gnome-themes/Manifest
index 43477be303cd..3271c40995d3 100644
--- a/x11-themes/gnome-themes/Manifest
+++ b/x11-themes/gnome-themes/Manifest
@@ -1,7 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gnome-themes-2.24.3-bashism.patch 524 RMD160 bdbeb167d71dbaa242dd12a5bae979602d2dbe04 SHA1 cb26e34e085cb6b135a58cf9241308990c40aa4b SHA256 f94fbd406d38ad0878c01f8cbe75573ae21545e42b67b2c51f4248e2cf714b28
-DIST gnome-themes-2.30.2.tar.bz2 1643197 RMD160 dfa2cb96befff4f160507d7b0805abfcc71bbecf SHA1 701343961956ded719d9ac7c6ff22a9b7603bad4 SHA256 b7efbeb429ad19003cc26c468597cef42f5b5570d819af51828efbaa441682d5
 DIST gnome-themes-2.32.1.tar.bz2 2683723 RMD160 f6fc96686e6076995f0c2a5b25c655e513435941 SHA1 0af9ac28c7b1f7fdd543b3629d9b4711c7412195 SHA256 8601ee24c2e096593221cbd6ebdb6686042225a03c02a01c0d67c163f9febd1a
-EBUILD gnome-themes-2.30.2.ebuild 1614 RMD160 f60fe9fd85f607f1e34decd5d3de6e38e5fed4bb SHA1 8ecc32cd3e9dd79e1e16ce58605daaf8ef19fc4c SHA256 76005c69a6da7f25e76bf51dcfc83fac670184031030ec9e0a9705e57c477e91
+EBUILD gnome-themes-2.32.1-r1.ebuild 1589 RMD160 d3ffae9c151792fc5ce9cbbbe4eb3938e972a238 SHA1 c8dd782caa323c66e48e2ea7a6337bb372758fd8 SHA256 ddd2952a256077a676107ead160e921b5cdfc18e4fc9e5845db51ec96c11e46c
 EBUILD gnome-themes-2.32.1.ebuild 1675 RMD160 ceb1887c304990320b7952e3fd9c9e97db1c066e SHA1 95abb802959525cdfc6b6a95a5f882ad0f5b3b86 SHA256 80a6a02f8aa575859730c342ddf129c332d99a8acefe4734cf86e1ee9bcb2fad
-MISC ChangeLog 31040 RMD160 eef8817411c99b5ca9adec04b7e52f176862ae8b SHA1 8791ab95b54bf18d6d2c3e534ec717fcc3fffb15 SHA256 55325a9ca4d76673f4dec4b86e523087c3d885011c74ce7a35e3b36af53dd4c6
+MISC ChangeLog 31282 RMD160 e3e2e5a019ca9a82a85b43c1053c63a4851c4fc0 SHA1 bc9ddac53c1e01e5ba57a6a5b0f8c32afa48dd96 SHA256 d93bccc62bd6add9f3c868c0e860dfe8a8b0a75667f02a641e8ed9e5a056cd6c
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk4VuQgACgkQCaWpQKGI+9RMRgCeLM3PUn27qMk2GgOyyds2gDuA
+JBIAnR4tlUnNs0T9/zakL6N6lS9qoVT2
+=hVUp
+-----END PGP SIGNATURE-----
diff --git a/x11-themes/gnome-themes/gnome-themes-2.30.2.ebuild b/x11-themes/gnome-themes/gnome-themes-2.32.1-r1.ebuild
index 5f8f7ff9f5c9..9e6dd867bbd5 100644
--- a/x11-themes/gnome-themes/gnome-themes-2.30.2.ebuild
+++ b/x11-themes/gnome-themes/gnome-themes-2.32.1-r1.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gnome-themes/gnome-themes-2.30.2.ebuild,v 1.10 2011/03/22 07:20:57 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gnome-themes/gnome-themes-2.32.1-r1.ebuild,v 1.1 2011/07/07 13:47:47 pacho Exp $
 
-EAPI="2"
+EAPI="4"
 GCONF_DEBUG="no"
+GNOME_TARBALL_SUFFIX="bz2"
 
 inherit eutils gnome2
 
@@ -12,27 +13,26 @@ HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE="accessibility"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE=""
 
 RDEPEND=">=x11-libs/gtk+-2:2
 	>=x11-themes/gtk-engines-2.15.3:2"
 DEPEND="${RDEPEND}
 	>=x11-misc/icon-naming-utils-0.8.7
 	>=dev-util/pkgconfig-0.19
-	>=dev-util/intltool-0.35"
-# dev-perl/XML-LibXML is bug 266136
-
-DOCS="AUTHORS ChangeLog NEWS README"
+	>=dev-util/intltool-0.35
+	sys-devel/gettext"
+# For problems related with dev-perl/XML-LibXML please see bug 266136
 
 # This ebuild does not install any binaries
 RESTRICT="binchecks strip"
 
 pkg_setup() {
 	G2CONF="${G2CONF}
-		$(use_enable accessibility all-themes)
 		--disable-test-themes
 		--enable-icon-mapping"
+	DOCS="AUTHORS ChangeLog NEWS README"
 }
 
 src_prepare() {
@@ -41,16 +41,11 @@ src_prepare() {
 	# Fix bashisms, bug #256337
 	epatch "${FILESDIR}/${PN}-2.24.3-bashism.patch"
 
-	# Do not build/install accessibility themes, bug #274515
-	if ! use accessibility; then
-		sed 's:HighContrast.*\\:\\:g' -i \
-			desktop-themes/Makefile.am desktop-themes/Makefile.in \
-			gtk-themes/Makefile.am gtk-themes/Makefile.in \
-			icon-themes/Makefile.am icon-themes/Makefile.in \
-			|| die "sed 1 failed"
-	fi
+	# Remove themes now provided by x11-themes/gnome-themes-standard
+	sed 's:HighContrast.*\\:\\:g' -i $(find . -name Makefile.am -o -name Makefile.in) || die
+	sed 's:LowContrast.*\\:\\:g' -i $(find . -name Makefile.am -o -name Makefile.in) || die
 
 	# Fix intltoolize broken file, see upstream #577133
 	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \
-		|| die "sed 2 failed"
+		|| die "intltool rules fix failed"
 }