Compile the gtk1 theme as in previous versions (#87966).

Package-Manager: portage-2.0.51.19

4 files changed, 15 insertions, 10 deletions

diff --git a/x11-themes/redhat-artwork/ChangeLog b/x11-themes/redhat-artwork/ChangeLog
index 6e2eb5e61ad6..11b2863eed04 100644
--- a/x11-themes/redhat-artwork/ChangeLog
+++ b/x11-themes/redhat-artwork/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-themes/redhat-artwork
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/redhat-artwork/ChangeLog,v 1.53 2005/04/05 07:42:09 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/redhat-artwork/ChangeLog,v 1.54 2005/04/06 13:48:57 greg_g Exp $
+
+*redhat-artwork-0.122.1-r1 (06 Apr 2005)
+
+  06 Apr 2005; Gregorio Guidi <greg_g@gentoo.org>
+  -redhat-artwork-0.122.1.ebuild, +redhat-artwork-0.122.1-r1.ebuild:
+  Compile the gtk1 theme as in previous versions (#87966).
 
   05 Apr 2005; Bryan Østergaard <kloeri@gentoo.org>
   redhat-artwork-0.96.ebuild:
diff --git a/x11-themes/redhat-artwork/Manifest b/x11-themes/redhat-artwork/Manifest
index d65381c1addb..569f4bb55908 100644
--- a/x11-themes/redhat-artwork/Manifest
+++ b/x11-themes/redhat-artwork/Manifest
@@ -1,10 +1,10 @@
 MD5 8f906ffe0aa837e5e26fe03af3043461 metadata.xml 219
+MD5 ad1827b0e848554ead201f32e0562213 redhat-artwork-0.122.1-r1.ebuild 3956
 MD5 87b97fb2990fb4914257c0625a68767f redhat-artwork-0.96.ebuild 5324
-MD5 37e4d278167b6acfac54f4ff95fd233b redhat-artwork-0.122.1.ebuild 4031
 MD5 847feb9f261cf173e0e45c7fa681401d redhat-artwork-0.120.1.2.ebuild 5007
-MD5 c724dd09229df12374ff43438588bae1 ChangeLog 7989
+MD5 9ceb2c83e54dcd5ca94880061c8c6c52 ChangeLog 8210
 MD5 78e7b042fa08cfb372e656b3b2cb3831 redhat-artwork-0.95.ebuild 5169
-MD5 5d907e18affa414570d39790d791b072 files/digest-redhat-artwork-0.122.1 76
 MD5 17e6ab0b628ed039eb471b3dba20157a files/digest-redhat-artwork-0.95 75
 MD5 bd1e13df0214635279d65b8c6c245759 files/digest-redhat-artwork-0.96 75
+MD5 5d907e18affa414570d39790d791b072 files/digest-redhat-artwork-0.122.1-r1 76
 MD5 85bf44a0b4be21be168fb786434bc5aa files/digest-redhat-artwork-0.120.1.2 78
diff --git a/x11-themes/redhat-artwork/files/digest-redhat-artwork-0.122.1 b/x11-themes/redhat-artwork/files/digest-redhat-artwork-0.122.1-r1
index b8a1348b4fc5..b8a1348b4fc5 100644
--- a/x11-themes/redhat-artwork/files/digest-redhat-artwork-0.122.1
+++ b/x11-themes/redhat-artwork/files/digest-redhat-artwork-0.122.1-r1
diff --git a/x11-themes/redhat-artwork/redhat-artwork-0.122.1.ebuild b/x11-themes/redhat-artwork/redhat-artwork-0.122.1-r1.ebuild
index f535b014ed13..ee3d86a34185 100644
--- a/x11-themes/redhat-artwork/redhat-artwork-0.122.1.ebuild
+++ b/x11-themes/redhat-artwork/redhat-artwork-0.122.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/redhat-artwork/redhat-artwork-0.122.1.ebuild,v 1.1 2005/04/04 16:07:14 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/redhat-artwork/redhat-artwork-0.122.1-r1.ebuild,v 1.1 2005/04/06 13:48:57 greg_g Exp $
 
 inherit eutils rpm versionator kde-functions
 
@@ -12,11 +12,11 @@ LICENSE="GPL-2"
 
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~alpha ~sparc ~amd64"
-IUSE="gtk gtk2 kde xmms"
+IUSE="gtk kde xmms"
 
 RDEPEND=">=x11-libs/gtk+-2.0
-	gtk? ( !gtk2? ( >=media-libs/gdk-pixbuf-0.2.5
-			=x11-libs/gtk+-1.2* ) )
+	gtk? ( >=media-libs/gdk-pixbuf-0.2.5
+	       =x11-libs/gtk+-1.2* )
 	kde? ( || ( ( kde-base/kcontrol kde-base/kwin )
 	            kde-base/kdebase ) )"
 
@@ -62,8 +62,7 @@ src_compile() {
 			art/Makefile.am
 	fi
 
-	# enable gtk 1.x support only if gtk2 flag is not set
-	if ! use gtk || use gtk2; then
+	if ! use gtk; then
 		sed -i -e "s|AM_PATH_GTK(1.2.9, ,||" \
 		       -e "s|AC_MSG_ERROR(.*GTK+-1.*||" \
 		       -e "s|AC_CHECK_LIB(gtk, gtk_style_set_prop_experimental, :,||" \