Gentoo Archives: gentoo-commits

From: Joonas Niilola <juippis@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/xtrlock/
Date: Thu, 15 Apr 2021 06:40:09
Message-Id: 1618468737.96b3fe30adbea3d0b1b78023343fc9ad71372fcf.juippis@gentoo
1 commit: 96b3fe30adbea3d0b1b78023343fc9ad71372fcf
2 Author: Ionen Wolkens <sudinave <AT> gmail <DOT> com>
3 AuthorDate: Wed Apr 14 13:33:50 2021 +0000
4 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
5 CommitDate: Thu Apr 15 06:38:57 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96b3fe30
7
8 x11-misc/xtrlock: fix build with -native-symlinks
9
10 Also swapped DEPEND with BDEPEND to put imake in the right block.
11
12 Closes: https://bugs.gentoo.org/726252
13 Signed-off-by: Ionen Wolkens <sudinave <AT> gmail.com>
14 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
15
16 x11-misc/xtrlock/xtrlock-2.13.ebuild | 16 +++++++++-------
17 1 file changed, 9 insertions(+), 7 deletions(-)
18
19 diff --git a/x11-misc/xtrlock/xtrlock-2.13.ebuild b/x11-misc/xtrlock/xtrlock-2.13.ebuild
20 index 48d686600b3..75993d78c0c 100644
21 --- a/x11-misc/xtrlock/xtrlock-2.13.ebuild
22 +++ b/x11-misc/xtrlock/xtrlock-2.13.ebuild
23 @@ -12,17 +12,19 @@ SLOT="0"
24 LICENSE="GPL-3"
25 KEYWORDS="amd64 ppc x86"
26
27 -RDEPEND="
28 - x11-libs/libX11
29 -"
30 -DEPEND="
31 - ${RDEPEND}
32 +RDEPEND="x11-libs/libX11"
33 +DEPEND="${RDEPEND}"
34 +BDEPEND="
35 x11-base/xorg-proto
36 - x11-misc/imake
37 + >=x11-misc/imake-1.0.8-r1
38 "
39
40 +src_configure() {
41 + CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
42 + IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf || die
43 +}
44 +
45 src_compile() {
46 - xmkmf || die
47 emake CDEBUGFLAGS="${CFLAGS} -DSHADOW_PWD" CC="$(tc-getCC)" \
48 EXTRA_LDOPTIONS="${LDFLAGS}" xtrlock
49 }