gentoo resync : 04.01.2022

46 files changed, 180 insertions, 70 deletions

diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 93ee085e8248..8d884dc11171 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index 63389daac053..e15d39f26ef2 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -5,6 +5,6 @@ AUX cairo-1.16.0-pdf-add-missing-flush.patch 914 BLAKE2B 6277dccf5e6fc70d885548b
 AUX cairo-1.16.0-strings.patch 690 BLAKE2B 2509bdb3d6592c9606c92730f1e052c0ce5dbbd557daaeb5955b998b8d89184063f15c583ea745fc16c07185cfe06e5f8ef9c18f749d35341918d626ceadd2b3 SHA512 90c9595698b30cceecc17ca186e7936d7884c382a23b8d536bdb10b912e6f1640037fc55326833a4977f332e02fc88d967ded751e50543c68dd80763b5fc43fe
 AUX cairo-respect-fontconfig.patch 538 BLAKE2B 7cc137277ccb2e1d641fd8ca39ee7ccd0fd4981a07a25122387c2f1b6ca4cd89a830360357953706dee62e4233126cd0630e4622f0682f6782cd27fa31f20ecc SHA512 4d4d473f956b56f11b31f513de06751dcc77342e0f04ecf37064a74b8217f9d3536c0a8a41b09e580f34576ff2d06815b4cbc2bc091c201f947965509677415e
 DIST cairo-1.16.0.tar.xz 41997432 BLAKE2B aa37edf7fdf0c952484fd0adc9281724227db93958d6e4919216b30e9017fab670bc2340e3b975737080f1f67dec24025fe0e4680e275ab7703cfb9235eb1fe0 SHA512 9eb27c4cf01c0b8b56f2e15e651f6d4e52c99d0005875546405b64f1132aed12fbf84727273f493d84056a13105e065009d89e94a8bfaf2be2649e232b82377f
-EBUILD cairo-1.16.0-r5.ebuild 3931 BLAKE2B 60f42f9bedc541457ccc3332fe15f0ad0c5a89ce4858bea355d1fdaace8b6d0f466e836a40177a9934d858869dc10d1e6b57d04190eb9c183bb041767323a525 SHA512 1fd72bb071bf3950ca9edf2450125441116d899730a5a3e2d095c52143a06c21421792fef0c9b56a944a18d01997e9adf45397594cc0f9fbd9a37a8b7314f284
-EBUILD cairo-9999.ebuild 3771 BLAKE2B f7392420ac41def74875552c009aa71de27b6f69cc68521a5e09bab31955e04a39bcc6bbaebe7cae5c1bff6e1f13c6e7c1be72aecfbf59238c3555d3b1a71cb5 SHA512 536957b24909a96054f2893cb1be4e13458959fa3532a79541286fdcc9da38f70e0b1c01667448f1fa34c2a2979e6f8eb3dfb76c54110d4d3270d4b19044831c
+EBUILD cairo-1.16.0-r5.ebuild 3873 BLAKE2B b3678e94ccef9af83c353e6f2cb3f1f02260277a8ddf5bad33f086ed4675d5aa5ae43dc177c12879469392258fedcf0f2303287cfed590a8e10243d04f129cc9 SHA512 12f69610664fe3e6bfc6ce96c2a80961667c752e3703f91656d27226eeefe706b93455993804b07d44fc299d7915f6918ee986d60942675b245a6d979f4ab31b
+EBUILD cairo-9999.ebuild 3713 BLAKE2B 579cf46822a7a7ede03d8d4cc7ca0a6f6ef0eea7aded1b23f98538a54b385c330b4b7fd1a183aef81f8bad3ff046e99648b21f1b83263d6635f9e34820f4dc46 SHA512 240ee225f56afd65e767dbc137f3ca19a0b3f3d16d814d05c457daa1a838d0fd7bd4b5a88982a812a35fd925783367f7843773005bf200151977f1910c2abc06
 MISC metadata.xml 710 BLAKE2B 11585ec0ac0ad56eb192f84388ab9fb7ce751ae29555fb366cd8966ec38fceace4978a2b6cad310073484eae51539dcbbe68323205b2b8e97217bc1b87f62b48 SHA512 1021784a9a6db6290fa57e2e5ed356131860820a114a601c8e77fab77eb7b075b81f1288e5df97cad8fe2d86b7aeb67a712f8fd9c5ed775d607d50d6a589dc01
