[gentoo-commits] repo/gentoo:master commit in: x11-terms/root-tail/

[Ionen Wolkens]

commit:     0ce2363dcf5bed5a993e16586c7e0e2e2e3b1449
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 30 10:20:12 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Fri Sep 30 10:48:14 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ce2363d

x11-terms/root-tail: force gcc -E for imake's generation

Requires traditional cpp support and is broken in all sort of ways
with clang-cpp / -E. Can still use clang & friends for everything else.

Ideally these packages need to be built another way or last rited,
imake will just accumulate more problems.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 x11-terms/root-tail/root-tail-1.2-r4.ebuild | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/x11-terms/root-tail/root-tail-1.2-r4.ebuild 
b/x11-terms/root-tail/root-tail-1.2-r4.ebuild
index aa82399568d3..733a496b5760 100644
--- a/x11-terms/root-tail/root-tail-1.2-r4.ebuild
+++ b/x11-terms/root-tail/root-tail-1.2-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,11 +16,12 @@ IUSE="kde debug"
 
 RDEPEND="x11-libs/libXext
        x11-libs/libX11"
-DEPEND="${RDEPEND}"
-BDEPEND=">=x11-misc/imake-1.0.8-r1
-       app-text/rman
-       x11-base/xorg-proto
-       x11-misc/gccmakedep"
+DEPEND="${RDEPEND}
+       x11-base/xorg-proto"
+BDEPEND="app-text/rman
+       sys-devel/gcc
+       x11-misc/gccmakedep
+       >=x11-misc/imake-1.0.8-r1"
 
 src_prepare() {
        use kde && eapply "${FILESDIR}"/${P}-kde.patch
@@ -29,7 +30,7 @@ src_prepare() {
 
 src_configure() {
        CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
-               IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf -a || die
+               IMAKECPP="${IMAKECPP:-${CHOST}-gcc -E}" xmkmf -a || die
 }
 
 src_compile() {