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/xearth/
Date: Fri, 30 Sep 2022 11:02:22
Message-Id: 1664534892.2b9bf983be4237399e3b48c27f63d871da9b9a9e.ionen@gentoo
1 commit: 2b9bf983be4237399e3b48c27f63d871da9b9a9e
2 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
3 AuthorDate: Fri Sep 30 09:12:07 2022 +0000
4 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
5 CommitDate: Fri Sep 30 10:48:12 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b9bf983
7
8 x11-misc/xearth: 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/xearth/xearth-1.1-r1.ebuild | 11 +++++++----
19 1 file changed, 7 insertions(+), 4 deletions(-)
20
21 diff --git a/x11-misc/xearth/xearth-1.1-r1.ebuild b/x11-misc/xearth/xearth-1.1-r1.ebuild
22 index 542041ede4a8..d80d0c43e7eb 100644
23 --- a/x11-misc/xearth/xearth-1.1-r1.ebuild
24 +++ b/x11-misc/xearth/xearth-1.1-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 @@ -18,20 +18,23 @@ RDEPEND="
32 x11-libs/libX11
33 x11-libs/libXext
34 x11-libs/libXt"
35 -DEPEND="${RDEPEND}"
36 +DEPEND="
37 + ${RDEPEND}
38 + x11-base/xorg-proto"
39 BDEPEND="
40 app-text/rman
41 - x11-base/xorg-proto
42 + sys-devel/gcc
43 >=x11-misc/imake-1.0.8-r1"
44
45 PATCHES=(
46 "${FILESDIR}"/${P}-include.patch
47 )
48 +
49 DOCS=( BUILT-IN GAMMA-TEST HISTORY README )
50
51 src_configure() {
52 CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
53 - IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf || die
54 + IMAKECPP="${IMAKECPP:-${CHOST}-gcc -E}" xmkmf || die
55 }
56
57 src_compile() {