Add Xen support, various ebuild bug fixes (m4 dep - #415497, automagic gtk+ dep - #413165, qpaeq needs qt4 and dbus - #398647).

Package-Manager: portage-2.2.0_alpha107/cvs/Linux x86_64

5 files changed, 255 insertions, 10 deletions

diff --git a/media-sound/pulseaudio/ChangeLog b/media-sound/pulseaudio/ChangeLog
index 6097bc53de16..a7f441e686d6 100644
--- a/media-sound/pulseaudio/ChangeLog
+++ b/media-sound/pulseaudio/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/pulseaudio
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.272 2012/06/01 03:01:18 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.273 2012/06/13 11:54:50 ford_prefect Exp $
+
+*pulseaudio-2.0-r1 (13 Jun 2012)
+
+  13 Jun 2012; Arun Raghavan <ford_prefect@gentoo.org>
+  +pulseaudio-2.0-r1.ebuild, pulseaudio-9999.ebuild, metadata.xml:
+  Add Xen support, various ebuild bug fixes (m4 dep - #415497, automagic gtk+
+  dep - #413165, qpaeq needs qt4 and dbus - #398647).
 
   01 Jun 2012; Zac Medico <zmedico@gentoo.org> pulseaudio-0.9.22-r2.ebuild,
   pulseaudio-0.9.22.ebuild, pulseaudio-0.9.23-r1.ebuild,
diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest
index e2ee90f7f754..b42e9744da79 100644
--- a/media-sound/pulseaudio/Manifest
+++ b/media-sound/pulseaudio/Manifest
@@ -19,14 +19,15 @@ EBUILD pulseaudio-0.9.22.ebuild 6653 RMD160 356e3fcd66a40e1d8851fcc098d398360f80
 EBUILD pulseaudio-0.9.23-r1.ebuild 6466 RMD160 e3ce9b1f3ad34a5617c9649df137e6fc2d08a4f3 SHA1 4ffc1b2832f2dee871dfee242d04adf30a54a5b3 SHA256 c738221695082ac79d4270b6b81bc4be3cfacc07011d113082132a7fb82be8b4
 EBUILD pulseaudio-1.1-r1.ebuild 6764 RMD160 3685acda41e95c317e90ca3ec61ecbdcfe64e9a8 SHA1 e06d5805d42918cfd37820d0929394308db1d5d0 SHA256 4b8374c53ce2f356264b96a7821c8ffe5b1d6987539a09028454774819920cb9
 EBUILD pulseaudio-1.1.ebuild 6080 RMD160 6035b98f9774f01af192cbfe82a8c1e88c06ea50 SHA1 22ba284dc0af1ef4c5b8f12e67164e2cc41db385 SHA256 abeb44fcc5ba68d9bd3080a1daea3f75269f899d80d7fbaa5d504f7213b6cba5
+EBUILD pulseaudio-2.0-r1.ebuild 6660 RMD160 e90f5c9af602fc717ad188483472170aa50b5132 SHA1 87389b073aba62658681d848a26ba98289e77dfd SHA256 5c4b3f03c35ee276d379bde17aab29117338092e08c79a7d7f311d3b9d79ece3
 EBUILD pulseaudio-2.0.ebuild 6499 RMD160 14ad868a68d8f58cf0404cd009f3fc7471c72566 SHA1 217b5c52e28fe690dbdc5723e98af408ee566e43 SHA256 2ab31708ae7818a2775ee42c27f4f45fd37188bb476ca5d5b3f88d814d84e761
-EBUILD pulseaudio-9999.ebuild 6466 RMD160 73d4b03464be1e68de79e5673e8541078072fc10 SHA1 a20a9aea56114f7c2a6ea899f7b5af9e370045fe SHA256 89232d4cc05d26d7048fc4b22c83ef4779ab59192b76092e93df1be3d5c20a1a
-MISC ChangeLog 53085 RMD160 c772e793997fac8f130fa7ee16d530504e4f3cc7 SHA1 00567809b3c2be0a7d3249e4ccaa72b08db4ca0f SHA256 f654cc25e6cf024de66c51539c1e160e72fe3b2895eb997fdf176523f7f6e907
-MISC metadata.xml 2771 RMD160 9adf00b9144b43546590fa7a8654992213c183db SHA1 3444c72ab24a78ab721517a1a46a7d546556cf4a SHA256 350afa38e8777c593b9e28c7d4dd08b6ee1eeb501a36b48a11addd697a3ff562
+EBUILD pulseaudio-9999.ebuild 6624 RMD160 5707c07a6f200c4a1d414bddd8978cdbb8a6357b SHA1 2b4e14e78905941920bc90f2611557c988323558 SHA256 f0a59fc151f3e6f1f3e3764f05fb42719f924a87df71cb1b18fc995dadb9a6e9
+MISC ChangeLog 53379 RMD160 76a8db6f75c661b122b0cc40705362ae2fa665f4 SHA1 6f0c122397f39c3d88ef96d16892a28cc19dbbb6 SHA256 5866e618d544aa4fd594f7087638328c171315b39269e8019b7c9b795a9f18a4
+MISC metadata.xml 2879 RMD160 4bd9e313a4a00ae525c1e6ad8e7c1652db56a094 SHA1 c03935c05e7c4de135090f6a4475522ce12322e6 SHA256 826fc6b7534f5f2c3d9f7ca010373c03ce3287007e7536aa044634996de55598
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk/IMIYACgkQ/ejvha5XGaOcfwCfd7A6tzktrIRy0fG/+koNrCkK
-twwAoKW5xC3j4WIyG5HK4vYL/VD2ODu5
-=DV68
+iEYEARECAAYFAk/Yf5cACgkQ+Vqt1inD4uyv0QCfWgUx0bjRihGpVow1LcVja2ak
+2kQAnRkYGp1JLueCVby22cni6gNfLdpW
+=Wh6Y
 -----END PGP SIGNATURE-----
diff --git a/media-sound/pulseaudio/metadata.xml b/media-sound/pulseaudio/metadata.xml
index f845af763254..2be5aa2816f9 100644
--- a/media-sound/pulseaudio/metadata.xml
+++ b/media-sound/pulseaudio/metadata.xml
@@ -61,5 +61,8 @@
       greatly in applications that support it by performing acoustic echo
       cancellation, analog gain control, noise suppression and other processing.
     </flag>
+    <flag name="xen">
+      Builds a special paravirtualized module for running in a Xen guest.
+    </flag>
   </use>
 </pkgmetadata>
diff --git a/media-sound/pulseaudio/pulseaudio-2.0-r1.ebuild b/media-sound/pulseaudio/pulseaudio-2.0-r1.ebuild
new file mode 100644
index 000000000000..cbd0709c6b33
--- /dev/null
+++ b/media-sound/pulseaudio/pulseaudio-2.0-r1.ebuild
@@ -0,0 +1,226 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-2.0-r1.ebuild,v 1.1 2012/06/13 11:54:50 ford_prefect Exp $
+
+EAPI=4
+
+inherit eutils flag-o-matic user versionator
+
+DESCRIPTION="A networked sound server with an advanced plugin system"
+HOMEPAGE="http://www.pulseaudio.org/"
+
+SRC_URI="http://freedesktop.org/software/pulseaudio/releases/${P}.tar.xz"
+
+# libpulse-simple and libpulse link to libpulse-core; this is daemon's
+# library and can link to gdbm and other GPL-only libraries. In this
+# cases, we have a fully GPL-2 package. Leaving the rest of the
+# GPL-forcing USE flags for those who use them.
+LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="+alsa avahi +caps equalizer jack lirc oss tcpd +X dbus libsamplerate gnome bluetooth +asyncns +glib gtk test doc +udev ipv6 system-wide realtime +orc ssl +gdbm +webrtc-aec xen"
+
+RDEPEND=">=media-libs/libsndfile-1.0.20
+	X? (
+		>=x11-libs/libX11-1.4.0
+		>=x11-libs/libxcb-1.6
+		>=x11-libs/xcb-util-0.3.1
+		x11-libs/libSM
+		x11-libs/libICE
+		x11-libs/libXtst
+	)
+	caps? ( sys-libs/libcap )
+	libsamplerate? ( >=media-libs/libsamplerate-0.1.1-r1 )
+	alsa? ( >=media-libs/alsa-lib-1.0.19 )
+	glib? ( >=dev-libs/glib-2.4.0 )
+	avahi? ( >=net-dns/avahi-0.6.12[dbus] )
+	jack? ( >=media-sound/jack-audio-connection-kit-0.117 )
+	tcpd? ( sys-apps/tcp-wrappers )
+	lirc? ( app-misc/lirc )
+	dbus? ( >=sys-apps/dbus-1.0.0 )
+	gtk? ( x11-libs/gtk+:2 )
+	gnome? ( >=gnome-base/gconf-2.4.0 )
+	bluetooth? (
+		>=net-wireless/bluez-4
+		>=sys-apps/dbus-1.0.0
+	)
+	asyncns? ( net-libs/libasyncns )
+	udev? ( || ( >=sys-fs/udev-171[hwdb] >=sys-fs/udev-143[extras] ) )
+	realtime? ( sys-auth/rtkit )
+	equalizer? (
+		sci-libs/fftw:3.0
+		dev-python/PyQt4[dbus]
+	)
+	orc? ( >=dev-lang/orc-0.4.9 )
+	ssl? ( dev-libs/openssl )
+	>=media-libs/speex-1.2_rc1
+	gdbm? ( sys-libs/gdbm )
+	webrtc-aec? ( media-libs/webrtc-audio-processing )
+	xen? ( app-emulation/xen )
+	dev-libs/json-c
+	>=sys-devel/libtool-2.2.4" # it's a valid RDEPEND, libltdl.so is used
+
+DEPEND="${RDEPEND}
+	sys-devel/m4
+	doc? ( app-doc/doxygen )
+	X? (
+		x11-proto/xproto
+		>=x11-libs/libXtst-1.0.99.2
+	)
+	dev-libs/libatomic_ops
+	virtual/pkgconfig
+	system-wide? ( || ( dev-util/unifdef sys-freebsd/freebsd-ubin ) )
+	dev-util/intltool"
+# This is a PDEPEND to avoid a circular dep
+PDEPEND="alsa? ( media-plugins/alsa-plugins[pulseaudio] )"
+
+# alsa-utils dep is for the alsasound init.d script (see bug #155707)
+# bluez dep is for the bluetooth init.d script
+RDEPEND="${RDEPEND}
+	X? ( gnome-extra/gnome-audio )
+	system-wide? (
+		sys-apps/openrc
+		alsa? ( media-sound/alsa-utils )
+		bluetooth? ( >=net-wireless/bluez-4 )
+	)"
+
+# See "*** BLUEZ support not found (requires D-Bus)" in configure.ac
+REQUIRED_USE="bluetooth? ( dbus )"
+
+pkg_setup() {
+	enewgroup audio 18 # Just make sure it exists
+	enewgroup pulse-access
+	enewgroup pulse
+	enewuser pulse -1 -1 /var/run/pulse pulse,audio
+}
+
+src_configure() {
+	# 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 $(no-as-needed)
+
+	if use gdbm; then
+		myconf+=" --with-database=gdbm"
+	#elif use tdb; then
+	#	myconf+=" --with-database=tdb"
+	else
+		myconf+=" --with-database=simple"
+	fi
+
+	econf \
+		--enable-largefile \
+		$(use_enable glib glib2) \
+		--disable-solaris \
+		$(use_enable asyncns) \
+		$(use_enable oss oss-output) \
+		$(use_enable alsa) \
+		$(use_enable lirc) \
+		$(use_enable tcpd tcpwrap) \
+		$(use_enable jack) \
+		$(use_enable lirc) \
+		$(use_enable avahi) \
+		--disable-hal \
+		$(use_enable dbus) \
+		$(use_enable gnome gconf) \
+		$(use_enable gtk gtk2) \
+		$(use_enable libsamplerate samplerate) \
+		$(use_enable bluetooth bluez) \
+		$(use_enable X x11) \
+		$(use_enable test default-build-tests) \
+		$(use_enable udev) \
+		$(use_enable ipv6) \
+		$(use_enable ssl openssl) \
+		$(use_enable webrtc-aec) \
+		$(use_enable xen) \
+		$(use_with caps) \
+		$(use_with equalizer fftw) \
+		--disable-adrian-aec \
+		--disable-esound \
+		--localstatedir="${EPREFIX}"/var \
+		--with-udev-rules-dir="${EPREFIX}/lib/udev/rules.d" \
+		${myconf}
+
+	if use doc; then
+		pushd doxygen
+		doxygen doxygen.conf
+		popd
+	fi
+}
+
+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.41, but that doesn't look like a stable release.
+	emake -C src check
+}
+
+src_install() {
+	emake -j1 DESTDIR="${D}" install
+
+	# Drop the script entirely if X is disabled
+	use X || rm "${ED}"/usr/bin/start-pulseaudio-x11
+
+	if use system-wide; then
+		newconfd "${FILESDIR}/pulseaudio.conf.d" pulseaudio
+
+		use_define() {
+			local define=${2:-$(echo $1 | tr '[:lower:]' '[:upper:]')}
+
+			use "$1" && echo "-D$define" || echo "-U$define"
+		}
+
+		unifdef $(use_define avahi) \
+			$(use_define alsa) \
+			$(use_define bluetooth) \
+			$(use_define udev) \
+			"${FILESDIR}/pulseaudio.init.d-5" \
+			> "${T}/pulseaudio"
+
+		doinitd "${T}/pulseaudio"
+	fi
+
+	use avahi && sed -i -e '/module-zeroconf-publish/s:^#::' "${ED}/etc/pulse/default.pa"
+
+	dodoc README todo
+
+	if use doc; then
+		pushd doxygen/html
+		dohtml *
+		popd
+	fi
+
+	# Create the state directory
+	use prefix || diropts -o pulse -g pulse -m0755
+	keepdir /var/run/pulse
+
+	find "${D}" -name '*.la' -delete
+}
+
+pkg_postinst() {
+	if use system-wide; then
+		elog "PulseAudio in Gentoo can use a system-wide pulseaudio daemon."
+		elog "This support is enabled by starting the pulseaudio init.d ."
+		elog "To be able to access that you need to be in the group pulse-access."
+		elog "If you choose to use this feature, please make sure that you"
+		elog "really want to run PulseAudio this way:"
+		elog "   http://pulseaudio.org/wiki/WhatIsWrongWithSystemMode"
+		elog "For more information about system-wide support, please refer to:"
+		elog "	 http://pulseaudio.org/wiki/SystemWideInstance"
+		if use gnome ; then
+			elog
+			elog "By enabling gnome USE flag, you enabled gconf support. Please note"
+			elog "that you might need to remove the gnome USE flag or disable the"
+			elog "gconf module on /etc/pulse/system.pa to be able to use PulseAudio"
+			elog "with a system-wide instance."
+		fi
+	fi
+	if use bluetooth; then
+		elog
+		elog "The Bluetooth proximity module is not enabled in the default"
+		elog "configuration file. If you do enable it, you'll have to have"
+		elog "your Bluetooth controller enabled and inserted at bootup or"
+		elog "PulseAudio will refuse to start."
+	fi
+
+	eselect esd update --if-unset
+}
diff --git a/media-sound/pulseaudio/pulseaudio-9999.ebuild b/media-sound/pulseaudio/pulseaudio-9999.ebuild
index 0b4fa7473388..b7ce9f413941 100644
--- a/media-sound/pulseaudio/pulseaudio-9999.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-9999.ebuild,v 1.25 2012/06/01 03:01:18 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-9999.ebuild,v 1.26 2012/06/13 11:54:50 ford_prefect Exp $
 
 EAPI=4
 
@@ -18,7 +18,7 @@ EGIT_REPO_URI="git://anongit.freedesktop.org/pulseaudio/pulseaudio.git"
 LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )"
 SLOT="0"
 KEYWORDS=""
