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

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

diff --git a/media-sound/pulseaudio/ChangeLog b/media-sound/pulseaudio/ChangeLog
index 7387f44d30b44f980af418438346b4134d2ba3eb..e0afa115d39874848ac2ac98aa562a45089bb1a1 100644 (file)
--- 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/Manifest b/media-sound/pulseaudio/Manifest
index 70b5fcdc74f8a6a922378b833be4b9887102a266..5cb4eea8da7c7c23c0526e3f62cc42350ec7ef3f 100644 (file)
--- a/media-sound/pulseaudio/Manifest
+++ b/media-sound/pulseaudio/Manifest
@@ -13,14 +13,14 @@ DIST pulseaudio-1.0.tar.xz 1305008 RMD160 eecacfcaa8e181a694589a889e26352a214f74
 EBUILD pulseaudio-0.9.22-r2.ebuild 6796 RMD160 02fc6a6e035cb758042d4dd40c311bb242cefbb2 SHA1 9592d4c27deb87758ce73a7e9d1760161d5f5697 SHA256 5c1b7996dd575cf24084d32b7957e41d6af547e6792ddf2b695c5cbe49bf4062
 EBUILD pulseaudio-0.9.22.ebuild 6673 RMD160 7fedd677e1965979a1b3ae723bc631f0ac9b9502 SHA1 8c20123736b20c264b255a579da3f848184f6104 SHA256 c20632a24bd755409e6e4fc6185174bd903f8c890b02d4b605dc7d9d427dbea8
 EBUILD pulseaudio-0.9.23-r1.ebuild 6447 RMD160 bdd2c8a238140a694d68a8a73ccd1c036edbe141 SHA1 296ce55f936d89e77ff99e34be01ac99ea2462ed SHA256 4df36f7090347daaebfdef125a08ee455f6b7572e5e9376ed9d4c6e142a7bba1
-EBUILD pulseaudio-1.0.ebuild 6475 RMD160 e40daa16a3e53632229f0d6158424953304526c8 SHA1 874a286c1771e64122f1cc56c72fca487c193299 SHA256 7ce2afb5b00ef2265d0f0055f2f4655d85076ddaafe79f93cafe704de2fa9d8d
-EBUILD pulseaudio-9999.ebuild 6466 RMD160 f7c56cb4f8769635258f606e1966eb38eecefb26 SHA1 dae64b4ae21c3f6e1b22086ed4ece75823841163 SHA256 89e27b7743c7a0f3e6568afa00452212c10781154b703cf6847b7b7ca21c5e6e
-MISC ChangeLog 47639 RMD160 b95291906ffe031babaaec3e58f2d77023eeebef SHA1 58156823a0ed5f83996eba1350b734e74b43e0ef SHA256 08b09533680b55619ff66f2b5adc49b3c969c7fb8ca22147005fa4241125a1fe
+EBUILD pulseaudio-1.0-r1.ebuild 6037 RMD160 b34bf746547a296dc90d100b04a7f6b80b29c868 SHA1 f18647654cfa01ab246f47d437cb4f30b0817978 SHA256 4db0caac66bf64bc074cb8135dccca3f43523d0d7f0492df08bfc558aeaf5c1f
+EBUILD pulseaudio-9999.ebuild 6025 RMD160 3a4b4c878beb9e76506398e14996fb2d00dfcf03 SHA1 8fdd2b0606d791f164e8214441ac3e98e6609050 SHA256 2a62648f22c244615383bbf02bd5bca781f4c2457c222286c9ef81434a75da35
+MISC ChangeLog 47877 RMD160 1fbf9039175184274c2638be1e4e8c508f6969c9 SHA1 231976776aeb96a1eea0490df060ea1083e98e0b SHA256 9e41cef81fdedffbd1663b8ab2a57de0ab91c4fc4e55087bef5cbda9842041d2
 MISC metadata.xml 2225 RMD160 270fc66edbe5134853cc06c1feaca8d94a8c50fd SHA1 1c8edb3e83bb3791d860e3b007e7dab37bdf3459 SHA256 57429e87e6e2902c0a81aa480f603ffa894234434c03da1ffef89d52493d848b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk6B09UACgkQ+Vqt1inD4uyJSQCfbVq60mScDY6epNP/4YH+iBov
-dEwAn11Q7fizTXLsDc/fd5+/tTBH0j5y
-=VH3L
+iEYEARECAAYFAk6DMCwACgkQ+Vqt1inD4uwSNACeJjc1Hrt6zjBAm2yVmUmd7U9C
+ZtgAn2Dh5BCz8GH4RquXWc1/iybj507h
+=AOBz
 -----END PGP SIGNATURE-----

diff --git a/media-sound/pulseaudio/pulseaudio-1.0.ebuild b/media-sound/pulseaudio/pulseaudio-1.0-r1.ebuild
similarity index 90%
rename from media-sound/pulseaudio/pulseaudio-1.0.ebuild
rename to media-sound/pulseaudio/pulseaudio-1.0-r1.ebuild
index 986a4aa3a694c13e73d60745afe5d766632ba088..7e71c5ee48e549dc36cc8cd4b6a5a27822fabb73 100644 (file)
--- 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 be8238a6be6dd15dd6fc01185a23e0ae15aa3b05..742eafaf2fc41cdf1c39502e399404c3ed526d2e 100644 (file)
--- 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"