Make sure that the ebuild creates system.pa, modify the init script to use system.pa rather than default.pa and add a "needs" on consolekit if module-console-kit is requested in system.pa (bug #233789).

Package-Manager: portage-2.2_rc6/cvs/Linux 2.6.26-gentoo x86_64

4 files changed, 285 insertions, 12 deletions

diff --git a/media-sound/pulseaudio/ChangeLog b/media-sound/pulseaudio/ChangeLog
index 264a3c2d8ca9..2e797845aaaf 100644
--- a/media-sound/pulseaudio/ChangeLog
+++ b/media-sound/pulseaudio/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-sound/pulseaudio
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.108 2008/08/03 12:37:01 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.109 2008/08/03 18:03:45 chutzpah Exp $
+
+*pulseaudio-0.9.11-r2 (03 Aug 2008)
+
+  03 Aug 2008; Patrick McLean <chutzpah@gentoo.org>
+  +files/pulseaudio.init.d-4, +pulseaudio-0.9.11-r2.ebuild:
+  Make sure that the ebuild creates system.pa, modify the init script to use
+  system.pa rather than default.pa and add a "needs" on consolekit if
+  module-console-kit is requested in system.pa (bug #233789).
 
   03 Aug 2008; Petteri Räty <betelgeuse@gentoo.org>
   pulseaudio-0.9.11-r1.ebuild:
diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest
index d70bc5461547..b04ccbadfe53 100644
--- a/media-sound/pulseaudio/Manifest
+++ b/media-sound/pulseaudio/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX pulseaudio-0.9.10-caps.patch 364 RMD160 66c588518c2cf9a307cead7e10b5ef713b2bfe0f SHA1 717fc1d95445a3b816b8a10154561d27e28ebee3 SHA256 d4452a9d4c284ceda27199e26772075280efd5f8d546949eac93c1efeaf7f19b
 AUX pulseaudio-0.9.7-module-loading.patch 947 RMD160 725f13d72da5ee72e61cc8d558ca352bb3a5d001 SHA1 236819d1fe76ccb22580f07e2c3a24f95d010011 SHA256 0ecc719e38bbf423d46120ce991bcc807c431e36a68cb97471235aa8e8316075
 AUX pulseaudio-0.9.8-bt-nohal.patch 1153 RMD160 5ad7a7173795c022fca73ccf694207e18d6925a7 SHA1 9f50549357b5fa498e0b7f67258de431e90f89e2 SHA256 1bdc458d55529777a3a760205a09d0381433402a3002518ba5a700b3518c727d
@@ -11,6 +8,7 @@ AUX pulseaudio-0.9.8-svn2074.patch 412 RMD160 49e416e5e9747cd7c2065b98220e999103
 AUX pulseaudio.conf.d 275 RMD160 6317cb5be41a768428056c0057d8f5b1f189e804 SHA1 22ed7f1de0f2a18a608c5e9a91635ee66addac4d SHA256 c03661e8cc902d27ff6b52f291207f2b008957571b942abdd92a873a52aae0dd
 AUX pulseaudio.init.d-2 632 RMD160 5baf66e3f64e406b7e23ffbe13774e32595cff19 SHA1 e0a46567d43f7e3620c8da90654a0f16235a36fa SHA256 24c7f5319161105e46382c7c1340ae634d54cfbe32cdf70c86d6fd6c40782ee0
 AUX pulseaudio.init.d-3 1727 RMD160 ffe93d7c5300ae7974e9b5c02987a23422940d35 SHA1 437b6a0b856e44dffa89c44a2934b4d87b0e187f SHA256 8f31a03b430b5a6a7525e2251842cf685e55983c1f6d7036ae8b0aa9c8f9e2fb
+AUX pulseaudio.init.d-4 1849 RMD160 e91b9cc6da3b89827ad2c7dbe6b040669e94e7bd SHA1 e35530e8bf70339945eb7ebdfbe1cefcee4c62de SHA256 fd20883258e97d70fe957b01e70a9f73c58e843595dc3e53bffa658652659f99
 DIST pulseaudio-0.9.10.tar.gz 1081546 RMD160 efe78b85360d0342bc839b870ad424cff0171e80 SHA1 90139debe73b6d26bc0240af3587fdb7fe4c2750 SHA256 1ae8b587759b33ad954e717728fab6df58bd28088d0ac8faf22e90253b774975
 DIST pulseaudio-0.9.11.tar.gz 1166430 RMD160 2a0629d8a4d93542e55e3031133fc36072604476 SHA1 844884c1a0c2a4810d0f92093413f8dfeb34eed9 SHA256 6cc4aff778275f087cfbd65d2040b1587cafc588749499a452eb496329505ab0
 DIST pulseaudio-0.9.7.tar.gz 1013981 RMD160 49d0d875d6929527fe97124431462e63adf52873 SHA1 c6c36f2ddb51685971abf8b47ed325a8f06759c5 SHA256 b5f3fe8fc8be435e5d1b2183894fb545220a50b5b4850bb71af6b5e14f8f6ee0
@@ -19,15 +17,9 @@ EBUILD pulseaudio-0.9.10-r1.ebuild 5865 RMD160 c65dd19a6461fea44172af31884751a52
 EBUILD pulseaudio-0.9.10-r51.ebuild 5828 RMD160 c3f442403bece77a50678428816bc4be791a76f8 SHA1 2f33c3a8318b55546102a90bbb995f6527153785 SHA256 5328068fb5bb78203721af9b41654363ef9d8ace9801f39daf4f74a478dc8188
 EBUILD pulseaudio-0.9.10.ebuild 5668 RMD160 bbda20bb4340ef60044c9d376c70ff9dc49df6bc SHA1 cba18c72faf7b5c5fd2b9ba7ac9cdef2a5da8387 SHA256 ce1b37a01d4541b40ac0d178ddb91e756a7324ce5dbd433c7e7dbc45adfbd95c
 EBUILD pulseaudio-0.9.11-r1.ebuild 6277 RMD160 37bcaefdedbc84550f698e64175dfad1fc829dba SHA1 bd9667cccc3ffe85355c62c7ca70fb9907c7f995 SHA256 1057fe1a4a8a189fad246d5701c82aa91d0eb73e6f6cc9f81ed8c2dcd90aee28
+EBUILD pulseaudio-0.9.11-r2.ebuild 6393 RMD160 1921a984ac8cbc1a6d4db92a6dbe1e704124dbc6 SHA1 af58b383445e0b7a487fb8a250d66511bc1b6596 SHA256 a5b11555e310f8918337f87753d4f5b1afcf54b8350842ac92ff5a106d6bcbe9
 EBUILD pulseaudio-0.9.11.ebuild 5861 RMD160 6fa50de291158e56812058778f9097a3e1479c57 SHA1 fadeb02b6c249ff401b43ec1d5a5161c58f5f7b7 SHA256 50c8b51ad2fb666089d56ba684ecf154998ebcc4c6407d1f7643420ceea88ade
 EBUILD pulseaudio-0.9.7.ebuild 4752 RMD160 0217d3ccee281219df3a6817935f762b9a03f286 SHA1 2fca6bbfd4b2c209ca59e5313a1b45cec19c5fb2 SHA256 65803bb77985bc3bb82e0e0d01e82a7293fc61ad951a35a1672e25941725437c
 EBUILD pulseaudio-0.9.9.ebuild 5810 RMD160 db6a3d4da34ea78d6cf5901c57bc74b48082fd66 SHA1 7a659611de1b5ad7acb8e4e5ebac8ac6ec2c06f7 SHA256 90128fff4ccca7e019cd772e0faab2dc68ec8c2149aa476ddc77e1b63201279b
-MISC ChangeLog 20098 RMD160 f6caddf1fe443e225d7d1bf16899cf039db6271b SHA1 bd4c9b2acf2b9a724ff124acf7ad6c4616536326 SHA256 a7e6b8e313f62846b5113a8224a4323656895188a54846eb71c2d521725d3506
+MISC ChangeLog 20455 RMD160 eb3b02ec685eefe2dc17a0455a19c0ebafa1675d SHA1 7ba2f347f8fe40ff24f78735c0486b631a335d75 SHA256 6356504362f2a0673f7e498934060794a529e9c3775095e1bad1b3021a6bc24f
 MISC metadata.xml 1106 RMD160 451b24728e90377bc829a999a76fca5b4bc91078 SHA1 6b242be79913c9ffa2aafdd95149a7fa93b3c764 SHA256 995d3c7013901cd84098a1b40975c54863751e8668874f763ec70b81e23e9a9f
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkiVpnQACgkQcxLzpIGCsLRbiwCfWyDyJEJXXVJIgj457kjZxdgj
-gq4An0YELvBdPnQsYhqD4gpr+1gC6PxV
-=OF1s
------END PGP SIGNATURE-----
diff --git a/media-sound/pulseaudio/files/pulseaudio.init.d-4 b/media-sound/pulseaudio/files/pulseaudio.init.d-4
new file mode 100644
index 000000000000..b9c883d664c5
--- /dev/null
+++ b/media-sound/pulseaudio/files/pulseaudio.init.d-4
@@ -0,0 +1,72 @@
+#!/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.1 2008/08/03 18:03:46 chutzpah 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 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-)?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() {
+	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.11-r2.ebuild b/media-sound/pulseaudio/pulseaudio-0.9.11-r2.ebuild
new file mode 100644
index 000000000000..d04009010fe6
--- /dev/null
+++ b/media-sound/pulseaudio/pulseaudio-0.9.11-r2.ebuild
@@ -0,0 +1,201 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.9.11-r2.ebuild,v 1.1 2008/08/03 18:03:45 chutzpah Exp $
+
+EAPI=1
+
+inherit eutils libtool autotools flag-o-matic
+
+DESCRIPTION="A networked sound server with an advanced plugin system"
+HOMEPAGE="http://0pointer.de/lennart/projects/pulseaudio/"
+SRC_URI="http://0pointer.de/lennart/projects/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2 GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc64 ~sparc ~x86"
+IUSE="alsa avahi caps jack lirc oss tcpd X hal dbus libsamplerate gnome bluetooth policykit asyncns +glib"
+
+RDEPEND="X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libXau x11-libs/libXdmcp )
+	caps? ( sys-libs/libcap )
+	libsamplerate? ( >=media-libs/libsamplerate-0.1.1-r1 )
+	alsa? ( >=media-libs/alsa-lib-1.0.17-r1 )
+	glib? ( >=dev-libs/glib-2.4.0 )
+	avahi? ( >=net-dns/avahi-0.6.12 )
+	>=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.7
+		>=sys-apps/dbus-1.0.0
+	)
+	app-admin/eselect-esd
+	bluetooth? (
+		>=net-wireless/bluez-libs-3
+		>=sys-apps/dbus-1.0.0
+	)
+	policykit? ( sys-auth/policykit )
+	asyncns? ( net-libs/libasyncns )
+	>=media-libs/audiofile-0.2.6-r1
+	>=media-libs/speex-1.2_beta
+	>=media-libs/libsndfile-1.0.10
+	>=dev-libs/liboil-0.3.6
+	sys-libs/gdbm
+	|| ( sys-apps/openrc >=sys-apps/baselayout-2.0_rc5 )
+	>=sys-devel/libtool-1.5.24" # it's a valid RDEPEND, libltdl.so is used
+DEPEND="${RDEPEND}
+	X? ( x11-proto/xproto )
+	dev-libs/libatomic_ops
+	dev-util/pkgconfig
+	dev-util/unifdef"
+
+# 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
+	alsa? ( media-sound/alsa-utils )
+	bluetooth? ( >=net-wireless/bluez-utils-3 )"
+
+pkg_setup() {
+	if use avahi && ! built_with_use net-dns/avahi dbus ; then
+		echo
+		eerror "In order to compile pulseaudio with avahi support, you need to have"
+		eerror "net-dns/avahi emerged with 'dbus' in your USE flag. Please add that"
+		eerror "flag, re-emerge avahi, and then emerge pulseaudio again."
+		die "net-dns/avahi is missing the D-Bus bindings."
+	fi
+
+	enewgroup audio 18 # Just make sure it exists
+	enewgroup realtime
+	enewgroup pulse-access
+	enewgroup pulse
+	enewuser pulse -1 -1 /var/run/pulse pulse,audio
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Avoid building - and especially linking - test programs
+	# outside of make check
+	sed -i -e 's:noinst_PROGRAMS:check_PROGRAMS:' \
+		"${S}/src/Makefile.am"
+
+	eautoreconf
+	elibtoolize
+}
+
+src_compile() {
+	# To properly fix CVE-2008-0008
+	append-flags -UNDEBUG
+
+	econf \
+		--enable-largefile \
+		$(use_enable glib) \
+		--disable-solaris \
+		$(use_enable asyncns) \
+		$(use_enable oss) \
+		$(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 policykit polkit) \
+		$(use_with caps) \
+		$(use_with X x) \
+		--disable-ltdl-install \
+		--localstatedir=/var \
+		--with-realtime-group=realtime \
+		--disable-per-user-esound-socket \
+		|| die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake -j1 DESTDIR="${D}" install || die "make install failed"
+
+	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 "${FILESDIR}/pulseaudio.init.d-4" \
+		$(use_define hal) \
+		$(use_define avahi) \
+		$(use_define alsa) \
+		$(use_define bluetooth) \
+		> "${T}/pulseaudio"
+	doinitd "${T}/pulseaudio"
+
+	use avahi && sed -i -e '/module-zeroconf-publish/s:^#::' "${D}/etc/pulse/default.pa"
+
+	dohtml -r doc
+	dodoc README
+
+	# this should fix system daemon startup #233789
+	cp "${D}/etc/pulse/default.pa" "${D}/etc/pulse/system.pa"
+
+	# 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 "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. Pleaes note"
+		elog "that you might need to remove the gnome USE flag or disable the"
+		elog "gconf module on /etc/pulse/default.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
+	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; 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
+}