5 files changed, 20 insertions, 13 deletions
diff --git a/media-sound/pulseaudio/ChangeLog b/media-sound/pulseaudio/ChangeLog
index 4c637516d034..8b7f3e05ad9c 100644
--- a/media-sound/pulseaudio/ChangeLog
+++ b/media-sound/pulseaudio/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/pulseaudio
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.142 2009/08/20 18:53:27 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.143 2009/08/21 23:16:13 flameeyes Exp $
+
+  21 Aug 2009; Diego E. Pettenò <flameeyes@gentoo.org>
+  pulseaudio-0.9.9-r54.ebuild, pulseaudio-0.9.16_rc5.ebuild,
+  pulseaudio-0.9.16_rc5-r51.ebuild, files/pulseaudio.init.d-4:
+  Depend on libtool 1.5 for 0.9.9 (bug #281342), fix dependency on udev for
+  0.9.16 to require extras (bug #281951), fix init scripts to ignore
+  comments (bug #263350) and also consider udev detect in ALSA's case.
 
 *pulseaudio-0.9.16_rc5-r51 (20 Aug 2009)
 *pulseaudio-0.9.16_rc5 (20 Aug 2009)
diff --git a/media-sound/pulseaudio/files/pulseaudio.init.d-4 b/media-sound/pulseaudio/files/pulseaudio.init.d-4
index 01b241ad6439..98fce63a5d04 100644
--- a/media-sound/pulseaudio/files/pulseaudio.init.d-4
+++ b/media-sound/pulseaudio/files/pulseaudio.init.d-4
@@ -1,7 +1,7 @@
 #!/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.4 2009/07/30 13:27:26 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/files/pulseaudio.init.d-4,v 1.5 2009/08/21 23:16:13 flameeyes Exp $
 
 depend() {
 	need localmount
@@ -41,21 +41,21 @@ depend() {
 #endif
 
 #ifdef AVAHI
-	if egrep -q '[[:space:]]*load-module[[:space:]]+module-zeroconf-publish' "$script"; then
+	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
+	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
+	if egrep -q '^[[:space:]]*load-module[[:space:]]+module-alsa-(sink|source)' "$script" || 
+	    egrep -q '^[[:space:]]*load-module[[:space:]]+module-((hal|udev)-)?detect' "$script" ||
+	    egrep -q '^[[:space:]]*add-autoload-source[[:space:]]+(input|output)[[:space:]]+module-alsa-(sink|source)' "$script"; then
 	    needs="${needs} alsasound"
 	fi
 #endif
diff --git a/media-sound/pulseaudio/pulseaudio-0.9.16_rc5-r51.ebuild b/media-sound/pulseaudio/pulseaudio-0.9.16_rc5-r51.ebuild
index d1200018ea84..9cfcd27814e8 100644
--- a/media-sound/pulseaudio/pulseaudio-0.9.16_rc5-r51.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-0.9.16_rc5-r51.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.9.16_rc5-r51.ebuild,v 1.1 2009/08/20 18:53:27 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.9.16_rc5-r51.ebuild,v 1.2 2009/08/21 23:16:13 flameeyes Exp $
 
 EAPI=2
 
@@ -47,7 +47,7 @@ RDEPEND="X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE x11-libs/libXtst )
 	)
 	policykit? ( sys-auth/policykit )
 	asyncns? ( net-libs/libasyncns )
-	udev? ( >=sys-fs/udev-143 )
+	udev? ( >=sys-fs/udev-143[extras] )
 	>=media-libs/audiofile-0.2.6-r1
 	>=media-libs/speex-1.2_beta
 	>=media-libs/libsndfile-1.0.10
diff --git a/media-sound/pulseaudio/pulseaudio-0.9.16_rc5.ebuild b/media-sound/pulseaudio/pulseaudio-0.9.16_rc5.ebuild
index 51ec52a21dde..3a1228450b30 100644
--- a/media-sound/pulseaudio/pulseaudio-0.9.16_rc5.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-0.9.16_rc5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.9.16_rc5.ebuild,v 1.1 2009/08/20 18:53:27 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.9.16_rc5.ebuild,v 1.2 2009/08/21 23:16:13 flameeyes Exp $
 
 EAPI=2
 
@@ -47,7 +47,7 @@ RDEPEND="X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE x11-libs/libXtst )
 	)
 	policykit? ( sys-auth/policykit )
 	asyncns? ( net-libs/libasyncns )
-	udev? ( >=sys-fs/udev-143 )
+	udev? ( >=sys-fs/udev-143[extras] )
 	>=media-libs/audiofile-0.2.6-r1
 	>=media-libs/speex-1.2_beta
 	>=media-libs/libsndfile-1.0.10
diff --git a/media-sound/pulseaudio/pulseaudio-0.9.9-r54.ebuild b/media-sound/pulseaudio/pulseaudio-0.9.9-r54.ebuild
index 2ec15275d831..9c9e5ec1698d 100644
--- a/media-sound/pulseaudio/pulseaudio-0.9.9-r54.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-0.9.9-r54.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.9.9-r54.ebuild,v 1.1 2009/07/16 14:01:21 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.9.9-r54.ebuild,v 1.2 2009/08/21 23:16:13 flameeyes Exp $
 
 inherit eutils libtool autotools flag-o-matic
 
@@ -39,7 +39,7 @@ RDEPEND="X? ( x11-libs/libX11 )
 	)
 	policykit? ( sys-auth/policykit )
 	asyncns? ( net-libs/libasyncns )
-	>=sys-devel/libtool-1.5.24" # it's a valid RDEPEND, libltdl.so is used
+	=sys-devel/libtool-1.5*" # it's a valid RDEPEND, libltdl.so is used
 DEPEND="${RDEPEND}
 	dev-libs/libatomic_ops
 	dev-util/pkgconfig"