synced media-sound/pulseaudio with main tree

2 files changed, 24 insertions, 25 deletions

diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest
index 8f98229b0..37b0abd08 100644
--- a/media-sound/pulseaudio/Manifest
+++ b/media-sound/pulseaudio/Manifest
@@ -11,7 +11,7 @@ AUX pulseaudio.init.d-3 1727 RMD160 ffe93d7c5300ae7974e9b5c02987a23422940d35 SHA
 AUX pulseaudio.init.d-4 1849 RMD160 e91b9cc6da3b89827ad2c7dbe6b040669e94e7bd SHA1 e35530e8bf70339945eb7ebdfbe1cefcee4c62de SHA256 fd20883258e97d70fe957b01e70a9f73c58e843595dc3e53bffa658652659f99
 DIST pulseaudio-0.9.15.tar.gz 1704374 RMD160 7cab0d9ab44180b6440ae7f151a6cbb91928b321 SHA1 56fb71e4e88c901d9941d85bfe142612c30e5c8e SHA256 1e8ad5b7c5cf3485bd0738c296274ff2c99d26d12a25a225dc250eddea25b9f1
 DIST pulseaudio-0.9.9.tar.gz 1063448 RMD160 beb9cb645ce69978ba095e73376ae8ae4b92daf9 SHA1 de8896cf3c6e26e77e4ae19ba300c409b6de8455 SHA256 9caab8f9be8a371aea7cd0241aab7ffd4b1043fbc4a8f62736faea4229f11f7d
-EBUILD pulseaudio-0.9.15.ebuild 6395 RMD160 06162787b817b3ab4ea98f1585b9fae72ebf467d SHA1 c06785983f492e74a34bc3052ed6b0806daca7e8 SHA256 79cedafb1bbf81c38df6855aa4913fa730a042482d2412c07d35001836c62f52
+EBUILD pulseaudio-0.9.15.ebuild 6173 RMD160 e1fb19252d83b44285c51f75aa400c3635f24cea SHA1 73aa8bcd161654affb9db002874901be7778ab4d SHA256 c85867197a061616cbd66db3ed04a3336911de15306d597e1f05df6575f36f8e
 EBUILD pulseaudio-0.9.9.ebuild 6017 RMD160 d4c10958ea009e19a4d2ac93389ae8cdfe5de507 SHA1 47f2000d9847d4e25d3e5fb4b0856c2de2a5264d SHA256 d8aaa9004d3e96d3ee95ccc656cb18e3edcb8c259f6e06e791b25f6af09a5995
 MISC ChangeLog 22760 RMD160 934b5a53b69d8925ce9f06b96fbe2951efaea4ef SHA1 465a733137c5f4bb03105e032c884d6589dc91a9 SHA256 73848795b7a39432fa90bdd316609cd8c7ba03cff21e1a8a454870fca04382c8
 MISC metadata.xml 1336 RMD160 fff3b1ef9cc533d3e40816de7b39cc7789d6056e SHA1 3a8b478a30b18c7b0311eb78ca6e60ec3cd12d2c SHA256 1ca2733f429248a115989cdd9a9530af57b5021cc1ecfdbbb8ed23c6414894ff
diff --git a/media-sound/pulseaudio/pulseaudio-0.9.15.ebuild b/media-sound/pulseaudio/pulseaudio-0.9.15.ebuild
index d5983e6ec..ed9d15221 100644
--- a/media-sound/pulseaudio/pulseaudio-0.9.15.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-0.9.15.ebuild
@@ -1,24 +1,30 @@
 # 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.14.ebuild,v 1.5 2009/02/24 11:16:21 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.9.15.ebuild,v 1.2 2009/04/17 11:49:44 flameeyes Exp $
 
 EAPI=2
 
-inherit eutils libtool autotools flag-o-matic multilib-native
+inherit eutils libtool flag-o-matic multilib-native
 
 DESCRIPTION="A networked sound server with an advanced plugin system"
 HOMEPAGE="http://www.pulseaudio.org/"
-SRC_URI="http://0pointer.de/lennart/projects/${PN}/${P}.tar.gz"
+if [[ ${PV/_rc/} == ${PV} ]]; then
+	SRC_URI="http://0pointer.de/lennart/projects/${PN}/${P}.tar.gz"
+else
+	SRC_URI="http://0pointer.de/public/${P/_rc/-test}.tar.gz"
+fi
+
+S="${WORKDIR}/${P/_rc/-test}"
 
 LICENSE="LGPL-2 GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE="alsa avahi caps jack lirc oss tcpd X hal dbus libsamplerate gnome bluetooth policykit asyncns +glib"
