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

(Portage version: 2.1.10.3/cvs/Linux x86_64)

2 files changed, 21 insertions, 19 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/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"
 }