gentoo resync : 20.03.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-03-20 14:27:17 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2021-03-20 14:27:17 +0000
commit: 5bb9ff1ee56d2b5e75e01a7f066d8b0cec84ec02 (patch)
tree: 66e860a5099bcad013f1cf667255dc372a7c11b3 /x11-apps
parent: 7218e1b46bceac05841e90472501742d905fb3fc (diff)
84 files changed, 504 insertions, 128 deletions
diff --git a/x11-apps/Manifest.gz b/x11-apps/Manifest.gz
index 58433f34ac1f..fda7248cded8 100644
--- a/x11-apps/Manifest.gz
+++ b/x11-apps/Manifest.gz
diff --git a/x11-apps/appres/Manifest b/x11-apps/appres/Manifest
index 1263cab3b1ca..b2bce7bd5236 100644
--- a/x11-apps/appres/Manifest
+++ b/x11-apps/appres/Manifest
@@ -1,3 +1,4 @@
 DIST appres-1.0.5.tar.bz2 124531 BLAKE2B 0d3e497afb3ab7d3565451c0da6594b4e608fa20e1a225162c4347d672db6a94823b5961c112b414e55c86a6b53a684709ddd109991f0545b6897bf276824da8 SHA512 70825563cd80f0f433c48ab2fdae888072939c1b22fb22340b70b9444c97916275ed92c9e5bf9a06bb76c32a5371b89ff7c0211a9a47a227c88311078c2c4137
+EBUILD appres-1.0.5-r1.ebuild 413 BLAKE2B 354b9e46453ae39cff3e3e66ab7abc885078ee3e19ef3586ead633da7506aebee4d7a78220878d193e5d991d1f1aebabd3d958c2452ca863437b8f840c39809a SHA512 0b9d540cd558a7d44b01fac9fcde490dc22db2a28ea51de9c5aab55ec7faa6f6302d3e38d77bef2e7899b3cfe34b05bcfa13f9407e8315b317be3b54f9a955ba
 EBUILD appres-1.0.5.ebuild 390 BLAKE2B dd2777b0787ae95e36bf11b10924ad175f36573d84a8d326fcfd1de2030012ac56f66811664c8a3c60e2f631a2404ae25440ff5de069227ca5b51df946b80bc6 SHA512 defdbb32abc88776106c212722758e17d0941f7451def6d7907bc11b750b4a73b73efc6f5585b18cbd2ce24997cfdc748b059a772112734c73f9a29caf09a920
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/appres/appres-1.0.5-r1.ebuild b/x11-apps/appres/appres-1.0.5-r1.ebuild
new file mode 100644
index 000000000000..cafaa058a220
--- /dev/null
+++ b/x11-apps/appres/appres-1.0.5-r1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xorg-3
+
+DESCRIPTION="list X application resource database"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris ~x86-winnt"
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXt"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
diff --git a/x11-apps/bdftopcf/Manifest b/x11-apps/bdftopcf/Manifest
index d53c9bebd420..2b415f60a24c 100644
--- a/x11-apps/bdftopcf/Manifest
+++ b/x11-apps/bdftopcf/Manifest
@@ -1,3 +1,4 @@
 DIST bdftopcf-1.1.tar.bz2 150815 BLAKE2B 2251b6daf090d61b6418bb0b76666e9dba65230c7a568bca6d3211869466921d6cb411820afd18262fb42fbc8b9d7118b3fe61b465b5bb00f8c93a17a6779df4 SHA512 7b790e8d512ca2812ac889c156ef91c48798b4744a6857e5b17e0128764b5afa8c5426fe5de05a9819d64745116718db4221b3e657e3c2633465e87179c44bec
+EBUILD bdftopcf-1.1-r1.ebuild 391 BLAKE2B 5977a9cb75123bba61efbfd0a979060ecdf57a673feceeafb65b8a172c3d2d01dc4094040647fb95e24b57198857bf17b52da3cd8a3ed197e02f887062d311c9 SHA512 457a3a887d7bd5e02d233f1d2d1fab59f63f457f5fa91d7d5ded36ea02da3f5cc992fd0a097f590f4d54cdf6de37df5db8078b92da14f9b54df999cb13a4e90c
 EBUILD bdftopcf-1.1.ebuild 392 BLAKE2B 2e42e1e81954bbc174ef03fdd550292b46d31f26e95abf6c40e840c58f7e62f90f3dffb0506256e45fbbaf9a614ac69a58e00ddbdb7b38f3c7262759d5c9fee1 SHA512 57bbaf70e61cecde5b1480a6033a2de6c9166649778470389170ee24f287d672a99a1fd2e8bd168d7d6217972c496353028edef8a248d1af88c531054eb6f415
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/bdftopcf/bdftopcf-1.1-r1.ebuild b/x11-apps/bdftopcf/bdftopcf-1.1-r1.ebuild
new file mode 100644
index 000000000000..17246b803cad
--- /dev/null
+++ b/x11-apps/bdftopcf/bdftopcf-1.1-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xorg-3
+
+DESCRIPTION="X.Org bdftopcf application"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+DEPEND="x11-base/xorg-proto"
+RDEPEND=""
diff --git a/x11-apps/beforelight/Manifest b/x11-apps/beforelight/Manifest
index 3ecabc82ae54..fa64a394de47 100644
--- a/x11-apps/beforelight/Manifest
+++ b/x11-apps/beforelight/Manifest
@@ -1,3 +1,3 @@
 DIST beforelight-1.0.5.tar.bz2 119358 BLAKE2B ff4a0e0a28d3cc668611eaea8b181696986f92eb7236b336218d0392484738788db9c16e0eb6d16a106ba3b30d094be082c12da22c058a5a0afeeb76fcddb76e SHA512 f6cc794159cda89ac060a43d190fa72419dbcf503a97093b4c0f05315389085ff804c2891e00da2843709e97633973010165f9d68ceb0dcc76eed150f9c75968
-EBUILD beforelight-1.0.5.ebuild 348 BLAKE2B 16b21b76e7107a2abec7b4126a108951dc092c283a15229fa53d2fa3c348f715f4eda5142e1f86f62dbc9ee08909c3854aca4a78fca5c78b90cba64063411f71 SHA512 15cbd40ddbd077b917cb0e7a671e5dbf0f3b4b012a733614eab53f73dc2845ae51e95985ecb25393a073e4a6606d9582bd742390d67ebb9cd75f0d6a932ebd17
+EBUILD beforelight-1.0.5.ebuild 344 BLAKE2B 76b349c867e402b3298a25e0bc45d414b0231dc75a7a33972c8f53aa2f99cc729bb8b475d6350c609342d0cd7d619c5650773bf147e1a275060acfe008fdd3fb SHA512 ce01df57580ac39084522f3d8306f0306a7d8525f781295273fd0f2e252b0dc3828654611a87eeb76f996fc9ddf6f5f4611326d818055a1ca3854f3dafb00f42
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/beforelight/beforelight-1.0.5.ebuild b/x11-apps/beforelight/beforelight-1.0.5.ebuild
index f131ec93b6dc..78a3c0648acd 100644
--- a/x11-apps/beforelight/beforelight-1.0.5.ebuild
+++ b/x11-apps/beforelight/beforelight-1.0.5.ebuild
@@ -1,14 +1,16 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit xorg-2
+inherit xorg-3
 
 DESCRIPTION="Sample implementation of screen saver"
+
 KEYWORDS="amd64 arm ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
-IUSE=""
-RDEPEND="x11-libs/libX11
+
+RDEPEND="
+	x11-libs/libX11
 	x11-libs/libXScrnSaver
 	x11-libs/libXt
 	x11-libs/libXaw"
diff --git a/x11-apps/bitmap/Manifest b/x11-apps/bitmap/Manifest
index 121bcae19e6f..ad3724839b67 100644
--- a/x11-apps/bitmap/Manifest
+++ b/x11-apps/bitmap/Manifest
@@ -1,3 +1,4 @@
 DIST bitmap-1.0.9.tar.bz2 181401 BLAKE2B efdf2d2905f6513ba8942d55a1aadca8f47f22736a55894deb9a4afeff132d8e410b8d84d27314253f16cb84ebb530b79c75991427365c45058e58280ede4449 SHA512 873c626c72a0f4025fe8c8aeedbf3fe4ee5657fb487ad7410406a20da518c0358041dc45c2549926cc10e1d031977073b9d1ddb32830fdce95b716a52fe44456
+EBUILD bitmap-1.0.9-r1.ebuild 392 BLAKE2B 8637f7a4f93ba5d2ade30fb92c4b87a9c6b41d5abda5a0f6f8be5e9811ae1dd601ab72952fdcb4390b371e65e811d495754fcfdce5b712d3c849fffb11ef2638 SHA512 2fcbaa00185276eb07cd1b9f13c26cccc2e6cf2d133060ebad3652f1acc724ea64f4311ff247dca3970d0279c372e7a125e86e34e2856352f1e2deca87683083
 EBUILD bitmap-1.0.9.ebuild 370 BLAKE2B 6c7cabf9c6ef53b576e65fe0c388700a5486298dab8d3ee6666583c2399bec7b557cd969a5eec9f1071aae4b46601dd8bc669083530c7f99e577bc85006829d3 SHA512 52352baec1b698b9d79640aa888113af2242145651a1d6df52f437110f17be934e9a262e2a1ca3e7a4e55724ef6b25d463af3c789cbbdc69319d6184c055cdaa
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/bitmap/bitmap-1.0.9-r1.ebuild b/x11-apps/bitmap/bitmap-1.0.9-r1.ebuild
new file mode 100644
index 000000000000..37031344c529
--- /dev/null
+++ b/x11-apps/bitmap/bitmap-1.0.9-r1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xorg-3
+
+DESCRIPTION="X.Org bitmap application"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXaw
+	x11-libs/libXmu
+	x11-libs/libXt
+	x11-misc/xbitmaps"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
diff --git a/x11-apps/editres/Manifest b/x11-apps/editres/Manifest
index 3bfe74412a1e..251e77fe230c 100644
--- a/x11-apps/editres/Manifest
+++ b/x11-apps/editres/Manifest
@@ -1,3 +1,3 @@
 DIST editres-1.0.7.tar.bz2 166429 BLAKE2B abaa0764bfc3419e17d5cd222bbe20f5591f7bc8431444aa6739cdc067cfb81f606370df19562410aa54820a0249828ccc9d506a9607031b453a7993af634f60 SHA512 b9c928b556116bf50cf4b6ea779bdc9fedf29f5db3e6a8cc75c122578c92e1cc530a81b226ec24aad183b8ebc2de570f200314b0d9ce7883b6e3306007365b32
-EBUILD editres-1.0.7.ebuild 361 BLAKE2B ac68542b65c5ee71605b52cd05e9a517cc6af8c5cbe1feb2bbe8657633eec8784d782d0676774d1c9c916b4a1aa3ce232b367a920cef6535bed9b78e8d5ab943 SHA512 c477c719f59ff2f82e711958e822e986cff9632585476e97fcf04a10c3afafcfc4f8b4650a1998dcd085dda05ac900aec3c0aa221f7ecd2a337fd0dd8c9fbbac
+EBUILD editres-1.0.7.ebuild 355 BLAKE2B f6b8b0784e0402937766ef7e53200c17f47de72b2b7e526e351b824dd28db82a9aa63bb0c9fa05341cd8a945c25bc0d5c08d75fdab6ee253be9d479f11196c1f SHA512 aa885b00e061253d9a14efb22ecbfde541756b8c4848acc997c4b89c0a36b156bf1ec91bc08e456049887d14621cfca918b33916f9452beae14a0d7b16290abd
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/editres/editres-1.0.7.ebuild b/x11-apps/editres/editres-1.0.7.ebuild
index 77eaba3af20a..3d918065d7f9 100644
--- a/x11-apps/editres/editres-1.0.7.ebuild
+++ b/x11-apps/editres/editres-1.0.7.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit xorg-2
+inherit xorg-3
 
 DESCRIPTION="a dynamic resource editor for X Toolkit applications"
 
 KEYWORDS="amd64 arm ~hppa ~mips ppc ppc64 ~s390 sparc x86"
-IUSE=""
 
-RDEPEND="x11-libs/libX11
+RDEPEND="
+	x11-libs/libX11
 	x11-libs/libXt
 	x11-libs/libXmu
 	x11-libs/libXaw"
