Drop old redundant versions.

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

7 files changed, 11 insertions, 788 deletions

diff --git a/media-sound/pulseaudio/ChangeLog b/media-sound/pulseaudio/ChangeLog
index a7f441e686d6..40457c3196c7 100644
--- a/media-sound/pulseaudio/ChangeLog
+++ b/media-sound/pulseaudio/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/pulseaudio
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.273 2012/06/13 11:54:50 ford_prefect Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.274 2012/07/05 14:18:14 ford_prefect Exp $
+
+  05 Jul 2012; Arun Raghavan <ford_prefect@gentoo.org>
+  -pulseaudio-0.9.22.ebuild, -pulseaudio-0.9.23-r1.ebuild,
+  -files/pulseaudio-1.0-version-fix.patch, -pulseaudio-1.1.ebuild,
+  -files/pulseaudio.init.d-4:
+  Drop old redundant versions.
 
 *pulseaudio-2.0-r1 (13 Jun 2012)
 
diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest
index b42e9744da79..351314b95d60 100644
--- a/media-sound/pulseaudio/Manifest
+++ b/media-sound/pulseaudio/Manifest
@@ -4,30 +4,24 @@ Hash: SHA1
 AUX pulseaudio-0.9.21-armv5-build-fix.patch 3387 RMD160 a3c3d2cd97478fc7ee53eb9aa6054d7c09271ec4 SHA1 1a3747c5e24c2cc26e43348a12627725b5d6242f SHA256 4734ffb3b038194911627c20959f75609da76e8e071da0833a794f264c243000
 AUX pulseaudio-0.9.22-xcb-atom-2.patch 4381 RMD160 9f46c2d75c7c89f23919ef890829af4533166304 SHA1 c427582c9724b034c0e72f76685e32e44f281868 SHA256 7c256858654529302ec242dadf2a6123da7077154fe31adc26ca96f8824becd4
 AUX pulseaudio-0.9.22-xcb-atom.patch 3026 RMD160 3b88da261896e393294e6d11ebdc0986fb7cedde SHA1 23ea548e6a3853c1052c8e4516d396132cfb7221 SHA256 b7c528c3f20743d4337878138b0d0f12073a50b4d435c72812d06c472ebb1104
-AUX pulseaudio-1.0-version-fix.patch 1756 RMD160 e7897bdeb833cc402b33d004e4713ef3a25a17d0 SHA1 c0631f979b4ebf351b3a9b815b88f3e26fdfba21 SHA256 a8a84f768d2aded658b1cf2b75e95a67051380edec9dac8494692e6870c982a7
 AUX pulseaudio-1.1-machine-id-fix.patch 1723 RMD160 e878e71f52af36b84e5464114977adfb9b4d18b7 SHA1 67aa832703237c41f1ab9bf9a6e2ee9dc1b946e8 SHA256 4167f52eb2dfb2c6fcaab1c6dda3f1208556dfc2e3511e46b63b686d14e204d3
 AUX pulseaudio-1.1-python3-fix.patch 5200 RMD160 c00325ed5417406f57f755f772eeae7e5335f8d9 SHA1 c0440858890ad01a09fbcb59647fb0df331cc4e1 SHA256 cd7b6a4702e11afe91d6f5f3c7e10d1db540709c5c4ad478aa550a23233ec3f6
 AUX pulseaudio.conf.d 275 RMD160 6317cb5be41a768428056c0057d8f5b1f189e804 SHA1 22ed7f1de0f2a18a608c5e9a91635ee66addac4d SHA256 c03661e8cc902d27ff6b52f291207f2b008957571b942abdd92a873a52aae0dd
-AUX pulseaudio.init.d-4 2493 RMD160 9f6b2f487298a5576b60b53095ee697095b88c89 SHA1 80f0e5e621d9312a7b24129fe843dd7ce085756d SHA256 dc8caa43aa297d2ca4019eef5b3cb64b3a57741e611620490f8d79091790f363
 AUX pulseaudio.init.d-5 2352 RMD160 36a3732386617f5436a60d0d9248a69da9804c5d SHA1 4b2fa2f0437b78b0a7fd5a54e8a83b02c99af579 SHA256 60e4571a8af0437bd99cfd858fde1e6223544a60e591febf25e55e4a2918ff59
 DIST pulseaudio-0.9.22.tar.gz 2076785 RMD160 31199c497f7b1cce2285a6369d43fc1f66cd41a4 SHA1 f5fc14d7a62ae9f9ee9745026e3f13f4c130140a SHA256 c6019324395117a258c048a6db5e9734551cc2c61dc35b46403ff00d64be55f0
