bring back the alsa useflag guard for the alsa-plugins dep which was dropped in http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-sound/pulseaudio/pulseaudio-9999.ebuild?r1=1.18&r2=1.19

Package-Manager: portage-2.2.0_alpha101/cvs/Linux x86_64

4 files changed, 19 insertions, 12 deletions

diff --git a/media-sound/pulseaudio/ChangeLog b/media-sound/pulseaudio/ChangeLog
index f151d1ded012..771dc7d9010c 100644
--- a/media-sound/pulseaudio/ChangeLog
+++ b/media-sound/pulseaudio/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/pulseaudio
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.267 2012/03/29 03:17:38 ford_prefect Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.268 2012/04/23 21:09:16 aballier Exp $
+
+  23 Apr 2012; Alexis Ballier <aballier@gentoo.org> pulseaudio-1.99.2.ebuild,
+  pulseaudio-9999.ebuild:
+  bring back the alsa useflag guard for the alsa-plugins dep which was dropped
+  in
+  http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-sound/pulseaudi
+  o/pulseaudio-9999.ebuild?r1=1.18&r2=1.19
 
   29 Mar 2012; Arun Raghavan <ford_prefect@gentoo.org>
   pulseaudio-1.99.2.ebuild, pulseaudio-9999.ebuild:
diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest
index fab36194c7fb..78c57c2945be 100644
--- a/media-sound/pulseaudio/Manifest
+++ b/media-sound/pulseaudio/Manifest
@@ -19,14 +19,14 @@ EBUILD pulseaudio-0.9.22.ebuild 6642 RMD160 ae91ab6f182f82d1d57b97c54c8e604752ab
 EBUILD pulseaudio-0.9.23-r1.ebuild 6472 RMD160 a102585405f89c2ad0919f8f9c9ec7bd4f7b9351 SHA1 35d5ef9c244d48df409bb31b81d5e4c62c414d26 SHA256 c4c86ec0b265882bfc695d9155db9c7c458e2bad0a6a68a16fa382f5f3d72dc4
 EBUILD pulseaudio-1.1-r1.ebuild 6770 RMD160 cde25fb4cba896ed5aaecc35c44a433050fb6bd6 SHA1 0be1f1b645df67fbe34ed0f8fc8dbea62c69bf24 SHA256 3909bf086de23c83d4a2fc8304145ce40ecf125a2e0e5cad88ddb4510e733ff7
 EBUILD pulseaudio-1.1.ebuild 6086 RMD160 5b46afd75b8b15f07601a72597d53a7d42debe62 SHA1 9100add556bcc38e21ba35a038ab60d81acfe08e SHA256 1e2e6fa19cc70307e8d785521dd26954d2ff28ad346a8c4b32e5ff78382e2bea
