Remove old version, replace the esdcompat patch with the right one, thanks to Florian Scandella for noticing in bug #145843.

Package-Manager: portage-2.1.1_rc1-r2

9 files changed, 18 insertions, 454 deletions

diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest
index b6a147b73ece..b0d0564f2dd2 100644
--- a/media-sound/pulseaudio/Manifest
+++ b/media-sound/pulseaudio/Manifest
@@ -1,14 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX pulseaudio-0.9.2-esdcompat.patch 1047 RMD160 6fe3a3dfaa8fcbb85f6d765c703a0b67fa4036b8 SHA1 380a251ca85911aba1aad888ee057fd96532da12 SHA256 1b96565a6a7bbe185cbd21452470e9b8a1b8e256be994abf58791a986df60172
-MD5 9a380dd5a93494a7c1df3ac2f40a6452 files/pulseaudio-0.9.2-esdcompat.patch 1047
-RMD160 6fe3a3dfaa8fcbb85f6d765c703a0b67fa4036b8 files/pulseaudio-0.9.2-esdcompat.patch 1047
-SHA256 1b96565a6a7bbe185cbd21452470e9b8a1b8e256be994abf58791a986df60172 files/pulseaudio-0.9.2-esdcompat.patch 1047
-AUX pulseaudio-0.9.4-r1170.patch 542 RMD160 29f8969ba3fe5abd27fd5c52bf2acd4179af92d2 SHA1 6f929408a807256c3644be5e5b6f60145ccdab63 SHA256 275a5ec4bed49585d76e7cd64288caae57dbe61d6ade4c27ebbe87f82b7f4281
-MD5 cd0b71d4a1b1358807a1ccd83e15e0d6 files/pulseaudio-0.9.4-r1170.patch 542
-RMD160 29f8969ba3fe5abd27fd5c52bf2acd4179af92d2 files/pulseaudio-0.9.4-r1170.patch 542
-SHA256 275a5ec4bed49585d76e7cd64288caae57dbe61d6ade4c27ebbe87f82b7f4281 files/pulseaudio-0.9.4-r1170.patch 542
+AUX pulseaudio-0.9.5-esdcompat.patch 452 RMD160 dcd88a9b761819f5d23a342ce7d7b60412e44f2d SHA1 d22b4428392e3e1d0e1450ac5b63311c912ea26c SHA256 3fcd75716a4627a1b9093b782963f5d7df2a27e11998d3eefb1f8c6b43abfb72
+MD5 8742630795736e87363db80e0b9437cd files/pulseaudio-0.9.5-esdcompat.patch 452
+RMD160 dcd88a9b761819f5d23a342ce7d7b60412e44f2d files/pulseaudio-0.9.5-esdcompat.patch 452
+SHA256 3fcd75716a4627a1b9093b782963f5d7df2a27e11998d3eefb1f8c6b43abfb72 files/pulseaudio-0.9.5-esdcompat.patch 452
 AUX pulseaudio-0.9.5-fbsd.patch 1312 RMD160 bf57c80ad041b3c8f848eb90dd3c94164a041540 SHA1 0b48e2b3a396f2a2dc9b2a6ddb4bb88f942acca1 SHA256 a0c27008aa8a2de3253b2b1bc44bb9a7e874cc208c83c533b792b9d98e94b17a
 MD5 d8651b2b0d4adc4a99c33438ffe2a8a5 files/pulseaudio-0.9.5-fbsd.patch 1312
 RMD160 bf57c80ad041b3c8f848eb90dd3c94164a041540 files/pulseaudio-0.9.5-fbsd.patch 1312
@@ -21,41 +17,26 @@ AUX pulseaudio.init.d-2 581 RMD160 6990a5d0104622e4d9385c74932807bde493e987 SHA1
 MD5 13ba9b43823aef4b2ad4fdc137bfc7a4 files/pulseaudio.init.d-2 581
 RMD160 6990a5d0104622e4d9385c74932807bde493e987 files/pulseaudio.init.d-2 581
 SHA256 6febaaaa4b158ea3c9523d0382bee34f65e9c8a95ada0d47e477839df2c55264 files/pulseaudio.init.d-2 581
