Add a new revision with an experimental init script with dynamic dependencies. With this script, disabling HAL or Avahi support on the configuration file will not require them to be started even if PulseAudio was built with their support enabled. Similarly ALSA is no more a requirement if no ALSA sink or source is defined and no autodetect modules are loaded.

Package-Manager: portage-2.1.3.16

5 files changed, 235 insertions, 9 deletions

diff --git a/media-sound/pulseaudio/ChangeLog b/media-sound/pulseaudio/ChangeLog
index e09402124d38..9f17c08ce2ad 100644
--- a/media-sound/pulseaudio/ChangeLog
+++ b/media-sound/pulseaudio/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for media-sound/pulseaudio
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.63 2007/09/10 19:11:37 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.64 2007/10/26 15:28:43 flameeyes Exp $
+
+*pulseaudio-0.9.6-r2 (26 Oct 2007)
+
+  26 Oct 2007; Diego Pettenò <flameeyes@gentoo.org>
+  +files/pulseaudio.init.d-3, +pulseaudio-0.9.6-r2.ebuild:
+  Add a new revision with an experimental init script with dynamic
+  dependencies. With this script, disabling HAL or Avahi support on the
+  configuration file will not require them to be started even if PulseAudio
+  was built with their support enabled. Similarly ALSA is no more a
+  requirement if no ALSA sink or source is defined and no autodetect modules
+  are loaded.
 
   10 Sep 2007; Joseph Jezak <josejx@gentoo.org> pulseaudio-0.9.6-r1.ebuild:
   Marked ~ppc/~ppc64 for bug #181234.
diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest
index e01bb729c13d..d7883ef71439 100644
--- a/media-sound/pulseaudio/Manifest
+++ b/media-sound/pulseaudio/Manifest
@@ -29,6 +29,10 @@ AUX pulseaudio.init.d-2 615 RMD160 65824abf6251e451767d4cf6c90d75e2fd578f66 SHA1
 MD5 c3f957fd025284694e2c790a2132a199 files/pulseaudio.init.d-2 615
 RMD160 65824abf6251e451767d4cf6c90d75e2fd578f66 files/pulseaudio.init.d-2 615
 SHA256 a1fd790c3484c4536a8a2412c4dea7a3a51ec8ce040c0509529cb8ad2e089068 files/pulseaudio.init.d-2 615
+AUX pulseaudio.init.d-3 1563 RMD160 fe706b89b0a06d2a8174d30ad3c4650eed7aaf02 SHA1 4f5d7e812186b7b0317c17b9c28eb116d3d10450 SHA256 334acbabb14031e93449a7ea396459e170a75c9ac17cc6c316bb3d2053674a3a
+MD5 3c53a8306a156aadc1ae2be56e6a496a files/pulseaudio.init.d-3 1563
+RMD160 fe706b89b0a06d2a8174d30ad3c4650eed7aaf02 files/pulseaudio.init.d-3 1563
+SHA256 334acbabb14031e93449a7ea396459e170a75c9ac17cc6c316bb3d2053674a3a files/pulseaudio.init.d-3 1563
 DIST pulseaudio-0.9.5.tar.gz 1145930 RMD160 67f0cef89588453e347a2af5f641c9f953d4ef4b SHA1 c69c5a1f3e0cdc0c79f2ec3860e6aa02a049405e SHA256 cd82eabcf9fa310a64b58b621730cebe5d3edae7596a9c121155db455b1e58f6
 DIST pulseaudio-0.9.6.tar.gz 1157647 RMD160 04de5538d6f4530f90163ba52b6f077878f1297b SHA1 c3ec7aac57bd14eb9c922883f47795995cc2b6dc SHA256 b7a5f14eb8cf7076f1df8fb78d4a05c83e1e655474688c48364fa1b96f478d64
 EBUILD pulseaudio-0.9.5-r4.ebuild 3929 RMD160 b6f963ff3ffab9badd0ca98b78d93773f933dc65 SHA1 aee9bcdd7deb9e5aa7d8117d3001d81e695f10fd SHA256 b00a9f1deb8c7d86c47f1c10c98af570d6fff4e8ce049b3fbd6e7ddf81db2627
