Fix building with libtool 2.2 (bug #215843) and with caps (bug #215656).

Package-Manager: portage-2.1.4.4

5 files changed, 36 insertions, 11 deletions

diff --git a/media-sound/pulseaudio/ChangeLog b/media-sound/pulseaudio/ChangeLog
index 9551b2fc9068..5294a32cd6b3 100644
--- a/media-sound/pulseaudio/ChangeLog
+++ b/media-sound/pulseaudio/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/pulseaudio
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.103 2008/03/31 14:53:59 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.104 2008/04/03 19:52:34 flameeyes Exp $
+
+  03 Apr 2008; Diego Pettenò <flameeyes@gentoo.org>
+  +files/pulseaudio-0.9.10-caps.patch, pulseaudio-0.9.10.ebuild,
+  pulseaudio-0.9.10-r50.ebuild:
+  Fix building with libtool 2.2 (bug #215843) and with caps (bug #215656).
 
 *pulseaudio-0.9.10-r50 (31 Mar 2008)
 *pulseaudio-0.9.10 (31 Mar 2008)
diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest
index b051bf19eef3..fc140042e685 100644
--- a/media-sound/pulseaudio/Manifest
+++ b/media-sound/pulseaudio/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX pulseaudio-0.9.10-caps.patch 364 RMD160 66c588518c2cf9a307cead7e10b5ef713b2bfe0f SHA1 717fc1d95445a3b816b8a10154561d27e28ebee3 SHA256 d4452a9d4c284ceda27199e26772075280efd5f8d546949eac93c1efeaf7f19b
 AUX pulseaudio-0.9.7-module-loading.patch 947 RMD160 725f13d72da5ee72e61cc8d558ca352bb3a5d001 SHA1 236819d1fe76ccb22580f07e2c3a24f95d010011 SHA256 0ecc719e38bbf423d46120ce991bcc807c431e36a68cb97471235aa8e8316075
 AUX pulseaudio-0.9.8-bt-nohal.patch 1153 RMD160 5ad7a7173795c022fca73ccf694207e18d6925a7 SHA1 9f50549357b5fa498e0b7f67258de431e90f89e2 SHA256 1bdc458d55529777a3a760205a09d0381433402a3002518ba5a700b3518c727d
 AUX pulseaudio-0.9.8-create-directory.patch 685 RMD160 87c287d3ff6047c9bee892271ea3b3ac6d06fa1a SHA1 2083a575f6272135909efce292d43a2f947f285f SHA256 5fd77f5d0a897d3f70cb3e20e24b97e7f0f46d9266b8758c56a7cb84f763e571
@@ -13,16 +14,16 @@ AUX pulseaudio.init.d-3 1727 RMD160 ffe93d7c5300ae7974e9b5c02987a23422940d35 SHA
 DIST pulseaudio-0.9.10.tar.gz 1081546 RMD160 efe78b85360d0342bc839b870ad424cff0171e80 SHA1 90139debe73b6d26bc0240af3587fdb7fe4c2750 SHA256 1ae8b587759b33ad954e717728fab6df58bd28088d0ac8faf22e90253b774975
 DIST pulseaudio-0.9.7.tar.gz 1013981 RMD160 49d0d875d6929527fe97124431462e63adf52873 SHA1 c6c36f2ddb51685971abf8b47ed325a8f06759c5 SHA256 b5f3fe8fc8be435e5d1b2183894fb545220a50b5b4850bb71af6b5e14f8f6ee0
 DIST pulseaudio-0.9.9.tar.gz 1063448 RMD160 beb9cb645ce69978ba095e73376ae8ae4b92daf9 SHA1 de8896cf3c6e26e77e4ae19ba300c409b6de8455 SHA256 9caab8f9be8a371aea7cd0241aab7ffd4b1043fbc4a8f62736faea4229f11f7d
-EBUILD pulseaudio-0.9.10-r50.ebuild 5597 RMD160 49a0a74daead625996ca3b7a8f54b1cede211054 SHA1 d18420e93f077f6b64f3979efdea511a01c67564 SHA256 380fd83a0bc52f1e4a8f2fb58f6eb2cb35144789a5456fdc088c0a84a869a3c6
-EBUILD pulseaudio-0.9.10.ebuild 5631 RMD160 6308b8c901509064bcb603810bea281708391922 SHA1 caac36977ead2a71697b3f9768491acbe482bf2a SHA256 3f379a97385607f86f84771d17ba87d5ff486fb76975ec5454d7aac884964b22
+EBUILD pulseaudio-0.9.10-r50.ebuild 5634 RMD160 6516c8f5e343eca6424cf6888aa3d3ec1f8141a8 SHA1 6cd59e0c6f552e2d68872380324ee98837744081 SHA256 981574148dc3e7c76140161211d3fd55bb9f3d5788fa7bfb2dcae79bbf943528
+EBUILD pulseaudio-0.9.10.ebuild 5668 RMD160 bbda20bb4340ef60044c9d376c70ff9dc49df6bc SHA1 cba18c72faf7b5c5fd2b9ba7ac9cdef2a5da8387 SHA256 ce1b37a01d4541b40ac0d178ddb91e756a7324ce5dbd433c7e7dbc45adfbd95c
 EBUILD pulseaudio-0.9.7.ebuild 4752 RMD160 0217d3ccee281219df3a6817935f762b9a03f286 SHA1 2fca6bbfd4b2c209ca59e5313a1b45cec19c5fb2 SHA256 65803bb77985bc3bb82e0e0d01e82a7293fc61ad951a35a1672e25941725437c
 EBUILD pulseaudio-0.9.9.ebuild 5810 RMD160 db6a3d4da34ea78d6cf5901c57bc74b48082fd66 SHA1 7a659611de1b5ad7acb8e4e5ebac8ac6ec2c06f7 SHA256 90128fff4ccca7e019cd772e0faab2dc68ec8c2149aa476ddc77e1b63201279b
-MISC ChangeLog 18879 RMD160 29892e3bec12f0da0681797026a213ab1f8e40e5 SHA1 59f5367e6584602f62c72c3824886e83ed37f412 SHA256 1daf66913712b1c1cb9606e9a0e0399a0b8222de703b8af99d89dcc3348fdb61
+MISC ChangeLog 19105 RMD160 fdae85d753f6f25a6b03619d78c71720217ca63b SHA1 142699a70b15ac743f09896da47431ba89ad17ff SHA256 705d61ddeb6a337760faf2bbb1bdb2ba6eaa5f1f85c0816c11ba275fdae5970c
 MISC metadata.xml 1106 RMD160 451b24728e90377bc829a999a76fca5b4bc91078 SHA1 6b242be79913c9ffa2aafdd95149a7fa93b3c764 SHA256 995d3c7013901cd84098a1b40975c54863751e8668874f763ec70b81e23e9a9f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkfw+yYACgkQAiZjviIA2Xhu4ACcDlE0Rx66auS4X4A9HeXrECb4
-XEAAn24xQhkgff6J4hT+mqB4XtLzzU7e
-=7UUr
+iEYEARECAAYFAkf1NagACgkQAiZjviIA2XgkxACeNLyjaeTdThxE4OUt2MWotW+E
+FVIAoLjJcp/SvrPvpAjf9Anh8eFr0uKb
+=lfKD
 -----END PGP SIGNATURE-----
diff --git a/media-sound/pulseaudio/files/pulseaudio-0.9.10-caps.patch b/media-sound/pulseaudio/files/pulseaudio-0.9.10-caps.patch
new file mode 100644
index 000000000000..7502ad257576
--- /dev/null
+++ b/media-sound/pulseaudio/files/pulseaudio-0.9.10-caps.patch
@@ -0,0 +1,15 @@
+Index: pulseaudio-0.9.10/src/daemon/caps.c
+===================================================================
+--- pulseaudio-0.9.10.orig/src/daemon/caps.c
++++ pulseaudio-0.9.10/src/daemon/caps.c
+@@ -131,9 +131,8 @@ int pa_limit_caps(void) {
+     return 0;
+ }
+ 
+-int pa_drop_caps(void) {
++void pa_drop_caps(void) {
+     pa_drop_root();
+-    return 0;
+ }
+ 
+ #endif
diff --git a/media-sound/pulseaudio/pulseaudio-0.9.10-r50.ebuild b/media-sound/pulseaudio/pulseaudio-0.9.10-r50.ebuild
index d0a9c1eced57..d6ac9dfbfbf0 100644
--- a/media-sound/pulseaudio/pulseaudio-0.9.10-r50.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-0.9.10-r50.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.9.10-r50.ebuild,v 1.1 2008/03/31 14:53:59 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.9.10-r50.ebuild,v 1.2 2008/04/03 19:52:34 flameeyes Exp $
 
 EAPI=1
 
@@ -75,7 +75,9 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	# eautoreconf
+	epatch "${FILESDIR}/${P}-caps.patch"
+
+	eautoreconf
 	elibtoolize
 }
 
diff --git a/media-sound/pulseaudio/pulseaudio-0.9.10.ebuild b/media-sound/pulseaudio/pulseaudio-0.9.10.ebuild
index 5ca739bab54b..7943e3df078a 100644
--- a/media-sound/pulseaudio/pulseaudio-0.9.10.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-0.9.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.9.10.ebuild,v 1.1 2008/03/31 14:53:59 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.9.10.ebuild,v 1.2 2008/04/03 19:52:34 flameeyes Exp $
 
 EAPI=1
 
@@ -73,7 +73,9 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	# eautoreconf
+	epatch "${FILESDIR}/${P}-caps.patch"
+
+	eautoreconf
 	elibtoolize
 }