Version bump.

Package-Manager: portage-2.2.0_alpha177/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

5 files changed, 106 insertions, 14 deletions

diff --git a/media-sound/pianobar/ChangeLog b/media-sound/pianobar/ChangeLog
index 15aa6c4388c1..b947ec5cbc95 100644
--- a/media-sound/pianobar/ChangeLog
+++ b/media-sound/pianobar/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/pianobar
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pianobar/ChangeLog,v 1.30 2013/04/28 19:58:34 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pianobar/ChangeLog,v 1.31 2013/05/25 20:53:13 radhermit Exp $
+
+*pianobar-2013.05.19 (25 May 2013)
+
+  25 May 2013; Tim Harder <radhermit@gentoo.org> +pianobar-2013.05.19.ebuild,
+  +files/pianobar-2013.05.19-tests.patch, pianobar-9999.ebuild:
+  Version bump.
 
   28 Apr 2013; Tim Harder <radhermit@gentoo.org> -pianobar-2012.12.01.ebuild:
   Remove old.
diff --git a/media-sound/pianobar/Manifest b/media-sound/pianobar/Manifest
index 6c388966186c..d6c30d6d19f7 100644
--- a/media-sound/pianobar/Manifest
+++ b/media-sound/pianobar/Manifest
@@ -3,19 +3,22 @@ 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
+AUX pianobar-2013.05.19-tests.patch 1002 SHA256 73366536c5900dc0334135e2440137700144cd6f79fac5eb7be46bb806f44184 SHA512 1a36589912032e4f0eefbbd797f08c034490ecf121c8af08089dd2f6d054e05d8d8c82fcd14ca34fb394b85026a846c78518a23cc3b70ddb2e7d1ddd3f658fc0 WHIRLPOOL b508a2e7ff9e27c3d5e375df3f5522fa89fe877aebdd8c71c4c69623595b3b5b5e62350b86283fe81b864e0e175b95ed825f59c5ab2247a8c55014d87992f482
 DIST pianobar-2012.12.01.tar.bz2 50383 SHA256 a3909f796e7cef21b19d98282f332ecbcf9b2c60a2af22a0a2ce01e9c4d9f515 SHA512 4d0996009f1fe8d4493f892593b545e3a6ab460aea5629ae80d4ba2c6dd43431be35cf16ead71e0b2b4ef4b5ba3bd4bf76d4f3b53e6ec97aa3cc1d5f3429d2d8 WHIRLPOOL b1fc67d56cd8dd4701198ac2491077d3e53afc56bfa316c791a5e14b74d162c1961fd8852cbaa1b383e1cee0332334ce8f33906083e728f995c05d50cfb21294
+DIST pianobar-2013.05.19.tar.bz2 50942 SHA256 cf88e82663d2b0aa4d73e761506eac4f3e7bc789b57d92377acd994d785e1046 SHA512 4dc9ab26a2f936a479703d7c7551d71a77043b144683db65356e03e9ae1cdd5150e59cc4d3d076031d4a9e9163ccd567feac1dcb07dc16ea2b0d32131afd12b7 WHIRLPOOL 6ebd3d0bb399ff81ccf0ba51c83449960efe582191c14e2c84013394b63b8b965c7b6b2463d34c8578aaaec9dc4d9b8c714b474013a79ee6bfe878a89312a817
 EBUILD pianobar-2012.12.01-r1.ebuild 1436 SHA256 6e6da69e93a8491f8e80ec18e20d8f07c38897f0dc8ce39a4d38c143d857e5f2 SHA512 b67e84247742d6baed4f1adce780addf35ead35402b37315fbcb289fe721fbe6ea6b8dc6b020504f33b7961f366d32f99dcb463504531d9c150b65d1e7e20950 WHIRLPOOL c21653336f45db1e35e995bba48f61365aec963ff4b29d5f2ac6df1e5202ad49f99d92755ce7ac90afd7c9618e77e795a0625b1873943f527acf2333a239be6f