diff --git a/x11-apps/fonttosfnt/Manifest b/x11-apps/fonttosfnt/Manifest
index 8693f6aa9c5e..833533af6660 100644
--- a/x11-apps/fonttosfnt/Manifest
+++ b/x11-apps/fonttosfnt/Manifest
@@ -1,5 +1,5 @@
 DIST fonttosfnt-1.2.0.tar.bz2 145904 BLAKE2B b9b25076126dbd412d69f4c9698f937009f620b55a06f8c55b621add2ed6d638e0b91d3e716ed276089986c1a0140e2bf7aadef021c21ac24ac23c3347ee081c SHA512 a360bd8535beaef89afa6c0678a40f7c554e9d631e0fcb80bb1363ab72288e27a5e106521610f61c95b8101f79c7f02492a2068411b5f5b695de780d8a1c1b25
 DIST fonttosfnt-1.2.1.tar.bz2 146512 BLAKE2B 54b92f586248978f56b1b114a1ec02b19f7c871fed0c0f91c2e8064933d990f2b44f0163fa59f04f82b992a40be47e391eeeeae60a490412e361af9f10c445f9 SHA512 3d4ece61e31d4a5ed56923ecc1883e80a9308d2062d37345cb5be081bc2b004aadebf99a989601749a63e03eb641e0522d07773a57bca0b4710ed453e4f20742
 EBUILD fonttosfnt-1.2.0.ebuild 356 BLAKE2B e9d3f967a9627ddc95c971f99db33075a699b03340351821fba43022a81c0825a5831d45d1210c5c51be69ed4c5176ec193db214f50e1875d3f78b2bdbc271a5 SHA512 e43910fc1d262e11e982663ed0ae8284890f0aa3a2b441702b9263619ef575732176154860452cbd009c15330366a4ee877ea16508c2a1d5a02f5fc7dc85db23
-EBUILD fonttosfnt-1.2.1.ebuild 359 BLAKE2B 40cbf6f1df154572ba4b13b0a1ed50b658a5bdc563fcb7d8da378494cb4c1b31faf8ed9cc7ecd32fea834f0f3c3fb7239d2cdcfc2c425cbeeff7fd7a08e148a4 SHA512 d8106ddb0114896ba4e1a49e60f97671d519a1ed561aa98727ca6458d48d178f9ec89349ca4529fb517166b14fa041a52fc68e5cc96817da97e69901537b8b46
+EBUILD fonttosfnt-1.2.1.ebuild 358 BLAKE2B ea01f5771ff9955f7fc87057408ef750b3a3c379e82a8c540a3cbd52dbd58ef1320c67b84e491465e49212b85da1a32a383a6ecbde2035cd10848c9eb192164a SHA512 7b316da0c68d4bb21895a12b813aef4f5b670feda63b2cd2803f0b6e5d7c61a33fd3e52d345bfadb4aa47f39778eae46fac5cac8ae407736d9072b929d029014
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/fonttosfnt/fonttosfnt-1.2.1.ebuild b/x11-apps/fonttosfnt/fonttosfnt-1.2.1.ebuild
index c4569d861a5a..4245e106ef12 100644
--- a/x11-apps/fonttosfnt/fonttosfnt-1.2.1.ebuild
+++ b/x11-apps/fonttosfnt/fonttosfnt-1.2.1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 inherit xorg-3
 
 DESCRIPTION="X.Org fonttosfnt application"
-KEYWORDS="amd64 arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
+KEYWORDS="amd64 arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86"
 IUSE=""
 RDEPEND="media-libs/freetype:2
 	x11-libs/libX11
diff --git a/x11-apps/fslsfonts/Manifest b/x11-apps/fslsfonts/Manifest
index dcf4385c6c30..265a73946240 100644
--- a/x11-apps/fslsfonts/Manifest
+++ b/x11-apps/fslsfonts/Manifest
@@ -1,3 +1,3 @@
 DIST fslsfonts-1.0.5.tar.bz2 125650 BLAKE2B df08689dc452d07e895a93d5e755b3820b21c1df997b5269835ac04ac81beb09d98ebdcf7030d3e6c7ae288b3e7388b136a8b7b58f95ce3958e12923bab50620 SHA512 3a30598ace981c7396bfe44f0d8f76d40fca3f77158dceb3914a524594a12187dcad0b0f225fa81f251f0b7896bf046cec4ba610b4676da9be311eec5d8c6cc2
-EBUILD fslsfonts-1.0.5-r1.ebuild 306 BLAKE2B dc53b776adaf1d754dd6dd35bff01e7b88767181c5224c19d3ffb1c2878611d64e97c31c63d09ffbd569c2b8e92fe255ed829eff509532f80f5255a73062105c SHA512 fd79d21802ce5c86913e12a7478f32e3c02f4c0a93b4927bf0b2c2bbe879f5e4a05d96a4b52116fae1a4867d80d8c5f25df4b7bd153c653e91a32183241fe134
+EBUILD fslsfonts-1.0.5-r1.ebuild 301 BLAKE2B c5b4fa40580a60c7ce374069f070925150fb9e9632f294c81bc6840b5d146037efdb3c035c74445930f77a460314e3533a55d1fa7646764081be137dc76c80ab SHA512 eac96bf8e6653d2bd932d88aefe5e356ce1767b1713c019246ee96bea1149c1d70c69cb51ac65db994f15424000e2667091c93ec030588778e318bee8a61e0a7
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/fslsfonts/fslsfonts-1.0.5-r1.ebuild b/x11-apps/fslsfonts/fslsfonts-1.0.5-r1.ebuild
index 32f8fbb3f0bc..208786d2e835 100644
--- a/x11-apps/fslsfonts/fslsfonts-1.0.5-r1.ebuild
+++ b/x11-apps/fslsfonts/fslsfonts-1.0.5-r1.ebuild
@@ -1,14 +1,15 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit xorg-2
+inherit xorg-3
 
 DESCRIPTION="list fonts served by X font server"
+
 KEYWORDS="amd64 arm ~mips ppc ppc64 ~s390 sparc x86"
-IUSE=""
 
 RDEPEND="x11-libs/libFS"
-DEPEND="${RDEPEND}
+DEPEND="
+	${RDEPEND}
 	x11-base/xorg-proto"
diff --git a/x11-apps/fstobdf/Manifest b/x11-apps/fstobdf/Manifest
index db82619a062d..830f7b4f1cd4 100644
--- a/x11-apps/fstobdf/Manifest
+++ b/x11-apps/fstobdf/Manifest
@@ -1,3 +1,3 @@
 DIST fstobdf-1.0.6.tar.bz2 127170 BLAKE2B 89ed63541386d9f46ef839fb78be1cbfae4b51d824781325e33566a027a5a44671cdae84ec6ed81eb23b6a89f6868726b35781f2626a407753129ffd4c0af86f SHA512 ec5b8f62019ba51725bb47241d4fc244412f354e7c12094ed884109a88e3db9d25d41a6142fd002e6c49877b4c7f2c5dde549682dcc05f7ce102621d2c71671f
-EBUILD fstobdf-1.0.6.ebuild 304 BLAKE2B 7758d228a19624edcdc9e813e8f9aa1fcbf7e5c62bdedebc42a28140875ce71ebf842d040a52f4d9eb332785908665d94606eec58396fa882de0444a9bd3f330 SHA512 a072748bfdcf8a2cc89a5010160ed9eb7c7fe3f619e8f7fa6d2ea5c98a6c7bd8daba67aab5b58d28fc0b9a8f35522b19d31ebcaeca17e8af166156a35703b759
+EBUILD fstobdf-1.0.6.ebuild 298 BLAKE2B 5ffbf7a947e8c8e6ce7aa3e7e1a72bc5b192ecca5681fc8d34859b6a10f978ab2206ac95225bf4168bd1f4c944c6cbfbda268327dd33da32fbce77fac7cf51df SHA512 4f3b43276bc32c423d119a4525c7445725f3a07355339e24f95c68f65e404d96e414b6e2c66ae1b30885799d38b760432b0f6afa494a97c4d043e41669a0b7b6
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/fstobdf/fstobdf-1.0.6.ebuild b/x11-apps/fstobdf/fstobdf-1.0.6.ebuild
index fc375467eb96..5638ad52e4fd 100644
--- a/x11-apps/fstobdf/fstobdf-1.0.6.ebuild
+++ b/x11-apps/fstobdf/fstobdf-1.0.6.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit xorg-2
+inherit xorg-3
 
 DESCRIPTION="generate BDF font from X font server"
 KEYWORDS="amd64 arm ~mips ppc ppc64 ~s390 sparc x86"
-IUSE=""
 
-RDEPEND="x11-libs/libX11
+RDEPEND="
+	x11-libs/libX11
 	x11-libs/libFS"
 DEPEND="${RDEPEND}"
diff --git a/x11-apps/ico/Manifest b/x11-apps/ico/Manifest
index 0b8233ca98d4..5a205c4d3509 100644
--- a/x11-apps/ico/Manifest
+++ b/x11-apps/ico/Manifest
@@ -1,3 +1,3 @@
 DIST ico-1.0.5.tar.bz2 136727 BLAKE2B 6c6d0a3e9521d9dad9f17f20ca7e1ccb52da31b6a5c5879bbe3d63e58231956cb2ff665b109191185a9af8ee9d2b87f034d349d4d3b33d18dc7b52e0d0640972 SHA512 93a94a66d4a41b39d4b3657050e58f8269d352dae5d5916c9ecdda1cb14f23b9d159d67c50fdfa654b4b1c2ad11434bed140ace70703c82b05d3fe8686aab8f6
-EBUILD ico-1.0.5.ebuild 308 BLAKE2B 468613dc6e01745bff4fb99db8cac492ab296aa9d45044f58a0d228f691534adccd415554c47e1ff1f1822e491a640f6016c21fc1be003ddb1972cc501a237a3 SHA512 b55e76d19556566e052c1907d917c8a12fc2e7546172393fded38161046f8f199d01e81f9a58fd54f111f306db5aa22b547a843dd6b79f9e12a30f6b58bc44a9
+EBUILD ico-1.0.5.ebuild 301 BLAKE2B f82eb2b8b3c0214a8287eeaae5b0f2e7d026254287395929a6ce6cfdf6599510d59ab6f4b69cc7651272fde31f1804df1d7ed9e5221c10152d52b903c503b5fd SHA512 9cd528c4ec19e012fea9e4fa61eef12494a73cfd8d75f8dc23c5f47da921cc26e471d0d1d1dec7f1cc16f84e6c0399ddaf1068e45aacf7d95aa3936f8de6e508
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/ico/ico-1.0.5.ebuild b/x11-apps/ico/ico-1.0.5.ebuild
index 0c60e859472d..bbdf3fb6e6e1 100644
--- a/x11-apps/ico/ico-1.0.5.ebuild
+++ b/x11-apps/ico/ico-1.0.5.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit xorg-2
+inherit xorg-3
 
 DESCRIPTION="animate an icosahedron or other polyhedron"
+
 KEYWORDS="amd64 arm ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~x86-linux"
-IUSE=""
 
 RDEPEND="x11-libs/libX11"
 DEPEND="${RDEPEND}"
diff --git a/x11-apps/metadata.xml b/x11-apps/metadata.xml
index acb438fa4def..2ad9cf6b8e1e 100644
--- a/x11-apps/metadata.xml
+++ b/x11-apps/metadata.xml
@@ -24,4 +24,3 @@
 		parte de X.Org X11.
 	</longdescription>
 </catmetadata>
-
diff --git a/x11-apps/oclock/Manifest b/x11-apps/oclock/Manifest
index 47debb9d9560..927b5e4ccfe1 100644
--- a/x11-apps/oclock/Manifest
+++ b/x11-apps/oclock/Manifest
@@ -1,3 +1,3 @@
 DIST oclock-1.0.4.tar.bz2 132835 BLAKE2B 8547aeb06ac33917d44f318ffaa38bd899b78176e4ecd0e4446706cdcb3fe30933b4a63cc465601268d8d868e90d498c0fc6a27f8c0feb304fb7ca1f44492d4d SHA512 6e0d36a84572a153226b2929f2253cb7adc3c9e5e3af168aeaf8c487ade2e43517b271a8e9cdb2a2c4a67ca56ed0b99c194ca63a4a822b68bfc72ca6518335e7
-EBUILD oclock-1.0.4.ebuild 373 BLAKE2B 4cd9468a09b40b337350c48dec5312720857ecb20b6429ce384a07391137c4fe88e050af83af617e77e458316c69b5ed0689dc5385b20e17f97e398e7334917e SHA512 a7208314058f577731a06d89d04accc71f18a2749bf590427476a5647f4a0b393f83fc265197f5cad54b5c3148f53b9574c78b4091e205124ba55e1dfab7283d
+EBUILD oclock-1.0.4.ebuild 368 BLAKE2B dc4327fac69c28638cff0fe94d3286ce5bc4a1218208756fbc467763cec2df3f06428fbb346cc5e838dbb5234f69f06c69c476ace1802d588ca60acc5ea8f41d SHA512 79187ea593324e3b9f7adcf46ec5b882c58f1f7785177ed554f8298efcf4b95bd8b1286ca53cf9c4e694ecf71126019bf17d6054d9c18aea9e8d2ee5a3a384af
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/oclock/oclock-1.0.4.ebuild b/x11-apps/oclock/oclock-1.0.4.ebuild
index a9d5cb572755..5a42ee056ade 100644
--- a/x11-apps/oclock/oclock-1.0.4.ebuild
+++ b/x11-apps/oclock/oclock-1.0.4.ebuild
@@ -1,15 +1,16 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit xorg-2
+inherit xorg-3
 
 DESCRIPTION="round X clock"
 
 KEYWORDS="~alpha amd64 arm ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-RDEPEND="x11-libs/libX11
