Bump to 2.99.3 (3.0 RC3). Bunch of features and fixes, Bluetooth dependency bumped since we now use the D-Bus API. Some ebuild maintenance - keepdir dropped and enewuser/group done only for USE=system-wide (bug #442852), dropped unnecessary eselect esd, drop no-as-needed since it should work these days. Corresponding updates to the live ebuild as well.

Package-Manager: portage-2.2.0_alpha144/cvs/Linux x86_64
Manifest-Sign-Key: 0x29C3E2EC

4 files changed, 253 insertions, 19 deletions

diff --git a/media-sound/pulseaudio/ChangeLog b/media-sound/pulseaudio/ChangeLog
index 9ffcd86da0d3..7c0dbb3dda24 100644
--- a/media-sound/pulseaudio/ChangeLog
+++ b/media-sound/pulseaudio/ChangeLog
@@ -1,6 +1,16 @@
 # 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.286 2012/12/06 03:58:23 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.287 2012/12/07 20:13:21 ford_prefect Exp $
+
+*pulseaudio-2.99.3 (07 Dec 2012)
+
+  07 Dec 2012; Arun Raghavan <ford_prefect@gentoo.org>
+  +pulseaudio-2.99.3.ebuild, pulseaudio-9999.ebuild:
+  Bump to 2.99.3 (3.0 RC3). Bunch of features and fixes, Bluetooth dependency
+  bumped since we now use the D-Bus API. Some ebuild maintenance - keepdir
+  dropped and enewuser/group done only for USE=system-wide (bug #442852),
+  dropped unnecessary eselect esd, drop no-as-needed since it should work these
+  days. Corresponding updates to the live ebuild as well.
 
   06 Dec 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   pulseaudio-2.1-r1.ebuild:
diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest
index 02c0238471c0..8772d9d3a5d8 100644
--- a/media-sound/pulseaudio/Manifest
+++ b/media-sound/pulseaudio/Manifest
@@ -13,19 +13,21 @@ DIST pulseaudio-0.9.22.tar.gz 2076785 SHA256 c6019324395117a258c048a6db5e9734551
 DIST pulseaudio-1.1.tar.xz 1306168 SHA256 6fe531136f6ebce2d35872a2d2c914278cdc5dcdd5eea516dc52c81f9001f5ee SHA512 6cd24259ad27f272c9069f4474c63208e431b802858f8485e601a7335a92787701a4a51b3f6b11d3bf2c5c04b4d9ec8c3b33f8dd3c0dda674c15da7c0c78cbba WHIRLPOOL 9ea4a8283c114298cf172f1757f0da1f218a82c54ac1e76a376a6439c2c795bb29040a2b113655127cc17e9a8def0339e74767bae24384d89dd3ed4db5f2c96e
 DIST pulseaudio-2.0.tar.xz 1353708 SHA256 28b42edd42f4879a6884af5f0ec11801ac001eb7582881215b36649aa37e2061 SHA512 5003ba3ca1db9e1450dd5336e7c8bd36658a8d4841fdede68d17e34e7e196d8c045d8c3824c788d3ceab9aaf7a48d29578b847dc174bbdfd7479d5cde9a94820 WHIRLPOOL 3ec29072691569b01cd371cc99b13e760ea6622f27a132897ee54114ff70689bee2d61b099e0005b219b6f64737878affe55aa8d390476238a66fe8e29947998
 DIST pulseaudio-2.1.tar.xz 1355004 SHA256 ef6b347bf47abfb98080795f1583018ac959b4aeb4df916b879f9e1eaba0ca7f SHA512 56b672968ae32dcaa5520b8199ed603f4f1223c7884ee6ad1ddf0ee796b1859784c262eef749504f996638f68bf2b213dd0ad1e9cddfb342e2795300ff9972b6 WHIRLPOOL cf4e38d868b67e1cf3fe610d8759a922c7a71040d923844ea0168b00b756b51882580504a7d876e470d0a6ad523a643ddb1559424d8786bc4d9ce457b4a855ea
+DIST pulseaudio-2.99.3.tar.xz 1367388 SHA256 afebd5c46cde2dfe08ff185090bc85c2ff9e1b54b78c7c24c8d8c8d7b6082b56 SHA512 a421ffd7c2285d8e967523cd7b540168d31c9f682e392e4b7c68e36d022718c7999af5d20d07747268f9bbb4e79054e2048b7966eaa21e47ae97140d798e6027 WHIRLPOOL d28e4750078f533b5c988dfba374c389d0e4bc5bb26d222b7d0495a89249c8e08845a0d50d6513ef1cb6912d41422612ef60fdceb1a3122a369ee2dff72512a7
 EBUILD pulseaudio-0.9.22-r2.ebuild 6741 SHA256 f9a897006ddad0f07a4d38fc6ae13e9a498e3d8c6351d17d51eb3971e76e1c29 SHA512 cbd24b959929d27eb1f842fc050d8fb13e4292e77d5a227aa7873bed0db8831a0c24b3c51e5df7509e78013094c5e2989da11fe05f076da8ef8bd55c99180491 WHIRLPOOL 0709bbed1df0b9c21a7152bca7680533189d924dd1e61cd4185e385c9682f15b1f468968bb941eb1d459d8b82c390f0cdbb9361501dd28c3c177104e60cd2605
 EBUILD pulseaudio-1.1-r1.ebuild 6730 SHA256 1f43b6879c137447521bdada6dda8f438fa26530cf59d73a8ed4dfc1e3f928de SHA512 48861b93d999661a68f2d56d1c29f498d1a1afcb72619f754ee84a875f56e5f164c6f4d885445e4e20e6ddbd75bb9300fcbc5fc0a462f437d236939764ebc158 WHIRLPOOL 1fd994e50ebd5440221624ac882c34aeaf6dbfafcdb6a2a791c48850efadb8288f53fd2f9564b39cd4cfcd171a2e6fec7f872ba94bff9aaee22bbc43213cdbf5
 EBUILD pulseaudio-2.0-r1.ebuild 6625 SHA256 d3085bd6898fd6646f157bc9866f9a8ba79e06549f3d5bde0c5222ccdc40fc7a SHA512 3bff0503f96e6ccdcdffd69ae140b4726b4c1bcea473b214efb3c11331acc79f69d88523efe4c5d5391343f08c380768a5b27887cdf8bb4c6d48ba84fb62d15e WHIRLPOOL b23e2e3a653934fd7b72c7a4eabbbf635f6e576f41224bd12281c6edf38ea2a3126f65d069d99927872232163336a20fa1e9b036ebf54ce68c56193711c04be9
 EBUILD pulseaudio-2.0-r2.ebuild 6690 SHA256 ff3dd0c670e2c554ff943cd24212b8d7515fb0235da36d1c8a919471b3cb4a97 SHA512 93e4897781deecca8f6ce3486e757ab249d2ebd328ede93545e710313a4a26af4de757beabb9501427614fc95530eb67a67bf9a601cbe6e05f803a87d3b20e96 WHIRLPOOL 936247806133d3de24800c52952e0b1d251e31526f5233f3ad3226e899f8c1b12649b5ac017eceac5194f876ecec954802f1f3487a2e4a8e9cba72e5fbdc2021
 EBUILD pulseaudio-2.1-r1.ebuild 6722 SHA256 fb2e1b53b25a794e2b98aa598e159287081f30e353a31824d7ee09e1c64d3bc4 SHA512 85f8f18f97dde6b5acef145fac1d20ae5ba73658c8e511ad06b92486ccf541958fad403d2e9302b8487627e89877143c61618ccb4bdf9c5d147d1400d87006ef WHIRLPOOL 147b510760dc5096ebf95035f6493e96f775e8a64a2088875be865bab0ab12850b0ada3c7e8a36cc6f68878488c7b1788c53463f5d52d14d532e75ed5f127756
 EBUILD pulseaudio-2.1.ebuild 6727 SHA256 ce32a4cd51a357de48e3c88accac688b2ff396038f1435857444cc08b10bea3e SHA512 564d7a03cac9b3e836aace4c4ba65cd4cd39773c70dd0ed83383219d7989e176e8857b20bd6f2452a4a797be53094ce1ef6b4879d79130bde1b6f704f93ac88c WHIRLPOOL 40b6711acd8a1721c09fe60f795200a43d0c4f1e94303f6a61cffac7fa298b9ee27712574e954a4215b0d8575d271f95c4ee8fb9d12204c7b85bcd471b6e10a7
-EBUILD pulseaudio-9999.ebuild 6675 SHA256 88d7f25ced5b63fefcb929b1275e594095143364a7fd0dc22b8879419e623afe SHA512 8b5171df91f8563fa7cf4fd4e261a307b393cb42f3c20edda1c36f4c1ffec3176300b8d6e4b9c54df0bfd221ce42713d562defb77cb8d2d90eb1a222ad70d3d7 WHIRLPOOL f582ac5e36182f401466c7dc184361f7a39fa66d89cc44c4794d468d23a72f7b36717dc643f8dda2390aec5d644e6ee7708a3325e3117c1a47f78dbcb033445f
-MISC ChangeLog 55616 SHA256 f6f684d3637bd9f24b2a41c51df3aaa69f3d3bdcc0940304b016fc71c1344257 SHA512 f5a93ee89f5de6835584f559e6fdbb89b11272666b3853a43327e5286bf4bc79f49d4979faabbbaf2d57167a086b766c5e1ae58150ec0a797ca7e8f3cda10878 WHIRLPOOL 2455d1e4600dc1ce0534f65a43bb887a41ebf4f38aa6529bc21165da063bbe92c1dcfa9e1ca2228c2545576aabaa9a351758dea443171ec65902c114e6268a01
+EBUILD pulseaudio-2.99.3.ebuild 6583 SHA256 cef1354fe693b049f86f31e437690fafcb8762455461b2d5b3e1f0646c1167b3 SHA512 874d33701bdbb26608be91d55e7a2b65149d0e0d0bf045af88e7b5ad93c9a79ed3ae2f26bf1d56d22eddf2ed5e1db5cda2d2c6717c63348ce4e922f93033da1f WHIRLPOOL e7d449dfd239f3aff461a775ffe9e0aea3e31bfa03466dfe1bca5eb77d50a6dde884de2f1d3ac684b56e09eb873f50ab0e359958a5cf6ca8e347da933b502c26
+EBUILD pulseaudio-9999.ebuild 6531 SHA256 d60517f25d40d03514f76748bd331514411e95d02e88ca2889a3ffa58561a701 SHA512 532510b059c96ee11b23170b4e7f94c1e5d6089e49a12be41adfbd87b1d67b55379589c0e34ac3a9202ff255a80e53c08bc6e1199904064626d211743da412fe WHIRLPOOL 9fdc7eefa32861c3244090b0f32c70e40581379cf5031f1324bffcbaa35ae41e2a2bd8a997cbe1919f2b6fd7a3d1c6619890f6510e5df5915bd5a77170264536
+MISC ChangeLog 56126 SHA256 d28b178182283e33b2f710f75ae46ac339668e12aef969c1d5458af5ca48c415 SHA512 48000f53bd85ddc398e3a856cf58ecc1c8c173cffbe94809d451a43179f023cbfecf5c0e2ae77bb6f85f41070571c5a8197737d2a1146ca33c7bb3dcd0b06015 WHIRLPOOL f9021434d517e90cfd2b181acce8f79df8615103ca50fb08411227d81d451406b1d3d5c88044513627e9d7ed9a00c0f96a1340f9dabce9f63b20598cd9c47a8c
 MISC metadata.xml 3010 SHA256 b85255ef97e9b3f4a26158298c51d7d23cf36206e0d5266a4aa09f020c28c219 SHA512 6d2e5d8fb8d932f53c49e0c3dcd3418f7f6f5471c4993a459ac2cb68f825c4925eb7d2c20a78bb34ba26ce4950c07c88465592f79de33363f7f36b65e5a16f96 WHIRLPOOL b19a2ba962a0912dd458e56bc3876622b40114082525dac46bba91dd9a6f3ec8c7867ac0fc13adfd9479593681c880d49f015a563f94e7be25febabc07680fb5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlDAF+gACgkQuUQtlDBCeQJv5gCeO3PG9V3p8ym6np3zSIfNTkpr
-W0oAnRB25LX3ztC5A4jL0nfeWnZru8KQ
-=s/aE
+iEUEAREIAAYFAlDCTg0ACgkQ+Vqt1inD4uzHrQCdEhTetjWdFCxOdo7nBmBHOD4N
+5aoAlRXF9dTiJLRfFaa9lTr8Xego+rw=
+=wWLV
 -----END PGP SIGNATURE-----
diff --git a/media-sound/pulseaudio/pulseaudio-2.99.3.ebuild b/media-sound/pulseaudio/pulseaudio-2.99.3.ebuild
new file mode 100644
index 000000000000..6e152d4c3edd
--- /dev/null
+++ b/media-sound/pulseaudio/pulseaudio-2.99.3.ebuild
@@ -0,0 +1,225 @@
+# 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-2.99.3.ebuild,v 1.1 2012/12/07 20:13:21 ford_prefect Exp $
+
+EAPI=4
+
+inherit eutils flag-o-matic user versionator toolchain-funcs udev
+
+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"
+
+# libpulse-simple and libpulse link to libpulse-core; this is daemon's
+# library and can link to gdbm and other GPL-only libraries. In this
+# cases, we have a fully GPL-2 package. Leaving the rest of the
+# GPL-forcing USE flags for those who use them.
+LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( 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 gtk test doc +udev ipv6 system-wide realtime +orc ssl +gdbm +webrtc-aec xen systemd"
+
+RDEPEND=">=media-libs/libsndfile-1.0.20
+	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 )
+	gtk? ( x11-libs/gtk+:2 )
+	gnome? ( >=gnome-base/gconf-2.4.0 )
+	bluetooth? (
+		>=net-wireless/bluez-4.99
+		>=sys-apps/dbus-1.0.0
+		media-libs/sbc
+	)
+	asyncns? ( net-libs/libasyncns )
+	udev? ( >=virtual/udev-143[hwdb] )
+	realtime? ( sys-auth/rtkit )
+	equalizer? (
+		sci-libs/fftw:3.0
+		dev-python/PyQt4[dbus]
+	)
+	orc? ( >=dev-lang/orc-0.4.9 )
+	ssl? ( dev-libs/openssl )
+	>=media-libs/speex-1.2_rc1
+	gdbm? ( sys-libs/gdbm )
+	webrtc-aec? ( media-libs/webrtc-audio-processing )
+	xen? ( app-emulation/xen )
+	systemd? ( >=sys-apps/systemd-39 )
+	dev-libs/json-c
+	>=sys-devel/libtool-2.2.4" # it's a valid RDEPEND, libltdl.so is used
+
+DEPEND="${RDEPEND}
+	sys-devel/m4
+	doc? ( app-doc/doxygen )
+	test? ( dev-libs/check )
+	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"
+# This is a PDEPEND to avoid a circular dep
+PDEPEND="alsa? ( media-plugins/alsa-plugins[pulseaudio] )"
+
+# 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 )
+	)"
+
+# See "*** BLUEZ support not found (requires D-Bus)" in configure.ac
+REQUIRED_USE="bluetooth? ( dbus )"
+
+pkg_setup() {
+	enewgroup audio 18 # Just make sure it exists
+
+	if use system-wide; then
+		enewgroup pulse-access
+		enewgroup pulse
+		enewuser pulse -1 -1 /var/run/pulse pulse,audio
+	fi
+}
+
+src_configure() {
+	if use gdbm; then
+		myconf+=" --with-database=gdbm"
+	#elif use tdb; then
+	#	myconf+=" --with-database=tdb"
+	else
+		myconf+=" --with-database=simple"
+	fi
+
+	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 dbus) \
+		$(use_enable gnome gconf) \
+		$(use_enable gtk gtk2) \
+		$(use_enable libsamplerate samplerate) \
+		$(use_enable bluetooth bluez) \
+		$(use_enable X x11) \
+		$(use_enable test default-build-tests) \
+		$(use_enable udev) \
+		$(use_enable systemd) \
+		$(use_enable ipv6) \
+		$(use_enable ssl openssl) \
+		$(use_enable webrtc-aec) \
+		$(use_enable xen) \
+		$(use_with caps) \
+		$(use_with equalizer fftw) \
+		--disable-adrian-aec \
+		--disable-esound \
+		--localstatedir="${EPREFIX}"/var \
+		--with-udev-rules-dir="${EPREFIX}/$(udev_get_udevdir)"/rules.d \
+		${myconf}
+
+	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
+
+	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
+}
diff --git a/media-sound/pulseaudio/pulseaudio-9999.ebuild b/media-sound/pulseaudio/pulseaudio-9999.ebuild
index 275d0ae3e5bd..cef36733c37b 100644
--- a/media-sound/pulseaudio/pulseaudio-9999.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-9999.ebuild
@@ -1,6 +1,6 @@
 # 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-9999.ebuild,v 1.30 2012/12/02 02:11:15 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-9999.ebuild,v 1.31 2012/12/07 20:13:21 ford_prefect Exp $
 
 EAPI=4
 
