adding !gtk2? check on gnome-panel dep as discussed to close bug #35060.

6 files changed, 19 insertions, 14 deletions

diff --git a/media-sound/xmms/ChangeLog b/media-sound/xmms/ChangeLog
index 58af94f80d8c..3b901c1667d5 100644
--- a/media-sound/xmms/ChangeLog
+++ b/media-sound/xmms/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/xmms
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/ChangeLog,v 1.94 2004/02/02 19:24:55 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/ChangeLog,v 1.95 2004/02/03 09:48:55 eradicator Exp $
+
+  03 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  xmms-1.2.7-r23.ebuild, xmms-1.2.7-r25.ebuild, xmms-1.2.8-r3.ebuild,
+  xmms-1.2.8-r4.ebuild:
+  adding !gtk2? check on gnome-panel dep as discussed to close bug #35060.
 
   02 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org> xmms-1.2.9-r1.ebuild:
   Cleanup to remove some gnome cruft and now using make DESTDIR=${D} install
diff --git a/media-sound/xmms/Manifest b/media-sound/xmms/Manifest
index 5ae9c48ba4e0..63059ac34f03 100644
--- a/media-sound/xmms/Manifest
+++ b/media-sound/xmms/Manifest
@@ -1,9 +1,9 @@
-MD5 c71268dd67b5e034324c1bd1d888a784 xmms-1.2.7-r23.ebuild 5450
-MD5 266e5522544a4c4693600c39c46e3707 xmms-1.2.7-r25.ebuild 5860
+MD5 8c56b782fa4b32819020fb0efb29b505 xmms-1.2.7-r23.ebuild 5462
+MD5 4dbcac0d6436d228957f928cb47eb47d xmms-1.2.7-r25.ebuild 5872
 MD5 6e132d7c2863547a42912815455bf387 xmms-1.2.9-r1.ebuild 5433
-MD5 db30834f3b768c46406c8330fdc18a48 xmms-1.2.8-r4.ebuild 5213
-MD5 08eab40a442303536ae0a88b0b847c3b ChangeLog 18890
-MD5 5c8b4d52a2da5ae758538b56bc384e37 xmms-1.2.8-r3.ebuild 4926
+MD5 f8de4c796cef601ed9cd0e27f50a3aec xmms-1.2.8-r4.ebuild 5224
+MD5 e8ab07020594bf3e3146e2e52705f296 ChangeLog 19117
+MD5 ee1d2f037bde868169064b3d14ca2b3a xmms-1.2.8-r3.ebuild 4938
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 MD5 20b60b9c94a35974970dafd0bbd050c4 files/digest-xmms-1.2.7-r23 211
 MD5 20b60b9c94a35974970dafd0bbd050c4 files/digest-xmms-1.2.7-r25 211
diff --git a/media-sound/xmms/xmms-1.2.7-r23.ebuild b/media-sound/xmms/xmms-1.2.7-r23.ebuild
index d2d058953e75..f14ca37478d1 100644
--- a/media-sound/xmms/xmms-1.2.7-r23.ebuild
+++ b/media-sound/xmms/xmms-1.2.7-r23.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/xmms-1.2.7-r23.ebuild,v 1.14 2004/01/30 08:10:05 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/xmms-1.2.7-r23.ebuild,v 1.15 2004/02/03 09:48:55 eradicator Exp $
 
 inherit libtool flag-o-matic eutils
 filter-flags -fforce-addr -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
@@ -22,7 +22,7 @@ DEPEND="=x11-libs/gtk+-1.2*
 	mikmod? ( >=media-libs/libmikmod-3.1.6 )
 	esd? ( >=media-sound/esound-0.2.22 )
 	xml? ( >=dev-libs/libxml-1.8.15 )
-	gnome? ( <gnome-base/gnome-panel-1.5.0 )
+	!gtk2? ( gnome? ( <gnome-base/gnome-panel-1.5.0 ) )
 	opengl? ( virtual/opengl )
 	oggvorbis? ( >=media-libs/libvorbis-1.0_beta4 )"
 
