Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-radio/ibp/
Date: Fri, 18 Jun 2021 21:07:47
Message-Id: 1624050431.efc07b04ebe215e44e0051bca585bc6630d965b4.soap@gentoo
1 commit: efc07b04ebe215e44e0051bca585bc6630d965b4
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jun 18 21:07:11 2021 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Fri Jun 18 21:07:11 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efc07b04
7
8 media-radio/ibp: use pkg-config to find ncurses
9
10 This is more resilient in the (rare) case of non-split tinfo,
11 which still occurs on e.g. Prefix.
12
13 Signed-off-by: Sam James <sam <AT> gentoo.org>
14 Signed-off-by: David Seifert <soap <AT> gentoo.org>
15
16 .../ibp/{ibp-0.21-r1.ebuild => ibp-0.21-r2.ebuild} | 15 ++++++++-------
17 1 file changed, 8 insertions(+), 7 deletions(-)
18
19 diff --git a/media-radio/ibp/ibp-0.21-r1.ebuild b/media-radio/ibp/ibp-0.21-r2.ebuild
20 similarity index 77%
21 rename from media-radio/ibp/ibp-0.21-r1.ebuild
22 rename to media-radio/ibp/ibp-0.21-r2.ebuild
23 index a02af617b34..08a4b2b5fa4 100644
24 --- a/media-radio/ibp/ibp-0.21-r1.ebuild
25 +++ b/media-radio/ibp/ibp-0.21-r2.ebuild
26 @@ -1,7 +1,8 @@
27 # Copyright 1999-2021 Gentoo Authors
28 # Distributed under the terms of the GNU General Public License v2
29
30 -EAPI="6"
31 +EAPI="7"
32 +
33 inherit toolchain-funcs
34
35 DESCRIPTION="Shows currently transmitting beacons of the International Beacon Project (IBP)"
36 @@ -13,18 +14,18 @@ SLOT="0"
37 KEYWORDS="amd64 x86"
38 IUSE="X"
39
40 -RDEPEND="sys-libs/ncurses:0
41 +RDEPEND="sys-libs/ncurses:0=
42 X? ( x11-libs/libX11 )"
43 DEPEND="${RDEPEND}
44 X? ( >=x11-misc/imake-1.0.8-r1 )"
45 +BDEPEND="virtual/pkgconfig"
46
47 src_prepare() {
48 - # respect CFLAGS if built without USE=X
49 + # Respect CFLAGS if built without USE=X
50 sed -i -e "s/= -D/+= -D/" Makefile || die
51 - # fix compile if ncurses is built with separate libtinfo
52 - if has_version "sys-libs/ncurses:0[tinfo]" ;then
53 - sed -i -e "s/-lcurses/-lcurses -ltinfo/" Imakefile Makefile || die
54 - fi
55 +
56 + # Fix compile if ncurses is built with separate libtinfo
57 + sed -i -e "s:-lcurses:$($(tc-getPKG_CONFIG) --libs ncurses):" Imakefile Makefile || die
58
59 eapply_user
60 }