Drop old redundant versions.

(Portage version: 2.2.0_alpha112/cvs/Linux x86_64)

6 files changed, 7 insertions, 778 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/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
-}