diff --git a/x11-libs/cairo/cairo-1.16.0-r5.ebuild b/x11-libs/cairo/cairo-1.16.0-r5.ebuild
index 03d9d52ed6af..a1546a49797f 100644
--- a/x11-libs/cairo/cairo-1.16.0-r5.ebuild
+++ b/x11-libs/cairo/cairo-1.16.0-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -92,8 +92,6 @@ multilib_src_configure() {
 
 	[[ ${CHOST} == *-interix* ]] && append-flags -D_REENTRANT
 
-	use elibc_FreeBSD && myopts+=" --disable-symbol-lookup"
-
 	# [[ ${PV} == *9999* ]] && myopts+=" $(use_enable doc gtk-doc)"
 
 	ECONF_SOURCE="${S}" \
diff --git a/x11-libs/cairo/cairo-9999.ebuild b/x11-libs/cairo/cairo-9999.ebuild
index 526be1dcbbf9..f2e78b07a7b0 100644
--- a/x11-libs/cairo/cairo-9999.ebuild
+++ b/x11-libs/cairo/cairo-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -89,8 +89,6 @@ multilib_src_configure() {
 
 	[[ ${CHOST} == *-interix* ]] && append-flags -D_REENTRANT
 
-	use elibc_FreeBSD && myopts+=" --disable-symbol-lookup"
-
 	# [[ ${PV} == *9999* ]] && myopts+=" $(use_enable doc gtk-doc)"
 
 	ECONF_SOURCE="${S}" \
diff --git a/x11-libs/libICE/Manifest b/x11-libs/libICE/Manifest
index d4efd2a0a92d..af6e2fa5bf2c 100644
--- a/x11-libs/libICE/Manifest
+++ b/x11-libs/libICE/Manifest
@@ -1,3 +1,3 @@
 DIST libICE-1.0.10.tar.bz2 393116 BLAKE2B 2089cbddab679f8565f0b7bf0313616b71f33cd403aea2cb84032a247c1e1d01de343058c31be73214bd6dea7fc167fa6a0f81704c960bc279d904bdf4bf804f SHA512 2f1ef2c32c833c71894a08fa7e7ed53f301f6c7bd22485d71c12884d8e8b36b99f362ec886349dcc84d08edc81c8b2cea035320831d64974edeba021b433c468
-EBUILD libICE-1.0.10.ebuild 672 BLAKE2B 78286dd7a5f4dca688e14caa4a9f361c3e756cc70c3712138b79a1246425d62a7dfcad605a9bade568c20fcb0536f603b560b6645fbaaa0a47164840af56564d SHA512 4ccdee62a72db35fa233af64f7feb97f93b255faa91040e9ac1da07573c98f32e9dda00f141bda3060d4f575c535ecdfd2aa73b6972bfb60bf94266b91751e83
+EBUILD libICE-1.0.10.ebuild 678 BLAKE2B 8ac95d6c8dd230c6f3c344e677f8c01ce9720b73da0189f4d430e94746a8b7e90d95a89ba209ed3df4f896787d4f2377c552e639fcf1b664f93ff2d3938920d6 SHA512 464b002a282055b33ac93370b4c05b5d34366db937004bfd1e68d43d9388d7143d3dee3418a9b1aefeb12e1b7ef86a88f84214b5d76f986d38ab4e9d8dd3c950
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-libs/libICE/libICE-1.0.10.ebuild b/x11-libs/libICE/libICE-1.0.10.ebuild
index 57851fba2960..d296a6c49b06 100644
--- a/x11-libs/libICE/libICE-1.0.10.ebuild
+++ b/x11-libs/libICE/libICE-1.0.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Inter-Client Exchange library"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="ipv6"
 
 DEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libSM/Manifest b/x11-libs/libSM/Manifest
index 5da95cfd5531..7906dd8f5893 100644
--- a/x11-libs/libSM/Manifest
+++ b/x11-libs/libSM/Manifest
@@ -1,3 +1,3 @@
 DIST libSM-1.2.3.tar.bz2 362595 BLAKE2B 20b7327cd16e066bd2a81eae60f52cab7499dd92d65786d0e5726faa64c2055376749562ff2158777f83711e1517b90b2dc94670892b787889b3950c0a975b68 SHA512 74c42e27029db78475e62025b4711dbac5e22d2f8e8a24be98a1c31b03c0fc4afe859928f851800ea0b76854f12147900dc4f27bbfd3d8ea45daaaf24b70a903
-EBUILD libSM-1.2.3-r1.ebuild 1741 BLAKE2B a4ceaa03d75601e560065eeccd4d8a23808434efb909bcc830fcb666ce3b48613a7f94a888f115ea99ee43f0bc23e7c342d00412e6f712721f8d6da378264f25 SHA512 40bb812132d3a8ed4eaf1b2f10c1df3b2035cd5c99dda1c78ec89cce4cb2f220c7355b37e61e5edaf3e2d85dae0373217e992101137c01218a5434516cbb7b0d
+EBUILD libSM-1.2.3-r1.ebuild 1727 BLAKE2B b69e56eda5433e3d19b1a4cff4b095401fa1bfbd8608cabaf6d33085bbaf9ac31b84f5f119b88f55df4c6e334eb151003a5f6e206d1013978fb8deae8ca1558f SHA512 f8a3651d1c05393c8f0f28d20b817bc1ef32ac45270d5230ffdaf64bb58a8893e927976df3171002f270ae1bf37f42550cf022a38f52c9d07068ecc8ae246fe5
 MISC metadata.xml 349 BLAKE2B 3155baed4056db371fb64fec4eaa13ead1455914541b5cfef35d7cd5e6faa478667a188e12528ecdea8d7e05970e357da79510bfc9b4ebd5252e958485d7ba0e SHA512 d827c454124f3bda52f37bbf507dd51a9430dff3d41f5c4cedfd4bade125e666678b0af0b52a3830792fbc142096aac7501d88de7750983d1421297f5bb50104
diff --git a/x11-libs/libSM/libSM-1.2.3-r1.ebuild b/x11-libs/libSM/libSM-1.2.3-r1.ebuild
index 7feb0c6c5e44..087d19a56f27 100644
--- a/x11-libs/libSM/libSM-1.2.3-r1.ebuild
+++ b/x11-libs/libSM/libSM-1.2.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Session Management library"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="ipv6 +uuid"
 
 RDEPEND="x11-base/xorg-proto
@@ -17,9 +17,9 @@ RDEPEND="x11-base/xorg-proto
 	x11-libs/xtrans
 	uuid? (
 		elibc_Darwin? ( sys-libs/native-uuid )
-		!elibc_FreeBSD? ( !elibc_SunOS? ( !elibc_Darwin? (
+		!elibc_SunOS? ( !elibc_Darwin? (
 			>=sys-apps/util-linux-2.24.1-r3[${MULTILIB_USEDEP}]
-		) ) )
+		) )
 	)"
 DEPEND="${RDEPEND}"
 
diff --git a/x11-libs/libX11/Manifest b/x11-libs/libX11/Manifest
index d89d6c6273c6..b6f92d5bdab9 100644
--- a/x11-libs/libX11/Manifest
+++ b/x11-libs/libX11/Manifest
@@ -1,5 +1,5 @@
 DIST libX11-1.7.2.tar.bz2 2392982 BLAKE2B ce64bd8172fcf4f5bf0783c4f25f4d220fa0eceb211b7a852802256f7241f543769565f70a59c1ff14e0bb1ae7d3f05914f8f0b1bd423dcb20181cfb2227c70d SHA512 d01e5c1848c76218605e5af2d353de6b301a251555b52a38dbe930e6635d5e8a92d1486eb6d328ad5d42a5939e0d16868ffa19a75e5a7863d1a32e0d0727bdc7
 DIST libX11-1.7.3.tar.xz 1861304 BLAKE2B e0f647ef55567b1d7eff74bc053b8e73f8c696be6f233c2ff6f64dee65c1b40b746683ea7a6fafb4304eba4dec43301b4b3506e2ec6fac1d4c89d664b516bbdd SHA512 abc70837d19f7e104a5db1e6d2cfa1256625332c0b53fec44a0a39916a60a430bb53fd436207892aabe4199ac7a0f9287a06588fcd27e0eed54d45d67bbe1294
 EBUILD libX11-1.7.2.ebuild 932 BLAKE2B c33dfd62b0d452169d5e242c8f455586ece1155204b0c3d1d018625fcf7c272fd27b7de44e338d3a865db47152fb28480118bb327a97da9333fb6ce0029b0844 SHA512 3a6f0e3ef002cfc6514724f5b08c7527d25e8b3347703155392e63393f20b0e8bfbbb52cf124f2a83838f0ce1708f2151261e40da46c250e3e19a8e84e8111fe
-EBUILD libX11-1.7.3.ebuild 933 BLAKE2B 218663687b2aad7b2f2359adee771033090befcbbdcf060c4a5f7b9402ed8fc98c7519e722acfc6569a845eb147a3eeb3b37866d3187e28d1eb3f59b2dbf60b6 SHA512 004bea2ed8d4966872b27e49a071e4e7d8ab50ae9980df7ebabb19ddd20b694f74c979a579a304bcd436abb6bcd23ebc6a3e4988d29c0d05207c6b27d12d70af
+EBUILD libX11-1.7.3.ebuild 939 BLAKE2B c8c70725bb4cfd15cb2eeaba451fff53a239c07c0e159d1a905cdeef850222ff1aebd161bbed83ec68f105235b0c2bd96bce2112330e641ad9d55e82aaf871cb SHA512 a582dd6fed67cfd1af18035632e9d3c5e1505232c2287028cad6cdfb24b3892f3d61d715aa26debd41aa85adf8ed61afcd960e8fda71579da6b3df9587ed93d4
 MISC metadata.xml 312 BLAKE2B 297d68d5585ee7fe053a0b9d1e4758d1c8538fbfa6037cddfefa84f5b757c1c768d4ab072f6198e19c1b9bf4d21120440db61e5a9690cc6cfd387ee9d2add736 SHA512 4b5fc7ba8a7c24241e7ab5dd68677ccba15f5e89a76482679f18139faea4ff1555759066041afbf51c65d1870ec0d999a772c340f1e934a6aba0135b8da28d18
diff --git a/x11-libs/libX11/libX11-1.7.3.ebuild b/x11-libs/libX11/libX11-1.7.3.ebuild
index bc2f07298e05..34171b8bc0c2 100644
--- a/x11-libs/libX11/libX11-1.7.3.ebuild
+++ b/x11-libs/libX11/libX11-1.7.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ inherit toolchain-funcs xorg-3
 # Note: please bump this with x11-misc/compose-tables
 DESCRIPTION="X.Org X11 library"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="ipv6 test"
 RESTRICT="!test? ( test )"
 
diff --git a/x11-libs/libXau/Manifest b/x11-libs/libXau/Manifest
index 7717ba35fdc9..077b19e065a0 100644
--- a/x11-libs/libXau/Manifest
+++ b/x11-libs/libXau/Manifest
@@ -1,3 +1,3 @@
 DIST libXau-1.0.9.tar.bz2 322650 BLAKE2B 0bc9eb01b99f13a8f978edd7ff63d76f89071ac27f1cd946f9ebc96165a892e7ba7cdcdc52f73e8ed6d5b3d672f8a29a24582195fe14d1d24730a797a592cdd3 SHA512 3ca454ba466a807ea28b0f715066d73dc76ad312697b121d43e4d5766215052e9b7ffb8fe3ed3e496fa3f2a13f164ac692ff85cc428e26731b679f0f06a1d562
-EBUILD libXau-1.0.9-r1.ebuild 446 BLAKE2B 46ebe15b4cdef728c29e7dbb9cc0f27c287dc02aa8bfac445e35e7df18bd73813cc6299194c39181a60876ec05c72ff5088cbafd9f1eda3c6f1feb8bfab20ea8 SHA512 ba967fbe9e51b0e97f970cb5e27241b7cc2a90c038634db6c9b5e346815066cb83a2d684ee93bba04aefbf694255a1fe981bd5b11322aef9e6daa1419ca033f7
+EBUILD libXau-1.0.9-r1.ebuild 452 BLAKE2B 24cfa3356558b5e4cfd39c2c612172a0350c3833e0091e245e50e1227a34876f511580d643acbad2034f8b0ee11406baf4b83d6121152198e7bd21cc5494f334 SHA512 519c7521d5ef1b6ea65b73bd86d5f709e0f5be40471325de7d7108b674324ca3855409964ebad44b25387c983a2ee1e94cdf3b7e702324226e9caff335cbffdb
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-libs/libXau/libXau-1.0.9-r1.ebuild b/x11-libs/libXau/libXau-1.0.9-r1.ebuild
index fb485435a64b..601cb99fae18 100644
--- a/x11-libs/libXau/libXau-1.0.9-r1.ebuild
+++ b/x11-libs/libXau/libXau-1.0.9-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,6 +9,6 @@ inherit xorg-3
 
 DESCRIPTION="X.Org X authorization library"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 
 DEPEND="x11-base/xorg-proto"
diff --git a/x11-libs/libXaw/Manifest b/x11-libs/libXaw/Manifest
index 8b400e09918b..e0986a954853 100644
--- a/x11-libs/libXaw/Manifest
+++ b/x11-libs/libXaw/Manifest
@@ -1,3 +1,3 @@
 DIST libXaw-1.0.14.tar.bz2 690994 BLAKE2B 9beaf5ad47b300b3bd57c85ce4c54996db824cb10377472bab8b4ec446458ce162b21e19c4e3ed8d48f10d0bddb695509e73d3274326bdd59916dfbb3c63120e SHA512 29d1c151369523ae6cb418e636b0b7b39ccccc35462a0b394dbeb46d5b6d780badd2eb872a55d9fbba1ee1af034e76c0463f40f8d8a7be2c336d08b3b1bf81d4
-EBUILD libXaw-1.0.14.ebuild 871 BLAKE2B 8b1bd20e66dceae418240160675e38758f41b22ab697b29dd612ce0eb560bd100f4617208a09d4025b852ee5936e510303c4dee30bf81ca93b1543c081646f81 SHA512 a74310a5cccf652f3996eb3b27c1dbbcd1dabc054c28a51cce17d6dc1503e3493fb8e9dc501589d0988430bb3cbb443d9446ed5ba76ace9b3b345a63e0e359a1
+EBUILD libXaw-1.0.14.ebuild 877 BLAKE2B 234baa6f787d642ac1ef68591a029848f6f923f1040e215bc28967d876d2daefb8534e72fea6835d4d6d4ec596c838a0f8d3b33327cf33191d4d70fd779d3cfa SHA512 3d11ade46ea94351da41c6abf5c64bc10ed8653eaa3f646b5d88f1d8ed7afc14c96dba3615242065030aa75bb6d0c8bbbe93ca2f90ea0a7be7240fbe064b537d
 MISC metadata.xml 309 BLAKE2B ba69d8d8545fa5fa3816eb6696801f0f18fc9f4cc8c3822ee3a4394ad4f14b625ba1dd36ae1cad6b93df5da7d42d08497c199c8f4873524be79cb92da1232b2a SHA512 0833d0c3d4e0e30041c3265a9df0b90a33829ce1c179a60f54db38a3ab32231d82f0f16bf0d1b0496876493feece3f981c602445f3497f1595d6afe64eb14eca
diff --git a/x11-libs/libXaw/libXaw-1.0.14.ebuild b/x11-libs/libXaw/libXaw-1.0.14.ebuild
index 7d459d2bd178..87b5f21cdb32 100644
--- a/x11-libs/libXaw/libXaw-1.0.14.ebuild
+++ b/x11-libs/libXaw/libXaw-1.0.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xaw library"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="deprecated"
 
 RDEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libXaw3d/Manifest b/x11-libs/libXaw3d/Manifest
index 05bfbe30f225..07fbb4cd2757 100644
--- a/x11-libs/libXaw3d/Manifest
+++ b/x11-libs/libXaw3d/Manifest
@@ -1,3 +1,3 @@
 DIST libXaw3d-1.6.3.tar.bz2 561594 BLAKE2B 85f3fb6d39a9a0ccb7d2c529eff84a4a9e85bf81be16487f2119da0a670e40c2d328e17b06ca237f69029e8d43daf6eeba8488029e6e4d2f56bc1093a2f305ad SHA512 f79f997ff8442563c74f38c7d76fab2c9253691743ca3143047ce698adb4c126d02dc968be7bdc79ab3052b785fd705375d2f01171e3a3266736beb531c91424
-EBUILD libXaw3d-1.6.3.ebuild 737 BLAKE2B e7a9946155da58edbb71fe21f9496bb66ea4159f2024d154dc8b532abb746c37be6fb864c2b4ab1340f12efd7055c7d2142e09fa24b69b444137ca5635eef0a2 SHA512 0d144618d3b9d602f17069693863802e2eff73547231ae87b1902c3e23ac574ba2aa158ca68e7d8e2877d284ca84123a9b1b4a103fe8b4afd96911a116037dcc
+EBUILD libXaw3d-1.6.3.ebuild 743 BLAKE2B 35d4f33ed8314ea6b1265e40bfe8ec89ac051792226e4fbe46697f7fd7631e598768475d7eedb762cce940e0979d3dd7177037031fc74b59bbed31664c1d82eb SHA512 d2549746022ba6cc6b31d0ff97509eb0de7fe3a0572bd5ca80d61f4de3589176f99bb6ba79f41613f5392e54a6b95c1e6eb0a57145fe90aa722155de6f02bb8f
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-libs/libXaw3d/libXaw3d-1.6.3.ebuild b/x11-libs/libXaw3d/libXaw3d-1.6.3.ebuild
index 0cc685fca9df..a9db8934313e 100644
--- a/x11-libs/libXaw3d/libXaw3d-1.6.3.ebuild
+++ b/x11-libs/libXaw3d/libXaw3d-1.6.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xaw3d library"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE="unicode xpm"
 
 RDEPEND="
diff --git a/x11-libs/libXdmcp/Manifest b/x11-libs/libXdmcp/Manifest
index 8817ee551f77..286c9363d54d 100644
--- a/x11-libs/libXdmcp/Manifest
+++ b/x11-libs/libXdmcp/Manifest
@@ -1,3 +1,3 @@
 DIST libXdmcp-1.1.3.tar.bz2 332795 BLAKE2B 0c9df30450857dd2703c4bf54972d5a26c1b6f8e216b4f3173491def650cc32742554eee04c883670e783eb5f476df94ed2c0c52274a51e2bc54d45e5dcb8c77 SHA512 cb1d4650f97d66e73acd2465ec7d757b9b797cce2f85e301860a44997a461837eea845ec9bd5b639ec5ca34c804f8bdd870697a5ce3f4e270b687c9ef74f25ec
-EBUILD libXdmcp-1.1.3.ebuild 663 BLAKE2B 7305b487a99093c8013789d214850ad08eec54a77304eef2a95dd741172d7118206eba8ee84298b79282167dbcb452db4017e9a48c06962e55b19769f5444ee2 SHA512 dcaf784ee82606569e6e646e8a0129c04dbc3fa542ad97ea4061f3476c4bbf4d87bb4ee117809b3ffff560b0c7b57e00b9c2087f6eac0b276cba98df283ebef0
+EBUILD libXdmcp-1.1.3.ebuild 669 BLAKE2B eee2be4867519959b176926c20c37e3f934a4df43bb64a6a06507bd284c35d48c42d86620238edcb66dff320e880d1001015d7dd0273660f0109a3da91093291 SHA512 61577006919f98a3f07303febc0e57377e2ca3bd17d431db335f242d8232017608b2e7efe912c340b1fc3a8af5d8b712067e2d8ff42a8eb217786c13a9404e77
 MISC metadata.xml 311 BLAKE2B 21ffdd3bae13784b216398e0dafd6d9dab3b46647ff72d248d559dbd768c7b640a368f49af1d84148321172815bfb961660192f5ae2adf87f2d801afd3d830f0 SHA512 b3961e5c23283feb98fccc70e0a69ca8c4813a76ee029633731a6a651266673378c5e1fc95c1a079c9983da98dc41f574b41c808b52a63db325b00b5171f21cf
diff --git a/x11-libs/libXdmcp/libXdmcp-1.1.3.ebuild b/x11-libs/libXdmcp/libXdmcp-1.1.3.ebuild
index 61a5ecc30083..387662fc2a8c 100644
--- a/x11-libs/libXdmcp/libXdmcp-1.1.3.ebuild
+++ b/x11-libs/libXdmcp/libXdmcp-1.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org X Display Manager Control Protocol library"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 
 RDEPEND="elibc_glibc? ( dev-libs/libbsd )"
 DEPEND="${RDEPEND}
diff --git a/x11-libs/libXext/Manifest b/x11-libs/libXext/Manifest
index 6b832ebbfdf4..84a78eafd288 100644
--- a/x11-libs/libXext/Manifest
+++ b/x11-libs/libXext/Manifest
@@ -1,3 +1,3 @@
 DIST libXext-1.3.4.tar.bz2 389114 BLAKE2B 941ebf63583a05f40063ec0d2350a40ccc656c6463e58a347489f7dcd8dc5ae5c3b24b561d74a0af2661c2e3c941bd4ffd90295273c248f22e52f23e8d7c0ec9 SHA512 09146397d95f80c04701be1cc0a9c580ab5a085842ac31d17dfb6d4c2e42b4253b89cba695e54444e520be359883a76ffd02f42484c9e2ba2c33a5a40c29df4a
-EBUILD libXext-1.3.4.ebuild 647 BLAKE2B 65aae8c02129f764943fea000fe341eed94868767d2b337b5c2e28297aded0029f239ed6f0835037bc272c562068068b5613235eb2bad2ec8559b67a7f4e8145 SHA512 1db37bc11699e5f588bfb6431a82479dd977c5865461e226b250e4fabd87294e05900b0f102d8acccfdce28c3d4d39369e6a77c891c21fb028697c9e7cdb7f95
+EBUILD libXext-1.3.4.ebuild 653 BLAKE2B d421c75715ca829bf2ca3a8017b9fb2d406a9295e2832db22cbd704b3a0c566e38122421724a6799f452f8cbfb530c9aba52389a89bea2b1b34fbf6d075712e8 SHA512 c1348805cab060f4181e43b0743bd06a9602f6b1134c3d3ba2612069722a1d4aa007f8003aa16a309768ca547fbe7db2383108fad27ce4303f2dbb761c86af72
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-libs/libXext/libXext-1.3.4.ebuild b/x11-libs/libXext/libXext-1.3.4.ebuild
index 4ef042cb11c7..fc52ac96b728 100644
--- a/x11-libs/libXext/libXext-1.3.4.ebuild
+++ b/x11-libs/libXext/libXext-1.3.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xext library"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 
 RDEPEND=">=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
diff --git a/x11-libs/libXft/Manifest b/x11-libs/libXft/Manifest
index 9cf8fa3b7964..646ce7c68c1d 100644
--- a/x11-libs/libXft/Manifest
+++ b/x11-libs/libXft/Manifest
@@ -1,3 +1,3 @@
 DIST libXft-2.3.4.tar.bz2 359088 BLAKE2B 37f8522ad744e99ae8372f4292017eed1f2c2a84169497441c3c12696cbb7b3cf33e04864b50433e46f8723cc6c6006226c743a0d491a3784baf3f21ea062399 SHA512 5bb019750982ed4643880efd7368bc226ad49cfa8c0c8c6d4614dfeed74f588c65e1ba69adcc12284ec07d841e5b58fc1c27f3fddf83fe1a2837b29dd9ecec51
-EBUILD libXft-2.3.4.ebuild 705 BLAKE2B ad8c0dd550a1936c798cc84cbd4fff1a1a0f39a711adf5cfdd1050ea1753077ad11dba2802c68fd106865642694534eda0aa9a6820f414d65ab5e42a3320d478 SHA512 16af99878c9e63030753500da2d21dda6413a4a8b2cf1bd430df2c09f66063c13eac923626ffe3fb4d6f1c7e767536507edd10bb446211a91396a89c16b9208d
+EBUILD libXft-2.3.4.ebuild 711 BLAKE2B 1c9bb687c1bae702dff60eb33ccbb6ba21f155f3fde2f697b1c3ff9bb2da73b12bcbd07b3dcc9b371e957376a543b3505f223ffb03755c72d043dfdea7ae3266 SHA512 fc6ddae51ced5bfbd71ca1ce5b97c50fa228a10d4ede433175fa538d5bd6f7f47db266422ee826b1260156511956b8fe54fbd514bf1e4417b55c85a2f1abdcba
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-libs/libXft/libXft-2.3.4.ebuild b/x11-libs/libXft/libXft-2.3.4.ebuild
index 8087fa12d344..40823927c942 100644
--- a/x11-libs/libXft/libXft-2.3.4.ebuild
+++ b/x11-libs/libXft/libXft-2.3.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xft library"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="doc"
 
 RDEPEND=">=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
diff --git a/x11-libs/libXinerama/Manifest b/x11-libs/libXinerama/Manifest
index 6b7b16c8691f..cd404683dc5f 100644
--- a/x11-libs/libXinerama/Manifest
+++ b/x11-libs/libXinerama/Manifest
@@ -1,3 +1,3 @@
 DIST libXinerama-1.1.4.tar.bz2 287162 BLAKE2B 9e27f9776eb200a430875e4ea3a9a559f205822b5dcea59e4207a58889e8c7b67b2014e9ceed5b3cedd311c47fa023b4a8f1a17faa511fb0041382c7467527d9 SHA512 cff777ad942614fbf6bc6d8529f399e62debf3ecbf6cc0694a94e38c022bf929ffd5636fb59f55533c394d89b23af3ea51fa5128927f12a85787e16239330f14
-EBUILD libXinerama-1.1.4-r1.ebuild 501 BLAKE2B 2b62a78840132c6b4d59ac109d8c7a41e52c62366ebfd55da17459509bc0db78a78b633618b0066fbbc8179047691bea00f75b8360daf8c1131d0889cf7186d5 SHA512 105298b512833e4d019345ac33faae20b7c4f75bc0702565012d81afde518cfafc9d3f7d77913d0104703858a4c3b0f0a1069b837ea9ec95f639f5189c912353
+EBUILD libXinerama-1.1.4-r1.ebuild 507 BLAKE2B 827cf7579b4a981ebe05493f3d653d19eb057d4108a44ea9edc193b05add0161c6fa352e4a367a1a5f23704e9ef658d682d04ba31d7b67aacb6fd5bb47dcd196 SHA512 cdd0ade2c892b071534a0d45f574212e05c72a60fc231c488b3da222e318e42f649126ce070c33216dab713f68302d029b3a0b23f9ca8d4c20ff02ea2539a411
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-libs/libXinerama/libXinerama-1.1.4-r1.ebuild b/x11-libs/libXinerama/libXinerama-1.1.4-r1.ebuild
index aa19c2ed3839..97cb337c702c 100644
--- a/x11-libs/libXinerama/libXinerama-1.1.4-r1.ebuild
+++ b/x11-libs/libXinerama/libXinerama-1.1.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xinerama library"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="x11-base/xorg-proto
 	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
diff --git a/x11-libs/libXmu/Manifest b/x11-libs/libXmu/Manifest
index dddf04354d40..d424f4449926 100644
--- a/x11-libs/libXmu/Manifest
+++ b/x11-libs/libXmu/Manifest
@@ -1,3 +1,3 @@
 DIST libXmu-1.1.3.tar.bz2 394330 BLAKE2B 5bbc4345f32588a8b1e196fef39a636b9a765a2d22a12cc30bc7f5528b004c1f73370d25b023b68772081f1c58b4813293971f8f08ca8f2b9508adb4c3925c94 SHA512 8c6cc65b22aa031ad870dd92736681a068a0878a425a53dbed909943da1136c4a24034d467cfd3785c3a8d78f66850b69f1ebe1eb24aaf9bc176b1d171a5c762
-EBUILD libXmu-1.1.3.ebuild 757 BLAKE2B fc9e44afa211b446527d6b246793be710d73d691e42c7ce8e6b69352c99af2c425b67a29fa255d3dd037b7296795f5b688d08be304fbc8ef373875ca4df975c7 SHA512 58d3d1d001c9e488c70be8dc6bdff7773685463c4c26487c0ed29d599a7c64b148db8b30f6583cdbe4c9f828f55d8182ad383ff577e658aa928d51828f165b0a
+EBUILD libXmu-1.1.3.ebuild 763 BLAKE2B d338328d1aa54a1c0c767a6d24074601985c904c2617fd194f9a40fe7712681895046107ab274a02c047267a6dd6bca89905cb88b048634d84e53fa395a298a3 SHA512 25957d7360978427f0becde5a26c84026833584aa7395f676f7d9b6b1bb3b31841c9568c81534bb47aab932399687b04270a110ab4b129ab9498423444d66af4
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-libs/libXmu/libXmu-1.1.3.ebuild b/x11-libs/libXmu/libXmu-1.1.3.ebuild
index 99fd2100223b..2e6741e86dab 100644
--- a/x11-libs/libXmu/libXmu-1.1.3.ebuild
+++ b/x11-libs/libXmu/libXmu-1.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xmu library"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="ipv6"
 
 RDEPEND="
diff --git a/x11-libs/libXpm/Manifest b/x11-libs/libXpm/Manifest
index 4fd437fa77b5..5805c24e27c5 100644
--- a/x11-libs/libXpm/Manifest
+++ b/x11-libs/libXpm/Manifest
@@ -1,3 +1,3 @@
 DIST libXpm-3.5.13.tar.bz2 463251 BLAKE2B eb8a390802f13ffdd8199e21f5f18d4d17141783d7259c6b558dbaddd2dce05f7cb27306dd5cb73e27d01cffa62f5e4808c143b72974dae443e958069e70cd17 SHA512 3b8f6e926272f39b1d95135c2274c00f5aaee1f9fb2ef79f71628df5edeb7ba20158819ef6a778101cc4092493a3b5b613c53634fdccadcc0fc85f0605e5e9a5
-EBUILD libXpm-3.5.13.ebuild 603 BLAKE2B cb740c94f707c115c1c69b48b97d6c5cd0030771e4b7fbc5164409ebc172ffc85f922a5f325010b24b13932820da52d7a4f7899ffcc4a636fe17b3f48fae1002 SHA512 ab7d0b34120b2c8957574f9056eb459435326de43c369da3777ad9dae30f54dbb0aeb257c917d01df46d1cd410aea7d0b4113ed3ba56422d4655347dccab64c1
+EBUILD libXpm-3.5.13.ebuild 609 BLAKE2B c4a0d8a9fc610d1236302191df3a96514b674e1f837f1d1537efa13fcd7d82c21c1e310d6f906ec9ef55fd9b308b7442742cff1b467881324f30424fddf16dff SHA512 56a68897d25e2541b81c9530759916883b5bc894485039297399f5f00f4f44d30ca60f6baee3ae156413c386ea06fee49797f791809ba555f9106cef76d8e240
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-libs/libXpm/libXpm-3.5.13.ebuild b/x11-libs/libXpm/libXpm-3.5.13.ebuild
index e48eac129564..49d91f8844e0 100644
--- a/x11-libs/libXpm/libXpm-3.5.13.ebuild
+++ b/x11-libs/libXpm/libXpm-3.5.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xpm library"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
diff --git a/x11-libs/libXrandr/Manifest b/x11-libs/libXrandr/Manifest
index ca5ccfadff77..0fed9d692251 100644
--- a/x11-libs/libXrandr/Manifest
+++ b/x11-libs/libXrandr/Manifest
@@ -1,3 +1,3 @@
 DIST libXrandr-1.5.2.tar.bz2 330726 BLAKE2B 2d91e4cd2d7af6b79ee952a0d51b0c61d64251c61f862677b47065f2eda811650a5e3bb3185d09a6401291b5a8bb30e8d29cf7aaf1699ac3f49b838ef7b1208d SHA512 fcd005f9839e7ef980607128a5d76d7b671cc2f5755949e03c569c500d7e987cb3f6932750ab8bf6e2c1086ec69dde09d5831f0c2098b9f9ad46be4f56db0d87
-EBUILD libXrandr-1.5.2.ebuild 586 BLAKE2B 180279d8336b64a2bd86440ed52edc9ea38670ad3e2bef84f9b34cd00c90b48fb413e05193d92546fcb8a49289506d8ac1b52ec1dc1a38827c010a26f162fac2 SHA512 7e84afd844102bb7f223c678a12c5f4861f22447a30e2339e8f8d39aabfa9fb0c424ca12698b1ea66ef82754a5e5d9e1d8f911c803b5b21364413d213dfc9ea4
+EBUILD libXrandr-1.5.2.ebuild 592 BLAKE2B c211baa12324db15ef988e666710f92db4289fb7957b07c7b5e5c796f91ed65edd850539db3483529679af4af60566b9b5d1551d8a36faf35d8f80468668be5e SHA512 959c7e0d332643e660da98663a98fada23cdd7cc523186135f670dc23d4d8a5c945d5b9782e4b1eb6510c018294cf260ee140275457ef97d2596ee89e5ac38fb
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-libs/libXrandr/libXrandr-1.5.2.ebuild b/x11-libs/libXrandr/libXrandr-1.5.2.ebuild
index ae058440d1a6..ca5350a36664 100644
--- a/x11-libs/libXrandr/libXrandr-1.5.2.ebuild
+++ b/x11-libs/libXrandr/libXrandr-1.5.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xrandr library"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="doc"
 
 RDEPEND="
diff --git a/x11-libs/libXrender/Manifest b/x11-libs/libXrender/Manifest
index 9a346b5822b4..a1a411532143 100644
--- a/x11-libs/libXrender/Manifest
+++ b/x11-libs/libXrender/Manifest
@@ -1,3 +1,3 @@
 DIST libXrender-0.9.10.tar.bz2 308318 BLAKE2B c9e250e16118a4878e7439fdb37549596abfd6a17f50e4e88242579fc285d0ef5b0c8d5d0fb592c7dbcd6e77c5fb284e6644e4edf9b12118cbfc0f179e274313 SHA512 16ea0cf638b32d7df54b270457ef8c9d9a80da27fa845b105b560cb31027b4c7fe799cf23d6b6bac492be5961264e96d7845d316a9af4de9ff38bf40885ea6fe
-EBUILD libXrender-0.9.10-r2.ebuild 479 BLAKE2B c11639b3dec669634a2a2154e1807d826406fe3e63f5b4cb97da68f74024a3c5c5ae3cca8893eb4316209b198eba268edfc9ae29b911134e43508d79ed56f298 SHA512 fbecb9144da548c40864916723ab4c5c0737fb221a2b5af18f2ed369509183ec9724c804f2e558dd65911a2cf2ff0463f7db7acbd4e6ce19c2e4b064ba5b01c1
+EBUILD libXrender-0.9.10-r2.ebuild 485 BLAKE2B 6e005a92f1e82389d7ece79fb64f02bcc7a8601b99bcf5f7839436e1afc0910a111094de24c1a8a67ea7e98fd885d138123dbcb34203900aeec9d10d196dfe63 SHA512 16b48fc04e09e95a52d4835f0927a4508604491cbda638416a2ed01cd9b0069662c5e8d5878f8de17e9deffe61820f3d47897e4c1384aa8e8662f4e2e26ba0fb
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-libs/libXrender/libXrender-0.9.10-r2.ebuild b/x11-libs/libXrender/libXrender-0.9.10-r2.ebuild
index b9dfac5f40fd..b85e782dc834 100644
--- a/x11-libs/libXrender/libXrender-0.9.10-r2.ebuild
+++ b/x11-libs/libXrender/libXrender-0.9.10-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xrender library"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 
 RDEPEND="x11-base/xorg-proto
 	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]"
diff --git a/x11-libs/libXt/Manifest b/x11-libs/libXt/Manifest
index 0b3a6d082fc6..1adec1a54fd6 100644
--- a/x11-libs/libXt/Manifest
+++ b/x11-libs/libXt/Manifest
@@ -1,5 +1,5 @@
 DIST libXt-1.2.0.tar.bz2 810521 BLAKE2B dc60b8fb126f465122eec4df287d5a0d12e483457ba20abbd04a17a8a5fb8a1073d8765236b8020353ec3c5f472b1580ba7a99d6896ce5fcdabaed5f4fbc6753 SHA512 06248508b6fe5dfba8ceb4518475f656162351d78136eeb5d65086d680dabe9aca7bba3c94347f9c13ef03f82dab3ac19d0952ee610bc8c51c14cee7cf65f0b1
 DIST libXt-1.2.1.tar.bz2 784610 BLAKE2B 69a1446a22acb50e625ab4a7b24b5db634d47a540d4543a3f58459dbb380d61aa4bbbde50328c76b2c31eaae3662a1c71cdbcf9bd3a0c915ae4e587f63fbee7a SHA512 6877af61ba91eeed6b6f80471b84f354ad0ec0827249c7ee0a00c13508063fe8d2696dd400a4bdbc6ca2ff67cbe1317ad5ac24522fd96099dc56535e33ca052c
 EBUILD libXt-1.2.0.ebuild 875 BLAKE2B d7139b22e4a29967a99a807004a4a56b210f44bfe7f5975077dcd17a60fa8f51bc64d5c7b49e8cc6661883b5c1cad091eaaef6ae9a94a300668b8c571dab5624 SHA512 5dbad6e7ace4f45106551511e21262b4b31c398712ffae506284dc54c01db353a8619685f20017dfbfb1d8d32aa923c8d8078b8ccea63e64b2bb4974c2c5c115
-EBUILD libXt-1.2.1.ebuild 874 BLAKE2B 85fcaa2b6245f39831a8946767e6f3da63cec87e25e0dbfdb261163056c807ab583b3c62632f922ab6ffec205cd3d77fb192701309cc08bccf84725d508495fa SHA512 171a8f6a61a5e6aa6f67712ddf1c9f9463cc0ba2cfbbd3bc0a3e2f4c74d55ebb7621c5b6769d34fbc42acf4fa848bbea109c7df85cd45a1ac2777189f7033343
+EBUILD libXt-1.2.1.ebuild 880 BLAKE2B 681cbe85c8559bf7c64da8e8cbebb3b90cefdc7f0585c68a2eea44f2249fc4739026835ac4a4e96c494daadb50cd3722ef79bc0c67852e65b3ca2c2e5ea099e1 SHA512 080dbb42b489f0d13fd361b2de59c039050559f12fb8a12e40cc9814fd2d28cb944b05ef4e9eb7abd776971492a4cbf188cb472fc390681e27f3639c855646a0
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-libs/libXt/libXt-1.2.1.ebuild b/x11-libs/libXt/libXt-1.2.1.ebuild
index 1fbf8a0dd20f..601abeae34a1 100644
--- a/x11-libs/libXt/libXt-1.2.1.ebuild
+++ b/x11-libs/libXt/libXt-1.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org X Toolkit Intrinsics library"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/x11-libs/libfontenc/Manifest b/x11-libs/libfontenc/Manifest
index cafd64af9005..cac1f532caee 100644
--- a/x11-libs/libfontenc/Manifest
+++ b/x11-libs/libfontenc/Manifest
@@ -1,3 +1,3 @@
 DIST libfontenc-1.1.4.tar.bz2 320492 BLAKE2B 34da17e220789f5078e870329390c0e3ee665598db3432ef5a33e78d1db4b12460c7467bcbcc1dad67e9f6ade0173f9fad915a2fbbee51f0be23feedc242e7bd SHA512 76fa851d00113241f15fdd5b5bb7e927b8d8b9a82ce3fcb0678b8c7e32cb5e8d898c4bda1d60dafb7748145049d3240627ac34a2360c64e98a7a912ea7c30582
-EBUILD libfontenc-1.1.4.ebuild 510 BLAKE2B acebf2e3240829a74042d68060537dcc2efec5c461079309d86217b32e27d058739fc47a418809939d110c684d1c9a0ec27826d1356ea7df2e4714ffa604e2f8 SHA512 72814189cdb2d0f541c977e68854a11c3f6092b6b77f90bff4540faa76dfb69df979e4f39a21cd79fcc27a7767b13c63c8317350edad8769f5c267b52ed4e3c3
+EBUILD libfontenc-1.1.4.ebuild 516 BLAKE2B ddf4be27d03584933b368ffcba688f09766748538827622d1a9acdf51acbb7da08e56f28379151361b806c782057868ad609d5ca965270a639ea60e0fef30011 SHA512 f2a49df67b45329a6e1f0460b65629b07a17d3eab819d0073d601bf36a6f558007e0d0d5095cc7e53dce31c94ed742d11aded77ad864efb3ab0ae534868d913e
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-libs/libfontenc/libfontenc-1.1.4.ebuild b/x11-libs/libfontenc/libfontenc-1.1.4.ebuild
index e835d708f8a8..97ce203064b4 100644
--- a/x11-libs/libfontenc/libfontenc-1.1.4.ebuild
+++ b/x11-libs/libfontenc/libfontenc-1.1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org fontenc library"
 
-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 ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND="sys-libs/zlib"
diff --git a/x11-libs/libva-intel-media-driver/Manifest b/x11-libs/libva-intel-media-driver/Manifest
index eef628a29e85..8c0add54905c 100644
--- a/x11-libs/libva-intel-media-driver/Manifest
+++ b/x11-libs/libva-intel-media-driver/Manifest
@@ -7,9 +7,13 @@ DIST intel-media-20.4.5.tar.gz 22437981 BLAKE2B 136be5280b463879e47ce8a1dae1befb
 DIST intel-media-21.3.5.tar.gz 23110985 BLAKE2B 1dbbc1efa9ae2c8f3b4a34596c71173101f8a43591bf9e07d269a8499b7a57969d9af5c1d4ffb7774a6947947e572b441f871760d3ca695335bfa2976ac2cf6f SHA512 e7836b19050677e81aa34ce5d7cea661ca3b5ac55d73d5aa0bab93f1daba8ee010d84b1c585f62fcec65a4361ef2b7f14ed574858f56b85b4c4d59840ecb6cb6
 DIST intel-media-21.4.0.tar.gz 23116624 BLAKE2B d913e379c4990bd0f5a5d07654baeb374d3b4f7adbe607338a96ac6555631560005d6124fb0124bafe5e94107b54acdfd0fbcfdabc820210b453ebb61c828c36 SHA512 e338e645677d90d4c2e91d5096a9002b87cec602ec354283b67e4ee31fcd6a2454918c4e179b86189126d30742ab2814bc8400072fb1d06638c3bc0bf66385e4
 DIST intel-media-21.4.2.tar.gz 23185132 BLAKE2B 257f1a8a65928aee897d84ed8df69a129958bcf5fd6ea263283e1f2341a845651a86367cff7988c0d4b04accf48664dbd4d1e0bd106883e92feff095e5f88225 SHA512 1b906ce75ef70395e36296de1e1e4b39d4a82c8b8532497faf47bcb101cf2103bba67a125da7ea1be9f901699288520f704b43fef01339a1f1b7691040d7618e
+DIST intel-media-21.4.3.tar.gz 23192939 BLAKE2B d013b60c330df97dc29e51a95a78bd91a38c789c4690fde12c304e1bf0695024e5488d0485b60fa603e8490b932210163aec590bcfca031c1f19d7b16161b420 SHA512 d2e2db1ddc2cbdc022273f53d873f2156e992420d382285de0b9559340d912e847a4780ed2adfe67f06a7c4bcac83aadca1104cf051b9a3d43b3ffd931a3db22
+DIST intel-media-22.1.0.tar.gz 26188730 BLAKE2B 7ade4b25d2fe50ed6c3498c37f0fb39ecf7241ba21485c423a4a8769628b78d8134471639aad12bcac79a7d107682e36cb5954227528601eb5253be5ce00acac SHA512 dd444608fd15fc7f05a0d2c9e6e2c8be3a588a1253ac014c045c207d5d59c9d172c89d248e94688078097a224f57025c11e86b9392271cd111bb9dce6d07617e
 EBUILD libva-intel-media-driver-20.4.5-r2.ebuild 1491 BLAKE2B 9c1c9e9d4c753fd6e840fe9aec5db9e994e427440c31335c2e3e579abb1e29b66261a03b1cb77cf2d863d99b2fadb24954450a9c8016ea7a18626a86f50155c5 SHA512 ed9b086e5dc379953a629f227aa9561accba7dfc3422242603df06872d00c571fd1a544d999595dc17b4ce6f80748e2c959c79199161278fdfab5cc9868ffa70
 EBUILD libva-intel-media-driver-21.3.5-r2.ebuild 1518 BLAKE2B 5c2a4591ce1a3b6af4827f0c2eec03767d80f825704abd2e6c589b97ec55d6e76d0e8516bb2993cbae492eceddd4071cb07b605b28fa17c8b5acdba4e3e5c115 SHA512 fe936016b71e4203bcea37a1deb8c5812469b9d6fb756b76aa844a959a0883710dec2775a43f2f07b80c02b9254d5fdc17f5424cd0cf3bb625fe42acf7258406
 EBUILD libva-intel-media-driver-21.4.0-r2.ebuild 1519 BLAKE2B b6fa5f05746270f6c458022c914d08edda6fcb5edb5e28612df4543561e3cf5df6ebd7a71a76b9504d1bd94f8b8cc1391e08481a69fff54b7a3129712b8cff28 SHA512 fd08f731552148367c900c030c8731388e8a273de8823f38c630b08731ce4e53f7d8826f83c2b9ea1bf574bd4d27d9b43eece32f24c0cb891b5f809b235a772e
 EBUILD libva-intel-media-driver-21.4.2-r2.ebuild 1392 BLAKE2B 7412f822b7459314494014cd5d2ad795ad4ce0564e19ff53bc2a2f00701b082ef20ef3ff6253192fca802e1b805fef2bac2554591e879125baa5b0a7f89bc484 SHA512 68e29ddab24decacf5e21377f11e1b404e449cdf76b78037f46c340654b22b35098253941957c75a13466856a3db6b851919b40847e89116df62bb85ec5a7bc3
-EBUILD libva-intel-media-driver-9999.ebuild 1369 BLAKE2B b275e1452a39f0c11834e2a73b37ed5553a40f5b78271ad3e774ea565ddca1e41b2f260e685fb57b347ac3d0c16698e671c006fb1cddedf12739a629399da484 SHA512 10c0f9ade2b337df30a24828132d244743ef86a229cfbc30831a697f20e9ea8e6b2b03356f5d217824fa60af0c2ae22aa914436fba442c5323c76a1d48b20461
+EBUILD libva-intel-media-driver-21.4.3.ebuild 1392 BLAKE2B 7412f822b7459314494014cd5d2ad795ad4ce0564e19ff53bc2a2f00701b082ef20ef3ff6253192fca802e1b805fef2bac2554591e879125baa5b0a7f89bc484 SHA512 68e29ddab24decacf5e21377f11e1b404e449cdf76b78037f46c340654b22b35098253941957c75a13466856a3db6b851919b40847e89116df62bb85ec5a7bc3
+EBUILD libva-intel-media-driver-22.1.0.ebuild 1369 BLAKE2B 6629037820176d3beaf10be676db7d705d2b3b4329bd2682b3ff11e5ef47369585b3de1d246c4fec4589224068ac9146a1d6df86a4d2b9eff6dd74a995229bb1 SHA512 8abc05bd597ed110fd115f203d05f8847a7b25bc5f7764d6a6d46f5d27e4836b061a4c45dbb33fadf3d9d2a043369ffa1b9fa3a4314a8fca7328e44688ceb0de
+EBUILD libva-intel-media-driver-9999.ebuild 1369 BLAKE2B 6629037820176d3beaf10be676db7d705d2b3b4329bd2682b3ff11e5ef47369585b3de1d246c4fec4589224068ac9146a1d6df86a4d2b9eff6dd74a995229bb1 SHA512 8abc05bd597ed110fd115f203d05f8847a7b25bc5f7764d6a6d46f5d27e4836b061a4c45dbb33fadf3d9d2a043369ffa1b9fa3a4314a8fca7328e44688ceb0de
 MISC metadata.xml 770 BLAKE2B 6ab4ad71025ad0e2130613c3c4a06c0d337be0388f994f9e02042214228e105dfde10943efe80aef0d3e0656038a35c9bab01ad907f05826059a809f76add8e3 SHA512 c4cfbacc4218176b4a18bb3afe428a46a09d2fc7f7b13e6a12fa5f028e8d9d498c29e0e654ee51591eb62eff2e4d4addaa2a3a63c45706dba46f447c3b013027
diff --git a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.4.3.ebuild b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.4.3.ebuild
new file mode 100644
index 000000000000..5ce014edf7eb
--- /dev/null
+++ b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.4.3.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+if [[ ${PV} == *9999 ]] ; then
+	: ${EGIT_REPO_URI:="https://github.com/intel/media-driver"}
+	if [[ ${PV%9999} != "" ]] ; then
+		: ${EGIT_BRANCH:="release/${PV%.9999}"}
+	fi
+	inherit git-r3
+else
+	MY_PV="${PV%_pre}"
+	SRC_URI="https://github.com/intel/media-driver/archive/intel-media-${MY_PV}.tar.gz"
+	S="${WORKDIR}/media-driver-intel-media-${MY_PV}"
+	if [[ ${PV} != *_pre* ]] ; then
+		KEYWORDS="~amd64"
+	fi
+fi
+
+DESCRIPTION="Intel Media Driver for VAAPI (iHD)"
+HOMEPAGE="https://github.com/intel/media-driver"
+
+LICENSE="MIT BSD redistributable? ( no-source-code )"
+SLOT="0"
+IUSE="+redistributable test X"
+
+RESTRICT="!test? ( test )"
+
+DEPEND=">=media-libs/gmmlib-21.3.1:=
+	media-libs/gmmlib:0/0
+	>=x11-libs/libva-2.13.0[X?]
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-20.2.0_x11_optional.patch
+	"${FILESDIR}"/${PN}-21.4.2-Remove-unwanted-CFLAGS.patch
+	"${FILESDIR}"/${PN}-20.4.5_testing_in_src_test.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DMEDIA_BUILD_FATAL_WARNINGS=OFF
+		-DMEDIA_RUN_TEST_SUITE=$(usex test)
+		-DBUILD_TYPE=Release
+		-DPLATFORM=linux
+		-DUSE_X11=$(usex X)
+		-DENABLE_NONFREE_KERNELS=$(usex redistributable)
+		-DLATEST_CPP_NEEDED=ON # Seems to be the best option for now
+	)
+	local CMAKE_BUILD_TYPE="Release"
+	cmake_src_configure
+}
diff --git a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-22.1.0.ebuild b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-22.1.0.ebuild
new file mode 100644
index 000000000000..b0004515b354
--- /dev/null
+++ b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-22.1.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+if [[ ${PV} == *9999 ]] ; then
+	: ${EGIT_REPO_URI:="https://github.com/intel/media-driver"}
+	if [[ ${PV%9999} != "" ]] ; then
+		: ${EGIT_BRANCH:="release/${PV%.9999}"}
+	fi
+	inherit git-r3
+else
+	MY_PV="${PV%_pre}"
+	SRC_URI="https://github.com/intel/media-driver/archive/intel-media-${MY_PV}.tar.gz"
+	S="${WORKDIR}/media-driver-intel-media-${MY_PV}"
+	if [[ ${PV} != *_pre* ]] ; then
+		KEYWORDS="~amd64"
+	fi
+fi
+
+DESCRIPTION="Intel Media Driver for VAAPI (iHD)"
+HOMEPAGE="https://github.com/intel/media-driver"
+
+LICENSE="MIT BSD redistributable? ( no-source-code )"
+SLOT="0"
+IUSE="+redistributable test X"
+
+RESTRICT="!test? ( test )"
+
+DEPEND=">=media-libs/gmmlib-22.0.0:=
+	>=x11-libs/libva-2.13.0[X?]
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-20.2.0_x11_optional.patch
+	"${FILESDIR}"/${PN}-21.4.2-Remove-unwanted-CFLAGS.patch
+	"${FILESDIR}"/${PN}-20.4.5_testing_in_src_test.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DMEDIA_BUILD_FATAL_WARNINGS=OFF
+		-DMEDIA_RUN_TEST_SUITE=$(usex test)
+		-DBUILD_TYPE=Release
+		-DPLATFORM=linux
+		-DUSE_X11=$(usex X)
+		-DENABLE_NONFREE_KERNELS=$(usex redistributable)
+		-DLATEST_CPP_NEEDED=ON # Seems to be the best option for now
+	)
+	local CMAKE_BUILD_TYPE="Release"
+	cmake_src_configure
+}
diff --git a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-9999.ebuild b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-9999.ebuild
index 7645bfd38f1d..b0004515b354 100644
--- a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-9999.ebuild
+++ b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-9999.ebuild
@@ -29,7 +29,7 @@ IUSE="+redistributable test X"
 
 RESTRICT="!test? ( test )"
 
