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.

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

6 files changed, 28 insertions, 21 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/Manifest b/media-sound/pulseaudio/Manifest
index c5d2ca235a27..793526e28110 100644
--- a/media-sound/pulseaudio/Manifest
+++ b/media-sound/pulseaudio/Manifest
@@ -12,21 +12,21 @@ AUX pulseaudio-0.9.8-svn2074.patch 412 RMD160 49e416e5e9747cd7c2065b98220e999103
 AUX pulseaudio-0.9.9-CVE-2009-1894.patch 2274 RMD160 727d4e4e355612f105d5c8bbe66e898d5ceee1f6 SHA1 679aace5e7647d636cf3f186993fa0d7a7cc8855 SHA256 e4981106768e4a60ca7384200668a5071cbe934afecad850e58b626a7414cc43
 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-4 2481 RMD160 36c8bff725d43e33b32a484957e944534fc92e19 SHA1 abe5a741d4be11d39926bf1c18ff9a9817519189 SHA256 5572daf0092b34c3a0a3dc87964ef518465bc287a7bacf6f39fdfd7c51b7a6d7
+AUX pulseaudio.init.d-4 2493 RMD160 89942dc8e46ceb3c73083a0078a12bd9f7e60fc3 SHA1 26c25bb372d7c581d60efa42eb9aafbacec6ab57 SHA256 d35657b0a3361332c294269b33796a48b7e4743a8eb763c3ff6e812b21914a8d
 DIST pulseaudio-0.9.15.tar.gz 1704374 RMD160 7cab0d9ab44180b6440ae7f151a6cbb91928b321 SHA1 56fb71e4e88c901d9941d85bfe142612c30e5c8e SHA256 1e8ad5b7c5cf3485bd0738c296274ff2c99d26d12a25a225dc250eddea25b9f1
 DIST pulseaudio-0.9.16-test5.tar.gz 1946672 RMD160 08f8409aae76d33b5d686d107be054f3bae6cfc1 SHA1 e791487f0386382e22789233fef7f8eb2d45ece5 SHA256 5d75eb34cb99c9b41498d1b135748a07e949424cc24aac62b82ea12e4cb691b5
 DIST pulseaudio-0.9.9.tar.gz 1063448 RMD160 beb9cb645ce69978ba095e73376ae8ae4b92daf9 SHA1 de8896cf3c6e26e77e4ae19ba300c409b6de8455 SHA256 9caab8f9be8a371aea7cd0241aab7ffd4b1043fbc4a8f62736faea4229f11f7d
 EBUILD pulseaudio-0.9.15-r2.ebuild 4542 RMD160 e2107897551c294c2639304ccd04a2d7f255fd5c SHA1 073b86dc52fffc71b5b9b0c9a4e1b873adcdb222 SHA256 399edbfe69d7a3aa097c6c2a0eed778951c269da1e083b1154e5c11cbf2a55ec
 EBUILD pulseaudio-0.9.15-r51.ebuild 6279 RMD160 a7745c4100e3ee600dfbb6e9ae97a4603b9b6938 SHA1 9412326c78494778beca23eb184a435bfbd2938a SHA256 226712aef93fad884f20c6432dea5831c033aa794a24d08f0b2b1df0278956bd
-EBUILD pulseaudio-0.9.16_rc5-r51.ebuild 6768 RMD160 a11dd6954cd60f4db1eba44a3dbdc89aac2fb85f SHA1 78881af2d04cd2887be1c3cfae1002192461787e SHA256 142ea389625e6e9be27d0868e7bf0e7834c7af07b827b9d8fc231e1cd094723d
-EBUILD pulseaudio-0.9.16_rc5.ebuild 5411 RMD160 21f82b81c66e8be922941ffd5e4f105e5e4354f2 SHA1 24d68240dd7550333957a9b21c92e6324d91a086 SHA256 4005873cb441d75c5c6f9bbe4008b31f5ef6ca93eee16900dd3e73c7f149b635
-EBUILD pulseaudio-0.9.9-r54.ebuild 5849 RMD160 6669aa0cafd94237b05109c553224cd661028524 SHA1 a524d830594e7a976c5af43f55e62c446d2714c2 SHA256 aea418fcbbd74971169adf09d3ab60cac0039058c022d47963cfc0ef0da4922c
-MISC ChangeLog 28616 RMD160 10eb1e55fc2608103f101ec8438cf1f7b909f244 SHA1 a501e4610be0611eeb6b93773c042e6d41221895 SHA256 948d54a45b4acc21bd248b8051b43f32747565b98fca558ca3d43a66a53720ba
+EBUILD pulseaudio-0.9.16_rc5-r51.ebuild 6776 RMD160 3394becab255ec1175f9cb38cd766c28594af58d SHA1 7c27d9a52622ba3ca90144285fdeac98ff6dc6f9 SHA256 2cd7c729dd0775eaf76c0e94e8f3aa80f02ed813b162a472abd56a17f2ac24d8
+EBUILD pulseaudio-0.9.16_rc5.ebuild 5419 RMD160 ff296d5f04c0b5e8b697cf82e1efad25c7d7d55e SHA1 f4a491e2be573e523041021d382455d113d722a4 SHA256 acee9bf4823ad8f793d750ef2f9e1ab8dfaaf4369c05ca8cd6b55a8067b8735d
+EBUILD pulseaudio-0.9.9-r54.ebuild 5846 RMD160 2932b2d2ac43f65b1640160aa4190e084939cda9 SHA1 a20c513c59d0a14b6423ed31d2d10110e12b0ccb SHA256 f6b390db812fd1271e705f0d1a80ab5c9c6f7c37bd3b5743c648100d0929e60f
+MISC ChangeLog 29013 RMD160 026ef88f1ff38eefe69e4684fe597e98e998180a SHA1 b7aec99d883b3c22d2bcffea8cdeb8c9e77de81a SHA256 dcd2cc42c48569932e2c738774df8bb317a45eaf21acc898f3c415c600ab69fc
 MISC metadata.xml 2026 RMD160 c9ab8b941696d7bbc414a0ec1f1aacb7ea2cf560 SHA1 77a7b37f63602e282fb47f5b9a4d130449c9c0ee SHA256 8146dd9e728580c17ff5eb800577773e7a261dbbd32bdcecd7a375f4ea955160
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkqNm6oACgkQAiZjviIA2XgmoACgsbDTHNM5qFMOCxfhxyerfEGQ
-w2sAoNxHoQMMc6mKCmkd7s4ytV1/vnPc
-=qbfX
+iEYEARECAAYFAkqPKsMACgkQAiZjviIA2XiuDQCbB4Mr21zZ3clFiyL0E20Ay5MB
+8mQAoO6SzqdaQ/qwaVXVV1NNWweyZUmB
+=rEvD
 -----END PGP SIGNATURE-----
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"