Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-simulation/pmars-sdl/
Date: Fri, 18 Jun 2021 21:07:45
Message-Id: 1624050428.c2c24ad694d76c541d680eb671a34dd04838cbf4.soap@gentoo
1 commit: c2c24ad694d76c541d680eb671a34dd04838cbf4
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jun 18 21:07:08 2021 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Fri Jun 18 21:07:08 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2c24ad6
7
8 games-simulation/pmars-sdl: use pkg-config to find ncurses, x11
9
10 Signed-off-by: Sam James <sam <AT> gentoo.org>
11 Signed-off-by: David Seifert <soap <AT> gentoo.org>
12
13 games-simulation/pmars-sdl/pmars-sdl-0.9.2e-r1.ebuild | 7 ++++---
14 1 file changed, 4 insertions(+), 3 deletions(-)
15
16 diff --git a/games-simulation/pmars-sdl/pmars-sdl-0.9.2e-r1.ebuild b/games-simulation/pmars-sdl/pmars-sdl-0.9.2e-r1.ebuild
17 index ae564aa94c0..df1ca5fb51e 100644
18 --- a/games-simulation/pmars-sdl/pmars-sdl-0.9.2e-r1.ebuild
19 +++ b/games-simulation/pmars-sdl/pmars-sdl-0.9.2e-r1.ebuild
20 @@ -25,6 +25,7 @@ RDEPEND="
21 !sdl? ( !X? ( sys-libs/ncurses:0= ) )
22 "
23 DEPEND="${RDEPEND}"
24 +BDEPEND="virtual/pkgconfig"
25
26 PATCHES=(
27 "${FILESDIR}"/${P}-format.patch
28 @@ -46,15 +47,15 @@ src_compile() {
29 append-cflags $(sdl-config --cflags)
30 append-cppflags -DSDLGRAPHX
31
32 - LIB=$(sdl-config --libs)
33 + LIB="$(sdl-config --libs)"
34 elif use X ; then
35 append-cppflags -DXWINGRAPHX
36
37 - LIB="-L${ESYSROOT}/usr/X11R6/lib -lX11"
38 + LIB="$($(tc-getPKG_CONFIG) --libs x11)"
39 else
40 append-cppflags -DCURSESGRAPHX
41
42 - LIB="-lcurses -ltinfo"
43 + LIB="$($(tc-getPKG_CONFIG) --libs ncurses)"
44 fi
45
46 cd src || die