+
+RDEPEND="
+	x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXmu
 	x11-libs/libXt
diff --git a/x11-apps/rstart/Manifest b/x11-apps/rstart/Manifest
index 35276ee3c62a..776b2c665875 100644
--- a/x11-apps/rstart/Manifest
+++ b/x11-apps/rstart/Manifest
@@ -1,3 +1,3 @@
 DIST rstart-1.0.5.tar.bz2 144607 BLAKE2B 2048877683a5a1c1d07bb68d8814cea2a0e1755d7cea3f40b62c086a7f2e8ea2582eea81db46117f906f998bc830f50c437188131584d07fbb68730bfe2491ae SHA512 bda43dd29f95ba5ea4ab42e78069c4011afc6987d00dc580250aec8bec217fabb67577a3038607468de1739d54da596a43cea4c1f5be72e3e572ae6d5abbc09a
-EBUILD rstart-1.0.5-r1.ebuild 280 BLAKE2B d5056eb1cfb5a4f8ae0a038af8c7504d57a069a565500022abaacb9bae713b129066bb66ae679940298ded4443884a9a290db48500d3d55f12b4b9d132127c36 SHA512 d4bd3618d942b338215a298a6044e78364e31271546ebc0248f61554883be23012d4bd129e9df202e2dcd0d3320b9588225ac8e0ea416c4766b41e00e66aee6b
+EBUILD rstart-1.0.5-r1.ebuild 273 BLAKE2B 914e1fd0ab78cb4d4099e4dc08ffba52c1c9e7e9d67dbb0a2195f9a057320779897d269071208601a66a4e6f024ff109a6a44692c1a0e84e670f0181a3535c05 SHA512 638208dd8676e8f63953578bd845bff593abad42d4169c4fdd72bcd6d04eed9b2bbdba0eaccbe4fe1344a90d4e33eb422af05c61a545797dd831857fddd762be
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/rstart/rstart-1.0.5-r1.ebuild b/x11-apps/rstart/rstart-1.0.5-r1.ebuild
index 327b30687d9b..ee7cbcde71e5 100644
--- a/x11-apps/rstart/rstart-1.0.5-r1.ebuild
+++ b/x11-apps/rstart/rstart-1.0.5-r1.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit xorg-2
+inherit xorg-3
 
 DESCRIPTION="X.Org rstart application"
+
 KEYWORDS="amd64 arm ~mips ppc ppc64 ~s390 ~sparc x86"
-IUSE=""
 
 DEPEND="x11-base/xorg-proto"
 RDEPEND="${DEPEND}"
diff --git a/x11-apps/scripts/Manifest b/x11-apps/scripts/Manifest
index eb1104b01aab..297f91f6182e 100644
--- a/x11-apps/scripts/Manifest
+++ b/x11-apps/scripts/Manifest
@@ -1,3 +1,3 @@
 DIST scripts-1.0.1.tar.bz2 72301 BLAKE2B 2765ea1be05fabbbbf874399bf2a32fd778e5c57a98ef6c5135206d125ce29b7a02f7622205638e5c3a35fadd12211d46ef60e6c60b970ec924ec0bf97769282 SHA512 dd058c5d5b34dfb7b996e28c78ce8169809d9e0b0233b1e0f4f5ec223c62affe1e6e561869d7cc47948efbb56bd4b67f69e01f27e2133a15206fd3013c284226
-EBUILD scripts-1.0.1-r1.ebuild 468 BLAKE2B 0426e0271b394abc8aeb7b9c2ca71b2c750ae0c8b20367c6cb8be3f04d6e0c37ea9a988bc4c87316abc919427a005f7c8b21e0e857788c6e07e15b88bec336f1 SHA512 4ff979c5d352dbabb0a527184011d8af9776c8039a724748f57ec7372a0277006c5182a1a02e68687bff2fb3a191f2fa8bfa7ef5837cd2136d5fdba6dcb46a7c
+EBUILD scripts-1.0.1-r1.ebuild 459 BLAKE2B 5e3ea9e992ad209e1b2b6d120e8f0e3ccc67bc74225f070defb9ebd27f908b49dd9e5fbf655238ff952cc712b90d090d1049852522147b8f2a81b465371a91ca SHA512 de89605d59cb8e535a12d7c77dfd7015784945026cea5ddefd1fae49ffc5aa5394fc014d7d72c24403ff7d9fbca27403671d2c88f4a3999b00cae967dd5cbf9b
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/scripts/scripts-1.0.1-r1.ebuild b/x11-apps/scripts/scripts-1.0.1-r1.ebuild
index 666d1a2b8801..fabcb457abf6 100644
--- a/x11-apps/scripts/scripts-1.0.1-r1.ebuild
+++ b/x11-apps/scripts/scripts-1.0.1-r1.ebuild
@@ -1,20 +1,20 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit xorg-2
+inherit xorg-3
 
 DESCRIPTION="start an X program on a remote machine"
+
 KEYWORDS="amd64 arm ~arm64 ~mips ppc ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
 
 RDEPEND="x11-libs/libX11"
 DEPEND="${RDEPEND}"
 
 src_install() {
-	xorg-2_src_install
+	xorg-3_src_install
 
 	# Requires ksh, assumes hostname(1) is in /usr/bin
-	rm "${ED%/}"/usr/bin/xauth_switch_to_sun-des-1 || die
+	rm "${ED}"/usr/bin/xauth_switch_to_sun-des-1 || die
 }
diff --git a/x11-apps/showfont/Manifest b/x11-apps/showfont/Manifest
index 559341ba8636..a6182fd6e327 100644
--- a/x11-apps/showfont/Manifest
+++ b/x11-apps/showfont/Manifest
@@ -1,3 +1,3 @@
 DIST showfont-1.0.5.tar.bz2 125618 BLAKE2B dd3f97e3f2dff934f1cff4bfda0f8a06be3b8549b8572f3a163dbc638fa753eb14b65e8b11e19a56e687a306f3602f99b91fc458c22543d5622f870e518b77cd SHA512 d90d6d99ca573f2632435ccfd46de606994e3792deb58bab6261ff950481ec71eef032b828da0ee5333d6946c5f54594dfb2dadf930825971d3f4baa5c0ff6fd
-EBUILD showfont-1.0.5.ebuild 280 BLAKE2B 5f3e0343da41c73d391f75e228bb094650cf91cdf537e1cbd8c7cddd92ed92f4d67994dfd2b25a58dc03aa8b88bbad4a0bc6e80ee6ff01399b66f792f08e8a3a SHA512 e78c4100e6bdb4e2c4950bea79e4e10b694208a9eabae9ae7bf22beb9f927a5b23deb2935fd2f270063d730663c488ca2361b97526e440a9cc6dbc2e8fb4727e
+EBUILD showfont-1.0.5.ebuild 273 BLAKE2B 9635b9757eabeec523ed1ed75e5078e23691024b1c1dc9b611d5a6d213166b88de625f6ec4f4e9601fa2b946bff9086e483dd5faef83eb7638f03966b0db287d SHA512 d153546ba7c0eafefd5fdaaebc79559e9612548e34db414aa1e0d657597b35ec1ee5f035752dde35d3671690ed90b9dffb75976941ff1bed020b33276810d6b1
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/showfont/showfont-1.0.5.ebuild b/x11-apps/showfont/showfont-1.0.5.ebuild
index 08e95071467c..a2c947085670 100644
--- a/x11-apps/showfont/showfont-1.0.5.ebuild
+++ b/x11-apps/showfont/showfont-1.0.5.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit xorg-2
+inherit xorg-3
 
 DESCRIPTION="font dumper for X font server"
+
 KEYWORDS="amd64 arm ~mips ppc ppc64 ~s390 sparc x86"
-IUSE=""
 
 RDEPEND="x11-libs/libFS"
 DEPEND="${RDEPEND}"
diff --git a/x11-apps/smproxy/Manifest b/x11-apps/smproxy/Manifest
index 4314dc8e1661..7006ca05e468 100644
--- a/x11-apps/smproxy/Manifest
+++ b/x11-apps/smproxy/Manifest
@@ -1,3 +1,4 @@
 DIST smproxy-1.0.6.tar.bz2 132046 BLAKE2B b1eeba52730da79ed9f374636631c0400df997b2c5ab5ce18f1644ea6de7c55ba2914978d0b8b88f0cc455a0b5a65513fd7e29d2a374e7464fed14e007f8cf96 SHA512 4945c92c0f07c5dba5698889f415e78ce406939f4a36eb977309488c27385ce4ce04235c4e850a90a451fea8d7885ded7c6b18db71335c7731b38aaeefa9fcb7
+EBUILD smproxy-1.0.6-r1.ebuild 337 BLAKE2B 1bda74df12cf2f1640f55fa22302c66770d698ea0de0cb0c2ab5efab888482740d3bcd6fce0c34516de0c3c985c52d27431e5cb538f27903b129ab2d28dfb24f SHA512 4602212b08aae54af4648a63a27d9d58a5c20fd0d2a49058d01a17988d8d670c9362a5a5dcc3457d42093f0cfe156f1d4467662d289c9cf0792b8a88cbe0b9cc
 EBUILD smproxy-1.0.6.ebuild 315 BLAKE2B 0de031517e4a864abcbc1d78ffdf1030a6b1c715a52e4b10d47e046244463dfca3e1ea2ac671c5fb0e36cffaffed7a73f2a4f1ebb0f6ea68c86285725714bfbb SHA512 514338b38212aaf888c1ec0eb721fd65f80272cc249b7481140a3f2698f0b8feab787ccd7dc896929cdf2117e93b6e9189ab88ae182433fa35e3f1f9ef80eed9
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/smproxy/smproxy-1.0.6-r1.ebuild b/x11-apps/smproxy/smproxy-1.0.6-r1.ebuild
new file mode 100644
index 000000000000..04ff1c27740e
--- /dev/null
+++ b/x11-apps/smproxy/smproxy-1.0.6-r1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xorg-3
+
+DESCRIPTION="Session Manager Proxy"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+RDEPEND="
+	x11-libs/libXt
+	x11-libs/libXmu"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
diff --git a/x11-apps/transset/Manifest b/x11-apps/transset/Manifest
index 8d1503efcc9a..3ec7defdc0cc 100644
--- a/x11-apps/transset/Manifest
+++ b/x11-apps/transset/Manifest
@@ -1,3 +1,3 @@
 DIST transset-1.0.2.tar.bz2 127774 BLAKE2B fba4e8dc6eb3b3ea1285af9fccacc2d46cddbf17a086084c3db395bb5d78e6f13a348e2733c8b42efd2993dc053c01a4e6761c479506ba5d84a8715a956303c0 SHA512 f7a658cae70e211a0455420efbfacee0f3032821d94e7a80ec6db32ced716c1ce013f38713915505998071c312cedd1bad08575dbadfbbeb94361b048623f874
-EBUILD transset-1.0.2.ebuild 300 BLAKE2B 7eae249f4b26b9f5b2971d18644e88e46eac674049e8361a8980c28a3fc1a1a11898ad72825ec3cd93fdd0b209c139ce3a7682a2232e7d3b8bc5908b0ba44b9d SHA512 834062a86b701b476e31a9fc26bc0c935914169d99b2c191ab820860e92752ec9374b416193b0ac00acbb0893e01836d89dea0d431a8abba813809716f7c3276
+EBUILD transset-1.0.2.ebuild 295 BLAKE2B 01e1b8316369030c86a8e9bacde8dfd7c2bc859a16ff14cef1d5a17796b756459f22fe6a2f737017dd86c8ac1864d579da18c2466dffbb30f4c858d011c355b9 SHA512 b77962e76e53f71fa95d381c525a97e4356f9464f009a733c4b21ee5b8f416b4f94db887f72f82abe3268545ddab04f23b475ea3b0fcb578455147e5b9507191
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/transset/transset-1.0.2.ebuild b/x11-apps/transset/transset-1.0.2.ebuild
index e94154a3ff15..18372fbb4b41 100644
--- a/x11-apps/transset/transset-1.0.2.ebuild
+++ b/x11-apps/transset/transset-1.0.2.ebuild
@@ -1,15 +1,16 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit xorg-2
+EAPI=7
+
+inherit xorg-3
 
 DESCRIPTION="An utility for setting opacity property"
 
 LICENSE="SGI-B-2.0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
 RDEPEND="x11-libs/libX11"
