Version bump and update live ebuild.

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)

3 files changed, 73 insertions, 17 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/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}