Remove last trace of sys-apps/hal from init.d script wrt #351722. No revision bump because USE="system-wide" is masked.

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

4 files changed, 92 insertions, 5 deletions

diff --git a/media-sound/pulseaudio/ChangeLog b/media-sound/pulseaudio/ChangeLog
index aaf3d01ba076..19bfcbc4936e 100644
--- a/media-sound/pulseaudio/ChangeLog
+++ b/media-sound/pulseaudio/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/pulseaudio
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.209 2011/03/27 14:16:19 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.210 2011/03/27 16:58:49 ssuominen Exp $
+
+  27 Mar 2011; Samuli Suominen <ssuominen@gentoo.org> pulseaudio-0.9.22.ebuild,
+  +files/pulseaudio.init.d-5:
+  Remove last trace of sys-apps/hal from init.d script wrt #351722. No revision
+  bump because USE="system-wide" is masked.
 
   27 Mar 2011; Brent Baude <ranger@gentoo.org> pulseaudio-0.9.22.ebuild:
   Marking pulseaudio-0.9.22 ppc for bug 360123
diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest
index ef4b7c7fe187..c643032e6ba3 100644
--- a/media-sound/pulseaudio/Manifest
+++ b/media-sound/pulseaudio/Manifest
@@ -1,10 +1,11 @@
 AUX pulseaudio-0.9.21-armv5-build-fix.patch 3387 RMD160 a3c3d2cd97478fc7ee53eb9aa6054d7c09271ec4 SHA1 1a3747c5e24c2cc26e43348a12627725b5d6242f SHA256 4734ffb3b038194911627c20959f75609da76e8e071da0833a794f264c243000
 AUX pulseaudio.conf.d 275 RMD160 6317cb5be41a768428056c0057d8f5b1f189e804 SHA1 22ed7f1de0f2a18a608c5e9a91635ee66addac4d SHA256 c03661e8cc902d27ff6b52f291207f2b008957571b942abdd92a873a52aae0dd
 AUX pulseaudio.init.d-4 2493 RMD160 9f6b2f487298a5576b60b53095ee697095b88c89 SHA1 80f0e5e621d9312a7b24129fe843dd7ce085756d SHA256 dc8caa43aa297d2ca4019eef5b3cb64b3a57741e611620490f8d79091790f363
+AUX pulseaudio.init.d-5 2352 RMD160 36a3732386617f5436a60d0d9248a69da9804c5d SHA1 4b2fa2f0437b78b0a7fd5a54e8a83b02c99af579 SHA256 60e4571a8af0437bd99cfd858fde1e6223544a60e591febf25e55e4a2918ff59
 DIST pulseaudio-0.9.21.1.tar.gz 1930604 RMD160 f66e8e7bf8a0c9ee698864eda58a096fa40b91cf SHA1 8208face40802b93174ca503f314a772b5fceaeb SHA256 1a7972da037140375b2d5cc95f0c82bfa0c86b05ab74a569081a5b99d32533ef
 DIST pulseaudio-0.9.22.tar.gz 2076785 RMD160 31199c497f7b1cce2285a6369d43fc1f66cd41a4 SHA1 f5fc14d7a62ae9f9ee9745026e3f13f4c130140a SHA256 c6019324395117a258c048a6db5e9734551cc2c61dc35b46403ff00d64be55f0
 EBUILD pulseaudio-0.9.21.1.ebuild 7240 RMD160 430702401e4177a58dbd7336e940d3c756270873 SHA1 80a2dcb509f28ea4bf2c066a05e0742b813c7e5f SHA256 d79966441bd715fe4a34d5d41ef2a1b7406cc87b9a726a65486c37beeaa9fc3a