-DIST pulseaudio-0.9.4.tar.gz 1111744 RMD160 5a5f270ed9e2ec5ebc89e9592eb19cc6d8450e8b SHA1 d40fc9ea0dd7c32823635059515bbe92acc0401c SHA256 2e3f7e7d7177a6383acbe624bdb29d110459ac3c9d4a5ef07531836507a519fd
 DIST pulseaudio-0.9.5.tar.gz 1145930 RMD160 67f0cef89588453e347a2af5f641c9f953d4ef4b SHA1 c69c5a1f3e0cdc0c79f2ec3860e6aa02a049405e SHA256 cd82eabcf9fa310a64b58b621730cebe5d3edae7596a9c121155db455b1e58f6
-EBUILD pulseaudio-0.9.4-r1.ebuild 3323 RMD160 4f20daf755b35a34052bc36f57dbe038d602ae8d SHA1 748328b8ba8b488deb9e813942d072638195ed35 SHA256 6422092db49b8bb27c50402ffdd83c011d1ef9f958c009179c9e976547eed28b
-MD5 707b12aeccbb9a087805b88a53e557fb pulseaudio-0.9.4-r1.ebuild 3323
-RMD160 4f20daf755b35a34052bc36f57dbe038d602ae8d pulseaudio-0.9.4-r1.ebuild 3323
-SHA256 6422092db49b8bb27c50402ffdd83c011d1ef9f958c009179c9e976547eed28b pulseaudio-0.9.4-r1.ebuild 3323
-EBUILD pulseaudio-0.9.4.ebuild 3242 RMD160 92ccf180a8b312950a52fb9f80bf4a2af1d45de1 SHA1 5452648ec0cf37e12f81e695f15d380ccacb0ff4 SHA256 cb221991422da7397dd8864e2640ca9e04b58ea484f079aa67bc0d506c44eb6d
-MD5 08f266239b6eaf7ccecebfabebe1a92a pulseaudio-0.9.4.ebuild 3242
-RMD160 92ccf180a8b312950a52fb9f80bf4a2af1d45de1 pulseaudio-0.9.4.ebuild 3242
-SHA256 cb221991422da7397dd8864e2640ca9e04b58ea484f079aa67bc0d506c44eb6d pulseaudio-0.9.4.ebuild 3242
-EBUILD pulseaudio-0.9.5.ebuild 3518 RMD160 f762168b7de77f03922e00a133f0f0c6856ed451 SHA1 7c924d00f4afc6dfe5e8a8be0c35028ad64ab08c SHA256 6633b05e9315684d941df61876ea0f79197292476e9cd09f720e831200391ecf
-MD5 f83db7b8cf165aace3c43d134788b208 pulseaudio-0.9.5.ebuild 3518
-RMD160 f762168b7de77f03922e00a133f0f0c6856ed451 pulseaudio-0.9.5.ebuild 3518
-SHA256 6633b05e9315684d941df61876ea0f79197292476e9cd09f720e831200391ecf pulseaudio-0.9.5.ebuild 3518
-MISC ChangeLog 5228 RMD160 2eefbf637a2932917f6ea3e13e8a768a9f4c83b5 SHA1 7681ae964053989576c327a2a2ac4795b7516148 SHA256 356f9e1f951c5de22db42dc5bd8a012257c13e104b172062d1f854d2828bcd79
-MD5 df52c45b3e34d458a36335c68299f716 ChangeLog 5228
-RMD160 2eefbf637a2932917f6ea3e13e8a768a9f4c83b5 ChangeLog 5228
-SHA256 356f9e1f951c5de22db42dc5bd8a012257c13e104b172062d1f854d2828bcd79 ChangeLog 5228
+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
 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 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
