Read the value of udevdir from udev.pc pkg-config file wrt #432684 by Arne Stäcker

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

4 files changed, 256 insertions, 10 deletions

diff --git a/media-sound/pulseaudio/ChangeLog b/media-sound/pulseaudio/ChangeLog
index 32f8fcac6089..8e1408031c4c 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.278 2012/07/21 03:52:09 ford_prefect Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.279 2012/08/25 13:59:32 ssuominen Exp $
+
+*pulseaudio-2.1-r1 (25 Aug 2012)
+
+  25 Aug 2012; Samuli Suominen <ssuominen@gentoo.org>
+  +pulseaudio-2.1-r1.ebuild, pulseaudio-9999.ebuild:
+  Read the value of udevdir from udev.pc pkg-config file wrt #432684 by Arne
+  Stäcker
 
   21 Jul 2012; Arun Raghavan <ford_prefect@gentoo.org> pulseaudio-9999.ebuild:
   Bring live ebuild in sync with regular ebuilds (add systemd USE flag).
diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest
index b2e9ad0c07f8..65f8e5a1e57d 100644
--- a/media-sound/pulseaudio/Manifest
+++ b/media-sound/pulseaudio/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX pulseaudio-0.9.21-armv5-build-fix.patch 3387 SHA256 4734ffb3b038194911627c20959f75609da76e8e071da0833a794f264c243000 SHA512 38f9c39f13b50a45213b255952a359b19181ef39ff18121b23b8390da840b41f4aabfd96cfb9950716f0f75a19793f5a0b9edb7cb31fb6ccdbb5050b3689e69c WHIRLPOOL 970b915fb3abb83a95e3a6801bd34ae548c490a86bb9abf299a9301f77c0ee0537668cd3202124f9d1952d8720caac7cc16f9a5108c3e60ffd20ed0b12fa6cef
 AUX pulseaudio-0.9.22-xcb-atom-2.patch 4381 SHA256 7c256858654529302ec242dadf2a6123da7077154fe31adc26ca96f8824becd4 SHA512 bcf1845c5c74987217c94fab080a7b20b2c7fc06b2a839b8c95fa92d639ac72589eb53fda8325965fdd708c5f728aec5538c0901daaf8303d83fc768d646bb1b WHIRLPOOL 37ed10c8265e2520ccf5b60507ee37aca830b2e2c5c2d48a82f5baeed77d76e0ad2a4ff1b7752f26cba1691f126bad8f4e1f78a9788f867d38e03cb2365bf2a8
@@ -17,14 +17,19 @@ EBUILD pulseaudio-0.9.22-r2.ebuild 6781 SHA256 d2094809a5fdc3d0196ff71ce5636c5f1
 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-r1.ebuild 6856 SHA256 1a398af6e62e3171ed49fdf682b04181a0bfd9226d5ab43154ecd7e9f044ddca SHA512 05fb21c10f03733b34fbcd9bedc3a6e367599f9f0ec8e1383bfa2b474b43e5f5b8773e910a742a1517f96472238abf9573f87bdba014fc465d6daca0830e0859 WHIRLPOOL 3d58a4043c7e1a8b00f990c76c27655d59cf6e8efc01eafd87d6e5e94bee10b0ab024b8a104d8b8f5a4e38d9a86cf03c3c1d454ea040ba2613d4a6bfdcf3eb46
 EBUILD pulseaudio-2.1.ebuild 6727 SHA256 ce32a4cd51a357de48e3c88accac688b2ff396038f1435857444cc08b10bea3e SHA512 564d7a03cac9b3e836aace4c4ba65cd4cd39773c70dd0ed83383219d7989e176e8857b20bd6f2452a4a797be53094ce1ef6b4879d79130bde1b6f704f93ac88c WHIRLPOOL 40b6711acd8a1721c09fe60f795200a43d0c4f1e94303f6a61cffac7fa298b9ee27712574e954a4215b0d8575d271f95c4ee8fb9d12204c7b85bcd471b6e10a7
