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

Package-Manager: portage-2.1_pre9-r4

7 files changed, 62 insertions, 38 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/Manifest b/media-plugins/alsa-jack/Manifest
index 25f248f2d82e..96dc5a8b4c7e 100644
--- a/media-plugins/alsa-jack/Manifest
+++ b/media-plugins/alsa-jack/Manifest
@@ -1,27 +1,44 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 a0c8a22fcf3bdf91d5217824cb455a27 ChangeLog 6763
-RMD160 7a0bb1fd669a98c755ec206c9fd222939b6f9a22 ChangeLog 6763
-SHA256 9947a3665423aa873d9d072228dd90b10bd2b0f362ec923c58a4c3a9df33d764 ChangeLog 6763
+DIST alsa-lib-1.0.8.tar.bz2 682438 size 682438
+DIST alsa-plugins-1.0.10.tar.bz2 194840 size 194840
+DIST alsa-plugins-1.0.10rc1.tar.bz2 194990 size 194990
+DIST alsa-plugins-1.0.11rc4.tar.bz2 215650 RMD160 15207571379077be07c21533a929faba47f6db09 SHA256 d0c3e6c854c3fc2cf1a35f5e5d57b89aa255ac040d47aafd131dda5965aa4779 size 215650
+DIST alsa-plugins-1.0.11rc5.tar.bz2 236388 RMD160 9b4fbc8eac2abaa4ef4eae9df79e07062bf60028 SHA256 e7f2c9d8608f408b13e6032a977c71326b20f6843d8bb0e1530da23af2e9db54 size 236388
+DIST alsa-plugins-1.0.9.tar.bz2 191290 size 191290
+EBUILD alsa-jack-1.0.10.ebuild 973 RMD160 fca1fe497bad9ea9fcfb58eeff31dd2dbf156c6b SHA1 402d6642b8638491573544bfaafb5430f18bb760 SHA256 abb18b80034933e64edd26cb74e204c3756c526a04f00bbe0ade6daf57f3f122 size 973
 MD5 a606b2936c8c356719e090b99d181839 alsa-jack-1.0.10.ebuild 973
 RMD160 fca1fe497bad9ea9fcfb58eeff31dd2dbf156c6b alsa-jack-1.0.10.ebuild 973
 SHA256 abb18b80034933e64edd26cb74e204c3756c526a04f00bbe0ade6daf57f3f122 alsa-jack-1.0.10.ebuild 973