-DEPEND="${RDEPEND}
+DEPEND="
+	${RDEPEND}
 	x11-base/xorg-proto"
diff --git a/x11-apps/xclipboard/Manifest b/x11-apps/xclipboard/Manifest
index 1a6cdb069fa5..051c17a66f3f 100644
--- a/x11-apps/xclipboard/Manifest
+++ b/x11-apps/xclipboard/Manifest
@@ -1,3 +1,3 @@
 DIST xclipboard-1.1.3.tar.bz2 132406 BLAKE2B 5e2e77a297c32884cadc4bf6e4503a958218b11083c747a575bb05dd8218fd0759edcab5c8d12055f5b0a1875e8a2cfb6b2062795580358521b619ecca8d70d8 SHA512 84a51d11851756422eb23e67b2721d2bcb2ac248fa32c0837423b6169144dff76717c22611ad3c93633e09a44dc70c847a2470d3988eff0b24d77e252a4e147e
-EBUILD xclipboard-1.1.3.ebuild 378 BLAKE2B d98beecedcd4f1ba58bccd00a3f93eff532fecd4517f7a0ef6c92b235a37698051252e6a65d40cab698aa5868be508af5b950b554d2b43cbd2e89eb41d2089d3 SHA512 d5b5c7cac88561fffc37e0ec3b47305c42ef505b61cb437791626e2cc30256e3e8db8c15083866a97763ecdd98726eaa858469be525f0e064ddbfdbdbb879c05
+EBUILD xclipboard-1.1.3.ebuild 374 BLAKE2B 6e40ffedc8a81c49ce8953941548802716fdc79953f5fb76cdc434183d8fabb1652e680ac28d5aa307b0a482d302dff85be5cd86f1358b530452dab805a69236 SHA512 29687d418e81b54e582f6ed87d7595bf92f841bc917447d597f7d540e163191a0069cce24aa84b8b342c0f51223a18f8d747eef87abb35e7a12bb4a52d1053bc
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xclipboard/xclipboard-1.1.3.ebuild b/x11-apps/xclipboard/xclipboard-1.1.3.ebuild
index 7f469de7f513..d3e1001b82ea 100644
--- a/x11-apps/xclipboard/xclipboard-1.1.3.ebuild
+++ b/x11-apps/xclipboard/xclipboard-1.1.3.ebuild
@@ -1,14 +1,16 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit xorg-2
+inherit xorg-3
 
 DESCRIPTION="interchange between cut buffer and selection"
+
 KEYWORDS="amd64 arm ~hppa ~mips ppc ppc64 ~s390 sparc x86"
-IUSE=""
-RDEPEND="x11-libs/libXaw
+
+RDEPEND="
+	x11-libs/libXaw
 	x11-libs/libxkbfile
 	x11-libs/libXmu
 	>=x11-libs/libXt-1.1
diff --git a/x11-apps/xcmsdb/Manifest b/x11-apps/xcmsdb/Manifest
index 3acb887a6d3a..1a17e922bcbd 100644
--- a/x11-apps/xcmsdb/Manifest
+++ b/x11-apps/xcmsdb/Manifest
@@ -1,3 +1,4 @@
 DIST xcmsdb-1.0.5.tar.bz2 145419 BLAKE2B 41269ca270e4b11838f54669900a074dfbbc7339af84db8638498e220eb7abac2fe055ca003dba326babf368d26137eabc0f0bae9f69233d9c91f7e727c3ba30 SHA512 e47bfce87d7531e7809c300e01120c3e8d6001130d9a6c9f6de5bc19651d8712d273a6f54452223bd8c4bff4612b5ecae8db45eddb022da945ed6e14c9c84ae4
+EBUILD xcmsdb-1.0.5-r1.ebuild 364 BLAKE2B 1e400b1ef00ec1f471ce9a3e796cce4489d6173aa930b6a5977e0c76cd29545a475280b296083815df91fcff2319fd99070b8c7c7e7bd6c5286cf28c725fd6f8 SHA512 f956eb5b469bff415437acf83310d0348143094be0bac19c7aebdd432c6cf26b5b0c6f783297da36e924c3b1f84af4ba01824b03f152a840b6fdc7e14dc0909b
 EBUILD xcmsdb-1.0.5.ebuild 345 BLAKE2B a6ed488cdde48630833abd44f6772d44d268e840f1cdf90361927dbb04c08eae2dade2d058a2ef3cec33a07d310e224d7737ba441249add63d2d81e7cffadf36 SHA512 2a52b63147293a89c9c271548252a2c046f784ae0b2e09571b4c44b91897ea7bba975422cbb640f9f5547007cb386f7ecf52fa626012a738e4347ba386d919b8
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xcmsdb/xcmsdb-1.0.5-r1.ebuild b/x11-apps/xcmsdb/xcmsdb-1.0.5-r1.ebuild
new file mode 100644
index 000000000000..0641e30abecb
--- /dev/null
+++ b/x11-apps/xcmsdb/xcmsdb-1.0.5-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xorg-3
+
+DESCRIPTION="Device Color Characterization utility for X Color Management System"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+RDEPEND="x11-libs/libX11"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
diff --git a/x11-apps/xcursorgen/Manifest b/x11-apps/xcursorgen/Manifest
index 2aa4214e0a4b..f45ab879ff0f 100644
--- a/x11-apps/xcursorgen/Manifest
+++ b/x11-apps/xcursorgen/Manifest
@@ -1,3 +1,4 @@
 DIST xcursorgen-1.0.7.tar.bz2 128102 BLAKE2B d4e583e0183e23d1a127d367e520027bb36dad44306dc2848717f2d25ea3cb656a7cd95fd02a18522911a720319126eed07637e1809b868f1f85c74773a10c35 SHA512 bd13ad23691d3daa2d5dcdc5902cf62e3dcb97a0289aff362e6cd85866a1d8cafb64f98800a75bfb4cf1f3c76244ca20201847dff594543d136d0abaec7011d2
+EBUILD xcursorgen-1.0.7-r1.ebuild 398 BLAKE2B e2538a20a46a88f473f9dcac2d2f3d80db363152a1fde1e99c0f1203ab36bd1cc3acc66c66f86279df7d09542bc0290eaf73bea71956998e08cf4cb016e0d883 SHA512 4eac51d7f841180b9c3b9ae891859b4cbfc3a03adf81a9badb8f8be49d4abc749065a4bfada24d7d956c059d63b6c91c550b7ce8acdc000bd4d24ad9caf0bf9a
 EBUILD xcursorgen-1.0.7.ebuild 375 BLAKE2B fbedac7900c723f04c0fcbfb61fcc8e668ef888dbf7a9f36e535c9c45fe855748df3477fe1b66f0200ce1bc51dc45748d2e905466bb9ad9e60c498ed7a0c6fac SHA512 e9ad2ce7da1d46a04705e46e3f31db70c69474cd9b57cbe3fe0d6fffe3ecc2dbf4586562cbe32e521c9a0629b7f55e1cc9d5f7f4646c7d7f46552cead4c7a727
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xcursorgen/xcursorgen-1.0.7-r1.ebuild b/x11-apps/xcursorgen/xcursorgen-1.0.7-r1.ebuild
new file mode 100644
index 000000000000..b7046b906d08
--- /dev/null
+++ b/x11-apps/xcursorgen/xcursorgen-1.0.7-r1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xorg-3
+
+DESCRIPTION="create an X cursor file from a collection of PNG images"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXcursor
+	media-libs/libpng:0="
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
diff --git a/x11-apps/xdbedizzy/Manifest b/x11-apps/xdbedizzy/Manifest
index 3f9adb7ff850..87f8e47f896e 100644
--- a/x11-apps/xdbedizzy/Manifest
+++ b/x11-apps/xdbedizzy/Manifest
@@ -1,3 +1,3 @@
 DIST xdbedizzy-1.1.0.tar.bz2 110340 BLAKE2B 2245ee691441e72e22a71ce482d97f7a24c230fae23779f6a496f8f82f962e7a0875b136b2a2308ac3e4940835b129e7641bebc895be02e2d32fff890d42489f SHA512 58b9c88b09772008fe18921c0b63972a65ee5833f96edbbd2e1dc335e5f20ca9a241728b9a225e3b0f3eb392a7941cc1ab6e3c871b9463ff21bb23e38557e9fa
-EBUILD xdbedizzy-1.1.0.ebuild 322 BLAKE2B d60f6c38e58455bd95a73c67b8d7b46eb5b159af59742a0431745b5c10f9bd653cdf238cdbc12123b1f29a6ae09423711096446eeaef69297d15724ac93ba583 SHA512 4a94814a7c1489b3dc4adb6f26888056208cf5cb5f163d8b4f214c19a3de962a216029960d670ad97712821236a622c13439115c5058072f9316043c1235c844
+EBUILD xdbedizzy-1.1.0.ebuild 315 BLAKE2B 72e53a05ddd8001e93f69761c78b8434c79196e7ce3d43c12fbeafc1ab2f1d12fe135406f8dc52ca64bdfdfd3b6a99137fb8fc168b73cc789b4d3e2f51c0f213 SHA512 9394b5b7d17bf3a527caee090a5dddc9cbb4cf010f42f8fa5ebd3ddd2a5df301b7c4e8c79af1cb88926ac12642cc2a781691d7573109f011c396b76e06e8bf2c
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xdbedizzy/xdbedizzy-1.1.0.ebuild b/x11-apps/xdbedizzy/xdbedizzy-1.1.0.ebuild
index 8c5f6233c354..a274b1b04b3f 100644
--- a/x11-apps/xdbedizzy/xdbedizzy-1.1.0.ebuild
+++ b/x11-apps/xdbedizzy/xdbedizzy-1.1.0.ebuild
@@ -1,18 +1,17 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit xorg-2
+inherit xorg-3
 
 DESCRIPTION="X.Org xdbedizzy application"
+
 KEYWORDS="amd64 arm ~mips ppc ppc64 s390 ~sparc x86"
-IUSE=""
 
 RDEPEND="
 	x11-libs/libXext
-	x11-libs/libX11
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-"
+	x11-libs/libX11"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto"
diff --git a/x11-apps/xdpyinfo/Manifest b/x11-apps/xdpyinfo/Manifest
index 0d28d733f4be..f153c562e363 100644
--- a/x11-apps/xdpyinfo/Manifest
+++ b/x11-apps/xdpyinfo/Manifest
@@ -1,3 +1,4 @@
 DIST xdpyinfo-1.3.2.tar.bz2 141351 BLAKE2B b2dee4f424dee902c31430b8843c14d6836508ee0125db7de41f5e9faef1732dea571e90b37638cc90dabd3995a0ceb5e4094707138b7e066ee1ae856258503c SHA512 2c9097c13778c7a7fe5a9b3ee04b28512ff6028231eca91ecdf6104c742be470678920d37a4f540fece7e39dccbea34802271f359ab80618027b2856c8912e7d
+EBUILD xdpyinfo-1.3.2-r1.ebuild 778 BLAKE2B 8f9b9ea0b0e6027b114d4602376a38f79d41b26c187bb621f4a49fe03377b38c4850143160c2919168326a5f61dd3fc97247bc843a6128a757fadb6fa6ecae2f SHA512 b26dfa8a5edb6a9cb46c457098eb9348607683b69b4399a49ebd2bb49dc56c10befa34dc75ec59a4dae0c5882259097545dbfbb1b3b8a3d40288de3ad8fefa30
 EBUILD xdpyinfo-1.3.2.ebuild 771 BLAKE2B 73045fa25f9ea855e98174d9086594dbe737e476774ae9a18ee59de17698ebaf5e0e3dd7830207403530e809e1e21eacada3f4a3e3cb6ad39c91b1b724e66f1a SHA512 db2b6fb02243fd4aa98ac284e72780f1ff960ce5edb616fe67d327c8bdf7c8b2c94c6bdb3adc66acb76e02d1db132c75cf7520efec9fd63b7586515f3af06589
 MISC metadata.xml 347 BLAKE2B 0496b148ad07710139de96e153b80e6035e6731a18d6e8a4dce75dd17bdfc54ad77276f1f82791393d198e96c9306f464dbce832b4d643b6285fb9a6d92e6261 SHA512 98174497a1f55be4b14d769ec110dafd63a8942eb8f51e2953237b76705128e47bd36a39b9c25985cdd99a3b431f3d5aa856fd634b2a2fbfc1a5cc13a3826fab