-EBUILD pianobar-9999.ebuild 1309 SHA256 91bbf163afb14fa086d3f3ef31843769203a1a03bb0a93d143d8d56bb09f0df5 SHA512 39a10ee1de850bd4ba71961358ecdcb6c4faf41f38c31b3ea9ae05b26ffb74e240b8bdb1ea2bdc8585ea4ed90025dc397cf91e541d277de2f189388c8043c8a8 WHIRLPOOL 6efed10d804da9a865545e6d6b266520abef4dcb4640122d970c411d38b4a95b9b4c8f0c607cbd657cd016e5370e824cd5694324e8ca6b900de468d9573ff0eb
-MISC ChangeLog 4764 SHA256 dfff27cc403a18cdea1476641d275f071d5390a755fb34560a751502ba7fb98f SHA512 801ced131bdc5c134e754e3cd6b22f154d92a0fc3bf83a11fc5521912793095804d8c81b231fc0267e80de3677d3a343d8803ae453527996ce11591067ce6a94 WHIRLPOOL c978844bf8603459ccf4707d3c5517a8b2068c36fb4c0f190aef7f866a6fc7caae4a788dcc41de6d7989bb0e58f841070f9088757beaa49553fbe080531dccd5
+EBUILD pianobar-2013.05.19.ebuild 1363 SHA256 0122c4ac34967f2736f53d7acf05f887114d77e816db80e1f44158ba522081f0 SHA512 e027ea9bef1b4b19011a45535cd25232f00a07ca338021d37fd08be7cd48eab2b4d6f6bf6cab9a9d8dd026f0f90bb0d1d20680021ac8200b9f71a9cf0d5f1445 WHIRLPOOL ca9e8e611b7f8d86099ccaf431c22400d81a53a3efb270557b154e4f580bd83a164ca6de4bd9693d0ffb43c6fb8e48395d5a7b953b79e4e0d5f16b33e8cc843a
+EBUILD pianobar-9999.ebuild 1298 SHA256 db974d4d552cf8eedaf2002c29b02e096cbd38940eb177d3225e301105e21297 SHA512 0e545ddb9897ad2243f8536b353d919c199e2d05a61b1734bcf79ca468cc6dbc804fa651468aaba60dba0dd58e210c8efba73b7841e38d0b2104ef0cbe27f284 WHIRLPOOL 192f7a72052c7ce167903506fbe280ca8cb5b639123ea343e7331d2accd57515f846e4818acba2348464e35b53eaf50d02422fcd3adb6f4694d23d5e1d558dc9
+MISC ChangeLog 4959 SHA256 578253c66888265d72efa83ea1a99f7f3458f1f35f069480489087338af05e5b SHA512 09e1427812b2fcfa7567c370963b98ec30d88f298083ceec0fa7496ab485ab44f5803d3f3857e8538d4219a4b16ed6ce57bdd17d8c26ebb7b16aa6912e7abf99 WHIRLPOOL db1430dab9f69ed44a17320c01dc884c5c6dbe0ac76749f2bcd923d5aea4a2425c4fb9358f15e73a18a27456539161a10cbfff45be2df94706b3584f51eade66
 MISC metadata.xml 232 SHA256 a778e40f66cb2fa35529e4f45cb8356c8b1b109163cd939396f02e8ea6aa5f1a SHA512 6952f63da1c92a4ed7ddb87b5eb4003d123f0b7af6ffdbc9118159c97ddf18917e8ac7727285a42c07c64e52a40335bc2ef9f17261557617beb8c2226a391873 WHIRLPOOL 0a4441f075f8af01588da2aac3e03732f93463b8bea5e46749d37e1468452735d15f45243b930b3346c93734f8aa235a492030445fee471a95d2c5998f08e7de
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRfX9vAAoJEEqz6FtPBkyjU4gIAKhiKhBdV+HTrkuIfB+VAszY
-M/jVT936p6a6eatrPBtzg4PU5iPxip8goqJ5fE+SbfCF/vHKmXpg2Q5JfoWmPsfJ
-bCBEuo5RuaRIzvwBz/zfkhbGcokTBJjIbqGoz+OI9PRecAVBugZlfVT7jK3WqHwh
-Oa/gpzCdy7hQx/8CzIcj7R2GpBh44ngDL1au6rMppOuLAS663bXDRMxzgudNyyWM
-tgRZvMAwDDRE+AAbGqam7zxwIe1DydL73IeRVBjPhKL1a/jCKrSGmkYRDMo9NRqx
-xKnDdc/4NeOR2yt8q430QZnMv3gMgGdsDZKEnzbpn5ClOZDTTmOY3S7byFdP8wA=
-=NVB6
+iQEcBAEBCAAGBQJRoSS9AAoJEEqz6FtPBkyjOrgIAIeIBs8WBJUv8175ym7UrIrz
+rKwNbeIr7WBLh0AZ4Hd1FQsMRznRvNXgspWfDlYiFego7DMAgzpE1UL2nFFe5KjL
+V97Wpy70/NErDtGWwSuj00WMQiCkWG9E4bUBB0FzcoF9c6XxvHOgTI4iG/ELCqrD
+05ogfqRsgZ1o3djwdIz1C1lVSXjA76X53DFUmVgkZFVFJNORi9Oh9Sw9FPRJu1tN
+2Qh0gC8m7g6PDdO8zrGZB7OaE2BK/2ABPejItZuD+BSKd/CLfIsO2LRZ0m4Jci2x
+8YrGD7wmWsTnFRnpPtubToB8+xuwr732LRZa9k2G3newx8Srx7YeDTCBe6tcnTY=
+=M0i5
 -----END PGP SIGNATURE-----
