Version bump.

(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)

3 files changed, 86 insertions, 2 deletions

diff --git a/media-sound/pianobar/ChangeLog b/media-sound/pianobar/ChangeLog
index 619740607813..dccc4d48da3b 100644
--- a/media-sound/pianobar/ChangeLog
+++ b/media-sound/pianobar/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/pianobar
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pianobar/ChangeLog,v 1.11 2011/11/12 07:28:39 radhermit Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pianobar/ChangeLog,v 1.12 2012/01/09 08:24:20 radhermit Exp $
+
+*pianobar-2011.12.11 (09 Jan 2012)
+
+  09 Jan 2012; Tim Harder <radhermit@gentoo.org> +pianobar-2011.12.11.ebuild,
+  +files/pianobar-2011.12.11-tests.patch:
+  Version bump.
 
 *pianobar-2011.11.11 (12 Nov 2011)
 
diff --git a/media-sound/pianobar/files/pianobar-2011.12.11-tests.patch b/media-sound/pianobar/files/pianobar-2011.12.11-tests.patch
new file mode 100644
index 000000000000..df4c667bd0ac
--- /dev/null
+++ b/media-sound/pianobar/files/pianobar-2011.12.11-tests.patch
@@ -0,0 +1,26 @@
+--- pianobar-2011.12.11/Makefile.orig
++++ pianobar-2011.12.11/Makefile
+@@ -55,10 +55,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}
+ 
+@@ -133,8 +135,8 @@
+ debug: CFLAGS=-Wall -pedantic -ggdb
+ 
+ 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-2011.12.11.ebuild b/media-sound/pianobar/pianobar-2011.12.11.ebuild
new file mode 100644
index 000000000000..ae727a223227
--- /dev/null
+++ b/media-sound/pianobar/pianobar-2011.12.11.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pianobar/pianobar-2011.12.11.ebuild,v 1.1 2012/01/09 08:24:20 radhermit Exp $
+
+EAPI="4"
+
+inherit toolchain-funcs flag-o-matic eutils
+
+DESCRIPTION="A console-based replacement for Pandora's flash player"
+HOMEPAGE="http://6xq.net/projects/pianobar/"
+SRC_URI="http://6xq.net/static/projects/${PN}/${P}.tar.bz2"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="aac +mp3"
+
+DEPEND="media-libs/libao
+	net-libs/gnutls
+	aac? ( media-libs/faad2 )
+	mp3? ( media-libs/libmad )"
+RDEPEND="${DEPEND}"
+
+REQUIRED_USE="|| ( mp3 aac )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-tests.patch
+}
+
+src_compile() {
+	local myconf
+	! 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 install
+	dodoc ChangeLog README
+
+	docinto contrib
+	dodoc -r contrib/{config-example,*.sh,eventcmd-examples}
+	docompress -x /usr/share/doc/${PF}/contrib
+}