2022-09-30 11:16:49 UTC

36 files changed, 125 insertions, 135 deletions

diff --git a/metadata/md5-cache/app-i18n/kinput2-3.1-r3 b/metadata/md5-cache/app-i18n/kinput2-3.1-r3
index d7e371fb729b..52f63c36170a 100644
--- a/metadata/md5-cache/app-i18n/kinput2-3.1-r3
+++ b/metadata/md5-cache/app-i18n/kinput2-3.1-r3
@@ -1,4 +1,4 @@
-BDEPEND=x11-misc/gccmakedep >=x11-misc/imake-1.0.8-r1
+BDEPEND=sys-devel/gcc x11-misc/gccmakedep >=x11-misc/imake-1.0.8-r1
 DEFINED_PHASES=compile configure install prepare
 DEPEND=app-i18n/freewnn x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXaw x11-libs/libXext x11-libs/libXmu x11-libs/libXpm x11-libs/libXt
 DESCRIPTION=A Japanese input server which supports the XIM protocol
@@ -11,4 +11,4 @@ RDEPEND=app-i18n/freewnn x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs
 SLOT=0
 SRC_URI=ftp://ftp.sra.co.jp/pub/x11/kinput2/kinput2-v3.1.tar.gz
 _eclasses_=toolchain-funcs	1542e649be915f43f6908a9e93909961	multilib	5ca4e49abed8e3a2f7b56920eadee157
-_md5_=5fb80e064b8e51df9d2fea2c26831d98
+_md5_=c5d6e394e4707d77ae44991eba5df43d
diff --git a/metadata/md5-cache/app-misc/oneko-1.2_p6_p14-r1 b/metadata/md5-cache/app-misc/oneko-1.2_p6_p14-r1
index 8d63c8b1ee1f..306b7a7fbd37 100644
--- a/metadata/md5-cache/app-misc/oneko-1.2_p6_p14-r1
+++ b/metadata/md5-cache/app-misc/oneko-1.2_p6_p14-r1
@@ -1,4 +1,4 @@
-BDEPEND=app-text/rman x11-misc/gccmakedep >=x11-misc/imake-1.0.8-r1
+BDEPEND=app-text/rman sys-devel/gcc x11-misc/gccmakedep >=x11-misc/imake-1.0.8-r1
 DEFINED_PHASES=compile configure install prepare
 DEPEND=x11-libs/libX11 x11-libs/libXext x11-base/xorg-proto
 DESCRIPTION=A cat, dog and others which chase the mouse or windows around the screen
@@ -11,4 +11,4 @@ RDEPEND=x11-libs/libX11 x11-libs/libXext
 SLOT=0
 SRC_URI=mirror://debian/pool/main/o/oneko/oneko_1.2.sakura.6-14.debian.tar.xz mirror://debian/pool/main/o/oneko/oneko_1.2.sakura.6.orig.tar.gz mirror://gentoo/oneko-1.2-cat.png mirror://gentoo/oneko-1.2-dog.png
 _eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	toolchain-funcs	1542e649be915f43f6908a9e93909961	multilib	5ca4e49abed8e3a2f7b56920eadee157
-_md5_=a56bf6a836285280bc878df8d2517ef3
+_md5_=9374e421f18995f3b5bdf99a238ca268
diff --git a/metadata/md5-cache/app-office/magicpoint-1.13a_p20121015-r2 b/metadata/md5-cache/app-office/magicpoint-1.13a_p20121015-r2
index 76e2f891e56f..1d85b8df88c4 100644
--- a/metadata/md5-cache/app-office/magicpoint-1.13a_p20121015-r2
+++ b/metadata/md5-cache/app-office/magicpoint-1.13a_p20121015-r2
@@ -1,4 +1,4 @@
-BDEPEND=app-text/rman virtual/pkgconfig x11-base/xorg-proto >=x11-misc/imake-1.0.8-r1 sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+BDEPEND=app-text/rman sys-devel/gcc virtual/pkgconfig x11-base/xorg-proto >=x11-misc/imake-1.0.8-r1 sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install postinst postrm prepare
 DEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libXmu x11-libs/libXrender emacs? ( >=app-editors/emacs-23.1:* ) imlib? ( media-libs/imlib2[X] ) !imlib? ( gif? ( media-libs/giflib:= ) png? ( >=media-libs/libpng-1.4:0= ) ) m17n-lib? ( dev-libs/m17n-lib[X] fontconfig? ( media-libs/fontconfig ) ) mng? ( media-libs/libmng:= ) truetype? ( x11-libs/libXft media-libs/fontconfig ) x11-libs/libxkbfile
 DESCRIPTION=X11 based presentation tool
@@ -13,4 +13,4 @@ REQUIRED_USE=imlib? ( !gif !png )
 SLOT=0
 SRC_URI=ftp://sh.wide.ad.jp/WIDE/free-ware/mgp-snap/mgp-snap-20121015.tar.gz
 _eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	1542e649be915f43f6908a9e93909961	multilib	5ca4e49abed8e3a2f7b56920eadee157	libtool	241a8f577b9781a42a7421e53448a44e	autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
-_md5_=08fd46f322666d5eb8a697a133f26bba
+_md5_=fb3164bcd28f9c32c264c18c55db5f0b
diff --git a/metadata/md5-cache/games-action/xpilot-4.5.5-r1 b/metadata/md5-cache/games-action/xpilot-4.5.5-r1
index 9e1e00b3fd47..f59dd0416e4a 100644
--- a/metadata/md5-cache/games-action/xpilot-4.5.5-r1
+++ b/metadata/md5-cache/games-action/xpilot-4.5.5-r1
@@ -1,4 +1,4 @@
-BDEPEND=app-text/rman x11-misc/gccmakedep >=x11-misc/imake-1.0.8-r1
+BDEPEND=app-text/rman sys-devel/gcc x11-misc/gccmakedep >=x11-misc/imake-1.0.8-r1
 DEFINED_PHASES=compile configure install prepare
 DEPEND=x11-libs/libX11 x11-libs/libXext x11-base/xorg-proto
 DESCRIPTION=Multi-player 2D client/server space game
@@ -11,4 +11,4 @@ RDEPEND=x11-libs/libX11 x11-libs/libXext
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ionen/distfiles/xpilot.png mirror://sourceforge/xpilotgame/xpilot-4.5.5.tar.bz2
 _eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	toolchain-funcs	1542e649be915f43f6908a9e93909961	multilib	5ca4e49abed8e3a2f7b56920eadee157
-_md5_=bd8b053ccd407716e5879e06b33c7ee9
+_md5_=a9f8d2487b17dd92d2a2612cf52665f3
diff --git a/metadata/md5-cache/games-arcade/xboing-2.4-r3 b/metadata/md5-cache/games-arcade/xboing-2.4-r4
index 444feaa167d0..fb2bb95b68ea 100644
--- a/metadata/md5-cache/games-arcade/xboing-2.4-r3
+++ b/metadata/md5-cache/games-arcade/xboing-2.4-r4
@@ -1,14 +1,14 @@
-BDEPEND=app-text/rman x11-misc/gccmakedep >=x11-misc/imake-1.0.8-r1
+BDEPEND=app-text/rman sys-devel/gcc x11-misc/gccmakedep >=x11-misc/imake-1.0.8-r1
 DEFINED_PHASES=compile configure install prepare