-DEPEND=">=media-libs/gmmlib-21.3.1:=
+DEPEND=">=media-libs/gmmlib-22.0.0:=
 	>=x11-libs/libva-2.13.0[X?]
 "
 RDEPEND="${DEPEND}"
diff --git a/x11-libs/libxcb/Manifest b/x11-libs/libxcb/Manifest
index bb606c29d849..44d9c1a54348 100644
--- a/x11-libs/libxcb/Manifest
+++ b/x11-libs/libxcb/Manifest
@@ -1,4 +1,4 @@
 AUX libxcb-1.14-tests-don-t-use-deprecated-fail_unless-check-API.patch 5795 BLAKE2B 0a864b0fbd998fdc6c151b9f9cdb2a31797ac693b4ffa164a6f9a3c0fc1c5430454ec97be4c52ed48489cb08e820a998086fc588cdd2348b16da122bd483b8bc SHA512 e5148c7c310ca395b7e0f3b76ef98d79e50d0ac58935ad6df3c71bfd426166ce736ccfff4970e9523a2418820cd7cb2cba6e8818f23dd5cc21dac69accc1c3f9
 DIST libxcb-1.14.tar.xz 439404 BLAKE2B 63605e02dd32b4d26b3ac6d3b93b7383dbc30701b9a063e8efa5b387215c9325196451f80c7b0b357df1773c6fd1224eea8eeca2a456055a2cdc61082c726111 SHA512 b90a23204b0d2c29d8b115577edb01df0465e02d6a8876550fecd62375d24a5d5f872ddd5946772ddba077cadce75b12c7a6d218469dc30b5b92bc82188e8bc6
