Block the new package alsa-plugins as that includes jack plugin, too.

(Portage version: 2.1_pre9-r4)

6 files changed, 23 insertions, 13 deletions

diff --git a/media-plugins/alsa-jack/ChangeLog b/media-plugins/alsa-jack/ChangeLog
index 595bfd3e4bcd..6ad355664caa 100644
--- a/media-plugins/alsa-jack/ChangeLog
+++ b/media-plugins/alsa-jack/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-plugins/alsa-jack
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/alsa-jack/ChangeLog,v 1.51 2006/04/11 19:39:48 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/alsa-jack/ChangeLog,v 1.52 2006/04/24 10:01:29 flameeyes Exp $
+
+  24 Apr 2006; Diego Pettenò <flameeyes@gentoo.org> alsa-jack-1.0.8.ebuild,
+  alsa-jack-1.0.9.ebuild, alsa-jack-1.0.10_rc1.ebuild,
+  alsa-jack-1.0.11_rc4.ebuild, alsa-jack-1.0.11_rc5.ebuild:
+  Block the new package alsa-plugins as that includes jack plugin, too.
 
 *alsa-jack-1.0.11_rc5 (11 Apr 2006)
 
diff --git a/media-plugins/alsa-jack/alsa-jack-1.0.10_rc1.ebuild b/media-plugins/alsa-jack/alsa-jack-1.0.10_rc1.ebuild
index d81f3554c0eb..fd688a542198 100644
--- a/media-plugins/alsa-jack/alsa-jack-1.0.10_rc1.ebuild
+++ b/media-plugins/alsa-jack/alsa-jack-1.0.10_rc1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/alsa-jack/alsa-jack-1.0.10_rc1.ebuild,v 1.10 2006/01/16 09:30:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/alsa-jack/alsa-jack-1.0.10_rc1.ebuild,v 1.11 2006/04/24 10:01:29 flameeyes Exp $
 
 inherit libtool
 
@@ -16,7 +16,8 @@ KEYWORDS="~alpha amd64 arm ppc ppc64 sh ~sparc x86"
 IUSE=""
 
 DEPEND=">=media-libs/alsa-lib-${PV}
-	media-sound/jack-audio-connection-kit"
+	media-sound/jack-audio-connection-kit
+	!media-plugins/alsa-plugins"
 
 S=${WORKDIR}/alsa-plugins-${MY_PV}
 
diff --git a/media-plugins/alsa-jack/alsa-jack-1.0.11_rc4.ebuild b/media-plugins/alsa-jack/alsa-jack-1.0.11_rc4.ebuild
index b927b570bd88..d08db2aded86 100644
--- a/media-plugins/alsa-jack/alsa-jack-1.0.11_rc4.ebuild
+++ b/media-plugins/alsa-jack/alsa-jack-1.0.11_rc4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/alsa-jack/alsa-jack-1.0.11_rc4.ebuild,v 1.1 2006/03/24 13:55:45 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/alsa-jack/alsa-jack-1.0.11_rc4.ebuild,v 1.2 2006/04/24 10:01:29 flameeyes Exp $
 
 inherit libtool
 
@@ -16,7 +16,8 @@ KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sh ~sparc ~x86"
 IUSE=""
 
 DEPEND=">=media-libs/alsa-lib-${PV}
-	media-sound/jack-audio-connection-kit"
+	media-sound/jack-audio-connection-kit
+	!media-plugins/alsa-plugins"
 
 S=${WORKDIR}/alsa-plugins-${MY_PV}
 
diff --git a/media-plugins/alsa-jack/alsa-jack-1.0.11_rc5.ebuild b/media-plugins/alsa-jack/alsa-jack-1.0.11_rc5.ebuild
index de4056322b24..0c8ef524443d 100644
--- a/media-plugins/alsa-jack/alsa-jack-1.0.11_rc5.ebuild
+++ b/media-plugins/alsa-jack/alsa-jack-1.0.11_rc5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/alsa-jack/alsa-jack-1.0.11_rc5.ebuild,v 1.1 2006/04/11 19:39:48 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/alsa-jack/alsa-jack-1.0.11_rc5.ebuild,v 1.2 2006/04/24 10:01:29 flameeyes Exp $
 
 inherit libtool
 
@@ -16,7 +16,8 @@ KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sh ~sparc ~x86"
 IUSE=""
 
 DEPEND=">=media-libs/alsa-lib-${PV}
-	media-sound/jack-audio-connection-kit"
+	media-sound/jack-audio-connection-kit
+	!media-plugins/alsa-plugins"
 
 S=${WORKDIR}/alsa-plugins-${MY_PV}
 
diff --git a/media-plugins/alsa-jack/alsa-jack-1.0.8.ebuild b/media-plugins/alsa-jack/alsa-jack-1.0.8.ebuild
index f148a286cce1..38dca801ec78 100644
--- a/media-plugins/alsa-jack/alsa-jack-1.0.8.ebuild
+++ b/media-plugins/alsa-jack/alsa-jack-1.0.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/alsa-jack/alsa-jack-1.0.8.ebuild,v 1.5 2005/12/14 15:35:24 fvdpol Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/alsa-jack/alsa-jack-1.0.8.ebuild,v 1.6 2006/04/24 10:01:29 flameeyes Exp $
 
 IUSE=""
 
@@ -18,7 +18,8 @@ KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
 LICENSE="GPL-2 LGPL-2.1"
 
 DEPEND="~media-libs/alsa-lib-${PV}
-	media-sound/jack-audio-connection-kit"
+	media-sound/jack-audio-connection-kit
+	!media-plugins/alsa-plugins"
 
 src_compile() {
 	elibtoolize
diff --git a/media-plugins/alsa-jack/alsa-jack-1.0.9.ebuild b/media-plugins/alsa-jack/alsa-jack-1.0.9.ebuild
index 53b5d6ed0907..74f7a61eeef3 100644
--- a/media-plugins/alsa-jack/alsa-jack-1.0.9.ebuild
+++ b/media-plugins/alsa-jack/alsa-jack-1.0.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/alsa-jack/alsa-jack-1.0.9.ebuild,v 1.7 2005/12/14 15:35:24 fvdpol Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/alsa-jack/alsa-jack-1.0.9.ebuild,v 1.8 2006/04/24 10:01:29 flameeyes Exp $
 
 inherit libtool
 
@@ -14,7 +14,8 @@ KEYWORDS="~alpha amd64 ppc ppc64 -sparc x86"
 IUSE=""
 
 DEPEND="~media-libs/alsa-lib-${PV}
-	media-sound/jack-audio-connection-kit"
+	media-sound/jack-audio-connection-kit
+	!media-plugins/alsa-plugins"
 
 S=${WORKDIR}/alsa-plugins-${PV}