The services previously in 'use' section are actually needed, make sure that restarting alsasound make pulseaudio restart.

(Portage version: 2.1.1_rc1-r4)
 (Signed Manifest commit)

3 files changed, 18 insertions, 140 deletions

diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest
index b0d0564f2dd2..692490485fcf 100644
--- a/media-sound/pulseaudio/Manifest
+++ b/media-sound/pulseaudio/Manifest
@@ -13,30 +13,30 @@ AUX pulseaudio.conf.d 275 RMD160 6317cb5be41a768428056c0057d8f5b1f189e804 SHA1 2
 MD5 bf7487ba2c48fc8a56bca41c97a18934 files/pulseaudio.conf.d 275
 RMD160 6317cb5be41a768428056c0057d8f5b1f189e804 files/pulseaudio.conf.d 275
 SHA256 c03661e8cc902d27ff6b52f291207f2b008957571b942abdd92a873a52aae0dd files/pulseaudio.conf.d 275
-AUX pulseaudio.init.d-2 581 RMD160 6990a5d0104622e4d9385c74932807bde493e987 SHA1 ff08e63f37fe43d7932213e6a64e3f06c5501bd6 SHA256 6febaaaa4b158ea3c9523d0382bee34f65e9c8a95ada0d47e477839df2c55264
-MD5 13ba9b43823aef4b2ad4fdc137bfc7a4 files/pulseaudio.init.d-2 581
-RMD160 6990a5d0104622e4d9385c74932807bde493e987 files/pulseaudio.init.d-2 581
-SHA256 6febaaaa4b158ea3c9523d0382bee34f65e9c8a95ada0d47e477839df2c55264 files/pulseaudio.init.d-2 581
+AUX pulseaudio.init.d-2 586 RMD160 8cff812d629fce32b5cdf59b628c77adda4990e1 SHA1 c8533dd1e0582acdea04fc311c8ef57b5b7f8275 SHA256 ad899956fa99bcb9c52f3ee31af1cedd9ea4f86edd885e1885aab06f396f34e6
+MD5 0fa5631e3565ce5dcde726884d1ebf6c files/pulseaudio.init.d-2 586
+RMD160 8cff812d629fce32b5cdf59b628c77adda4990e1 files/pulseaudio.init.d-2 586
+SHA256 ad899956fa99bcb9c52f3ee31af1cedd9ea4f86edd885e1885aab06f396f34e6 files/pulseaudio.init.d-2 586
 DIST pulseaudio-0.9.5.tar.gz 1145930 RMD160 67f0cef89588453e347a2af5f641c9f953d4ef4b SHA1 c69c5a1f3e0cdc0c79f2ec3860e6aa02a049405e SHA256 cd82eabcf9fa310a64b58b621730cebe5d3edae7596a9c121155db455b1e58f6
