Gentoo Archives: gentoo-commits

From: Ionen Wolkens <ionen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/xtrlock/
Date: Fri, 30 Sep 2022 11:02:25
Message-Id: 1664534894.6398d97368629e77b8ae765cfeb12805ff3a88d5.ionen@gentoo
1 commit: 6398d97368629e77b8ae765cfeb12805ff3a88d5
2 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
3 AuthorDate: Fri Sep 30 09:57:31 2022 +0000
4 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
5 CommitDate: Fri Sep 30 10:48:14 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6398d973
7
8 x11-misc/xtrlock: force gcc -E for imake's generation
9
10 Requires traditional cpp support and is broken in all sort of ways
11 with clang-cpp / -E. Can still use clang & friends for everything else.
12
13 Ideally these packages need to be built another way or last rited,
14 imake will just accumulate more problems.
15
16 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
17
18 x11-misc/xtrlock/xtrlock-2.13-r1.ebuild | 16 +++++++++-------
19 1 file changed, 9 insertions(+), 7 deletions(-)
20
21 diff --git a/x11-misc/xtrlock/xtrlock-2.13-r1.ebuild b/x11-misc/xtrlock/xtrlock-2.13-r1.ebuild
22 index 6818f908f40f..fef71c7cb75b 100644
23 --- a/x11-misc/xtrlock/xtrlock-2.13-r1.ebuild
24 +++ b/x11-misc/xtrlock/xtrlock-2.13-r1.ebuild
25 @@ -1,4 +1,4 @@
26 -# Copyright 1999-2021 Gentoo Authors
27 +# Copyright 1999-2022 Gentoo Authors
28 # Distributed under the terms of the GNU General Public License v2
29
30 EAPI=7
31 @@ -12,17 +12,19 @@ SLOT="0"
32 LICENSE="GPL-3"
33 KEYWORDS="amd64 ppc x86"
34
35 -RDEPEND="virtual/libcrypt:=
36 +RDEPEND="
37 + virtual/libcrypt:=
38 x11-libs/libX11"
39 -DEPEND="${RDEPEND}"
40 +DEPEND="
41 + ${RDEPEND}
42 + x11-base/xorg-proto"
43 BDEPEND="
44 - x11-base/xorg-proto
45 - >=x11-misc/imake-1.0.8-r1
46 -"
47 + sys-devel/gcc
48 + >=x11-misc/imake-1.0.8-r1"
49
50 src_configure() {
51 CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
52 - IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf || die
53 + IMAKECPP="${IMAKECPP:-${CHOST}-gcc -E}" xmkmf || die
54 }
55
56 src_compile() {