gentoo auto-resync : 30:09:2022 - 15:24:40

26 files changed, 135 insertions, 152 deletions

diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 717dd242156c..80f2002720e1 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/dclock/Manifest b/x11-misc/dclock/Manifest
index ffeb96c0377a..d5b4b0399668 100644
--- a/x11-misc/dclock/Manifest
+++ b/x11-misc/dclock/Manifest
@@ -1,4 +1,4 @@
 DIST dclock_2.2.2-12.debian.tar.xz 16112 BLAKE2B 3da6a75834791cbba71d84c8d46d65b18db6a9aa97a085d984b598c8db41fe507965390568377a9167823d0b3856165e58115aa74b05da35fd6432b44ea877e9 SHA512 c6c468a378e421fb9ef2c6e84db991644888f8d2d9afe220142ea26914423387d3aed335b43fa69b38501c3d713d5540bb2efc2e52dd0db1fa1cd3d9c00c1531
 DIST dclock_2.2.2.orig.tar.gz 63583 BLAKE2B b1208439e3a689ff1e00cbdbfa7e3a559b7ec7705ab0834cf350d1ba1e3dcd01d4746e90999f6215cfa9e101a4bd8cf42ff324a307c792028479077152b5414b SHA512 c43ba031fd0d9ba2bc7e8fe9becc73591bfc47cd4ca931df03fa55207cfb148e24e5d702a7de5af8b67e188c561eae2fb7da14162f6a982d0abbb3251c32372c
-EBUILD dclock-2.2.2_p12.ebuild 1437 BLAKE2B 072dbd61cc14fe6c58bbcb58270d68b978432cdc19e0f5ecec7b872c13b904969833da4870b28ffafb56fd9ebe0503f1ac79202d028e2e7d528bcb8b6d572781 SHA512 6cd05b5fa0a425daac38c27d5ae8aacaf73e22f0760b9382d6c36c468d2f5798fd6189d8e859d2681e05a0e3cedef6542e151f1c2b7a5651c277cb2817977f6b
+EBUILD dclock-2.2.2_p12.ebuild 1455 BLAKE2B c297bd957b3323018ae70bb06f34165a57fdae8b9f16c4aafeaf3bc3ebba8de76c88650d06d159e4bf9443b4288f7a0f81b06cd95cd01a94256f3dbeb921be5d SHA512 5a061080c5f1fcdf6b0458e7229465b90e42b3fe0ca00878f6e5ba65d0a2186d34f1240147366531893bb11d65279eb8207937a2b2823c608d5891ed9b954efc
 MISC metadata.xml 319 BLAKE2B 991d0f89b643d24c6fcea9a22d130a9e5ca23486e319c42517e2d07ac5f0680ea3989464cc3557c413556dd4b7eb938cea3dffa78031f06f358476cce132aff1 SHA512 536da7cc9bec7c9e42d88e736138d1efd55dc8d89adc74edfc6535f730f01937a7d3228528c6b78b9eb0e29b1807a2d4d4ca202595e2f693009221331981958c
diff --git a/x11-misc/dclock/dclock-2.2.2_p12.ebuild b/x11-misc/dclock/dclock-2.2.2_p12.ebuild
index aa4f9a6f28fd..40e1bc5b5574 100644
--- a/x11-misc/dclock/dclock-2.2.2_p12.ebuild
+++ b/x11-misc/dclock/dclock-2.2.2_p12.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
@@ -30,6 +30,7 @@ DEPEND="
 "
 BDEPEND="
 	app-text/rman
+	sys-devel/gcc
 	>=x11-misc/imake-1.0.8-r1
 	xft? ( virtual/pkgconfig )
 "
