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

[Andreas Sturmlechner]

commit:     2f5fdbdc73cfbea4394f2404b4750a63a01527b9
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri May 15 22:11:32 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri May 15 22:30:01 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f5fdbdc

media-sound/pianobar: Improve EAPI-7, sorting

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-sound/pianobar/pianobar-9999.ebuild | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/media-sound/pianobar/pianobar-9999.ebuild 
b/media-sound/pianobar/pianobar-9999.ebuild
index 5a3320ef9da..603adde3fbf 100644
--- a/media-sound/pianobar/pianobar-9999.ebuild
+++ b/media-sound/pianobar/pianobar-9999.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit toolchain-funcs flag-o-matic
 
 if [[ ${PV} == 9999 ]]; then
@@ -19,14 +20,15 @@ LICENSE="MIT"
 SLOT="0"
 IUSE="static-libs"
 
-RDEPEND="media-libs/libao
-       net-misc/curl
-       dev-libs/libgcrypt:0=
+BDEPEND="virtual/pkgconfig"
+RDEPEND="
        dev-libs/json-c:=
-       >=media-video/ffmpeg-3.1:0=
+       dev-libs/libgcrypt:0=
+       media-libs/libao
+       >=media-video/ffmpeg-3.3:0=
+       net-misc/curl
 "
-DEPEND="${RDEPEND}
-       virtual/pkgconfig"
+DEPEND="${RDEPEND}"
 
 src_compile() {
        append-cflags -std=c99
@@ -38,7 +40,9 @@ 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; }
+       if ! use static-libs; then
+               rm "${D}"/usr/lib*/*.a || die
+       fi
 
        docinto contrib
        dodoc -r contrib/{config-example,*.sh,eventcmd-examples}