@@ -43,14 +47,18 @@ EBUILD pulseaudio-0.9.6-r1.ebuild 4242 RMD160 24034407b2d95303be340df5388e8f5dda
 MD5 0acd3124f58aebcae7b1f574da476cd1 pulseaudio-0.9.6-r1.ebuild 4242
 RMD160 24034407b2d95303be340df5388e8f5dda295cca pulseaudio-0.9.6-r1.ebuild 4242
 SHA256 41c27a76d7d62f0d2f46b7cce53d36bfdee19a87e4492be1bc550b5a601a3849 pulseaudio-0.9.6-r1.ebuild 4242
+EBUILD pulseaudio-0.9.6-r2.ebuild 4240 RMD160 67aaf064abbfd84aef49a455cabc20e1b63d7ca9 SHA1 5213b8e3692da6a09b10a64f4d8040417f5dce67 SHA256 5d2d939567f57308b4c2462771293c2a0035fbbf67b13e141cd501648746bab7
+MD5 7752def7688532d18ee554ca011f4a63 pulseaudio-0.9.6-r2.ebuild 4240
+RMD160 67aaf064abbfd84aef49a455cabc20e1b63d7ca9 pulseaudio-0.9.6-r2.ebuild 4240
+SHA256 5d2d939567f57308b4c2462771293c2a0035fbbf67b13e141cd501648746bab7 pulseaudio-0.9.6-r2.ebuild 4240
 EBUILD pulseaudio-0.9.6.ebuild 3866 RMD160 d8e522cea99f78d0e4a5bb15377c42158eca48c6 SHA1 a362b0b4b31f7040a43779c3d18fc7440efa308a SHA256 08c280756ddbd87b53c2b6961b8307d4a182bc42cf2520506776f4f158c18531
 MD5 2f1ae2f549d93b917d0cacc0280cb8a1 pulseaudio-0.9.6.ebuild 3866
 RMD160 d8e522cea99f78d0e4a5bb15377c42158eca48c6 pulseaudio-0.9.6.ebuild 3866
 SHA256 08c280756ddbd87b53c2b6961b8307d4a182bc42cf2520506776f4f158c18531 pulseaudio-0.9.6.ebuild 3866
-MISC ChangeLog 11177 RMD160 7f2c591af1eaa22d43e3adb8b8e10d3b8ecc51a0 SHA1 dd6fcb3f422ae5c0bcd1c74a07e025889f41ec55 SHA256 e8f44cc53da230c1b0f6d3418cc5589e14d9403429a624affc3e48b1e2481be0
-MD5 6d1022dba77062c70691eee9d6ee8d47 ChangeLog 11177
-RMD160 7f2c591af1eaa22d43e3adb8b8e10d3b8ecc51a0 ChangeLog 11177
-SHA256 e8f44cc53da230c1b0f6d3418cc5589e14d9403429a624affc3e48b1e2481be0 ChangeLog 11177
+MISC ChangeLog 11703 RMD160 d5ead35589cec3ecf8b6dfb109931ee0c6f16641 SHA1 e317000fe49217d89ac9d9068c6378823cb19752 SHA256 4419874e3243908d8f1281281ff6c707e76739e3400834bcdf157d2db21820a2
+MD5 a90eef710a1c4553df7d25ab6585a7c8 ChangeLog 11703
+RMD160 d5ead35589cec3ecf8b6dfb109931ee0c6f16641 ChangeLog 11703
+SHA256 4419874e3243908d8f1281281ff6c707e76739e3400834bcdf157d2db21820a2 ChangeLog 11703
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
@@ -67,10 +75,13 @@ SHA256 589a5d35f77e204519dca87c60cd887406b4c55a755afcd7975a5b392c994ab7 files/di
 MD5 03bd693cbd374e1dd1f4fff834053e12 files/digest-pulseaudio-0.9.6-r1 253
 RMD160 b3a1281e4a0deef7e89dea86a48384513c9a002d files/digest-pulseaudio-0.9.6-r1 253
 SHA256 589a5d35f77e204519dca87c60cd887406b4c55a755afcd7975a5b392c994ab7 files/digest-pulseaudio-0.9.6-r1 253
+MD5 03bd693cbd374e1dd1f4fff834053e12 files/digest-pulseaudio-0.9.6-r2 253
+RMD160 b3a1281e4a0deef7e89dea86a48384513c9a002d files/digest-pulseaudio-0.9.6-r2 253
+SHA256 589a5d35f77e204519dca87c60cd887406b4c55a755afcd7975a5b392c994ab7 files/digest-pulseaudio-0.9.6-r2 253
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.6 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFG5Zb8csIHjyDViGQRAiI9AJ9BzfJEkMPQHGKnKf2QIPWwibxPmwCfScsA
-GFZlQrs5GmA1qWH9Qm0kFwY=
-=+WT5
+iD8DBQFHIgbyAiZjviIA2XgRAq+dAKDHaV3pJCSkRMBvt3ff/CZxKHyFOgCdFw79
+Jn6Ztzq6zcccqEvV/KKqFbU=
+=FFPw
 -----END PGP SIGNATURE-----