-EBUILD pulseaudio-9999.ebuild 6694 SHA256 dc85d40258be0f4b7cc40b096c29a9fd0578ddf1ec1321d055cd90017cbcf122 SHA512 ee6173b14baed62332aaac6761bf2205dd511fcee1707d003a0facdc38036a458ba921b65913b610aa042c198e45a55938b894cb1620bc6ae7df7aa2336be89e WHIRLPOOL 3b1f90cf51ed36093b5b89aca49d8ff37d55fe2880046fc6c019771160be0c019f9923499d069a727c1ae834919320b7fe10919d717abe0708853bada3e9d50f
-MISC ChangeLog 54446 SHA256 cc5937e5fa02efa2ca11405ffd030a9c0033b8372674e06fa8b98f27773f9e8f SHA512 d5b9873ccf2f6c52693f28bfbc41b7b5aebcc80a1709073f72358dacbbcc4c0d8e3c6b68786e9f07ee290bb0b33e323cca28ee869e75b17615cadf596db4053b WHIRLPOOL 9b7114c5f308a4964502b935da6c41f3781924cc57a120de5673ecde670a4a3b63af6efdec953f9de8b1f0b4ca2ca9a2fb1e5f0fd92044f49b7a3bc3fc85393e
+EBUILD pulseaudio-9999.ebuild 6820 SHA256 d9dcd6ca1ef5ac8de26d8ac0fdcb792d466746c886630e5b97314cd8891468f2 SHA512 dda462c85634ee097a44c2bf49814ff0e98362e09e2047c27ceaaffb021ab9f0e3f7fb08869801621ada58d5371e99ef065ab8a442e857ac58077633b5f449a2 WHIRLPOOL d14e42cf9ef3389f0d1741923ac97d4132d965981248a89f3d51a7d0180706642a6fb92d1347865257bde3a46864eb65af20bef60871dce1ee1dbcbc5c1200cc
+MISC ChangeLog 54673 SHA256 8d8126733a8785a26b76029fc8e69d4ecd6661afbb6f63fb733f61a1501da4f9 SHA512 e1c17926ac2ed160e03dbe3dc5b146517ee1a28d1906ba60be0ab9e14630904e50c2b8b7e58f3c16aa1a042f600ae0e6c06c2e3d1caa18fcb5be6c237b388ee1 WHIRLPOOL aee8a6209b4eec4e8cdd937512c7944bafb9c61d077196423528f466f84a1a985fb363410b271b30ecc2ca85960b7f63265b94bb5f0c481593c6f8e93674f0cd
 MISC metadata.xml 3010 SHA256 b85255ef97e9b3f4a26158298c51d7d23cf36206e0d5266a4aa09f020c28c219 SHA512 6d2e5d8fb8d932f53c49e0c3dcd3418f7f6f5471c4993a459ac2cb68f825c4925eb7d2c20a78bb34ba26ce4950c07c88465592f79de33363f7f36b65e5a16f96 WHIRLPOOL b19a2ba962a0912dd458e56bc3876622b40114082525dac46bba91dd9a6f3ec8c7867ac0fc13adfd9479593681c880d49f015a563f94e7be25febabc07680fb5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAlAKJ4UACgkQ+Vqt1inD4uwEgACdGByzGAIAKHldj3jXpRl1IZO3
-HgsAniA9MkLwvQKC7sREhxpz1aCp3Odr
-=HxzK
+iQEcBAEBCAAGBQJQONomAAoJEEdUh39IaPFNBp4H/0GKevD4SPiyi7e3rdd0DHM2
+WYnVgbRdE520fBVacCFdZIdwDEA3TBjkS/MjNGIs+blPRIkMPFMqMNxJ5vBgfBbd
+zOBzK7ecyA4yZ8Bsw+q2FujA/7C6tBNNKKHAxrjgrIZlxnNwZQigiuUwsyyAUasv
+0M8/7AZ+TiLXNi96fjHZ/tPKxmjp9/sM7erOHuSUIs9KQWljSzGots6qKoq2AiOQ
+hcL5+9JAvNwEPmeRspMIPZeoiHGWKWFcxE776Md13OsupNiPrUn7Rn+Y9rFcNuvK
+dwZBUIyfqoq5bzyiKSt3vh999kdYGO3Ik3MgsVSdCTD3D31SmW5N6avSIThOyGo=
+=lGRa
 -----END PGP SIGNATURE-----
diff --git a/media-sound/pulseaudio/pulseaudio-2.1-r1.ebuild b/media-sound/pulseaudio/pulseaudio-2.1-r1.ebuild
new file mode 100644
index 000000000000..0a1622a12f33
--- /dev/null
+++ b/media-sound/pulseaudio/pulseaudio-2.1-r1.ebuild
@@ -0,0 +1,231 @@
+# 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-r1.ebuild,v 1.1 2012/08/25 13:59:32 ssuominen Exp $
+
+EAPI=4
+
+inherit eutils flag-o-matic user versionator toolchain-funcs
+
+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() {
+	local udevdir=/lib/udev
+	has_version sys-fs/udev && udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
+
+	# 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}/${udevdir}"/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 4d519ec7c3da..da2980634707 100644
--- a/media-sound/pulseaudio/pulseaudio-9999.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-9999.ebuild
@@ -1,10 +1,10 @@
 # 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.27 2012/07/21 03:52:09 ford_prefect Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-9999.ebuild,v 1.28 2012/08/25 13:59:32 ssuominen Exp $
 
 EAPI=4
 
-inherit autotools eutils flag-o-matic user versionator git-2
+inherit autotools eutils flag-o-matic user versionator git-2 toolchain-funcs
 
 DESCRIPTION="A networked sound server with an advanced plugin system"
 HOMEPAGE="http://www.pulseaudio.org/"
@@ -98,6 +98,9 @@ pkg_setup() {
 EGIT_BOOTSTRAP="./bootstrap.sh"
 
 src_configure() {
+	local udevdir=/lib/udev
+	has_version sys-fs/udev && udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
+
 	# 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)
@@ -141,7 +144,7 @@ src_configure() {
 		--disable-adrian-aec \
 		--disable-esound \
 		--localstatedir="${EPREFIX}"/var \
-		--with-udev-rules-dir="${EPREFIX}/lib/udev/rules.d" \
+		--with-udev-rules-dir="${EPREFIX}/${udevdir}"/rules.d \
 		${myconf}
 
 	if use doc; then