-DEPEND=acct-group/gamestat x11-libs/libXpm
+DEPEND=acct-group/gamestat x11-libs/libX11 x11-libs/libXpm x11-base/xorg-proto
 DESCRIPTION=Blockout type game where you bounce a ball trying to destroy blocks
 EAPI=7
 HOMEPAGE=http://www.techrescue.org/xboing/
 INHERIT=flag-o-matic toolchain-funcs
 KEYWORDS=amd64 ~x86
 LICENSE=xboing
-RDEPEND=acct-group/gamestat x11-libs/libXpm
+RDEPEND=acct-group/gamestat x11-libs/libX11 x11-libs/libXpm
 SLOT=0
 SRC_URI=http://www.techrescue.org/xboing/xboing2.4.tar.gz mirror://gentoo/xboing-2.4-debian.patch.bz2
 _eclasses_=toolchain-funcs	1542e649be915f43f6908a9e93909961	multilib	5ca4e49abed8e3a2f7b56920eadee157	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153
-_md5_=3d9f3de8a665d3dea624619f6b16bff5
+_md5_=342679b13b1873f52173c8b4737597db
diff --git a/metadata/md5-cache/games-board/xgammon-0.98-r3 b/metadata/md5-cache/games-board/xgammon-0.98-r3
index 0710bfbbf999..ca9352ea3296 100644
--- a/metadata/md5-cache/games-board/xgammon-0.98-r3
+++ b/metadata/md5-cache/games-board/xgammon-0.98-r3
@@ -1,4 +1,4 @@
-BDEPEND=app-text/rman >=x11-misc/imake-1.0.8-r1
+BDEPEND=app-text/rman sys-devel/gcc >=x11-misc/imake-1.0.8-r1
 DEFINED_PHASES=compile configure install postinst
 DEPEND=x11-libs/libX11 x11-libs/libXaw x11-libs/libXt !<x11-terms/kterm-6.2.0-r7
 DESCRIPTION=very nice backgammon game for X
@@ -11,4 +11,4 @@ RDEPEND=x11-libs/libX11 x11-libs/libXaw x11-libs/libXt !<x11-terms/kterm-6.2.0-r
 SLOT=0
 SRC_URI=http://fawn.unibw-hamburg.de/steuer/xgammon/Downloads/xgammon-0.98a.tar.gz
 _eclasses_=toolchain-funcs	1542e649be915f43f6908a9e93909961	multilib	5ca4e49abed8e3a2f7b56920eadee157
-_md5_=62ea3563bfa61695e5d50b2230d20cfb
+_md5_=91c0ba0cd9c41dcd2fa07f0bcc6fda7b
diff --git a/metadata/md5-cache/games-board/xmille-2.0-r4 b/metadata/md5-cache/games-board/xmille-2.0-r4
index 6ad770f8fa24..18b8c6fe0b46 100644
--- a/metadata/md5-cache/games-board/xmille-2.0-r4
+++ b/metadata/md5-cache/games-board/xmille-2.0-r4
@@ -1,5 +1,5 @@
-BDEPEND=app-text/rman >=x11-misc/imake-1.0.8-r1
-DEFINED_PHASES=compile configure install prepare
+BDEPEND=app-text/rman sys-devel/gcc >=x11-misc/imake-1.0.8-r1
+DEFINED_PHASES=compile configure install
 DEPEND=x11-libs/libXext
 DESCRIPTION=Mille Bournes card game
 EAPI=7
@@ -11,4 +11,4 @@ RDEPEND=x11-libs/libXext
 SLOT=0
 SRC_URI=mirror://debian/pool/main/x/xmille/xmille_2.0.orig.tar.gz mirror://debian/pool/main/x/xmille/xmille_2.0-13.diff.gz
 _eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	toolchain-funcs	1542e649be915f43f6908a9e93909961	multilib	5ca4e49abed8e3a2f7b56920eadee157	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153
-_md5_=9a4850b5ab67a3ba60d87801e59bf410
+_md5_=f9aac865190768be25b8b50a9e6ae40c
diff --git a/metadata/md5-cache/games-board/xscrabble-2.10-r4 b/metadata/md5-cache/games-board/xscrabble-2.10-r4
index f1ec2a75068a..e64d8baf6430 100644
--- a/metadata/md5-cache/games-board/xscrabble-2.10-r4
+++ b/metadata/md5-cache/games-board/xscrabble-2.10-r4
@@ -1,4 +1,4 @@
-BDEPEND=x11-misc/gccmakedep >=x11-misc/imake-1.0.8-r1
+BDEPEND=sys-devel/gcc x11-misc/gccmakedep >=x11-misc/imake-1.0.8-r1
 DEFINED_PHASES=compile configure install prepare unpack
 DEPEND=x11-libs/libXaw
 DESCRIPTION=An X11 clone of the well-known Scrabble
@@ -12,4 +12,4 @@ RDEPEND=x11-libs/libXaw acct-group/gamestat !<x11-terms/kterm-6.2.0-r7
 SLOT=0
 SRC_URI=ftp://ftp.ac-grenoble.fr/ge/educational_games/xscrabble-2.10.tgz l10n_fr? ( ftp://ftp.ac-grenoble.fr/ge/educational_games/xscrabble_fr.tgz ) ftp://ftp.ac-grenoble.fr/ge/educational_games/xscrabble_en.tgz
 _eclasses_=toolchain-funcs	1542e649be915f43f6908a9e93909961	multilib	5ca4e49abed8e3a2f7b56920eadee157	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153
-_md5_=c1ef16b43b860d853b32f7fdc2fc187e
+_md5_=84ee2c4e5587f0cf0588dcc431b2fd3e
diff --git a/metadata/md5-cache/games-misc/xcruiser-0.30-r1 b/metadata/md5-cache/games-misc/xcruiser-0.30-r1
index 8697635cd85e..fa0e675db1de 100644
--- a/metadata/md5-cache/games-misc/xcruiser-0.30-r1
+++ b/metadata/md5-cache/games-misc/xcruiser-0.30-r1
@@ -1,4 +1,4 @@
-BDEPEND=app-text/rman x11-misc/gccmakedep >=x11-misc/imake-1.0.8-r1
+BDEPEND=app-text/rman sys-devel/gcc x11-misc/gccmakedep >=x11-misc/imake-1.0.8-r1
 DEFINED_PHASES=compile configure install
 DEPEND=x11-libs/libXaw
 DESCRIPTION=Fly about 3D-formed file system
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/xcruiser/xcruiser-0.30.tar.gz
 _eclasses_=toolchain-funcs	1542e649be915f43f6908a9e93909961	multilib	5ca4e49abed8e3a2f7b56920eadee157