-EBUILD libxcb-1.14.ebuild 1494 BLAKE2B fdc21f31ecb0ee96306831aa8bbba6442fefeb18433fa40b890a231f99c9a86b4c36eda0ec8fbdef4c3b63c384104f233266caceb9b6fe4108bfda22c5afcecb SHA512 3285150e5a46d34de93671eb529b6a2b7c6ff1d7a59d84b7f0df10651c818e8cabd765fa10aab7a79674feadbbf2d1d0803cc0af21aa83e79be8dac904dad306
+EBUILD libxcb-1.14.ebuild 1500 BLAKE2B 31d68d2b246e4da3906e3a1507fa83a151a9ee3b66427192dc1917d95fe3e48c43765b8284d8f074d2f8a19c82e2f1055f36aac4c515f0096339547ce753e57c SHA512 6e86fde7e6b6c011b81b946a6a1f22070285d75e8001dd9a31e059e9579287b2c863425c505dac0de14ccf613541b660d06e771313d4b639ba2d2db8b91e1ed1
 MISC metadata.xml 401 BLAKE2B 67d85ae2c4ac6eecb10245666173d96f896ec9eddc36c8d0890092cbd19c7dd685f327332235937afbb119fa6e69860920fc1e385fdc750d89c85b67a9fbaa20 SHA512 72981a4b87a9219573847178c3d50f9a182c0b0a82917d3d472be062a5bb5e21422bc1776a8988b0ff0a5248a6f5eabe3dee3aa51612b31a7da283fd870b58ab
