From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0643B1382C5 for ; Fri, 15 May 2020 22:30:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 19ED2E080E; Fri, 15 May 2020 22:30:31 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F103AE080E for ; Fri, 15 May 2020 22:30:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 42F3934F0E0 for ; Fri, 15 May 2020 22:30:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C9AD3103 for ; Fri, 15 May 2020 22:30:11 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1589581801.2f5fdbdc73cfbea4394f2404b4750a63a01527b9.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/pianobar/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-sound/pianobar/pianobar-9999.ebuild X-VCS-Directories: media-sound/pianobar/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 2f5fdbdc73cfbea4394f2404b4750a63a01527b9 X-VCS-Branch: master Date: Fri, 15 May 2020 22:30:11 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 86da6c22-4a67-42e5-beae-d92ad9899d8e X-Archives-Hash: 2948d86043f8dd2923d27044b0d8c39e commit: 2f5fdbdc73cfbea4394f2404b4750a63a01527b9 Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri May 15 22:11:32 2020 +0000 Commit: Andreas Sturmlechner gentoo 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 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}