-EBUILD pulseaudio-1.99.2.ebuild 6501 RMD160 8645695b5729cecc17de9be5f2b025b578c388b9 SHA1 af81365424a63ee3806bf4e20dac351f76e928c5 SHA256 97fe2c1be99681fb8e5bc9d75cab7bbc5aa412bc4494e2c48018b310cb9266e9
-EBUILD pulseaudio-9999.ebuild 6465 RMD160 675d3a57ef69f437f2cf5b63e5b6907b10955dc1 SHA1 fcf3be0a44777987632a0a4b5a7d11c99cc94875 SHA256 9c211406a6a061f623091521a9d124c4fefd6ec9d454e9ebbc8e3c18dd213864
-MISC ChangeLog 51682 RMD160 f2103d710ff67be989d99f5784d64725ab17aec2 SHA1 cf1fc6353f323ae0664934b2105e8b55ec650fb3 SHA256 869ee85dff477ee7b0c8eff94f1db381f30601ca9e63612019f7b7e38030f0d1
+EBUILD pulseaudio-1.99.2.ebuild 6507 RMD160 86eac53c4920c74fc93abaf8d252cdb483627281 SHA1 b2b984b109ddd8a0d5e73190f7dc71b5264f70e8 SHA256 0f52880039446b510712fcd7393b89c7edb64bad7708a2206e688b91c0b0d391
+EBUILD pulseaudio-9999.ebuild 6471 RMD160 2493450ead3419ca8831afa46f567162faf59bb5 SHA1 6ac145242a0cccf922d7dce96a3eceb0242fdfbd SHA256 72998908697264be5012abab2c6047ab230e8716cfbfd3e06243baf796e07d4a
+MISC ChangeLog 51990 RMD160 93b890befe0cec37b039b80e5cdea0fdda77c064 SHA1 55314e363e4f7b70e4efaadfaa0be96289cdfd79 SHA256 9322eed7dbe75f707d2b4bd3fe36d6a2b68a0b3d16616876902d78466000ab20
 MISC metadata.xml 2771 RMD160 9adf00b9144b43546590fa7a8654992213c183db SHA1 3444c72ab24a78ab721517a1a46a7d546556cf4a SHA256 350afa38e8777c593b9e28c7d4dd08b6ee1eeb501a36b48a11addd697a3ff562
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk9z1GwACgkQ+Vqt1inD4uyPYACeKWmIBKVWaK8LzZbgirlvaxCg
-Nh0AniYj36Q8Nwoa163PchmV9zwbslJZ
-=9kM/
+iEYEARECAAYFAk+VxQEACgkQvFcC4BYPU0rXQQCfbJ9fRXl7YWkUrHd2TUlhiL0m
+h6QAnRVLRyth/0kHkigknNOogn4EF1xo
+=fKra
 -----END PGP SIGNATURE-----
diff --git a/media-sound/pulseaudio/pulseaudio-1.99.2.ebuild b/media-sound/pulseaudio/pulseaudio-1.99.2.ebuild
index 9dd2cd052d33..69e537b178b6 100644
--- a/media-sound/pulseaudio/pulseaudio-1.99.2.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-1.99.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-1.99.2.ebuild,v 1.2 2012/03/29 03:17:38 ford_prefect Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-1.99.2.ebuild,v 1.3 2012/04/23 21:09:16 aballier Exp $
 
 EAPI=4
 
@@ -66,7 +66,7 @@ DEPEND="${RDEPEND}
 	system-wide? ( || ( dev-util/unifdef sys-freebsd/freebsd-ubin ) )
 	dev-util/intltool"
 # This is a PDEPEND to avoid a circular dep
-PDEPEND="media-plugins/alsa-plugins[pulseaudio]"
+PDEPEND="alsa? ( media-plugins/alsa-plugins[pulseaudio] )"
 
 # alsa-utils dep is for the alsasound init.d script (see bug #155707)
 # bluez dep is for the bluetooth init.d script
diff --git a/media-sound/pulseaudio/pulseaudio-9999.ebuild b/media-sound/pulseaudio/pulseaudio-9999.ebuild
index 66fbec01bbf8..ca51071d6a03 100644
--- a/media-sound/pulseaudio/pulseaudio-9999.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-9999.ebuild,v 1.22 2012/03/29 03:17:38 ford_prefect Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-9999.ebuild,v 1.23 2012/04/23 21:09:16 aballier Exp $
 
 EAPI=4
 
@@ -66,7 +66,7 @@ DEPEND="${RDEPEND}
 	system-wide? ( || ( dev-util/unifdef sys-freebsd/freebsd-ubin ) )
 	dev-util/intltool"
 # This is a PDEPEND to avoid a circular dep
-PDEPEND="media-plugins/alsa-plugins[pulseaudio]"
+PDEPEND="alsa? ( media-plugins/alsa-plugins[pulseaudio] )"
 
 # alsa-utils dep is for the alsasound init.d script (see bug #155707)
 # bluez dep is for the bluetooth init.d script