diff --git a/x11-libs/libxcb/libxcb-1.14.ebuild b/x11-libs/libxcb/libxcb-1.14.ebuild
index 4bf62d4bcc5f..8cd1a7ed1915 100644
--- a/x11-libs/libxcb/libxcb-1.14.ebuild
+++ b/x11-libs/libxcb/libxcb-1.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ inherit python-any-r1 xorg-3
 DESCRIPTION="X C-language Bindings library"
 HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc selinux test +xkb"
 RESTRICT="!test? ( test )"
 SLOT="0/1.12"
diff --git a/x11-libs/libxkbfile/Manifest b/x11-libs/libxkbfile/Manifest
index 20e1c58e28df..dab393161f7a 100644
--- a/x11-libs/libxkbfile/Manifest
+++ b/x11-libs/libxkbfile/Manifest
@@ -1,3 +1,3 @@
 DIST libxkbfile-1.1.0.tar.bz2 364678 BLAKE2B 577da1c43e6ce681630676f3f52f40b1f31d01862a891d4c1bd853056d90b03d9993299714c5e63a903b243165a1e299e1e014cd94614eacb50aeef363be8990 SHA512 1c6a57564e916ccdc3df3c49b9f3589f701df0cec55112c12ddc35ac3ed556608c28fe98e5ba0ac1962e9a65ed1e90eb7e6169b564951bf55a7cf3499b745826
