revbump to fix building with new json-c-0.11

Package-Manager: portage-2.1.11.62/cvs/Linux x86_64
Manifest-Sign-Key: 0xC2BA7F3C!

5 files changed, 120 insertions, 14 deletions

diff --git a/media-sound/pianobar/ChangeLog b/media-sound/pianobar/ChangeLog
index 9582e7a001ba..e46e45b880b0 100644
--- a/media-sound/pianobar/ChangeLog
+++ b/media-sound/pianobar/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/pianobar
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pianobar/ChangeLog,v 1.28 2012/12/02 11:42:07 radhermit Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pianobar/ChangeLog,v 1.29 2013/04/28 19:07:44 hwoarang Exp $
+
+*pianobar-2012.12.01-r1 (28 Apr 2013)
+
+  28 Apr 2013; Markos Chandras <hwoarang@gentoo.org>
+  pianobar-2012.12.01.ebuild, +pianobar-2012.12.01-r1.ebuild,
+  +files/pianobar-2012.12.01-json-c-0.11.patch:
+  revbump to fix building with new json-c-0.11
 
   02 Dec 2012; Tim Harder <radhermit@gentoo.org> metadata.xml:
   Drop sound herd from metadata.
diff --git a/media-sound/pianobar/Manifest b/media-sound/pianobar/Manifest
index 339421fc8090..65de1796b8d1 100644
--- a/media-sound/pianobar/Manifest
+++ b/media-sound/pianobar/Manifest
@@ -2,19 +2,29 @@
 Hash: SHA256
 
 AUX pianobar-2011.12.11-tests.patch 841 SHA256 62028822d612a03e0c854ebcfae56ceb95cb7f281a0bbfbaa16e543647b6eedc SHA512 ad7819ddd102a295408ed1a933264e7bce1f8db0f4f0994be084b64316bea6191e70c0a12f939131aba81c514ae0b0dd29b2498370516e9cf421f6fe8b8a9676 WHIRLPOOL 2b2877bd70b7b0f8e07bd1ec6ec6aff43777276f108c2be1adbf3d130e8d75fb94ec0cf984cf82b491641035757e13f5bc7225164c3e851a52cdc6fef874b69e
+AUX pianobar-2012.12.01-json-c-0.11.patch 919 SHA256 a907bd6da72343c1c79b64aa2d834dc2264a8d08758a9d892b10ce1e797a73f4 SHA512 655ca6db15f22a14ede5057ae83cebe8ce882d88e0ba1e728569e40013c25a3a0a9fd746e6d659b3e3bb4d7b93db4b809c75720875219d9ec6fd390e537baef8 WHIRLPOOL 483ec4e50c5fab628b796932e36b3a1ce84459875282e8857473f74018da7f779a96b7a9ca3dc27aebf7b87eebd0985a387c436d821505dff1e46162c50ed012
 DIST pianobar-2012.12.01.tar.bz2 50383 SHA256 a3909f796e7cef21b19d98282f332ecbcf9b2c60a2af22a0a2ce01e9c4d9f515 SHA512 4d0996009f1fe8d4493f892593b545e3a6ab460aea5629ae80d4ba2c6dd43431be35cf16ead71e0b2b4ef4b5ba3bd4bf76d4f3b53e6ec97aa3cc1d5f3429d2d8 WHIRLPOOL b1fc67d56cd8dd4701198ac2491077d3e53afc56bfa316c791a5e14b74d162c1961fd8852cbaa1b383e1cee0332334ce8f33906083e728f995c05d50cfb21294