diff --git a/media-sound/pulseaudio/files/digest-pulseaudio-0.9.6-r2 b/media-sound/pulseaudio/files/digest-pulseaudio-0.9.6-r2
new file mode 100644
index 000000000000..347bd6651446
--- /dev/null
+++ b/media-sound/pulseaudio/files/digest-pulseaudio-0.9.6-r2
@@ -0,0 +1,3 @@
+MD5 669d52a70fb9a7a83c2507005bfa2a6f pulseaudio-0.9.6.tar.gz 1157647
+RMD160 04de5538d6f4530f90163ba52b6f077878f1297b pulseaudio-0.9.6.tar.gz 1157647
+SHA256 b7a5f14eb8cf7076f1df8fb78d4a05c83e1e655474688c48364fa1b96f478d64 pulseaudio-0.9.6.tar.gz 1157647
diff --git a/media-sound/pulseaudio/files/pulseaudio.init.d-3 b/media-sound/pulseaudio/files/pulseaudio.init.d-3
new file mode 100644
index 000000000000..76dd277e0877
--- /dev/null
+++ b/media-sound/pulseaudio/files/pulseaudio.init.d-3
@@ -0,0 +1,61 @@
+#!/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-3,v 1.1 2007/10/26 15:28:44 flameeyes Exp $
+
+depend() {
+	use net
+
+	local script="/etc/pulse/default.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
+
+#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 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.6-r2.ebuild b/media-sound/pulseaudio/pulseaudio-0.9.6-r2.ebuild
new file mode 100644
index 000000000000..50c5b4d0aab7
--- /dev/null
+++ b/media-sound/pulseaudio/pulseaudio-0.9.6-r2.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.9.6-r2.ebuild,v 1.1 2007/10/26 15:28:43 flameeyes Exp $
+
+inherit eutils libtool # autotools
+
+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 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="alsa avahi caps jack lirc oss tcpd X hal"
+
+RDEPEND="X? ( x11-libs/libX11 )
+	caps? ( sys-libs/libcap )
+	>=media-libs/audiofile-0.2.6-r1
+	>=media-libs/libsamplerate-0.1.1-r1
+	>=media-libs/libsndfile-1.0.10
+	>=dev-libs/liboil-0.3.6
+	alsa? ( >=media-libs/alsa-lib-1.0.10 )
+	>=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 )
+	hal? ( >=sys-apps/hal-0.5.7 )
+	>=sys-apps/baselayout-2.0_rc5
+	app-admin/eselect-esd
+	sys-devel/libtool" # it's a valid RDEPEND, libltdl.so is used
+DEPEND="${RDEPEND}
+	dev-libs/libatomic_ops
+	dev-util/pkgconfig
+	dev-util/unifdef"
+
+# This is for the alsasound init.d script (see bug #155707)
+RDEPEND="${RDEPEND}
+	alsa? ( media-sound/alsa-utils )"
+
+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}"
+
+	epatch "${FILESDIR}/${P}-build.patch"
+
+	# eautoreconf
+	elibtoolize
+}
+
+src_compile() {
+	econf \
+		--enable-largefile \
+		--enable-glib2 \
+		--disable-solaris \
+		--disable-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_with caps) \
+		$(use_with X x) \
+		--disable-ltdl-install \
+		--localstatedir=/var \
+		--with-realtime-group=realtime \
+		|| 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-3" \
+		$(use_define hal) \
+		$(use_define avahi) \
+		$(use_define alsa) \
+		> "${T}/pulseaudio"
+	doinitd "${T}/pulseaudio"
+
+	if ! use hal; then
+		sed -i -e '/module-hal-detect/s:^:#: ; /module-detect/s:^#::' "${D}/etc/pulse/default.pa"
+	fi
+	use avahi && sed -i -e '/module-zeroconf-publish/s:^#::' "${D}/etc/pulse/default.pa"
+
+	dohtml -r doc
+	dodoc README
+
+	# Create the state directory
+	diropts -o pulse -g pulse -m0755
+	keepdir /var/run/pulse
+}
+
+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"
+	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."
+
+	eselect esd update --if-unset
+}