Do not install HighContrast* themes if not requested, bug #274515. Clean up old revision.

(Portage version: 2.2_rc33/cvs/Linux x86_64)

3 files changed, 16 insertions, 44 deletions

diff --git a/x11-themes/gnome-themes/ChangeLog b/x11-themes/gnome-themes/ChangeLog
index 8b367aa33f98..fea1c9b8acd5 100644
--- a/x11-themes/gnome-themes/ChangeLog
+++ b/x11-themes/gnome-themes/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-themes/gnome-themes
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gnome-themes/ChangeLog,v 1.212 2009/07/06 22:06:18 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gnome-themes/ChangeLog,v 1.213 2009/08/08 22:57:31 eva Exp $
+
+  08 Aug 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  -gnome-themes-2.26.2.ebuild, gnome-themes-2.26.3.1.ebuild:
+  Do not install HighContrast* themes if not requested, bug #274515. Clean
+  up old revision.
 
 *gnome-themes-2.26.3.1 (07 Jul 2009)
 
diff --git a/x11-themes/gnome-themes/gnome-themes-2.26.2.ebuild b/x11-themes/gnome-themes/gnome-themes-2.26.2.ebuild
deleted file mode 100644
index 3bcc55426b92..000000000000
--- a/x11-themes/gnome-themes/gnome-themes-2.26.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2009 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.26.2.ebuild,v 1.1 2009/05/18 20:40:36 eva Exp $
-
-GCONF_DEBUG="no"
-
-inherit eutils gnome2
-
-DESCRIPTION="A set of GNOME themes, with sets for users with limited or low vision"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="accessibility"
-
-RDEPEND=">=x11-libs/gtk+-2
-	 >=x11-themes/gtk-engines-2.15.3"
-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"
-
-# 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"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# Fix bashisms, bug #256337
-	epatch "${FILESDIR}/${PN}-2.24.3-bashism.patch"
-}
diff --git a/x11-themes/gnome-themes/gnome-themes-2.26.3.1.ebuild b/x11-themes/gnome-themes/gnome-themes-2.26.3.1.ebuild
index b197fe598679..68beb18fd15e 100644
--- a/x11-themes/gnome-themes/gnome-themes-2.26.3.1.ebuild
+++ b/x11-themes/gnome-themes/gnome-themes-2.26.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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.26.3.1.ebuild,v 1.1 2009/07/06 22:06:18 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gnome-themes/gnome-themes-2.26.3.1.ebuild,v 1.2 2009/08/08 22:57:31 eva Exp $
 
 GCONF_DEBUG="no"
 
@@ -39,4 +39,13 @@ src_unpack() {
 
 	# 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 failed"
+	fi
 }