From a71d886e84900deedd4d5318d6fbcf549a3e8c3e Mon Sep 17 00:00:00 2001 From: Tim Harder Date: Thu, 10 Nov 2011 00:26:23 +0000 Subject: [PATCH] Bump to working snapshot with ssl support and remove old. Package-Manager: portage-2.2.0_alpha72/cvs/Linux x86_64 --- media-sound/pianobar/ChangeLog | 9 ++++- media-sound/pianobar/Manifest | 22 +++++------ .../files/pianobar-2011.07.09-tests.patch | 26 ------------- .../files/pianobar-2011.11.09_p1-tests.patch | 37 +++++++++++++++++++ ...9.ebuild => pianobar-2011.11.09_p1.ebuild} | 7 ++-- 5 files changed, 60 insertions(+), 41 deletions(-) delete mode 100644 media-sound/pianobar/files/pianobar-2011.07.09-tests.patch create mode 100644 media-sound/pianobar/files/pianobar-2011.11.09_p1-tests.patch rename media-sound/pianobar/{pianobar-2011.11.09.ebuild => pianobar-2011.11.09_p1.ebuild} (84%) 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 + -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/Manifest b/media-sound/pianobar/Manifest index 2f41d9079c4b..50c493cd9204 100644 --- a/media-sound/pianobar/Manifest +++ b/media-sound/pianobar/Manifest @@ -1,19 +1,19 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 -AUX pianobar-2011.07.09-tests.patch 799 RMD160 33d3b455f251e1169e6f16fe10b8b8e0b74f0ec1 SHA1 a0405801bb369116fecdf25f8f93f6a2f57936ec SHA256 6879787ab9e4c9fe8fca764345fc2b42d1b3b7dba1ace54d26efda8a08c24eb8 -DIST pianobar-2011.11.09.tar.bz2 65499 RMD160 e3a83686ecdb0ef93f3c529886d2e6a52aef5f2b SHA1 4bddc4a7d23f351c18aa618063f660c57c56746c SHA256 022a53ed6ace9bdd7b50003623752e48a04b1b306d00b1bbe91e20d4d5b1c6f3 -EBUILD pianobar-2011.11.09.ebuild 1195 RMD160 166fa7fcbe88a5e1ea1026b059fd91ef38e378a5 SHA1 52e32b4482b819ac63b985cadf2830576e51a2dc SHA256 b7ee73de8ab67efd77a88e26644bd8ba085507db305532b2eaee3c996f128f19 -MISC ChangeLog 1761 RMD160 6fb8d7a10e1a6302a69f872c8692930528669d31 SHA1 f29a9de90d55399e95148d48602aaab9f3b7154a SHA256 2f9db4a03605592731dbf5ff7e80667cbc10ab8cc6c8705f85245a36d2e76898 +AUX pianobar-2011.11.09_p1-tests.patch 1253 RMD160 59f109d9d72a9a22691f63f50627b6f439796f5c SHA1 c4b6efef1270a041d855c21dea8308688de0771b SHA256 bfc321e3ca06284f6b26dbcbf842a3c1ff30329ffdecf32b04d85780a6f1dbd6 +DIST pianobar-2011.11.09_p1.tar.bz2 67620 RMD160 5310bd4916e01eb6631dce922effb7a378a6cdef SHA1 44affa15f9f327d4ce56f3c2d9bcd7f7e3cf7b0d SHA256 1b2eba019fd0ecf771e620a07a51481a3b35048010b255b699b1478a19cc6923 +EBUILD pianobar-2011.11.09_p1.ebuild 1209 RMD160 92bb0a9e1646f50b541e44718b888415d68d545f SHA1 569a277207684192b52fdb9b1de86c6d207d894b SHA256 0abbaf6ee0239565314eeb1c3fbda727e516bd868814d63f9e0647d09ef56fd8 +MISC ChangeLog 2059 RMD160 2131433d6589f446da413250404a263f221a8e58 SHA1 8087b151fe26071505c01b5ca2a13d3f8ec8d408 SHA256 b3b2d8b03233c5365781acd79aa31427dbcfae9d25eccc7f62e70407ec51a3b5 MISC metadata.xml 259 RMD160 3aa48fb8a20128bc3daf5afea8beb2cde21839ae SHA1 4913e8a70b40a7af1104538355a430a45d67f35a SHA256 71b52b5b989346aa41e78d6021fb157a3941bf1f6bedf8b0c90eb94ab544fc55 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iQEcBAEBCgAGBQJOuwxQAAoJEEqz6FtPBkyjC/0IAI4KGpTte9gArUtUSDf4F5cM -96LBtqBOr7VTIijj9Sj7F/ICjOuhEVWzI3YiCLoPhbpMs/puCXoHrGDaFQouUSqm -LD84iF3qUF2rKsUYR1EhKIXz+tY1X7O7Us8rYh6BUQcmL9XM5e3WiYAnkFnDY5Sy -WgcF8BVtQLio94oJKfGC72Ydq1+1dBztijBb/pLDhghMhIDPYWC5J6g8b6iySYvT -pjPaMYP6q7SCAaIRvTgS7ThKFaVwn+fyKdE1JtpWsohmkjViGIyImUh6wGYN/DmA -cTaUvXoVoHQTole7vNb2IiNyRs2TFDmtKBjuYQZ1lhkmfq9AQvcH+6RdOJLMEa8= -=RDbc +iQEcBAEBCgAGBQJOuxo4AAoJEEqz6FtPBkyjuIkH/30bG32DnbV3aIdW6cewHPkC +zXn1gkmFW8v++R1jikM8gcVNRDgMJrJ8/ZYmRn5WaE3hAN7Cy6pc+KXH6JNSRhf2 +c0tSWgORJnJ7wvCJDjgcK51o7MVbnEWywTaSr3O8olliHDCXW+zos8h8hQ7IghFy +iI4pzAV6QV/od/iFTOWGBo3pWbZGpDgoc1Bu4hH4kQcjsxdlG8eYMmjYhNo/Fj/g +LZkwceX/L1X7slAntGQXD9TnqDzbu7/LFM3Zv+gTAHCwrNfKbCTiA2aqm5tDKYeV +V7Hz66w9ebu/GzGdwgumYFSpw/zFc6hod3IuMQWWgHy092FlvNnnYGpQGSnwW10= +=/hRt -----END PGP SIGNATURE----- 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 similarity index 84% rename from media-sound/pianobar/pianobar-2011.11.09.ebuild rename to 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() { -- 2.26.2