Require avahi 0.6.12 to complete the fix of 0.9.4 version. Remove old version.

(Portage version: 2.1.1_pre3-r5)
 (Signed Manifest commit)

3 files changed, 11 insertions, 130 deletions

diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest
index 45a03b8a8c66..36c698c8a94f 100644
--- a/media-sound/pulseaudio/Manifest
+++ b/media-sound/pulseaudio/Manifest
@@ -13,34 +13,26 @@ AUX pulseaudio.init.d-2 456 RMD160 55215b87dff432e1bdc919a327a3b41386bc7ff5 SHA1
 MD5 3dd0ae11af8d212ae5b6f711fc3d3ed5 files/pulseaudio.init.d-2 456
 RMD160 55215b87dff432e1bdc919a327a3b41386bc7ff5 files/pulseaudio.init.d-2 456
 SHA256 0171096817367df4fd639d6122832ffaf49073848827f519857d04d64f855f31 files/pulseaudio.init.d-2 456
-DIST pulseaudio-0.9.3.tar.gz 1111287 RMD160 88ce7f6f55a4ece7620d148912bc6efed8c807f6 SHA1 d3c528acf5d84cf207e4e1e9a41b5efd59dece9a SHA256 f07bd02e1769485c72bd299e4eb28f9eb29a96fb943267e26e49b6ba34d377fc
 DIST pulseaudio-0.9.4.tar.gz 1111744 RMD160 5a5f270ed9e2ec5ebc89e9592eb19cc6d8450e8b SHA1 d40fc9ea0dd7c32823635059515bbe92acc0401c SHA256 2e3f7e7d7177a6383acbe624bdb29d110459ac3c9d4a5ef07531836507a519fd
-EBUILD pulseaudio-0.9.3.ebuild 3152 RMD160 91e8ec0a1ed8f5c89bea76ca4c4d86709675fb2e SHA1 20b8bec3c2017be12f3a18bc928d72de7c8dea24 SHA256 d1bc0311ea0b03c7cfe8ea3a84a36bfd5846b0f50c1a1b97e09064cae2574065
-MD5 e9459e25a3f2b7e6599d2f9ffed8ff13 pulseaudio-0.9.3.ebuild 3152
-RMD160 91e8ec0a1ed8f5c89bea76ca4c4d86709675fb2e pulseaudio-0.9.3.ebuild 3152
-SHA256 d1bc0311ea0b03c7cfe8ea3a84a36bfd5846b0f50c1a1b97e09064cae2574065 pulseaudio-0.9.3.ebuild 3152
-EBUILD pulseaudio-0.9.4.ebuild 3154 RMD160 7ca9de4f2ca5773208dd42793518972a9afea730 SHA1 fe144fa1737043bf0fdd6a97eb8d17ba9db60c2c SHA256 604404f697b134c7bdcbeaea74e171273cef8857022e727cadf7dbbd6adda794
-MD5 f86b8d9602c1d17a09ee762eaa485f8a pulseaudio-0.9.4.ebuild 3154
-RMD160 7ca9de4f2ca5773208dd42793518972a9afea730 pulseaudio-0.9.4.ebuild 3154
-SHA256 604404f697b134c7bdcbeaea74e171273cef8857022e727cadf7dbbd6adda794 pulseaudio-0.9.4.ebuild 3154
-MISC ChangeLog 3752 RMD160 ace4e1722d8e690ef210fe9ccffb0e9b6291f9f7 SHA1 bdbf944e2183d3dda2bd4e6bd88a9fb47e1cc630 SHA256 240dfbfa2a9bf37623ee47f9cdbb374552084426209ef4c46f455694f1fee1a3
-MD5 e5315b06ba64437fa0ec978f3ee6226e ChangeLog 3752
-RMD160 ace4e1722d8e690ef210fe9ccffb0e9b6291f9f7 ChangeLog 3752
-SHA256 240dfbfa2a9bf37623ee47f9cdbb374552084426209ef4c46f455694f1fee1a3 ChangeLog 3752
+EBUILD pulseaudio-0.9.4.ebuild 3163 RMD160 798d88f650820c1c67706392a7f7402211aea105 SHA1 32857363622ab00005b35e305ac3c0921470d07a SHA256 81df2c8777da5d7f43b9aa5940455d359728cdcfd9c0f28e9ad7e80efe501c6f
+MD5 16bfff865775d6d89c1468a0f9f26025 pulseaudio-0.9.4.ebuild 3163
+RMD160 798d88f650820c1c67706392a7f7402211aea105 pulseaudio-0.9.4.ebuild 3163
+SHA256 81df2c8777da5d7f43b9aa5940455d359728cdcfd9c0f28e9ad7e80efe501c6f pulseaudio-0.9.4.ebuild 3163
+MISC ChangeLog 3940 RMD160 e761615dc295a56f30de4d4513236b569823c1cd SHA1 186b195a2d6be1822631651d22eead2885fce566 SHA256 9b562637f46f84efeb3cd21c080b1d1ad0a7193626854982df1ea2fa19ff9c3b
+MD5 eefeb0dc349451086ce32f0232b80c51 ChangeLog 3940
+RMD160 e761615dc295a56f30de4d4513236b569823c1cd ChangeLog 3940
+SHA256 9b562637f46f84efeb3cd21c080b1d1ad0a7193626854982df1ea2fa19ff9c3b ChangeLog 3940
 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 24e8d97acc4531bb49f749c953d46060 files/digest-pulseaudio-0.9.3 253