-_md5_=00e39c7f35d7cf1c02771cd502bfb95e
+_md5_=e337ea9f1d2f091072e524aaf3c5bdfb
diff --git a/metadata/md5-cache/media-gfx/transfig-3.2.5e-r1 b/metadata/md5-cache/media-gfx/transfig-3.2.5e-r1
index e815a05a114f..406ff4045427 100644
--- a/metadata/md5-cache/media-gfx/transfig-3.2.5e-r1
+++ b/metadata/md5-cache/media-gfx/transfig-3.2.5e-r1
@@ -1,4 +1,4 @@
-BDEPEND=app-text/rman >=x11-misc/imake-1.0.8-r1
+BDEPEND=app-text/rman sys-devel/gcc >=x11-misc/imake-1.0.8-r1
 DEFINED_PHASES=compile configure install postinst prepare
 DEPEND=media-libs/libpng virtual/jpeg x11-apps/rgb x11-libs/libXpm
 DESCRIPTION=Set of tools for creating TeX documents with graphics
@@ -11,4 +11,4 @@ RDEPEND=media-libs/libpng virtual/jpeg x11-apps/rgb x11-libs/libXpm
 SLOT=0
 SRC_URI=mirror://sourceforge/mcj/transfig.3.2.5e.tar.gz mirror://gentoo/fig2mpdf-1.1.2.tar.bz2 https://dev.gentoo.org/~sultan/distfiles/media-gfx/transfig/transfig-3.2.5e-gentoo-patchset-r1.tar.bz2
 _eclasses_=toolchain-funcs	1542e649be915f43f6908a9e93909961	multilib	5ca4e49abed8e3a2f7b56920eadee157
-_md5_=0f986db70c2583d515110c972825070d
+_md5_=266ccf775e573d33f1f4301eacbf7567
diff --git a/metadata/md5-cache/media-gfx/xli-1.17.0-r5 b/metadata/md5-cache/media-gfx/xli-1.17.0-r6
index fdb943034764..1f8654cc0cc3 100644
--- a/metadata/md5-cache/media-gfx/xli-1.17.0-r5
+++ b/metadata/md5-cache/media-gfx/xli-1.17.0-r6
@@ -1,14 +1,14 @@
-BDEPEND=app-text/rman x11-base/xorg-proto >=x11-misc/imake-1.0.8-r1
+BDEPEND=app-text/rman sys-devel/gcc >=x11-misc/imake-1.0.8-r1
 DEFINED_PHASES=compile configure install prepare
-DEPEND=app-arch/bzip2:= >=media-libs/libpng-1.0.5:= >=sys-libs/zlib-1.1.4:= virtual/jpeg:0 x11-libs/libXext !media-gfx/xloadimage
+DEPEND=app-arch/bzip2:= media-libs/libjpeg-turbo:= media-libs/libpng:= sys-libs/zlib:= x11-libs/libX11 x11-libs/libXext !media-gfx/xloadimage x11-base/xorg-proto
 DESCRIPTION=X Load Image: view images or load them to root window
 EAPI=7
 HOMEPAGE=ftp://ftp.ibiblio.org/pub/Linux/apps/graphics/viewers/X/xli-1.16.README
 INHERIT=toolchain-funcs
 KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=HPND
-RDEPEND=app-arch/bzip2:= >=media-libs/libpng-1.0.5:= >=sys-libs/zlib-1.1.4:= virtual/jpeg:0 x11-libs/libXext !media-gfx/xloadimage
+RDEPEND=app-arch/bzip2:= media-libs/libjpeg-turbo:= media-libs/libpng:= sys-libs/zlib:= x11-libs/libX11 x11-libs/libXext !media-gfx/xloadimage
 SLOT=0
 SRC_URI=http://pantransit.reptiles.org/prog/xli/xli-2005-02-27.tar.gz
 _eclasses_=toolchain-funcs	1542e649be915f43f6908a9e93909961	multilib	5ca4e49abed8e3a2f7b56920eadee157
-_md5_=08ea1fc72443be6402b7f5dc6929ad5d
+_md5_=182bd5640883eeba3da894fcf8824861
diff --git a/metadata/md5-cache/media-libs/nas-1.9.5 b/metadata/md5-cache/media-libs/nas-1.9.5
index a1393447c59b..5bdcc8cb6f18 100644
--- a/metadata/md5-cache/media-libs/nas-1.9.5
+++ b/metadata/md5-cache/media-libs/nas-1.9.5
@@ -1,15 +1,15 @@
-BDEPEND=app-text/rman sys-devel/bison sys-devel/flex x11-base/xorg-proto x11-misc/gccmakedep riscv? ( x11-misc/xorg-cf-files ) >=x11-misc/imake-1.0.8-r1
+BDEPEND=app-text/rman sys-devel/bison sys-devel/flex sys-devel/gcc x11-misc/gccmakedep riscv? ( x11-misc/xorg-cf-files ) >=x11-misc/imake-1.0.8-r1
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXaw x11-libs/libXext x11-libs/libXmu x11-libs/libXpm x11-libs/libXt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXaw x11-libs/libXext x11-libs/libXmu x11-libs/libXpm x11-libs/libXt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-base/xorg-proto
 DESCRIPTION=Network Audio System
 EAPI=8
 HOMEPAGE=https://radscan.com/nas.html
-INHERIT=multilib-minimal toolchain-funcs
+INHERIT=multilib multilib-minimal toolchain-funcs
 IUSE=doc static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=HPND MIT
 RDEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXaw x11-libs/libXext x11-libs/libXmu x11-libs/libXpm x11-libs/libXt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=mirror://sourceforge/nas/nas-1.9.5.tar.gz
-_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b
-_md5_=cfd8e0f5589f83ff93fb426738bd0fd6
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b
+_md5_=c165a9c20a55010babde69a7164a2b57
diff --git a/metadata/md5-cache/media-radio/ibp-0.21-r2 b/metadata/md5-cache/media-radio/ibp-0.21-r2
index c53445a16da3..b36e79097265 100644
--- a/metadata/md5-cache/media-radio/ibp-0.21-r2
+++ b/metadata/md5-cache/media-radio/ibp-0.21-r2
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig
+BDEPEND=virtual/pkgconfig X? ( sys-devel/gcc )
 DEFINED_PHASES=compile configure install prepare
 DEPEND=sys-libs/ncurses:0= X? ( x11-libs/libX11 ) X? ( >=x11-misc/imake-1.0.8-r1 )
 DESCRIPTION=Shows currently transmitting beacons of the International Beacon Project (IBP)
@@ -12,4 +12,4 @@ RDEPEND=sys-libs/ncurses:0= X? ( x11-libs/libX11 )
 SLOT=0
 SRC_URI=http://www.pa3fwm.nl/software/ibp/ibp-0.21.tgz
 _eclasses_=toolchain-funcs	1542e649be915f43f6908a9e93909961	multilib	5ca4e49abed8e3a2f7b56920eadee157
