Make sure the esound module doesn't break things and some log fixes.

(Portage version: 2.2.0_alpha59/cvs/Linux x86_64)

3 files changed, 13 insertions, 27 deletions

diff --git a/media-sound/pulseaudio/ChangeLog b/media-sound/pulseaudio/ChangeLog
index 7387f44d30b4..e0afa115d398 100644
--- a/media-sound/pulseaudio/ChangeLog
+++ b/media-sound/pulseaudio/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/pulseaudio
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.248 2011/09/27 13:45:29 ford_prefect Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.249 2011/09/28 14:31:56 ford_prefect Exp $
+
+*pulseaudio-1.0-r1 (28 Sep 2011)
+
+  28 Sep 2011; Arun Raghavan <ford_prefect@gentoo.org> -pulseaudio-1.0.ebuild,
+  +pulseaudio-1.0-r1.ebuild, pulseaudio-9999.ebuild:
+  Make sure the esound module doesn't break things and some log fixes.
 
   27 Sep 2011; Arun Raghavan <ford_prefect@gentoo.org> pulseaudio-1.0.ebuild,
   pulseaudio-9999.ebuild:
diff --git a/media-sound/pulseaudio/pulseaudio-1.0.ebuild b/media-sound/pulseaudio/pulseaudio-1.0-r1.ebuild
index 986a4aa3a694..7e71c5ee48e5 100644
--- a/media-sound/pulseaudio/pulseaudio-1.0.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-1.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-1.0.ebuild,v 1.2 2011/09/27 13:45:29 ford_prefect Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-1.0-r1.ebuild,v 1.1 2011/09/28 14:31:56 ford_prefect Exp $
 
 EAPI=4
 
@@ -108,7 +108,6 @@ src_configure() {
 		$(use_with caps) \
 		$(use_with equalizer fftw) \
 		--localstatedir="${EPREFIX}"/var \
-		--disable-per-user-esound-socket \
 		--with-database=gdbm \
 		--with-udev-rules-dir="${EPREFIX}/lib/udev/rules.d"
 
@@ -185,22 +184,13 @@ pkg_postinst() {
 			elog "gconf module on /etc/pulse/system.pa to be able to use PulseAudio"
 			elog "with a system-wide instance."
 		fi
-		elog
-		elog "To use the ESounD wrapper while using a system-wide daemon, you also"
-		elog "need to enable auth-anonymous for the esound-unix module, or to copy"
-		elog "/var/run/pulse/.esd_auth into each home directory."
-		elog
 	fi
 	if use bluetooth; then
 		elog
-		elog "The BlueTooth proximity module is not enabled in the default"
+		elog "The Bluetooth proximity module is not enabled in the default"
 		elog "configuration file. If you do enable it, you'll have to have"
-		elog "your BlueTooth controller enabled and inserted at bootup or"
+		elog "your Bluetooth controller enabled and inserted at bootup or"
 		elog "PulseAudio will refuse to start."
-		elog
-		elog "Please note that the BlueTooth proximity module seems itself"
-		elog "still experimental, so please report to upstream if you have"
-		elog "problems with it."
 	fi
 	if use alsa; then
 		local pkg="media-plugins/alsa-plugins"
diff --git a/media-sound/pulseaudio/pulseaudio-9999.ebuild b/media-sound/pulseaudio/pulseaudio-9999.ebuild
index be8238a6be6d..742eafaf2fc4 100644
--- a/media-sound/pulseaudio/pulseaudio-9999.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.13 2011/09/27 13:45:29 ford_prefect Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-9999.ebuild,v 1.14 2011/09/28 14:31:56 ford_prefect Exp $
 
 EAPI=4
 
@@ -110,7 +110,6 @@ src_configure() {
 		$(use_with caps) \
 		$(use_with equalizer fftw) \
 		--localstatedir="${EPREFIX}"/var \
-		--disable-per-user-esound-socket \
 		--with-database=gdbm \
 		--with-udev-rules-dir="${EPREFIX}/lib/udev/rules.d"
 
@@ -187,22 +186,13 @@ pkg_postinst() {
 			elog "gconf module on /etc/pulse/system.pa to be able to use PulseAudio"
 			elog "with a system-wide instance."
 		fi
-		elog
-		elog "To use the ESounD wrapper while using a system-wide daemon, you also"
-		elog "need to enable auth-anonymous for the esound-unix module, or to copy"
-		elog "/var/run/pulse/.esd_auth into each home directory."
-		elog
 	fi
 	if use bluetooth; then
 		elog
-		elog "The BlueTooth proximity module is not enabled in the default"
+		elog "The Bluetooth proximity module is not enabled in the default"
 		elog "configuration file. If you do enable it, you'll have to have"
-		elog "your BlueTooth controller enabled and inserted at bootup or"
+		elog "your Bluetooth controller enabled and inserted at bootup or"
 		elog "PulseAudio will refuse to start."
-		elog
-		elog "Please note that the BlueTooth proximity module seems itself"
-		elog "still experimental, so please report to upstream if you have"
-		elog "problems with it."
 	fi
 	if use alsa; then
 		local pkg="media-plugins/alsa-plugins"