-RMD160 4f363587c83de1c7e99e3c02cd4ef5b7a71b7511 files/digest-pulseaudio-0.9.3 253
-SHA256 0f9ad61c4a77222a914e24850dca93af82a4bbfaa8e0d1f33d12352ebb4b2ea3 files/digest-pulseaudio-0.9.3 253
 MD5 afeb92e5b3d14e829e730d37ab72006c files/digest-pulseaudio-0.9.4 253
 RMD160 2241eb6958b54525d99b1a38ea30dace97aeb8a0 files/digest-pulseaudio-0.9.4 253
 SHA256 66f3b356b175d77ac6b4e26f8696c126a4f1bb8eb61d150876f768c963c079ef files/digest-pulseaudio-0.9.4 253
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFEyAhnAiZjviIA2XgRAlVbAJ0XN2qeQ6x6nKJifLaS5J9f7rFCnwCdH9Td
-d7LYMoMiwLgR/9x0PDIILoo=
-=Teay
+iD8DBQFEyR75AiZjviIA2XgRAtEZAKCBhCDLusVhASqGxPS8+QOggstAhQCguSjo
+hZLxZlsAxgPd/7sFJywDxlU=
+=2BvQ
 -----END PGP SIGNATURE-----
diff --git a/media-sound/pulseaudio/files/digest-pulseaudio-0.9.3 b/media-sound/pulseaudio/files/digest-pulseaudio-0.9.3
deleted file mode 100644
index 083d602152a0..000000000000
--- a/media-sound/pulseaudio/files/digest-pulseaudio-0.9.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 65da3e44e0580425dae628f7e39149cb pulseaudio-0.9.3.tar.gz 1111287
-RMD160 88ce7f6f55a4ece7620d148912bc6efed8c807f6 pulseaudio-0.9.3.tar.gz 1111287
-SHA256 f07bd02e1769485c72bd299e4eb28f9eb29a96fb943267e26e49b6ba34d377fc pulseaudio-0.9.3.tar.gz 1111287
diff --git a/media-sound/pulseaudio/pulseaudio-0.9.3.ebuild b/media-sound/pulseaudio/pulseaudio-0.9.3.ebuild
deleted file mode 100644
index 2afd631943a3..000000000000
--- a/media-sound/pulseaudio/pulseaudio-0.9.3.ebuild
+++ /dev/null
@@ -1,108 +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.3.ebuild,v 1.3 2006/07/22 10:40:37 zaheerm 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 ~ppc ~x86-fbsd ~x86"
-
-IUSE="alsa avahi caps jack lirc oss tcpd X"
-
-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 )
-	>=dev-libs/liboil-0.3.0
-	jack? ( >=media-sound/jack-audio-connection-kit-0.100 )
-	tcpd? ( sys-apps/tcp-wrappers )
-	lirc? ( app-misc/lirc )
-	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}/${PN}-0.9.2-esdcompat.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_with caps) \
-		$(use_with X x) \
-		--disable-ltdl-install \
-		--localstatedir=/var \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	local extradepend
-
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	newconfd "${FILESDIR}/pulseaudio.conf.d" pulseaudio
-
-	use alsa && extradepend="$extradepend alsasound"
-	use avahi && extradepend="$extradepend avahi"
-	sed -e "s/@extradepend@/$extradepend/" "${FILESDIR}/pulseaudio.init.d-2" > "${T}/pulseaudio"
-	doinitd "${T}/pulseaudio"
-
-	dohtml -r doc
-	dodoc README doc/todo
-}
-
-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
-}