Bump to the latest test version released by Lennart; this changes the meaning of the oss USE flag (and removes some hacks around).

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

5 files changed, 47 insertions, 41 deletions

diff --git a/media-sound/pulseaudio/ChangeLog b/media-sound/pulseaudio/ChangeLog
index 1171014bbae8..4c637516d034 100644
--- a/media-sound/pulseaudio/ChangeLog
+++ b/media-sound/pulseaudio/ChangeLog
@@ -1,6 +1,16 @@
 # 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.141 2009/08/07 23:41:49 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.142 2009/08/20 18:53:27 flameeyes Exp $
+
+*pulseaudio-0.9.16_rc5-r51 (20 Aug 2009)
+*pulseaudio-0.9.16_rc5 (20 Aug 2009)
+
+  20 Aug 2009; Diego E. Pettenò <flameeyes@gentoo.org>
+  -pulseaudio-0.9.16_rc4.ebuild, -pulseaudio-0.9.16_rc4-r51.ebuild,
+  +pulseaudio-0.9.16_rc5.ebuild, +pulseaudio-0.9.16_rc5-r51.ebuild,
+  metadata.xml:
+  Bump to the latest test version released by Lennart; this changes the
+  meaning of the oss USE flag (and removes some hacks around).
 
   07 Aug 2009; Diego E. Pettenò <flameeyes@gentoo.org>
   pulseaudio-0.9.15-r2.ebuild, pulseaudio-0.9.15-r51.ebuild,
diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest
index 9060d8d171eb..c5d2ca235a27 100644
--- a/media-sound/pulseaudio/Manifest
+++ b/media-sound/pulseaudio/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX pulseaudio-0.9.15-CVE-2009-1894.patch 1969 RMD160 69a11b7f132d24e7f99fec180ffed3caf806de77 SHA1 1b9106e52c063e83b8577434360edaf3be81351d SHA256 a14e01e386f60c083dda6049e951bcf17af693ac475afd1f455d71f400f2e526
 AUX pulseaudio-0.9.15-bsd.patch 549 RMD160 d44e309557353c115281e860bfa643b197d04921 SHA1 0cd07acc70c0e53984e7a639d9668b4817cb804c SHA256 d044e27ad71424b601f0de37e29321226579146203c6c557434d11e298798787
 AUX pulseaudio-0.9.16-CVE-2009-1894.patch 3269 RMD160 b900d2001a4dc611f78c704603f5994c0a9614da SHA1 9c6737a7ec293308699410ec41eeceae1a3643d2 SHA256 3be0eaa395606aaa832e6748a7c0d075ad4a2dd473dc302759510673189bfb48
@@ -11,12 +14,19 @@ AUX pulseaudio.conf.d 275 RMD160 6317cb5be41a768428056c0057d8f5b1f189e804 SHA1 2
 AUX pulseaudio.init.d-2 632 RMD160 5baf66e3f64e406b7e23ffbe13774e32595cff19 SHA1 e0a46567d43f7e3620c8da90654a0f16235a36fa SHA256 24c7f5319161105e46382c7c1340ae634d54cfbe32cdf70c86d6fd6c40782ee0
 AUX pulseaudio.init.d-4 2481 RMD160 36c8bff725d43e33b32a484957e944534fc92e19 SHA1 abe5a741d4be11d39926bf1c18ff9a9817519189 SHA256 5572daf0092b34c3a0a3dc87964ef518465bc287a7bacf6f39fdfd7c51b7a6d7
 DIST pulseaudio-0.9.15.tar.gz 1704374 RMD160 7cab0d9ab44180b6440ae7f151a6cbb91928b321 SHA1 56fb71e4e88c901d9941d85bfe142612c30e5c8e SHA256 1e8ad5b7c5cf3485bd0738c296274ff2c99d26d12a25a225dc250eddea25b9f1
-DIST pulseaudio-0.9.16-test4.tar.gz 1922200 RMD160 b3e6afea1002d8436f7e151cd2336c7755b9d841 SHA1 1744c2ce98b53d83fabac860a837c168d497c536 SHA256 b9acfd6be4ed065479756c62ff4de71033655805312abc3057ab12979a48d253
+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_rc4-r51.ebuild 6995 RMD160 1420f951b6ccea5c543fbe7de949d72f29d857ad SHA1 8d2a92774bbef0d4b918465851e7e988969f1a1d SHA256 64c51d47089290a0b2ae06e2f4113a9a59891485c0635fe22f5197a03e1e8cc1
-EBUILD pulseaudio-0.9.16_rc4.ebuild 5652 RMD160 3f203352d260757caadc378740967fcf54e0d79c SHA1 00fa45d2d3993eca4c3e875eff2a748ffb93fcb6 SHA256 130c5b97fc637f7612012b892366354d5da62132f09c0da787a89dd1dba22545
+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 28193 RMD160 2e78858c89fce89d2c912d6c5f26ac03811d5fa5 SHA1 c5112a88fdf7b4a9064e0a77f6c1ad04b778e170 SHA256 496322578ecef1b826cca23afad75df0425bec182d197ba3fbbdcb99c4ecc918
-MISC metadata.xml 1638 RMD160 c299bb4d4e2eda208ba464c6f0e368208d508967 SHA1 0cfbf109c613fb55f9059a503b1cce3d4f2a6e48 SHA256 05abc2a6ebe6fc27465fca8df605d24bd042db307ffbf5b0f8148090fd17bb13
+MISC ChangeLog 28616 RMD160 10eb1e55fc2608103f101ec8438cf1f7b909f244 SHA1 a501e4610be0611eeb6b93773c042e6d41221895 SHA256 948d54a45b4acc21bd248b8051b43f32747565b98fca558ca3d43a66a53720ba
+MISC metadata.xml 2026 RMD160 c9ab8b941696d7bbc414a0ec1f1aacb7ea2cf560 SHA1 77a7b37f63602e282fb47f5b9a4d130449c9c0ee SHA256 8146dd9e728580c17ff5eb800577773e7a261dbbd32bdcecd7a375f4ea955160
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkqNm6oACgkQAiZjviIA2XgmoACgsbDTHNM5qFMOCxfhxyerfEGQ
+w2sAoNxHoQMMc6mKCmkd7s4ytV1/vnPc
+=qbfX
+-----END PGP SIGNATURE-----
diff --git a/media-sound/pulseaudio/metadata.xml b/media-sound/pulseaudio/metadata.xml
index d5335ad57db4..544d644b1e49 100644
--- a/media-sound/pulseaudio/metadata.xml
+++ b/media-sound/pulseaudio/metadata.xml
@@ -14,10 +14,16 @@
       enable this flag if you want to use a system wide instance. If
       unsure, enable this flag.
     </flag>