-IUSE="+alsa avahi +caps equalizer jack lirc oss tcpd +X dbus libsamplerate gnome bluetooth +asyncns +glib test doc +udev ipv6 system-wide realtime +orc ssl +gdbm +webrtc-aec"
+IUSE="+alsa avahi +caps equalizer jack lirc oss tcpd +X dbus libsamplerate gtk gnome bluetooth +asyncns +glib test doc +udev ipv6 system-wide realtime +orc ssl +gdbm +webrtc-aec xen"
 
 RDEPEND=">=media-libs/libsndfile-1.0.20
 	X? (
@@ -38,6 +38,7 @@ RDEPEND=">=media-libs/libsndfile-1.0.20
 	tcpd? ( sys-apps/tcp-wrappers )
 	lirc? ( app-misc/lirc )
 	dbus? ( >=sys-apps/dbus-1.0.0 )
+	gtk? ( x11-libs/gtk+:2 )
 	gnome? ( >=gnome-base/gconf-2.4.0 )
 	bluetooth? (
 		>=net-wireless/bluez-4
@@ -46,16 +47,21 @@ RDEPEND=">=media-libs/libsndfile-1.0.20
 	asyncns? ( net-libs/libasyncns )
 	udev? ( || ( >=sys-fs/udev-171[hwdb] >=sys-fs/udev-143[extras] ) )
 	realtime? ( sys-auth/rtkit )
-	equalizer? ( sci-libs/fftw:3.0 )
+	equalizer? (
+		sci-libs/fftw:3.0
+		dev-python/PyQt4[dbus]
+	)
 	orc? ( >=dev-lang/orc-0.4.9 )
 	ssl? ( dev-libs/openssl )
 	>=media-libs/speex-1.2_rc1
 	gdbm? ( sys-libs/gdbm )
 	webrtc-aec? ( media-libs/webrtc-audio-processing )
+	xen? ( app-emulation/xen )
 	dev-libs/json-c
 	>=sys-devel/libtool-2.2.4" # it's a valid RDEPEND, libltdl.so is used
 
 DEPEND="${RDEPEND}
+	sys-devel/m4
 	doc? ( app-doc/doxygen )
 	X? (
 		x11-proto/xproto
@@ -118,6 +124,7 @@ src_configure() {
 		--disable-hal \
 		$(use_enable dbus) \
 		$(use_enable gnome gconf) \
+		$(use_enable gtk gtk2) \
 		$(use_enable libsamplerate samplerate) \
 		$(use_enable bluetooth bluez) \
 		$(use_enable X x11) \
@@ -126,6 +133,7 @@ src_configure() {
 		$(use_enable ipv6) \
 		$(use_enable ssl openssl) \
 		$(use_enable webrtc-aec) \
+		$(use_enable xen) \
 		$(use_with caps) \
 		$(use_with equalizer fftw) \
 		--disable-adrian-aec \