@@ -54,7 +55,7 @@ src_configure() {
 	fi
 
 	CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
-		IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf || die
+		IMAKECPP="${IMAKECPP:-${CHOST}-gcc -E}" xmkmf || die
 }
 
 src_compile() {
diff --git a/x11-misc/x2x/Manifest b/x11-misc/x2x/Manifest
index 1fa7f93d55b5..d07d8779f84f 100644
--- a/x11-misc/x2x/Manifest
+++ b/x11-misc/x2x/Manifest
@@ -1,9 +1,4 @@
 AUX x2x_1.30-10-keymap.patch 3825 BLAKE2B 1dade51328dad2587e1ef9d13d86bb9ef53b3c88092402286a3371af2d6b18791844fc7aae45c260b1575ee24f50f0dcfc85b5554a10a9615b0810edc9413d97 SHA512 8ea3c6f7b219e5e8649d27108c89a1b253f73a3bede3c107eaa09ae1ca38634eeb391803f1dbfe05a5ec82e1ad31162c194f1f142203d342e980edc6e13ff143
-DIST x2x-1.27-keymap.diff.gz 1145 BLAKE2B cca78c368a9f5a27c94121eec12ab800322d1b0549c1be940b22dd455cbd42761283d1646bba8e098b94364cd6023ef6e615df9f788cf68913af967077eb6de9 SHA512 46e0d9cef4b985523e4bf2d6c550d68f488c0975a007433f2a6c03d77541ce0cbdffd44ea29472fa6db4e8b804503cdaf9e8b5f9d72c56d902270cf3291ca37f
-DIST x2x-1.27.tar.gz 16776 BLAKE2B 8f78d801c1911928b0d5bb37b406bcf5285d3a54daf5067abae40125ad4e4f7fc52b8cc74f4e1c35b99350fc794f80c26120cae48e5076326746ec87d7aee0f3 SHA512 c5f8b1ec49f9871bf0d8142a047a2dff9a6ee262dfafd459044c977973dd45e297186961a8793938fc8e328f2553ec4de97e06343bdf3550f3bc3f2368b23131
 DIST x2x-1.30.tar.gz 52760 BLAKE2B fae2eeb9aa68241c3ba9e79021aa9313a5852048f23b6be8ad5de7dd090d2cd09c006f4c1b1403ccfa8057f314657c2248463a7c53187e41291742cfaa04139a SHA512 cb14b40e1511e3fe6c927443f5f411a827ebf6c313bfb46af0165eebdd534c8aa3abcc8064b89420b7f44c23c518ed4f02bab4c23bbcfaece8910a3f824c9c11
-DIST x2x_1.27-8-initvars.patch.gz 494 BLAKE2B 97d48f4a2e7b65fd6755860c51399e5b6343bd0c7e6c79c7dd311792a899a02ed0ac6991d16495e96ca34913fbcec011b106bac6d0f9798540fb5704ca12f4cf SHA512 53060affef7575106932380063616473103c738193fdeab9118e0fb9ec1d1de2fe63f4112e5af82fe38198d0b42a10effde574bb9dee95c8fefdbdf680dbdf01
-DIST x2x_1.27-8.diff.gz 13291 BLAKE2B 4a4a0bf34a864596cff2f0722163bfe53968e30892bd0a18ed18ca6c3ef8f5bc763b215381c46792b499839397dbecab033bd9095646fad36613ad11beba1240 SHA512 8201ab5fd0efd93adec53cec3b48f7b4de907b2db184ffa6e85a1e16739b4d0021f4562820d0b4730a0f6a2779985b5574973c2b0ceb04b241f0d7dc15060b71
-EBUILD x2x-1.27-r3.ebuild 1472 BLAKE2B d31f4329ed5974fcda95f5f8c40b9989d0533bae79a4f6aa3c5e3bd1b100b158819095b433603527054d79e89082761fee5c29d121f7eebd4e20f8c85d8c2d08 SHA512 6d6a8605cf947b97701f2581a93973e6a8356c9dcdc0d2f9d0bcf77930c7800673044f4192f2ebb7e9b35e9ae2fa1bb6f25591cfbe022563d78af68586bb6aa6
-EBUILD x2x-1.30.ebuild 1006 BLAKE2B 673065480bcd1004dc1a024d7d92b38dc8a8b4a9ebf72f57d1da676df685883c623265a5a24a567708850717a180e332fd2112271df988092a0ba6aaa4338d10 SHA512 ea2e3ad5092a2cf55002fe5591faf6ea369df54fc92da684088221d67bfde6a8c23090b048e3fe90b500df5619dc3a4443f18c4941157a35c44fd750a7cf070e
+EBUILD x2x-1.30-r1.ebuild 973 BLAKE2B 332430780d9ce5cc84ea75903a41a8dc1a5a94653958a0cc190af8383d1eac3129d8865fb278cf0f416569fa165e445888474ca91737a83c6b199a16a697db7e SHA512 a3cee4b00b386c63195603e182d43a6821759588a2151a5a68572015abdb1ffe6e86346763951b671f1d0d0b9f69e5617676ffd1448781638ce2eba9224a0913
 MISC metadata.xml 405 BLAKE2B 8b71db6f16bfb481e524a331eac615661b267d2d2fddde3aa6c9244b75026eacada167e2ed2ad6e7611bad234b53c0b073063925ae6745832585771d5342c913 SHA512 23f707e5ed833c5901d482e0d9cedbae751434311d8c67e7b300b452faabd958eb0c12a5b1c48a3c6d4773891cf3c7426d60a85eecd4b3ceb3358f68f4c8ad87
diff --git a/x11-misc/x2x/x2x-1.27-r3.ebuild b/x11-misc/x2x/x2x-1.27-r3.ebuild
deleted file mode 100644
index 3fa95a9e0e9a..000000000000
--- a/x11-misc/x2x/x2x-1.27-r3.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="A utility to connect the Mouse and KeyBoard to another X"
-HOMEPAGE="http://www.the-labs.com/X11/#x2x"
-SRC_URI="http://ftp.digital.com/pub/Digital/SRC/x2x/${P}.tar.gz
-	mirror://debian/pool/main/x/x2x/x2x_1.27-8.diff.gz
-	mirror://gentoo/x2x_1.27-8-initvars.patch.gz
-	mirror://gentoo/${P}-keymap.diff.gz"
-
-LICENSE="x2x"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~mips ppc x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXtst
-	x11-libs/libXext"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-text/rman
-	x11-base/xorg-proto
-	>=x11-misc/imake-1.0.8-r1"
-
-PATCHES=(
-	# Patch from Debian to add -north and -south, among other fixes
-	"${WORKDIR}"/x2x_1.27-8.diff
-	# Fix variable initialization in Debian patch
-	"${WORKDIR}"/x2x_1.27-8-initvars.patch
-	# Patch to fix bug #126939
-	# AltGr does not work in x2x with different keymaps:
-	"${WORKDIR}"/${P}-keymap.diff
-)
-
-src_prepare() {
-	default
-
-	# Revert part of debian patch messing with CFLAGS
-	sed -i '/CFLAGS = -Wall/d' Imakefile || die
-	# Man-page is packaged as x2x.1 but needs to be x2x.man for building
-	mv x2x.1 x2x.man || die
-}
-
-src_configure() {
-	CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
-		IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf || die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CDEBUGFLAGS="${CFLAGS}" \
-		EXTRA_LDOPTIONS="${LDFLAGS}"
-}
-
-src_install() {
-	default
-	newman x2x.man x2x.1
-}
diff --git a/x11-misc/x2x/x2x-1.30.ebuild b/x11-misc/x2x/x2x-1.30-r1.ebuild
index e1ea883c0b2f..505f19649f03 100644
--- a/x11-misc/x2x/x2x-1.30.ebuild
+++ b/x11-misc/x2x/x2x-1.30-r1.ebuild
@@ -8,28 +8,25 @@ inherit autotools toolchain-funcs
 DESCRIPTION="A utility to connect the mouse and keyboard to another X"
 HOMEPAGE="https://github.com/dottedmag/x2x"
 SRC_URI="https://github.com/dottedmag/x2x/archive/refs/tags/debian/${PV}-10.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-debian-1.30-10
 
 LICENSE="MIT BSD"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~mips ppc x86"
-IUSE=""
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXtst
 	x11-libs/libXext"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-text/rman
-	x11-base/xorg-proto
-	>=x11-misc/imake-1.0.8-r1"
-
-S="${WORKDIR}"/${PN}-debian-1.30-10
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	# Patch to fix bug #126939
 	# AltGr does not work in x2x with different keymaps:
 	"${FILESDIR}"/${PN}_1.30-10-keymap.patch
 )