-    <flag name="oss">
+    <flag name="oss" restrict="&lt;media-sound/pulseaudio-0.9.16-test5">
       Enable OSS sink/source (output/input). Also build the padsp
       script to make OSS software use PulseAudio.
     </flag>
+    <flag name="oss" restrict="&gt;=media-sound/pulseaudio-0.9.16-test5">
+      Enable OSS sink/source (output/input). Deprecated, upstream does
+      not support this on systems where other sink/source systems are
+      available (i.e.: Linux). The padsp wrapper is now always build
+      if the system supports OSS at all.
+    </flag>
     <flag name="policykit">
       Use the PolicyKit framework (<pkg>sys-auth/policykit</pkg>) to
       acquire high-priority and real-time scheduling for the daemon.
diff --git a/media-sound/pulseaudio/pulseaudio-0.9.16_rc4-r51.ebuild b/media-sound/pulseaudio/pulseaudio-0.9.16_rc5-r51.ebuild
index 9f5ab7ce82e6..d1200018ea84 100644
--- a/media-sound/pulseaudio/pulseaudio-0.9.16_rc4-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_rc4-r51.ebuild,v 1.2 2009/08/07 23:41:49 flameeyes Exp $
+# $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 $
 
 EAPI=2
 
@@ -88,20 +88,10 @@ pkg_setup() {
 }
 
 src_prepare() {
-	# Not extremely nice but allows to avoid a bit of work in the case
-	# users don't request tests.
-	if use test; then
-		sed -i -e 's:\<mix-test::' src/Makefile.am || die
-
-		eautomake
-	fi
 	elibtoolize
 }
 
 src_configure() {
-	# To properly fix CVE-2008-0008
-	append-flags -UNDEBUG
-
 	# It's a binutils bug, once I can find time to fix that I'll add a
 	# proper dependency and fix this up. — flameeyes
 	append-ldflags -Wl,--no-as-needed
@@ -111,7 +101,7 @@ src_configure() {
 		$(use_enable glib glib2) \
 		--disable-solaris \
 		$(use_enable asyncns) \
-		$(use_enable oss) \
+		$(use_enable oss oss-output) \
 		$(use_enable alsa) \
 		$(use_enable lirc) \
 		$(use_enable tcpd tcpwrap) \
@@ -142,7 +132,7 @@ src_configure() {
 src_test() {
 	# We avoid running the toplevel check target because that will run
 	# po/'s tests too, and they are broken. Officially, it should work
-	# with intltool 0.40.6, but that doesn't seem to be the case.
+	# with intltool 0.41, but that doesn't look like a stable release.
 	emake -C src check || die
 }
 
diff --git a/media-sound/pulseaudio/pulseaudio-0.9.16_rc4.ebuild b/media-sound/pulseaudio/pulseaudio-0.9.16_rc5.ebuild
index 1a96c81d03ca..51ec52a21dde 100644
--- a/media-sound/pulseaudio/pulseaudio-0.9.16_rc4.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_rc4.ebuild,v 1.2 2009/08/07 23:41:49 flameeyes Exp $
+# $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 $
 
 EAPI=2
 
@@ -81,20 +81,10 @@ pkg_setup() {
 }
 
 src_prepare() {
-	# Not extremely nice but allows to avoid a bit of work in the case
-	# users don't request tests.
-	if use test; then
-		sed -i -e 's:\<mix-test::' src/Makefile.am || die
-
-		eautomake
-	fi
 	elibtoolize
 }
 
 src_configure() {
-	# To properly fix CVE-2008-0008
-	append-flags -UNDEBUG
-
 	# It's a binutils bug, once I can find time to fix that I'll add a
 	# proper dependency and fix this up. — flameeyes
 	append-ldflags -Wl,--no-as-needed
@@ -104,7 +94,7 @@ src_configure() {
 		$(use_enable glib glib2) \
 		--disable-solaris \
 		$(use_enable asyncns) \
-		$(use_enable oss) \
+		$(use_enable oss oss-output) \
 		$(use_enable alsa) \
 		$(use_enable lirc) \
 		$(use_enable tcpd tcpwrap) \
@@ -136,7 +126,7 @@ src_configure() {
 src_test() {
 	# We avoid running the toplevel check target because that will run
 	# po/'s tests too, and they are broken. Officially, it should work
-	# with intltool 0.40.6, but that doesn't seem to be the case.
+	# with intltool 0.41, but that doesn't look like a stable release.
 	emake -C src check || die
 }
 
@@ -181,14 +171,14 @@ pkg_postinst() {
 		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
+	if use alsa &&
+		has_version media-plugins/alsa-plugins &&
+		!built_with_use --missing false media-plugins/alsa-plugins 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
 
 	eselect esd update --if-unset