-EBUILD libxkbfile-1.1.0.ebuild 478 BLAKE2B cce6d905d32a689c62b8f84ea72e4d9b908e06d6e7b1abde991c5f80698f4aeadf7d539e32e8cff5b9b62687ea2b0350a8bcab9fa0d999565a0c4344d99e48e1 SHA512 8f00fa86aef7d2f6d553dbfb534e283ce3ef15517e0174c3a9c318ec872a07771a23aa6a9047ce21fa7105bcab8ff13b6c1f38b02238392c493a9986bb9e1e3b
+EBUILD libxkbfile-1.1.0.ebuild 484 BLAKE2B 253d2bc7ecea1cb448b3030cc0da6eb36110007d361a591896cdb0186f2fcf4a85218415325ac97748806d7ee99d0130208b3bd01053a943d3d5367c3c51b970 SHA512 4311a6bcdb8bcf17c8cb63f7de9a841598f31e5f4d4837b181ba94b23a4bd0406c70456f44c855e535ce65345cf8d364c4c3a2c663413dc83c5b4a55826d9871
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-libs/libxkbfile/libxkbfile-1.1.0.ebuild b/x11-libs/libxkbfile/libxkbfile-1.1.0.ebuild
index 3c81299b9922..2fd485e2eb21 100644
--- a/x11-libs/libxkbfile/libxkbfile-1.1.0.ebuild
+++ b/x11-libs/libxkbfile/libxkbfile-1.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org xkbfile library"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND="x11-libs/libX11[${MULTILIB_USEDEP}]"
diff --git a/x11-libs/motif/Manifest b/x11-libs/motif/Manifest
index a888450d6dc8..45893b53164e 100644
--- a/x11-libs/motif/Manifest
+++ b/x11-libs/motif/Manifest
@@ -1,5 +1,5 @@
 AUX Mwm.defaults 536 BLAKE2B 675abf74eaa86c9b8f1f9730c3216d06239a6e67cd3657245b4c4095a5e1fc552a0c9c59cd72d3537de71e7f26d10bca87c7d34723e5514890c7a044aa2674b2 SHA512 ef121001e0a124fdea20a2b573ad79a68f23bf4f73c33097e8acc62fa00fd28311d999893b37514be33bceee1d2a22a5b03a02b75b2c02049131c8fedb3e02ab
 DIST motif-2.3.8-patches-1.tar.xz 1896 BLAKE2B 7234860dadac55362c7f1804133a660da1ab468fb6c0f0c71cad76b956a5f0b1e58874496a6721f49bd6413e916014807e946112b48b9a22272db5e4d97d43d9 SHA512 22e5d8c590d2c1c57fc639cb46d16984dc5fbafb3b68fd647d180d6299a06f884a8ed69e2180da8153bb0f68821eb0031f93e9b9a3128ba93535fd7fb92b402b
 DIST motif-2.3.8.tar.gz 5704328 BLAKE2B 3755b7f46e50240e1e9e7046aa439fa89872e54ae5d03860383f509b6d0f09edf85bd7d92ea4d37925efd2e44401028aa2752d940c42d9cccb652b2bd1d85459 SHA512 1ab8e8eece25ef97e948592b5fa3e19d98e932695290a18b7a8e90f1aa2766bc4f082bdbc3999dff5660e684821178a149040f76bb477163e53ca06474d02b55