-EBUILD pulseaudio-0.9.5-r1.ebuild 3514 RMD160 f59526d636c3c286b8102b839244738339b01d17 SHA1 48308ca8004f2ec60c074cb2eea7d06a7f7bfeec SHA256 444ef3478e8c11d6655ff3af76b1336b941999d57adca1ea7cdde0562249d75a
-MD5 10edde810edb18e37954b781ee224b3b pulseaudio-0.9.5-r1.ebuild 3514
-RMD160 f59526d636c3c286b8102b839244738339b01d17 pulseaudio-0.9.5-r1.ebuild 3514
-SHA256 444ef3478e8c11d6655ff3af76b1336b941999d57adca1ea7cdde0562249d75a pulseaudio-0.9.5-r1.ebuild 3514
-MISC ChangeLog 5686 RMD160 146b9ccea5edf8abb2acf3e4d8763b33e63ea747 SHA1 9258c5cec26bac6a26ca7b4def60e393848da04a SHA256 a0aaaded23caf1e5bda700b8ffee3d10c0ac571328ff36d422be672e0e0da17f
-MD5 814b27a2573e83eb211d0284c0241d56 ChangeLog 5686
-RMD160 146b9ccea5edf8abb2acf3e4d8763b33e63ea747 ChangeLog 5686
-SHA256 a0aaaded23caf1e5bda700b8ffee3d10c0ac571328ff36d422be672e0e0da17f ChangeLog 5686
+EBUILD pulseaudio-0.9.5-r2.ebuild 3576 RMD160 66ecdb9a58122f9416a03c0f9cc7a0a2697fd7e0 SHA1 4c28c003a6f11af355221fde22832abfde7744ad SHA256 deb8187f980df6daeda4f2a0ef70f53192cc487478898d687f089de6c18befd5
+MD5 1846ca0e16b5f8210c9116d28e3a27ca pulseaudio-0.9.5-r2.ebuild 3576
+RMD160 66ecdb9a58122f9416a03c0f9cc7a0a2697fd7e0 pulseaudio-0.9.5-r2.ebuild 3576
+SHA256 deb8187f980df6daeda4f2a0ef70f53192cc487478898d687f089de6c18befd5 pulseaudio-0.9.5-r2.ebuild 3576
+MISC ChangeLog 5992 RMD160 f1d56dbe8fdb7a9fd2d7c5dffed80989aff76ea1 SHA1 371411f1b67d96542af125fcc7493d08b024be10 SHA256 dd281d9bbe773bd7cc5fd56610baa220311b50db5defbc9ec59c54c2e38988d1
+MD5 896370100954512f3e92c42b0f342f3c ChangeLog 5992
+RMD160 f1d56dbe8fdb7a9fd2d7c5dffed80989aff76ea1 ChangeLog 5992
+SHA256 dd281d9bbe773bd7cc5fd56610baa220311b50db5defbc9ec59c54c2e38988d1 ChangeLog 5992
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b metadata.xml 158
-MD5 721f0000d2b670e8e086600933df9995 files/digest-pulseaudio-0.9.5-r1 253
-RMD160 afad8885c68b08dc4e537df2e3731329b0693b5b files/digest-pulseaudio-0.9.5-r1 253
-SHA256 ab6179a1918a6773c82406c18c5c491c6c286ffa6b1934f53eadec3f11e1e62d files/digest-pulseaudio-0.9.5-r1 253
+MD5 721f0000d2b670e8e086600933df9995 files/digest-pulseaudio-0.9.5-r2 253
+RMD160 afad8885c68b08dc4e537df2e3731329b0693b5b files/digest-pulseaudio-0.9.5-r2 253
+SHA256 ab6179a1918a6773c82406c18c5c491c6c286ffa6b1934f53eadec3f11e1e62d files/digest-pulseaudio-0.9.5-r2 253
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFE+XcoAiZjviIA2XgRAuEKAKCchTt5i/0GDNBHTT51ZbxhuL9ApgCfRZfq
-AIX9dmmOMd36F/84NDPofOo=
-=5xDG
+iD8DBQFE/epyAiZjviIA2XgRAhvTAJ9jikHIo6rN7NfUHIxVeNQ73pVtugCeLe+1
+kps4QY7xW2BadyfyR9pR/rY=
+=kMMe
 -----END PGP SIGNATURE-----
