5 files changed, 13 insertions, 11 deletions
diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index 642590de2044..0ea2e2d9a8c5 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/kterm/Manifest b/x11-terms/kterm/Manifest
index 50e3f362a0dc..25d71d45d341 100644
--- a/x11-terms/kterm/Manifest
+++ b/x11-terms/kterm/Manifest
@@ -6,5 +6,5 @@ AUX kterm-underline.patch 467 BLAKE2B 5aa8a79a4262418f08d2618c3bc9a5ad2efaddba0c
 DIST kterm-6.2.0-wpi.patch.gz 6629 BLAKE2B 7a40d2305677cc8e8f7a0aba6c1a6ed2de19fac578a668719285a63f26c4b572e8b49e95e765f95a66ee54d485634acd9e685105ebb12503a23e5d2989adfd68 SHA512 b3ae44ce3a2a5ed7d08055c7b9a006844441c77727694ec1eb5f07752f745c8f1990ce23115070006999bd035fd934f09322bb6dc407f825f0da2b06a163faab
 DIST kterm-6.2.0.ext02.patch.gz 15290 BLAKE2B 031d59df558bbc8d6044a508542fe39b8e733df5964e6ba940be0914e376cf5f8e457028cfc9fbc2f8bb044babdffdb71ca6c43f246a74a781377c8a6c2a4dc1 SHA512 95b70f61496ed43dcbdda22b3250c651b3dbce07ef2209a7baec3f729ef954d6781dd5e18a5368d34792db4a3e310adec4fad5c05d3dfd211c0dc7f89c5ae356
 DIST kterm-6.2.0.tar.gz 200448 BLAKE2B 99fa24b6fea6244df87e1ee052bd3368c8baab1271bc5530903c5b04dd0f5b531134f9d3721923a3d4c20fa8c84d01a22398b26c49d967e1a3aeabf1293f7350 SHA512 c84a5b57154dc14ab93e1bc6cd33103495716c203a648d57044672c4218cb7e4e80110f7e6e7c0900c80c2e55843ecb190de4f61d0c72dcf9b1ada306348ce1f
-EBUILD kterm-6.2.0-r7.ebuild 2199 BLAKE2B d12704f08b0f28382451c80edb40c3e932b7236b66ffc8cc54aee62a857d161ad69bef19ff22009603e324d5be7a4fcdd7ff384e98971aebeb82c9c378d1813d SHA512 7c7993eaf44872a0702ededa2fe07687605c1d478038c0505ef545ed9c31b3cd4163cce3300e63a46eb48a4ba347f8195a100d69b9687ba556252cdba4db3281
+EBUILD kterm-6.2.0-r7.ebuild 2217 BLAKE2B 3205bd1081b83870f6b33fc7461eb0baaea2ff89e6b7cdc878f45ba1e2663701854f5bf9c16e37d968ecb3ffda7391036ef6478dc0e391b44a08dd656e439430 SHA512 d0c6f38ff93c459fad761bc477e4321968e8aa75c211d4b95b19f07edf47dec71e46f870bb86b8229588c56b4d2d8d8c33796cf955d0934948036c9f14310641
 MISC metadata.xml 235 BLAKE2B a3e5a3109b59e3f97ef14f8d55ba13b16dc5371a1b7d6f238230aa4494db32dd4a42e3ee012ec8b18fae394feb2b1b56882bc70504aa7c6b969c1b20140f0ece SHA512 7c4e5f5dea465e45c662f5f53513626088aff514e1326593426af227d77e63d8a00d8af05aa208881a399f83dd41e73cd2ef81c8b7f275a2fa891f295231d67c
diff --git a/x11-terms/kterm/kterm-6.2.0-r7.ebuild b/x11-terms/kterm/kterm-6.2.0-r7.ebuild
index 82a0e0e0ef31..5f674d0259b6 100644
--- a/x11-terms/kterm/kterm-6.2.0-r7.ebuild
+++ b/x11-terms/kterm/kterm-6.2.0-r7.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
@@ -28,6 +28,7 @@ RDEPEND="
 	!<games-board/xscrabble-2.10-r4"
 DEPEND="${RDEPEND}"
 BDEPEND="
+	sys-devel/gcc
 	virtual/pkgconfig
 	x11-misc/gccmakedep
 	>=x11-misc/imake-1.0.8-r1"
@@ -48,7 +49,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() {
diff --git a/x11-terms/root-tail/Manifest b/x11-terms/root-tail/Manifest
index d8a78d49f4f5..421498e2af9d 100644
--- a/x11-terms/root-tail/Manifest
+++ b/x11-terms/root-tail/Manifest
@@ -1,4 +1,4 @@
 AUX root-tail-1.2-kde.patch 3188 BLAKE2B 122e2ade46725c9e1dacaf5e68f283b3efe2c968407e48d7ee0567e10d5d360f479588ac1b9f6da74a5d0fec52e83ac51ddc6789d8b560c43a83aba5b1ba5ac4 SHA512 f99c8cd04664d7e1afe21854d2ba9114387c55fa89268aca7cbeb88ecfeedad26529bdfd2b52dbe88d74959f4943571bda1f518fb41d8827f04f25e250bc7fb7
 DIST root-tail-1.2.tar.gz 20805 BLAKE2B 29891f0bbedc18d6b4e6e726234d7abaf107fa96b3da3a38a5a3aa91edd00403ae52166491cd5ec59f903b12c0edcddc92a3576db3127a837ae9ac3480823c40 SHA512 9e0b046d3e22ad8e85baa356ae8850885759e28624840901465c88c5791595db89da8d7908446cfa52cef180d2ae5a6d3857310679dc37545b6a9cabdd1d3e10
-EBUILD root-tail-1.2-r4.ebuild 1075 BLAKE2B fd551413aab84e94f4dc07c68b5188fb4973363eccef0895b224a94510f393c75f9586be2ce298cbf93aa52f33a11f991c4ad3e7bb3abefec1b57146b4de1296 SHA512 e214bab918f3da289e680b810f5e409befa33524ea0b00b1963400bcf60fd11deb5da7a331d372f9e80d8c3fc828f4e17f95801d154d2d59cafb5857bc497203
+EBUILD root-tail-1.2-r4.ebuild 1093 BLAKE2B 38a9496bac810072374d1ae15ad9791c94f2c9af39efc4d8eaf74cc998199e093ee57db9d435e24748e77a014d5c16009bd3b267eca829e82e240745f549ede0 SHA512 92a0e27d31859770f02fbb72e06c6890aec1f39b69fc7d08d00dbd094820265e0ab04ed298e4d3abdaff9903380401c640aaaea0c8c2bfd922c07cbcac39209e
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
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() {