-EBUILD pianobar-2012.12.01.ebuild 1382 SHA256 44e06a138b43873cd478a1b7208f7d0e3095d0798aa28cbd0ec8f5d9b0a92a3a SHA512 3a20d42154a48a83bbdb49d5167cac31f57e32f5267e82b0680db96e4bb713b099adc1c306428efa080d8c4986f5acf7e8030a514d37f6a2a35f688111ca3004 WHIRLPOOL 9a28ddd9270811dac9d2365b43c5f736c5dd57f1473e6d89a0b5cbb634f80b5ad3b2759c20a71e0491359275e7443590ca701cefdc77b5966f092a11e112c76c
+EBUILD pianobar-2012.12.01-r1.ebuild 1436 SHA256 6e6da69e93a8491f8e80ec18e20d8f07c38897f0dc8ce39a4d38c143d857e5f2 SHA512 b67e84247742d6baed4f1adce780addf35ead35402b37315fbcb289fe721fbe6ea6b8dc6b020504f33b7961f366d32f99dcb463504531d9c150b65d1e7e20950 WHIRLPOOL c21653336f45db1e35e995bba48f61365aec963ff4b29d5f2ac6df1e5202ad49f99d92755ce7ac90afd7c9618e77e795a0625b1873943f527acf2333a239be6f
+EBUILD pianobar-2012.12.01.ebuild 1387 SHA256 d2971ca2d928e3458fd7132d622e021daa8c3799847f6d4ad9be201488878161 SHA512 887b61147dbd295219dc073e215e008253f110b3b51853ddb67aeeb0d1054d37937b86ffcb2c74662bfd730ba8d66729b6cf2224cac44ac22fabd11b9344f970 WHIRLPOOL c8171b57b6e1a307e8135ef8d6f15ea8afc95997bf4220f139508d79259c4b7b94ec8fcf0a37db16f569935115d632fafc3a929d25037081689bc4bb689e02cf
 EBUILD pianobar-9999.ebuild 1309 SHA256 91bbf163afb14fa086d3f3ef31843769203a1a03bb0a93d143d8d56bb09f0df5 SHA512 39a10ee1de850bd4ba71961358ecdcb6c4faf41f38c31b3ea9ae05b26ffb74e240b8bdb1ea2bdc8585ea4ed90025dc397cf91e541d277de2f189388c8043c8a8 WHIRLPOOL 6efed10d804da9a865545e6d6b266520abef4dcb4640122d970c411d38b4a95b9b4c8f0c607cbd657cd016e5370e824cd5694324e8ca6b900de468d9573ff0eb
