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

(Portage version: 2.1.4.4)

4 files changed, 29 insertions, 5 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/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
 }