Version bump, use verbose build, and update live ebuild to git-r3 and run tests for it.

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

4 files changed, 80 insertions, 15 deletions

diff --git a/media-sound/pianobar/ChangeLog b/media-sound/pianobar/ChangeLog
index b947ec5cbc95..6bf4ff76af4c 100644
--- a/media-sound/pianobar/ChangeLog
+++ b/media-sound/pianobar/ChangeLog
@@ -1,6 +1,13 @@
 # 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.31 2013/05/25 20:53:13 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pianobar/ChangeLog,v 1.32 2013/09/20 20:31:59 radhermit Exp $
+
+*pianobar-2013.09.15 (20 Sep 2013)
+
+  20 Sep 2013; Tim Harder <radhermit@gentoo.org> +pianobar-2013.09.15.ebuild,
+  pianobar-9999.ebuild:
+  Version bump, use verbose build, and update live ebuild to git-r3 and run
+  tests for it.
 
 *pianobar-2013.05.19 (25 May 2013)
 
diff --git a/media-sound/pianobar/Manifest b/media-sound/pianobar/Manifest
index d6c30d6d19f7..39d13b28fcc9 100644
--- a/media-sound/pianobar/Manifest
+++ b/media-sound/pianobar/Manifest
@@ -6,19 +6,21 @@ AUX pianobar-2012.12.01-json-c-0.11.patch 919 SHA256 a907bd6da72343c1c79b64aa2d8
 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
+DIST pianobar-2013.09.15.tar.bz2 52553 SHA256 3f8cf25ef054acf46e519d02453a6e214cfa09661b3adc03da99ace1c6f10066 SHA512 f158ae0f75326d97157f987128bba615aaa30c313270b4474bf70e00da198ea53d3a5ac70bfe890ce75cf5f0a42cedc948ee57e9d46806a9da3e830bbe5d7754 WHIRLPOOL 0fee59b3f1eb819fffbd30c61a5faf4a85ede44f3852115539cb0408c2b16739d190c5efde1fead422f23153ab04b2f57a9ebdf229736a5a7147a0f36977f820
 EBUILD pianobar-2012.12.01-r1.ebuild 1436 SHA256 6e6da69e93a8491f8e80ec18e20d8f07c38897f0dc8ce39a4d38c143d857e5f2 SHA512 b67e84247742d6baed4f1adce780addf35ead35402b37315fbcb289fe721fbe6ea6b8dc6b020504f33b7961f366d32f99dcb463504531d9c150b65d1e7e20950 WHIRLPOOL c21653336f45db1e35e995bba48f61365aec963ff4b29d5f2ac6df1e5202ad49f99d92755ce7ac90afd7c9618e77e795a0625b1873943f527acf2333a239be6f
 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
