media-sound/pianobar: version bump to 2016.06.02

diff --git a/media-sound/pianobar/Manifest b/media-sound/pianobar/Manifest
index 749c202d60d928527675224722620a322263ce32..04f8a6670275af53b966c37e8a5992be1e4a7d09 100644 (file)
--- a/media-sound/pianobar/Manifest
+++ b/media-sound/pianobar/Manifest
@@ -1 +1,2 @@
 DIST pianobar-2015.11.22.tar.bz2 45973 SHA256 23fbc9e6f55b3277dba7a0f68ff721bad7f1eeea504c616ba008841686de322b SHA512 cd8f7307f0d7bd0359954202d2fc3b6d9fdcdc7238a2057c1541f85d62d69fafb22c4a6466d873c35727c1ad1576755ac2f9224dd5ce4ccba2d9c1c8b9a0205a WHIRLPOOL 30c6a43b2cad991d28ca7de981a950debed1f7b6097f71346ea181857e9599a3bf362153ffd040dbed1bc2a1b3459e96e48e5b963ffcb5a87d19157cf6d96ba8
+DIST pianobar-2016.06.02.tar.bz2 46262 SHA256 c6efb0d0fe36013c6506dadf3718e8ed9471b7839654c97027e036ed16212559 SHA512 943e4b7bdfa5690f73378c6454666ec972f4d33faa0549ec087fb0ffeb5584e7ec26cef39dfd0134eefe2723638cc41f29c76eecb306c295c067996443958027 WHIRLPOOL 1289313f7f9e19f4974c849854204a08d26efa0afc7e4ca56b7dfb43b5c696976e8faa8a0cc1b0d27e6166b39b27714e9eb566e234afdccc3faf968129a1edf6

diff --git a/media-sound/pianobar/pianobar-2016.06.02.ebuild b/media-sound/pianobar/pianobar-2016.06.02.ebuild
new file mode 100644 (file)
index 0000000..e9e7619
--- /dev/null
+++ b/media-sound/pianobar/pianobar-2016.06.02.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+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-misc/curl
+       dev-libs/libgcrypt:0=
+       dev-libs/json-c:=
+       >=virtual/ffmpeg-9"
+DEPEND="${RDEPEND}
+       virtual/pkgconfig"
+
+src_compile() {
+       append-cflags -std=c99
+       tc-export CC
+       emake V=1 DYNLINK=1
+}
+
+src_install() {
+       emake DESTDIR="${D}" PREFIX=/usr LIBDIR=/usr/$(get_libdir) DYNLINK=1 install
+       dodoc ChangeLog README.md
+
+       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
+}

diff --git a/media-sound/pianobar/pianobar-9999.ebuild b/media-sound/pianobar/pianobar-9999.ebuild
index 0b27aa69c6e4fb2c7ed54294a6f14dd63c1d6610..e9e761994c64a2758630e5a6e2a32251f5ae8d01 100644 (file)
--- a/media-sound/pianobar/pianobar-9999.ebuild
+++ b/media-sound/pianobar/pianobar-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
+EAPI=6
 inherit toolchain-funcs flag-o-matic multilib
 
 if [[ ${PV} == 9999 ]]; then
@@ -23,21 +23,15 @@ IUSE="static-libs"
 RDEPEND="media-libs/libao
        net-misc/curl
        dev-libs/libgcrypt:0=
-       dev-libs/json-c
+       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
+       emake V=1 DYNLINK=1
 }
 
 src_install() {