diff --git a/x11-apps/xdpyinfo/xdpyinfo-1.3.2-r1.ebuild b/x11-apps/xdpyinfo/xdpyinfo-1.3.2-r1.ebuild
new file mode 100644
index 000000000000..63f16db55f3a
--- /dev/null
+++ b/x11-apps/xdpyinfo/xdpyinfo-1.3.2-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xorg-3
+
+DESCRIPTION="Display information utility for X"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris ~x86-winnt"
+IUSE="dga dmx xinerama"
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXext
+	x11-libs/libXi
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/libXxf86vm
+	x11-libs/libxcb
+	dga? ( x11-libs/libXxf86dga )
+	dmx? ( x11-libs/libdmx )
+	xinerama? ( x11-libs/libXinerama )
+"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+"
+
+pkg_setup() {
+	XORG_CONFIGURE_OPTIONS=(
+		"--without-xf86misc"
+		$(use_with dga)
+		$(use_with dmx)
+		$(use_with xinerama)
+	)
+
+}
diff --git a/x11-apps/xdriinfo/Manifest b/x11-apps/xdriinfo/Manifest
index 65b5d9919c5d..e72aa7b524b0 100644
--- a/x11-apps/xdriinfo/Manifest
+++ b/x11-apps/xdriinfo/Manifest
@@ -1,3 +1,4 @@
 DIST xdriinfo-1.0.6.tar.bz2 123636 BLAKE2B 43e15c6833ad84760c89abff272864e13b777c01796ba119fbc7fa7165ab05cf5a090cf736f618a25385b5d5a8cf2d679fbe2cd55119842fcf9e16fdb46dd549 SHA512 7ddd9e19abaef93e4d85004293528ec3814ef84c470d496dbb8dc8313d804bb7520406de8d33d2bc2b3af942bd0a5d5032a109b2726438a966af63ea680a102f
+EBUILD xdriinfo-1.0.6-r1.ebuild 480 BLAKE2B 7b59e791bb350cbf4099a3946c3aa79bca1ab03897757919f1492f600da525be3f988534eb8b0c4df626689655982b0f79502c5eae3bab33f9b8399bf3d8db7e SHA512 c272261235b43fa053e403709a2c9844bc99f3d444c340cf881055b605f72f894f9224164159f00cf0522d55ce4cd09cc86547673415680c6fca39f5eec542c9
 EBUILD xdriinfo-1.0.6.ebuild 488 BLAKE2B 7118a5e7ff9a2dd7e9425536447299cb8e8b77823ca8e423d31bbeb5f0a41b1f256f90b123fc3711e39122e13b854285eec92760f96d2011c82a8e6e1e376dca SHA512 938a89980c771e34926ae5efad21fcf9de3e778d55df68b29fce4d4016e69039775826cbdb6de702f58db198bf1762c1ec666551e11d93b5764a7242bc6dbc79
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xdriinfo/xdriinfo-1.0.6-r1.ebuild b/x11-apps/xdriinfo/xdriinfo-1.0.6-r1.ebuild
new file mode 100644
index 000000000000..12d615ee4f87
--- /dev/null
+++ b/x11-apps/xdriinfo/xdriinfo-1.0.6-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xorg-3 flag-o-matic
+
+DESCRIPTION="query configuration information of DRI drivers"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	x11-libs/libX11
+	virtual/opengl"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+pkg_setup() {
+	xorg-3_pkg_setup
+
+	append-cppflags "-I${EPREFIX}/usr/$(get_libdir)/opengl/xorg-x11/include/"
+}
diff --git a/x11-apps/xedit/Manifest b/x11-apps/xedit/Manifest
index 7bbd95fafdc0..27ea888567bf 100644
--- a/x11-apps/xedit/Manifest
+++ b/x11-apps/xedit/Manifest
@@ -1,3 +1,3 @@
 DIST xedit-1.2.2.tar.bz2 525861 BLAKE2B 608f3f2b06d14f99a71d9eaf45114ba71271957f584c685236bd78e2f7c9a6e969ce15de72a7530a41835b951caa800a7cb0c45d71a4790aab5fe703d654e912 SHA512 24d8e23a2ad1a2e81f6606928bb032f25b70b76da83b65341367bc4111d011abe89f9e30402d057854f2ccdaa9c1ef0d7c55bf29b81ab2d050a8f448cf3eeb5d
-EBUILD xedit-1.2.2.ebuild 329 BLAKE2B 0e4160a783af7c161a2a045e40cf45aa61acf807dee6bebe61961a061d3a5433b35930c9b45231d9ccc2946ecfc60cc87a51389a20c17412694e49fd77da7a5a SHA512 995e12b5330e4d01171776307561ab070eefdc4295e2dfa9df57878640100aea8805d6cc60bda9241b3c9a01622e76090d98f6a1aa9e85467464ef2d4e98d440
+EBUILD xedit-1.2.2.ebuild 324 BLAKE2B 0f3b2f9a67f5ea5e7ae95554ef70f6ebbe406b73f9d02075908c0017a5c8a0d781a1138edd38ae6dc23c4ed6e1032693d567d1c70db92d5be5928cddd9a27d1f SHA512 c4ad52e58106cfdde4b9a9c2565b6ce3d748efecb507882ed5c3acf7b188330f4372ebe10b7950b0a89e58f2ad86c56bd76d823e5b215c6374727b72ad407d93
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xedit/xedit-1.2.2.ebuild b/x11-apps/xedit/xedit-1.2.2.ebuild
index e837afbc9fb6..a91671b39076 100644
--- a/x11-apps/xedit/xedit-1.2.2.ebuild
+++ b/x11-apps/xedit/xedit-1.2.2.ebuild
@@ -1,15 +1,16 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit xorg-2
+inherit xorg-3
 
 DESCRIPTION="simple text editor for X"
+
 KEYWORDS="amd64 ~arm64 ~hppa ~mips ppc ppc64 sparc x86"
-IUSE=""
 
-RDEPEND="x11-libs/libXaw
+RDEPEND="
+	x11-libs/libXaw
 	x11-libs/libXt
 	x11-libs/libXmu
 	x11-libs/libX11"
diff --git a/x11-apps/xeyes/Manifest b/x11-apps/xeyes/Manifest
index 448fe1506cb7..86978223c3b4 100644
--- a/x11-apps/xeyes/Manifest
+++ b/x11-apps/xeyes/Manifest
@@ -1,3 +1,3 @@
 DIST xeyes-1.1.2.tar.bz2 133160 BLAKE2B c3f31a2df7988517e4f8903fce6b0cbfbaad01e84d89c7b9f7755eccebba95fbb8b75377644ae97f090e9f4a3a245698966e78f738275f7513f5927193b5dd19 SHA512 008d76f03ddabd3d86ad9e52a540504553b94cb7a6743b20cf08897549eb27505667365ab9af21956a1b5ec7297acca8903a326536e6195a30e643cd93297ee0
-EBUILD xeyes-1.1.2.ebuild 452 BLAKE2B d64808f6da09c4c8157869431751edf17ababd41e461caf749a64747256f5967b2ac77205ec60148304752a2c4e33ad029bead786c843f4880828c4fdb5bacbd SHA512 fa98c557c99bf24c57f8c5e904c65c6f87d7f13047a1181d3a914ebd6d4952ef22d02e260e62b06fa65a7d36de9d5c86cda3d5f2915a1ed35ebe1d6e5d7f96c9
+EBUILD xeyes-1.1.2.ebuild 450 BLAKE2B 656e720004791543c7753549e3c2517e2b8b3ff23d7dc1ee1d511a3e3be88d20241c8291a80326114bc67f8a44cb4674626691522aec328e4c38fcd34391115b SHA512 fa05b8dccfb7a0946c122ff49a57be3f67084a46b1cc7b5121cb259b73e06b0332a159770fd5d7076963502f62d975835ae84096d5da4b8749d388c569be4804
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xeyes/xeyes-1.1.2.ebuild b/x11-apps/xeyes/xeyes-1.1.2.ebuild
index 1630ff25ee18..770341c49443 100644
--- a/x11-apps/xeyes/xeyes-1.1.2.ebuild
+++ b/x11-apps/xeyes/xeyes-1.1.2.ebuild
@@ -1,18 +1,20 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit xorg-2
+inherit xorg-3
 
 DESCRIPTION="X.Org xeyes application"
+
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~sparc64-solaris"
-IUSE=""
-RDEPEND="x11-libs/libX11
+
+RDEPEND="
+	x11-libs/libX11
 	x11-libs/libXt
 	x11-libs/libXext
 	x11-libs/libXmu
 	x11-libs/libXrender"
 DEPEND="${RDEPEND}"
 
-XORG_CONFIGURE_OPTIONS="--with-xrender"
+XORG_CONFIGURE_OPTIONS=( --with-xrender )
diff --git a/x11-apps/xf86dga/Manifest b/x11-apps/xf86dga/Manifest
index 20ea703a56c5..df23a9bf5553 100644
--- a/x11-apps/xf86dga/Manifest
+++ b/x11-apps/xf86dga/Manifest
@@ -1,3 +1,4 @@
 DIST xf86dga-1.0.3.tar.bz2 104935 BLAKE2B ec294d1d1d49b57479d52e9bee834ad15eb15758d50da3d894c5236e9d94a37e2383258e2c2456ef6a6cf9f73d1332b594fc663a48dd0241cfc02be1b9157480 SHA512 18dbf9b5bbe1bb9c993c742e04e132ee22e376148a499ee159418435477221b00904f36c1a6b1063df788079a4ff5520b4d604abcafaad3b5fd391a3b2c1ec07
+EBUILD xf86dga-1.0.3-r1.ebuild 370 BLAKE2B 2941132edb5cc114a25b67b17bb0ac3f57c6a08e51421b3dd25a0c5490a6630c4fc7d86ed85f98ac866a200b4e2f959f1faed71dd61115a76c2bd658d876e06f SHA512 beb29878c4798c1696299dc446ecb804c525c9b6f729cbefc1fffa2a0dc0d234dd211cb4b6aec3fce72efefa323b663217b911958c1986d3d2de94924cd51b8d
 EBUILD xf86dga-1.0.3.ebuild 369 BLAKE2B 93548c8513d4a09d28d7e3191397c0cbf98ea458db81bf40699811a4d4fcf636167dbdb026a3d9d932c81cb861f4dfaaee101219e841656100f7ce4d10c91730 SHA512 f6bd89b547d09776da6183b95a04b96042c9e75edfb816217021e94e30538506719b5d8ff402daee671d8feade1eb0014037131f76ddf50bee5161150552a00c
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xf86dga/xf86dga-1.0.3-r1.ebuild b/x11-apps/xf86dga/xf86dga-1.0.3-r1.ebuild
new file mode 100644
index 000000000000..edb4b7e8ca4f
--- /dev/null
+++ b/x11-apps/xf86dga/xf86dga-1.0.3-r1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xorg-3
+
+DESCRIPTION="Test program for the XFree86-DGA extension"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+RDEPEND="
+	x11-libs/libX11
+	>=x11-libs/libXxf86dga-1.1"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
diff --git a/x11-apps/xfontsel/Manifest b/x11-apps/xfontsel/Manifest
index bf68c233286b..777bcfc9041d 100644
--- a/x11-apps/xfontsel/Manifest
+++ b/x11-apps/xfontsel/Manifest
@@ -1,3 +1,3 @@
 DIST xfontsel-1.0.6.tar.bz2 146469 BLAKE2B 9773430e51e63d23086403f91fd78f6ed2e7f3abf144fda5bba171d05145026d233474e9d055b31bd498a861994c4f59af52a8101fc1e10b891ea879cb2f0bb9 SHA512 2f6bc51549a302404cdaf9a5a825add383953fcbb2a0c7076691cefd4dd7e4a3c772c047be74101c8486f75d03ce0bd3e65ede14e91732cf2a932810441c9099
-EBUILD xfontsel-1.0.6.ebuild 400 BLAKE2B db63b64ceec5059813fe94106f0e27eb1688be5197459b48fee7bfa065daedc877654bb9544fde65a2ac6f24f83ea6f4fe7bf531c2308c1348c30707d5511371 SHA512 b74d8ba1561e7389c0d4ba63893613460c5d04318236435ffaaeea19e2c5d8a1a12d2bd3a00a90f8b46b4626dbb9e07cdffbf12b043390ffdbedab450f6c27b3
+EBUILD xfontsel-1.0.6.ebuild 394 BLAKE2B 356c14e9f455dbefaa43cc9c2ac999a05b1ac9e1ce599337175ba32ce371a741e8dbc8798ba88b332008a80e715e6e041781e3a3005cdf1c7ad28f92c1f16263 SHA512 54220873efcd3637ec3c40535809439dacd6571972fd806ad2fa7a0a58ffc02ce5c001b5a97ee0426dbc972f809e8670ad4d62427340bd1b1e20a08494ed1d2c
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xfontsel/xfontsel-1.0.6.ebuild b/x11-apps/xfontsel/xfontsel-1.0.6.ebuild
index d48b18533f97..74c543c2d071 100644
--- a/x11-apps/xfontsel/xfontsel-1.0.6.ebuild
+++ b/x11-apps/xfontsel/xfontsel-1.0.6.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit xorg-2
+inherit xorg-3
 
 DESCRIPTION="point and click selection of X11 font names"
 
 KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE=""
 