-EBUILD motif-2.3.8-r2.ebuild 3081 BLAKE2B 74561b0a76b896a0b2f5f72604e4761cd4165be96b69610076febf1e7cc99c0d67de2c651114e6d42a19417b17018c6cdca3bc2408c4d30cea01407e454b34ee SHA512 ba32ad89938cdeec415aa737a4e796525190d5e03c4d67072bf03d3973e50fac207abcae87f9017ba6c02454c58dfd00d57e04e724cd42b7b00084948e48424f
+EBUILD motif-2.3.8-r2.ebuild 3055 BLAKE2B 9e910be57aa656ff5234012c677c669814505537e78e6a56cecd0b97f14c94eb081332d8012972581d12fe8c4a0927276457f3a5e81d9429b2644973ea6df540 SHA512 465c166e1c5a6dd46faf07a915b6abb505ba04355e537cb43bca0447af5939c3a6ebf6a13d0f88adbb811c82a44febae2797e75cb8103c0464fd25caa4abe97c
 MISC metadata.xml 395 BLAKE2B b38f6a1edd0fd73e4db1c60e5b4da0df16bfb0f6c54481c531afc451b782a30ee7510b52ff88a3a140187db7296c8711a0fe4580533f858494402f37ed02d704 SHA512 cb64fc9c0c7993edb329285be74992a02f9788cb3a302fbcc8e0cf3bd34aa5b9b12241503f08d8d0bca1c6108f8ef94fa2d01bbdbe1dd25e755931c242713b69
diff --git a/x11-libs/motif/motif-2.3.8-r2.ebuild b/x11-libs/motif/motif-2.3.8-r2.ebuild
index 92ab7b3e60fe..707f27f2cd29 100644
--- a/x11-libs/motif/motif-2.3.8-r2.ebuild
+++ b/x11-libs/motif/motif-2.3.8-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -54,8 +54,7 @@ src_prepare() {
 	[[ ${CHOST} == *-solaris2.11 ]] \
 		&& append-cppflags -DNEED_XOS_R_H -DHAVE_READDIR_R_3
 
-	if use !elibc_glibc && use !elibc_uclibc && use !elibc_musl \
-			&& use unicode; then
+	if use !elibc_glibc && use !elibc_musl && use unicode; then
 		# libiconv detection in configure script doesn't always work
 		# http://bugs.motifzone.net/show_bug.cgi?id=1423
 		export LIBS="${LIBS} -liconv"