USE default-enabled USE=alsa-plugin to control installing the plugin, as agreed betwe...

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

diff --git a/media-sound/pulseaudio/ChangeLog b/media-sound/pulseaudio/ChangeLog
index 9c562ed4a2ac2b4531c3a53ba65b8386b32fd42f..945a5f55f898b97c2168a65c2c43a696d70db1c3 100644 (file)
--- a/media-sound/pulseaudio/ChangeLog
+++ b/media-sound/pulseaudio/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/pulseaudio
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.360 2014/12/05 10:30:55 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.361 2014/12/05 15:26:17 mgorny Exp $
+
+  05 Dec 2014; Michał Górny <mgorny@gentoo.org> metadata.xml,
+  pulseaudio-5.0-r6.ebuild:
+  USE default-enabled USE=alsa-plugin to control installing the plugin, as
+  agreed between the maintainers and QA.
 
   05 Dec 2014; Pacho Ramos <pacho@gentoo.org> pulseaudio-5.0-r6.ebuild:
   Increase severity of the messages as people wanting to run pulseaudio[alsa]

diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest
index b9578f6060c25bfc9bde5a4a81bcad2d051bdc7f..90c612f0fcb587aa4d449b30ea240a9e34eb6c6a 100644 (file)
--- a/media-sound/pulseaudio/Manifest
+++ b/media-sound/pulseaudio/Manifest
@@ -13,13 +13,25 @@ AUX pulseaudio.tmpfiles 36 SHA256 d836951fb800308256288506b6bd82919d377399e1292d
 DIST pulseaudio-5.0.tar.xz 1455428 SHA256 99c13a8b1249ddbd724f195579df79484e9af6418cecf6a15f003a7f36caf939 SHA512 f3d64bd6e03a732fd812da466b6658004600b4f3d0b9760403b7e113b6d654d54387658bf3704f45f28ab700245433e23fe517e4579130886fc58647eb97be2b WHIRLPOOL c85829c78ded3bbef234e455bfd3778f2daf50de9d7627508dbf131d0c398e35ab3ae41a4b5136f0c0da09249bc9a600ad85d848ba4e1faba74875af0a787036
 EBUILD pulseaudio-5.0-r4.ebuild 10280 SHA256 ecfcb8e41987a89721eece1b90535d8b69e6051fc526b8017ed93cde28986588 SHA512 53bbcda4b9885cbdb4c3d2c3077052e519ceb64fe4ad74678eef75ddedd5590f4ea7b33efbd58bd8a35b29ab084fce596d8672188abf1b5b915ec007ee33cae0 WHIRLPOOL 7bb2a3898ee6b6775c51a207ff13102524f76ea38a49e68b30b647b8423eb456e841bf4e61fbe8a4bcb48a6cdbdd594253ccb1702989ac1ac460648e7f47e14d
 EBUILD pulseaudio-5.0-r5.ebuild 10463 SHA256 b74d44a38bcc42c73012138ced50c84f916d03068c439b6998940ea290372840 SHA512 5347fb31876ed4c72ef6596583f42e94a960eb97638f90921c51f75defbebf460b8c27b7b64d5beebf89c7cd0b3938f48746ad0ff5a6e572c5d419084000eada WHIRLPOOL cc5490557c23954787d44b0949794bcac9417cd7c39691db44fef865a28d4f6cc2dc1246f78f0ec12361f51a86d4f68b943a9c33242839e06fa96fbee7fef116
