[gentoo-commits] repo/gentoo:master commit in: x11-misc/xsnap/

[Ionen Wolkens]

commit:     c93bd722e0b57cf2313f3eb97e50e4277cfce344
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 30 09:19:37 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Fri Sep 30 10:48:13 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c93bd722

x11-misc/xsnap: 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.

Bug: https://bugs.gentoo.org/870811
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 x11-misc/xsnap/xsnap-1.5.15-r2.ebuild | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/x11-misc/xsnap/xsnap-1.5.15-r2.ebuild b/x11-misc/xsnap/xsnap-1.5.15-r2.ebuild
index dd43dcab6432..bc17eb259842 100644
--- a/x11-misc/xsnap/xsnap-1.5.15-r2.ebuild
+++ b/x11-misc/xsnap/xsnap-1.5.15-r2.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
@@ -24,11 +24,14 @@ RDEPEND="
 	${COMMON_DEPEND}
 	media-fonts/font-misc-misc
 "
-DEPEND="${COMMON_DEPEND}"
+DEPEND="
+	${COMMON_DEPEND}
+	x11-base/xorg-proto
+"
 BDEPEND="
 	app-text/rman
 	dev-lang/perl
-	x11-base/xorg-proto
+	sys-devel/gcc
 	>=x11-misc/imake-1.0.8-r1
 "
 DOCS=( AUTHORS Changelog README )
@@ -50,7 +53,7 @@ src_prepare() {
 
 src_configure() {
 	CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
-		IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf || die
+		IMAKECPP="${IMAKECPP:-${CHOST}-gcc -E}" xmkmf || die
 }
 
 src_compile() {