-RDEPEND="x11-libs/libXaw
+RDEPEND="
+	x11-libs/libXaw
 	x11-libs/libXmu
 	x11-libs/libXt
 	x11-libs/libX11"
diff --git a/x11-apps/xgamma/Manifest b/x11-apps/xgamma/Manifest
index 80a1d986db32..a9298edecc5f 100644
--- a/x11-apps/xgamma/Manifest
+++ b/x11-apps/xgamma/Manifest
@@ -1,3 +1,4 @@
 DIST xgamma-1.0.6.tar.bz2 123105 BLAKE2B fbf5496e7c91f1e96d591721bfe7a1771659e7ef408be689e205e898191e0fd6beeff9466f4eff628054aefa640e83d7a8d69de028a6a6e5716a1eee50ef0abd SHA512 2d41798e15ac8c6f6731a2da29589207d936eaee1223ce6f3ca948e67d63c5c8b955d11c7db092dcd8c66a6209bd15c1de3dc1446dad4b4277134f010c6fc47a
+EBUILD xgamma-1.0.6-r1.ebuild 375 BLAKE2B bfe784ce754f36cad02e25167a06c37fe19d89920a0b3475cf0d17c9421bffd1b6980e392b43618dd300ee4af63e3e73ae10c18ac2432b99791a65976519c534 SHA512 22e14697fc9028901c758ee27eda50533f01fe7f8a9eee2f25c5dd6070a19abe968f43e76f684d6d74f259419e55dbf3c4f5d5f5b18f617846767868de94eb8f
 EBUILD xgamma-1.0.6.ebuild 375 BLAKE2B 0316bc444b1d541a3c0fefbda73c01a2ae6b5fc76ac0535b4887d43183640e33188683a34ba943c2d9823bf838b73b592605899e9558163dd87d3f1c63cf7c50 SHA512 0cf4db7a84d5c5f0622e1ae6bfc14611f32799e036f3c4dbe4f2221882363833d36ebcf284893fddb079fabb496e942bede4ce6f5131eb55a0cad02e3b7a4634
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xgamma/xgamma-1.0.6-r1.ebuild b/x11-apps/xgamma/xgamma-1.0.6-r1.ebuild
new file mode 100644
index 000000000000..2cbd04c886d3
--- /dev/null
+++ b/x11-apps/xgamma/xgamma-1.0.6-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xorg-3
+
+DESCRIPTION="Alter a monitor's gamma correction through the X server"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+RDEPEND="
+	x11-libs/libXxf86vm
+	x11-libs/libX11"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
diff --git a/x11-apps/xgc/Manifest b/x11-apps/xgc/Manifest
index 693647ef1635..226d1dbd5fcf 100644
--- a/x11-apps/xgc/Manifest
+++ b/x11-apps/xgc/Manifest
@@ -1,3 +1,3 @@
 DIST xgc-1.0.5.tar.bz2 188307 BLAKE2B 8e3906ee07898c1382c692d3ccb7541de40be55dbc88c0ed40ab3e78a638c6e475bf38f3a34d626507d34270208cc59cb7bdf727869c9907a00fca6280b5b39e SHA512 5943d13b9e0ed5e1b66d26eaa4b39d16d71f0df23e3ea93bfc397b6303516b161c2b60b24679ed75b640bf2493e66682d35efc7cedd41c5b57caa65f309a8314
-EBUILD xgc-1.0.5.ebuild 289 BLAKE2B a89b2b577bad5c753a825c772a04c0ffc72fc0b0d222689f2797a17ef4f8cfa6bd5b39d38d061961dcb3b0589f096ac74fc0199fd78a47fd6d6d7880498adffd SHA512 aec82a608763914633f923ba13ecb7e5fa0a523132141b97ece6e2f9ec89bada556b83cd869379e777a442ace8a62954247663401f0fc18d0fffd2f2b30e93c2
+EBUILD xgc-1.0.5.ebuild 284 BLAKE2B 9900bb11a8031b0d264101b94c471a687ac80e2cfb076dfb2240282ff2e75683260a538850b208d13b4d5ec31abba3bc560bdb5b987c6ac811953441ed9ce2c5 SHA512 20480f920022099036d88aef0503348674dd3343958c1a0e6d843ef697a90d580b5cc0f7b0b898c3da34e9b4712bf56585f08ff87319da288a2b653bf45f3449
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xgc/xgc-1.0.5.ebuild b/x11-apps/xgc/xgc-1.0.5.ebuild
index 9ae1d24edaa5..ccb06e5e8d79 100644
--- a/x11-apps/xgc/xgc-1.0.5.ebuild
+++ b/x11-apps/xgc/xgc-1.0.5.ebuild
@@ -1,14 +1,15 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit xorg-2
+inherit xorg-3
 
 DESCRIPTION="X graphics demo"
+
 KEYWORDS="amd64 arm ~hppa ~mips ppc ppc64 ~s390 sparc x86"
-IUSE=""
 
-RDEPEND="x11-libs/libXaw
+RDEPEND="
+	x11-libs/libXaw
 	x11-libs/libXt"
 DEPEND="${RDEPEND}"
diff --git a/x11-apps/xkbevd/Manifest b/x11-apps/xkbevd/Manifest
index 213dc8bfe772..e7dd202f4247 100644
--- a/x11-apps/xkbevd/Manifest
+++ b/x11-apps/xkbevd/Manifest
@@ -1,3 +1,4 @@
 DIST xkbevd-1.1.4.tar.bz2 151991 BLAKE2B 5f48968f4a45aeb5a851ba5c6c9cc6dd525d4385bda3475e1261a8419a3ea931fefff8e315309b6fcfba766ec9d95b4d64b93861f84798f5d730e2c5584c2cec SHA512 7628eddd0e1dc0c4df8e61eb3f6a6bf0e9d92a87e96bb2f5248ba5bd3d99d868885c36860b78e8ea2eaba3bb9a420067ef95c4d58c1254fa3d12fb25dd4e60e7
+EBUILD xkbevd-1.1.4-r1.ebuild 363 BLAKE2B d8c9ae2c37f55381b42a138d5efe78bfbfc7e38e61bb56bb21d9a7b3ab172a964c903875673092b9fc93735554f122db2a45d7be0b459f8aa77a91552842b6ef SHA512 75e6847b7a55c1d594e5bc1a126c156f3db0cceb9d4d5e37879472b50aa0cf336e169d21c8efd09fc8fde28470725aa0d9c670978e11758da38e551a8244b72a
 EBUILD xkbevd-1.1.4.ebuild 333 BLAKE2B b94579d74dc02be3ce26033a9d8cc3e47acb1603604f16909340695354191f3a559aea7004316afb86232d5c907d0146abdff8ff68079c959b7c77bd52b9c4c3 SHA512 41ccca25360d9658303cbac2740381c52434b322c5ab08b7fe5503e4f504a92a8797df5063cb4f6a829891b353b3748b93fe8dbd11d8ad3f37a96a259af1830a
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xkbevd/xkbevd-1.1.4-r1.ebuild b/x11-apps/xkbevd/xkbevd-1.1.4-r1.ebuild
new file mode 100644
index 000000000000..e897c00d87ac
--- /dev/null
+++ b/x11-apps/xkbevd/xkbevd-1.1.4-r1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xorg-3
+
+DESCRIPTION="XKB event daemon"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libxkbfile"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+BDEPEND="sys-devel/bison"
diff --git a/x11-apps/xkbutils/Manifest b/x11-apps/xkbutils/Manifest
index 6ae82ab28b42..05d597a82ab7 100644
--- a/x11-apps/xkbutils/Manifest
+++ b/x11-apps/xkbutils/Manifest
@@ -1,3 +1,4 @@
 DIST xkbutils-1.0.4.tar.bz2 131269 BLAKE2B 20e51a33b280bf4eaf6dfb3b2986ffdb09d1bb4fe3dd3689de5256204cc0e90808367b0afc054e2b5a6746b3b125bc0d20337761e1714c069f3c300a65fddb06 SHA512 5bb6cb52ac02a4ec18332559853815585ca86e00e8c6452483af10c4db75811fe00952575dbbad5b7d03b9d6498830fb45d617b1b3c5c1cea8445f1131856a4d
+EBUILD xkbutils-1.0.4-r1.ebuild 357 BLAKE2B 353a7729087263f2065ec40751fc63b716ae999cd0ba2e1e28bd614fe5dbe2dee18f216189d95e9eb69c88f04ad9a320000d4a2046847ee399b93a528e08c804 SHA512 78764cdcdb942f992624057b9f77719a3acb34ccd04155735fd8d01f66bde384b5adfe09e1605e0c32805a4066613ae80256474d234d458aa8e9f5b2df86509c
 EBUILD xkbutils-1.0.4.ebuild 359 BLAKE2B a8f3c870330fb536a45fd8bbd19ccef2b13bdd39a1f11f0ebce2d247d80aaa6b20e2a0806c47b39100a63198ed94e6feeca5b7fb8cbd5756554e60eac9f65938 SHA512 f6b17791a4b3df16e1bbf47fed78f2572a42351faf82fc8087412c53c6b250d3eb5e6a92fef1cfcc9124d5173ec9ba69695fc9b8a59ffeee9af3b42a9d22756e
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xkbutils/xkbutils-1.0.4-r1.ebuild b/x11-apps/xkbutils/xkbutils-1.0.4-r1.ebuild
new file mode 100644
index 000000000000..f407430b8807
--- /dev/null
+++ b/x11-apps/xkbutils/xkbutils-1.0.4-r1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xorg-3
+
+DESCRIPTION="X.Org xkbutils application"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXt
+	x11-libs/libXaw"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
diff --git a/x11-apps/xkill/Manifest b/x11-apps/xkill/Manifest
index f4b41a07024a..6f1e7db18bfd 100644
--- a/x11-apps/xkill/Manifest
+++ b/x11-apps/xkill/Manifest
@@ -1,3 +1,4 @@
 DIST xkill-1.0.5.tar.bz2 128146 BLAKE2B a01b954872eaad2aefe11335df2c85972abb8d36ae0c00fbca02b5af2d7df57934e3ddc47455f88927a90b0bff5ed707ca6dddbbf5478c89b193c98a86cc0562 SHA512 4603a1794f114f5cea2c885020c9d073c8421d1e785c99ff6b936ae97139c8dac8020a187b5bbd0fa6d56ed6fab879441b42ba900cc5f2f5a534dafdc86b9249
+EBUILD xkill-1.0.5-r1.ebuild 381 BLAKE2B 2dd2cb156862617b010741fc702af3d543134a611a05a544b136ef445b2764b5e14cf0a5935d54dbfdeb1300ab831aa180ed39da57e3025ba9f6661fdcb5ebfe SHA512 8d6848005812bd7ff0745cf98395d8463f918c124491bff7bf1bb26192d1dffb59a8ffb08c4c24ffa122c0f01f14cf86085594819ebecc3d184a525f126ae8fd
 EBUILD xkill-1.0.5.ebuild 362 BLAKE2B 7aecfcf146503b9c185512b54a3ec1a571f2a825a1bfee8e24af71737fc1ded9237f7b93564a133e27323580eb6503fa5eba76fc885dd97db01ccc2eddc14ea8 SHA512 6c4b0c5f4a22bd8fc930d5ff8a564a6214e10e401e9faff4e7efcd0fbc64359cfbac21182aefcdd4fa2b6bb418fe1487fc4fe1ca342657124af67a3969186547
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xkill/xkill-1.0.5-r1.ebuild b/x11-apps/xkill/xkill-1.0.5-r1.ebuild
new file mode 100644
index 000000000000..0539ad5a3749
--- /dev/null
+++ b/x11-apps/xkill/xkill-1.0.5-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xorg-3
+
+DESCRIPTION="kill a client by its X resource"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-winnt"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXmu"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
diff --git a/x11-apps/xload/Manifest b/x11-apps/xload/Manifest
index 39239849a791..76e2b8eb2d9a 100644
--- a/x11-apps/xload/Manifest
+++ b/x11-apps/xload/Manifest
@@ -1,3 +1,3 @@
 DIST xload-1.1.3.tar.bz2 140327 BLAKE2B e3e4e817b65a405b2e4733fbf736d2f2a9803436bd752d8fc14204f2c6e342dcf60c9fe69d749283ed53345020fbf7c250c91453d4b6634c41795e91e072cd46 SHA512 8dbc4f0cee7b30d7381be819152b27653d9b0049266e59bde2e2c972a88c4f2bdea766fc407bbdfef15d0aab30fedc756189a1048170a812853133a5094fe7a5