-MISC ChangeLog 4421 SHA256 8a3c589e0bf03af7fea40cd9a070bdc3981306d7c0ac9e3962b4064c96819eb6 SHA512 0e109676384ef932490eb0ef7c0560817a4e5826a554db6bc1b9b0bf7e04db2d244e9830f3f8e9521586193c9f471de1dd4f0378cf5635085ffe4b98ac6aa384 WHIRLPOOL 0185f36ea10d582ae1425d5102068dad9a3eee6bc4a7e868af3fa189a2162f16ab8d735f2d041c150f912ca46aa76aa0cb412114c9b6873bee9efaf0ddd65a7b
+MISC ChangeLog 4670 SHA256 562b1aeb7271c74af243c5e3fc670300a7274371b98054ac30436dc6921709a5 SHA512 2407e3da9af173d097afac3f7da710f4fc409702e920dd67a93c744d441e5c483c2b1b474482017ebcbbc5dda5927a55cd1359be3f23b0477101d9a3bacc1162 WHIRLPOOL 83f270e04443e38c324e9ae84bd1818ea4117b8daa97ac83f9750a715d103546bfe7deff72a370c7844e0afcd53d137631c9d23e23df108c8ab56ddd82db5e68
 MISC metadata.xml 232 SHA256 a778e40f66cb2fa35529e4f45cb8356c8b1b109163cd939396f02e8ea6aa5f1a SHA512 6952f63da1c92a4ed7ddb87b5eb4003d123f0b7af6ffdbc9118159c97ddf18917e8ac7727285a42c07c64e52a40335bc2ef9f17261557617beb8c2226a391873 WHIRLPOOL 0a4441f075f8af01588da2aac3e03732f93463b8bea5e46749d37e1468452735d15f45243b930b3346c93734f8aa235a492030445fee471a95d2c5998f08e7de
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQuz6RAAoJEEqz6FtPBkyjqbUIAKXmdG4t9IsMWaZI4BDMKSjr
-GXacGbJH/ZBxhHX0RRV/ioL6jplN9h09N1fN4dQzkkhoUJcwqzKWMNMSAaaJysNx
-vCtEqOJKHZYXDHy6/guKJF9bbyvrvr1WNKJNniYcxSFIoBdXIAYRkvJ0m71bn6xb
-5QJ0e/knCZqO4xKSjn4qASVlpPhbg7cmm6Vg4xgkQO/m5iFoJFMRttHFKy1OsxQi
-43Ek/jy1GNvzMzAstPMLtZ0s/ClGMDZNnFwv7RNEQhPoOJc+ivuh6RcFTduvwfBW
-thgs62JPKgx2JoJLRvBVPimzDfaeIshkUropecnVGvadEdN6pxmJBlPFl/XzBJA=
-=Duva
+iQJ8BAEBCABmBQJRfXN/XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
+OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88inoQAMgUH4nAygdmMA+oT+6OcTSj
+5qH9+Qy7tfmV6/xihEJ6JkdsYsNyuUVbA5dK2p1kY5mInabwaieuMjL0JAoxoV4r
+MCHHXDBbDsZuX71PuNd0J7c/lf2GjthancW3ELe9B1ypFUG1mpSLhbfLzKd38Eyu
+j/uR/NcfdFRASZTAV0/6HBkEExHXRrCPJuPV4yYT30LDIR0mu749VB3hynqJQH97
+n8rzWD//4NnPSMLt3gPcVMvkf8tMd83VRL9oG8c7vi16O/Gx86xsFDDut/4wP56S
+U7KGcvNTII0DwoWwcPoAoZ2q4pkjKvpxOJ6nLNCCYWvKfYzY0vrLZa1UuMzPwuo7
+YKUQMKGIpVggW9nkg1KdhazX0nKHsu83XUqihhOEPvYBFs+l9gbFP5zphvuF4pu/
+hk7xNCqbJdYxt48Z9qhZriiRsWNEOtC2jdPavNUBObqJrfTS3pyIX1ie+XGun8OR
+iqJ2wpHC6C7UQJTf3G3+101jXXZ+/uEMTpqiNIk3AqI6sA59Jpal1SHybIau8Eb0
+ZgPzLqAAc+PG6Wiu/VlgFg6svQBqT4cxs9BcD6T/TWuIkTKN57LfcpfQNckuKwA9
+jCgfjOtgi4SDqbAVtI170CVHwKLGpg1v37Q2QfrfyCkUxthfAB3fbYyUPMvfwVqw
+s7A4Nuu69l25n4E4P/MJ
+=TxWh
 -----END PGP SIGNATURE-----