+IUSE="alsa avahi caps jack lirc oss tcpd X hal dbus libsamplerate gnome bluetooth policykit asyncns +glib test"
 
-RDEPEND="X? ( x11-libs/libX11[lib32?] x11-libs/libSM[lib32?] x11-libs/libXau[lib32?] x11-libs/libXdmcp[lib32?] )
+RDEPEND="X? ( x11-libs/libX11[lib32?] x11-libs/libSM[lib32?] x11-libs/libICE[lib32?] )
 	caps? ( sys-libs/libcap[lib32?] )
 	libsamplerate? ( >=media-libs/libsamplerate-0.1.1-r1[lib32?] )
-	alsa? ( >=media-libs/alsa-lib-1.0.17-r1[lib32?] )
+	alsa? ( >=media-libs/alsa-lib-1.0.19[lib32?] )
 	glib? ( >=dev-libs/glib-2.4.0[lib32?] )
 	avahi? ( >=net-dns/avahi-0.6.12[dbus,lib32?] )
 	>=dev-libs/liboil-0.3.0[lib32?]
@@ -32,9 +38,9 @@ RDEPEND="X? ( x11-libs/libX11[lib32?] x11-libs/libSM[lib32?] x11-libs/libXau[lib
 		>=sys-apps/dbus-1.0.0[lib32?]
 	)
 	app-admin/eselect-esd
-	bluetooth? ( || ( >=net-wireless/bluez-4[lib32?] 
-			>=net-wireless/bluez-libs-3[lib32?] )
-			>=sys-apps/dbus-1.0.0[lib32?]
+	bluetooth? (
+		>=net-wireless/bluez-libs-3[lib32?]
+		>=sys-apps/dbus-1.0.0[lib32?]
 	)
 	policykit? ( sys-auth/policykit )
 	asyncns? ( net-libs/libasyncns[lib32?] )
@@ -43,12 +49,9 @@ RDEPEND="X? ( x11-libs/libX11[lib32?] x11-libs/libSM[lib32?] x11-libs/libXau[lib
 	>=media-libs/libsndfile-1.0.10[lib32?]
 	>=dev-libs/liboil-0.3.6[lib32?]
 	sys-libs/gdbm[lib32?]
-	|| ( sys-apps/openrc >=sys-apps/baselayout-2.0_rc5 )
-	>=sys-devel/libtool-1.5.24" # it's a valid RDEPEND, libltdl.so is used
+	>=sys-devel/libtool-2.2.4" # it's a valid RDEPEND, libltdl.so is used
 
-# Remove autoconf when >=2.62 stable and pulled in by autotools.eclass
 DEPEND="${RDEPEND}
-	>=sys-devel/autoconf-2.62
 	X? ( x11-proto/xproto )
 	dev-libs/libatomic_ops
 	dev-util/pkgconfig
@@ -58,10 +61,10 @@ DEPEND="${RDEPEND}
 # alsa-utils dep is for the alsasound init.d script (see bug #155707)
 # bluez-utils dep is for the bluetooth init.d script
 RDEPEND="${RDEPEND}
+	sys-apps/openrc
 	gnome-extra/gnome-audio
 	alsa? ( media-sound/alsa-utils )
-	bluetooth? ( || ( >=net-wireless/bluez-utils-3
-			  >=net-wireless/bluez-4 ) )"
+	bluetooth? ( >=net-wireless/bluez-utils-3 )"
 
 pkg_setup() {
 	enewgroup audio 18 # Just make sure it exists
@@ -75,12 +78,6 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	# Avoid building - and especially linking - test programs
-	# outside of make check
-	sed -i -e 's:noinst_PROGRAMS:check_PROGRAMS:' \
-		"${S}/src/Makefile.am"
-
-	eautoreconf
 	elibtoolize
 }
 
@@ -88,9 +85,11 @@ multilib-native_src_configure_internal() {
 	# To properly fix CVE-2008-0008
 	append-flags -UNDEBUG
 
+	append-ldflags -Wl,--no-as-needed
+
 	econf \
 		--enable-largefile \
-		$(use_enable glib) \
+		$(use_enable glib glib2) \
 		--disable-solaris \
 		$(use_enable asyncns) \
 		$(use_enable oss) \
@@ -106,9 +105,9 @@ multilib-native_src_configure_internal() {
 		$(use_enable libsamplerate samplerate) \
 		$(use_enable bluetooth bluez) \
 		$(use_enable policykit polkit) \
+		$(use_enable X x11) \
+		$(use_enable test default-build-tests) \
 		$(use_with caps) \
-		$(use_with X x) \
-		--disable-ltdl-install \
 		--localstatedir=/var \
 		--with-realtime-group=realtime \
 		--disable-per-user-esound-socket \