@@ -41,8 +41,9 @@ RDEPEND=">=media-libs/libsndfile-1.0.20
 	gtk? ( x11-libs/gtk+:2 )
 	gnome? ( >=gnome-base/gconf-2.4.0 )
 	bluetooth? (
-		>=net-wireless/bluez-4
+		>=net-wireless/bluez-4.99
 		>=sys-apps/dbus-1.0.0
+		media-libs/sbc
 	)
 	asyncns? ( net-libs/libasyncns )
 	udev? ( >=virtual/udev-143[hwdb] )
@@ -64,6 +65,7 @@ RDEPEND=">=media-libs/libsndfile-1.0.20
 DEPEND="${RDEPEND}
 	sys-devel/m4
 	doc? ( app-doc/doxygen )
+	test? ( dev-libs/check )
 	X? (
 		x11-proto/xproto
 		>=x11-libs/libXtst-1.0.99.2
@@ -90,18 +92,17 @@ REQUIRED_USE="bluetooth? ( dbus )"
 
 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 system-wide; then
+		enewgroup pulse-access
+		enewgroup pulse
+		enewuser pulse -1 -1 /var/run/pulse pulse,audio
+	fi
 }
 
 EGIT_BOOTSTRAP="./bootstrap.sh"
 
 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)
-
 	if use gdbm; then
 		myconf+=" --with-database=gdbm"
 	#elif use tdb; then
@@ -122,7 +123,6 @@ src_configure() {
 		$(use_enable jack) \
 		$(use_enable lirc) \
 		$(use_enable avahi) \
-		--disable-hal \
 		$(use_enable dbus) \
 		$(use_enable gnome gconf) \
 		$(use_enable gtk gtk2) \
@@ -195,7 +195,6 @@ src_install() {
 
 	# Create the state directory
 	use prefix || diropts -o pulse -g pulse -m0755
-	keepdir /var/run/pulse
 
 	find "${D}" -name '*.la' -delete
 }
@@ -225,6 +224,4 @@ pkg_postinst() {
 		elog "your Bluetooth controller enabled and inserted at bootup or"
 		elog "PulseAudio will refuse to start."
 	fi
-
-	eselect esd update --if-unset
 }