diff --git a/media-sound/pianobar/files/pianobar-2012.12.01-json-c-0.11.patch b/media-sound/pianobar/files/pianobar-2012.12.01-json-c-0.11.patch
new file mode 100644
index 000000000000..a37f1c36f292
--- /dev/null
+++ b/media-sound/pianobar/files/pianobar-2012.12.01-json-c-0.11.patch
@@ -0,0 +1,31 @@
+From a807347f62238cf4635bc111726c547ebf531ca3 Mon Sep 17 00:00:00 2001
+From: Markos Chandras <hwoarang@gentoo.org>
+Date: Sun, 28 Apr 2013 13:01:45 +0100
+Subject: [PATCH] Makefile: Use new json-c pkgconfig file name
+
+json-c-0.11 renamed the pkgconfig file to json-c
+https://github.com/json-c/json-c/blob/master/ChangeLog
+
+Signed-off-by: Markos Chandras <hwoarang@gentoo.org>
+---
+ Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 3dda79e..60972b4 100644
+--- a/Makefile
++++ b/Makefile
+@@ -88,8 +88,8 @@ LIBGNUTLS_LDFLAGS=$(shell pkg-config --libs gnutls)
+ LIBGCRYPT_CFLAGS=
+ LIBGCRYPT_LDFLAGS=-lgcrypt
+ 
+-LIBJSONC_CFLAGS=$(shell pkg-config --cflags json)
+-LIBJSONC_LDFLAGS=$(shell pkg-config --libs json)
++LIBJSONC_CFLAGS=$(shell pkg-config --cflags json-c)
++LIBJSONC_LDFLAGS=$(shell pkg-config --libs json-c)
+ 
+ # build pianobar
+ ifeq (${DYNLINK},1)
+-- 
+1.8.1.5
+
diff --git a/media-sound/pianobar/pianobar-2012.12.01-r1.ebuild b/media-sound/pianobar/pianobar-2012.12.01-r1.ebuild
new file mode 100644
index 000000000000..6211f70f95dc
--- /dev/null
+++ b/media-sound/pianobar/pianobar-2012.12.01-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pianobar/pianobar-2012.12.01-r1.ebuild,v 1.1 2013/04/28 19:07:44 hwoarang Exp $
+
+EAPI="5"
+
+inherit toolchain-funcs flag-o-matic eutils multilib
+
+DESCRIPTION="A console-based replacement for Pandora's flash player"
+HOMEPAGE="http://6xq.net/projects/pianobar/"
+SRC_URI="http://6xq.net/static/projects/${PN}/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+aac mp3 static-libs"
+
+RDEPEND="media-libs/libao
+	net-libs/gnutls
+	dev-libs/libgcrypt
+	>=dev-libs/json-c-0.11
+	aac? ( media-libs/faad2 )
+	mp3? ( media-libs/libmad )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+REQUIRED_USE="|| ( aac mp3 )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2011.12.11-tests.patch
+	epatch "${FILESDIR}"/${P}-json-c-0.11.patch
+}
+
+src_compile() {
+	local myconf="DYNLINK=1"
+	! use aac && myconf+=" DISABLE_FAAD=1"
+	! use mp3 && myconf+=" DISABLE_MAD=1"
+
+	append-cflags -std=c99
+	tc-export CC
+	emake ${myconf}
+}
+
+src_test() {
+	cp src/libwaitress/waitress.c src/libwaitress/waitress-test.c
+	emake test
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX=/usr LIBDIR=/usr/$(get_libdir) DYNLINK=1 install
+	dodoc ChangeLog README
+
+	use static-libs || rm -f "${D}"/usr/lib*/*.a
+
+	docinto contrib
+	dodoc -r contrib/{config-example,*.sh,eventcmd-examples}
+	docompress -x /usr/share/doc/${PF}/contrib
+}
diff --git a/media-sound/pianobar/pianobar-2012.12.01.ebuild b/media-sound/pianobar/pianobar-2012.12.01.ebuild
index 40fe24e7ecaa..053923bfe8b2 100644
--- a/media-sound/pianobar/pianobar-2012.12.01.ebuild
+++ b/media-sound/pianobar/pianobar-2012.12.01.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pianobar/pianobar-2012.12.01.ebuild,v 1.1 2012/12/02 11:38:31 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pianobar/pianobar-2012.12.01.ebuild,v 1.2 2013/04/28 19:07:44 hwoarang Exp $
 
 EAPI="5"
 
@@ -18,7 +18,7 @@ IUSE="+aac mp3 static-libs"
 RDEPEND="media-libs/libao
 	net-libs/gnutls
 	dev-libs/libgcrypt
-	dev-libs/json-c
+	<dev-libs/json-c-0.11
 	aac? ( media-libs/faad2 )
 	mp3? ( media-libs/libmad )"
 DEPEND="${RDEPEND}