Version bump and update live ebuild.

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

4 files changed, 85 insertions, 35 deletions

diff --git a/media-sound/pianobar/ChangeLog b/media-sound/pianobar/ChangeLog
index 6cbaa06fc869..1a696407a5cd 100644
--- a/media-sound/pianobar/ChangeLog
+++ b/media-sound/pianobar/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/pianobar
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pianobar/ChangeLog,v 1.33 2014/03/01 22:16:51 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pianobar/ChangeLog,v 1.34 2014/06/22 13:07:34 radhermit Exp $
+
+*pianobar-2014.06.08 (22 Jun 2014)
+
+  22 Jun 2014; Tim Harder <radhermit@gentoo.org> +pianobar-2014.06.08.ebuild,
+  pianobar-9999.ebuild:
+  Version bump and update live ebuild.
 
   01 Mar 2014; Michał Górny <mgorny@gentoo.org> pianobar-2012.12.01-r1.ebuild,
   pianobar-2013.05.19.ebuild, pianobar-2013.09.15.ebuild, pianobar-9999.ebuild:
diff --git a/media-sound/pianobar/Manifest b/media-sound/pianobar/Manifest
index 1b7f57f398eb..2b95c71f1f65 100644
--- a/media-sound/pianobar/Manifest
+++ b/media-sound/pianobar/Manifest
@@ -7,28 +7,22 @@ AUX pianobar-2013.05.19-tests.patch 1002 SHA256 73366536c5900dc0334135e244013770
 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
+DIST pianobar-2014.06.08.tar.bz2 51215 SHA256 3348b4bdfa9959bc7aeb03ff6ff66e334f8efc78a84261558f18f5fbd543ed2b SHA512 6faeb395a40e4d6813d8a067521faedbc3265dd554f0023290c6a37ae5765b9a72a7442055fb53cda05166f6dff47d71b83a7ff128f6ac5d99a0a2378feb9faa WHIRLPOOL 9cbf0899e1fb7883daf446e294ed88893125b757f52fbeb3fae2b15ee05e4b05c2ecc1827450f9e727696bd9baa07899e3db7e03162dd60bfb2d91bd1c1d2567
 EBUILD pianobar-2012.12.01-r1.ebuild 1436 SHA256 63c1dc084cc16a767010aeff28ad764fe03d5d5153249aa99261eedc3183a827 SHA512 5eead39e14be1b045030102b462cec33c4a093fc89b1fd532aa7b80bfde0c60fdc3c2fd9b8d878bf5d5fd8fa9f8f8c0cee293e4d6980384f293a1f7b50a08d4d WHIRLPOOL 2c88f7fe79dd0411a8a0becc56caf8303848c94f16492db6510f584e5e4d0b89451eb754a2ab1433b336bd1935545dfee1757225122084a3069b562ced26b0a1
 EBUILD pianobar-2013.05.19.ebuild 1362 SHA256 27303424a1815c9028835c622479e6527b1bc798377f908ae726e27c40db3eee SHA512 8fa6a774340e2fb4af9ce95e2da390c1e38966f1987e4c32320315e1b3276f09c4cdc4f15503bc1dac1433c35fd99cb57b6cb16f4f9f9a6082c295cc33c89b09 WHIRLPOOL f36e3ad71af919f7a732834f5c48b14481733976a53e3eefbd67af3ffb4cb452acddb75abb9f7cf64526c3fba741e245bf2efb1e325204820d4c2d0ab120f483
 EBUILD pianobar-2013.09.15.ebuild 1293 SHA256 2ff3e8a63ea8b3928921876c00aff5add65536c5a2b85e9fa8b27a9756c3100a SHA512 c0892da3eee9d3b8e5df23df39a43018c3890e47019315436065d10dbf12dcb123ae42e0439070c5f8a8947708dddd1f92a4916549153be4b4b20aaaf733702e WHIRLPOOL a235e49ee54be89240185512d68d043619dfdb41430683482c43b52c50084cdbf883f2cc1e813cd774e27cbbd8183cc315d454d6c2baf3ae8c20fdb605abc078
