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

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 21 insertions, 51 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/Manifest b/x11-themes/gnome-themes/Manifest
index d25d053ef264..a537f35e08ae 100644
--- a/x11-themes/gnome-themes/Manifest
+++ b/x11-themes/gnome-themes/Manifest
@@ -3,17 +3,15 @@ Hash: SHA1
 
 AUX gnome-themes-2.24.3-bashism.patch 524 RMD160 bdbeb167d71dbaa242dd12a5bae979602d2dbe04 SHA1 cb26e34e085cb6b135a58cf9241308990c40aa4b SHA256 f94fbd406d38ad0878c01f8cbe75573ae21545e42b67b2c51f4248e2cf714b28
 DIST gnome-themes-2.24.3.tar.bz2 1505357 RMD160 26aac887bf42f938eba0fa3f8569dfd2af6d01eb SHA1 d6e53ccf9b767cf8352ff7876a98424a44a009a5 SHA256 8f13e281a2b4363a980de2edbf16cd1ce0c895f84496f00758c29e00c929bf97
-DIST gnome-themes-2.26.2.tar.bz2 1603539 RMD160 d259c7664bf6f4c55dd1abf1f9e76cd617fc2dab SHA1 4b548309069f9d3b62e8f63e590a40d77b285d02 SHA256 423dfc65ab4988f946077483359fdff05b481eca03c01fccdad7c21911ed93f4
 DIST gnome-themes-2.26.3.1.tar.bz2 1582870 RMD160 53176af0dfbf9534fa8337f1d4fe0f2b1ec31998 SHA1 3696948ee025479869a2dd570603a2adc235d8f9 SHA256 cdf1720bf8c9c9682ed65bfd61587065e11f63f69d5e827ff7a8c49bb40cf9b7
 EBUILD gnome-themes-2.24.3.ebuild 1017 RMD160 e5a83af51d5fab1917be1f375cd694d31253c1f9 SHA1 0518b83033129875ee76cf7ac8e0e84c65d54b92 SHA256 4cbf8c9671282fab38dcf4397a5b55400e13bd34de9089359fb4c7b2dbca2d65
-EBUILD gnome-themes-2.26.2.ebuild 1084 RMD160 9dd5c4667e34a19e13a079468e14eb89ccaacbb8 SHA1 54c092c7403c9a4e2a9679410b70cbd4dc921833 SHA256 4688cb43817bb8950e85fdd3e2763b94cab47a54f49579ffd1e69db1399834c1
-EBUILD gnome-themes-2.26.3.1.ebuild 1086 RMD160 0585e251325d0ea4cb48485d925788e09c9f78c0 SHA1 6ca39f1f6cb362a8224158bcdac7b3e84036b55e SHA256 4f3156a45894e2af7a00739c4b63f4a96c5021ac7a4455233d1722def6794990
-MISC ChangeLog 26376 RMD160 2d6f2431bf65fea41e3345a8c7740a08a3c8a0a0 SHA1 4b3998291af7037352b971d8f819f12f85d10690 SHA256 bb0319438f74e1929f5ecad68c69bbaf57cd1ad47287e9b1eeeba67ff29f441f
+EBUILD gnome-themes-2.26.3.1.ebuild 1402 RMD160 b3cf33db591766fa5fdddf66a6b9d20255f7c8c0 SHA1 da57f302c4237bbddb3ff1361be95e85cf154a92 SHA256 117754d6f1de7490410f5714af77d9f4b492b9cb6f222cf21fc0657e6cacc368
+MISC ChangeLog 26586 RMD160 1c2fa19aec82218bdb8cb50c7a3bc4a49620b0d5 SHA1 f6fc8619617e54f61ab9a0214a11b79f3be9b17d SHA256 587335c0042bdd5d8f7b06de21b0f06d1df069df2f80a1261d8ad89eb2383f2b
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkpSkYEACgkQ1fmVwcYIWAbKWgCgoItoHf6V6u5fv9R0ai4VSy0I
-XvAAoNT1YAi/qA59LE81cNvmaAtlkPZn
-=OqYH
+iEYEARECAAYFAkp+AuAACgkQ1fmVwcYIWAah7wCgsY+LuHdB9jnRJPOE+kG3A7Hs
+5eUAni+jasYzmCnIRLWSTWaLG2iVmXYt
+=qFji
 -----END PGP SIGNATURE-----
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
 }