Fix compilation with json-c 0.11 (bug #467280).

Package-Manager: portage-2.2.0_alpha173/cvs/Linux x86_64
Manifest-Sign-Key: 0x29C3E2EC

4 files changed, 277 insertions, 5 deletions

diff --git a/media-sound/pulseaudio/ChangeLog b/media-sound/pulseaudio/ChangeLog
index 4f5d9a9b4489..b04ef5404b71 100644
--- a/media-sound/pulseaudio/ChangeLog
+++ b/media-sound/pulseaudio/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/pulseaudio
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.300 2013/04/10 20:43:51 vincent Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.301 2013/04/27 03:56:05 ford_prefect Exp $
+
+*pulseaudio-3.0-r1 (27 Apr 2013)
+
+  27 Apr 2013; Arun Raghavan <ford_prefect@gentoo.org>
+  +pulseaudio-3.0-r1.ebuild, +files/pulseaudio-3.0-json-c-fix.patch:
+  Fix compilation with json-c 0.11 (bug #467280).
 
   10 Apr 2013; Vicente Olivert Riera <vincent@gentoo.org>
   pulseaudio-1.1-r1.ebuild, pulseaudio-2.1-r1.ebuild, pulseaudio-3.0.ebuild,
diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest
index 51d439fbd630..593fb5bf8c2a 100644
--- a/media-sound/pulseaudio/Manifest
+++ b/media-sound/pulseaudio/Manifest
@@ -7,6 +7,7 @@ AUX pulseaudio-0.9.22-xcb-atom.patch 3026 SHA256 b7c528c3f20743d4337878138b0d0f1
 AUX pulseaudio-1.1-machine-id-fix.patch 1723 SHA256 4167f52eb2dfb2c6fcaab1c6dda3f1208556dfc2e3511e46b63b686d14e204d3 SHA512 035c08a0d8c11a3fae6192f484adb25dfe12685ca6acba460033aef9b519e78ab9ed4bbe37baf4c564ed56c93ed462736b99c6c713c926407c36e68592db65c5 WHIRLPOOL 6d2162ce3b4791264a6a05ea57a947f757fc81a33943e8d604b3859d4ce5edd67a881ca37bd98a56a531e72a1e63dac42761d7aab5ee96d6acdee34666182cae
 AUX pulseaudio-1.1-python3-fix.patch 5200 SHA256 cd7b6a4702e11afe91d6f5f3c7e10d1db540709c5c4ad478aa550a23233ec3f6 SHA512 441ee4d78dbe23b21161ca9387db67bff405fef2826fcfd221c9b80420d267a1c0fa81ef3ecf6e93317f198ccdf2ba5f3e24c907b56d7ac6fd86a804f1d66e20 WHIRLPOOL 55f388fcc9ba639d1a56f9f436dd76cba2407be501050aabb4fe3de0b4edb8d1f4c151724ea41fad5bef40eeed82d8aeaa91133cfa69621e46408f40624a5de8
 AUX pulseaudio-2.0-udev-symbols.patch 2950 SHA256 ee4250aff4ccfbdf55f4547e8bab0e2d4f9b56ab108668ca657440b4723c02b4 SHA512 09e1bf4ce1f9188e360da37490822b1a1f6bfbdfa5c32ede5ac9029bdb3c259436445ad0a866a0b0156be0e17c8c501da5a2b71c500d730656c9b440adcc8f5e WHIRLPOOL f7b87124d95e1862dbfbad9de7e438c649c95c4ddbdcdbacf17fb0128dae229d8ed9a2db0854d6435e939ec2ccc1fa7e4f9a0704daa0637f72e1622bfe8bcd5e
+AUX pulseaudio-3.0-json-c-fix.patch 829 SHA256 a3b40933454fd84b95d770e499ea010bb63616fea8b4ce1845c87b9a9892dc45 SHA512 5585e53c0d5ba6e1abdfe7eacf6f304e63dd79178c3a254808fd0cbc0865a5de490821d04ccdf05da42adcb9f2f2fdb7e382260fba8a8dae698e9cd07752f49a WHIRLPOOL 42899a1b720dbfb7c447981ae51aff8d005ac708221132cfdcc5574aa8fc4820100cc584a93c7aa45fb76f369b726728b09968e5dcbeee60b2e3098ecf456944
 AUX pulseaudio.conf.d 275 SHA256 c03661e8cc902d27ff6b52f291207f2b008957571b942abdd92a873a52aae0dd SHA512 75b54581591519d63a3362b155c0f9b0501a60763ab394693a456c44d0216138cf3a40bdd0f7442028663bc045e9ffee286f8f8eaf2ee3bb17379b43615fee0e WHIRLPOOL 60c546c76c6de1d7f5244264829bac13fa5ed3993837e00a93eb6d1ac4ecd8e00d70dd9f5f92f5b6a42b8fb11aaaeb618d5f9a4db5e382ad5d6511c8e26889ba
 AUX pulseaudio.init.d-5 2352 SHA256 60e4571a8af0437bd99cfd858fde1e6223544a60e591febf25e55e4a2918ff59 SHA512 c510ddc71509435946a4f5a29ee2deb124fddec1a078433651bee99fd71424a0673c6b67015c2b737878e0e6e1da0b0ee4935e419a00cbfe74d6f8c8dc91f243 WHIRLPOOL 9fd81ab29c74b5bfc75aa15d73490881d59c4a280dd6214baf714080e74cb8cdd263d70ec220ea30c08da7890345f5bee6e0d68d2b04c8f5711051fe2b330cbc
 DIST pulseaudio-1.1.tar.xz 1306168 SHA256 6fe531136f6ebce2d35872a2d2c914278cdc5dcdd5eea516dc52c81f9001f5ee SHA512 6cd24259ad27f272c9069f4474c63208e431b802858f8485e601a7335a92787701a4a51b3f6b11d3bf2c5c04b4d9ec8c3b33f8dd3c0dda674c15da7c0c78cbba WHIRLPOOL 9ea4a8283c114298cf172f1757f0da1f218a82c54ac1e76a376a6439c2c795bb29040a2b113655127cc17e9a8def0339e74767bae24384d89dd3ed4db5f2c96e
@@ -14,14 +15,15 @@ DIST pulseaudio-2.1.tar.xz 1355004 SHA256 ef6b347bf47abfb98080795f1583018ac959b4
 DIST pulseaudio-3.0.tar.xz 1367468 SHA256 c90bfda29605942d08e3e218ef10e3c660506a06651a616bfbb6a6df8392836d SHA512 965d6f2472f1b15b600b4578cfbfcb6bbe6be2e7661c0672216141118e34caba3046a026aed69d4fc6ae82b7190bc64e00cf03fb638a872b5d0d25c7c3e10514 WHIRLPOOL 79813545993c7a6291550a471d5e32826438c72060ca07051a455a23c8695de5e1d30d104bec01ec29552e5e8d72448f393536d5b81c50d6371e29567ba937bc
 EBUILD pulseaudio-1.1-r1.ebuild 6728 SHA256 ba9c701c1832f7b86c726d29831b9d893bf62d40fd93b85a291150a3a7a00fdb SHA512 4f6ede5166c68c157519e23aaa0eac39f1cdd929660acec8b86cebb2f906f8d1e17c3f363c76026a16bf81c89f065d5076e95d1d654dc62ccfea83b69b93198d WHIRLPOOL 776af8c4d07db56e9c211e403bc28adc50c20feebe265cf909f4935044e7ea5d0f0153649f0ece2ba581fcab9ad85b5db67a2f8c1a1f77f1782708469ee835c5
 EBUILD pulseaudio-2.1-r1.ebuild 6716 SHA256 5d7adeed83c76ed3a4a8ce48ffab3e6833efa21b3a765ba83d9f35cf5ab53f38 SHA512 bac57bd87f952ccfcc927ce32186e2a073cef2e97db7cebd2f614e277a57952d8247c98470790e36321770ce12816ae2dbf13a5c8ef5abf67572fff87ee9a09b WHIRLPOOL 6ebfc3faec0a858eeedb648d308139d320979ac559e8521421a96426cfe23ccd609a2405a133c6c1b8afc0b697c3020fc8d6a13c97e708c4a6e4f80c0505eb7c
+EBUILD pulseaudio-3.0-r1.ebuild 6997 SHA256 a78bf3e41974c3aceb5e21aa384a9031c48aab18ed4411d8095d285b1ffe34d2 SHA512 45e4d06d01c3eef923ae87117e94c02cb09831c1366688e566c2dda4b81b1b92709555853b4a3aa857350d9e503cf4f02d5eaa943f850e4fdf19811f125f87df WHIRLPOOL 74d08e72779b638b8b9a5071321a673a343bc9d121381e6ec9cc74d225293e52f08c6b8bfc9b9a53a32d2c2fdf2e057b58617c39b627d9005c200eac12cedf93
 EBUILD pulseaudio-3.0.ebuild 6903 SHA256 1ce417ae4493ea16ee4c70c42eb3e910ba1fb6aa35da8b0ea2204275139dc0e5 SHA512 cc96d3448267e048fbcc6ceaff2489a734ba18b1963bf21785ba1c7df7322408fb5439bff2d56927365b1a1b23734bcd0303896ddf003c77f1ab0e4f28797731 WHIRLPOOL 7f76c7a4453c6867a9d4caff26c026d2b1377e4b656218ff7008288d71482b40428967621c35bec231672c45f2d9eac9cadd2d477c7ed54b719d715047d3f63e
 EBUILD pulseaudio-9999.ebuild 6854 SHA256 beebdfe502b907ae648b6f446174fbbddffe17434cda2b1435518955f3e06b96 SHA512 9014fa7c596bb41d0531455485090e4ef51a18844b391e26dce37bdc2d5ec59f3f00a15bda5b00b214699cb562bff0dff0b2997d2706c307eba4ae4990d8f102 WHIRLPOOL f1161dd70091cd8e5f1738cb2c80d96032d400cf91abb75f0ab93299abcf9ec3f71f0344c719e5ca18baeebcce12f4394ed56e4207fad0623b15a01dcdb2d3a6
-MISC ChangeLog 58012 SHA256 48c699e883ecd986d790b54d7f64037fcbc4a62c8c9f2fb1ac8e9656cf1a46ee SHA512 24eb3e9604366aa46c9ea32629265b34951c036b4c968d7a3cc3127330115a276e5dfdbb130daa5ebc3522560b23037db14d0c9749841409d78308eb907f9906 WHIRLPOOL 6d8d6f4cb1db5c1b5a4d2c470f0c9e9bcb1143da548f3a0d514c94c352457523f6ed96f52c35c1650c29ddc52a74227c92449c96c546fa9de6c809ddc24915ce
+MISC ChangeLog 58226 SHA256 94a83d71d93b3d17ea583b627623b4d9f4c283b227556628f2f835606f82c82c SHA512 18f09f1d2241527d07c37208bd3df3109a54fd236f96f9df5b788f6f3615be9259e6ace9b78241fc7304c86c87cb0a94855c3da98b9519ec5c8336356b084cf9 WHIRLPOOL 144fb5a7f45614edab4240f0b0b06987584c6f131a00502c44cd96bc057c5e396dd5f00ae781595be210850186d20b4e92f61b40f10da1e0cb767a09dfb18a9e
 MISC metadata.xml 2915 SHA256 833bf5b1874232dc37f100f32ad32a4b757d02d96cda0b49596196f4d715ea61 SHA512 52660b534e64ce727c1eea8060cbf66a2a5776d3149e551aa00800c65c80dfbed5828c974ba82dcd6e56e849612645dd1f7d2cf1aed250a2631b53bb10cccb3c WHIRLPOOL 51605e887017e571800d79394d0515740888c337228dcb89f70389734044553b95043edd7e362b70cd9b1eff0be34a22f37d6a3bc45d41fa102264963e7b00a8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlFlzv4ACgkQWunnsum7y6jAsACcC6ooy0mBLJsx1qkdnIvzMls6
-6c0AoI5ekdL0wz23b2PeU4xbvHZbqpyr
-=oEHI
+iEYEAREIAAYFAlF7TJgACgkQ+Vqt1inD4uzKBwCgp0U0ld7PdPPMs+Tyakoe+UN0
+hp8An0R7XHAPYT+RX6AXBvVO3sHIMh1a
+=4x/8
 -----END PGP SIGNATURE-----
diff --git a/media-sound/pulseaudio/files/pulseaudio-3.0-json-c-fix.patch b/media-sound/pulseaudio/files/pulseaudio-3.0-json-c-fix.patch
new file mode 100644
index 000000000000..e0b027b20df5
--- /dev/null
+++ b/media-sound/pulseaudio/files/pulseaudio-3.0-json-c-fix.patch
@@ -0,0 +1,28 @@
+From 759c0bc6f990240287a14fa6dec029ecea581463 Mon Sep 17 00:00:00 2001
+From: Arun Raghavan <arun.raghavan@collabora.co.uk>
+Date: Sat, 27 Apr 2013 08:57:05 +0530
+Subject: [PATCH] build-sys: json-c changed everything :(
+
+json-c 0.11 ships a pkg-config file with a different name, and changes
+the name of its library as well.
+---
+ configure.ac | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index c8161a4..b1bd21a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -624,7 +624,8 @@ AM_CONDITIONAL([HAVE_TESTS], [test "x$HAVE_LIBCHECK" = x1])
+ 
+ #### json parsing ####
+ 
+-PKG_CHECK_MODULES(LIBJSON, [ json >= 0.9 ])
++PKG_CHECK_MODULES(LIBJSON, [ json-c >= 0.11 ], [],
++		  [PKG_CHECK_MODULES(LIBJSON, [ json >= 0.9 ])])
+ AC_SUBST(LIBJSON_CFLAGS)
+ AC_SUBST(LIBJSON_LIBS)
+ 
+-- 
+1.8.1.2
+
diff --git a/media-sound/pulseaudio/pulseaudio-3.0-r1.ebuild b/media-sound/pulseaudio/pulseaudio-3.0-r1.ebuild
new file mode 100644
index 000000000000..4541c080b04c
--- /dev/null
+++ b/media-sound/pulseaudio/pulseaudio-3.0-r1.ebuild
@@ -0,0 +1,236 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-3.0-r1.ebuild,v 1.1 2013/04/27 03:56:05 ford_prefect Exp $
+
+EAPI="5"
+
+inherit autotools eutils flag-o-matic user versionator toolchain-funcs udev
+
+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 +asyncns avahi bluetooth +caps dbus doc equalizer +gdbm +glib gnome
+gtk ipv6 jack libsamplerate lirc neon +orc oss qt4 realtime ssl systemd
+system-wide tcpd test +udev +webrtc-aec +X 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.99
+		>=sys-apps/dbus-1.0.0
+		media-libs/sbc
+	)
+	asyncns? ( net-libs/libasyncns )
+	udev? ( >=virtual/udev-143[hwdb] )
+	realtime? ( sys-auth/rtkit )
+	equalizer? ( sci-libs/fftw:3.0 )
+	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 )
+	test? ( dev-libs/check )
+	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
+# PyQt4 dep is for the qpaeq script
+RDEPEND="${RDEPEND}
+	equalizer? ( qt4? ( dev-python/PyQt4[dbus] ) )
+	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
+
+	if use system-wide; then
+		enewgroup pulse-access
+		enewgroup pulse
+		enewuser pulse -1 -1 /var/run/pulse pulse,audio
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-json-c-fix.patch"
+	eautoreconf
+}
+
+src_configure() {
+	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 neon neon-opt) \
+		$(use_enable tcpd tcpwrap) \
+		$(use_enable jack) \
+		$(use_enable avahi) \
+		$(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}/$(udev_get_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
+
+	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
+	if use equalizer && ! use qt4; then
+		elog "You've enabled the 'equalizer' USE-flag but not the 'qt4' USE-flag."
+		elog "This will build the equalizer module, but the 'qpaeq' tool"
+		elog "which is required to set equalizer levels will not work."
+	fi
+}