-DIST pulseaudio-0.9.23.tar.gz 2095454 RMD160 1f5d19a40279327dcd04908e4f441c95a986313d SHA1 361f7d89606e8423aad19691bb27f6552e0b679e SHA256 af3e84c614cb632fd1f57105489fcd5f93f906da1ce5aa9019492212031fba4e
 DIST pulseaudio-1.1.tar.xz 1306168 RMD160 26faa0831a97ce02b1d9b256f5171ece797c721b SHA1 5ff451389951f79949a461b95168558cc4120e73 SHA256 6fe531136f6ebce2d35872a2d2c914278cdc5dcdd5eea516dc52c81f9001f5ee
 DIST pulseaudio-2.0.tar.xz 1353708 RMD160 0a0320732a60747ca7f86074ba897caaf317d246 SHA1 a999d2cd8044651c8bd610079bb74eab808484bf SHA256 28b42edd42f4879a6884af5f0ec11801ac001eb7582881215b36649aa37e2061
 EBUILD pulseaudio-0.9.22-r2.ebuild 6781 RMD160 affb1a7f47833a7c19d46529a17faa9d30f8a642 SHA1 4cd0d584ca616b4dff3e9b7f0398b4fe1519e317 SHA256 d2094809a5fdc3d0196ff71ce5636c5f1b4bab5bc92faafd2957d107dc6c19c7
-EBUILD pulseaudio-0.9.22.ebuild 6653 RMD160 356e3fcd66a40e1d8851fcc098d398360f80b503 SHA1 208b6047d4f7d227e8872efc620934ca40d76fc7 SHA256 9a373fd842f53420f4a6bcc544bf8eddc25ffd6c58138b2bc881e1b789fd0cae
-EBUILD pulseaudio-0.9.23-r1.ebuild 6466 RMD160 e3ce9b1f3ad34a5617c9649df137e6fc2d08a4f3 SHA1 4ffc1b2832f2dee871dfee242d04adf30a54a5b3 SHA256 c738221695082ac79d4270b6b81bc4be3cfacc07011d113082132a7fb82be8b4
 EBUILD pulseaudio-1.1-r1.ebuild 6764 RMD160 3685acda41e95c317e90ca3ec61ecbdcfe64e9a8 SHA1 e06d5805d42918cfd37820d0929394308db1d5d0 SHA256 4b8374c53ce2f356264b96a7821c8ffe5b1d6987539a09028454774819920cb9
-EBUILD pulseaudio-1.1.ebuild 6080 RMD160 6035b98f9774f01af192cbfe82a8c1e88c06ea50 SHA1 22ba284dc0af1ef4c5b8f12e67164e2cc41db385 SHA256 abeb44fcc5ba68d9bd3080a1daea3f75269f899d80d7fbaa5d504f7213b6cba5
 EBUILD pulseaudio-2.0-r1.ebuild 6660 RMD160 e90f5c9af602fc717ad188483472170aa50b5132 SHA1 87389b073aba62658681d848a26ba98289e77dfd SHA256 5c4b3f03c35ee276d379bde17aab29117338092e08c79a7d7f311d3b9d79ece3
 EBUILD pulseaudio-2.0.ebuild 6499 RMD160 14ad868a68d8f58cf0404cd009f3fc7471c72566 SHA1 217b5c52e28fe690dbdc5723e98af408ee566e43 SHA256 2ab31708ae7818a2775ee42c27f4f45fd37188bb476ca5d5b3f88d814d84e761
 EBUILD pulseaudio-9999.ebuild 6624 RMD160 5707c07a6f200c4a1d414bddd8978cdbb8a6357b SHA1 2b4e14e78905941920bc90f2611557c988323558 SHA256 f0a59fc151f3e6f1f3e3764f05fb42719f924a87df71cb1b18fc995dadb9a6e9
-MISC ChangeLog 53379 RMD160 76a8db6f75c661b122b0cc40705362ae2fa665f4 SHA1 6f0c122397f39c3d88ef96d16892a28cc19dbbb6 SHA256 5866e618d544aa4fd594f7087638328c171315b39269e8019b7c9b795a9f18a4
+MISC ChangeLog 53622 RMD160 6f80ee7c7abb828dc5aaf167138e04d1eac6478b SHA1 d09f9473832ab2685858f93549fe329b9dd5e72c SHA256 1475bfc65e8b1c6ddadcabc67686a43d498d36e3f5238c4039bf002ead7857cb
 MISC metadata.xml 2879 RMD160 4bd9e313a4a00ae525c1e6ad8e7c1652db56a094 SHA1 c03935c05e7c4de135090f6a4475522ce12322e6 SHA256 826fc6b7534f5f2c3d9f7ca010373c03ce3287007e7536aa044634996de55598
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk/Yf5cACgkQ+Vqt1inD4uyv0QCfWgUx0bjRihGpVow1LcVja2ak
-2kQAnRkYGp1JLueCVby22cni6gNfLdpW
-=Wh6Y
+iEYEARECAAYFAk/1oiYACgkQ+Vqt1inD4uxHZACdEL3bux7slk6RniqbocW6fSWJ
+Gk0An27N08+HAfQuMxBHpx3gwb3DzGEF
+=YPh1
 -----END PGP SIGNATURE-----