diff --git a/media-sound/pulseaudio/files/digest-pulseaudio-0.9.5-r1 b/media-sound/pulseaudio/files/digest-pulseaudio-0.9.5-r1
deleted file mode 100644
index 0d68de7bdc88..000000000000
--- a/media-sound/pulseaudio/files/digest-pulseaudio-0.9.5-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 99b5d9efd4fce35cabb4ae5d0ebb230d pulseaudio-0.9.5.tar.gz 1145930
-RMD160 67f0cef89588453e347a2af5f641c9f953d4ef4b pulseaudio-0.9.5.tar.gz 1145930
-SHA256 cd82eabcf9fa310a64b58b621730cebe5d3edae7596a9c121155db455b1e58f6 pulseaudio-0.9.5.tar.gz 1145930
diff --git a/media-sound/pulseaudio/pulseaudio-0.9.5-r1.ebuild b/media-sound/pulseaudio/pulseaudio-0.9.5-r1.ebuild
deleted file mode 100644
index 2ce6b46b9708..000000000000
--- a/media-sound/pulseaudio/pulseaudio-0.9.5-r1.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.9.5-r1.ebuild,v 1.1 2006/09/02 12:20:49 flameeyes Exp $
-
-inherit eutils libtool # autotools
-
-DESCRIPTION="A networked sound server with an advanced plugin system"
-HOMEPAGE="http://0pointer.de/lennart/projects/pulseaudio/"
-SRC_URI="http://0pointer.de/lennart/projects/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-
-IUSE="alsa avahi caps jack lirc oss tcpd X hal"
-
-RDEPEND="X? ( || ( x11-libs/libX11 <virtual/x11-7 ) )
-	caps? ( sys-libs/libcap )
-	>=media-libs/audiofile-0.2.6-r1
-	>=media-libs/libsamplerate-0.1.1-r1
-	>=media-libs/libsndfile-1.0.10
-	>=dev-libs/liboil-0.3.6
-	alsa? ( >=media-libs/alsa-lib-1.0.10 )
-	>=dev-libs/glib-2.4.0
-	avahi? ( >=net-dns/avahi-0.6.12 )
-	>=dev-libs/liboil-0.3.0
-	jack? ( >=media-sound/jack-audio-connection-kit-0.100 )
-	tcpd? ( sys-apps/tcp-wrappers )
-	lirc? ( app-misc/lirc )
-	hal? ( >=sys-apps/hal-0.5.7 )
-	app-admin/eselect-esd"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-pkg_setup() {
-	if use avahi && ! built_with_use net-dns/avahi dbus ; then
-		echo
-		eerror "In order to compile pulseaudio with avahi support, you need to have"
-		eerror "net-dns/avahi emerged with 'dbus' in your USE flag. Please add that"
-		eerror "flag, re-emerge avahi, and then emerge pulseaudio again."
-		die "net-dns/avahi is missing the D-Bus bindings."
-	fi
-
-	enewgroup audio 18 # Just make sure it exists
-	enewgroup pulse-access
-	enewgroup pulse
-	enewuser pulse -1 -1 /var/run/pulse pulse,audio
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${P}-esdcompat.patch"
-	epatch "${FILESDIR}/${P}-fbsd.patch"
-
-	# eautoreconf
-	elibtoolize
-}
-
-src_compile() {
-	econf \
-		--enable-largefile \
-		--enable-glib2 \
-		--disable-solaris \
-		--disable-asyncns \
-		$(use_enable oss) \
-		$(use_enable alsa) \
-		$(use_enable lirc) \
-		$(use_enable tcpd tcpwrap) \
-		$(use_enable jack) \
-		$(use_enable lirc) \
-		$(use_enable avahi) \
-		$(use_enable hal) \
-		$(use_with caps) \
-		$(use_with X x) \
-		--disable-ltdl-install \
-		--localstatedir=/var \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	newconfd "${FILESDIR}/pulseaudio.conf.d" pulseaudio
-
-	local extradepend
-	use alsa && extradepend="$extradepend alsasound"
-	use avahi && extradepend="$extradepend avahi"
-	use hal && extradepend="$extradepend hald"
-	sed -e "s/@extradepend@/$extradepend/" "${FILESDIR}/pulseaudio.init.d-2" > "${T}/pulseaudio"
-	doinitd "${T}/pulseaudio"
-
-	if ! use hal; then
-		sed -i -e '/module-hal-detect/s:^:#: ; /module-detect/s:^#::' "${D}/etc/pulse/default.pa"
-	fi
-
-	dohtml -r doc
-	dodoc README
-
-	# Create the state directory
-	diropts -o pulse -g pulse -m0755
-	keepdir /var/run/pulse
-}
-
-pkg_postinst() {
-	elog "PulseAudio in Gentoo can use a system-wide pulseaudio daemon."
-	elog "This support is enabled by starting the pulsedaemon init.d ."
-	elog "To be able to access that you need to be in the group pulse-access."
-	elog "For more information about system-wide support, please refer to"
-	elog "	 http://pulseaudio.org/wiki/SystemWideInstance"
-
-	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."
-
-	eselect esd update --if-unset
-}