-EBUILD xload-1.1.3.ebuild 381 BLAKE2B 484b989b923ff6cd1bed8cdfff0ed08b3863ba19a8e08adf4d249c51c4105372b28b01e9ffe5cad51187bcf25b26b3f38bcd63d23b94c48d07c2ca8f7d14bb97 SHA512 137a57fc380e8358e62d5dd162e40e2b2d14b8af58ba610a8b35bc1154bda3cf22a2ea2e9f75d0d8a3e5a9f22b890c12bc9a414ac33822b072acfaa98d28a98e
+EBUILD xload-1.1.3.ebuild 384 BLAKE2B d36bdd5aaf07e86d70ae188b45fbeaebb58c1785e1ad978cee3be2a7827d3131fa9b2200b1f3982895133a2fc62e80c99cfbaaabeca68d2cdeaa3c59f5910203 SHA512 038afcdd217fc5171b3de167631f0024097f5379a3986ec1e46184310ba9a5fdf75f2fa34137360654e4d384384d494f3eaa4da8270e4e2956a61a7790f7bfcc
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xload/xload-1.1.3.ebuild b/x11-apps/xload/xload-1.1.3.ebuild
index 942bfa2921ad..71c7c8fcbdd8 100644
--- a/x11-apps/xload/xload-1.1.3.ebuild
+++ b/x11-apps/xload/xload-1.1.3.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit xorg-2
+inherit xorg-3
 
 DESCRIPTION="system load average display for X"
 
 KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-IUSE=""
 
-RDEPEND="x11-libs/libXaw
+RDEPEND="
+	x11-libs/libXaw
 	x11-libs/libXmu
 	x11-libs/libXt
 	x11-libs/libX11"
-DEPEND="${RDEPEND}
-	sys-devel/gettext"
+DEPEND="${RDEPEND}"
+BDEPEND="sys-devel/gettext"
diff --git a/x11-apps/xlsclients/Manifest b/x11-apps/xlsclients/Manifest
index 71f135f4ced4..a9dcaf0c2d5c 100644
--- a/x11-apps/xlsclients/Manifest
+++ b/x11-apps/xlsclients/Manifest
@@ -1,3 +1,4 @@
 DIST xlsclients-1.1.4.tar.bz2 130586 BLAKE2B 8e13bd29f10035a101cabe2a271fd665618dce12f7047f441bf943e8c4d2743e2385874b8e1cf42b69f6a19b7a3d5c16ec9ecff7e6cb62401888802d6946dd5e SHA512 42fd848d88d3cf31168a37fed63f9f5b60ddc4f36be2956b354e574c93129d75f29e005d6631784380bcef27860b54c64f419ca18ad77f092f4520dec47b10f4
+EBUILD xlsclients-1.1.4-r1.ebuild 361 BLAKE2B 00f29d98e21190a6410ee5ff28fac2314c60929b913d4919f9b794afcfa98fd0193682e6ab7b83f0fec67db62e8db71ec9f3ffa00e393622016d0c822387c4d0 SHA512 70ae99a61af0becd1a928086de640527b85f6c58d7a674a23057603ebf3138a117af2ee59f9562098a8c0a6ee417c7d39b291ec9b80ce821b90bbbd655a023ba
 EBUILD xlsclients-1.1.4.ebuild 342 BLAKE2B d7e1a9b54a45dd100e674ff05571748a5f3c025ee39434db0e9f0842474dcf0b56caa5cde6faaa52c8937d6627f7d35e4ad1981adc5ce9c8be13ad8fe8a205c2 SHA512 0e7d7d8734ec0685171ebcd0360e7cf6ec24fe3aa351f5326fb53687877510e6e472923907f7144449c7e1b95b196e54094a3dea3031b08337f15f42bbed6c3e
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xlsclients/xlsclients-1.1.4-r1.ebuild b/x11-apps/xlsclients/xlsclients-1.1.4-r1.ebuild
new file mode 100644
index 000000000000..0219303ab804
--- /dev/null
+++ b/x11-apps/xlsclients/xlsclients-1.1.4-r1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xorg-3
+
+DESCRIPTION="X.Org xlsclients application"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=x11-libs/libxcb-1.7
+	>=x11-libs/xcb-util-0.3.8
+"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
diff --git a/x11-apps/xlsfonts/Manifest b/x11-apps/xlsfonts/Manifest
index b238ff0d9280..2289b4d0ed44 100644
--- a/x11-apps/xlsfonts/Manifest
+++ b/x11-apps/xlsfonts/Manifest
@@ -1,3 +1,3 @@
 DIST xlsfonts-1.0.6.tar.bz2 133500 BLAKE2B e21b5776ca02c5fe07ba80c2e845fd04d75642ed7984080df3402a478748e4bea00f93134eaf359da9d5223be6bf98224067bd3413c072c2f38bd589fdc90328 SHA512 052a3b1dec23cb20fdfacd4500cb836feb3b888bf568a548ea71deb58a4ba10a1ad5392d658e95272c6d4a1832edf1f19c3de2498b78dca82c43ee52800a30c0
-EBUILD xlsfonts-1.0.6.ebuild 349 BLAKE2B 9b7ad77ebe8b1da276db7b11348cfaf831da4cfc8925bbe62730362286b8247b3525262e61b331d83ecf8e93cc19a8533b326d61d7fe5f86d35830207fbb8a01 SHA512 760e485d5e2d02b3e624e77fefecfca1556b78e0f194cbd7e9e9e6318a291e56e1333b403d17fe7ece2b9a3839aa676cae5dbf614b5288fa9043d1fb509cf59f
+EBUILD xlsfonts-1.0.6.ebuild 342 BLAKE2B 20701c1afe250fcdcfe2297991a1c4ea84c7b202c916e52a2927332dadd2223ea975bb62be0f1646cb6824bddc20d4fdde64e19cf49a195350b2d58e7fbdd8a2 SHA512 9aec01d9e19dce9618e1a50e6d7aefc80d25438e9f5cc1a7a50e6c1f4f9cd3205e6a035b46608ed88379ed12bc64527092536d3c16a70dcce56ac77fb3c53354
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xlsfonts/xlsfonts-1.0.6.ebuild b/x11-apps/xlsfonts/xlsfonts-1.0.6.ebuild
index 8ae47d4ad07c..32365ce3cf15 100644
--- a/x11-apps/xlsfonts/xlsfonts-1.0.6.ebuild
+++ b/x11-apps/xlsfonts/xlsfonts-1.0.6.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit xorg-2
+inherit xorg-3
 
 DESCRIPTION="X.Org xlsfonts application"
 
 KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE=""
+
 RDEPEND="x11-libs/libX11"
 DEPEND="${RDEPEND}"
diff --git a/x11-apps/xmag/Manifest b/x11-apps/xmag/Manifest
index c78e8e03930f..399059e552f0 100644
--- a/x11-apps/xmag/Manifest
+++ b/x11-apps/xmag/Manifest
@@ -1,3 +1,3 @@
 DIST xmag-1.0.6.tar.bz2 143112 BLAKE2B f53d7f564c71100e5903c19ee86aae3405cbc56258c89a5ad3d5e583649e1c2a862fef875c6de18c462e103da2afcd4fcfc9927188e7a4e8b980c7d80b2c4c64 SHA512 98f3c8e0c58f31cd4f1736ba9c5cd68dba3b2e2de6191988de8ae3e91b1d310803461840189ad56be45ee57c9ca05a2c63544a49b02ce6f79f2ebc14c59613de
-EBUILD xmag-1.0.6.ebuild 331 BLAKE2B cb48a74486a10fd0c347c6236a7b85a50c440522fe541dfb42c2fdc1f7e412dd0bd1131a9ea4e6a41ce34f1dd7441ee046a945cc5a613e7aa27cdb414e705de8 SHA512 ad3cbb5f6134a6e18872224295ba868e8bffd0203034f076360c3141a779490da149c03e781f21a1174a047dc9f029adf02b96ea8d4177c953c613abf8277a71
+EBUILD xmag-1.0.6.ebuild 325 BLAKE2B cd8d45f91f7bf0bdb71d1e271706a0108c8792450975cf54c30b577624000c83a7e55e18089106bc2169cd1c79b30ff6e8cd21e14ab56a418aefac8d09a00981 SHA512 fecd2fcc9d1aa206ef66f34fd3b244ca2d10089f5c195446dd408f7b329078d681ef48ebc8717561dd0faadfd32ec1681ba40ec160dd0bf74ee0eba7b9436916
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xmag/xmag-1.0.6.ebuild b/x11-apps/xmag/xmag-1.0.6.ebuild
index 905fd30756ec..4f865e46ee3d 100644
--- a/x11-apps/xmag/xmag-1.0.6.ebuild
+++ b/x11-apps/xmag/xmag-1.0.6.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit xorg-2
+inherit xorg-3
 
 DESCRIPTION="X.Org xmag application"
 
 KEYWORDS="amd64 arm ~hppa ~mips ppc ppc64 ~s390 sparc x86"
-IUSE=""
 
-RDEPEND="x11-libs/libXaw
+RDEPEND="
+	x11-libs/libXaw
 	x11-libs/libXmu
 	x11-libs/libXt
 	x11-libs/libX11"
diff --git a/x11-apps/xpr/Manifest b/x11-apps/xpr/Manifest
index 6b53da118505..2a04f9d270ac 100644
--- a/x11-apps/xpr/Manifest
+++ b/x11-apps/xpr/Manifest
@@ -1,3 +1,4 @@
 DIST xpr-1.0.5.tar.bz2 150714 BLAKE2B 89d20134a3a9a12e319d343ae20c3aac71d1d2d2cbbffe1ff71375211efb3a4b22c2d99099fb1621fba838778702cca8c088181218c5d2c5fcb6af706d23b359 SHA512 d5dfb936ec4ad0067d02654dec8e862fe337ff6a2c2f974b2b3a612a829c2e728a0d51e7aba00ed2a94dc96dc50cc69f2c59f522e0635013f5f4f5bb3f4ab967
+EBUILD xpr-1.0.5-r1.ebuild 337 BLAKE2B 94304ee921c547e3a9e1a60da1ef7881080b3310a381494fa99f99cc7525a9dc811e324c0fe576ee551d60adb6926ff49ff759181b1b39eab18c9034131e6099 SHA512 c598fe74e69386cf2ebf65c7f913ec97a4ea0fe590cf87004ac6da7c6bb9f80d0334f88762fd2252d396cb8872f578509c6f89bc5f39f0300a3c1c1a5a434abc
 EBUILD xpr-1.0.5.ebuild 313 BLAKE2B fccbb36a3616243c56ceb67577c0895027e17c453ba3ffcb3b06b9d8ca7c05616316a18efa33d77f89c7b806a4bb629efa59d562946862ce53d2b5ed7fd0aa0c SHA512 e3492591a5dc0e648dfb355968532627daa40c8aa2c1bb60072cedbf36a5dea2921a8248d70b3eb3f0b8a1c43232902c9851dcb222a081ac15e3278cf41afd28
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xpr/xpr-1.0.5-r1.ebuild b/x11-apps/xpr/xpr-1.0.5-r1.ebuild
new file mode 100644
index 000000000000..b2a41d163976
--- /dev/null
+++ b/x11-apps/xpr/xpr-1.0.5-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xorg-3
+
+DESCRIPTION="X.Org xpr application"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXmu"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
diff --git a/x11-apps/xrefresh/Manifest b/x11-apps/xrefresh/Manifest
index 355ec00b82b4..ef737c6e17d4 100644
--- a/x11-apps/xrefresh/Manifest
+++ b/x11-apps/xrefresh/Manifest
@@ -1,3 +1,4 @@
 DIST xrefresh-1.0.6.tar.bz2 127494 BLAKE2B 587f5756bbd3095e77494288d4b9cca99992b342bb718e5cadefdfbf018710ce0f216f43b68814d0d0a681c87d855be4ecf199a314361278c3bfdd81e6073f69 SHA512 361e97fecfc2706d5eeab69df0d4dd4baa55b6783cfddabf51d8561b7c930d71ce6c217e0512c6564208d69b04f89c69ea8c0bfb2e4f6cc25b062b55e4db3674
