Remove old.

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

6 files changed, 8 insertions, 200 deletions

diff --git a/media-sound/pianobar/ChangeLog b/media-sound/pianobar/ChangeLog
index 1a696407a5cd..15e432ebcacf 100644
--- a/media-sound/pianobar/ChangeLog
+++ b/media-sound/pianobar/ChangeLog
@@ -1,6 +1,13 @@
 # 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.34 2014/06/22 13:07:34 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pianobar/ChangeLog,v 1.35 2014/06/22 13:08:28 radhermit Exp $
+
+  22 Jun 2014; Tim Harder <radhermit@gentoo.org>
+  -pianobar-2012.12.01-r1.ebuild, -pianobar-2013.05.19.ebuild,
+  -files/pianobar-2011.12.11-tests.patch,
+  -files/pianobar-2012.12.01-json-c-0.11.patch,
+  -files/pianobar-2013.05.19-tests.patch:
+  Remove old.
 
 *pianobar-2014.06.08 (22 Jun 2014)
 
diff --git a/media-sound/pianobar/files/pianobar-2011.12.11-tests.patch b/media-sound/pianobar/files/pianobar-2011.12.11-tests.patch
deleted file mode 100644
index df4c667bd0ac..000000000000
--- a/media-sound/pianobar/files/pianobar-2011.12.11-tests.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- 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/files/pianobar-2012.12.01-json-c-0.11.patch b/media-sound/pianobar/files/pianobar-2012.12.01-json-c-0.11.patch
deleted file mode 100644
index a37f1c36f292..000000000000
--- a/media-sound/pianobar/files/pianobar-2012.12.01-json-c-0.11.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From a807347f62238cf4635bc111726c547ebf531ca3 Mon Sep 17 00:00:00 2001
-From: Markos Chandras <hwoarang@gentoo.org>
-Date: Sun, 28 Apr 2013 13:01:45 +0100
-Subject: [PATCH] Makefile: Use new json-c pkgconfig file name
-
-json-c-0.11 renamed the pkgconfig file to json-c
-https://github.com/json-c/json-c/blob/master/ChangeLog
-
-Signed-off-by: Markos Chandras <hwoarang@gentoo.org>
----
- Makefile | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 3dda79e..60972b4 100644
---- a/Makefile
-+++ b/Makefile
-@@ -88,8 +88,8 @@ LIBGNUTLS_LDFLAGS=$(shell pkg-config --libs gnutls)
- LIBGCRYPT_CFLAGS=
- LIBGCRYPT_LDFLAGS=-lgcrypt
- 
--LIBJSONC_CFLAGS=$(shell pkg-config --cflags json)
--LIBJSONC_LDFLAGS=$(shell pkg-config --libs json)
-+LIBJSONC_CFLAGS=$(shell pkg-config --cflags json-c)
-+LIBJSONC_LDFLAGS=$(shell pkg-config --libs json-c)
- 
- # build pianobar
- ifeq (${DYNLINK},1)
--- 
-1.8.1.5
-
diff --git a/media-sound/pianobar/files/pianobar-2013.05.19-tests.patch b/media-sound/pianobar/files/pianobar-2013.05.19-tests.patch
deleted file mode 100644
index a76b998448f3..000000000000
--- a/media-sound/pianobar/files/pianobar-2013.05.19-tests.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-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-2012.12.01-r1.ebuild b/media-sound/pianobar/pianobar-2012.12.01-r1.ebuild
deleted file mode 100644
index ceba1461dd66..000000000000
--- a/media-sound/pianobar/pianobar-2012.12.01-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# 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-2012.12.01-r1.ebuild,v 1.2 2014/03/01 22:16:51 mgorny 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/static/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:0
-	>=dev-libs/json-c-0.11
-	aac? ( media-libs/faad2 )
-	mp3? ( media-libs/libmad )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-REQUIRED_USE="|| ( aac mp3 )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2011.12.11-tests.patch
-	epatch "${FILESDIR}"/${P}-json-c-0.11.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-2013.05.19.ebuild b/media-sound/pianobar/pianobar-2013.05.19.ebuild
deleted file mode 100644
index cf07a4d2b687..000000000000
--- a/media-sound/pianobar/pianobar-2013.05.19.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# 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-2013.05.19.ebuild,v 1.2 2014/03/01 22:16:51 mgorny 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:0
-	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
-}