summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Harder <radhermit@gentoo.org>2011-07-10 06:07:55 +0000
committerTim Harder <radhermit@gentoo.org>2011-07-10 06:07:55 +0000
commit83cf575e1834ad832ba801309e00fb3526dc960c (patch)
treed06e33b68d3aa5b21342e1185a79b209f8d2239f /media-sound/pianobar
parentversion bump. Fix bug #331295 (diff)
downloadgentoo-2-83cf575e1834ad832ba801309e00fb3526dc960c.tar.gz
gentoo-2-83cf575e1834ad832ba801309e00fb3526dc960c.tar.bz2
gentoo-2-83cf575e1834ad832ba801309e00fb3526dc960c.zip
Version bump and remove old.
(Portage version: 2.2.0_alpha43/cvs/Linux x86_64)
Diffstat (limited to 'media-sound/pianobar')
-rw-r--r--media-sound/pianobar/ChangeLog8
-rw-r--r--media-sound/pianobar/files/pianobar-2011.04.27-linking.patch15
-rw-r--r--media-sound/pianobar/pianobar-2011.07.09.ebuild (renamed from media-sound/pianobar/pianobar-2011.04.27.ebuild)14
3 files changed, 12 insertions, 25 deletions
diff --git a/media-sound/pianobar/ChangeLog b/media-sound/pianobar/ChangeLog
index 7d5882f77e05..10abd2a9e478 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.2 2011/05/07 01:12:19 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pianobar/ChangeLog,v 1.3 2011/07/10 06:07:55 radhermit Exp $
+
+*pianobar-2011.07.09 (10 Jul 2011)
+
+ 10 Jul 2011; Tim Harder <radhermit@gentoo.org> -pianobar-2011.04.27.ebuild,
+ -files/pianobar-2011.04.27-linking.patch, +pianobar-2011.07.09.ebuild:
+ Version bump and remove old.
07 May 2011; Tim Harder <radhermit@gentoo.org> pianobar-2011.04.27.ebuild:
Use docinto/dodoc instead of insinto/doins.
diff --git a/media-sound/pianobar/files/pianobar-2011.04.27-linking.patch b/media-sound/pianobar/files/pianobar-2011.04.27-linking.patch
deleted file mode 100644
index a3329c05979d..000000000000
--- a/media-sound/pianobar/files/pianobar-2011.04.27-linking.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- pianobar-2011.04.27/Makefile.orig
-+++ pianobar-2011.04.27/Makefile
-@@ -88,9 +88,9 @@
- else
- pianobar: ${PIANOBAR_OBJ} ${PIANOBAR_HDR} ${LIBPIANO_OBJ} ${LIBWAITRESS_OBJ} \
- ${LIBWAITRESS_HDR} ${LIBEZXML_OBJ} ${LIBEZXML_HDR}
-- ${CC} ${CFLAGS} ${LDFLAGS} -lao -lpthread -lm ${LIBFAAD_LDFLAGS} \
-- ${LIBMAD_LDFLAGS} -o $@ ${PIANOBAR_OBJ} ${LIBPIANO_OBJ} \
-- ${LIBWAITRESS_OBJ} ${LIBEZXML_OBJ}
-+ ${CC} ${CFLAGS} ${LDFLAGS} ${LIBPIANO_OBJ} ${LIBWAITRESS_OBJ} \
-+ ${LIBEZXML_OBJ} ${PIANOBAR_OBJ} -lao -lpthread -lm \
-+ ${LIBFAAD_LDFLAGS} ${LIBMAD_LDFLAGS} -o $@
- endif
-
- # build shared and static libpiano
diff --git a/media-sound/pianobar/pianobar-2011.04.27.ebuild b/media-sound/pianobar/pianobar-2011.07.09.ebuild
index c0c52e4489b7..0a3a1e07d507 100644
--- a/media-sound/pianobar/pianobar-2011.04.27.ebuild
+++ b/media-sound/pianobar/pianobar-2011.07.09.ebuild
@@ -1,14 +1,14 @@
# 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.04.27.ebuild,v 1.2 2011/05/07 01:12:19 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pianobar/pianobar-2011.07.09.ebuild,v 1.1 2011/07/10 06:07:55 radhermit Exp $
EAPI=4
-inherit toolchain-funcs flag-o-matic eutils
+inherit toolchain-funcs flag-o-matic
DESCRIPTION="A console-based replacement for Pandora's flash player"
-HOMEPAGE="http://6xq.net/html/00/17.html"
-SRC_URI="http://6xq.net/media/00/16/${P}.tar.bz2"
+HOMEPAGE="http://6xq.net/projects/pianobar/"
+SRC_URI="http://6xq.net/static/projects/${PN}/${P}.tar.bz2"
LICENSE="as-is"
SLOT="0"
@@ -22,17 +22,13 @@ RDEPEND="${DEPEND}"
REQUIRED_USE="|| ( mp3 aac )"
-src_prepare() {
- epatch "${FILESDIR}"/${P}-linking.patch
-}
-
src_compile() {
local myconf=""
! use aac && myconf+=" DISABLE_FAAD=1"
! use mp3 && myconf+=" DISABLE_MAD=1"
append-cflags -std=c99
- emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" ${myconf}
+ emake CC=$(tc-getCC) ${myconf}
}
src_install() {