-EBUILD pianobar-9999.ebuild 1275 SHA256 3c4174313f60c4fcdc7f777e0cdbd72929e5090d5f68ba28c93d8b77c81b2d4f SHA512 aee6aa3083b24181fdae6125de50e6d4401eb7b57425d956da906462358be3dbd0e8b86c1329124ad7740f04efdf4157bf3b163096d758d62927f72e158ed889 WHIRLPOOL f70698d6d0d72be628c8df96a31daf2a32947f646150f3b82e1e66fd0c67a36dd0a1450a4d6fe7c85c6c069d37a513d194c7fd59112c8046903cdc8ed973fac6
-MISC ChangeLog 5387 SHA256 e9f9ff92af40f92b1c482d1ab4dfb1ac24837906da04584674cb5b8c445d5aa0 SHA512 6fe59c26c0ad0d8340bea30b59dcf59462f55ca9a0d5ef26cc98d54c894489146c4607ee48608cd09683b80e8068815b79e2a7abdfcac0fc6707aa3b789eef86 WHIRLPOOL edf7066dad1a2de330c08551eaa0217522be2aa42ba33f37421ee8dc77c3fbaaf9899a37690c6ea4228a4c3c2231532f83ba25cc42385e18c2b023f996224041
+EBUILD pianobar-2014.06.08.ebuild 1237 SHA256 c6fcfdad70672c0f0deb01e9956702ba7ffe4afc246d409d52c95c1c6450e45b SHA512 86fd522c1c1d098f2844dc21e9b552380c4358d64806236b0a563c0e12f2d3c7e81a85b42916f2e2d9024eb139e74f1e2c46843ee4d7f332bbf0fb86a6b6a33d WHIRLPOOL ab7d6b8622f74d8d4e24838ffba819740e0346f33aafa35182caac26374f6dab68a0c6ea2b1d94076362ec7ef45991aa5a36b862c7d9b8e12b68b0b661e8653b
+EBUILD pianobar-9999.ebuild 1231 SHA256 a8d8b09e72039d677fda3bd468b3004e83d28136822846ae1b5223348c154b43 SHA512 598c3c5e023fa9453c792699395313dbf6d43caa13559a5d945c313dd4b0446a0358b08c44ea3337565218fa38840206b340eda71aedd59fc1a9edd241e75493 WHIRLPOOL d5c075f338be48fdd45a66cd8ce0341f89dfa5899980083b09556e06d5eadc4a66d7f3774876f315aa509774099c50a9b301005a57b4e25cc5b85eed89742df0
+MISC ChangeLog 5568 SHA256 98cffcfdee74f2d52c88f08536b5ec295b62b7176defe4d9cb49cd83e23e650a SHA512 302fbe89706274a6077e0a604513e97a4e4bfb2c01c40e3b9e71a1d03e888dc805247180e4ce357cfb0f37b8c13f0e52ca0f89db950d80f727c69d6e21518e9b WHIRLPOOL d285198dbd669e5d6f5977fb76a0c7827cdc2f87d3fed5c53117a2fd43b1496c872fa3f790ae5f83d7f6cca68c5d5025023930aaff45984aefeaa8010be67d50
 MISC metadata.xml 232 SHA256 a778e40f66cb2fa35529e4f45cb8356c8b1b109163cd939396f02e8ea6aa5f1a SHA512 6952f63da1c92a4ed7ddb87b5eb4003d123f0b7af6ffdbc9118159c97ddf18917e8ac7727285a42c07c64e52a40335bc2ef9f17261557617beb8c2226a391873 WHIRLPOOL 0a4441f075f8af01588da2aac3e03732f93463b8bea5e46749d37e1468452735d15f45243b930b3346c93734f8aa235a492030445fee471a95d2c5998f08e7de
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQJ8BAEBCABmBQJTElxYXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOuawP/AwHAy/WInq2qmKzZ6ORSW76
-gt0eLLJH6M2VRyVn/1+wjiQKABCXEwNg/mRczeQ6fChHGi+PK9LqMkNH+kje3C08
-cDlCpkwqOg2fTUqDtdw5mW5eCEIIe2Nm0KEwpkzx9o46k6MgC6BDRWop2MBxCbYG
-kVgbu449b8KZcSw+lPLdNtJ9WP2Os3DEEgYWMdI2AKjIXBm5BcE8hnvKvnQ+lLee
-KKD1tJiLGuXO1PEzgeQLcJ+1ZSYk+UU2wnyZ75nL38aY8wxEm4ZwmhfMgrofwlw+
-JVAqrSx+4hSbDCi974c6s9ubC+QikE0TUSuvhPYJnKPtALSU/xDs3HzsHX45OjfL
-sl16+8SPezijJ0/+lkqwvYDhJfWD3Pf/F/86baAU5G5gCgVoUwxQy3sbjYTXvBhJ
-S/EH1js/qF+oqZUbjmfmh3AgttV6Tu8aLcUvFkGB9Ri20kdbkY8F/rCqzCyp2G0A
-t02m8yjCDYP9q64kag6K9TBGB5poAD+42rn4qAGajoxrvV+7PVrwOx1VFTH6C/+j
-DJP/CCU+IugZKtJvL97RwSMmR/MiU/VmHNFmxBH1C4TPl8NH7F9PDEVXYeTeD74d
-j0USkHXxmHijCKPDQ0MFGlM67SqzTu5FIah2CBRPPV//WLgtJhRnxqyCmyPmCaF2
-9DCeDdpJIaP4dUunlH0b
-=5k7M
+iQEcBAEBCAAGBQJTptUXAAoJEEqz6FtPBkyjp/gH/R4MmBCl5JE4wIXXM1wmXhPH
++35JSiOwcNzY691L6IUmjHhPtqkOIHPj/Pz3VM13X41KsnFqztff84Z6duXLfvug
+hzhea4ganpgwzCtGMkR6fmoWDXmmbrj4IzlVWkTrM9Vx3jBVqTw1IqdYYBI34PIe
+BFzD2EIrtGNIdo61p+zrUdiHYw70fb3jvynESg+XM1xj6qv4I6YqsqoXqhpOcNgR
+uwx5zGkq75iaIVH7SgnMXhvsJwx490lyZTvEiqfUFaZwjxKviyhD+LDqUNLdbRRz
+sqO286ikNMBES2avliGIKGb7tHlqj4fjvDFC1zD9/YyqHlQfBUV8ss5cu8fQ1dQ=
+=b4/b
 -----END PGP SIGNATURE-----