diff --git a/media-sound/pulseaudio/files/pulseaudio-1.0-version-fix.patch b/media-sound/pulseaudio/files/pulseaudio-1.0-version-fix.patch
deleted file mode 100644
index 13378db01851..000000000000
--- a/media-sound/pulseaudio/files/pulseaudio-1.0-version-fix.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 7563e0bbb54fbac54e77f3a62d9761a70f3a559c Mon Sep 17 00:00:00 2001
-From: Colin Guthrie <colin@mageia.org>
-Date: Sat, 1 Oct 2011 12:03:44 +0100
-Subject: [PATCH] libpulse: Always return a three part version number in API
- calls.
-
-For both the headers and the library we should provide clean, three part
-strings as this has been what we've previously done in the past
-and some external systems apparently rely on this format. While it's not
-something we've officially commented on before, there is no real advantage
-to us to change it so let's not try to tidy things up too much
-considering some third party apps (e.g. Skype) seem to dislike a two
-part version string.
----
- src/pulse/context.c    |    2 +-
- src/pulse/version.h.in |    2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/pulse/context.c b/src/pulse/context.c
-index 25d04a1..af144aa 100644
---- a/src/pulse/context.c
-+++ b/src/pulse/context.c
-@@ -1281,7 +1281,7 @@ pa_operation* pa_context_set_name(pa_context *c, const char *name, pa_context_su
- }
- 
- const char* pa_get_library_version(void) {
--    return PACKAGE_VERSION;
-+    return pa_get_headers_version();
- }
- 
- const char* pa_context_get_server(pa_context *c) {
-diff --git a/src/pulse/version.h.in b/src/pulse/version.h.in
-index 7e00c5e..1be4c75 100644
---- a/src/pulse/version.h.in
-+++ b/src/pulse/version.h.in
-@@ -35,7 +35,7 @@ PA_C_DECL_BEGIN
- /** Return the version of the header files. Keep in mind that this is
- a macro and not a function, so it is impossible to get the pointer of
- it. */
--#define pa_get_headers_version() ("@PACKAGE_VERSION@")
-+#define pa_get_headers_version() ("@PA_MAJOR@.@PA_MINOR@.0")
- 
- /** Return the version of the library the current application is
-  * linked to. */
--- 
-1.7.6.1
-
diff --git a/media-sound/pulseaudio/files/pulseaudio.init.d-4 b/media-sound/pulseaudio/files/pulseaudio.init.d-4
deleted file mode 100644
index 30bc2abcb906..000000000000
--- a/media-sound/pulseaudio/files/pulseaudio.init.d-4
+++ /dev/null
@@ -1,87 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/files/pulseaudio.init.d-4,v 1.6 2009/09/13 10:46:12 flameeyes Exp $
-
-depend() {
-	need localmount
-	use net
-
-	local script="/etc/pulse/system.pa"
-
-	for opt in ${PA_OPTS}; do
-		case "$opt" in
-			--file=*)	script="${opt#*=}" ;;
-			-F*)		script="${opt#-F}" ;;
-		esac
-	done
-
-	config "$script"
-
-	local needs="$(get_options need)"
-	if [ -n "${needs}" ]; then
-		need ${needs}
-		return
-	fi
-
-	if egrep -q '^[[:space:]]*load-module[[:space:]]+module-console-kit' "$script"; then
-	    needs="${needs} consolekit"
-	fi
-
-#ifdef UDEV
-	if egrep -q '^[[:space:]]*load-module[[:space:]]+module-udev-detect' "$script"; then
-	    needs="${needs} udev"
-	fi
-#endif
-
-#ifdef HAL
-	if egrep -q '^[[:space:]]*load-module[[:space:]]+module-hal-detect' "$script"; then
-	    needs="${needs} hald"
-	fi
-#endif
-
-#ifdef AVAHI
-	if egrep -q '^[[:space:]]*load-module[[:space:]]+module-zeroconf-publish' "$script"; then
-	    needs="${needs} avahi-daemon"
-	fi
-#endif
-
-#ifdef BLUETOOTH
-	if egrep -q '^[[:space:]]*load-module[[:space:]]+module-bt-proximity' "$script"; then
-	    needs="${needs} bluetooth"
-	fi
-#endif
-
-#ifdef ALSA
-	if egrep -q '^[[:space:]]*load-module[[:space:]]+module-alsa-(sink|source)' "$script" || 
-	    egrep -q '^[[:space:]]*load-module[[:space:]]+module-((hal|udev)-)?detect' "$script" ||
-	    egrep -q '^[[:space:]]*add-autoload-source[[:space:]]+(input|output)[[:space:]]+module-alsa-(sink|source)' "$script"; then
-	    needs="${needs} alsasound"
-	fi
-#endif
-
-	need "${needs}"
-	save_options need "${needs}"
-}
-
-start() {
-	if [ -z "${PULSEAUDIO_SHOULD_NOT_GO_SYSTEMWIDE}" ]; then
-		eerror "Please don't use system wide PulseAudio unless you read the"
-		eerror "documentation available at http://www.pulseaudio.org/wiki/WhatIsWrongWithSystemMode"
-		eerror ""
-		eerror "When you're done, please set the variable PULSEAUDIO_SHOULD_NOT_GO_SYSTEMWIDE in"
-		eerror "/etc/conf.d/pulseaudio . Please remember that upstream does not support this mode"
-		eerror "when used for standard desktop configurations."
-		return 1
-	fi
-	ebegin "Starting pulseaudio"
-	PA_ALL_OPTS="${PA_OPTS} --fail=1 --daemonize=1 --system"
-	start-stop-daemon --start --exec /usr/bin/pulseaudio -- ${PA_ALL_OPTS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping pulseaudio"
-	start-stop-daemon --stop --quiet --exec /usr/bin/pulseaudio --pidfile /var/run/pulse/pid
-	eend $?
-}
diff --git a/media-sound/pulseaudio/pulseaudio-0.9.22.ebuild b/media-sound/pulseaudio/pulseaudio-0.9.22.ebuild
deleted file mode 100644
index dff41d4f5863..000000000000
--- a/media-sound/pulseaudio/pulseaudio-0.9.22.ebuild
+++ /dev/null
@@ -1,221 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.9.22.ebuild,v 1.23 2012/06/01 03:01:18 zmedico Exp $
-
-EAPI=3
-
-inherit autotools eutils libtool flag-o-matic multilib user versionator
-
-DESCRIPTION="A networked sound server with an advanced plugin system"
-HOMEPAGE="http://www.pulseaudio.org/"
-
-SRC_URI="http://0pointer.de/lennart/projects/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2 GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux"
-IUSE="+alsa avahi +caps jack lirc oss tcpd +X dbus libsamplerate gnome bluetooth +asyncns +glib test doc +udev ipv6 system-wide realtime"
-
-RDEPEND="app-admin/eselect-esd
-	X? (
-		|| ( >=x11-libs/libX11-1.4.0 <x11-libs/libX11-1.4.0[xcb] )
-		<x11-libs/xcb-util-0.3.8
-		x11-libs/libSM
-		x11-libs/libICE
-		x11-libs/libXtst
-	)
-	caps? ( sys-libs/libcap )
-	libsamplerate? ( >=media-libs/libsamplerate-0.1.1-r1 )
-	alsa? ( >=media-libs/alsa-lib-1.0.19 )
-	glib? ( >=dev-libs/glib-2.4.0 )
-	avahi? ( >=net-dns/avahi-0.6.12[dbus] )
-	jack? ( >=media-sound/jack-audio-connection-kit-0.100 )
-	tcpd? ( sys-apps/tcp-wrappers )
-	lirc? ( app-misc/lirc )
-	dbus? ( >=sys-apps/dbus-1.0.0 )
-	gnome? ( >=gnome-base/gconf-2.4.0 )
-	bluetooth? (
-		>=net-wireless/bluez-4
-		>=sys-apps/dbus-1.0.0
-	)
-	asyncns? ( net-libs/libasyncns )
-	udev? ( || ( >=sys-fs/udev-171[hwdb] >=sys-fs/udev-143[extras] ) )
-	realtime? ( sys-auth/rtkit )
-	>=media-libs/speex-1.2_beta
-	>=media-libs/libsndfile-1.0.20
-	sys-libs/gdbm
-	>=sys-devel/libtool-2.2.4" # it's a valid RDEPEND, libltdl.so is used
-
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	X? (
-		x11-proto/xproto
-		|| ( >=x11-libs/libXtst-1.0.99.2 <x11-proto/xextproto-7.0.99 )
-	)
-	dev-libs/libatomic_ops
-	virtual/pkgconfig
-	system-wide? ( || ( dev-util/unifdef sys-freebsd/freebsd-ubin ) )
-	dev-util/intltool"
-
-# alsa-utils dep is for the alsasound init.d script (see bug #155707)
-# bluez dep is for the bluetooth init.d script
-RDEPEND="${RDEPEND}
-	X? ( gnome-extra/gnome-audio )
-	system-wide? (
-		sys-apps/openrc
-		alsa? ( media-sound/alsa-utils )
-		bluetooth? ( >=net-wireless/bluez-4 )
-	)"
-
-pkg_setup() {
-	enewgroup audio 18 # Just make sure it exists
-	enewgroup pulse-access
-	enewgroup pulse
-	enewuser pulse -1 -1 /var/run/pulse pulse,audio
-}
-
-src_prepare() {
-	if use arm; then
-		# Fix build on armv5 - bug #294599
-		epatch "${FILESDIR}/${PN}-0.9.21-armv5-build-fix.patch"
-		eautoreconf
-	fi
-
-	elibtoolize
-}
-
-src_configure() {
-	# It's a binutils bug, once I can find time to fix that I'll add a
-	# proper dependency and fix this up. — flameeyes
-	append-ldflags $(no-as-needed)
-
-	econf \
-		--enable-largefile \
-		$(use_enable glib glib2) \
-		--disable-solaris \
-		$(use_enable asyncns) \
-		$(use_enable oss oss-output) \
-		$(use_enable alsa) \
-		$(use_enable lirc) \
-		$(use_enable tcpd tcpwrap) \
-		$(use_enable jack) \
-		$(use_enable lirc) \
-		$(use_enable avahi) \
-		--disable-hal \
-		$(use_enable dbus) \
-		$(use_enable gnome gconf) \
-		$(use_enable libsamplerate samplerate) \
-		$(use_enable bluetooth bluez) \
-		$(use_enable X x11) \
-		$(use_enable test default-build-tests) \
-		$(use_enable udev) \
-		$(use_enable ipv6) \
-		$(use_with caps) \
-		--localstatedir="${EPREFIX}"/var \
-		--disable-per-user-esound-socket \
-		--with-database=gdbm \
-		--with-udev-rules-dir="${EPREFIX}/$(get_libdir)/udev/rules.d" \
-		|| die "econf failed"
-
-	if use doc; then
-		pushd doxygen
-		doxygen doxygen.conf || die
-		popd
-	fi
-}
-
-src_test() {
-	# We avoid running the toplevel check target because that will run
-	# po/'s tests too, and they are broken. Officially, it should work
-	# with intltool 0.41, but that doesn't look like a stable release.
-	emake -C src check || die
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install || die "make install failed"
-
-	# Drop the script entirely if X is disabled
-	use X || rm "${ED}"/usr/bin/start-pulseaudio-x11
-
-	if use system-wide; then
-		newconfd "${FILESDIR}/pulseaudio.conf.d" pulseaudio
-
-		use_define() {
-			local define=${2:-$(echo $1 | tr '[:lower:]' '[:upper:]')}
-
-			use "$1" && echo "-D$define" || echo "-U$define"
-		}
-
-		unifdef $(use_define avahi) \
-			$(use_define alsa) \
-			$(use_define bluetooth) \
-			$(use_define udev) \
-			"${FILESDIR}/pulseaudio.init.d-5" \
-			> "${T}/pulseaudio"
-
-		doinitd "${T}/pulseaudio"
-	fi
-
-	use avahi && sed -i -e '/module-zeroconf-publish/s:^#::' "${ED}/etc/pulse/default.pa"
-
-	dodoc README ChangeLog todo || die
-
-	if use doc; then
-		pushd doxygen/html
-		dohtml * || die
-		popd
-	fi
-
-	# Create the state directory
-	use prefix || diropts -o pulse -g pulse -m0755
-	keepdir /var/run/pulse
-
-	find "${D}" -name '*.la' -delete
-}
-
-pkg_postinst() {
-	if use system-wide; then
-		elog "PulseAudio in Gentoo can use a system-wide pulseaudio daemon."
-		elog "This support is enabled by starting the pulseaudio init.d ."
-		elog "To be able to access that you need to be in the group pulse-access."
-		elog "If you choose to use this feature, please make sure that you"
-		elog "really want to run PulseAudio this way:"
-		elog "   http://pulseaudio.org/wiki/WhatIsWrongWithSystemMode"
-		elog "For more information about system-wide support, please refer to:"
-		elog "	 http://pulseaudio.org/wiki/SystemWideInstance"
-		if use gnome ; then
-			elog
-			elog "By enabling gnome USE flag, you enabled gconf support. Please note"
-			elog "that you might need to remove the gnome USE flag or disable the"
-			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 "configuration file. If you do enable it, you'll have to have"
-		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"
-		if has_version ${pkg} && ! has_version "${pkg}[pulseaudio]"; then
-			elog
-			elog "You have alsa support enabled so you probably want to install"
-			elog "${pkg} with pulseaudio support to have"
-			elog "alsa using applications route their sound through pulseaudio"
-		fi
-	fi
-
-	eselect esd update --if-unset
-}
diff --git a/media-sound/pulseaudio/pulseaudio-0.9.23-r1.ebuild b/media-sound/pulseaudio/pulseaudio-0.9.23-r1.ebuild
deleted file mode 100644
index 8c2d420c8857..000000000000
--- a/media-sound/pulseaudio/pulseaudio-0.9.23-r1.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.9.23-r1.ebuild,v 1.5 2012/06/01 03:01:18 zmedico Exp $
-
-EAPI=4
-
-inherit eutils flag-o-matic user versionator
-
-DESCRIPTION="A networked sound server with an advanced plugin system"
-HOMEPAGE="http://www.pulseaudio.org/"
-
-SRC_URI="http://freedesktop.org/software/pulseaudio/releases/${P}.tar.gz"
-
-LICENSE="LGPL-2 GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="+alsa avahi +caps jack lirc oss tcpd +X dbus libsamplerate gnome bluetooth +asyncns +glib test doc +udev ipv6 system-wide realtime ssl"
-
-RDEPEND="app-admin/eselect-esd
-	X? (
-		|| ( >=x11-libs/libX11-1.4.0 <x11-libs/libX11-1.4.0[xcb] )
-		>=x11-libs/libxcb-1.6
-		>=x11-libs/xcb-util-0.3.1
-		x11-libs/libSM
-		x11-libs/libICE
-		x11-libs/libXtst
-	)
-	caps? ( sys-libs/libcap )
-	libsamplerate? ( >=media-libs/libsamplerate-0.1.1-r1 )
-	alsa? ( >=media-libs/alsa-lib-1.0.19 )
-	glib? ( >=dev-libs/glib-2.4.0 )
-	avahi? ( >=net-dns/avahi-0.6.12[dbus] )
-	jack? ( >=media-sound/jack-audio-connection-kit-0.100 )
-	tcpd? ( sys-apps/tcp-wrappers )
-	lirc? ( app-misc/lirc )
-	dbus? ( >=sys-apps/dbus-1.0.0 )
-	gnome? ( >=gnome-base/gconf-2.4.0 )
-	bluetooth? (
-		>=net-wireless/bluez-4
-		>=sys-apps/dbus-1.0.0
-	)
-	asyncns? ( net-libs/libasyncns )
-	udev? ( || ( >=sys-fs/udev-171[hwdb] >=sys-fs/udev-143[extras] ) )
-	realtime? ( sys-auth/rtkit )
-	ssl? ( dev-libs/openssl )
-	>=media-libs/speex-1.2_rc1
-	>=media-libs/libsndfile-1.0.20
-	sys-libs/gdbm
-	>=sys-devel/libtool-2.2.4" # it's a valid RDEPEND, libltdl.so is used
-
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	X? (
-		x11-proto/xproto
-		|| ( >=x11-libs/libXtst-1.0.99.2 <x11-proto/xextproto-7.0.99 )
-	)
-	dev-libs/libatomic_ops
-	virtual/pkgconfig
-	system-wide? ( || ( dev-util/unifdef sys-freebsd/freebsd-ubin ) )
-	dev-util/intltool"
-
-# alsa-utils dep is for the alsasound init.d script (see bug #155707)
-# bluez dep is for the bluetooth init.d script
-RDEPEND="${RDEPEND}
-	X? ( gnome-extra/gnome-audio )
-	system-wide? (
-		sys-apps/openrc
-		alsa? ( media-sound/alsa-utils )
-		bluetooth? ( >=net-wireless/bluez-4 )
-	)"
-
-pkg_setup() {
-	enewgroup audio 18 # Just make sure it exists
-	enewgroup pulse-access
-	enewgroup pulse
-	enewuser pulse -1 -1 /var/run/pulse pulse,audio
-}
-
-src_configure() {
-	# It's a binutils bug, once I can find time to fix that I'll add a
-	# proper dependency and fix this up. — flameeyes
-	append-ldflags $(no-as-needed)
-
-	econf \
-		--enable-largefile \
-		$(use_enable glib glib2) \
-		--disable-solaris \
-		$(use_enable asyncns) \
-		$(use_enable oss oss-output) \
-		$(use_enable alsa) \
-		$(use_enable lirc) \
-		$(use_enable tcpd tcpwrap) \
-		$(use_enable jack) \
-		$(use_enable lirc) \
-		$(use_enable avahi) \
-		--disable-hal \
-		$(use_enable dbus) \
-		$(use_enable gnome gconf) \
-		$(use_enable libsamplerate samplerate) \
-		$(use_enable bluetooth bluez) \
-		$(use_enable X x11) \
-		$(use_enable test default-build-tests) \
-		$(use_enable udev) \
-		$(use_enable ipv6) \
-		$(use_enable ssl openssl) \
-		$(use_with caps) \
-		--localstatedir="${EPREFIX}"/var \
-		--disable-per-user-esound-socket \
-		--with-database=gdbm \
-		--with-udev-rules-dir="${EPREFIX}/lib/udev/rules.d"
-
-	if use doc; then
-		pushd doxygen
-		doxygen doxygen.conf
-		popd
-	fi
-}
-
-src_test() {
-	# We avoid running the toplevel check target because that will run
-	# po/'s tests too, and they are broken. Officially, it should work
-	# with intltool 0.41, but that doesn't look like a stable release.
-	emake -C src check
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install
-
-	# Drop the script entirely if X is disabled
-	use X || rm "${ED}"/usr/bin/start-pulseaudio-x11
-
-	if use system-wide; then
-		newconfd "${FILESDIR}/pulseaudio.conf.d" pulseaudio
-
-		use_define() {
-			local define=${2:-$(echo $1 | tr '[:lower:]' '[:upper:]')}
-
-			use "$1" && echo "-D$define" || echo "-U$define"
-		}
-
-		unifdef $(use_define avahi) \
-			$(use_define alsa) \
-			$(use_define bluetooth) \
-			$(use_define udev) \
-			"${FILESDIR}/pulseaudio.init.d-5" \
-			> "${T}/pulseaudio"
-
-		doinitd "${T}/pulseaudio"
-	fi
-
-	use avahi && sed -i -e '/module-zeroconf-publish/s:^#::' "${ED}/etc/pulse/default.pa"
-
-	dodoc README todo
-
-	if use doc; then
-		pushd doxygen/html
-		dohtml *
-		popd
-	fi
-
-	# Create the state directory
-	use prefix || diropts -o pulse -g pulse -m0755
-	keepdir /var/run/pulse
-
-	find "${D}" -name '*.la' -delete
-}
-
-pkg_postinst() {
-	if use system-wide; then
-		elog "PulseAudio in Gentoo can use a system-wide pulseaudio daemon."
-		elog "This support is enabled by starting the pulseaudio init.d ."
-		elog "To be able to access that you need to be in the group pulse-access."
-		elog "If you choose to use this feature, please make sure that you"
-		elog "really want to run PulseAudio this way:"
-		elog "   http://pulseaudio.org/wiki/WhatIsWrongWithSystemMode"
-		elog "For more information about system-wide support, please refer to:"
-		elog "	 http://pulseaudio.org/wiki/SystemWideInstance"
-		if use gnome ; then
-			elog
-			elog "By enabling gnome USE flag, you enabled gconf support. Please note"
-			elog "that you might need to remove the gnome USE flag or disable the"
-			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 "configuration file. If you do enable it, you'll have to have"
-		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"
-		if has_version ${pkg} && ! has_version "${pkg}[pulseaudio]"; then
-			elog
-			elog "You have alsa support enabled so you probably want to install"
-			elog "${pkg} with pulseaudio support to have"
-			elog "alsa using applications route their sound through pulseaudio"
-		fi
-	fi
-
-	eselect esd update --if-unset
-}
diff --git a/media-sound/pulseaudio/pulseaudio-1.1.ebuild b/media-sound/pulseaudio/pulseaudio-1.1.ebuild
deleted file mode 100644
index f97e32da18d6..000000000000
--- a/media-sound/pulseaudio/pulseaudio-1.1.ebuild
+++ /dev/null
@@ -1,209 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-1.1.ebuild,v 1.5 2012/06/01 03:01:18 zmedico Exp $
-
-EAPI=4
-
-inherit eutils flag-o-matic user versionator
-
-DESCRIPTION="A networked sound server with an advanced plugin system"
-HOMEPAGE="http://www.pulseaudio.org/"
-
-SRC_URI="http://freedesktop.org/software/pulseaudio/releases/${P}.tar.xz"
-
-LICENSE="LGPL-2 GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="+alsa avahi +caps equalizer jack lirc oss tcpd +X dbus libsamplerate gnome bluetooth +asyncns +glib test doc +udev ipv6 system-wide realtime +orc"
-
-RDEPEND="app-admin/eselect-esd
-	X? (
-		>=x11-libs/libX11-1.4.0
-		>=x11-libs/libxcb-1.6
-		>=x11-libs/xcb-util-0.3.1
-		x11-libs/libSM
-		x11-libs/libICE
-		x11-libs/libXtst
-	)
-	caps? ( sys-libs/libcap )
-	libsamplerate? ( >=media-libs/libsamplerate-0.1.1-r1 )
-	alsa? ( >=media-libs/alsa-lib-1.0.19 )
-	glib? ( >=dev-libs/glib-2.4.0 )
-	avahi? ( >=net-dns/avahi-0.6.12[dbus] )
-	jack? ( >=media-sound/jack-audio-connection-kit-0.117 )
-	tcpd? ( sys-apps/tcp-wrappers )
-	lirc? ( app-misc/lirc )
-	dbus? ( >=sys-apps/dbus-1.0.0 )
-	gnome? ( >=gnome-base/gconf-2.4.0 )
-	bluetooth? (
-		>=net-wireless/bluez-4
-		>=sys-apps/dbus-1.0.0
-	)
-	asyncns? ( net-libs/libasyncns )
-	udev? ( || ( >=sys-fs/udev-171[hwdb] >=sys-fs/udev-143[extras] ) )
-	realtime? ( sys-auth/rtkit )
-	equalizer? ( sci-libs/fftw:3.0 )
-	orc? ( >=dev-lang/orc-0.4.9 )
-	>=media-libs/speex-1.2_rc1
-	>=media-libs/libsndfile-1.0.20
-	sys-libs/gdbm
-	dev-libs/json-c
-	>=sys-devel/libtool-2.2.4" # it's a valid RDEPEND, libltdl.so is used
-
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	X? (
-		x11-proto/xproto
-		>=x11-libs/libXtst-1.0.99.2
-	)
-	dev-libs/libatomic_ops
-	virtual/pkgconfig
-	system-wide? ( || ( dev-util/unifdef sys-freebsd/freebsd-ubin ) )
-	dev-util/intltool"
-
-# alsa-utils dep is for the alsasound init.d script (see bug #155707)
-# bluez dep is for the bluetooth init.d script
-RDEPEND="${RDEPEND}
-	X? ( gnome-extra/gnome-audio )
-	system-wide? (
-		sys-apps/openrc
-		alsa? ( media-sound/alsa-utils )
-		bluetooth? ( >=net-wireless/bluez-4 )
-	)"
-
-pkg_setup() {
-	enewgroup audio 18 # Just make sure it exists
-	enewgroup pulse-access
-	enewgroup pulse
-	enewuser pulse -1 -1 /var/run/pulse pulse,audio
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-python3-fix.patch"
-}
-
-src_configure() {
-	# It's a binutils bug, once I can find time to fix that I'll add a
-	# proper dependency and fix this up. — flameeyes
-	append-ldflags $(no-as-needed)
-
-	econf \
-		--enable-largefile \
-		$(use_enable glib glib2) \
-		--disable-solaris \
-		$(use_enable asyncns) \
-		$(use_enable oss oss-output) \
-		$(use_enable alsa) \
-		$(use_enable lirc) \
-		$(use_enable tcpd tcpwrap) \
-		$(use_enable jack) \
-		$(use_enable lirc) \
-		$(use_enable avahi) \
-		--disable-hal \
-		$(use_enable dbus) \
-		$(use_enable gnome gconf) \
-		$(use_enable libsamplerate samplerate) \
-		$(use_enable bluetooth bluez) \
-		$(use_enable X x11) \
-		$(use_enable test default-build-tests) \
-		$(use_enable udev) \
-		$(use_enable ipv6) \
-		$(use_with caps) \
-		$(use_with equalizer fftw) \
-		--localstatedir="${EPREFIX}"/var \
-		--with-database=gdbm \
-		--with-udev-rules-dir="${EPREFIX}/lib/udev/rules.d"
-
-	if use doc; then
-		pushd doxygen
-		doxygen doxygen.conf
-		popd
-	fi
-}
-
-src_test() {
-	# We avoid running the toplevel check target because that will run
-	# po/'s tests too, and they are broken. Officially, it should work
-	# with intltool 0.41, but that doesn't look like a stable release.
-	emake -C src check
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install
-
-	# Drop the script entirely if X is disabled
-	use X || rm "${ED}"/usr/bin/start-pulseaudio-x11
-
-	if use system-wide; then
-		newconfd "${FILESDIR}/pulseaudio.conf.d" pulseaudio
-
-		use_define() {
-			local define=${2:-$(echo $1 | tr '[:lower:]' '[:upper:]')}
-
-			use "$1" && echo "-D$define" || echo "-U$define"
-		}
-
-		unifdef $(use_define avahi) \
-			$(use_define alsa) \
-			$(use_define bluetooth) \
-			$(use_define udev) \
-			"${FILESDIR}/pulseaudio.init.d-5" \
-			> "${T}/pulseaudio"
-
-		doinitd "${T}/pulseaudio"
-	fi
-
-	use avahi && sed -i -e '/module-zeroconf-publish/s:^#::' "${ED}/etc/pulse/default.pa"
-
-	dodoc README todo
-
-	if use doc; then
-		pushd doxygen/html
-		dohtml *
-		popd
-	fi
-
-	# Create the state directory
-	use prefix || diropts -o pulse -g pulse -m0755
-	keepdir /var/run/pulse
-
-	find "${D}" -name '*.la' -delete
-}
-
-pkg_postinst() {
-	if use system-wide; then
-		elog "PulseAudio in Gentoo can use a system-wide pulseaudio daemon."
-		elog "This support is enabled by starting the pulseaudio init.d ."
-		elog "To be able to access that you need to be in the group pulse-access."
-		elog "If you choose to use this feature, please make sure that you"
-		elog "really want to run PulseAudio this way:"
-		elog "   http://pulseaudio.org/wiki/WhatIsWrongWithSystemMode"
-		elog "For more information about system-wide support, please refer to:"
-		elog "	 http://pulseaudio.org/wiki/SystemWideInstance"
-		if use gnome ; then
-			elog
-			elog "By enabling gnome USE flag, you enabled gconf support. Please note"
-			elog "that you might need to remove the gnome USE flag or disable the"
-			elog "gconf module on /etc/pulse/system.pa to be able to use PulseAudio"
-			elog "with a system-wide instance."
-		fi
-	fi
-	if use bluetooth; then
-		elog
-		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 "PulseAudio will refuse to start."
-	fi
-	if use alsa; then
-		local pkg="media-plugins/alsa-plugins"
-		if has_version ${pkg} && ! has_version "${pkg}[pulseaudio]"; then
-			elog
-			elog "You have alsa support enabled so you probably want to install"
-			elog "${pkg} with pulseaudio support to have"
-			elog "alsa using applications route their sound through pulseaudio"
-		fi
-	fi
-
-	eselect esd update --if-unset
-}