Bump to working snapshot with ssl support and remove old.

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

4 files changed, 49 insertions, 30 deletions

diff --git a/media-sound/pianobar/ChangeLog b/media-sound/pianobar/ChangeLog
index b0af505669a0..f4bafbfb14dd 100644
--- a/media-sound/pianobar/ChangeLog
+++ b/media-sound/pianobar/ChangeLog
@@ -1,6 +1,13 @@
 # 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.9 2011/11/09 23:27:06 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pianobar/ChangeLog,v 1.10 2011/11/10 00:26:23 radhermit Exp $
+
+*pianobar-2011.11.09_p1 (10 Nov 2011)
+
+  10 Nov 2011; Tim Harder <radhermit@gentoo.org>
+  -files/pianobar-2011.07.09-tests.patch, -pianobar-2011.11.09.ebuild,
+  +pianobar-2011.11.09_p1.ebuild, +files/pianobar-2011.11.09_p1-tests.patch:
+  Bump to working snapshot with ssl support and remove old.
 
 *pianobar-2011.11.09 (09 Nov 2011)
 
diff --git a/media-sound/pianobar/files/pianobar-2011.07.09-tests.patch b/media-sound/pianobar/files/pianobar-2011.07.09-tests.patch
deleted file mode 100644
index ce6786dcbe84..000000000000
--- a/media-sound/pianobar/files/pianobar-2011.07.09-tests.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- pianobar-2011.07.09/Makefile.orig
-+++ pianobar-2011.07.09/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}
- 
-@@ -130,8 +132,8 @@
- debug: CFLAGS=-Wall -pedantic -ggdb
- 
- waitress-test: CFLAGS+= -DTEST
--waitress-test: ${LIBWAITRESS_OBJ}
--	${CC} ${LDFLAGS} ${LIBWAITRESS_OBJ} -o waitress-test
-+waitress-test: ${LIBWAITRESS_TOBJ}
-+	${CC} ${LDFLAGS} ${LIBWAITRESS_TOBJ} -o waitress-test
- 
- test: waitress-test
- 	./waitress-test
diff --git a/media-sound/pianobar/files/pianobar-2011.11.09_p1-tests.patch b/media-sound/pianobar/files/pianobar-2011.11.09_p1-tests.patch
new file mode 100644
index 000000000000..0ace55cb9375
--- /dev/null
+++ b/media-sound/pianobar/files/pianobar-2011.11.09_p1-tests.patch
@@ -0,0 +1,37 @@
+--- pianobar-2011.11.09_p1.orig/Makefile
++++ pianobar-2011.11.09_p1/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
+--- pianobar-2011.11.09_p1.orig/src/libwaitress/waitress.c
++++ pianobar-2011.11.09_p1/src/libwaitress/waitress.c
+@@ -1287,7 +1287,7 @@
+ 	gnutls_global_init ();
+ 	WaitressHandle_t waith;
+ 	char *buf;
+-	WaitressInit (&waith);
++	WaitressInit (&waith, NULL);
+ 	WaitressSetUrl (&waith, "http://6xq.net:80/");
+ 	printf ("ret: %s\n", WaitressErrorToStr (WaitressFetchBuf (&waith, &buf)));
+ 	printf ("%s\n", buf);
diff --git a/media-sound/pianobar/pianobar-2011.11.09.ebuild b/media-sound/pianobar/pianobar-2011.11.09_p1.ebuild
index 502b8db17d2f..afd56ad0e319 100644
--- a/media-sound/pianobar/pianobar-2011.11.09.ebuild
+++ b/media-sound/pianobar/pianobar-2011.11.09_p1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pianobar/pianobar-2011.11.09.ebuild,v 1.1 2011/11/09 23:27:06 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pianobar/pianobar-2011.11.09_p1.ebuild,v 1.1 2011/11/10 00:26:23 radhermit Exp $
 
 EAPI=4
 
@@ -8,7 +8,7 @@ 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"
+SRC_URI="http://dev.gentoo.org/~radhermit/distfiles/${P}.tar.bz2"
 
 LICENSE="as-is"
 SLOT="0"
@@ -16,6 +16,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="aac +mp3"
 
 DEPEND="media-libs/libao
+	net-libs/gnutls
 	aac? ( media-libs/faad2 )
 	mp3? ( media-libs/libmad )"
 RDEPEND="${DEPEND}"
@@ -23,7 +24,7 @@ RDEPEND="${DEPEND}"
 REQUIRED_USE="|| ( mp3 aac )"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2011.07.09-tests.patch
+	epatch "${FILESDIR}"/${P}-tests.patch
 }
 
 src_compile() {