[gentoo-commits] repo/gentoo:master commit in: media-sound/pianobar/

[Tim Harder]

commit:     d0b07c295e1f5a6235148abe8c6875c09898a21d
Author:     Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Wed Sep  6 00:00:16 2017 +0000
Commit:     Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Wed Sep  6 00:01:24 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0b07c29

media-sound/pianobar: version bump to 2017.08.30

 media-sound/pianobar/Manifest                                |  1 +
 .../{pianobar-9999.ebuild => pianobar-2017.08.30.ebuild}     | 12 +++++++-----
 media-sound/pianobar/pianobar-9999.ebuild                    | 12 +++++++-----
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/media-sound/pianobar/Manifest b/media-sound/pianobar/Manifest
index 202ec5c4ab1..acc353c8dcf 100644
--- a/media-sound/pianobar/Manifest
+++ b/media-sound/pianobar/Manifest
@@ -1 +1,2 @@
 DIST pianobar-2016.06.02.tar.bz2 46262 SHA256 
c6efb0d0fe36013c6506dadf3718e8ed9471b7839654c97027e036ed16212559 SHA512 
943e4b7bdfa5690f73378c6454666ec972f4d33faa0549ec087fb0ffeb5584e7ec26cef39dfd0134eefe2723638cc41f29c76eecb306c295c067996443958027
 WHIRLPOOL 
1289313f7f9e19f4974c849854204a08d26efa0afc7e4ca56b7dfb43b5c696976e8faa8a0cc1b0d27e6166b39b27714e9eb566e234afdccc3faf968129a1edf6
+DIST pianobar-2017.08.30.tar.bz2 46664 SHA256 
ec14db6cf1a7dbc1d8190b5ca0d256021e970587bcdaeb23904d4bca71a04674 SHA512 
35019bd387a323c85928e8979c075c7b2a8d88115066a55068dd62279760200fcadf022f7000a40e198bebc3cfc5507913da7c9c06ae220cba6fe3910a6bca54
 WHIRLPOOL 
e0ff835c9a143df9779f5f8e76bf55dde3ca97e50b17db64107c386b14cbaf99886c2558887ff8f468f7eca7fecfaf9e47582b139c9b62f645c66b569ded9ee1

diff --git a/media-sound/pianobar/pianobar-9999.ebuild 
b/media-sound/pianobar/pianobar-2017.08.30.ebuild
similarity index 79%
copy from media-sound/pianobar/pianobar-9999.ebuild
copy to media-sound/pianobar/pianobar-2017.08.30.ebuild
index 3d7f81a5fce..9d1f513a05e 100644
--- a/media-sound/pianobar/pianobar-9999.ebuild
+++ b/media-sound/pianobar/pianobar-2017.08.30.ebuild
@@ -2,11 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit toolchain-funcs flag-o-matic multilib
+inherit toolchain-funcs flag-o-matic
 
 if [[ ${PV} == 9999 ]]; then
        inherit git-r3
-       EGIT_REPO_URI="https://github.com/PromyLOPh/${PN}.git";
+       EGIT_REPO_URI="https://github.com/PromyLOPh/pianobar.git";
 else
        SRC_URI="https://6xq.net/${PN}/${P}.tar.bz2";
        KEYWORDS="~amd64 ~x86"
@@ -17,19 +17,21 @@ HOMEPAGE="https://6xq.net/pianobar/";
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="static-libs"
+IUSE="libav static-libs"
 
 RDEPEND="media-libs/libao
        net-misc/curl
        dev-libs/libgcrypt:0=
        dev-libs/json-c:=
-       >=virtual/ffmpeg-9"
+       libav? ( >=media-video/libav-12:0= )
+       !libav? ( >=media-video/ffmpeg-3.1:0= )
+"
 DEPEND="${RDEPEND}
        virtual/pkgconfig"
 
 src_compile() {
        append-cflags -std=c99
-       tc-export CC
+       tc-export AR CC
        emake V=1 DYNLINK=1
 }
 

diff --git a/media-sound/pianobar/pianobar-9999.ebuild 
b/media-sound/pianobar/pianobar-9999.ebuild
index 3d7f81a5fce..9d1f513a05e 100644
--- a/media-sound/pianobar/pianobar-9999.ebuild
+++ b/media-sound/pianobar/pianobar-9999.ebuild
@@ -2,11 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit toolchain-funcs flag-o-matic multilib
+inherit toolchain-funcs flag-o-matic
 
 if [[ ${PV} == 9999 ]]; then
        inherit git-r3
-       EGIT_REPO_URI="https://github.com/PromyLOPh/${PN}.git";
+       EGIT_REPO_URI="https://github.com/PromyLOPh/pianobar.git";
 else
        SRC_URI="https://6xq.net/${PN}/${P}.tar.bz2";
        KEYWORDS="~amd64 ~x86"
@@ -17,19 +17,21 @@ HOMEPAGE="https://6xq.net/pianobar/";
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="static-libs"
+IUSE="libav static-libs"
 
 RDEPEND="media-libs/libao
        net-misc/curl
        dev-libs/libgcrypt:0=
        dev-libs/json-c:=
-       >=virtual/ffmpeg-9"
+       libav? ( >=media-video/libav-12:0= )
+       !libav? ( >=media-video/ffmpeg-3.1:0= )
+"
 DEPEND="${RDEPEND}
        virtual/pkgconfig"
 
 src_compile() {
        append-cflags -std=c99
-       tc-export CC
+       tc-export AR CC
        emake V=1 DYNLINK=1
 }