+EBUILD xrefresh-1.0.6-r1.ebuild 331 BLAKE2B bf49ad0da8682c448ea852035d761baef9eed07470446819aa935e70892896e2e16cde48981b3c697ca247e1e8b26b75f144378aadc1bcc5c7e944e463ad9ce6 SHA512 2fb2e3aa334110e97da594b7cd4e2477147aaefc0cfa52aae4395e9b64599b60a7a7e24707e366b24d0c8d7ed75b43e5ab3f8612851678375f5f0fb83ce23306
 EBUILD xrefresh-1.0.6.ebuild 312 BLAKE2B a1da9e51bef49939635b4b8f60be789085c03df52770b4e8bb24d7a6232ec4c6bd318b92bad6344acf3480984facd81fd6da1a91106487fdfccbef1a28f56181 SHA512 b03eb1ef54333f5ce43b3a2ae0bb4015eb6bd55a3bd60cd72b588d3037a1ad012d82cbb70f70dba00d2e35a4725cf7d687737dcfd1a973d7143d67ebf004fdb6
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xrefresh/xrefresh-1.0.6-r1.ebuild b/x11-apps/xrefresh/xrefresh-1.0.6-r1.ebuild
new file mode 100644
index 000000000000..80fbc1b2cb1e
--- /dev/null
+++ b/x11-apps/xrefresh/xrefresh-1.0.6-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xorg-3
+
+DESCRIPTION="refresh all or part of an X screen"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+RDEPEND="x11-libs/libX11"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
diff --git a/x11-apps/xset/Manifest b/x11-apps/xset/Manifest
index 0d1b2aa22e76..caf222adb570 100644
--- a/x11-apps/xset/Manifest
+++ b/x11-apps/xset/Manifest
@@ -1,3 +1,4 @@
 DIST xset-1.2.4.tar.bz2 145546 BLAKE2B df4ae52046af7f632e2f60386bd3b8d90b27db3e53ceb68f1056c9c5df2ee9c6d83d109a444eb99ddc031e35b91db0249ee56eba3180bc9a8a002935db213605 SHA512 f24714c9a82081a09d3054bbad98553de9366992f22eaf3e2bcadbb58fad1d3dad2547fef6fa9898d8a9df064573c29df9d82a5c801fa92248604c95f65dc83d
+EBUILD xset-1.2.4-r1.ebuild 491 BLAKE2B 7490ac510a33f670f894b800579fbc61bc09a8e2d3a415030a52d6d143f59b1f2cd4fa06e7367479429aa8bd4d69f177cc77c6cb5d16c0ab4c6749a123728520 SHA512 5b890242d4088ffd3ee8be256e774bb1e0289615c09933881c2f9b404b929e8712d69d86a8e503d6f8cd3f8b1e8e4b74f7923d61a4d37bac250d74fe11b7aa12
 EBUILD xset-1.2.4.ebuild 470 BLAKE2B 201e4d8bf88ebcf477164b789bedb3bb974eb972099d6cb7b3a70a60668f5db15923c4da0dba93885302158dec629bdea731b9fec042bf1b227f819df48acdda SHA512 7e8d940c96570aa96c43e1c8bf04434347fdb1dd280496781e8cbcf3ba1380ab5e6f6d0699168a14b21316b93a796c582ccd104465196360657136be24ef7e2a
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xset/xset-1.2.4-r1.ebuild b/x11-apps/xset/xset-1.2.4-r1.ebuild
new file mode 100644
index 000000000000..3e4bc382f415
--- /dev/null
+++ b/x11-apps/xset/xset-1.2.4-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xorg-3
+
+DESCRIPTION="X.Org xset application"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXmu"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+XORG_CONFIGURE_OPTIONS=(
+	--without-xf86misc
+	--without-fontcache
+)
diff --git a/x11-apps/xsetroot/Manifest b/x11-apps/xsetroot/Manifest
index 25acdecacdb5..659bd091abcb 100644
--- a/x11-apps/xsetroot/Manifest
+++ b/x11-apps/xsetroot/Manifest
@@ -1,3 +1,4 @@
 DIST xsetroot-1.1.2.tar.bz2 129091 BLAKE2B 0bd0615f64c636eaad7ed1b83d49208e9065edf7583bcd7e5d4c5d2f1a1eca4c7692209a540cab823c35497696176f4925afecaaf843610f6e9485cd3724f1cb SHA512 0b9df1b72305e5c24f1e1664578aa4411a5ffcdc5d318458117594e641f01c34700205b0d16c08abf4a8106d36128ccdbe1ea1f1035fce9018d6b52801a8b72b
+EBUILD xsetroot-1.1.2-r1.ebuild 407 BLAKE2B e911774209086f3c35ca2c69c8f1d748a3088c9184955c5aba20254f2a2f05eb3952c0153c1977a6b195c686ce489bb85f864eb07c57d0b52b908bcef3c606a7 SHA512 7359eebc0545487e43c13987a9976b4b5044a3acd2c73f459e7bf2bc9e32a707a07add3a4bbb51097db54cced94b89299b442d30f423e9eebcb92c3eb64e646e
 EBUILD xsetroot-1.1.2.ebuild 384 BLAKE2B 3a22511b1f237133a80e616ebb529a5612622e2c12da4f0d33c5a38c2a23de9329a792ee9915a2b3a20174cc574badeb3e27d397c33259b5c019d8e4516a32ba SHA512 55b586e59c7e5d0bfbe582776460cf896c671d7a8e68dd0ae07e1ce612013bb9f051a7b2cfaac9a2270da33b7d533c0fd9fe688150a242c6cc1b2afb4f4df7bd
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xsetroot/xsetroot-1.1.2-r1.ebuild b/x11-apps/xsetroot/xsetroot-1.1.2-r1.ebuild
new file mode 100644
index 000000000000..bb312bbff677
--- /dev/null
+++ b/x11-apps/xsetroot/xsetroot-1.1.2-r1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xorg-3
+
+DESCRIPTION="X.Org xsetroot application"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXcursor
+	x11-libs/libXmu
+	x11-misc/xbitmaps"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
diff --git a/x11-apps/xvidtune/Manifest b/x11-apps/xvidtune/Manifest
index e20b13453d90..2bf2ace07d8d 100644
--- a/x11-apps/xvidtune/Manifest
+++ b/x11-apps/xvidtune/Manifest
@@ -1,3 +1,3 @@
 DIST xvidtune-1.0.3.tar.bz2 128492 BLAKE2B 87271fa736f1c377f48f36fbb63a28ad0e6327ca612b681328aec44cafa839f5e1c04b239907e25f547b5a69e7dbd92bccd3500ed20760efcf18fb570078241b SHA512 0f8a4fca1b544ef8f9623246fb0ece75739a0889f2e729c040cd768c595f0bbbfa3a665576369032535c34c7d55784a29b62f0d51432bf2b75d2cec619db7352
-EBUILD xvidtune-1.0.3.ebuild 382 BLAKE2B b6ea8b42094c80bf606d01597490acff27cb42be97232bb731c5d1780da0a34b06ab729deba4c176c6508bf1ff898047a3f4899b515660e3022547a347a33bd1 SHA512 435f0523f1961be8a084bc368710a7aa876c6adaf676484e8b696ae79d8de29ce0264c1d33d726b00c29997c24f60405af74f117b169543455b890e3b11c9d67
+EBUILD xvidtune-1.0.3.ebuild 379 BLAKE2B e381912454278004a28d93865db1294f910bdf32d8c352cc578a9cfd9ee7e5f5d6dcddf09c9674707fa89b4a6560982973d562c8986ba27e6d10abfe0ae18cdf SHA512 cbd52a7ae5ad14bb5f096b92f8f0ffcf100e42953e9639ac5311e63cd1093464ecd321be5f4c06b8b4422eee57477eb141ab8166d83c8f9c422af2a9b9b12b1e
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xvidtune/xvidtune-1.0.3.ebuild b/x11-apps/xvidtune/xvidtune-1.0.3.ebuild
index 3de262b8407d..0c03db335b35 100644
--- a/x11-apps/xvidtune/xvidtune-1.0.3.ebuild
+++ b/x11-apps/xvidtune/xvidtune-1.0.3.ebuild
@@ -1,18 +1,20 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit xorg-2
+EAPI=7
+
+inherit xorg-3
 
 DESCRIPTION="video mode tuner for Xorg"
 
 KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ppc64 ~s390 sparc x86"
-IUSE=""
 
-RDEPEND="x11-libs/libXaw
+RDEPEND="
+	x11-libs/libXaw
 	x11-libs/libXmu
 	x11-libs/libX11
 	x11-libs/libXt
 	x11-libs/libXxf86vm"
-DEPEND="${RDEPEND}
+DEPEND="
+	${RDEPEND}
 	x11-base/xorg-proto"
diff --git a/x11-apps/xwd/Manifest b/x11-apps/xwd/Manifest
index c719144df17a..b90b18ba4738 100644
--- a/x11-apps/xwd/Manifest
+++ b/x11-apps/xwd/Manifest
@@ -1,3 +1,4 @@
 DIST xwd-1.0.7.tar.bz2 148026 BLAKE2B 9088105a07db38418352cccafaee4ecc084940e031416358291e6b5a6f47b2c8972928f0eb3479db4ff93b3a54a24ea4231f4d8196464f14ac4d7a1b5bb7ecce SHA512 6fdb0a115ae505169bbc7fcc45580daf26bced2e26e0bf9a877636016038931a8386e8edcbe015f4024be508d0461906adef4834cf22a445e3c282f0b8fad17e
+EBUILD xwd-1.0.7-r1.ebuild 363 BLAKE2B 6004748bac88f0e0e7a7b3ba0c2cf562d090016721ef2337bfed728deb3b8f5d2eabc35dc41b30d10d68cdcbabe22e7809d835af3a386e5b0aa1a76d10322448 SHA512 f88cb986f7d81447918b405a4898980af05b7538bd66cad813d8150a35f4e070f283512670fe6d7340b4f8d46ec69c67541fca3e01cabae7ab5edf0a5cdc32be
 EBUILD xwd-1.0.7.ebuild 439 BLAKE2B 9606f93395ad02373d8cee7d22a4e48e7a751f6f9399d4a067b04c5c0696d8062f94d809f95e66ad65aa6188fbb3a266597564a7ca4c6d14cb20f76869a4a419 SHA512 c1d749d3e6e6038e2dc7da6180992919d0bb1c16ba5514978a5febfd946dea483d33ae15bc1d1e80e66669bffd71dc0310abd65934c3a20f096b0ac7c920398f
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xwd/xwd-1.0.7-r1.ebuild b/x11-apps/xwd/xwd-1.0.7-r1.ebuild
new file mode 100644
index 000000000000..116dcac06fb2
--- /dev/null
+++ b/x11-apps/xwd/xwd-1.0.7-r1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xorg-3
+
+DESCRIPTION="dump an image of an X window"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+RDEPEND="x11-libs/libX11"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+	x11-libs/libXt
+	x11-libs/libxkbfile"
diff --git a/x11-apps/xwud/Manifest b/x11-apps/xwud/Manifest
index 5f56fe88d734..9d627734fdfe 100644
--- a/x11-apps/xwud/Manifest
+++ b/x11-apps/xwud/Manifest
@@ -1,3 +1,4 @@
 DIST xwud-1.0.5.tar.bz2 133376 BLAKE2B 27ce8251ae2a2a87393655e1824121dd54f75839a8066405299e9052bf2c55c6946cd686f285dca1d7339029d8ca8b94e4adb3efb485b42bd347db212b12858d SHA512 27a0ce7481978ae6cd94b0d94374af72185e270d68f2496620e148bb00945427c4827138d9efc48745e6382e3da3390ed0cdff7dbd02dcf9706e8ecccae97184
+EBUILD xwud-1.0.5-r1.ebuild 319 BLAKE2B effbf9a8f40839a3b505ed3a43268567311df3fc50197c311561ee871a1511df728cccfbe1ee48ec1703ff6cd43f705c7ac5d0aa5b487b28aeb8cbc138707edf SHA512 6a6b79b9bd097bf2f9521da2f221a2a855434e98bc1ca9eed199a936b0f61686b4fd65b346edadb8b72b6abfe3d3612c1dc3d01c041ebf39b0b7ff565c7ef5b7
 EBUILD xwud-1.0.5.ebuild 299 BLAKE2B 3e33caf41813fb6eb41b9c2348d21e3018bc294d4b31178fcc0fe4989c0dae05962fbd7059361e583afdb823f667e6dce11208f097e43718f2aea57c789c123f SHA512 7cd7aceca3304b6fcbb0c7b88a5a0e57f81415384f74df8df9311be846a77f0191e51040f870fab19e0b963ecb11ff248c7571af43a09afc4f1e08503452f156
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xwud/xwud-1.0.5-r1.ebuild b/x11-apps/xwud/xwud-1.0.5-r1.ebuild
new file mode 100644
index 000000000000..15db6db7c0f1
--- /dev/null
+++ b/x11-apps/xwud/xwud-1.0.5-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xorg-3
+
+DESCRIPTION="image displayer for X"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+RDEPEND="x11-libs/libX11"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
author	V3n3RiX <venerix@redcorelinux.org>	2021-03-20 14:27:17 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2021-03-20 14:27:17 +0000
commit	5bb9ff1ee56d2b5e75e01a7f066d8b0cec84ec02 (patch)
tree	66e860a5099bcad013f1cf667255dc372a7c11b3 /x11-apps
parent	7218e1b46bceac05841e90472501742d905fb3fc (diff)