Drop esound support and force pull the alsa pulse plugin (in live ebuild, for now).

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

3 files changed, 17 insertions, 19 deletions

diff --git a/media-sound/pulseaudio/ChangeLog b/media-sound/pulseaudio/ChangeLog
index f7ecd834f840..41baece9c3b0 100644
--- a/media-sound/pulseaudio/ChangeLog
+++ b/media-sound/pulseaudio/ChangeLog
@@ -1,6 +1,10 @@
 # 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.256 2012/02/10 00:55:34 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.257 2012/02/12 17:49:28 ford_prefect Exp $
+
+  12 Feb 2012; Arun Raghavan <ford_prefect@gentoo.org> pulseaudio-9999.ebuild:
+  Drop esound support and force pull the alsa pulse plugin (in live ebuild, for
+  now).
 
   10 Feb 2012; Diego E. Pettenò <flameeyes@gentoo.org> metadata.xml,
   pulseaudio-0.9.23-r1.ebuild, pulseaudio-1.1-r1.ebuild, pulseaudio-9999.ebuild:
diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest
index 3a5f4395eb40..0e288b5183cc 100644
--- a/media-sound/pulseaudio/Manifest
+++ b/media-sound/pulseaudio/Manifest
@@ -18,13 +18,13 @@ 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 6340 RMD160 301c50b9b1a6a742877c0b03d55c4fd81190bf79 SHA1 c9ee47860fa3f9a447060453da5723e9b345b067 SHA256 2226441626a7bab920d9930b7528f74be186c80a363a6a14e69b5bc36fd075ba
 EBUILD pulseaudio-1.1.ebuild 6086 RMD160 5b46afd75b8b15f07601a72597d53a7d42debe62 SHA1 9100add556bcc38e21ba35a038ab60d81acfe08e SHA256 1e2e6fa19cc70307e8d785521dd26954d2ff28ad346a8c4b32e5ff78382e2bea
-EBUILD pulseaudio-9999.ebuild 6155 RMD160 55516795fd1f7d0410a97d6369464c2cdb65651c SHA1 4e6f60086fdc0d6500f4a96905f8921664137cbb SHA256 fac2c2f403f0f50e6d224b8a13869028f4b3805372bc4caaf5c81dbc9b42bc05
-MISC ChangeLog 49623 RMD160 6021ae90de54a8f51c4e9434a9febe7d6d74d69c SHA1 f12540680a0433bc6c72a8b891707899bfb500d1 SHA256 daad2310934b67ea8b4dcad3436d6babdd2b5df28944c8ae53fa79218e3b9a19
+EBUILD pulseaudio-9999.ebuild 5863 RMD160 09756b13a3bf7317b4bad3af2aa95cf92b296e04 SHA1 d9b931d70163f4e6a360cec7fca6d4ec0df2ad3a SHA256 ed3f4818ba7656a17f29a85ea6d2df9050a2a0d02cbc2ad457e619f484d388ba
+MISC ChangeLog 49794 RMD160 81ff6aadbe390e23bce8f367c7ef696f4d9ee6e8 SHA1 e92123480c562144c0176444a6ceb657b59c920d SHA256 12d93f36935048035749baef05ba8bd7bc589d9c832cd66aedf0f6ebd6ad1526
 MISC metadata.xml 2364 RMD160 9bd91096af1532d34f0c315c17ae5481ad8a08c2 SHA1 af8a4b2ddcdd6c6038f8596847cac08b4f544448 SHA256 2764e0ce5b2a6011addf59afac9de9be7c5e6fbadf37826b1c6192247da1fc05
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk80avAACgkQAiZjviIA2XjKdwCg5A+q/2IebgS4yImdeSj6e9t3
-1lsAoNve8o75RoS4nYM5ojTrnTPe+H+I
-=eoZw
+iEYEARECAAYFAk83+8MACgkQ+Vqt1inD4uyl/ACdFvKXm0WTR4K/9H7OIb9Xgliz
+4IIAnj68ZdoyirynU7FXaweSW30dZRFB
+=9gv+
 -----END PGP SIGNATURE-----
diff --git a/media-sound/pulseaudio/pulseaudio-9999.ebuild b/media-sound/pulseaudio/pulseaudio-9999.ebuild
index 286256378766..9d3aa344509c 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.17 2012/02/10 00:55:34 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-9999.ebuild,v 1.18 2012/02/12 17:49:28 ford_prefect Exp $
 
 EAPI=4
 
@@ -16,7 +16,7 @@ SLOT="0"
 KEYWORDS=""
 IUSE="+alsa avahi +caps equalizer jack lirc oss tcpd +X dbus libsamplerate gnome bluetooth +asyncns +glib test doc +udev ipv6 system-wide realtime +orc ssl"
 
-RDEPEND="app-admin/eselect-esd
+RDEPEND=">=media-libs/libsndfile-1.0.20
 	X? (
 		>=x11-libs/libX11-1.4.0
 		>=x11-libs/libxcb-1.6
@@ -27,7 +27,10 @@ RDEPEND="app-admin/eselect-esd
 	)
 	caps? ( sys-libs/libcap )
 	libsamplerate? ( >=media-libs/libsamplerate-0.1.1-r1 )
-	alsa? ( >=media-libs/alsa-lib-1.0.19 )
+	alsa? (
+		>=media-libs/alsa-lib-1.0.19
+		media-plugins/alsa-plugins[pulseaudio]
+	)
 	glib? ( >=dev-libs/glib-2.4.0 )
 	avahi? ( >=net-dns/avahi-0.6.12[dbus] )
 	jack? ( >=media-sound/jack-audio-connection-kit-0.117 )
@@ -46,7 +49,6 @@ RDEPEND="app-admin/eselect-esd
 	orc? ( >=dev-lang/orc-0.4.9 )
 	ssl? ( dev-libs/openssl )
 	>=media-libs/speex-1.2_rc1
-	>=media-libs/libsndfile-1.0.20
 	sys-libs/gdbm
 	dev-libs/json-c
 	>=sys-devel/libtool-2.2.4" # it's a valid RDEPEND, libltdl.so is used
@@ -113,6 +115,7 @@ src_configure() {
 		$(use_enable ssl openssl) \
 		$(use_with caps) \
 		$(use_with equalizer fftw) \
+		--disable-esound \
 		--localstatedir="${EPREFIX}"/var \
 		--with-database=gdbm \
 		--with-udev-rules-dir="${EPREFIX}/lib/udev/rules.d"
@@ -198,15 +201,6 @@ pkg_postinst() {
 		elog "your Bluetooth controller enabled and inserted at bootup or"
 		elog "PulseAudio will refuse to start."
 	fi
-	if use alsa; then
-		local pkg="media-plugins/alsa-plugins"
-		if has_version ${pkg} && ! has_version "${pkg}[pulseaudio]"; then
-			elog
-			elog "You have alsa support enabled so you probably want to install"
-			elog "${pkg} with pulseaudio support to have"
-			elog "alsa using applications route their sound through pulseaudio"
-		fi
-	fi
 
 	eselect esd update --if-unset
 }