radhermit    14/06/22 13:07:34

  Modified:             ChangeLog pianobar-9999.ebuild
  Added:                pianobar-2014.06.08.ebuild
  Log:
  Version bump and update live ebuild.
  
  (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 
4AB3E85B4F064CA3)

Revision  Changes    Path
1.34                 media-sound/pianobar/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/pianobar/ChangeLog?rev=1.34&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/pianobar/ChangeLog?rev=1.34&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/pianobar/ChangeLog?r1=1.33&r2=1.34

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-sound/pianobar/ChangeLog,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- ChangeLog   1 Mar 2014 22:16:51 -0000       1.33
+++ ChangeLog   22 Jun 2014 13:07:34 -0000      1.34
@@ -1,6 +1,12 @@
 # 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.33 
2014/03/01 22:16:51 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pianobar/ChangeLog,v 1.34 
2014/06/22 13:07:34 radhermit Exp $
+
+*pianobar-2014.06.08 (22 Jun 2014)
+
+  22 Jun 2014; Tim Harder <radher...@gentoo.org> +pianobar-2014.06.08.ebuild,
+  pianobar-9999.ebuild:
+  Version bump and update live ebuild.
 
   01 Mar 2014; Michał Górny <mgo...@gentoo.org> pianobar-2012.12.01-r1.ebuild,
   pianobar-2013.05.19.ebuild, pianobar-2013.09.15.ebuild, pianobar-9999.ebuild:



1.8                  media-sound/pianobar/pianobar-9999.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/pianobar/pianobar-9999.ebuild?rev=1.8&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/pianobar/pianobar-9999.ebuild?rev=1.8&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/pianobar/pianobar-9999.ebuild?r1=1.7&r2=1.8

Index: pianobar-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-sound/pianobar/pianobar-9999.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- pianobar-9999.ebuild        1 Mar 2014 22:16:51 -0000       1.7
+++ pianobar-9999.ebuild        22 Jun 2014 13:07:34 -0000      1.8
@@ -1,31 +1,33 @@
 # 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-9999.ebuild,v 
1.7 2014/03/01 22:16:51 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pianobar/pianobar-9999.ebuild,v 
1.8 2014/06/22 13:07:34 radhermit Exp $
 
 EAPI="5"
+inherit toolchain-funcs flag-o-matic multilib
 
-inherit toolchain-funcs flag-o-matic multilib git-r3
-
-EGIT_REPO_URI="git://github.com/PromyLOPh/pianobar.git"
+if [[ ${PV} == 9999 ]]; then
+       inherit git-r3
+       EGIT_REPO_URI="git://github.com/PromyLOPh/pianobar.git"
+else
+       SRC_URI="http://6xq.net/projects/${PN}/${P}.tar.bz2";
+       KEYWORDS="~amd64 ~x86"
+fi
 
 DESCRIPTION="A console-based replacement for Pandora's flash player"
 HOMEPAGE="http://6xq.net/projects/pianobar/";
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="+aac mp3 static-libs"
+IUSE="static-libs"
 
 RDEPEND="media-libs/libao
        net-libs/gnutls
-       dev-libs/libgcrypt:0
+       dev-libs/libgcrypt:0=
        dev-libs/json-c
-       aac? ( media-libs/faad2 )
-       mp3? ( media-libs/libmad )"
+       >=virtual/ffmpeg-9"
 DEPEND="${RDEPEND}
        virtual/pkgconfig"
 
-REQUIRED_USE="|| ( aac mp3 )"
-
 src_prepare() {
        sed -e '/@echo /d' \
                -e 's/@${CC}/${CC}/' \
@@ -33,20 +35,16 @@
 }
 
 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}
+       emake DYNLINK=1
 }
 
 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
+       use static-libs || { rm "${D}"/usr/lib*/*.a || die; }
 
        docinto contrib
        dodoc -r contrib/{config-example,*.sh,eventcmd-examples}



1.1                  media-sound/pianobar/pianobar-2014.06.08.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/pianobar/pianobar-2014.06.08.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/pianobar/pianobar-2014.06.08.ebuild?rev=1.1&content-type=text/plain

Index: pianobar-2014.06.08.ebuild
===================================================================
# 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-2014.06.08.ebuild,v 1.1 
2014/06/22 13:07:34 radhermit Exp $

EAPI="5"
inherit toolchain-funcs flag-o-matic multilib

if [[ ${PV} == 9999 ]]; then
        inherit git-r3
        EGIT_REPO_URI="git://github.com/PromyLOPh/pianobar.git"
else
        SRC_URI="http://6xq.net/projects/${PN}/${P}.tar.bz2";
        KEYWORDS="~amd64 ~x86"
fi

DESCRIPTION="A console-based replacement for Pandora's flash player"
HOMEPAGE="http://6xq.net/projects/pianobar/";

LICENSE="MIT"
SLOT="0"
IUSE="static-libs"

RDEPEND="media-libs/libao
        net-libs/gnutls
        dev-libs/libgcrypt:0=
        dev-libs/json-c
        >=virtual/ffmpeg-9"
DEPEND="${RDEPEND}
        virtual/pkgconfig"

src_prepare() {
        sed -e '/@echo /d' \
                -e 's/@${CC}/${CC}/' \
                -i Makefile || die
}

src_compile() {
        append-cflags -std=c99
        tc-export CC
        emake DYNLINK=1
}

src_install() {
        emake DESTDIR="${D}" PREFIX=/usr LIBDIR=/usr/$(get_libdir) DYNLINK=1 
install
        dodoc ChangeLog README

        use static-libs || { rm "${D}"/usr/lib*/*.a || die; }

        docinto contrib
        dodoc -r contrib/{config-example,*.sh,eventcmd-examples}
        docompress -x /usr/share/doc/${PF}/contrib
}




Reply via email to