-MD5 afeb92e5b3d14e829e730d37ab72006c files/digest-pulseaudio-0.9.4-r1 253
-RMD160 2241eb6958b54525d99b1a38ea30dace97aeb8a0 files/digest-pulseaudio-0.9.4-r1 253
-SHA256 66f3b356b175d77ac6b4e26f8696c126a4f1bb8eb61d150876f768c963c079ef files/digest-pulseaudio-0.9.4-r1 253
-MD5 721f0000d2b670e8e086600933df9995 files/digest-pulseaudio-0.9.5 253
-RMD160 afad8885c68b08dc4e537df2e3731329b0693b5b files/digest-pulseaudio-0.9.5 253
-SHA256 ab6179a1918a6773c82406c18c5c491c6c286ffa6b1934f53eadec3f11e1e62d files/digest-pulseaudio-0.9.5 253
+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
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFE+WwvAiZjviIA2XgRAtATAKDNVHPWk+3I0odN6QMvs76hsQfSggCgqMah
-JLQcIjgFgFPAyowO7U5G7+8=
-=OrPW
+iD8DBQFE+XcoAiZjviIA2XgRAuEKAKCchTt5i/0GDNBHTT51ZbxhuL9ApgCfRZfq
+AIX9dmmOMd36F/84NDPofOo=
+=5xDG
 -----END PGP SIGNATURE-----