-_md5_=a7146ae856ddffaa140ee2ea0b828b34
+_md5_=e0a8661ae57b1eeb875d7f65feb855e1
diff --git a/metadata/md5-cache/net-misc/vncrec-0.2-r2 b/metadata/md5-cache/net-misc/vncrec-0.2-r2
deleted file mode 100644
index 82fbf40a5f69..000000000000
--- a/metadata/md5-cache/net-misc/vncrec-0.2-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure prepare
-DEPEND=x11-libs/libXaw x11-libs/libXext x11-libs/libXmu x11-libs/libXpm x11-libs/libXt app-text/rman x11-base/xorg-proto x11-misc/gccmakedep >=x11-misc/imake-1.0.8-r1
-DESCRIPTION=VNC session recorder and player
-EAPI=6
-HOMEPAGE=http://www.sodan.org/~penny/vncrec/
-INHERIT=toolchain-funcs
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/libXaw x11-libs/libXext x11-libs/libXmu x11-libs/libXpm x11-libs/libXt
-SLOT=0
-SRC_URI=http://www.sodan.org/~penny/vncrec/vncrec-0.2.tar.gz
-_eclasses_=toolchain-funcs	1542e649be915f43f6908a9e93909961	multilib	5ca4e49abed8e3a2f7b56920eadee157
-_md5_=ecf1708a56ebaf80fa6c58009942a32b
diff --git a/metadata/md5-cache/net-misc/vncrec-0.2-r3 b/metadata/md5-cache/net-misc/vncrec-0.2-r3
new file mode 100644
index 000000000000..75fba68482bc
--- /dev/null
+++ b/metadata/md5-cache/net-misc/vncrec-0.2-r3
@@ -0,0 +1,14 @@
+BDEPEND=app-text/rman sys-devel/gcc x11-misc/gccmakedep >=x11-misc/imake-1.0.8-r1
+DEFINED_PHASES=compile configure prepare
+DEPEND=x11-libs/libX11 x11-libs/libXaw x11-libs/libXext x11-libs/libXmu x11-libs/libXpm x11-libs/libXt x11-base/xorg-proto
+DESCRIPTION=VNC session recorder and player
+EAPI=8
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
+INHERIT=toolchain-funcs
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2+
+RDEPEND=x11-libs/libX11 x11-libs/libXaw x11-libs/libXext x11-libs/libXmu x11-libs/libXpm x11-libs/libXt
+SLOT=0
+SRC_URI=mirror://gentoo/vncrec-0.2.tar.gz
+_eclasses_=toolchain-funcs	1542e649be915f43f6908a9e93909961	multilib	5ca4e49abed8e3a2f7b56920eadee157
+_md5_=009445cd0074fa4192fc50928786bb4f
diff --git a/metadata/md5-cache/net-misc/x11-ssh-askpass-1.2.4.1-r2 b/metadata/md5-cache/net-misc/x11-ssh-askpass-1.2.4.1-r2
index 376bf33f4150..cf21bece14ee 100644
--- a/metadata/md5-cache/net-misc/x11-ssh-askpass-1.2.4.1-r2
+++ b/metadata/md5-cache/net-misc/x11-ssh-askpass-1.2.4.1-r2
@@ -1,4 +1,4 @@
-BDEPEND=app-text/rman >=x11-misc/imake-1.0.8-r1
+BDEPEND=app-text/rman sys-devel/gcc >=x11-misc/imake-1.0.8-r1
 DEFINED_PHASES=compile configure install
 DEPEND=virtual/ssh x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXt
 DESCRIPTION=X11-based passphrase dialog for use with OpenSSH
@@ -11,4 +11,4 @@ RDEPEND=virtual/ssh x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libX
 SLOT=0
 SRC_URI=https://github.com/sigmavirus24/x11-ssh-askpass/archive/1.2.4.1.tar.gz -> x11-ssh-askpass-1.2.4.1.gh.tar.gz
 _eclasses_=toolchain-funcs	1542e649be915f43f6908a9e93909961	multilib	5ca4e49abed8e3a2f7b56920eadee157
-_md5_=0c2367805da2ab54f9bbefd76a22ad02
+_md5_=4750be3f22d12e9dea4c8f74083093b2
diff --git a/metadata/md5-cache/sci-calculators/hexcalc-1.11-r3 b/metadata/md5-cache/sci-calculators/hexcalc-1.11-r3
deleted file mode 100644
index 0359ad02bd6e..000000000000
--- a/metadata/md5-cache/sci-calculators/hexcalc-1.11-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=x11-libs/libXaw >=x11-misc/imake-1.0.8-r1 app-text/rman
-DESCRIPTION=A simple hex calculator for X
-EAPI=6
-HOMEPAGE=ftp://ftp.x.org/R5contrib/
-INHERIT=toolchain-funcs
-KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=x11-libs/libXaw
-SLOT=0
-SRC_URI=mirror://gentoo/hexcalc-1.11.tar.Z
-_eclasses_=toolchain-funcs	1542e649be915f43f6908a9e93909961	multilib	5ca4e49abed8e3a2f7b56920eadee157
-_md5_=1d30d01dc662bfc61b12f22f1ee3cc50
diff --git a/metadata/md5-cache/sci-calculators/hexcalc-1.11-r4 b/metadata/md5-cache/sci-calculators/hexcalc-1.11-r4
new file mode 100644
index 000000000000..d92262cadc8e
--- /dev/null
+++ b/metadata/md5-cache/sci-calculators/hexcalc-1.11-r4
@@ -0,0 +1,14 @@
+BDEPEND=app-text/rman sys-devel/gcc >=x11-misc/imake-1.0.8-r1
+DEFINED_PHASES=compile configure install
+DEPEND=x11-libs/libX11 x11-libs/libXaw x11-libs/libXt x11-base/xorg-proto
+DESCRIPTION=Simple hex calculator for X
+EAPI=8
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
+INHERIT=toolchain-funcs
+KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux
+LICENSE=HPND
+RDEPEND=x11-libs/libX11 x11-libs/libXaw x11-libs/libXt
+SLOT=0
+SRC_URI=mirror://gentoo/hexcalc-1.11.tar.Z
+_eclasses_=toolchain-funcs	1542e649be915f43f6908a9e93909961	multilib	5ca4e49abed8e3a2f7b56920eadee157
+_md5_=fc06842f173f8e9717642f5075d6164e
diff --git a/metadata/md5-cache/x11-misc/dclock-2.2.2_p12 b/metadata/md5-cache/x11-misc/dclock-2.2.2_p12
index 91752d21d50a..80dc44fdd75d 100644
--- a/metadata/md5-cache/x11-misc/dclock-2.2.2_p12
+++ b/metadata/md5-cache/x11-misc/dclock-2.2.2_p12
@@ -1,4 +1,4 @@
-BDEPEND=app-text/rman >=x11-misc/imake-1.0.8-r1 xft? ( virtual/pkgconfig )
+BDEPEND=app-text/rman sys-devel/gcc >=x11-misc/imake-1.0.8-r1 xft? ( virtual/pkgconfig )
 DEFINED_PHASES=compile configure install prepare
 DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXt xft? ( media-libs/freetype x11-libs/libXft )
 DESCRIPTION=Digital clock for the X window system