diff --git a/media-sound/pianobar/pianobar-2014.06.08.ebuild b/media-sound/pianobar/pianobar-2014.06.08.ebuild
new file mode 100644
index 000000000000..705814ae18e3
--- /dev/null
+++ b/media-sound/pianobar/pianobar-2014.06.08.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pianobar/pianobar-2014.06.08.ebuild,v 1.1 2014/06/22 13:07:34 radhermit Exp $
+
+EAPI="5"
+inherit toolchain-funcs flag-o-matic multilib
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://github.com/PromyLOPh/pianobar.git"
+else
+	SRC_URI="http://6xq.net/projects/${PN}/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="A console-based replacement for Pandora's flash player"
+HOMEPAGE="http://6xq.net/projects/pianobar/"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="static-libs"
+
+RDEPEND="media-libs/libao
+	net-libs/gnutls
+	dev-libs/libgcrypt:0=
+	dev-libs/json-c
+	>=virtual/ffmpeg-9"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	sed -e '/@echo /d' \
+		-e 's/@${CC}/${CC}/' \
+		-i Makefile || die
+}
+
+src_compile() {
+	append-cflags -std=c99
+	tc-export CC
+	emake DYNLINK=1
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX=/usr LIBDIR=/usr/$(get_libdir) DYNLINK=1 install
+	dodoc ChangeLog README
+
+	use static-libs || { rm "${D}"/usr/lib*/*.a || die; }
+
+	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 bc15ced17215..7f35b011ca8d 100644
--- a/media-sound/pianobar/pianobar-9999.ebuild
+++ b/media-sound/pianobar/pianobar-9999.ebuild
@@ -1,31 +1,33 @@
 # Copyright 1999-2014 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.7 2014/03/01 22:16:51 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pianobar/pianobar-9999.ebuild,v 1.8 2014/06/22 13:07:34 radhermit Exp $
 
 EAPI="5"
+inherit toolchain-funcs flag-o-matic multilib
 
-inherit toolchain-funcs flag-o-matic multilib git-r3
-
-EGIT_REPO_URI="git://github.com/PromyLOPh/pianobar.git"
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://github.com/PromyLOPh/pianobar.git"
+else
+	SRC_URI="http://6xq.net/projects/${PN}/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+fi
 
 DESCRIPTION="A console-based replacement for Pandora's flash player"
 HOMEPAGE="http://6xq.net/projects/pianobar/"
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="+aac mp3 static-libs"
+IUSE="static-libs"
 
 RDEPEND="media-libs/libao
 	net-libs/gnutls
-	dev-libs/libgcrypt:0
+	dev-libs/libgcrypt:0=
 	dev-libs/json-c
-	aac? ( media-libs/faad2 )
-	mp3? ( media-libs/libmad )"
+	>=virtual/ffmpeg-9"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
-REQUIRED_USE="|| ( aac mp3 )"
-
 src_prepare() {
 	sed -e '/@echo /d' \
 		-e 's/@${CC}/${CC}/' \
@@ -33,20 +35,16 @@ src_prepare() {
 }
 
 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}
+	emake DYNLINK=1
 }
 
 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
+	use static-libs || { rm "${D}"/usr/lib*/*.a || die; }
 
 	docinto contrib
 	dodoc -r contrib/{config-example,*.sh,eventcmd-examples}