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 049181382C5 for ; Fri, 18 Jun 2021 21:07:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9DD9BE0880; Fri, 18 Jun 2021 21:07:43 +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 768DDE0880 for ; Fri, 18 Jun 2021 21:07:43 +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 2E3CB340B35 for ; Fri, 18 Jun 2021 21:07:42 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6B4D97C4 for ; Fri, 18 Jun 2021 21:07:38 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1624050431.efc07b04ebe215e44e0051bca585bc6630d965b4.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-radio/ibp/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-radio/ibp/ibp-0.21-r1.ebuild media-radio/ibp/ibp-0.21-r2.ebuild X-VCS-Directories: media-radio/ibp/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: efc07b04ebe215e44e0051bca585bc6630d965b4 X-VCS-Branch: master Date: Fri, 18 Jun 2021 21:07:38 +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: c44f1f54-1141-4314-8577-e3b5fac2fe3a X-Archives-Hash: d8cd8499a6ea99377a6aeee4f73b998e commit: efc07b04ebe215e44e0051bca585bc6630d965b4 Author: Sam James gentoo org> AuthorDate: Fri Jun 18 21:07:11 2021 +0000 Commit: David Seifert gentoo org> CommitDate: Fri Jun 18 21:07:11 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efc07b04 media-radio/ibp: use pkg-config to find ncurses This is more resilient in the (rare) case of non-split tinfo, which still occurs on e.g. Prefix. Signed-off-by: Sam James gentoo.org> Signed-off-by: David Seifert gentoo.org> .../ibp/{ibp-0.21-r1.ebuild => ibp-0.21-r2.ebuild} | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/media-radio/ibp/ibp-0.21-r1.ebuild b/media-radio/ibp/ibp-0.21-r2.ebuild similarity index 77% rename from media-radio/ibp/ibp-0.21-r1.ebuild rename to media-radio/ibp/ibp-0.21-r2.ebuild index a02af617b34..08a4b2b5fa4 100644 --- a/media-radio/ibp/ibp-0.21-r1.ebuild +++ b/media-radio/ibp/ibp-0.21-r2.ebuild @@ -1,7 +1,8 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI="7" + inherit toolchain-funcs DESCRIPTION="Shows currently transmitting beacons of the International Beacon Project (IBP)" @@ -13,18 +14,18 @@ SLOT="0" KEYWORDS="amd64 x86" IUSE="X" -RDEPEND="sys-libs/ncurses:0 +RDEPEND="sys-libs/ncurses:0= X? ( x11-libs/libX11 )" DEPEND="${RDEPEND} X? ( >=x11-misc/imake-1.0.8-r1 )" +BDEPEND="virtual/pkgconfig" src_prepare() { - # respect CFLAGS if built without USE=X + # Respect CFLAGS if built without USE=X sed -i -e "s/= -D/+= -D/" Makefile || die - # fix compile if ncurses is built with separate libtinfo - if has_version "sys-libs/ncurses:0[tinfo]" ;then - sed -i -e "s/-lcurses/-lcurses -ltinfo/" Imakefile Makefile || die - fi + + # Fix compile if ncurses is built with separate libtinfo + sed -i -e "s:-lcurses:$($(tc-getPKG_CONFIG) --libs ncurses):" Imakefile Makefile || die eapply_user }