diff --git a/media-sound/pianobar/files/pianobar-2013.05.19-tests.patch b/media-sound/pianobar/files/pianobar-2013.05.19-tests.patch
new file mode 100644
index 000000000000..a76b998448f3
--- /dev/null
+++ b/media-sound/pianobar/files/pianobar-2013.05.19-tests.patch
@@ -0,0 +1,27 @@
+diff -ur pianobar-2013.05.19.orig/Makefile pianobar-2013.05.19/Makefile
+--- pianobar-2013.05.19.orig/Makefile	2013-05-19 03:58:18.000000000 -0700
++++ pianobar-2013.05.19/Makefile	2013-05-25 13:45:21.555965614 -0700
+@@ -58,10 +58,12 @@
+ 
+ LIBWAITRESS_DIR:=src/libwaitress
+ LIBWAITRESS_SRC:=${LIBWAITRESS_DIR}/waitress.c
++LIBWAITRESS_TSRC:=${LIBWAITRESS_DIR}/waitress-test.c
+ LIBWAITRESS_HDR:=\
+ 		${LIBWAITRESS_DIR}/config.h \
+ 		${LIBWAITRESS_DIR}/waitress.h
+ LIBWAITRESS_OBJ:=${LIBWAITRESS_SRC:.c=.o}
++LIBWAITRESS_TOBJ:=${LIBWAITRESS_TSRC:.c=.o}
+ LIBWAITRESS_RELOBJ:=${LIBWAITRESS_SRC:.c=.lo}
+ LIBWAITRESS_INCLUDE:=${LIBWAITRESS_DIR}
+ 
+@@ -187,8 +189,8 @@
+ # -Woverlength-strings: over-portability-ish
+ 
+ waitress-test: CFLAGS+= -DTEST
+-waitress-test: ${LIBWAITRESS_OBJ}
+-	${CC} ${LDFLAGS} ${LIBWAITRESS_OBJ} ${LIBGNUTLS_LDFLAGS} -o waitress-test
++waitress-test: ${LIBWAITRESS_TOBJ}
++	${CC} ${LDFLAGS} ${LIBWAITRESS_TOBJ} ${LIBGNUTLS_LDFLAGS} -o waitress-test
+ 
+ test: waitress-test
+ 	./waitress-test
diff --git a/media-sound/pianobar/pianobar-2013.05.19.ebuild b/media-sound/pianobar/pianobar-2013.05.19.ebuild
new file mode 100644
index 000000000000..7ace32f819f8
--- /dev/null
+++ b/media-sound/pianobar/pianobar-2013.05.19.ebuild
@@ -0,0 +1,57 @@
+# 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-2013.05.19.ebuild,v 1.1 2013/05/25 20:53:13 radhermit 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/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
+	aac? ( media-libs/faad2 )
+	mp3? ( media-libs/libmad )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+REQUIRED_USE="|| ( aac mp3 )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-tests.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-9999.ebuild b/media-sound/pianobar/pianobar-9999.ebuild
index 920c25191885..1841a43aae29 100644
--- a/media-sound/pianobar/pianobar-9999.ebuild
+++ b/media-sound/pianobar/pianobar-9999.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-9999.ebuild,v 1.4 2012/12/02 11:39:56 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pianobar/pianobar-9999.ebuild,v 1.5 2013/05/25 20:53:13 radhermit Exp $
 
 EAPI="5"
 
@@ -10,7 +10,6 @@ EGIT_REPO_URI="git://github.com/PromyLOPh/pianobar.git"
 
 DESCRIPTION="A console-based replacement for Pandora's flash player"
 HOMEPAGE="http://6xq.net/projects/pianobar/"
-SRC_URI=""
 
 LICENSE="MIT"
 SLOT="0"