@@ -12,4 +12,4 @@ RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXt xft? ( media-libs/freety
 SLOT=0
 SRC_URI=mirror://debian/pool/main/d/dclock/dclock_2.2.2.orig.tar.gz mirror://debian/pool/main/d/dclock/dclock_2.2.2-12.debian.tar.xz
 _eclasses_=toolchain-funcs	1542e649be915f43f6908a9e93909961	multilib	5ca4e49abed8e3a2f7b56920eadee157	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153
-_md5_=d0405e8469a593e51c117e863d63ba86
+_md5_=dc3fff1306d5e764b065c75b4005cd5f
diff --git a/metadata/md5-cache/x11-misc/x2x-1.27-r3 b/metadata/md5-cache/x11-misc/x2x-1.27-r3
deleted file mode 100644
index 886bc226d138..000000000000
--- a/metadata/md5-cache/x11-misc/x2x-1.27-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-text/rman x11-base/xorg-proto >=x11-misc/imake-1.0.8-r1
-DEFINED_PHASES=compile configure install prepare
-DEPEND=x11-libs/libX11 x11-libs/libXtst x11-libs/libXext
-DESCRIPTION=A utility to connect the Mouse and KeyBoard to another X
-EAPI=7
-HOMEPAGE=http://www.the-labs.com/X11/#x2x
-INHERIT=toolchain-funcs
-KEYWORDS=amd64 ~arm ~mips ppc x86
-LICENSE=x2x
-RDEPEND=x11-libs/libX11 x11-libs/libXtst x11-libs/libXext
-SLOT=0
-SRC_URI=http://ftp.digital.com/pub/Digital/SRC/x2x/x2x-1.27.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/x2x-1.27-keymap.diff.gz
-_eclasses_=toolchain-funcs	1542e649be915f43f6908a9e93909961	multilib	5ca4e49abed8e3a2f7b56920eadee157
-_md5_=abd5cebce33eceef077b8e9b000c22b0
diff --git a/metadata/md5-cache/x11-misc/x2x-1.30 b/metadata/md5-cache/x11-misc/x2x-1.30-r1
index e148d1793bba..bb25a3953893 100644
--- a/metadata/md5-cache/x11-misc/x2x-1.30
+++ b/metadata/md5-cache/x11-misc/x2x-1.30-r1
@@ -1,6 +1,6 @@
-BDEPEND=app-text/rman x11-base/xorg-proto >=x11-misc/imake-1.0.8-r1 sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile install prepare
-DEPEND=x11-libs/libX11 x11-libs/libXtst x11-libs/libXext
+DEPEND=x11-libs/libX11 x11-libs/libXtst x11-libs/libXext x11-base/xorg-proto
 DESCRIPTION=A utility to connect the mouse and keyboard to another X
 EAPI=8
 HOMEPAGE=https://github.com/dottedmag/x2x
@@ -11,4 +11,4 @@ RDEPEND=x11-libs/libX11 x11-libs/libXtst x11-libs/libXext
 SLOT=0
 SRC_URI=https://github.com/dottedmag/x2x/archive/refs/tags/debian/1.30-10.tar.gz -> x2x-1.30.tar.gz
 _eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	1542e649be915f43f6908a9e93909961	multilib	5ca4e49abed8e3a2f7b56920eadee157	libtool	241a8f577b9781a42a7421e53448a44e	autotools	9e6965bfaa00f52cc61e0d4bc44c87b3
-_md5_=50535478fe7f708819dd8ff018917ad6
+_md5_=98c9762265325d019672cfcd7a023c5d
diff --git a/metadata/md5-cache/x11-misc/xautolock-2.2_p7 b/metadata/md5-cache/x11-misc/xautolock-2.2_p7
index b9933e825009..7c798246e3c2 100644
--- a/metadata/md5-cache/x11-misc/xautolock-2.2_p7
+++ b/metadata/md5-cache/x11-misc/xautolock-2.2_p7
@@ -1,6 +1,6 @@
-BDEPEND=app-text/rman x11-base/xorg-proto >=x11-misc/imake-1.0.8-r1
+BDEPEND=app-text/rman sys-devel/gcc >=x11-misc/imake-1.0.8-r1
 DEFINED_PHASES=compile configure install prepare
-DEPEND=x11-libs/libXScrnSaver
+DEPEND=x11-libs/libXScrnSaver x11-base/xorg-proto
 DESCRIPTION=An automatic X screen-locker/screen-saver
 EAPI=7
 HOMEPAGE=http://www.ibiblio.org/pub/Linux/X11/screensavers/
@@ -11,4 +11,4 @@ RDEPEND=x11-libs/libXScrnSaver
 SLOT=0
 SRC_URI=http://www.ibiblio.org/pub/Linux/X11/screensavers/xautolock-2.2.tgz mirror://debian/pool/main/x/xautolock/xautolock_2.2-7.debian.tar.xz
 _eclasses_=toolchain-funcs	1542e649be915f43f6908a9e93909961	multilib	5ca4e49abed8e3a2f7b56920eadee157
-_md5_=7640316e1cc8e09be53cf35863312e12
+_md5_=d19859b48d3cb0fc3f792eeac84984b7
diff --git a/metadata/md5-cache/x11-misc/xbatt-1.3_rc1 b/metadata/md5-cache/x11-misc/xbatt-1.3_rc1-r1
index 1ee0463f6b7f..c4eaa20bfbf2 100644
--- a/metadata/md5-cache/x11-misc/xbatt-1.3_rc1
+++ b/metadata/md5-cache/x11-misc/xbatt-1.3_rc1-r1
@@ -1,13 +1,14 @@
+BDEPEND=sys-devel/gcc >=x11-misc/imake-1.0.8-r1
 DEFINED_PHASES=compile configure install
-DEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXaw x11-libs/libXext x11-libs/libxkbfile x11-libs/libXpm x11-base/xorg-proto >=x11-misc/imake-1.0.8-r1
+DEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXaw x11-libs/libXext x11-libs/libxkbfile x11-libs/libXpm x11-base/xorg-proto
 DESCRIPTION=Notebook battery indicator for X
-EAPI=6
-HOMEPAGE=http://www.clave.gr.jp/~eto/xbatt/
-INHERIT=toolchain-funcs eapi7-ver
+EAPI=8
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
+INHERIT=toolchain-funcs
 KEYWORDS=amd64 ppc x86
 LICENSE=xbatt
 RDEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXaw x11-libs/libXext x11-libs/libxkbfile x11-libs/libXpm
 SLOT=0
-SRC_URI=http://www.clave.gr.jp/~eto/xbatt/xbatt-1.3pr1.tar.gz
-_eclasses_=toolchain-funcs	1542e649be915f43f6908a9e93909961	multilib	5ca4e49abed8e3a2f7b56920eadee157	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24
-_md5_=b1d5d9712f15a255baaaeddb1bfe5cc0
+SRC_URI=mirror://gentoo/xbatt-1.3pr1.tar.gz
+_eclasses_=toolchain-funcs	1542e649be915f43f6908a9e93909961	multilib	5ca4e49abed8e3a2f7b56920eadee157
+_md5_=fe2cc799f9172c8d37a154c10a07cbfc
diff --git a/metadata/md5-cache/x11-misc/xearth-1.1-r1 b/metadata/md5-cache/x11-misc/xearth-1.1-r1
index 78be98a1fc40..22203d596c3c 100644
--- a/metadata/md5-cache/x11-misc/xearth-1.1-r1
+++ b/metadata/md5-cache/x11-misc/xearth-1.1-r1
@@ -1,6 +1,6 @@
-BDEPEND=app-text/rman x11-base/xorg-proto >=x11-misc/imake-1.0.8-r1
+BDEPEND=app-text/rman sys-devel/gcc >=x11-misc/imake-1.0.8-r1
 DEFINED_PHASES=compile configure install
-DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXt
+DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXt x11-base/xorg-proto
 DESCRIPTION=Set the X root window to an image of the Earth
 EAPI=7
 HOMEPAGE=https://hewgill.com/xearth/original/
@@ -11,4 +11,4 @@ RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXt
 SLOT=0
 SRC_URI=ftp://cag.lcs.mit.edu/pub/tuna/xearth-1.1.tar.gz ftp://ftp.cs.colorado.edu/users/tuna/xearth-1.1.tar.gz
 _eclasses_=toolchain-funcs	1542e649be915f43f6908a9e93909961	multilib	5ca4e49abed8e3a2f7b56920eadee157
-_md5_=111d5e4d6a7bb1941435ac171adabbc7
+_md5_=2f10d4a4457e094a695f6c6ecaad8d79
diff --git a/metadata/md5-cache/x11-misc/xfishtank-2.5 b/metadata/md5-cache/x11-misc/xfishtank-2.5
index 5a16a503d5a3..eafa5b7c4dc4 100644
--- a/metadata/md5-cache/x11-misc/xfishtank-2.5
+++ b/metadata/md5-cache/x11-misc/xfishtank-2.5
@@ -1,6 +1,6 @@
-BDEPEND=x11-base/xorg-proto >=x11-misc/imake-1.0.8-r1
+BDEPEND=sys-devel/gcc >=x11-misc/imake-1.0.8-r1
 DEFINED_PHASES=compile configure
-DEPEND=media-libs/imlib2[X] x11-libs/libX11 x11-libs/libXext x11-libs/libXt
+DEPEND=media-libs/imlib2[X] x11-libs/libX11 x11-libs/libXext x11-libs/libXt x11-base/xorg-proto
 DESCRIPTION=Turns your root window into an aquarium
 EAPI=7
 HOMEPAGE=https://jim.rees.org/computers/xfishtank.html
@@ -11,4 +11,4 @@ RDEPEND=media-libs/imlib2[X] x11-libs/libX11 x11-libs/libXext x11-libs/libXt
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jsmolic/distfiles/xfishtank-2.5.tar.gz
 _eclasses_=toolchain-funcs	1542e649be915f43f6908a9e93909961	multilib	5ca4e49abed8e3a2f7b56920eadee157
-_md5_=d5a62994fa8b2016273207ceb3e81482
+_md5_=90807b683f31d07bc1446fb1f57adb9e
diff --git a/metadata/md5-cache/x11-misc/xkeycaps-2.47_p7 b/metadata/md5-cache/x11-misc/xkeycaps-2.47_p7
index 6250c1db13ec..dbebc6b5e2d8 100644
--- a/metadata/md5-cache/x11-misc/xkeycaps-2.47_p7
+++ b/metadata/md5-cache/x11-misc/xkeycaps-2.47_p7
@@ -1,6 +1,6 @@
-BDEPEND=>=sys-apps/sed-4 x11-base/xorg-proto >=x11-misc/imake-1.0.8-r1
+BDEPEND=sys-devel/gcc >=x11-misc/imake-1.0.8-r1
 DEFINED_PHASES=compile configure install prepare
-DEPEND=x11-libs/libX11 x11-libs/libXaw x11-libs/libXext x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps
+DEPEND=x11-libs/libX11 x11-libs/libXaw x11-libs/libXext x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps x11-base/xorg-proto
 DESCRIPTION=GUI frontend to xmodmap
 EAPI=7
 HOMEPAGE=https://packages.qa.debian.org/x/xkeycaps.html
@@ -11,4 +11,4 @@ RDEPEND=x11-libs/libX11 x11-libs/libXaw x11-libs/libXext x11-libs/libXmu x11-lib
 SLOT=0
 SRC_URI=mirror://debian/pool/main/x/xkeycaps/xkeycaps_2.47.orig.tar.gz mirror://debian/pool/main/x/xkeycaps/xkeycaps_2.47-7.debian.tar.xz
 _eclasses_=toolchain-funcs	1542e649be915f43f6908a9e93909961	multilib	5ca4e49abed8e3a2f7b56920eadee157
-_md5_=a4482a70e019710d9d7bc596af333744
+_md5_=427c7a8a95f76317e7e74b0cb3686b4d
diff --git a/metadata/md5-cache/x11-misc/xsnap-1.5.15-r2 b/metadata/md5-cache/x11-misc/xsnap-1.5.15-r3
index 29497934f0af..e4ddb5753898 100644
--- a/metadata/md5-cache/x11-misc/xsnap-1.5.15-r2
+++ b/metadata/md5-cache/x11-misc/xsnap-1.5.15-r3
@@ -1,14 +1,14 @@
-BDEPEND=app-text/rman dev-lang/perl x11-base/xorg-proto >=x11-misc/imake-1.0.8-r1
+BDEPEND=app-text/rman dev-lang/perl sys-devel/gcc >=x11-misc/imake-1.0.8-r1
 DEFINED_PHASES=compile configure install prepare
-DEPEND=media-libs/libpng:0 virtual/jpeg:0 x11-libs/libX11 x11-libs/libXft x11-libs/libXpm
+DEPEND=media-libs/libjpeg-turbo:= media-libs/libpng:= sys-libs/zlib:= x11-libs/libX11 x11-libs/libXft x11-libs/libXpm x11-base/xorg-proto
 DESCRIPTION=Program to interactively take a 'snapshot' of a region of the screen
-EAPI=7
+EAPI=8
 HOMEPAGE=ftp://ftp.ac-grenoble.fr/ge/Xutils/
 INHERIT=toolchain-funcs
 KEYWORDS=amd64 ppc x86 ~amd64-linux
 LICENSE=GPL-3+
-RDEPEND=media-libs/libpng:0 virtual/jpeg:0 x11-libs/libX11 x11-libs/libXft x11-libs/libXpm media-fonts/font-misc-misc
+RDEPEND=media-libs/libjpeg-turbo:= media-libs/libpng:= sys-libs/zlib:= x11-libs/libX11 x11-libs/libXft x11-libs/libXpm media-fonts/font-misc-misc
 SLOT=0
 SRC_URI=ftp://ftp.ac-grenoble.fr/ge/Xutils/xsnap-1.5.15.tar.bz2
 _eclasses_=toolchain-funcs	1542e649be915f43f6908a9e93909961	multilib	5ca4e49abed8e3a2f7b56920eadee157
-_md5_=1eb1f7160cbf9243c4f81e31c56c5350
+_md5_=d61ccaf587fdbbf5cc81eab941d5fd1c
diff --git a/metadata/md5-cache/x11-misc/xtitle-1.0.4 b/metadata/md5-cache/x11-misc/xtitle-1.0.4
index 40efdd0599f3..167f34f4cc63 100644
--- a/metadata/md5-cache/x11-misc/xtitle-1.0.4
+++ b/metadata/md5-cache/x11-misc/xtitle-1.0.4
@@ -1,12 +1,12 @@
+BDEPEND=sys-devel/gcc >=x11-misc/imake-1.0.8-r1
 DEFINED_PHASES=configure install
-DEPEND=>=x11-misc/imake-1.0.8-r1
 DESCRIPTION=Set window title and icon name for an X11 terminal window
-EAPI=6
+EAPI=8
 HOMEPAGE=https://kinzler.com/me/xtitle/
 INHERIT=toolchain-funcs
 KEYWORDS=amd64 x86
-LICENSE=GPL-2
+LICENSE=GPL-2+
 SLOT=0
 SRC_URI=https://kinzler.com/me/xtitle/xtitle-1.0.4.tgz
 _eclasses_=toolchain-funcs	1542e649be915f43f6908a9e93909961	multilib	5ca4e49abed8e3a2f7b56920eadee157
-_md5_=6e2d1961cf1bbc063edac4246125330b
+_md5_=f7b7f44c7637dca3f0887d3811632819
diff --git a/metadata/md5-cache/x11-misc/xtoolwait-1.3-r2 b/metadata/md5-cache/x11-misc/xtoolwait-1.3-r2
index a9b7fc11ce2d..811890afbd1a 100644
--- a/metadata/md5-cache/x11-misc/xtoolwait-1.3-r2
+++ b/metadata/md5-cache/x11-misc/xtoolwait-1.3-r2
@@ -1,6 +1,6 @@
-BDEPEND=app-text/rman x11-base/xorg-proto >=x11-misc/imake-1.0.8-r1
+BDEPEND=app-text/rman sys-devel/gcc >=x11-misc/imake-1.0.8-r1
 DEFINED_PHASES=compile configure install
-DEPEND=x11-libs/libX11 x11-libs/libXext
+DEPEND=x11-libs/libX11 x11-libs/libXext x11-base/xorg-proto
 DESCRIPTION=Xtoolwait notably decreases the startup time of an X session
 EAPI=7
 HOMEPAGE=http://ftp.x.org/contrib/utilities/xtoolwait-1.3.README
@@ -11,4 +11,4 @@ RDEPEND=x11-libs/libX11 x11-libs/libXext
 SLOT=0
 SRC_URI=http://ftp.x.org/contrib/utilities/xtoolwait-1.3.tar.gz
 _eclasses_=toolchain-funcs	1542e649be915f43f6908a9e93909961	multilib	5ca4e49abed8e3a2f7b56920eadee157
-_md5_=24a57a39261653c7ce895f73d53854c2
+_md5_=5e0a5d704c80dc22d06ea94435f36db9
diff --git a/metadata/md5-cache/x11-misc/xtrlock-2.13-r1 b/metadata/md5-cache/x11-misc/xtrlock-2.13-r1
index 7a8694ffd413..e3919e6fc2fe 100644
--- a/metadata/md5-cache/x11-misc/xtrlock-2.13-r1
+++ b/metadata/md5-cache/x11-misc/xtrlock-2.13-r1
@@ -1,6 +1,6 @@
-BDEPEND=x11-base/xorg-proto >=x11-misc/imake-1.0.8-r1
+BDEPEND=sys-devel/gcc >=x11-misc/imake-1.0.8-r1
 DEFINED_PHASES=compile configure install
-DEPEND=virtual/libcrypt:= x11-libs/libX11
+DEPEND=virtual/libcrypt:= x11-libs/libX11 x11-base/xorg-proto
 DESCRIPTION=A simplistic screen locking program for X
 EAPI=7
 HOMEPAGE=http://ftp.debian.org/debian/pool/main/x/xtrlock/
@@ -11,4 +11,4 @@ RDEPEND=virtual/libcrypt:= x11-libs/libX11
 SLOT=0
 SRC_URI=mirror://debian/pool/main/x/xtrlock/xtrlock_2.13.tar.xz
 _eclasses_=toolchain-funcs	1542e649be915f43f6908a9e93909961	multilib	5ca4e49abed8e3a2f7b56920eadee157
-_md5_=9c8950e1d86c6ec28e8d6c41d9aa476f
+_md5_=528d58fc560c53cf448c1f63c766906f
diff --git a/metadata/md5-cache/x11-plugins/wmnet-1.06-r2 b/metadata/md5-cache/x11-plugins/wmnet-1.06-r2
index 7b2d06aa7a6a..fa3e2e779c8b 100644
--- a/metadata/md5-cache/x11-plugins/wmnet-1.06-r2
+++ b/metadata/md5-cache/x11-plugins/wmnet-1.06-r2
@@ -1,6 +1,6 @@
-BDEPEND=x11-base/xorg-proto >=x11-misc/imake-1.0.8-r1 app-text/rman
+BDEPEND=app-text/rman sys-devel/gcc >=x11-misc/imake-1.0.8-r1
 DEFINED_PHASES=compile configure install
-DEPEND=x11-libs/libX11 x11-libs/libXext elibc_musl? ( net-libs/ppp-defs )
+DEPEND=x11-libs/libX11 x11-libs/libXext x11-base/xorg-proto elibc_musl? ( net-libs/ppp-defs )
 DESCRIPTION=WMnet is a dock.app network monitor
 EAPI=7
 HOMEPAGE=https://www.dockapps.net/wmnet
@@ -11,4 +11,4 @@ RDEPEND=x11-libs/libX11 x11-libs/libXext
 SLOT=0
 SRC_URI=https://www.dockapps.net/download/wmnet-1.06.tar.gz mirror://gentoo/wmnet-1.06-misc.patch.bz2
 _eclasses_=toolchain-funcs	1542e649be915f43f6908a9e93909961	multilib	5ca4e49abed8e3a2f7b56920eadee157
-_md5_=24ce75923b9d3c8a949f1254b3228a4f
+_md5_=17a5ab4725daa1a5a79c6a74136f7cb0
diff --git a/metadata/md5-cache/x11-terms/kterm-6.2.0-r7 b/metadata/md5-cache/x11-terms/kterm-6.2.0-r7
index f09fb02dcbdf..a588ce35edd1 100644
--- a/metadata/md5-cache/x11-terms/kterm-6.2.0-r7
+++ b/metadata/md5-cache/x11-terms/kterm-6.2.0-r7
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig x11-misc/gccmakedep >=x11-misc/imake-1.0.8-r1
+BDEPEND=sys-devel/gcc virtual/pkgconfig x11-misc/gccmakedep >=x11-misc/imake-1.0.8-r1
 DEFINED_PHASES=compile configure install postinst prepare
 DEPEND=app-text/rman sys-libs/ncurses:= x11-libs/libXaw x11-libs/libXmu x11-libs/libXpm x11-libs/libxkbfile Xaw3d? ( x11-libs/libXaw3d ) !<games-board/xgammon-0.98-r3 !<games-board/xscrabble-2.10-r4
 DESCRIPTION=Japanese Kanji X Terminal
@@ -12,4 +12,4 @@ RDEPEND=app-text/rman sys-libs/ncurses:= x11-libs/libXaw x11-libs/libXmu x11-lib
 SLOT=0
 SRC_URI=mirror://gentoo/kterm-6.2.0.tar.gz mirror://gentoo/kterm-6.2.0-wpi.patch.gz mirror://gentoo/kterm-6.2.0.ext02.patch.gz
 _eclasses_=toolchain-funcs	1542e649be915f43f6908a9e93909961	multilib	5ca4e49abed8e3a2f7b56920eadee157
-_md5_=6e9ab3c0ba1ceb46481989f2cf361035
+_md5_=04a08bb3ddc34e806d7a1ea44a06da46
diff --git a/metadata/md5-cache/x11-terms/root-tail-1.2-r4 b/metadata/md5-cache/x11-terms/root-tail-1.2-r4
index be3951a1c917..9981ff5b9983 100644
--- a/metadata/md5-cache/x11-terms/root-tail-1.2-r4
+++ b/metadata/md5-cache/x11-terms/root-tail-1.2-r4
@@ -1,6 +1,6 @@
-BDEPEND=>=x11-misc/imake-1.0.8-r1 app-text/rman x11-base/xorg-proto x11-misc/gccmakedep
+BDEPEND=app-text/rman sys-devel/gcc x11-misc/gccmakedep >=x11-misc/imake-1.0.8-r1
 DEFINED_PHASES=compile configure install prepare
-DEPEND=x11-libs/libXext x11-libs/libX11
+DEPEND=x11-libs/libXext x11-libs/libX11 x11-base/xorg-proto
 DESCRIPTION=Terminal to display (multiple) log files on the root window
 EAPI=7
 HOMEPAGE=http://oldhome.schmorp.de/marc/root-tail.html
@@ -12,4 +12,4 @@ RDEPEND=x11-libs/libXext x11-libs/libX11
 SLOT=0
 SRC_URI=http://oldhome.schmorp.de/marc/data/root-tail-1.2.tar.gz
 _eclasses_=toolchain-funcs	1542e649be915f43f6908a9e93909961	multilib	5ca4e49abed8e3a2f7b56920eadee157	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153
-_md5_=974eebfa67db34f9226cab8e5129740d
+_md5_=e3baa8198a4fb740c05597ce5947535a
diff --git a/metadata/md5-cache/x11-wm/larswm-7.5.3-r2 b/metadata/md5-cache/x11-wm/larswm-7.5.3-r2
index dc2f422f70c9..99ed606b823b 100644
--- a/metadata/md5-cache/x11-wm/larswm-7.5.3-r2
+++ b/metadata/md5-cache/x11-wm/larswm-7.5.3-r2
@@ -1,6 +1,6 @@
-BDEPEND=x11-base/xorg-proto >=x11-misc/imake-1.0.8-r1 x11-misc/gccmakedep app-text/rman
+BDEPEND=app-text/rman sys-devel/gcc x11-misc/gccmakedep >=x11-misc/imake-1.0.8-r1
 DEFINED_PHASES=compile configure install
-DEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXext
+DEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXext x11-base/xorg-proto
 DESCRIPTION=Tiling window manager for X11, based on 9wm by David Hogan
 EAPI=7
 HOMEPAGE=http://www.fnurt.net/larswm/
@@ -11,4 +11,4 @@ RDEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXext
 SLOT=0
 SRC_URI=http://www.fnurt.net/larswm/larswm-7.5.3.tar.gz
 _eclasses_=toolchain-funcs	1542e649be915f43f6908a9e93909961	multilib	5ca4e49abed8e3a2f7b56920eadee157
-_md5_=e0dbb8445dad737b5ac7c2a8c11fc180
+_md5_=ba99e2243fa0f71b43ba93db9ac7a4b6
diff --git a/metadata/md5-cache/x11-wm/lwm-1.2.4 b/metadata/md5-cache/x11-wm/lwm-1.2.4
index 56b599f15995..c26c21cac2cd 100644
--- a/metadata/md5-cache/x11-wm/lwm-1.2.4
+++ b/metadata/md5-cache/x11-wm/lwm-1.2.4
@@ -1,13 +1,14 @@
+BDEPEND=sys-devel/gcc >=x11-misc/imake-1.0.8-r1
 DEFINED_PHASES=compile configure install prepare
-DEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-base/xorg-proto >=x11-misc/imake-1.0.8-r1
+DEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-base/xorg-proto
 DESCRIPTION=The ultimate lightweight window manager
-EAPI=6
-HOMEPAGE=http://www.jfc.org.uk/software/lwm.html
+EAPI=8
+HOMEPAGE=https://www.jfc.org.uk/software/lwm.html
 INHERIT=toolchain-funcs
 KEYWORDS=amd64 ppc ~sparc x86
-LICENSE=GPL-2
+LICENSE=GPL-2+
 RDEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext
 SLOT=0
-SRC_URI=http://www.jfc.org.uk/files/lwm/lwm-1.2.4.tar.gz
+SRC_URI=https://www.jfc.org.uk/files/lwm/lwm-1.2.4.tar.gz
 _eclasses_=toolchain-funcs	1542e649be915f43f6908a9e93909961	multilib	5ca4e49abed8e3a2f7b56920eadee157
-_md5_=3e14023a4abc2ac07bf4aa5e66cc1d0e
+_md5_=2fdd6bf41423bb0231688d3e0dd6c554
diff --git a/metadata/md5-cache/x11-wm/vtwm-5.4.7-r2 b/metadata/md5-cache/x11-wm/vtwm-5.4.7-r2
index d043c5c75d6e..31fc5e964323 100644
--- a/metadata/md5-cache/x11-wm/vtwm-5.4.7-r2
+++ b/metadata/md5-cache/x11-wm/vtwm-5.4.7-r2
@@ -1,6 +1,6 @@
-BDEPEND=app-text/rman sys-devel/bison sys-devel/flex x11-base/xorg-proto >=x11-misc/imake-1.0.8-r1
+BDEPEND=app-text/rman sys-devel/bison sys-devel/flex sys-devel/gcc >=x11-misc/imake-1.0.8-r1
 DEFINED_PHASES=compile configure install prepare
-DEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXext x11-libs/libXpm rplay? ( media-sound/rplay )
+DEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXext x11-libs/libXpm rplay? ( media-sound/rplay ) x11-base/xorg-proto
 DESCRIPTION=TWM descendant that implements a Virtual Desktop
 EAPI=7
 HOMEPAGE=http://www.vtwm.org/
@@ -12,4 +12,4 @@ RDEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXext x11-libs
 SLOT=0
 SRC_URI=http://www.vtwm.org/downloads/vtwm-5.4.7.tar.gz
 _eclasses_=toolchain-funcs	1542e649be915f43f6908a9e93909961	multilib	5ca4e49abed8e3a2f7b56920eadee157
-_md5_=9d014b897e13f2944f09ee2334ec03aa
+_md5_=0d497829b1401ff2db3a4efcac794797