Bump to a newer stable-queue snapshot.

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

3 files changed, 259 insertions, 2 deletions

diff --git a/media-sound/pulseaudio/ChangeLog b/media-sound/pulseaudio/ChangeLog
index 1e61a35b9b04..0fcef4b674ba 100644
--- a/media-sound/pulseaudio/ChangeLog
+++ b/media-sound/pulseaudio/ChangeLog
@@ -1,6 +1,12 @@
 # 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.185 2010/03/02 02:36:23 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.186 2010/03/07 17:15:27 flameeyes Exp $
+
+*pulseaudio-0.9.21.2 (07 Mar 2010)
+
+  07 Mar 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  +pulseaudio-0.9.21.2.ebuild:
+  Bump to a newer stable-queue snapshot.
 
   02 Mar 2010; Jeroen Roovers <jer@gentoo.org> pulseaudio-0.9.21.1.ebuild:
   Stable for HPPA (bug #299913).
diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest
index f0aefc6558bd..c8e980b0ebb1 100644
--- a/media-sound/pulseaudio/Manifest
+++ b/media-sound/pulseaudio/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX pulseaudio-0.9.15-CVE-2009-1894.patch 1969 RMD160 69a11b7f132d24e7f99fec180ffed3caf806de77 SHA1 1b9106e52c063e83b8577434360edaf3be81351d SHA256 a14e01e386f60c083dda6049e951bcf17af693ac475afd1f455d71f400f2e526
 AUX pulseaudio-0.9.15-bsd.patch 549 RMD160 d44e309557353c115281e860bfa643b197d04921 SHA1 0cd07acc70c0e53984e7a639d9668b4817cb804c SHA256 d044e27ad71424b601f0de37e29321226579146203c6c557434d11e298798787
 AUX pulseaudio-0.9.19-fweb.patch 2263 RMD160 ab33d2b583244edde0a64c6cb285c9b0e2bf40fd SHA1 5ef59ce5e84b1b214b7e54ea64d9de851c70b25b SHA256 80fdc6c68566ed7c6bf02c263d0056c2c9f0c911d308ec166a35e309b47b2e2b
@@ -13,10 +16,19 @@ AUX pulseaudio.init.d-4 2493 RMD160 9f6b2f487298a5576b60b53095ee697095b88c89 SHA
 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.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
 EBUILD pulseaudio-0.9.15-r2.ebuild 4753 RMD160 d5b265c9c8b5a6408506fb81bbad60a80e32145a SHA1 c839256885703602e0cd9a375b4c4fccbf04edd0 SHA256 ef4c0922cf7fe434cc388383ffe7d0c5d88c8ff317927f19a901c4bf3964c98c
 EBUILD pulseaudio-0.9.19.ebuild 5435 RMD160 b09544a8c3dbaefe5a018288204f1247f134cd24 SHA1 4dd44a9b1623e1977759bd9b672d2cde01b3ca0a SHA256 ee28b6cbf92abaa11fff62e99b569f49248bf2991982f740c8f6df9bd88b84cb
 EBUILD pulseaudio-0.9.21.1.ebuild 7248 RMD160 dffbfeb3d9563309381ae2c694df49c09c767a6a SHA1 35a651e4d619be930953a96639787741e447de38 SHA256 3d570a2af6513e949ad8f3ebb1dd40f2f919b4ecc9c84a4e02a32400bf28c4a3
+EBUILD pulseaudio-0.9.21.2.ebuild 7257 RMD160 6a92bf6d9394fb7318d3c0b2ef3bc765f10f3ae2 SHA1 2a8e2a7f5e3fbae64f331325fca3fb747080f0d6 SHA256 5575e6d8b259cfa467bd244d32f5d47314cda6eaf14f4d5a6eefc8bf5afa17bb
 EBUILD pulseaudio-0.9.21.ebuild 5498 RMD160 139b0d283dc5091be17299bf894a88814c40cde4 SHA1 305efdf7979a82c7393cad1d50838eda55339ee8 SHA256 65c9f34074d5e45cf02347242f65c66c076f16caaea27d4a7a88aab318692af3
-MISC ChangeLog 37239 RMD160 0fb95a068da753d96562cf8136f4fc4c08bb7d11 SHA1 f55043e23343fe90ac2feadbcbee6f27c2c431b1 SHA256 421f4e17a9a80d1e9f2cb9c9c1df9b2692588a36584ed003a34ca8de0bcabb60
+MISC ChangeLog 37410 RMD160 d401d44633ac2fe11fbf7e9d6c6fe6c88a7618c6 SHA1 3999f559c9d7eda9b8b12ea5a1eb6a4f24bf8563 SHA256 a94324f3237580f621e09a8e4c2ace6f23bace6d2c3c2001c486aa7bca50d4ee
 MISC metadata.xml 2146 RMD160 9e201b75bea0fe98c76999e28f276becda9e8b8e SHA1 a28efc5090fdbdc7a09490ee3ed649e0b0a47aeb SHA256 05b7131f49857cca0bd73891e7700b8c1d2a5f56a1b63e27adfa61d111d0479c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAkuT30QACgkQAiZjviIA2XjJ7wCgjcrHsjRSOSw3vT/9r6t2Ha4S
+qPAAn0yJxA5QxLlOWqJuAEU88ScDriA0
+=t0xu
+-----END PGP SIGNATURE-----
diff --git a/media-sound/pulseaudio/pulseaudio-0.9.21.2.ebuild b/media-sound/pulseaudio/pulseaudio-0.9.21.2.ebuild
new file mode 100644
index 000000000000..656e66e7df3d
--- /dev/null
+++ b/media-sound/pulseaudio/pulseaudio-0.9.21.2.ebuild
@@ -0,0 +1,239 @@
+# 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.21.2.ebuild,v 1.1 2010/03/07 17:15:27 flameeyes Exp $
+
+EAPI=2
+
+inherit eutils libtool flag-o-matic versionator
+
+DESCRIPTION="A networked sound server with an advanced plugin system"
+HOMEPAGE="http://www.pulseaudio.org/"
+
+if [[ $(get_version_component_count) == 4 ]]; then
+	# Lennart does not produce point-releases, but I do so get them
+	# from my website instead.
+	SRC_URI="http://www.flameeyes.eu/gentoo-distfiles/${P}.tar.gz"
+elif [[ ${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 system-wide"
+
+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
+	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-utils dep is for the bluetooth init.d script
+RDEPEND="${RDEPEND}
+	gnome-extra/gnome-audio
+	system-wide? (
+		sys-apps/openrc
+		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() {
+	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"
+
+	# Drop the script entirely if X is disabled
+	use X || rm "${D}"/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:^#::' "${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() {
+	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} && ! 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
+}