-EBUILD pulseaudio-0.9.22.ebuild 6650 RMD160 17e36be6764176b3c9d5758bb68b44cba41c09a9 SHA1 9e934da0b1f333045a4ea2c06e1811b5ddfd9a54 SHA256 73af55c436436a5c68cb9d3671c63d8bfe707372a08884f6ad7c1a804a7f3b60
+EBUILD pulseaudio-0.9.22.ebuild 6653 RMD160 03255e5e6ee5444963a5874065234db396865061 SHA1 93905ca558cfe5d64caca896e7a9f27e65143516 SHA256 befbf537556827d67a041c853d0cf34100351d2510510f98aa6b986f4f6d0fa2
 EBUILD pulseaudio-9999.ebuild 6503 RMD160 56f8b4614247efe3144a3b13511b4a48c0d35b15 SHA1 0f38b40ca8564918fbf3a3f0a4f9bbb859889758 SHA256 e275753ac462f55c19bfa020056c2dc92ee7e78e8bdb3c9e438a18e0f621116f
-MISC ChangeLog 41687 RMD160 cc5f750e4f2f88730cd4fbe608dd886fcaae16fb SHA1 fa2643cacd372d73f791f79dd231c7f4af51c7e7 SHA256 d764063c854c5f75747a1ff5c2c8fca606aec91a0f60e937633b1c499f6f2981
+MISC ChangeLog 41925 RMD160 b415426fc87fc0c38122b6b1d191d4bf4e603ff7 SHA1 aab9d29f785e29ff83a9cff463e10658644f5fd8 SHA256 c9a375d64849856665c1fd87b393a12c5ee88ad9567d91ecdc02e81929767861
 MISC metadata.xml 2535 RMD160 9d35fbd1c4b3a7c13f594fb7fc058904b753be07 SHA1 aff148b238d2fe481c60a5d401f287c3e415fa88 SHA256 e83071b8e73fc3e79e45f0e265c16c96c607273d91f54a3bbf87e4b2c27bf1d5
diff --git a/media-sound/pulseaudio/files/pulseaudio.init.d-5 b/media-sound/pulseaudio/files/pulseaudio.init.d-5
new file mode 100644
index 000000000000..c573c030ed28
--- /dev/null
+++ b/media-sound/pulseaudio/files/pulseaudio.init.d-5
@@ -0,0 +1,81 @@
+#!/sbin/runscript
+# Copyright 1999-2011 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-5,v 1.1 2011/03/27 16:58:49 ssuominen 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 UDEV
+	if egrep -q '^[[:space:]]*load-module[[:space:]]+module-udev-detect' "$script"; then
+	    needs="${needs} udev"
+	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-(udev-)?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() {
+	if [ -z "${PULSEAUDIO_SHOULD_NOT_GO_SYSTEMWIDE}" ]; then
+		eerror "Please don't use system wide PulseAudio unless you read the"
+		eerror "documentation available at http://www.pulseaudio.org/wiki/WhatIsWrongWithSystemMode"
+		eerror ""
+		eerror "When you're done, please set the variable PULSEAUDIO_SHOULD_NOT_GO_SYSTEMWIDE in"
+		eerror "/etc/conf.d/pulseaudio . Please remember that upstream does not support this mode"
+		eerror "when used for standard desktop configurations."
+		return 1
+	fi
+	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.22.ebuild b/media-sound/pulseaudio/pulseaudio-0.9.22.ebuild
index 7b6f7b60b03c..aec737e951e2 100644
--- a/media-sound/pulseaudio/pulseaudio-0.9.22.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-0.9.22.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.11 2011/03/27 14:16:19 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.9.22.ebuild,v 1.12 2011/03/27 16:58:49 ssuominen Exp $
 
 EAPI=3
 
@@ -151,7 +151,7 @@ src_install() {
 			$(use_define alsa) \
 			$(use_define bluetooth) \
 			$(use_define udev) \
-			"${FILESDIR}/pulseaudio.init.d-4" \
+			"${FILESDIR}/pulseaudio.init.d-5" \
 			> "${T}/pulseaudio"
 
 		doinitd "${T}/pulseaudio"