+EBUILD pianobar-2013.09.15.ebuild 1294 SHA256 24302a2b12b5013450aac09efffb87e7e1f781a491fb3e939dd92574141811b7 SHA512 9620bb39d712aed507dadcef98d403105e0fa1ff3ef861840d8e561f32e73c6bc3b6a8fbb7e24f46d6c890659e57f345e38b1883686dd87abb0b123b7f680ff6 WHIRLPOOL ef8c7c9157c8d836c0c1e5de172203294fe236bdb1036316bf84dedb82851ea3cc1e4d6cd8a1342f6b1af1dd8d7be08e3d99c0e78b607d9da1dd1f53acd17c5b
+EBUILD pianobar-9999.ebuild 1276 SHA256 adee0dceacd3771996cda1741b6f38209533f66d1fa2a1f5e276ae41248ec521 SHA512 edd377d21ed155d6eb4654fd522132652228cbdbae1bf095ceba3a6cba8c017b56751c1a60447cf649dfa0a593503d0cf88e2f4188a45d37702088be496289fa WHIRLPOOL 81aff5aa6324dfd7bfbbaf66f605bac860666ed4b203b7e664012ca2a4c235998ded73c0ed3a22de131b9abf2457361851e62c211b748da3334ae6314376a405
+MISC ChangeLog 5190 SHA256 2aafa609e4411be29117916f90fe6de0b7fcfc339bc798c19f27fcc59c89208e SHA512 a58b9ed9c9685d6937e40f1be18c03bdc6b59e5a053e0a3cbf52c2df424e41f43edcc7ac5dbea51dc4df9d7cc894eb17835f3ab0a0b9817213034cfd9f6aceb6 WHIRLPOOL cc37a94a715ebdcc4d9bd0903998cd3e6f4a6d03c490d4dc81b957b1daf44b890a3112cab4f7770a08ed829669ca518f43c95d80fcba2ce6c4a98a5dc08857e7
 MISC metadata.xml 232 SHA256 a778e40f66cb2fa35529e4f45cb8356c8b1b109163cd939396f02e8ea6aa5f1a SHA512 6952f63da1c92a4ed7ddb87b5eb4003d123f0b7af6ffdbc9118159c97ddf18917e8ac7727285a42c07c64e52a40335bc2ef9f17261557617beb8c2226a391873 WHIRLPOOL 0a4441f075f8af01588da2aac3e03732f93463b8bea5e46749d37e1468452735d15f45243b930b3346c93734f8aa235a492030445fee471a95d2c5998f08e7de
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRoSS9AAoJEEqz6FtPBkyjOrgIAIeIBs8WBJUv8175ym7UrIrz
-rKwNbeIr7WBLh0AZ4Hd1FQsMRznRvNXgspWfDlYiFego7DMAgzpE1UL2nFFe5KjL
-V97Wpy70/NErDtGWwSuj00WMQiCkWG9E4bUBB0FzcoF9c6XxvHOgTI4iG/ELCqrD
-05ogfqRsgZ1o3djwdIz1C1lVSXjA76X53DFUmVgkZFVFJNORi9Oh9Sw9FPRJu1tN
-2Qh0gC8m7g6PDdO8zrGZB7OaE2BK/2ABPejItZuD+BSKd/CLfIsO2LRZ0m4Jci2x
-8YrGD7wmWsTnFRnpPtubToB8+xuwr732LRZa9k2G3newx8Srx7YeDTCBe6tcnTY=
-=M0i5
+iQEcBAEBCAAGBQJSPLDBAAoJEEqz6FtPBkyjtrAH/iBnyQEtlcvz+9ijb4RCYDbQ
+VbRFQ9LUd/x56OqUCaE0tLsHr+x3da8BT8/6EoHjx4cpPgwQ9ieVE6y7IsVOXuKc
+4ZbjRznLj0UtPYdZwScyM+fvVxNV2RFBog4h1uy3PFJlX+Zb2yYJF9wpCFBnEZbZ
+jNlQlDyUyUogbUoVZDHySOwPaCzgCmPvIcCnWSlG0jlm38QDHHBYp5OxDhwLVdYC
+NCABDCiXvqKvBG9IulFiR5J4TTCESfbTikqMEvEQsKq7Yo49JVqYB4GbsIr/+wmZ
+TFK7JkFWPXmRcgUvqovg8V0pMpYNmVqTr+1y0XIMv3XqpxmIQmQzloSS7iaFrKc=
+=W64v
 -----END PGP SIGNATURE-----
diff --git a/media-sound/pianobar/pianobar-2013.09.15.ebuild b/media-sound/pianobar/pianobar-2013.09.15.ebuild
new file mode 100644
index 000000000000..22ff66069e15
--- /dev/null
+++ b/media-sound/pianobar/pianobar-2013.09.15.ebuild
@@ -0,0 +1,54 @@
+# 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.09.15.ebuild,v 1.1 2013/09/20 20:31:59 radhermit Exp $
+
+EAPI="5"
+
+inherit toolchain-funcs flag-o-matic 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() {
+	sed -e '/@echo /d' \
+		-e 's/@${CC}/${CC}/' \
+		-i Makefile || die
+}
+
+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_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 1841a43aae29..a524c4f61bce 100644
--- a/media-sound/pianobar/pianobar-9999.ebuild
+++ b/media-sound/pianobar/pianobar-9999.ebuild
@@ -1,10 +1,10 @@
 # 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.5 2013/05/25 20:53:13 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pianobar/pianobar-9999.ebuild,v 1.6 2013/09/20 20:31:59 radhermit Exp $
 
 EAPI="5"
 
-inherit toolchain-funcs flag-o-matic eutils multilib git-2
+inherit toolchain-funcs flag-o-matic multilib git-r3
 
 EGIT_REPO_URI="git://github.com/PromyLOPh/pianobar.git"
 
@@ -13,7 +13,6 @@ HOMEPAGE="http://6xq.net/projects/pianobar/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS=""
 IUSE="+aac mp3 static-libs"
 
 RDEPEND="media-libs/libao
@@ -27,8 +26,11 @@ DEPEND="${RDEPEND}
 
 REQUIRED_USE="|| ( aac mp3 )"
 
-# Only releases are tested since patches required for testing often break
-RESTRICT="test"
+src_prepare() {
+	sed -e '/@echo /d' \
+		-e 's/@${CC}/${CC}/' \
+		-i Makefile || die
+}
 
 src_compile() {
 	local myconf="DYNLINK=1"