diff --git a/media-sound/xmms/xmms-1.2.7-r25.ebuild b/media-sound/xmms/xmms-1.2.7-r25.ebuild
index 5377c2ccfef9..f4c8dba26141 100644
--- a/media-sound/xmms/xmms-1.2.7-r25.ebuild
+++ b/media-sound/xmms/xmms-1.2.7-r25.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/xmms-1.2.7-r25.ebuild,v 1.10 2004/01/30 08:10:05 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/xmms-1.2.7-r25.ebuild,v 1.11 2004/02/03 09:48:55 eradicator Exp $
 
 IUSE="xml nls esd gnome opengl mmx oggvorbis 3dnow mikmod directfb ipv6 cjk"
 
@@ -23,7 +23,7 @@ DEPEND="=x11-libs/gtk+-1.2*
 	mikmod? ( >=media-libs/libmikmod-3.1.6 )
 	esd? ( >=media-sound/esound-0.2.22 )
 	xml? ( >=dev-libs/libxml-1.8.15 )
-	gnome? ( <gnome-base/gnome-panel-1.5.0 )
+	!gtk2? ( gnome? ( <gnome-base/gnome-panel-1.5.0 ) )
 	opengl? ( virtual/opengl )
 	oggvorbis? ( >=media-libs/libvorbis-1.0_beta4 )"
 
diff --git a/media-sound/xmms/xmms-1.2.8-r3.ebuild b/media-sound/xmms/xmms-1.2.8-r3.ebuild
index 94dd9bf407cc..6ba841fdcd56 100644
--- a/media-sound/xmms/xmms-1.2.8-r3.ebuild
+++ b/media-sound/xmms/xmms-1.2.8-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/xmms-1.2.8-r3.ebuild,v 1.11 2004/01/30 08:10:05 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/xmms-1.2.8-r3.ebuild,v 1.12 2004/02/03 09:48:55 eradicator Exp $
 
 IUSE="xml nls esd gnome opengl mmx oggvorbis 3dnow mikmod directfb ipv6 cjk"
 
@@ -23,7 +23,7 @@ DEPEND="=x11-libs/gtk+-1.2*
 	mikmod? ( >=media-libs/libmikmod-3.1.10 )
 	esd? ( >=media-sound/esound-0.2.22 )
 	xml? ( >=dev-libs/libxml-1.8.15 )
-	gnome? ( <gnome-base/gnome-panel-1.5.0 )
+	!gtk2? ( gnome? ( <gnome-base/gnome-panel-1.5.0 ) )
 	opengl? ( virtual/opengl )
 	oggvorbis? ( >=media-libs/libvorbis-1.0 )"
 
diff --git a/media-sound/xmms/xmms-1.2.8-r4.ebuild b/media-sound/xmms/xmms-1.2.8-r4.ebuild
index 875268eb5e38..60eb424a0090 100644
--- a/media-sound/xmms/xmms-1.2.8-r4.ebuild
+++ b/media-sound/xmms/xmms-1.2.8-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/xmms-1.2.8-r4.ebuild,v 1.1 2004/01/30 20:46:28 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/xmms-1.2.8-r4.ebuild,v 1.2 2004/02/03 09:48:55 eradicator Exp $
 
 IUSE="xml nls esd gnome opengl mmx oggvorbis 3dnow mikmod directfb ipv6 cjk"
 
@@ -23,7 +23,7 @@ DEPEND="=x11-libs/gtk+-1.2*
 	mikmod? ( >=media-libs/libmikmod-3.1.10 )
 	esd? ( >=media-sound/esound-0.2.22 )
 	xml? ( >=dev-libs/libxml-1.8.15 )
-	gnome? ( <gnome-base/gnome-panel-1.5.0 )
+	!gtk2? ( gnome? ( <gnome-base/gnome-panel-1.5.0 ) )
 	opengl? ( virtual/opengl )
 	oggvorbis? ( >=media-libs/libvorbis-1.0 )"