-EBUILD pulseaudio-5.0-r6.ebuild 10578 SHA256 454fdceb749b3b1c44be77746ec39a01651ec95664d9e1bcd474db886f3f54b8 SHA512 0a4fdd02f1e927a8355090f12c124e306d7dd6c398ca16540dff272db655e30ac96f4214d6cf6dbafbdbb2868bbc5abe769a82a25711a54e474d1a9e9daa67ba WHIRLPOOL ccc1c24c84a398d862c96f3ad8e7696f245d9b4bade3c8259ad7a46762dfa6d7fbaae647177795c2eaab0c6773c492767ab220032b889883f89f6662bc53f09b
-MISC ChangeLog 68548 SHA256 d85efea402b3822ee31b009142de17f9cb7036c68dcb4e338fb2cdb8d2da6410 SHA512 f8c27ce5ca435ea2028c01ee17f85c33dcbcd286bc837744176caa1b1ad6738fd14aa28e4e5b9b58c6ba5c8f6d98b7ab460c75c58789588ed2ad4ffa08f0567f WHIRLPOOL 80bf202a6379b07e3cd027eabf164be6f5c049db6c667e80354643d08c19c577e2de5ced7b4b9dfa35e331c4f221706072889b9cde9a6dc956a03f7edae0e1fd
-MISC metadata.xml 2831 SHA256 626aa770bbfbd06e872686d755d45c82f53e8b99cc82719fa7d8e69d9d9e2130 SHA512 a3b13e05bec6d3b4df89324e8caffdb8d9c4e9ed45087289e4b967269cb65ed7acbaa3896139b43a26e3fcffbe723f0579f0a438077069573eb9319ff7f179a1 WHIRLPOOL 1356c3d642361188574001f2f1d7797dfe7935c54dfcc6146389c930b69fdb89e7354f00201d99471c585b908d241b16bc8ae409c4d9852ebdcd07ffab85f1fa
+EBUILD pulseaudio-5.0-r6.ebuild 10480 SHA256 e02f40553e2d149d9e237829e1deff1a2c74c0b1774f8390ce622748abb78605 SHA512 3ee807619f736fb96ba06a210159527a30201988409d43e7bbef0878b25ed1df1359ae7abcfb91f441875a4e234478d0643b756f3923105667dff05f4350c394 WHIRLPOOL 56dc9324b6c27f698233fd0011384cd6ab621276953d3cb392ed8c810f7a9af28cd19b6539595749dc4d803578ee2af907eb008c36c22296697f8148c8463f84
+MISC ChangeLog 68758 SHA256 62b3ee55c2fb6c550b6cac80f9415e8bea60700180c220913e6a8407398df82f SHA512 282eec119fe00de5e3be775190383dc26eb5ef789cf48521e49346a85f1c28613b69712b5da76e9c34f6741a7480a33cd4ba6fd03ea4140c1e9fd08dd9951f5c WHIRLPOOL bc1cff483292d83b32d53528bbd6dfdbbd2c66b6a783a0485457602320a1787c6e9eeaa517acb380c0dd70db6e64745e5dc26db5f516a23680ff4091d84dccac
+MISC metadata.xml 3046 SHA256 e25b23335acfbb05882919c33cbb60e32c3e3cbd00176f94a9059adba05ae313 SHA512 6f566f880c729a8b04015cb056b6e652f82a49309beb166f2ca340949048f37e802647ddf58ee0ae4762cbe537b053968bcd4f8586220f33400437c5483ab235 WHIRLPOOL 17f09b3b1da837bae84a1374fa6ac773cdccc2c4408f7c6b1e5e380f9778ae7008959a18dc7e9a4cb1acf44e3be7b66316c14aed839373e8cc9a3f22ffa84bb1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlSBiWAACgkQCaWpQKGI+9QnLwCfeoIDN+E4PgNjasRA4AnEeouT
-pJIAnjtg9+xR0oTagfhaRJ/dr4aGoI8T
-=Bm40
+iQJ8BAEBCABmBQJUgc6bXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOyH0P/2VEs0EQ35dYFfhIb46prY/3
+zxOblCj6bE6Vzk7ltm8AlBFKbyNDcDBDlPHqpZnlGP59S4znCIS07M1YMxOC7cYp
+IDf+1LyHPPApvcKdXwd1tMYoBIdDAdRMOlXNETdD7O7nZLRLfLhFBuiRhhmr9j8D
+eilMlgyMv+NrqxSLpXyxFQVCIF3F36mpHQyVy9BxSrgfZZ1VIuoB21Qr7OsoMST2
+9L5tE5zIoxclhZXJaCPOVZ54zYEjuttmeu/xT9Fvu1pZZvCP/gFVvI1gSFg5eh9z
+KzH9tMY7wtoB6jDEEeYZll556TdcV2YVe0/dR0rtqbwZLEhCMwr22Sy6mW+rcKc9
+gZLhJYL5M5CMBQfXS0EZV8syz3nsu0f9+bCCQmwEtEvNqU/eVMEBD1DBcPHg/gVe
+2NZwAGzKupfkbGzQotgZUJplQtV8mICjeV8NnMOqFxoqD9EckmSeO1CLHOn0vM/k
+gL4Kt09hMgVFvwjelx81SmjscPvg13XmdWmaMb4RiZNVj1Cbfdzai01hndA7h22p
+kmIBUY97DlgZS01SkCUjsjGtqLwz2q0FzCvAX+/zqb+fV0Oj7vEtLIDYmJzs94JM
+vnn2WDR2G3p6XMaQWUw5tJfrWhMHF4iSJA41D7D2WxB4fy5eukvPq1ZSa0JWcgrV
+pzhwOXkNRpV3liuCSzOX
+=s7XD
 -----END PGP SIGNATURE-----