diff --git a/media-sound/pulseaudio/files/digest-pulseaudio-0.9.4 b/media-sound/pulseaudio/files/digest-pulseaudio-0.9.4
deleted file mode 100644
index 2a357881d328..000000000000
--- a/media-sound/pulseaudio/files/digest-pulseaudio-0.9.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 aadbbc68306653f9052872c11e0cc707 pulseaudio-0.9.4.tar.gz 1111744
-RMD160 5a5f270ed9e2ec5ebc89e9592eb19cc6d8450e8b pulseaudio-0.9.4.tar.gz 1111744
-SHA256 2e3f7e7d7177a6383acbe624bdb29d110459ac3c9d4a5ef07531836507a519fd pulseaudio-0.9.4.tar.gz 1111744
diff --git a/media-sound/pulseaudio/files/digest-pulseaudio-0.9.4-r1 b/media-sound/pulseaudio/files/digest-pulseaudio-0.9.4-r1
deleted file mode 100644
index 2a357881d328..000000000000
--- a/media-sound/pulseaudio/files/digest-pulseaudio-0.9.4-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 aadbbc68306653f9052872c11e0cc707 pulseaudio-0.9.4.tar.gz 1111744
-RMD160 5a5f270ed9e2ec5ebc89e9592eb19cc6d8450e8b pulseaudio-0.9.4.tar.gz 1111744
-SHA256 2e3f7e7d7177a6383acbe624bdb29d110459ac3c9d4a5ef07531836507a519fd pulseaudio-0.9.4.tar.gz 1111744
diff --git a/media-sound/pulseaudio/files/digest-pulseaudio-0.9.5 b/media-sound/pulseaudio/files/digest-pulseaudio-0.9.5
deleted file mode 100644
index 0d68de7bdc88..000000000000
--- a/media-sound/pulseaudio/files/digest-pulseaudio-0.9.5
+++ /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/files/pulseaudio-0.9.2-esdcompat.patch b/media-sound/pulseaudio/files/pulseaudio-0.9.2-esdcompat.patch
deleted file mode 100644
index 8353857f4e52..000000000000
--- a/media-sound/pulseaudio/files/pulseaudio-0.9.2-esdcompat.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Index: pulseaudio-0.9.2/src/daemon/esdcompat.in
-===================================================================
---- pulseaudio-0.9.2.orig/src/daemon/esdcompat.in
-+++ pulseaudio-0.9.2/src/daemon/esdcompat.in
-@@ -28,12 +28,8 @@ fail() {
- 
- ARGS=" --log-target=syslog"
- 
--for N in $(seq $#) ; do
--
-+while [ -n "$1" ]; do
-     case "$1" in
--        "")
--            ;;
--
-         -v|--version)
-             echo "$VERSION_STRING"
-             exit 0
-@@ -70,20 +66,23 @@ EOF
-         -spawnpid)
-             shift
-             ARGS="$ARGS '-Lmodule-esound-compat-spawnpid pid=$1'"
-+	    shift
-             ;;
- 
-         -spawnfd)
-             shift
-             ARGS="$ARGS '-Lmodule-esound-compat-spawnfd fd=$1'"
-+	    shift
-             ;;
-         
-         -unix|-b|-public|-terminate|-nobeeps|-trust|-tcp|-promiscuous)  
-             # Ignore these commands
-+	    shift
-             ;; 
- 
-         -d|-r|-as|-port|-bind)
-             # Ignore these commands and their arguments
--            shift
-+            shift; shift
- 
-             ;;
- 
diff --git a/media-sound/pulseaudio/files/pulseaudio-0.9.4-r1170.patch b/media-sound/pulseaudio/files/pulseaudio-0.9.4-r1170.patch
deleted file mode 100644
index 03f7fac3fa72..000000000000
--- a/media-sound/pulseaudio/files/pulseaudio-0.9.4-r1170.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: src/daemon/caps.c
-===================================================================
---- src/daemon/caps.c	(revision 1169)
-+++ src/daemon/caps.c	(revision 1170)
-@@ -82,7 +82,7 @@
-     cap_value_t nice_cap = CAP_SYS_NICE;
- 
-     /* Only drop caps when called SUID */
--    if (getuid() != 0)
-+    if (getuid() == 0)
-         return 0;
- 
-     caps = cap_init();
-@@ -112,7 +112,7 @@
-     int r = -1;
- 
-     /* Only drop caps when called SUID */
--    if (getuid() != 0)
-+    if (getuid() == 0)
-         return 0;
- 
-     caps = cap_init();
diff --git a/media-sound/pulseaudio/pulseaudio-0.9.4-r1.ebuild b/media-sound/pulseaudio/pulseaudio-0.9.4-r1.ebuild
deleted file mode 100644
index e50fa0f8d58c..000000000000
--- a/media-sound/pulseaudio/pulseaudio-0.9.4-r1.ebuild
+++ /dev/null
@@ -1,113 +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.4-r1.ebuild,v 1.4 2006/08/17 20:58:52 jer 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"
-
-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 )
-	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"
-	# Fix working with caps
-	epatch "${FILESDIR}/${P}-r1170.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() {
-	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"
-	sed -e "s/@extradepend@/$extradepend/" "${FILESDIR}/pulseaudio.init.d-2" > "${T}/pulseaudio"
-	doinitd "${T}/pulseaudio"
-
-	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
-}
diff --git a/media-sound/pulseaudio/pulseaudio-0.9.4.ebuild b/media-sound/pulseaudio/pulseaudio-0.9.4.ebuild
deleted file mode 100644
index c1f800df5051..000000000000
--- a/media-sound/pulseaudio/pulseaudio-0.9.4.ebuild
+++ /dev/null
@@ -1,111 +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.4.ebuild,v 1.3 2006/07/29 15:34:18 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 ~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-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 )
-	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() {
-	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"
-	sed -e "s/@extradepend@/$extradepend/" "${FILESDIR}/pulseaudio.init.d-2" > "${T}/pulseaudio"
-	doinitd "${T}/pulseaudio"
-
-	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
-}
diff --git a/media-sound/pulseaudio/pulseaudio-0.9.5.ebuild b/media-sound/pulseaudio/pulseaudio-0.9.5.ebuild
deleted file mode 100644
index c8320f7783d7..000000000000
--- a/media-sound/pulseaudio/pulseaudio-0.9.5.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.ebuild,v 1.3 2006/09/02 11:33:59 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}/${PN}-0.9.2-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
-}