Bump to 2.1. Also add a systemd USE flag (bug #423595. thanks to Maksim 'max_posedon' Melnikau <maxposedon@gmail.com> for the patch).

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

4 files changed, 248 insertions, 7 deletions

diff --git a/media-sound/pulseaudio/ChangeLog b/media-sound/pulseaudio/ChangeLog
index c5fc6a193370..1425f4bc2178 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.276 2012/07/15 18:04:05 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.277 2012/07/19 12:28:33 ford_prefect Exp $
+
+*pulseaudio-2.1 (19 Jul 2012)
+
+  19 Jul 2012; Arun Raghavan <ford_prefect@gentoo.org> +pulseaudio-2.1.ebuild,
+  metadata.xml:
+  Bump to 2.1. Also add a systemd USE flag (bug #423595. thanks to Maksim
+  'max_posedon' Melnikau <maxposedon@gmail.com> for the patch).
 
   15 Jul 2012; Raúl Porcel <armin76@gentoo.org> pulseaudio-1.1-r1.ebuild:
   alpha/ia64/sh/sparc stable wrt #403309
diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest
index a990277febe1..de878dc2120b 100644
--- a/media-sound/pulseaudio/Manifest
+++ b/media-sound/pulseaudio/Manifest
@@ -12,17 +12,19 @@ AUX pulseaudio.init.d-5 2352 SHA256 60e4571a8af0437bd99cfd858fde1e6223544a60e591
 DIST pulseaudio-0.9.22.tar.gz 2076785 SHA256 c6019324395117a258c048a6db5e9734551cc2c61dc35b46403ff00d64be55f0
 DIST pulseaudio-1.1.tar.xz 1306168 SHA256 6fe531136f6ebce2d35872a2d2c914278cdc5dcdd5eea516dc52c81f9001f5ee
 DIST pulseaudio-2.0.tar.xz 1353708 SHA256 28b42edd42f4879a6884af5f0ec11801ac001eb7582881215b36649aa37e2061
+DIST pulseaudio-2.1.tar.xz 1355004 SHA256 ef6b347bf47abfb98080795f1583018ac959b4aeb4df916b879f9e1eaba0ca7f SHA512 56b672968ae32dcaa5520b8199ed603f4f1223c7884ee6ad1ddf0ee796b1859784c262eef749504f996638f68bf2b213dd0ad1e9cddfb342e2795300ff9972b6 WHIRLPOOL cf4e38d868b67e1cf3fe610d8759a922c7a71040d923844ea0168b00b756b51882580504a7d876e470d0a6ad523a643ddb1559424d8786bc4d9ce457b4a855ea
 EBUILD pulseaudio-0.9.22-r2.ebuild 6781 SHA256 d2094809a5fdc3d0196ff71ce5636c5f1b4bab5bc92faafd2957d107dc6c19c7 SHA512 4dc2d5e0a62b5ecf9470dea33eccd48ecb61758f0d4db5c232ae55fc4c6812befcaa53e4498dd1961537c020f6ada8b0729d1d89b9d550704173623b39796bd6 WHIRLPOOL a4e75f69a1d437f5223983d0026d2dd3298935f0ef35dd70abff5f738fd254fe53d6560580092bfc3cb0c4c5b9bb9b4546fb53c556664dd8b7e5b400a8764d3e
 EBUILD pulseaudio-1.1-r1.ebuild 6760 SHA256 521e296786b4db5089f8a05b0a8d2ab3a6f5e8cdf4552719d38ae570cbb94253 SHA512 3b29b4c267107d5f9bdac95341e696cf7fd66c4d0065be7f916e85bf2c9a76c1b743d5c477c05c9de1b821fce1570dfcd4f18b907d4f4f5021c2bbd3552c949d WHIRLPOOL 6df3e5b873a42ea1ecb6fa6ad55f150ba28ca77b8e1ef4e6ec1bd595ba082d761b42da58fad34b8b3ac43173c3a5d130025d0e875839461dd5acb0d3a3863f20
 EBUILD pulseaudio-2.0-r1.ebuild 6660 SHA256 5c4b3f03c35ee276d379bde17aab29117338092e08c79a7d7f311d3b9d79ece3 SHA512 578ca38fb2aab2d4395a280d0b9830a6de8f99ae620a9d811a49a8ee767a55edb468c291cf3bc6498eca7a60668a7b26cdaf3af127f31e4d37345de57a735f46 WHIRLPOOL e849cf19091992d9e8fae41989be3eea1071c4968e0902c529b8ba821ff113fd10337802b1987370f1117e9a075507e0a3f907b3470b0722569c71cd95cea954
 EBUILD pulseaudio-2.0-r2.ebuild 6725 SHA256 3548f2861474d2aeea164bdba52fbf53161f609d9306788c4c191f3edce8340f SHA512 ce4817726a2a863c3ef85bfa36178f80ad5be885272aa39fa141cd6ef110d9ee6b6f27973fb51db6c1f702ec82e32ab140ae21cba764aa5e927d9aa851991118 WHIRLPOOL cd6ba32dea21c43c049ecf8003b32c341b1e84793fbf36a4ca952625238ea0e3fb9c2f6ad54873549b3fc5ca120b297301b2617e253773bdc189eb16477d416e
+EBUILD pulseaudio-2.1.ebuild 6727 SHA256 ce32a4cd51a357de48e3c88accac688b2ff396038f1435857444cc08b10bea3e SHA512 564d7a03cac9b3e836aace4c4ba65cd4cd39773c70dd0ed83383219d7989e176e8857b20bd6f2452a4a797be53094ce1ef6b4879d79130bde1b6f704f93ac88c WHIRLPOOL 40b6711acd8a1721c09fe60f795200a43d0c4f1e94303f6a61cffac7fa298b9ee27712574e954a4215b0d8575d271f95c4ee8fb9d12204c7b85bcd471b6e10a7
 EBUILD pulseaudio-9999.ebuild 6624 SHA256 f0a59fc151f3e6f1f3e3764f05fb42719f924a87df71cb1b18fc995dadb9a6e9 SHA512 a2c9c5ad219b4ef5b6688eed784cffb14fcc17b3b35810aa541c4b335d1ad501da682858df0dc34f1b94d1c0d6cb30fc27aadd1f8904317bfed3c8ab4507fdcd WHIRLPOOL cc4f39c82fbe2b4d834731857f2e7724bd8da4bd8b5765355099ce5f00808fefe702c14963d9657f5be39b316b360b4e0c909c8a912edfe06abe6d321a1713b4
-MISC ChangeLog 54023 SHA256 9ba301a9e176ae1a6a08d954c2eec34b7147759cb5480857980b2d55caa3a7b9 SHA512 95384745aa483235e729dafcc7597441a4ddee955dabbb83b1b0c00bb436f51f8df589f89f963fa55c700b826eb74f3099a86a7191ee2dafbda5778de59408a4 WHIRLPOOL 3c7a97b93ccc1d5f1d5bd2f2079f1ec72beebb6e24d47c9d86fa752103db5bfdf017b04e3017f15d2ca3443c19d35daf5dbc8683b6c593fcbc239d48ae2d7bc3
-MISC metadata.xml 2879 SHA256 826fc6b7534f5f2c3d9f7ca010373c03ce3287007e7536aa044634996de55598 SHA512 013d02504a94217fb336d6d7bed154cb6cfff2722cea19c269d22f0734e6e80ce7895a92487eced14b0465fd39d99502cba70faa96a2b165f5c5f7aee93095bd WHIRLPOOL 79c1993cd7b7909362defe5beacea46017ab56b9474310e843da1406303d977484f713c81c80ae4d74b003de82854e1f5497b25c5434c1f8aed7e3af30471145
+MISC ChangeLog 54293 SHA256 bb79f9f6d8ca174497eb8497af2f50542ebb10cfbfdac8f15dc2c8fe96143f47 SHA512 1fe10c705ff752c77c0e8ac4615d2565c0bc71a2ae3753d576f215e1188b273a6579de35932807ebc11d98386b739712e83367accf4c54f06656d7ca1d87a339 WHIRLPOOL bb3d0d7bc420a9469ed62f44d8e23a979f56db9e54945ec0fc3d02234dc98de6e5ab398963c34a00c7f04a0f3d5ca45dfcbd849bdcf0cb53a086e58e3d19e113
+MISC metadata.xml 3010 SHA256 b85255ef97e9b3f4a26158298c51d7d23cf36206e0d5266a4aa09f020c28c219 SHA512 6d2e5d8fb8d932f53c49e0c3dcd3418f7f6f5471c4993a459ac2cb68f825c4925eb7d2c20a78bb34ba26ce4950c07c88465592f79de33363f7f36b65e5a16f96 WHIRLPOOL b19a2ba962a0912dd458e56bc3876622b40114082525dac46bba91dd9a6f3ec8c7867ac0fc13adfd9479593681c880d49f015a563f94e7be25febabc07680fb5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAlADBhsACgkQuQc30/atMkCDYQCbBCQ3fugGAjog7WzSuImp/44j
-gXoAoLMcxFxVw7lL7wFfYvbP64X0eQMT
-=DocT
+iEYEARECAAYFAlAH/YgACgkQ+Vqt1inD4uzD5wCfcYk+YiAFStL2e7/ywVeGcNRZ
+QrcAoJR2T8aibiGmEZYXgRZt2ytejwRX
+=tE7J
 -----END PGP SIGNATURE-----
diff --git a/media-sound/pulseaudio/metadata.xml b/media-sound/pulseaudio/metadata.xml
index 2be5aa2816f9..67633b32238c 100644
--- a/media-sound/pulseaudio/metadata.xml
+++ b/media-sound/pulseaudio/metadata.xml
@@ -64,5 +64,9 @@
     <flag name="xen">
       Builds a special paravirtualized module for running in a Xen guest.
     </flag>
+    <flag name='systemd'>
+      Build with <pkg>sys-apps/systemd</pkg> support to replace standalone
+      ConsoleKit.
+    </flag>
   </use>
 </pkgmetadata>
diff --git a/media-sound/pulseaudio/pulseaudio-2.1.ebuild b/media-sound/pulseaudio/pulseaudio-2.1.ebuild
new file mode 100644
index 000000000000..4a875e0d4c26
--- /dev/null
+++ b/media-sound/pulseaudio/pulseaudio-2.1.ebuild
@@ -0,0 +1,228 @@
+# 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.1.ebuild,v 1.1 2012/07/19 12:28:33 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 systemd"
+
+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 )
+	systemd? ( >=sys-apps/systemd-39 )
+	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 systemd) \
+		$(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
+}