Version bump, remove the xinitrc symlink (bug #291497), should also fix bug #293472.

Package-Manager: portage-2.2_rc51/cvs/Linux x86_64

6 files changed, 24 insertions, 456 deletions

diff --git a/media-sound/pulseaudio/ChangeLog b/media-sound/pulseaudio/ChangeLog
index 9a75e1d4e0f7..667779df7903 100644
--- a/media-sound/pulseaudio/ChangeLog
+++ b/media-sound/pulseaudio/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for media-sound/pulseaudio
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.174 2009/11/15 19:05:00 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.175 2009/11/23 12:27:28 flameeyes Exp $
+
+*pulseaudio-0.9.21-r50 (23 Nov 2009)
+*pulseaudio-0.9.21 (23 Nov 2009)
+
+  23 Nov 2009; Diego E. Pettenò <flameeyes@gentoo.org>
+  -pulseaudio-0.9.19-r1.ebuild, -pulseaudio-0.9.19-r51.ebuild,
+  -pulseaudio-0.9.20.ebuild, -pulseaudio-0.9.20-r50.ebuild,
+  +pulseaudio-0.9.21.ebuild, +pulseaudio-0.9.21-r50.ebuild:
+  Version bump, remove the xinitrc symlink (bug #291497), should also fix
+  bug #293472.
 
 *pulseaudio-0.9.20-r50 (15 Nov 2009)
 *pulseaudio-0.9.20 (15 Nov 2009)
diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest
index ccb9cfb67277..1c36f6d85f13 100644
--- a/media-sound/pulseaudio/Manifest
+++ b/media-sound/pulseaudio/Manifest
@@ -15,20 +15,18 @@ AUX pulseaudio.init.d-2 632 RMD160 5baf66e3f64e406b7e23ffbe13774e32595cff19 SHA1
 AUX pulseaudio.init.d-4 2493 RMD160 9f6b2f487298a5576b60b53095ee697095b88c89 SHA1 80f0e5e621d9312a7b24129fe843dd7ce085756d SHA256 dc8caa43aa297d2ca4019eef5b3cb64b3a57741e611620490f8d79091790f363
 DIST pulseaudio-0.9.15.tar.gz 1704374 RMD160 7cab0d9ab44180b6440ae7f151a6cbb91928b321 SHA1 56fb71e4e88c901d9941d85bfe142612c30e5c8e SHA256 1e8ad5b7c5cf3485bd0738c296274ff2c99d26d12a25a225dc250eddea25b9f1
 DIST pulseaudio-0.9.19.tar.gz 2029090 RMD160 2de3f4b9ec587c3df3b7a9d11a6d1b9d5f9c8690 SHA1 176d54b09051c560427ed251c838197ba2414bb0 SHA256 e47e27083deb79571fb2b9215874ddc26d77c3dec2a7dc8de5ecec9058e4b806
-DIST pulseaudio-0.9.20.tar.gz 2048332 RMD160 736eebeee63d13e6b85b7ec9d47688346199166c SHA1 d27197ce1e1ade2b312faf4163f438a6b14085cb SHA256 8d6070aa4d57ec224b300f9fad95f529841e55d0edb26587791239ad78875550
+DIST pulseaudio-0.9.21.tar.gz 2056896 RMD160 6db0725253228b673a78cbfae4824fadce2198ed SHA1 0309c97f7e0812e243c1bb80a4b74dc26369ac22 SHA256 94e22356ac70ee95388ae58da90d88c6b3186d1938618d21671627ff56cee254
 EBUILD pulseaudio-0.9.15-r2.ebuild 4753 RMD160 d5b265c9c8b5a6408506fb81bbad60a80e32145a SHA1 c839256885703602e0cd9a375b4c4fccbf04edd0 SHA256 ef4c0922cf7fe434cc388383ffe7d0c5d88c8ff317927f19a901c4bf3964c98c
-EBUILD pulseaudio-0.9.19-r1.ebuild 5665 RMD160 a886d9d602fd23f648fd08339db0f9b75ffdb7f5 SHA1 4abe5d2c979303a03b09bbb981a733e67c518b76 SHA256 24d1bbd572c70032a8f87510306e089d4ea1220f6bef3cb388e06d2917b5e486
 EBUILD pulseaudio-0.9.19-r50.ebuild 6832 RMD160 57baf6d265a5525deb88ce7971596d6905b3298c SHA1 77148a40a3cf45fb6d3daa233439647abf00072a SHA256 ad899c071ad8c75ee0039cf939813018063c77596aa4d36ee7598d0c81076ac8
-EBUILD pulseaudio-0.9.19-r51.ebuild 7054 RMD160 16f705393ad06fe858c2dfd1daeaf2bf8f62d739 SHA1 fe3f60cde5da908603c95d0981c8e11d7bfc68f0 SHA256 526ef47178ca5aa9e49afe5daf353062a19c5c4a29a5a3c2ac804bd6353e8f8b
 EBUILD pulseaudio-0.9.19.ebuild 5440 RMD160 01b5e758b6854bbb94a36945ae7d9a95a2b5bfd9 SHA1 639da2e10705b7f6a0cff04c88160ac554a048fa SHA256 e670372d434c267f3d9392327b6df63fbaf74bdc95d59618f0a875ecf2fba4fe
-EBUILD pulseaudio-0.9.20-r50.ebuild 7015 RMD160 65498b49b218b3b0f9ca36d821ae8fb8e7c3a2aa SHA1 2cd247b45cbc90ea671e70ce6053739c7e8a117c SHA256 6f40526e9152f53d11781f5c98d4c7ea8fda8c6e8f98f7128e3399d2e834038b
-EBUILD pulseaudio-0.9.20.ebuild 5623 RMD160 a655c96572ef192eb471b5b34415c55e9eb1c3f1 SHA1 d83a539d09be68a130c6475a401010dd885553e3 SHA256 6f727bd08d5ef3b1691e5b3695780f2a3daf39c95820a8bd3184a0111eff56de
-MISC ChangeLog 35401 RMD160 2fdab14be69a89d6da89113d75e9cead8d8a04ac SHA1 659b30d23e0ad87e4f60d88b9d4960175645bd20 SHA256 20edfe3477d1acd3c59fb8da1fbad912ef95d9467852b305c4e149fba6b5fd3c
+EBUILD pulseaudio-0.9.21-r50.ebuild 6889 RMD160 fd21433a458f61d65e4c7896837219eea659be47 SHA1 1962ec41d63a6d5a03d8bc2417ee630ed23c6b67 SHA256 12bd988637aabaabd2b33ab4964d9891a7325d4c34532a26cadd3dc8b34f608c
+EBUILD pulseaudio-0.9.21.ebuild 5497 RMD160 b0059ef9c32ca578dca845f8c8c217f87ff31c2f SHA1 64846b975e5bbb818814f3f98e92e286503f6151 SHA256 83615f921586e464e063af5c22bd16e8d4888495a07d8023b21b557c40bdd780
+MISC ChangeLog 35801 RMD160 e8210f3f3294e6171d073d14de4b9f5fee9d0a0d SHA1 dd0e7c012ea39a41abd686f888bc153a13b5bf60 SHA256 43f26d791fb19ad9fc6153423e4309a67f3628462f981db8dde765f15babaaee
 MISC metadata.xml 1774 RMD160 422f7fcca52193e22c6a257eea28af8ff84247c3 SHA1 5994d8a5212a87a6ef8e6537f9cd2ef22542c8c4 SHA256 94facd3169c4b679f77ff21e329d73a073c55ff93e0d40edfd31e56419947582
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.13 (GNU/Linux)
 
-iEYEARECAAYFAksAUM8ACgkQAiZjviIA2Xgb+wCeO+f+snDUwtb36TOmSiwzBFJo
-AJYAnj5izeynqWDd2fIsaehNWCMMf+Ff
-=pAbn
+iEYEARECAAYFAksKf8AACgkQAiZjviIA2XgcSQCfaQ59boWW5OcsamKyTQPn8fC/
+4kkAoJiQfg9MIHsGKuC4sZy6bVnphh+j
+=q3VE
 -----END PGP SIGNATURE-----
diff --git a/media-sound/pulseaudio/pulseaudio-0.9.19-r1.ebuild b/media-sound/pulseaudio/pulseaudio-0.9.19-r1.ebuild
deleted file mode 100644
index e1fda3c039e4..000000000000
--- a/media-sound/pulseaudio/pulseaudio-0.9.19-r1.ebuild
+++ /dev/null
@@ -1,195 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.9.19-r1.ebuild,v 1.1 2009/10/20 13:34:12 flameeyes Exp $
-
-EAPI=2
-
-inherit eutils libtool flag-o-matic
-
-DESCRIPTION="A networked sound server with an advanced plugin system"
-HOMEPAGE="http://www.pulseaudio.org/"
-if [[ ${PV/_rc/} == ${PV} ]]; then
-	SRC_URI="http://0pointer.de/lennart/projects/${PN}/${P}.tar.gz"
-else
-	SRC_URI="http://0pointer.de/public/${P/_rc/-test}.tar.gz"
-fi
-
-S="${WORKDIR}/${P/_rc/-test}"
-
-LICENSE="LGPL-2 GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE="+alsa avahi +caps jack lirc oss tcpd +X hal dbus libsamplerate gnome bluetooth +asyncns +glib test doc +udev ipv6"
-
-RDEPEND="X? ( x11-libs/libX11 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] )
-	>=dev-libs/liboil-0.3.0
-	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 )
-	hal? (
-		>=sys-apps/hal-0.5.11
-		>=sys-apps/dbus-1.0.0
-	)
-	app-admin/eselect-esd
-	bluetooth? (
-		|| ( >=net-wireless/bluez-4
-			 >=net-wireless/bluez-libs-3 )
-		>=sys-apps/dbus-1.0.0
-	)
-	asyncns? ( net-libs/libasyncns )
-	udev? ( >=sys-fs/udev-143[extras] )
-	>=media-libs/audiofile-0.2.6-r1
-	>=media-libs/speex-1.2_beta
-	>=media-libs/libsndfile-1.0.20
-	>=dev-libs/liboil-0.3.6
-	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
-	dev-util/pkgconfig
-	dev-util/intltool"
-
-RDEPEND="${RDEPEND}
-	gnome-extra/gnome-audio"
-
-pkg_setup() {
-	enewgroup audio 18 # Just make sure it exists
-	enewgroup realtime
-	enewgroup pulse-access
-	enewgroup pulse
-	enewuser pulse -1 -1 /var/run/pulse pulse,audio
-
-	if use udev && use hal; then
-		elog "Please note that enabling both udev and hal will build both"
-		elog "discover modules, but only udev will be used automatically."
-		elog "If you wish to use hal you have to enable it explicitly"
-		elog "or you might just disable the hal USE flag entirely."
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-fweb.patch
-
-	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) \
-		$(use_enable 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=/var \
-		--with-realtime-group=realtime \
-		--disable-per-user-esound-socket \
-		|| 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 DESTDIR="${D}" install || die "make install failed"
-
-	if use X; then
-		dodir /etc/X11/xinit/xinitrc.d
-		ln -s ../../../usr/bin/start-pulseaudio-x11 "${D}"/etc/X11/xinit/xinitrc.d/95-pulseaudio
-	else
-		# Drop the script entirely
-		rm "${D}"/usr/bin/start-pulseaudio-x11
-	fi
-
-	use avahi && sed -i -e '/module-zeroconf-publish/s:^#::' "${D}/etc/pulse/default.pa"
-
-	if use hal && ! use udev; then
-		sed -i -e 's:-udev:-hal:' "${D}/etc/pulse/default.pa" || die
-	fi
-
-	dodoc README ChangeLog todo || die
-
-	if use doc; then
-		pushd doxygen/html
-		dohtml * || die
-		popd
-	fi
-
-	# Create the state directory
-	diropts -o pulse -g pulse -m0755
-	keepdir /var/run/pulse
-
-	find "${D}" -name '*.la' -delete
-}
-
-pkg_postinst() {
-	elog "If you want to make use of realtime capabilities of PulseAudio"
-	elog "you should follow the realtime guide to create and set up a realtime"
-	elog "user group: http://www.gentoo.org/proj/en/desktop/sound/realtime.xml"
-	elog "Make sure you also have baselayout installed with pam USE flag"
-	elog "enabled, if you're using the rlimit method."
-	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 &&
-		has_version media-plugins/alsa-plugins &&
-		!built_with_use --missing false media-plugins/alsa-plugins 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
-
-	eselect esd update --if-unset
-}
diff --git a/media-sound/pulseaudio/pulseaudio-0.9.19-r51.ebuild b/media-sound/pulseaudio/pulseaudio-0.9.19-r51.ebuild
deleted file mode 100644
index ce4117ed51e6..000000000000
--- a/media-sound/pulseaudio/pulseaudio-0.9.19-r51.ebuild
+++ /dev/null
@@ -1,235 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.9.19-r51.ebuild,v 1.1 2009/10/20 13:34:12 flameeyes Exp $
-
-EAPI=2
-
-inherit eutils libtool flag-o-matic
-
-DESCRIPTION="A networked sound server with an advanced plugin system"
-HOMEPAGE="http://www.pulseaudio.org/"
-if [[ ${PV/_rc/} == ${PV} ]]; then
-	SRC_URI="http://0pointer.de/lennart/projects/${PN}/${P}.tar.gz"
-else
-	SRC_URI="http://0pointer.de/public/${P/_rc/-test}.tar.gz"
-fi
-
-S="${WORKDIR}/${P/_rc/-test}"
-
-LICENSE="LGPL-2 GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE="+alsa avahi +caps jack lirc oss tcpd +X hal dbus libsamplerate gnome bluetooth +asyncns +glib test doc +udev ipv6"
-
-RDEPEND="X? ( x11-libs/libX11 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] )
-	>=dev-libs/liboil-0.3.0
-	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 )
-	hal? (
-		>=sys-apps/hal-0.5.11
-		>=sys-apps/dbus-1.0.0
-	)
-	app-admin/eselect-esd
-	bluetooth? (
-		|| ( >=net-wireless/bluez-4
-			 >=net-wireless/bluez-libs-3 )
-		>=sys-apps/dbus-1.0.0
-	)
-	asyncns? ( net-libs/libasyncns )
-	udev? ( >=sys-fs/udev-143[extras] )
-	>=media-libs/audiofile-0.2.6-r1
-	>=media-libs/speex-1.2_beta
-	>=media-libs/libsndfile-1.0.20
-	>=dev-libs/liboil-0.3.6
-	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
-	dev-util/pkgconfig
-	|| ( dev-util/unifdef sys-freebsd/freebsd-ubin )
-	dev-util/intltool"
-
-# alsa-utils dep is for the alsasound init.d script (see bug #155707)
-# bluez-utils dep is for the bluetooth init.d script
-RDEPEND="${RDEPEND}
-	sys-apps/openrc
-	gnome-extra/gnome-audio
-	alsa? ( media-sound/alsa-utils )
-	bluetooth? (
-	|| ( >=net-wireless/bluez-4
-		 >=net-wireless/bluez-utils-3 ) )"
-
-pkg_setup() {
-	enewgroup audio 18 # Just make sure it exists
-	enewgroup pulse-access
-	enewgroup pulse
-	enewuser pulse -1 -1 /var/run/pulse pulse,audio
-
-	if use udev && use hal; then
-		elog "Please note that enabling both udev and hal will build both"
-		elog "discover modules, but only udev will be used automatically."
-		elog "If you wish to use hal you have to enable it explicitly"
-		elog "or you might just disable the hal USE flag entirely."
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-fweb.patch
-
-	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) \
-		$(use_enable 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=/var \
-		--disable-per-user-esound-socket \
-		--with-database=gdbm \
-		|| 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"
-
-	if use X; then
-		dodir /etc/X11/xinit/xinitrc.d
-		ln -s ../../../usr/bin/start-pulseaudio-x11 "${D}"/etc/X11/xinit/xinitrc.d/95-pulseaudio
-	else
-		# Drop the script entirely
-		rm "${D}"/usr/bin/start-pulseaudio-x11
-	fi
-
-	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 hal) \
-		$(use_define avahi) \
-		$(use_define alsa) \
-		$(use_define bluetooth) \
-		$(use_define udev) \
-		"${FILESDIR}/pulseaudio.init.d-4" \
-		> "${T}/pulseaudio"
-
-	doinitd "${T}/pulseaudio"
-
-	use avahi && sed -i -e '/module-zeroconf-publish/s:^#::' "${D}/etc/pulse/default.pa"
-
-	if use hal && ! use udev; then
-		sed -i -e 's:-udev:-hal:' "${D}/etc/pulse/default.pa" || die
-	fi
-
-	dodoc README ChangeLog todo || die
-
-	if use doc; then
-		pushd doxygen/html
-		dohtml * || die
-		popd
-	fi
-
-	# Create the state directory
-	diropts -o pulse -g pulse -m0755
-	keepdir /var/run/pulse
-
-	find "${D}" -name '*.la' -delete
-}
-
-pkg_postinst() {
-	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
-	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} && ! built_with_use --missing false ${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.20-r50.ebuild b/media-sound/pulseaudio/pulseaudio-0.9.21-r50.ebuild
index 711cd06f6a09..c8f765e257ab 100644
--- a/media-sound/pulseaudio/pulseaudio-0.9.20-r50.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-0.9.21-r50.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.9.20-r50.ebuild,v 1.1 2009/11/15 19:05:00 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.9.21-r50.ebuild,v 1.1 2009/11/23 12:27:28 flameeyes Exp $
 
 EAPI=2
 
@@ -140,13 +140,8 @@ src_test() {
 src_install() {
 	emake -j1 DESTDIR="${D}" install || die "make install failed"
 
-	if use X; then
-		dodir /etc/X11/xinit/xinitrc.d
-		ln -s ../../../usr/bin/start-pulseaudio-x11 "${D}"/etc/X11/xinit/xinitrc.d/95-pulseaudio
-	else
-		# Drop the script entirely
-		rm "${D}"/usr/bin/start-pulseaudio-x11
-	fi
+	# Drop the script entirely if X is disabled
+	use X || rm "${D}"/usr/bin/start-pulseaudio-x11
 
 	newconfd "${FILESDIR}/pulseaudio.conf.d" pulseaudio
 
diff --git a/media-sound/pulseaudio/pulseaudio-0.9.20.ebuild b/media-sound/pulseaudio/pulseaudio-0.9.21.ebuild
index 9c1d38371301..0d28269f778c 100644
--- a/media-sound/pulseaudio/pulseaudio-0.9.20.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-0.9.21.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.9.20.ebuild,v 1.1 2009/11/15 19:05:00 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.9.21.ebuild,v 1.1 2009/11/23 12:27:28 flameeyes Exp $
 
 EAPI=2
 
@@ -133,13 +133,8 @@ src_test() {
 src_install() {
 	emake DESTDIR="${D}" install || die "make install failed"
 
-	if use X; then
-		dodir /etc/X11/xinit/xinitrc.d
-		ln -s ../../../usr/bin/start-pulseaudio-x11 "${D}"/etc/X11/xinit/xinitrc.d/95-pulseaudio
-	else
-		# Drop the script entirely
-		rm "${D}"/usr/bin/start-pulseaudio-x11
-	fi
+	# Drop the script entirely if X is disabled
+	use X || rm "${D}"/usr/bin/start-pulseaudio-x11
 
 	use avahi && sed -i -e '/module-zeroconf-publish/s:^#::' "${D}/etc/pulse/default.pa"