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

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

3 files changed, 69 insertions, 6 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/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"