Added blocker !media-plugins/xmms-alsa

6 files changed, 18 insertions, 10 deletions

diff --git a/media-sound/xmms/ChangeLog b/media-sound/xmms/ChangeLog
index d313e1dc629b..e2e18ed71ae9 100644
--- a/media-sound/xmms/ChangeLog
+++ b/media-sound/xmms/ChangeLog
@@ -1,6 +1,10 @@
 # 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.102 2004/02/24 11:35:02 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/ChangeLog,v 1.103 2004/02/24 22:35:23 eradicator Exp $
+
+  24 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org> xmms-1.2.8-r3.ebuild,
+  xmms-1.2.8-r4.ebuild, xmms-1.2.9-r1.ebuild, xmms-1.2.9-r2.ebuild:
+  Added blocker !media-plugins/xmms-alsa
 
   24 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org> xmms-1.2.8-r3.ebuild,
   xmms-1.2.8-r4.ebuild, xmms-1.2.9-r1.ebuild, xmms-1.2.9-r2.ebuild:
diff --git a/media-sound/xmms/Manifest b/media-sound/xmms/Manifest
index 30b519d63bb6..970a07226e32 100644
--- a/media-sound/xmms/Manifest
+++ b/media-sound/xmms/Manifest
@@ -1,10 +1,10 @@
-MD5 aa5b4f4a88dc6ba18e82521701ebdc56 xmms-1.2.9-r2.ebuild 5652
+MD5 707d16e12f5843f367f4fa9f2fbd0b6d xmms-1.2.9-r2.ebuild 5678
 MD5 1f3e56e1bd01d70a23efdb5efbd31638 xmms-1.2.7-r23.ebuild 5486
 MD5 4aa851cff9269f70c7f2384a817a7484 xmms-1.2.7-r25.ebuild 5890
-MD5 d21738e858b883d91305bb5892686b21 xmms-1.2.9-r1.ebuild 5506
-MD5 4bd7d68c31170c83b6788766c90a8cd6 xmms-1.2.8-r4.ebuild 5279
-MD5 60d7cc0595030447956a9363bba448e7 ChangeLog 20523
-MD5 4708b524b646d1a1b46c8e6c15fce7c6 xmms-1.2.8-r3.ebuild 4994
+MD5 c49098100b13dff83d4fd2af0272cf46 xmms-1.2.9-r1.ebuild 5532
+MD5 d7772576120eb8ec28a30034f7983f85 xmms-1.2.8-r4.ebuild 5305
+MD5 2725cc7d723e067b8665caac8f793236 ChangeLog 20712
+MD5 98dd8e955eff0652fc6e0113059e2d12 xmms-1.2.8-r3.ebuild 5020
 MD5 5a8290e44006ccff0dff3094555d6366 metadata.xml 257
 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.8-r3.ebuild b/media-sound/xmms/xmms-1.2.8-r3.ebuild
index 9da28141301c..706d65878ba6 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.17 2004/02/24 11:35:02 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/xmms-1.2.8-r3.ebuild,v 1.18 2004/02/24 22:35:23 eradicator Exp $
 
 IUSE="xml nls esd gnome opengl mmx oggvorbis 3dnow mikmod directfb ipv6 cjk gtk2"
 
@@ -26,6 +26,7 @@ DEPEND="=x11-libs/gtk+-1.2*
 	!gtk2? ( gnome? ( <gnome-base/gnome-panel-1.5.0 ) )
 	opengl? ( virtual/opengl )
 	alsa? ( >=media-libs/alsa-lib-0.9.0 )
+	!media-plugins/xmms-alsa
 	oggvorbis? ( >=media-libs/libvorbis-1.0 )"
 
 RDEPEND="${DEPEND}
diff --git a/media-sound/xmms/xmms-1.2.8-r4.ebuild b/media-sound/xmms/xmms-1.2.8-r4.ebuild
index 01b5932bd7c1..f8f34aeb3c34 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.8 2004/02/24 11:35:02 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/xmms-1.2.8-r4.ebuild,v 1.9 2004/02/24 22:35:23 eradicator Exp $
 
 IUSE="xml nls esd gnome opengl mmx oggvorbis 3dnow mikmod directfb ipv6 cjk gtk2"
 
@@ -26,6 +26,7 @@ DEPEND="=x11-libs/gtk+-1.2*
 	!gtk2? ( gnome? ( <gnome-base/gnome-panel-1.5.0 ) )
 	opengl? ( virtual/opengl )
 	alsa? ( >=media-libs/alsa-lib-0.9.0 )
+	!media-plugins/xmms-alsa
 	oggvorbis? ( >=media-libs/libvorbis-1.0 )"
 
 RDEPEND="${DEPEND}
diff --git a/media-sound/xmms/xmms-1.2.9-r1.ebuild b/media-sound/xmms/xmms-1.2.9-r1.ebuild
index 76596b83ee60..85fb80942e75 100644
--- a/media-sound/xmms/xmms-1.2.9-r1.ebuild
+++ b/media-sound/xmms/xmms-1.2.9-r1.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.9-r1.ebuild,v 1.8 2004/02/24 11:35:02 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/xmms-1.2.9-r1.ebuild,v 1.9 2004/02/24 22:35:23 eradicator Exp $
 
 inherit flag-o-matic eutils
 
@@ -26,6 +26,7 @@ DEPEND="=x11-libs/gtk+-1.2*
 	xml? ( >=dev-libs/libxml-1.8.15 )
 	opengl? ( virtual/opengl )
 	alsa? ( >=media-libs/alsa-lib-0.9.0 )
+	!media-plugins/xmms-alsa
 	oggvorbis? ( >=media-libs/libvorbis-1.0 )"
 
 RDEPEND="${DEPEND}
diff --git a/media-sound/xmms/xmms-1.2.9-r2.ebuild b/media-sound/xmms/xmms-1.2.9-r2.ebuild
index 30678429f607..762cd687623b 100644
--- a/media-sound/xmms/xmms-1.2.9-r2.ebuild
+++ b/media-sound/xmms/xmms-1.2.9-r2.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.9-r2.ebuild,v 1.5 2004/02/24 11:35:02 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/xmms-1.2.9-r2.ebuild,v 1.6 2004/02/24 22:35:23 eradicator Exp $
 
 inherit flag-o-matic eutils
 
@@ -26,6 +26,7 @@ DEPEND="=x11-libs/gtk+-1.2*
 	xml? ( >=dev-libs/libxml-1.8.15 )
 	opengl? ( virtual/opengl )
 	alsa? ( >=media-libs/alsa-lib-0.9.0 )
+	!media-plugins/xmms-alsa
 	oggvorbis? ( >=media-libs/libvorbis-1.0 )"
 
 RDEPEND="${DEPEND}