diff --git a/media-sound/pulseaudio/metadata.xml b/media-sound/pulseaudio/metadata.xml
index 25afd41c86d818d55c7dc90f31027556b633b8d6..8bf704bbeb7f9ca9a1436187d8378a7fd908a55f 100644 (file)
--- a/media-sound/pulseaudio/metadata.xml
+++ b/media-sound/pulseaudio/metadata.xml
@@ -10,6 +10,11 @@
       flag if you want to use a system wide instance. If unsure, enable
       this flag.
     </flag>
+    <flag name="alsa-plugin">
+      Request installing <pkg>media-sound/alsa-plugins</pkg> with
+      PulseAudio plugin enabled. This ensures that clients supporting
+      ALSA only will use PulseAudio.
+    </flag>
     <flag name="gnome">
       Use GConf to store user preferences on streams and so on. Don't
       enable this flag if you want to use a system wide instance. If

diff --git a/media-sound/pulseaudio/pulseaudio-5.0-r6.ebuild b/media-sound/pulseaudio/pulseaudio-5.0-r6.ebuild
index 6639d877cdd5eb3729f0c248f9e332588c7052c1..3c054471d648f632491c424fcb909c12a8c72dc1 100644 (file)
--- a/media-sound/pulseaudio/pulseaudio-5.0-r6.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-5.0-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-5.0-r6.ebuild,v 1.2 2014/12/05 10:30:55 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-5.0-r6.ebuild,v 1.3 2014/12/05 15:26:17 mgorny Exp $
 
 EAPI="5"
 inherit autotools bash-completion-r1 eutils flag-o-matic linux-info readme.gentoo systemd user versionator udev multilib-minimal
@@ -18,8 +18,8 @@ LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 
-IUSE="+alsa +asyncns bluetooth +caps dbus doc equalizer +gdbm +glib gnome
-gtk ipv6 jack libsamplerate lirc neon +orc oss qt4 realtime ssl systemd
+IUSE="+alsa +alsa-plugin +asyncns bluetooth +caps dbus doc equalizer +gdbm +glib
+gnome gtk ipv6 jack libsamplerate lirc neon +orc oss qt4 realtime ssl systemd
 system-wide tcpd test +udev +webrtc-aec +X xen zeroconf"
 
 # See "*** BLUEZ support not found (requires D-Bus)" in configure.ac
@@ -88,6 +88,8 @@ DEPEND="${RDEPEND}
        dev-util/intltool
        >=sys-devel/gettext-0.18.1
 "
+# This is a PDEPEND to avoid a circular dep
+PDEPEND="alsa-plugin? ( >=media-plugins/alsa-plugins-1.0.27-r1[pulseaudio] )"
 
 # alsa-utils dep is for the alsasound init.d script (see bug #155707)
 # bluez dep is for the bluetooth init.d script
@@ -350,10 +352,4 @@ pkg_postinst() {
                elog "This will build the equalizer module, but the 'qpaeq' tool"
                elog "which is required to set equalizer levels will not work."
        fi
-
-       if use alsa && ! has_version 'media-plugins/alsa-plugins[pulseaudio]'; then
-               ewarn
-               ewarn "You will need to install media-plugins/alsa-plugins[pulseaudio]"
-               ewarn "if you want ALSA-only apps to automatically use PulseAudio."
-       fi
 }