+
 DOCS=( README AUTHORS INSTALL ChangeLog ChangeLog.old )
 
 src_prepare() {
diff --git a/x11-misc/xautolock/Manifest b/x11-misc/xautolock/Manifest
index 5d8ed22fcb12..d5f2bbfa426a 100644
--- a/x11-misc/xautolock/Manifest
+++ b/x11-misc/xautolock/Manifest
@@ -1,5 +1,5 @@
 AUX xautolock-2.2_p5_p1-waitpid.patch 777 BLAKE2B 82031ddb959208db99472a72db6c1e8079a0f22ac91084742ed93df51b27e42fcabce36009f811f5d456e6ff803a08c75651ef7fbb9eab4248d79d3e09f8cb27 SHA512 4ac7fee35265c996a6bc82e3895d69e702b33e164f904da3dd022ce0f591b721c8e74493a53633695f66e332464a63007548fd24181b00b7dcd4228475355411
 DIST xautolock-2.2.tgz 35288 BLAKE2B 0cd709470002d7a6852a41a56e9f6b540405e172f30e3243a93b578e362f117a3ddd3b6ff15e653eb5466d15e7ff1d5505c19ccfd27d6e7d6ccae4c826a689ac SHA512 5f9dcc25cda706610e77a74235c4b421ca3a833d154b1a269057f0774579e1c6ec36fe0e5be5fadd6942ce8c1640a760f891397586b162e6024b524635153d04
 DIST xautolock_2.2-7.debian.tar.xz 7976 BLAKE2B d56687d0eee58e513eae152f2d6d30496346935a05410759eb116eb9fb19c3073db10f1393ab26ae5a63436693b82557b01c0dc18be75af4ee04de8a783bc618 SHA512 5cc0cce408466a57fc99d701199b6a1b3545d9faae86e2474450263a07fbe9920dc89cc3ac14bd8a00274e7e80768be3e360e81ad7378bcdbe34ada23958745a
-EBUILD xautolock-2.2_p7.ebuild 1207 BLAKE2B 0a9f35b8d8975855dc21f4b7b56494128fed9b9863a2562421fcdf73b73b5c696cd5fd2a76523d7eaebb738be4e333a014664fbe642186b656504b6183dd53b0 SHA512 6722c5ce27572ed03eae2e04ce229c30971e83c30f3d2f8b93f260c886b7c2511c925cb6419350d61eddd7d829659f9b7f3d6d6b82b4369521946d69897a37dd
+EBUILD xautolock-2.2_p7.ebuild 1228 BLAKE2B 255e2e3aa172829ee5f88cbea5c1d31f3b77c83ff9a89124ed5efe2c5fddab1312e8cf06dadca5d61a18fb7019a13ec2d3129a3d535d6a0875371e379bf17c22 SHA512 09b6d24d8974b87216ffd47c0b4a6caa2c4d90063ca337c7fc4a3a1a8023951a3cdea7075aed19a237fc8d6182cdc28917976bc349562f972a6e47433da68227
 MISC metadata.xml 641 BLAKE2B c66b9c9462ff9e7b1ae6bdd899bdf3cf6240db0b34ee6d4855a6e27ceb94b9d7dd7d8bfadf2a08a0e82308e15385f8ce32b65e3b5072ca7c696542c51c98fe2c SHA512 9991bb88ef1e7f0840981d9687fc49328a774f4bf9103bfe149ad725d41c394c91d72ecc9f7622deebefd3c2ca6889d83e4c5141265459e57c07011dbcda8dd9
diff --git a/x11-misc/xautolock/xautolock-2.2_p7.ebuild b/x11-misc/xautolock/xautolock-2.2_p7.ebuild
index 03cb72de3b8f..fd84f8e1b114 100644
--- a/x11-misc/xautolock/xautolock-2.2_p7.ebuild
+++ b/x11-misc/xautolock/xautolock-2.2_p7.ebuild
@@ -19,10 +19,13 @@ KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 sparc x86"
 RDEPEND="
 	x11-libs/libXScrnSaver
 "
-DEPEND="${RDEPEND}"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto
+"
 BDEPEND="
 	app-text/rman
-	x11-base/xorg-proto
+	sys-devel/gcc
 	>=x11-misc/imake-1.0.8-r1
 "
 PATCHES=(
@@ -38,7 +41,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() {
diff --git a/x11-misc/xbatt/Manifest b/x11-misc/xbatt/Manifest
index bc0a95557c7f..e85ab3736842 100644
--- a/x11-misc/xbatt/Manifest
+++ b/x11-misc/xbatt/Manifest
@@ -1,4 +1,5 @@
+AUX xbatt-1.2.1-clang16.patch 112 BLAKE2B 713802bda8be896d90b90cca1ec583cf1c436eae7d95c6478a167fa3e7d46cafa534770a06db84d42c3e842f75dfd0baa8a8af91acae469f9636415cd42a15aa SHA512 b0c154d3e356f09bc38da01a5aca1c7f13d053a0ede79c5d42aeeeb1cdc53908929d4a390f4a59ea232257c6efe2133860f0b6c22f8a83d45c7ebba5eea3384e
 AUX xbatt-1.2.1-implicits.patch 301 BLAKE2B 9e7a8b0f2a88ed56857a9f2836f4ac2b916323625e748f6d980d334dd958e6c0c8b442103af5312b1176d386c802d524c1e1b5f0012a18acfc73eb163c247e7f SHA512 defdd56e8a52147afc3f924a1e462bdce4c6200a7300f442a46cc1a4eaaa7ffdc0e52c70683f23774e20e6480c91e094db4f834073c71b1c30a3f4d24c145353
 DIST xbatt-1.3pr1.tar.gz 14412 BLAKE2B 7dc44305ac966c41cee8e62a8bcaa0ea991b13b3f126d09c5e80e60bfd4d2becbf57a657d41ee0db36c8a5d9a0366e255c5c893895fd253eb39dcd60a9227b51 SHA512 f6022a2d464e22a31c8246f20c4dcab2be381ec63a02fb9ac1d3e28dc9bdf26a949735b2eba800941f5dfde371913ea7a560413191197c44a0c156a58a60d41d
-EBUILD xbatt-1.3_rc1.ebuild 971 BLAKE2B 0830f168c87812327d0d12b3f22b8381ecf192787f77bb7202138eea3c70fcde6030d71dd2610c34cade381f5d9478c3420a6876219f28778856ccfb1b0292f9 SHA512 2da6924c5d0f0b27641dfd29e41ba94d05bd02f77f4e80c57618b9313bf0322b5d6b9ea9fcca6e1a7ae823bf037c714b0df5a57985847e46a8141a4c25c44472
+EBUILD xbatt-1.3_rc1-r1.ebuild 1019 BLAKE2B 56790052696400fb14cb18e46973af522f7e3905ade06ccaa0f0f7d9eae529d6d71906b086a21a1024a25f596398979a25eb5775e0f7cdfd28eea5006df08f37 SHA512 f36320b6f59846d781cada3bed9200f2e6e48e4ee2838466e02052bf7c5388bb65f31b49b3ae47c217e6c8352f201c76608f49d39cb87b404212c609f86ef0e0
 MISC metadata.xml 319 BLAKE2B 991d0f89b643d24c6fcea9a22d130a9e5ca23486e319c42517e2d07ac5f0680ea3989464cc3557c413556dd4b7eb938cea3dffa78031f06f358476cce132aff1 SHA512 536da7cc9bec7c9e42d88e736138d1efd55dc8d89adc74edfc6535f730f01937a7d3228528c6b78b9eb0e29b1807a2d4d4ca202595e2f693009221331981958c
diff --git a/x11-misc/xbatt/files/xbatt-1.2.1-clang16.patch b/x11-misc/xbatt/files/xbatt-1.2.1-clang16.patch
new file mode 100644
index 000000000000..9a7c03157738
--- /dev/null
+++ b/x11-misc/xbatt/files/xbatt-1.2.1-clang16.patch
@@ -0,0 +1,8 @@
+https://bugs.gentoo.org/870412
+--- a/xbatt.c
++++ b/xbatt.c
+@@ -223,3 +223,3 @@
+ 
+-main(
++int main(
+   int	argc,
diff --git a/x11-misc/xbatt/xbatt-1.3_rc1.ebuild b/x11-misc/xbatt/xbatt-1.3_rc1-r1.ebuild
index df26d01cbd2c..460d865a6a04 100644
--- a/x11-misc/xbatt/xbatt-1.3_rc1.ebuild
+++ b/x11-misc/xbatt/xbatt-1.3_rc1-r1.ebuild
@@ -1,13 +1,16 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit toolchain-funcs eapi7-ver
+EAPI=8
+
+inherit toolchain-funcs
 
 MY_PV=${PV/_rc/pr}
+
 DESCRIPTION="Notebook battery indicator for X"
-HOMEPAGE="http://www.clave.gr.jp/~eto/xbatt/"
-SRC_URI="http://www.clave.gr.jp/~eto/xbatt/${PN}-${MY_PV}.tar.gz"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="mirror://gentoo/${PN}-${MY_PV}.tar.gz"
+S="${WORKDIR}/${PN}-$(ver_cut 1-2)"
 
 LICENSE="xbatt"
 SLOT="0"
@@ -19,21 +22,22 @@ RDEPEND="
 	x11-libs/libXaw
 	x11-libs/libXext
 	x11-libs/libxkbfile
-	x11-libs/libXpm
-"
+	x11-libs/libXpm"
 DEPEND="
 	${RDEPEND}
-	x11-base/xorg-proto
-	>=x11-misc/imake-1.0.8-r1
-"
+	x11-base/xorg-proto"
+BDEPEND="
+	sys-devel/gcc
+	>=x11-misc/imake-1.0.8-r1"
+
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.2.1-implicits.patch
+	"${FILESDIR}"/${PN}-1.2.1-clang16.patch
 )
-S="${WORKDIR}"/${PN}-$(ver_cut 1-2)
 
 src_configure() {
 	CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
-		IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf || die
+		IMAKECPP="${IMAKECPP:-${CHOST}-gcc -E}" xmkmf || die
 }
 
 src_compile() {
@@ -46,5 +50,5 @@ src_compile() {
 
 src_install() {
 	emake DESTDIR="${D}" install
-	dodoc README*
+	einstalldocs
 }
diff --git a/x11-misc/xearth/Manifest b/x11-misc/xearth/Manifest
index 046592d4aebf..1344042bd9ed 100644
--- a/x11-misc/xearth/Manifest
+++ b/x11-misc/xearth/Manifest
@@ -1,4 +1,4 @@
 AUX xearth-1.1-include.patch 231 BLAKE2B 803cdd036a1018ab85bd3acc30a6f6168a3596c04dd7de7196983b6c53b10e443d2ed043f61faa35b1ab87f28496f5865f128008b604efed41a74af3effc0d0e SHA512 9e4fd1d44eeda5c79ab22ceeb20fd005cab71869bcadd17adcb1cee10157c35145e7c7aa6d3c62f3da1be83cc79763b9ad77cfaddd4021dbcb56c8efcbccadb7
 DIST xearth-1.1.tar.gz 157887 BLAKE2B 2dfc43b1a8fadeb7d30a4234496f44171cd138975e84b295e60d0f9855c1f3b011340b2b3aecb98d75fde2a71fdddb4e959ba84e89204f246915b7cd1a76efc1 SHA512 ab1c146385a0e61f6208a0218cabc8a10902f52feb50f328a330cdbddc5d2eff2c3efdf6719b625bcc07171ed2fd6201230ad8a71cd77a451ad9c81383bfd46e
-EBUILD xearth-1.1-r1.ebuild 1000 BLAKE2B e5b4b46bf294cdc4eee5a6d657589b09679d9e512e49c0bcd5b8a9888c16dcadc0546455c7c99193e9cbbfdf61797f9e2a722312ed0dc37ae4219c6053ec46d4 SHA512 d93139097cb4ae343f7daab9d1bb120faf21c97fda5148c1832e5f744a2b2c1b8a58eac0e4bf4cf70f24dc11b16851d24b6f8791bdfa53901031482e4ed21c62
+EBUILD xearth-1.1-r1.ebuild 1021 BLAKE2B 4d39ebc3a16a54a8d285371ce75706cab81d27c007538195d90b952b0e74fc75c4d54fc22d63892f691e21234084e7d0144458121f51b037d8667384e1761de2 SHA512 b46930711e47cf2fb9acfbada5ad993fd705c6149bd718f14218d3fdaf36bf26c1b8d84cc96f1a7ed2e6e32d9edfd1de9c3ab16942c641bf6cecde1ed2c5d3ae
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/x11-misc/xearth/xearth-1.1-r1.ebuild b/x11-misc/xearth/xearth-1.1-r1.ebuild
index 542041ede4a8..d80d0c43e7eb 100644
--- a/x11-misc/xearth/xearth-1.1-r1.ebuild
+++ b/x11-misc/xearth/xearth-1.1-r1.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
@@ -18,20 +18,23 @@ RDEPEND="
 	x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXt"
-DEPEND="${RDEPEND}"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto"
 BDEPEND="
 	app-text/rman
-	x11-base/xorg-proto
+	sys-devel/gcc
 	>=x11-misc/imake-1.0.8-r1"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-include.patch
 )
+
 DOCS=( BUILT-IN GAMMA-TEST HISTORY README )
 
 src_configure() {
 	CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
-		IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf || die
+		IMAKECPP="${IMAKECPP:-${CHOST}-gcc -E}" xmkmf || die
 }
 
 src_compile() {
diff --git a/x11-misc/xfishtank/Manifest b/x11-misc/xfishtank/Manifest
index 9b3c2b243720..82f894e4729d 100644
--- a/x11-misc/xfishtank/Manifest
+++ b/x11-misc/xfishtank/Manifest
@@ -1,3 +1,3 @@
 DIST xfishtank-2.5.tar.gz 153464 BLAKE2B 0bb3121b84c3d08ea2251a70f9ad569e90fe6299ad3ee4942ec83d80483fcf4db0b0079161c28ff63461597f76b0d0532a65c1bde8aa821ff6bc92be189843f2 SHA512 1bfe16737bdbc2b7cf74abb98408bf632d8881f15753005424f84eba4afca756b07fa7ad424df800ee3f3e46e033b8f60142877bcd9a7e4e806e318ee283721f
-EBUILD xfishtank-2.5.ebuild 807 BLAKE2B 04870b17b7819646d3df34d371ce2f03763a4b5aca7620e333e41507e9cd073c94c3aa5dddc642bb010da0fc86dace11cbbc8d881a938b3184acb86a20054519 SHA512 7b93cf3e87cee2b3dd0a85d7491e1eb9c72a095fb317388912c497a78090a081d96a313f0bacc8289a92219e63461cf424f0ea14a50537cd405a62d67716d3e5
+EBUILD xfishtank-2.5.ebuild 828 BLAKE2B 63203c1736603327ee64ea4910db3e1fea079c8c49fd6ad7918bbd23bb33c1932053b421ad7469b7fd4aa709f11240aa802e2480ba1d35ed343de728a49d42c2 SHA512 9edda682d66e059a3b4b8e3660ae1516e1bdb68dd9e86a1693d46d2a8fd93d3d0b1d2e940fca152d514d9f4d9f28679f7a4b94a93c9a30264a9e5e684037c9bf
 MISC metadata.xml 277 BLAKE2B ebaa8353413cfc5519fce99f8627c71cf765fc6d42b42651e232274de315487c156d45dcb23a401dffb8f112600b0dadd56f93d2283ff86b4293dc5490ad4059 SHA512 c8ef9069153b124118a6be64375c6954ccc6f518a13805e4ff1c33c9cec136170132a580c4a9781930b709c93678c94d6448291625de34d18fea41bfd17f685d
diff --git a/x11-misc/xfishtank/xfishtank-2.5.ebuild b/x11-misc/xfishtank/xfishtank-2.5.ebuild
index c8e58903ac86..48df2a9e84c5 100644
--- a/x11-misc/xfishtank/xfishtank-2.5.ebuild
+++ b/x11-misc/xfishtank/xfishtank-2.5.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
@@ -18,16 +18,19 @@ RDEPEND="
 	x11-libs/libXext
 	x11-libs/libXt
 "
-DEPEND="${RDEPEND}"
-BDEPEND="
+DEPEND="
+	${RDEPEND}
 	x11-base/xorg-proto
+"
+BDEPEND="
+	sys-devel/gcc
 	>=x11-misc/imake-1.0.8-r1
 "
 S=${WORKDIR}/${PN}
 
 src_configure() {
 	CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
-		IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf || die
+		IMAKECPP="${IMAKECPP:-${CHOST}-gcc -E}" xmkmf || die
 }
 
 src_compile() {
diff --git a/x11-misc/xkeycaps/Manifest b/x11-misc/xkeycaps/Manifest
index 071c1edf367d..7701531cf3cc 100644
--- a/x11-misc/xkeycaps/Manifest
+++ b/x11-misc/xkeycaps/Manifest
@@ -1,5 +1,5 @@
 AUX xkeycaps-2.47-Imakefile.patch 595 BLAKE2B a4ecbb62eb308357b77a7633eb8c1eb0a8fe25d17e6e912e416120003996438b51684ab60cbe840c5be7b217ce0c283890f40a5c997b952d8d31ab23a4a58c5a SHA512 3412fd9db48460a97c5630a9641bbf147e905b5c5ce357627d6f65e669d044cfb88f271506767a26fd3a6791d5ffa06af85eeb7ebfdb932c20dfcd088c7b2307
 DIST xkeycaps_2.47-7.debian.tar.xz 7268 BLAKE2B 86ddfd8b2ec8761b8e4a4c4de93fcfd0b88c018125c20f987bf5f47ea77edb5b996a3ed45c3fb2452c7647d6f1a3a2583bdd17f0442435d83afa3dbbc280d285 SHA512 85d72cbd4012299ab60ab700049862c1ab514c904acb8e3810fd7886cacb0712c3849fbc52dee499007d97ce8aa301a34d901120a46ba15a32151986121fbbbc
 DIST xkeycaps_2.47.orig.tar.gz 351418 BLAKE2B 0dfd53e6b7af6c14057e56071b70edf3479a55ab4e6ed9651cd5acec68c1db8096264dc8d5b578ccb62b331ad6f14ec8f1b8d0363b614d14b0ba9ce60492b55b SHA512 f5f5ecdf83c2bd86eb3d8b8a28b26af25a2dc9ff0a9c44091d8eb154d617b4373191a2e4479bb0e3025c023d6e5d785a088c64bc269c1c43431a3d2fc91c1a7e
-EBUILD xkeycaps-2.47_p7.ebuild 1260 BLAKE2B cc6eb758ef2cae0f0b284decf7ff2b1560e3b94717cae9cf8ef4e4f8c0f590f9bde143cf77160a9e19798f0ff07aba68ad6ef5836be33c5bc2b65b5bf0f9c1b6 SHA512 4661fef22ef026a89b429bad72e7d7eef483719a4eac4b2be6187de6b6add3ca1dc1106927050c3e546b495e4becf8b3c65606f5b0dfb9d673c5306f8348ab48
+EBUILD xkeycaps-2.47_p7.ebuild 1263 BLAKE2B 325b42f9f725264dc251303fa23ba681dc44507b5a4a46d292667532d23af8089c7334dadb0383c596bf5e39ab67ef3f8aa137f7d6438dda872c7925e4732c8e SHA512 44abc4a1431fb4975864ef409c1a6b9889e48d0c41d471fc8d44d6223d749126543321e148b7e9d554e0620fcad40953ad2aa848977e09b6c7bb0c8c45897f7d
 MISC metadata.xml 277 BLAKE2B ebaa8353413cfc5519fce99f8627c71cf765fc6d42b42651e232274de315487c156d45dcb23a401dffb8f112600b0dadd56f93d2283ff86b4293dc5490ad4059 SHA512 c8ef9069153b124118a6be64375c6954ccc6f518a13805e4ff1c33c9cec136170132a580c4a9781930b709c93678c94d6448291625de34d18fea41bfd17f685d
diff --git a/x11-misc/xkeycaps/xkeycaps-2.47_p7.ebuild b/x11-misc/xkeycaps/xkeycaps-2.47_p7.ebuild
index cbac2508a679..be540734790a 100644
--- a/x11-misc/xkeycaps/xkeycaps-2.47_p7.ebuild
+++ b/x11-misc/xkeycaps/xkeycaps-2.47_p7.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
@@ -23,10 +23,12 @@ RDEPEND="
 	x11-libs/libXt
 	x11-misc/xbitmaps
 "
-DEPEND="${RDEPEND}"
-BDEPEND="
-	>=sys-apps/sed-4
+DEPEND="
+	${RDEPEND}
 	x11-base/xorg-proto
+"
+BDEPEND="
+	sys-devel/gcc
 	>=x11-misc/imake-1.0.8-r1
 "
 
@@ -47,7 +49,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
 	sed -i \
 		-e "s,all:: xkeycaps.\$(MANSUFFIX).html,all:: ,g" \
 		Makefile || die
diff --git a/x11-misc/xsnap/Manifest b/x11-misc/xsnap/Manifest
index cf8b714bb28b..e83b0286d5af 100644
--- a/x11-misc/xsnap/Manifest
+++ b/x11-misc/xsnap/Manifest
@@ -1,4 +1,5 @@
+AUX xsnap-1.5.15-clang.patch 405 BLAKE2B 60bf4d05d5471a4163867df8a501a2c6ee08be497eca25663ad787e0e26406eced4591ef5ca4b20490552a212f68e2ecd9fbc2ef13bb5d0682279d7626dac09d SHA512 0effe1685869ad4ea593fe7c82447afcf428e3ea2fa79dc151e6ef1890bb92ea00680c49ddedfeaf0df01abc62679d96c800ebfddb8ac2c39f7cfb6bb4ddecc1
 AUX xsnap-1.5.15-root_name.patch 228 BLAKE2B 5a05da8ed5f708811a1792162bbc2dc1ea01a3666391c861296fb05706d3d1a4998764d3cd98c2847cd36573f0841966d0c16bb6fb22531055ec01fcc3d49354 SHA512 965a26474cdbe809a26559ac431aa9acdbc20ff5469e58f8b95b9da0eb58e278040f233bdc42fd54aea6f556fa2a801f6f0ca610a2ed4caa100172cb9ead4ed1
 DIST xsnap-1.5.15.tar.bz2 46574 BLAKE2B 4d0f67adea6f456bd92031752a307293d736b9ce14aa35435359ed7bdb9d774827130e95f526f363bc7f0bb3c8e3e637c3e4abdf7f9c157f15f7559bae3eba99 SHA512 898914dd0bfec93b641815cc07522d4ea6168266a7f5efe75715cf68555e8959a72b40b0a02e75244348afc6aa77d267fbe7ee60670da5f33e6db2f6c4476dac
-EBUILD xsnap-1.5.15-r2.ebuild 1392 BLAKE2B 606de45eef077fa066870abcb006b2fab9f3439120c3b75c052a086768193cb65fa1a4aa1a005c512f23becd335f961ce1c41f9cc99e4fb0afad62a98db7815a SHA512 d0c7690570623b54b467a816d4d7c5c3a13cf57e4d32d682d785aaac10d5b5a9b1a5e176c289f72409b14743ae0169bf51a5cd7d886986e24579963d42312b0d
+EBUILD xsnap-1.5.15-r3.ebuild 1439 BLAKE2B 69b5d7d668df205854eb98e53333e666c39f9e8ebc83cb909e104d49210cb36bf0d4121175396e22edd8b09fb0b524318faf176df20ac2e9cdce3e54727a433e SHA512 20eb04e42b61c5b2786a37f9c5e4d9c51b701176d84c6a7ed94645eccb6c9ebd486acfd664e02c46a4fcfd51c061d164c0490e48516f321d3184921f74462ccf
 MISC metadata.xml 283 BLAKE2B a331b1e9ff53500aeb6cc233060b012baa15650c7f7536cb91318e680c334d90b2cf5c61cae6b86d24e0a483831e7c2f9ed920b68aaae7ea8bb6c100313d61d4 SHA512 3c79af7b17da8a8179b4e996c70d8caa00e15ddc774d0d22b28c851eb18783f2c416af528e14f37c14869612c4d7420ecacf5333114c6b15a479f12f3b75c3f2
diff --git a/x11-misc/xsnap/files/xsnap-1.5.15-clang.patch b/x11-misc/xsnap/files/xsnap-1.5.15-clang.patch
new file mode 100644
index 000000000000..9b51bcb33e5b
--- /dev/null
+++ b/x11-misc/xsnap/files/xsnap-1.5.15-clang.patch
@@ -0,0 +1,17 @@
+https://bugs.gentoo.org/870811
+--- a/xsnap.c
++++ b/xsnap.c
+@@ -150,2 +150,3 @@
+ Window win;
++int init_cursor;
+ {
+@@ -1706,3 +1707,3 @@
+    static Window win0 = None;
+-   static w0 = 0, h0 = 0;
++   static int w0 = 0, h0 = 0;
+    int i, j, d, w, h;
+@@ -2254,3 +2255,3 @@
+ 	if (op_mode == 0)
+-	    exitXsnap (NULL, NULL, snap_pixmap, copy_gc);
++	    exitXsnap ((Window)0, (Window)0, snap_pixmap, copy_gc);
+ 
diff --git a/x11-misc/xsnap/xsnap-1.5.15-r2.ebuild b/x11-misc/xsnap/xsnap-1.5.15-r3.ebuild
index dd43dcab6432..560e1574bb68 100644
--- a/x11-misc/xsnap/xsnap-1.5.15-r2.ebuild
+++ b/x11-misc/xsnap/xsnap-1.5.15-r3.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
 inherit toolchain-funcs
 
 DESCRIPTION="Program to interactively take a 'snapshot' of a region of the screen"
@@ -11,28 +12,30 @@ SRC_URI="ftp://ftp.ac-grenoble.fr/ge/Xutils/${P}.tar.bz2"
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="amd64 ppc x86 ~amd64-linux"
-IUSE=""
 
 COMMON_DEPEND="
-	media-libs/libpng:0
-	virtual/jpeg:0
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:=
+	sys-libs/zlib:=
 	x11-libs/libX11
 	x11-libs/libXft
-	x11-libs/libXpm
-"
+	x11-libs/libXpm"
 RDEPEND="
 	${COMMON_DEPEND}
-	media-fonts/font-misc-misc
-"
-DEPEND="${COMMON_DEPEND}"
+	media-fonts/font-misc-misc"
+DEPEND="
+	${COMMON_DEPEND}
+	x11-base/xorg-proto"
 BDEPEND="
 	app-text/rman
 	dev-lang/perl
-	x11-base/xorg-proto
-	>=x11-misc/imake-1.0.8-r1
-"
-DOCS=( AUTHORS Changelog README )
-PATCHES=( "${FILESDIR}"/${P}-root_name.patch )
+	sys-devel/gcc
+	>=x11-misc/imake-1.0.8-r1"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-root_name.patch
+	"${FILESDIR}"/${P}-clang.patch
+)
 
 src_prepare() {
 	default
@@ -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() {
@@ -62,5 +65,6 @@ src_compile() {
 
 src_install() {
 	default
-	find "${ED}" -name '*.1.gz' -exec gunzip {} \; || die
+
+	find "${ED}" -type f -name '*.1.gz' -exec gunzip {} + || die
 }
diff --git a/x11-misc/xtitle/Manifest b/x11-misc/xtitle/Manifest
index c86fc708ec3d..e83df9569dc7 100644
--- a/x11-misc/xtitle/Manifest
+++ b/x11-misc/xtitle/Manifest
@@ -1,3 +1,3 @@
 DIST xtitle-1.0.4.tgz 10528 BLAKE2B 5461c538e2fb9a55ab9ba92c04f4543c70621982ade9142f59934be231d7ade7a886e413b31759ef1d64189d440db4ab030cba509a69a89ba5d2c2aedcbcd571 SHA512 6ed2b9fa5327dce0a2347631acf57517bc45f1bc7c88f098e5be70ec7acd844d1697da81c528046db897d7fd7be3b893f1fc79b010dd52c908c42a609f051cb6
-EBUILD xtitle-1.0.4.ebuild 617 BLAKE2B c307698bb99df4aeb3c09ba1e53f796afc2a576ec65b04f00dc3541b33ff94c8e3a978cca75683204042b325423209a8cc08dacfb3192d5abbff2873f07a34fc SHA512 b32575b2f4d5d9c75bde742822f285547f605f026e9984e813dd079fdab70ba1b24c9a0d4af8a5a1f8850ef5501a8afadb3a8d05192685a2f27fa4684456f96e
+EBUILD xtitle-1.0.4.ebuild 622 BLAKE2B 2b9153366a4cc42c83dd11b4e4379a2792b9c89e3ed30d38637c1f50b5501d746f3219c69d34ed8f58bf1076b7e2263a96264742a438c444b0dae53974c14f58 SHA512 c91ae36fd59a40339c9d37001f7743de9cbb1d715e8330e6d2c7a4cd1184d81ab7162d52ef9d4413203d604c32abeaefef95aa4a6691c0c051a30ba154acfc14
 MISC metadata.xml 248 BLAKE2B dba7ab19012197ff483b3c5febb6e1eae41d23999686b287a45c38e89ff7565454473fac44579b1e367345933bd749897f8e737f50eaf024190c42069a3d4d16 SHA512 abd659f01838c035f4dfeb2c13e95a0e8e249b41d093af54ff31b4d87bfe03ae472e911a20ff0ad3ea6bb9718dbab822c8b7553ac0a7a59c1d09db7b4d910ea9
diff --git a/x11-misc/xtitle/xtitle-1.0.4.ebuild b/x11-misc/xtitle/xtitle-1.0.4.ebuild
index db79ece8e4ad..eb54d4f2901c 100644
--- a/x11-misc/xtitle/xtitle-1.0.4.ebuild
+++ b/x11-misc/xtitle/xtitle-1.0.4.ebuild
@@ -1,31 +1,32 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit toolchain-funcs
 
 DESCRIPTION="Set window title and icon name for an X11 terminal window"
 HOMEPAGE="https://kinzler.com/me/xtitle/"
-SRC_URI="https://kinzler.com/me/${PN}/${P}.tgz"
+SRC_URI="https://kinzler.com/me/xtitle/${P}.tgz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
-DEPEND=">=x11-misc/imake-1.0.8-r1"
-RDEPEND=""
+BDEPEND="
+	sys-devel/gcc
+	>=x11-misc/imake-1.0.8-r1"
 
 HTML_DOCS=( xtitle.html )
 
 src_configure() {
 	CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
-		IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf || die
+		IMAKECPP="${IMAKECPP:-${CHOST}-gcc -E}" xmkmf || die
 }
 
 src_install() {
 	default
+
 	newman "${PN}.man" "${PN}.1"
 	einstalldocs
 }
diff --git a/x11-misc/xtoolwait/Manifest b/x11-misc/xtoolwait/Manifest
index d2f35197d5a7..d3ddbfb92dd4 100644
--- a/x11-misc/xtoolwait/Manifest
+++ b/x11-misc/xtoolwait/Manifest
@@ -1,3 +1,3 @@
 DIST xtoolwait-1.3.tar.gz 14315 BLAKE2B 7ebf1f6713308ae74510430e07c29e638e8c9549eba79f03bc42278dd88ce7036f4ed8c21854dbfd9d4706574c4c0982be87a56d001c71d98920f31401a32408 SHA512 36c8446dd7076c18de8f6c582db45cbdc6b7ddc733993ddb08c8bd5c5045621597ae1b3144b92461feabeb14bd50a759f86023848302436ab915faa8c10ebdaa
-EBUILD xtoolwait-1.3-r2.ebuild 947 BLAKE2B 1bc7e8dd151d74b29b5c0082e8d7a89a4461265066cf35825ea771e8f5c532262f0d3f773db205cb644f512c03f1dea0dbdabcb5e42f0cff04c71c6e74f0c032 SHA512 b4084dc08a43569ae45aee8fd30456077b14927c4683a09c48a2faa7f4c8189757497d7631534ca1a6d9b15d35d93d6f114e82c63e998d23c9d4d16c1d0ca31c
+EBUILD xtoolwait-1.3-r2.ebuild 967 BLAKE2B 413ab1659e35b32ed42c67dfef6146e64424d146dad6ecc78962609d54bcd0da853864519242f2a92557d68a4c7ae9445fc4417d7e0f2c159b0935a1a389b24a SHA512 b52e06b902ecf8fd471387aa1725f10f0ea8f3c52455612e8e4e07de81ef0a8c4bb39c059b81bee37c16a7975da99b40020408bc4a54a9fe940e1e590a8d8bb0
 MISC metadata.xml 277 BLAKE2B ebaa8353413cfc5519fce99f8627c71cf765fc6d42b42651e232274de315487c156d45dcb23a401dffb8f112600b0dadd56f93d2283ff86b4293dc5490ad4059 SHA512 c8ef9069153b124118a6be64375c6954ccc6f518a13805e4ff1c33c9cec136170132a580c4a9781930b709c93678c94d6448291625de34d18fea41bfd17f685d
diff --git a/x11-misc/xtoolwait/xtoolwait-1.3-r2.ebuild b/x11-misc/xtoolwait/xtoolwait-1.3-r2.ebuild
index 379b2beb3faf..f6dfa47f2340 100644
--- a/x11-misc/xtoolwait/xtoolwait-1.3-r2.ebuild
+++ b/x11-misc/xtoolwait/xtoolwait-1.3-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
@@ -16,15 +16,17 @@ KEYWORDS="amd64 ppc x86"
 RDEPEND="
 	x11-libs/libX11
 	x11-libs/libXext"
-DEPEND="${RDEPEND}"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto"
 BDEPEND="
 	app-text/rman
-	x11-base/xorg-proto
+	sys-devel/gcc
 	>=x11-misc/imake-1.0.8-r1"
 
 src_configure() {
 	CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
-		IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf || die
+		IMAKECPP="${IMAKECPP:-${CHOST}-gcc -E}" xmkmf || die
 }
 
 src_compile() {
diff --git a/x11-misc/xtrlock/Manifest b/x11-misc/xtrlock/Manifest
index 0a9d7e113b0e..44bb2532cebd 100644
--- a/x11-misc/xtrlock/Manifest
+++ b/x11-misc/xtrlock/Manifest
@@ -1,3 +1,3 @@
 DIST xtrlock_2.13.tar.xz 21156 BLAKE2B 879c27936cf8058707cbdb2247e1044c8c5eadf74dcb2bcfd5ec8f4b2bab80da6859118e48943de97f7696e41456771bf274b03728a61f5ac6bef8b471192dce SHA512 656e1e77194b816b04260a88c8046b8ef25d6df0405de6fe1ee1dfb2ebfa528a329c1b67be70eaac5ce4ee6a4159d728d363bf8a59232941b76b1e6d14aa91aa
-EBUILD xtrlock-2.13-r1.ebuild 851 BLAKE2B 6a843fbf49d91bcf321b910be5b544bbbd7065ae17a99803d68f6ed2b97d6e956b531fce8df952ff9f690733efb88f9ee2c9c38d55f49db1f5a9789a6d48f8d1 SHA512 69cb5f7bcb25650adeba124bff1eaf0925e63a9706e0bbff342795fcdb6cad353e70ceda8839366ed434e6db06b3306c2af8668db4b015a6963c33a77c57dc19
+EBUILD xtrlock-2.13-r1.ebuild 872 BLAKE2B ca7fe042262ca1d39790ab9159b20e8e6599df38ca7b0119d17c9051c997c393efd568a9a1ff9449b7e8b91a0c29ef46e43c20cd588d7da4479f64a521c30e03 SHA512 5da5e771c74c5471845fc89c0e10330cc9c35d3568d98285d5bddb55cc0120355606b4b711835b771388e5c82c3ef0693c8c3675c9a26629a825ee4a2b948ec0
 MISC metadata.xml 319 BLAKE2B 991d0f89b643d24c6fcea9a22d130a9e5ca23486e319c42517e2d07ac5f0680ea3989464cc3557c413556dd4b7eb938cea3dffa78031f06f358476cce132aff1 SHA512 536da7cc9bec7c9e42d88e736138d1efd55dc8d89adc74edfc6535f730f01937a7d3228528c6b78b9eb0e29b1807a2d4d4ca202595e2f693009221331981958c
diff --git a/x11-misc/xtrlock/xtrlock-2.13-r1.ebuild b/x11-misc/xtrlock/xtrlock-2.13-r1.ebuild
index 6818f908f40f..fef71c7cb75b 100644
--- a/x11-misc/xtrlock/xtrlock-2.13-r1.ebuild
+++ b/x11-misc/xtrlock/xtrlock-2.13-r1.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
@@ -12,17 +12,19 @@ SLOT="0"
 LICENSE="GPL-3"
 KEYWORDS="amd64 ppc x86"
 
-RDEPEND="virtual/libcrypt:=
+RDEPEND="
+	virtual/libcrypt:=
 	x11-libs/libX11"
-DEPEND="${RDEPEND}"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto"
 BDEPEND="
-	x11-base/xorg-proto
-	>=x11-misc/imake-1.0.8-r1
-"
+	sys-devel/gcc
+	>=x11-misc/imake-1.0.8-r1"
 
 src_configure() {
 	CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
-		IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf || die
+		IMAKECPP="${IMAKECPP:-${CHOST}-gcc -E}" xmkmf || die
 }
 
 src_compile() {