Bump to 0.9.22. Lots of bug fixes. Remove SRC_URI munging till a newer release scheme gets decided. Also use --with-udev-rules-dir instead of emake variable override and make pulling gnome-sounds dependent on USE=X (bug #341551).

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

3 files changed, 247 insertions, 2 deletions

diff --git a/media-sound/pulseaudio/ChangeLog b/media-sound/pulseaudio/ChangeLog
index 98fe55d58f07..22ec829c2cb2 100644
--- a/media-sound/pulseaudio/ChangeLog
+++ b/media-sound/pulseaudio/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-sound/pulseaudio
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.196 2010/09/21 22:36:43 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.197 2010/11/26 04:14:08 ford_prefect Exp $
+
+*pulseaudio-0.9.22 (26 Nov 2010)
+
+  26 Nov 2010; Arun Raghavan <ford_prefect@gentoo.org>
+  +pulseaudio-0.9.22.ebuild:
+  Bump to 0.9.22. Lots of bug fixes. Remove SRC_URI munging till a newer
+  release scheme gets decided. Also use --with-udev-rules-dir instead of
+  emake variable override and make pulling gnome-sounds dependent on USE=X
+  (bug #341551).
 
 *pulseaudio-0.9.21.2-r2 (21 Sep 2010)
 
diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest
index d3788ee10d5a..ff3d24225e21 100644
--- a/media-sound/pulseaudio/Manifest
+++ b/media-sound/pulseaudio/Manifest
@@ -15,6 +15,7 @@ DIST pulseaudio-0.9.19.tar.gz 2029090 RMD160 2de3f4b9ec587c3df3b7a9d11a6d1b9d5f9
 DIST pulseaudio-0.9.21.1.tar.gz 1930604 RMD160 f66e8e7bf8a0c9ee698864eda58a096fa40b91cf SHA1 8208face40802b93174ca503f314a772b5fceaeb SHA256 1a7972da037140375b2d5cc95f0c82bfa0c86b05ab74a569081a5b99d32533ef
 DIST pulseaudio-0.9.21.2.tar.gz 1938268 RMD160 61c04b4246c047024589a1f5fae55eaf1c6fd791 SHA1 d1cf462d9bb38399b1603eee88b7f1fd9a67cc27 SHA256 0ba8e1d85c94cb5a1ee18cf81b78e0a22c1575c6e9e4010565752f6271f8629b
 DIST pulseaudio-0.9.21.tar.gz 2056896 RMD160 6db0725253228b673a78cbfae4824fadce2198ed SHA1 0309c97f7e0812e243c1bb80a4b74dc26369ac22 SHA256 94e22356ac70ee95388ae58da90d88c6b3186d1938618d21671627ff56cee254
+DIST pulseaudio-0.9.22.tar.gz 2076785 RMD160 31199c497f7b1cce2285a6369d43fc1f66cd41a4 SHA1 f5fc14d7a62ae9f9ee9745026e3f13f4c130140a SHA256 c6019324395117a258c048a6db5e9734551cc2c61dc35b46403ff00d64be55f0
 EBUILD pulseaudio-0.9.15-r2.ebuild 4695 RMD160 1778eb536613625bbb9b9696308cdffbfc0fc597 SHA1 fdbb8b1d7bee3b93d87c2f9740d7c62ccb269258 SHA256 dc84c1fc7aea839dcc84adc48f3444fa4bab1f5dde7bd423da3c4dd370d6c5fd
 EBUILD pulseaudio-0.9.19.ebuild 5376 RMD160 3dfd7cfc8d35acc7dcae1b4efb272fc3e9ae9ec0 SHA1 026992f09962933b2097a2d2b32cdb88c737c4a1 SHA256 1a96d1ed99f330c9de65bc5a7a54a95d5f99113fb4de7e74295458f26f8ba495
 EBUILD pulseaudio-0.9.21.1.ebuild 7141 RMD160 0a9b668a79f487a59a5345df40444097115183e9 SHA1 38bbc60715712930aae037c93b9bd331570050b2 SHA256 24ac1db7065dfab24610dbcfa695a34e23bde12a1a79da988f82ed4a22d70625
@@ -22,5 +23,6 @@ EBUILD pulseaudio-0.9.21.2-r1.ebuild 7169 RMD160 3ef684a85d05351e0afc518eeb72be1
 EBUILD pulseaudio-0.9.21.2-r2.ebuild 7283 RMD160 e1142daaa3a621886a2938e70fcd67f1f71f4b67 SHA1 344c2961944a1da853551425865655b6b41c6a84 SHA256 ff3bfa56af4639efe47bba192aeec9b341e6d7c48ce400b3b0214533cd720b3c
 EBUILD pulseaudio-0.9.21.2.ebuild 7149 RMD160 7157c54ef26337b081dc68d002031063c6984f76 SHA1 a37d7e687013e392094ada204daa85286e8d7758 SHA256 a9d54547e66d2cec91c8e3325133b5927c63b3c1ff5d71f2def9103aadb1d902
 EBUILD pulseaudio-0.9.21.ebuild 5438 RMD160 1fb42bf4a5055b1f6ba6ce16884406678237556d SHA1 363d7f1078ba0ef19235bb826419ac0d8e2b2af1 SHA256 d55cd0be6aa10f0dc83543d5d9cec821382ce70d04752bba4f970cfe1e2e2f89
-MISC ChangeLog 39292 RMD160 94a05d89c2515009861045050b3bc8f5176d5686 SHA1 4f349387153f786d36676422333b2f0fa583b74a SHA256 b598944610b68ad23aed06c2bd76144dffd4c37a19bd65f4a24e71502074b7c5
+EBUILD pulseaudio-0.9.22.ebuild 6988 RMD160 071314a92fa13c0de87cd2689d110e7ad6e17f49 SHA1 0a5d5ea0647893bbee3cb6e7350bfdd6f842b2f6 SHA256 ba3ef471073c63d87b74f9b3b7ee50f604c6340850360c02dc848a627ac14fc5
+MISC ChangeLog 39657 RMD160 42f0142f04dad441e2e14db30bb2ceb879db534e SHA1 5315b2052a6b1e72738df02b530ea30aaae9c90b SHA256 ab6239789e105263925572284408411006a51d4019163ba9d126a2004caa3294
 MISC metadata.xml 2156 RMD160 14d0f56694ac33865c29d7db9458c9636497a66f SHA1 a3ca6364922bf6d07714d8d6670cfdac75a39e39 SHA256 2573de70d411e31d4ce22e757757893270f45281520bce564a715c1abd1f9959
diff --git a/media-sound/pulseaudio/pulseaudio-0.9.22.ebuild b/media-sound/pulseaudio/pulseaudio-0.9.22.ebuild
new file mode 100644
index 000000000000..2c450cddf904
--- /dev/null
+++ b/media-sound/pulseaudio/pulseaudio-0.9.22.ebuild
@@ -0,0 +1,234 @@
+# Copyright 1999-2010 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.1 2010/11/26 04:14:08 ford_prefect Exp $
+
+EAPI=3
+
+inherit eutils libtool flag-o-matic 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 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+alsa avahi +caps jack lirc oss tcpd +X hal dbus libsamplerate gnome bluetooth +asyncns +glib test doc +udev ipv6 system-wide realtime"
+
+RDEPEND="app-admin/eselect-esd
+	X? (
+		x11-libs/libX11[xcb]
+		x11-libs/xcb-util
+		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
+	)
+	bluetooth? (
+		>=net-wireless/bluez-4
+		>=sys-apps/dbus-1.0.0
+	)
+	asyncns? ( net-libs/libasyncns )
+	udev? ( >=sys-fs/udev-143[extras] )
+	realtime? ( sys-auth/rtkit )
+	>=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
+	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
+
+	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() {
+	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="${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 hal) \
+			$(use_define avahi) \
+			$(use_define alsa) \
+			$(use_define bluetooth) \
+			$(use_define udev) \
+			"${FILESDIR}/pulseaudio.init.d-4" \
+			> "${T}/pulseaudio"
+
+		doinitd "${T}/pulseaudio"
+	fi
+
+	use avahi && sed -i -e '/module-zeroconf-publish/s:^#::' "${ED}/etc/pulse/default.pa"
+
+	if use hal && ! use udev; then
+		sed -i -e 's:-udev:-hal:' "${ED}/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
+	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
+}