-MD5 22f5a4bb5a7ad5718712a6ce8ba70d1b alsa-jack-1.0.10_rc1.ebuild 969
-RMD160 d1cf34925c415d900e6ed86d46a37e649bb2c013 alsa-jack-1.0.10_rc1.ebuild 969
-SHA256 6b0d8cd6270eace364552697c703d540ba8ab495665b8090bd391b908018c8dc alsa-jack-1.0.10_rc1.ebuild 969
-MD5 46b87b05b52162fd963708cf0f48761a alsa-jack-1.0.11_rc4.ebuild 977
-RMD160 dc0f9844022520f13aa7471dc9a6a73fb1d1c547 alsa-jack-1.0.11_rc4.ebuild 977
-SHA256 f24602ba72f781ea20ae8f41cd9f152d7e2796c41fa4064099b80c4912db7523 alsa-jack-1.0.11_rc4.ebuild 977
-MD5 b7bc9b20727fc8fc85cbb7018ac1ef0c alsa-jack-1.0.11_rc5.ebuild 977
-RMD160 3704c9c278a8cdbadba0910b681f5f71f983c3cc alsa-jack-1.0.11_rc5.ebuild 977
-SHA256 d69cc230b98f082e1522b4d1f819b5f8c140d5f216e849fac2ad480d6f71db5c alsa-jack-1.0.11_rc5.ebuild 977
-MD5 bd783eaa84e2bc2a133cc7a53ea9fd9b alsa-jack-1.0.8.ebuild 969
-RMD160 edab3033071170eb92ca880de588a035d5d707e0 alsa-jack-1.0.8.ebuild 969
-SHA256 186b5df4a4875875cfac4dd40eb122fb67f7693ed1704af5999d677907afe1ed alsa-jack-1.0.8.ebuild 969
-MD5 5975fae950fd103fc45e05d34ffd79f9 alsa-jack-1.0.9.ebuild 927
-RMD160 16dfe8c508af2dc01686090dd91e21fa538425b5 alsa-jack-1.0.9.ebuild 927
-SHA256 a1485b8d45734c83d04ed96ffeb2e3022851068ee3958173ef9899e12d08f046 alsa-jack-1.0.9.ebuild 927
+EBUILD alsa-jack-1.0.10_rc1.ebuild 1001 RMD160 02c7c5731e49903fb5bdd09ca798d16b5f5311cd SHA1 d68c7bee8d37129eff244f6f86da74679119903f SHA256 b1e46b0b36a6a91d0a27760ab66eb015a73988e381b4e9f5789c73f898f58033 size 1001
+MD5 0c52c6bfba5595db4b16187a8c1e40ae alsa-jack-1.0.10_rc1.ebuild 1001
+RMD160 02c7c5731e49903fb5bdd09ca798d16b5f5311cd alsa-jack-1.0.10_rc1.ebuild 1001
+SHA256 b1e46b0b36a6a91d0a27760ab66eb015a73988e381b4e9f5789c73f898f58033 alsa-jack-1.0.10_rc1.ebuild 1001
+EBUILD alsa-jack-1.0.11_rc4.ebuild 1006 RMD160 af8a406fd74f3ee53bc325894d0eb7f6671f0c6e SHA1 8d2cf57776215ac6d9196ebfcca92c7d429b5424 SHA256 194b6daa056c89e7c2b1c07c92d63dc5c4d16a0d1d5dc7c7807b3b87370e1df6 size 1006
+MD5 469a538d77c188deeed1d8a281ab90ee alsa-jack-1.0.11_rc4.ebuild 1006
+RMD160 af8a406fd74f3ee53bc325894d0eb7f6671f0c6e alsa-jack-1.0.11_rc4.ebuild 1006
+SHA256 194b6daa056c89e7c2b1c07c92d63dc5c4d16a0d1d5dc7c7807b3b87370e1df6 alsa-jack-1.0.11_rc4.ebuild 1006
+EBUILD alsa-jack-1.0.11_rc5.ebuild 1006 RMD160 f856f05079e07f0044a9968cce2f9555f1f6143b SHA1 37a054b1d9e66540d51c18876b130dd54037a43e SHA256 af0eac9cd03cac42a0d9ec37080126a261eed4e167a9dd3d545d861e0e3c107b size 1006
+MD5 aec809649432f15565670084afc6d333 alsa-jack-1.0.11_rc5.ebuild 1006
+RMD160 f856f05079e07f0044a9968cce2f9555f1f6143b alsa-jack-1.0.11_rc5.ebuild 1006
+SHA256 af0eac9cd03cac42a0d9ec37080126a261eed4e167a9dd3d545d861e0e3c107b alsa-jack-1.0.11_rc5.ebuild 1006
+EBUILD alsa-jack-1.0.8.ebuild 1001 RMD160 f263dba97dcade738e02bb47fd4011af0c2e4664 SHA1 9af3abd84be7bad1856c47e3ea30f945074eba38 SHA256 a9946947c8e571cc15664931767b30245a6a71c266e282e20b855704009a7d1e size 1001
+MD5 0ff06959173604119758b8578e63908b alsa-jack-1.0.8.ebuild 1001
+RMD160 f263dba97dcade738e02bb47fd4011af0c2e4664 alsa-jack-1.0.8.ebuild 1001
+SHA256 a9946947c8e571cc15664931767b30245a6a71c266e282e20b855704009a7d1e alsa-jack-1.0.8.ebuild 1001
+EBUILD alsa-jack-1.0.9.ebuild 959 RMD160 5b7e765df9cc300ea60e16e6261dcc96d7832d09 SHA1 3b76ca135180e0cd9fb5090223e17b5619842f96 SHA256 5158fe4b460e33b62d872baa04ebff29e15eeacf15037da9f5626843f9db3a4c size 959
+MD5 cb0ce296ad82111fa526f3497ef7af18 alsa-jack-1.0.9.ebuild 959
+RMD160 5b7e765df9cc300ea60e16e6261dcc96d7832d09 alsa-jack-1.0.9.ebuild 959
+SHA256 5158fe4b460e33b62d872baa04ebff29e15eeacf15037da9f5626843f9db3a4c alsa-jack-1.0.9.ebuild 959
+MISC ChangeLog 7028 RMD160 f811a0bc417903f232a91e67d6118f858d5634b9 SHA1 a48444d8c1a93dfdb5a7798eb93bba326c014532 SHA256 fec1c9658118051950735b930b8a573636afdb5130cf70c8c63b64d1b11ceb95 size 7028
+MD5 da4a2323189e23df8ad5d214ebeb159c ChangeLog 7028
+RMD160 f811a0bc417903f232a91e67d6118f858d5634b9 ChangeLog 7028
+SHA256 fec1c9658118051950735b930b8a573636afdb5130cf70c8c63b64d1b11ceb95 ChangeLog 7028
+MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b size 158
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
+SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b metadata.xml 158
 MD5 d13e7fe735bca070ae255809e425473e files/digest-alsa-jack-1.0.10 72
 RMD160 7f22fadeb9ad18667264efa54f513eb47bb8401a files/digest-alsa-jack-1.0.10 72
 SHA256 b1ab124b78b93c2758331a3730bdf46950b5b139e4f5880317b016e351dcee17 files/digest-alsa-jack-1.0.10 72
@@ -40,13 +57,10 @@ SHA256 ff1c6d7153e3b27574f089ef7b701034eef8b7af71c53ac07b565d215535ada0 files/di
 MD5 115de3eba9191ee02931872cba635edf files/digest-alsa-jack-1.0.9 71
 RMD160 af15cb6be88fe43eecf0be56d1d2855da145c784 files/digest-alsa-jack-1.0.9 71
 SHA256 f2b92c6504ba0856da947a0ea62663e891b7c9c59eb23da6f03fd25760ec7a36 files/digest-alsa-jack-1.0.9 71
-MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
-SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b metadata.xml 158
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
+Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEPAYSAiZjviIA2XgRAiCyAJ9/1IQ0DBUahUYx4sdh1I/yvmLA/QCg8juQ
-G1j6/CMtnbSYYuegHBa7FT0=
-=HVIa
+iD8DBQFETKIAAiZjviIA2XgRAljqAJ9y4egXi1jnXgQC1qExY0xEvvpjAQCg73Ll
+pO816QEUFX9waViOMKARdx0=
+=y1Zw
 -----END PGP SIGNATURE-----
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}