Version bump.

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

4 files changed, 93 insertions, 4 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/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"