gentoo new year resync : 01.01.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-01-01 21:06:00 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2021-01-01 21:06:00 +0000
commit: 129160ec854dca4c3fedb5bcfbcb56930371da0f (patch)
tree: 53bf797418ac5e9b99c41ca0382c87b82421e5de /x11-libs
parent: 441d1370330332b7d78f238d2f5e13f7aed5e4e0 (diff)
116 files changed, 112 insertions, 480 deletions
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index b990f87ea685..5ce1f72c96fd 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/fltk/Manifest b/x11-libs/fltk/Manifest
index 13c1cf8cdfba..5eeddc2691d9 100644
--- a/x11-libs/fltk/Manifest
+++ b/x11-libs/fltk/Manifest
@@ -8,7 +8,7 @@ AUX fltk-1.3.5-cmake.patch 975 BLAKE2B d8f068c7773522683797e2ad2059019abdaff79b0
 AUX fltk-1.3.5-optim.patch 198 BLAKE2B 1fc6df1d2932d8c792802e437c60c6f02f9e50be5a997e60f2017796e0f5ec8c40886af1946c9269b0c5a2e8ca40be92dd499e373f02be6a62eb59d56c0d3993 SHA512 839cb0d543187bbaabb916eeb33a96e14808e65c7e6e1aaed61f33efa1f56857757f48d9b4852c711fb296c3e480175449dd0dc5167f589975220276d05e6a67
 AUX fltk-1.3.9999-conf-tests.patch 2259 BLAKE2B cb689918b807d75401ad3621deed635a883629c1e52ad0f797d77fb9e04aa28c9e9331399543f7d7fb63ca150f91d17ad0f7e71afef4364c505bf143bf3a7973 SHA512 a7ffb1c82e9a2c7bcfc7ffc1bfbf9fbf40daf4c5ca1ccb20c6e6d901846636de4c9166de8a63e739a730f4dc28c4527bec2c7390828611dc0b00b6c3e547b72e
 DIST fltk-1.3.5-source.tar.gz 5261324 BLAKE2B df05989d6581b570c689e29e9f31e5fc85fa91dee1296d70b5f5c3b4aab527749850ea78bec3ef5947151b21598c3bb04e52f78b5e6db179e7fd922627862b5e SHA512 db7ea7c5f3489195a48216037b9371a50f1119ae7692d66f71b6711e5ccf78814670581bae015e408dee15c4bba921728309372c1cffc90113cdc092e8540821
-EBUILD fltk-1.3.5-r4.ebuild 4473 BLAKE2B 0769301ce2b261b45b7b22868bf0fb703101ad2d99caf9579bdd9d0656a9ccef8a3d849139a81b54a4a3922437039a241e7e75f7f3b1bc9ff430aede7846049f SHA512 3680906bb43e350504cfaca7c3f95dcd7dd20941714b5ebafb15fdcd4aac8dc343c918f9c72b5997fd10b2089b12e302a25f0744b7cd3b775bf2c1ac644a6a5c
+EBUILD fltk-1.3.5-r4.ebuild 4474 BLAKE2B 87f1d6609ed057801a634c047a37003c0e2bdb067cf6b1d64492b68869ea465ff90fc8fcbbb388c9cc793ed590eea5d7f647aea4f7ed22dbe67ddebc4ce27e97 SHA512 a3d60b19142e73b5cbdf09869499219a1f5b638d156b00135c4d02ad6fb4ccb76bea396ee9e8fd1324bf13cb75fdae7cbfc9c0994035d0cbeb465df6858ae60c
 EBUILD fltk-1.3.9999.ebuild 4473 BLAKE2B 3ae316ba98fcd88c7344db7c78ca497620283eadc7419146af71e421862c6fdf30d02ef2e51e9a4d3e7bfb09dcaccb1496b1529e38aa20849bf29f3f959d2617 SHA512 ec27297bad9358c6ed4339c138fe38e69be71c386f0d0ac550999d1f31b4f713203d36cc2498b986c3e1aee82ffc8a1df4e8d61a93d1ff44d4109809f360bbf7
 EBUILD fltk-1.4.9999.ebuild 4506 BLAKE2B 3891ff70b01adc480baf56abe5de071d177893d0718cb7901b2fec1afdb4a3149644d5c77bdb7c126c890215711c3f17b261fcb686c3c80f4de803a302ba9610 SHA512 2b737473c748d04424a41657875096d78dfef7f96853c27f77554f41b963883ef4d25e82ff415da25be3f7372e5eaba65e707e310c131913ac85f0dc469efb46
 MISC metadata.xml 698 BLAKE2B 5289c4920b3345c4cfb1bd9151974c40b6d45f6ec605c7c1d766ed3c5118d562d645094ea64b4b0baeb83cf7872ff1fe762e0a427d53899b3d8f517233a9665f SHA512 05565c7e9fe48f03536bdb10f0396c4d609ae7e52ecf6e1a04e956a3f8fa9ad68e2a79827ace0e51b60111859a4482054680b361fe7b391b824ebd39bdfbd24f
diff --git a/x11-libs/fltk/fltk-1.3.5-r4.ebuild b/x11-libs/fltk/fltk-1.3.5-r4.ebuild
index 63067421100b..165ef8e51215 100644
--- a/x11-libs/fltk/fltk-1.3.5-r4.ebuild
+++ b/x11-libs/fltk/fltk-1.3.5-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.fltk.org/pub/${PN}/${PV}/${P}-source.tar.gz"
 
 SLOT="1"
 LICENSE="FLTK LGPL-2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="cairo debug doc examples games +opengl static-libs +threads +xft +xinerama"
 
 RDEPEND="
diff --git a/x11-libs/fox-wrapper/Manifest b/x11-libs/fox-wrapper/Manifest
index 2cb3f055ee0d..cdaab80dfd67 100644
--- a/x11-libs/fox-wrapper/Manifest
+++ b/x11-libs/fox-wrapper/Manifest
@@ -1,5 +1,5 @@
 AUX fox-wrapper-2.sh 1905 BLAKE2B 1b437efc5d8fa8b4d12ccd84469b1c6b8c19cad06fafcdca19304f352edb97e645815411a49ff1aeea1347b3ad024b40bacb761727d32c1d2692e2d5a040f893 SHA512 9cf96c083ea0d787992f40c5acce69dec162535122d65788aa05fe4bf33473103c889a1de98dfd80526c4a53e684cf536105f88bd610e9e50a55eb68bc2ecf35
 AUX fox-wrapper-3.sh 1901 BLAKE2B 20b6ca94deee62464642e5a7e127c78135dc83a5c8c4d369fe35d7e6c2686b825b7fe966998f58dbd7bd5d77ae30a9f6e98d1bac46bb06050cf52a1d8c9f30fb SHA512 19d7115feb5566ae8e3c7af9a88aca7d0643dab92fb8bfbdd0bfa826f7357b2caff436741218eb9d51164fcdf863c3150526108e3282fa244102bd85f8abaee5
-EBUILD fox-wrapper-2.ebuild 537 BLAKE2B 024653c139e30f29b1404dd71640fb04eba065cc7e2dc5c7a8ae2594702a02739cef6115b90188a15705741b2d44a6cdba4489c268c6ea230652346c44331b02 SHA512 25a4b2174120b11e5745da741f85c57479e7a011aa244a56d5949837579c1c8b5dcd77799b885f9a672960e08ce7225cc65c89aab4c48ce8e97510d28295ad46
+EBUILD fox-wrapper-2.ebuild 538 BLAKE2B 50f8f178e5b97c2c54636bfe82a89cfc2274d24d9671a554d3214a7800e7eccf0fe929bb71e737f85aa7f39a078eba4c0a8059d3c686af30347e4f6e60c25b0a SHA512 9de8fa442bc1de861dffb6ee378ccf323f189a1056a027a52aa444bf31dc174b818dd0dbe68af961c9d13cbafa3f6d82c658dc15b369e2e4d36278088eace953
 EBUILD fox-wrapper-3.ebuild 553 BLAKE2B d94b4abb60954601e40b47fce3dad0441fdd75d97fee3af49d43cb77d2b52cf4063d99dbb78d013c75dedd6a50c7f75d58d061a853ad4fcc2f2a5905e11a0389 SHA512 d421a48a49eee5712cc923f13774eb472abebda6d290ca488c067e0355d7aa4e4b5eecfdfa2f8fc842ab5143cd52c3d5895b19bed68baf80bac725693314d1fb
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/x11-libs/fox-wrapper/fox-wrapper-2.ebuild b/x11-libs/fox-wrapper/fox-wrapper-2.ebuild
index b4b834556c50..eeb9dd5e6bac 100644
--- a/x11-libs/fox-wrapper/fox-wrapper-2.ebuild
+++ b/x11-libs/fox-wrapper/fox-wrapper-2.ebuild
@@ -9,7 +9,7 @@ SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/x11-libs/gnome-pty-helper/Manifest b/x11-libs/gnome-pty-helper/Manifest
index 6d3a560ce6d0..66f5fade95b9 100644
--- a/x11-libs/gnome-pty-helper/Manifest
+++ b/x11-libs/gnome-pty-helper/Manifest
@@ -1,3 +1,3 @@
 DIST vte-0.40.2.tar.xz 923852 BLAKE2B 666f1e8bd5ce1392c8c533c180e7e6700a6b0023e9b0ab467f2d99a38661fb600c53d83bda10bc97302dc54801f8e1d8780eb27a2c5cd184d786a55d513dfc24 SHA512 06d1c9a34e8e82e1bd54810d245d908ebb837538ba19fbaabe683cdf3b96b7cb1630516ddeabf18b0294922b8d98d2b9a2f5028c171fac2ad913974d94555eb2
-EBUILD gnome-pty-helper-0.40.2.ebuild 802 BLAKE2B e288a19e0eda05da2cab73081509dc6969bd716a56d92c95f2a1ab833b85e17d5febfd82e360b663f0e23e0ba1efbf476242972abcbb0660677cc34839f907b3 SHA512 a46f1e7e36cc696492b10f9e61b24ed948c6c588e9f7b7a3d8ea2849d4aae3c799644d9528e0ffa56a200f364043c1e27f2378dcc6af17d2011b68ef3db9e76c
+EBUILD gnome-pty-helper-0.40.2.ebuild 803 BLAKE2B f90d8fd1007b289eb718e31bad71e83e75f42779967468f69c33e34a9f8e21c68ebc981fe0030b8c6592a183ed7c0750e1733ad1b249685a0236cb96d186cc69 SHA512 5cb489f0d752edfad332c6b8a42ae3ea45ef0b26aa4791b3ae5e05c82cb7420f0e51ec746e88baae499ef309db5ce6bfa7b456f7083fbcb4667820013bef953d
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/x11-libs/gnome-pty-helper/gnome-pty-helper-0.40.2.ebuild b/x11-libs/gnome-pty-helper/gnome-pty-helper-0.40.2.ebuild
index 32bdb56b0881..a3bea92e36d4 100644
--- a/x11-libs/gnome-pty-helper/gnome-pty-helper-0.40.2.ebuild
+++ b/x11-libs/gnome-pty-helper/gnome-pty-helper-0.40.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/VTE"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+hardened"
 
 # gnome-pty-helper was spit out with 0.27.90
diff --git a/x11-libs/gtkmathview/Manifest b/x11-libs/gtkmathview/Manifest
index 9ce59611677b..beaeb0e12926 100644
--- a/x11-libs/gtkmathview/Manifest
+++ b/x11-libs/gtkmathview/Manifest
@@ -8,5 +8,5 @@ AUX gtkmathview-0.8.0-gcc6.patch 2043 BLAKE2B 5534acd718f3b4423a1325c109483de311
 AUX gtkmathview-0.8.0-gcc7.patch 1150 BLAKE2B 28c122d1ac04cdbe6b232325da3e5994e9680c670ad51387c0d0f7cd67618fca11d54163b563431c3ae3853ea05ada400627c6dc45b8e00f79f07c050d118073 SHA512 550646e134f43a47dd185b9ac2bb7c1713682685c78feca43fd6371d3e6455d06cb105fac9cc69f624cc8c3fef14d06aeabe91dae35ecdd096901cea9c802b17
 AUX gtkmathview-0.8.0-underlinking.patch 1926 BLAKE2B 6f50638ebb9c2a6af55e3b0f13b438b97a2e606fc7639a2aa6d7e3467bfcdeb4661c6b18db200b727a3de87c457ea99013f32e49b76ebaaf0a5d9793828f280b SHA512 9f0f4404ad60d8318f6feaae81db5ff4d331509145874926667eb9274a83ae278b08a078830cfd98ae85a602fd1ac7ea13b676f5dcd70a77e8b45e9e5fe5aa0d
 DIST gtkmathview-0.8.0.tar.gz 987328 BLAKE2B 1c8403fcfab828153911a40850bdfcfdd15c8c19da5dc1d7c015a8718c647b4adde2f7201ee0abc72d6c2b5acc79b8c852d6aa4f09021bbeaa827291d963b646 SHA512 aa7eb4aa031f9b9727be3fd8635fdac0e912585de9b91c5e71400edc5fa0b3257724244f796fea0122e32318d00701e63ee7fb12b97b7abbb7940a5439d31adb
-EBUILD gtkmathview-0.8.0-r4.ebuild 1961 BLAKE2B 6994a6c40a3489563f07a88e1a8b4f77bb1ab20a6e0d6175dd07efe93ef75fbd1fc07b1e71817b1e34c9e650e2e089191bebd7a1280d55205328c890d21a27cb SHA512 29e0039532be785289c2ac09130dc83e9b6632750f81f9df653e1b8f659abfcb19aa497bdaa637ffaa6a4ff57c84bd97ae52ba68d929afa58f9d6b62076f90ba
+EBUILD gtkmathview-0.8.0-r4.ebuild 1962 BLAKE2B 7b60f4e6e82060044dabb795c9ecd5e905d7e7cfecedc6cd1a0415a932ac9deedf37dd281d1436be5ecfb6b511a4bdb3c32841a8e537747aa2611133e7133df9 SHA512 8a24987f19df3ab4e604051f1a65ebfef9350847a4a9a24b22f3f4c2c34f377ed65ca14d60a75f68e05a3428298bf3ba58ecf128160bbff6d83e4246ae0498d1
 MISC metadata.xml 413 BLAKE2B 795e9acaab179d9cf4e0ab6f3232dbf079b418420a55ff58d06f5b81b2fa785121a6b4bb734f45f4df9b15435b3af8bf26abf773100b70c362a98805057f8a38 SHA512 734ee7fb5aa123fb2794a22b1a374e514a92a640e7bbd35ee53de045126d0b330f177db4018ddf76e9932f984a2f5c1646d3a3f642b29972df0af88f64fb1352
diff --git a/x11-libs/gtkmathview/gtkmathview-0.8.0-r4.ebuild b/x11-libs/gtkmathview/gtkmathview-0.8.0-r4.ebuild
index e42c746b32ac..d714662b28f5 100644
--- a/x11-libs/gtkmathview/gtkmathview-0.8.0-r4.ebuild
+++ b/x11-libs/gtkmathview/gtkmathview-0.8.0-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://helm.cs.unibo.it/mml-widget/sources/${P}.tar.gz"
 LICENSE="LGPL-3"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="mathml svg t1lib"
 
 RDEPEND="
diff --git a/x11-libs/libFS/Manifest b/x11-libs/libFS/Manifest
index b0b723517e65..b30ad0471a1b 100644
--- a/x11-libs/libFS/Manifest
+++ b/x11-libs/libFS/Manifest
@@ -1,3 +1,3 @@
 DIST libFS-1.0.8.tar.bz2 347880 BLAKE2B 74f9079f4ac98ad8cc83e73a162f4e308c49b643dc11ab6d68d36afe5f70b9326023fafb7a17ab14a083bbda20f99d6e140bf85facc4a3177d356b7c5dd6e126 SHA512 466198ae5c0b83e3579713d86ddfd0b039f5c5b511cf6d5dc0e9664ee2d40aec9e8929445c8e97394d85faf76a7cf2f81bddb13d23de7ce19919e3b1e36ba56f
-EBUILD libFS-1.0.8.ebuild 369 BLAKE2B 046faa24932f34a23d4ac775d57293aec0275d8af87b44b3faf696adbcc192192973a75e67c640618daa85089149b4a38ad69f94fee5ca08bd3ea4e1430d582d SHA512 9f0d0add429a4170e06c152e72e7cd3395c5b2499216b77861272f8c4c5cdeaf22eeef0d72f98329b287e1cfbd8fe8332fb5bbfbaaac64fed3840ab006d59a7f
+EBUILD libFS-1.0.8.ebuild 370 BLAKE2B 5ebafcced36a43e27290a8cec1cd4df38477ca9028a266d9359b9a5d39e0c60c6d3e4fabff0f1f6b30c2323a867cc8eb35250f78559ff2858cfe13ee1e2e6be6 SHA512 b19da9250fd58cd473472bd55e29ab9d4a4d83bedd20ae8ae873c1555c5f93ba873eae2e1775c0cf31a576e78715b0028dd8a6d77eb8a4a94c7ffb268fedb8cd
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libFS/libFS-1.0.8.ebuild b/x11-libs/libFS/libFS-1.0.8.ebuild
index 2338a4d8ea39..d09e896974b0 100644
--- a/x11-libs/libFS/libFS-1.0.8.ebuild
+++ b/x11-libs/libFS/libFS-1.0.8.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org FS library"
 
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="ipv6"
 
 DEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libICE/Manifest b/x11-libs/libICE/Manifest
index e74e0a8ff8c2..59c68b83c0c1 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 659 BLAKE2B e0ad6227ffd7b125e2ddd5b295803916e710a10e647c1c2f6657c7cd6b418e95aec0e5ab7e61ec28a0f3435ccff61f35466b87c17941987f2f08eda370ad8703 SHA512 344159da92c7ca04fea657bd630280c3052d6955d9501a569324a304c69b818bda2faa86ced69fb160cda7b805e8d356c7e339f818648bd34e1787739af06063
+EBUILD libICE-1.0.10.ebuild 651 BLAKE2B 802b039a248af2f3edf1e2b2253b22422581faf8da8f51af0cef5699d2ccd817c16dbcd01a2513dca4c9becad173d0fff51072a1d68f79590e6bcaedf06dc63c SHA512 5b874f89903b05de8b8556f052170dd1d602f70084357a433514f9a917edb4d8fa7ad8e4b06926d865e378c5ef2d5fa15945be523d279495428b3008c9a899d4
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libICE/libICE-1.0.10.ebuild b/x11-libs/libICE/libICE-1.0.10.ebuild
index 314eb22f04d0..a723004486b5 100644
--- a/x11-libs/libICE/libICE-1.0.10.ebuild
+++ b/x11-libs/libICE/libICE-1.0.10.ebuild
@@ -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 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 d4471c2044a6..fb9de4332040 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 1714 BLAKE2B 1f5a5da8d98e9098f22264999d2ca9cca057277ebb821131272bde6e5b9bcc06ccecdb5d901768dba43826af43e53470521ed0c2fc65d256370adc91011d05af SHA512 4f3d7e4a885b803bdce0e9ab8d5e123ea6a29e5a0f00c3818438d1bce42017d2dc783baf707e29dcc32ae547333f2d6579de3fe6ad98ceaf185ed29d7b36b859
+EBUILD libSM-1.2.3-r1.ebuild 1706 BLAKE2B 34be5a9fbb4f3bded50238ad5c07e4ca8499f7b5d133f28e7be5d316d0ca999af7d37681062e50d6dcbcfc0a49ef9be5256126436709c7d50c586bd2557440f4 SHA512 a7515a41845688e5a52f5b786639aad691410f220a074041ec894c62fa4e1997054b839262b39b95332a68e19015346627dfe1e47a4a2f0ede2f8b96496e5e7e
 MISC metadata.xml 348 BLAKE2B 475822d6499e8c44bda145b3fb4d72b0f462c03ddddf44cdfb8359a2b0a0e44917a0004a53ace75218efa01c25491fd66e52c1bc0c7e392c88ba9cdbbe414e54 SHA512 4fa0439dc05b56a6fc0280c020ccbc52438ba0d22a4a9b8c0e4830844fa50bc6af8096498336b0d9752687b6e30dce581a24b4b67a812d2e7a62783e37af86d5
diff --git a/x11-libs/libSM/libSM-1.2.3-r1.ebuild b/x11-libs/libSM/libSM-1.2.3-r1.ebuild
index b9dcd81a8a9c..03ef9a294ce2 100644
--- a/x11-libs/libSM/libSM-1.2.3-r1.ebuild
+++ b/x11-libs/libSM/libSM-1.2.3-r1.ebuild
@@ -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 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="ipv6 +uuid"
 
 RDEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libX11/Manifest b/x11-libs/libX11/Manifest
index c62c7e14d32d..729f03ef492b 100644
--- a/x11-libs/libX11/Manifest
+++ b/x11-libs/libX11/Manifest
@@ -1,5 +1,3 @@
-DIST libX11-1.6.12.tar.bz2 2376498 BLAKE2B a2c6c76d5d4a15073f7837e6a72ecd8b7711dfcec48c54da538a6100a4afa01334a9456376633f1a2365717e03231c6b777c5683e462d10564065dc2437da39a SHA512 79df7d61d9009b0dd3b65f67a62189aa0a43799c01026b3d2d534092596a0b67f246af5e398a89eb1ccc61a27335f81be8262b8a39768a76f62d862cd7415a47
 DIST libX11-1.7.0.tar.bz2 2409144 BLAKE2B 1eb6aa8f2fe50ddb2f6d324429b3d9cecfb48833c3f52f22ae8e32846be614c8db63c57d25e2b1c46612b6b333ff61ceab8ac0b605b117bcea1224f918af8e6d SHA512 f661ca90350fd8a94f054b00f12f5122cea068ebff706acfd399462236c189a296a2358d17d16166635101cf56cc19303dd407873a159932d093c9f33556f9fb
-EBUILD libX11-1.6.12.ebuild 746 BLAKE2B 06fcee110e8b9bdf643032fd1a539f60c2590ec133e09369090c69a3565157e426a1a9a1fe08b66f949a9394aee20f23050bd02e96d17edfd4db285adb9be560 SHA512 aec825d556b6729ccdc457badcf469504c9604e0fdcbc8c3d919d3d4e7d6c6738ba992202a769624cfe9fee9798cad9c59c26f262289f950bc81549596a2444d
 EBUILD libX11-1.7.0.ebuild 850 BLAKE2B 42437a5d195571ac3866f3ca4abf08cc2486e72a358334f9d83d97065208b490118178967966c2e3304de098069fec0a72580a256fdd708f45f3c1d32b79bd27 SHA512 2ca11e50c2fce1e71405d18563c0f78848a411a549c08ff39c59bc1011d1468a9e15b3d0716984cc9ab20435117bd700af943ee9ad4912f1fdf5b6d875ea76be
 MISC metadata.xml 311 BLAKE2B 1e5deaa311245a5794e72574f94028f60c1c712a06820551cae811b113d633816a60fd3920ff5f2ca287558dbcff28e57537d5c0d3ee3a325c7540bc0b98da13 SHA512 760d09a1ed93bf16d8e26a70fa1178c02c6b336dff9aa29f900d5eff305686b9c3fae4bc93bcce58c0427f567d3759dd3a8adcd8707d07fdd90c6db79d4e13f2
diff --git a/x11-libs/libX11/libX11-1.6.12.ebuild b/x11-libs/libX11/libX11-1.6.12.ebuild
deleted file mode 100644
index 7928b78e6895..000000000000
--- a/x11-libs/libX11/libX11-1.6.12.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-XORG_DOC=doc
-XORG_MULTILIB=yes
-inherit toolchain-funcs xorg-3
-
-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 ~x86-macos"
-IUSE="ipv6 test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=x11-libs/libxcb-1.11.1[${MULTILIB_USEDEP}]
-	!<x11-base/xorg-proto-2019.2"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-	x11-libs/xtrans"
-BDEPEND="test? ( dev-lang/perl )"
-
-pkg_setup() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_with doc xmlto)
-		$(use_enable doc specs)
-		$(use_enable ipv6)
-		--without-fop
-		CPP="$(tc-getPROG CPP cpp)"
-	)
-}
diff --git a/x11-libs/libXScrnSaver/Manifest b/x11-libs/libXScrnSaver/Manifest
index f637014c1ab9..51461b5ef141 100644
--- a/x11-libs/libXScrnSaver/Manifest
+++ b/x11-libs/libXScrnSaver/Manifest
@@ -1,3 +1,3 @@
 DIST libXScrnSaver-1.2.3.tar.bz2 291465 BLAKE2B 03864811a3bb34521d9e27ec2ce363cb015ee3484a27cce6fed4e6b16499b441dc7336229cc926da7bbbb8366e03780f9f4eba0e725083b8f362ef45c43e8633 SHA512 7ea628324a11b25ee82c7b11c6bf98f37de219354de51c1e29467b5de422669ba1ab121f3b9dc674093c8f3960e93c5d5428122f5539092f79bc8451c768354a
-EBUILD libXScrnSaver-1.2.3.ebuild 495 BLAKE2B 4fc3a927797743d8ca16b394f11d69f532acc78c621d357b3b9d0bc8c050eabc30f685fc628b5f8a660a8f471b09f71f19a72b3e951106661ea1b474bf2246ce SHA512 5f2affb61d597f9e2c9dda213e913a19f77f08fcf6745b49b283bf05a59d6859b2539f20aac7f585d3bafd673da219445b4e7fda1e52224f1653c93fc9b6f3b0
+EBUILD libXScrnSaver-1.2.3.ebuild 487 BLAKE2B e006b43db511f1d0567bfae0416d2a7f0e3715a0156d986d1a5dbc18a96af7fe7c4e64e1db3063bb9372bef6c13451a02b61c74003bf53ea9a74172e4eb64762 SHA512 0c8c7033fb9ae12b49f94236b75d94549d7804ab7af0b5b26bb529f162334447b4e2af3ecae3c573b569de75bbcc0fc2df2531ba33c7c76eb00feb458842557f
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXScrnSaver/libXScrnSaver-1.2.3.ebuild b/x11-libs/libXScrnSaver/libXScrnSaver-1.2.3.ebuild
index 50ea188d6f3d..1e8a1b689237 100644
--- a/x11-libs/libXScrnSaver/libXScrnSaver-1.2.3.ebuild
+++ b/x11-libs/libXScrnSaver/libXScrnSaver-1.2.3.ebuild
@@ -7,7 +7,7 @@ XORG_MULTILIB=yes
 inherit xorg-2
 
 DESCRIPTION="X.Org XScrnSaver library"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libXau/Manifest b/x11-libs/libXau/Manifest
index 4b1bd263175e..e96d3430bc5f 100644
--- a/x11-libs/libXau/Manifest
+++ b/x11-libs/libXau/Manifest
@@ -1,4 +1,3 @@
 DIST libXau-1.0.9.tar.bz2 322650 BLAKE2B 0bc9eb01b99f13a8f978edd7ff63d76f89071ac27f1cd946f9ebc96165a892e7ba7cdcdc52f73e8ed6d5b3d672f8a29a24582195fe14d1d24730a797a592cdd3 SHA512 3ca454ba466a807ea28b0f715066d73dc76ad312697b121d43e4d5766215052e9b7ffb8fe3ed3e496fa3f2a13f164ac692ff85cc428e26731b679f0f06a1d562
-EBUILD libXau-1.0.9-r1.ebuild 466 BLAKE2B ad42e47fac643d03d37831753d48ae12c099ddc09e4241119fef479c1debaad87f711700dcef872874caab49bf8adb755eaedee5c580874a2034ec0272fb04bc SHA512 2e7106145cd86559e811cfe2f8d48be7c19795d01de869f43bf87da5df580399d2e02898bba2fb5af5040a9009c538acffba57bc7b6f3570f4ea1cacb09d6aa3
-EBUILD libXau-1.0.9.ebuild 474 BLAKE2B 9f7b74e6f5c183b91cf92b892df357407d1898132aa386b72b1c30b2bcca87b2b84b68f4884ec62f3a982dc23a90f478de45d87e5712410fdc1a2740f5732794 SHA512 a92a61c1abf46a69ff83d7ef342742e61005ef6278406a62201a78f3d39f55775a8d14687d99b057124915acf98184e2989f5dbaa6d1a5cb13205d5398e5a2f4
+EBUILD libXau-1.0.9-r1.ebuild 457 BLAKE2B 2d3ada593fd2cefbaf0e744af24c7fc4451ace1d05d0da9883a3924f362ec40a6711c95650dad01d3d54f06ceae01626262d678ac8d2cc617b43ea2cdf454f24 SHA512 25939eada2bbff7ef906af9be225f7823154881b349b3932b5d5dd53ba8c61b2e076b6276912eb2705966027c83331f594d9c80fc6026d8acf1bdef7fe74bba3
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXau/libXau-1.0.9-r1.ebuild b/x11-libs/libXau/libXau-1.0.9-r1.ebuild
index 02d46607b6ce..d7e50037ba61 100644
--- a/x11-libs/libXau/libXau-1.0.9-r1.ebuild
+++ b/x11-libs/libXau/libXau-1.0.9-r1.ebuild
@@ -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 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 
 DEPEND="x11-base/xorg-proto"
diff --git a/x11-libs/libXau/libXau-1.0.9.ebuild b/x11-libs/libXau/libXau-1.0.9.ebuild
deleted file mode 100644
index 85f36a1183b0..000000000000
--- a/x11-libs/libXau/libXau-1.0.9.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org X authorization library"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE=""
-
-RDEPEND="x11-base/xorg-proto"
-DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXaw/Manifest b/x11-libs/libXaw/Manifest
index fc9112fc2798..e485e2348032 100644
--- a/x11-libs/libXaw/Manifest
+++ b/x11-libs/libXaw/Manifest
@@ -1,3 +1,3 @@
 DIST libXaw-1.0.13.tar.bz2 674140 BLAKE2B e141a135d1a45edfb71687951542a31d838bf560997a631b3590db0581f94768a8cc77ebd86c7cff60668e9843b1258a9eb60383a4d25b704ce9dc91fc6d0bdf SHA512 d768a39f7111802493fa1df1b80d858e4139ceeb883d45ff13ce3b7a0e775a7d2834b7ad157c8330117f04c32f38979795332dd7a119adb2344fcb1aa9cf1e2f
-EBUILD libXaw-1.0.13-r2.ebuild 889 BLAKE2B aa54cad1128d30635cbdc97927fd82439c785e016ecd9c87383e33b3421619e169ddec7d9ba6069574c2d8bdfe6f050d3d12274e91fdacb0ba97401fb5561fb6 SHA512 471289b909cf9a93b0dc335309d83c14e46538265409880e8ca6151d30bd72a896f60110d522a8ea1d4b20aad80a963f5641306447cc59c1a36f6557481cd83d
+EBUILD libXaw-1.0.13-r2.ebuild 881 BLAKE2B 9ae42439c25dadb2d06cf5c1ace35dbbbf4a6490dacc99b930e824fdbeaeec5fa3b5c8f7f43a4dcf9bd1c7741351d37ce8812e7ad29338d77a243c3a25f7c247 SHA512 a2955dd9f725f402ada23d97fe710cef5f1a1ef5eb42b6fbd024c3025dfb3d4da531ac5b01f467f068e70041567f32f0b36114efd37180759b5d0a3a3484b1e0
 MISC metadata.xml 308 BLAKE2B c8b1bdf11408b82ade3364323648bf367d76ddec0711a46f3662f4fe34aec46918c7acc617a782312725ab0169e82c25d480194a2ff22bc3429f5f3c1d4e434d SHA512 331203494a47823877466669591ec0de413400dc18f51e96c18a06b7bece2fe56a73055cd7f1e4ffcf6cc9cc9bdd488a7a5ce2830def9ce5a6ae187c52dad364
diff --git a/x11-libs/libXaw/libXaw-1.0.13-r2.ebuild b/x11-libs/libXaw/libXaw-1.0.13-r2.ebuild
index 0e938441f826..088b0944fe02 100644
--- a/x11-libs/libXaw/libXaw-1.0.13-r2.ebuild
+++ b/x11-libs/libXaw/libXaw-1.0.13-r2.ebuild
@@ -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 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 3ef7fe7cbfbc..0b590e5f3cab 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 720 BLAKE2B 0487815d5232ea746bb0d557e09101623782bbce16c5e32c56c169ee256c1e02b0934b9a8d2f6cfa5a2f96c74440400f1ae5421439d742be80e8e36da2da487d SHA512 d50c07720dbe21292cb235a1f65cb5eaf3f15a2df5389f9ac1684621e8c9c8cd266b36a76225ea7304371346dcf0a4f67f2065c2e52a1cc0cc201c1d909a1c00
+EBUILD libXaw3d-1.6.3.ebuild 721 BLAKE2B 2acd32534b2e1ce0b248facb8b256c15746e35e8b701bc7783c999526b26ad29559b69e8e9acb04353ea069097e657a0d5d17c4e1e625c682a162e3503c5e7fe SHA512 3477da8c573b569a98db85da7a26b7d24595b9eba9367fbba06de022e86d22053170a2a9e59763cbfe0d1aa279f2d913634031b5c50cf7bdacfc91252ea8b827
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXaw3d/libXaw3d-1.6.3.ebuild b/x11-libs/libXaw3d/libXaw3d-1.6.3.ebuild
index 5efecc788a45..ad1ae92ab101 100644
--- a/x11-libs/libXaw3d/libXaw3d-1.6.3.ebuild
+++ b/x11-libs/libXaw3d/libXaw3d-1.6.3.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
 
 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 ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="unicode xpm"
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-libs/libXcomposite/Manifest b/x11-libs/libXcomposite/Manifest
index 01cf53476dca..2592aa3f35d2 100644
--- a/x11-libs/libXcomposite/Manifest
+++ b/x11-libs/libXcomposite/Manifest
@@ -1,3 +1,3 @@
 DIST libXcomposite-0.4.5.tar.bz2 316993 BLAKE2B 4dc01b4c3fd85bdaad1ab9d9da0668caa162957056284fe864dacfcad302ddacf32a3ca233efe191592121a42783e04d5844277ef8ede21951e890114120ba22 SHA512 502fd51fd9097bb3ca72174ac5b25b9d3b1ff240d32c4765199df03d89337d94b4ddea49e90b177b370862430089d966ce9c38988337156352cfeae911c2d3d5
-EBUILD libXcomposite-0.4.5.ebuild 604 BLAKE2B eb59cc9969cbde250870484976f797eb55c28fff44af941c777721abb6b91ba97dea4af861b84a39655bb523438859361035f6b59f60af378f51e39a464737dc SHA512 6c5ea8ef06ccbbae69e9310840f980e4a6891db6531cd70beafc6539ae96a99dacbc11e9716f29a7eeb6b10347fa4beff613f3ab50c5e4d781921462e2ddd743
+EBUILD libXcomposite-0.4.5.ebuild 605 BLAKE2B b04b6f9193e866bf9f243161b6d17ad7b5b0f4854062a09313d6a470ae89752b4649eb1d3c11de1cf522e9e85433d6e76de6e181ec2254dcbb0b34cc76fb0956 SHA512 8fc3e5ecff2b632b67c7071d783d5c93b5c1ee64f48ec557cb522670324d5275535531ec8f0eb505857f34867f51cabe13826600fc42a4c193568a540d8f48dc
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXcomposite/libXcomposite-0.4.5.ebuild b/x11-libs/libXcomposite/libXcomposite-0.4.5.ebuild
index af9569a717be..cdb071e55499 100644
--- a/x11-libs/libXcomposite/libXcomposite-0.4.5.ebuild
+++ b/x11-libs/libXcomposite/libXcomposite-0.4.5.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xcomposite library"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-libs/libXcursor/Manifest b/x11-libs/libXcursor/Manifest
index 84d62e14cad1..8d495b8210b6 100644
--- a/x11-libs/libXcursor/Manifest
+++ b/x11-libs/libXcursor/Manifest
@@ -1,3 +1,3 @@
 DIST libXcursor-1.2.0.tar.bz2 334144 BLAKE2B d1dc7f09b88bc570653e615ec5e854b7cd9362a8429e90dc36e1d7efe26fd9c0eb9a38ae8d18a308e1912bb1765e2adbf13f36a265500be2f787d60017091898 SHA512 2b12d0fd17e311ce269dbba58588698885815eb07aa44d48525ed5cd9e5f379bb90138a792a191e2f74888ab10b3ca9a4f507f21de0984ed79748973ab927a03
-EBUILD libXcursor-1.2.0.ebuild 872 BLAKE2B fa0c37fa8f6dc3b642406f10155b3eadd349b9be5cf65ce0f1b37b045aee122973b88cbd2a484ee6c5cdadf2fbec7d800d1ac48090b1394c17afb49a01fa4332 SHA512 7f5b3b04273e39b36645f775b01d57c788da2394b5bbec4536619981d428b79492c429f2d3811094859e15d1a4a0152cfb4aadb5431cd21e7e0891746892f565
+EBUILD libXcursor-1.2.0.ebuild 873 BLAKE2B 7d9eeaa914b86372e15c27874d3da7ec60ccd51f129331caba9f13f78022832d5af29ef7f2c531a20b9659e33793b19c3fbc5e25f1936a10f441da0513e376dd SHA512 2bbc6493ae49ebf7a470679a4b5afd03f5a6ab0989e479faf8be76ade69715bba928d945046b26a2b1aebd354c54d0c78d8e39808b1b463bfd4b1dd5bdcfe760
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXcursor/libXcursor-1.2.0.ebuild b/x11-libs/libXcursor/libXcursor-1.2.0.ebuild
index 55402fb5281d..d37ed6ca7ed4 100644
--- a/x11-libs/libXcursor/libXcursor-1.2.0.ebuild
+++ b/x11-libs/libXcursor/libXcursor-1.2.0.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xcursor library"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc"
 
 RDEPEND=">=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
diff --git a/x11-libs/libXdamage/Manifest b/x11-libs/libXdamage/Manifest
index 1e69d68aedb8..394eb4db883a 100644
--- a/x11-libs/libXdamage/Manifest
+++ b/x11-libs/libXdamage/Manifest
@@ -1,3 +1,3 @@
 DIST libXdamage-1.1.5.tar.bz2 303750 BLAKE2B 78cb593365cc842cbc6fcb4dec94aa28293c385ad7ecfef032117d19e98c7b3f252c53b79559096b1c0b259d24a59220e9af7fb60d55c55f4474a33d117958de SHA512 a3ca6cc33b1727f717a3e2aa5593f660508a81a47918a0aa949e9e8fba105e303fe5071983b48caac92feea0fe6e8e01620805e4d19b41f21f20d837b191c124
-EBUILD libXdamage-1.1.5.ebuild 519 BLAKE2B 6c98e4ab044cb5d7cb9b20fdb1b3eed7bc259e22172f07be6c02840b5b17e924cd713f58c8b866fc95dcd232981abfad8c2df92032d0708bdd72ae6876035bfb SHA512 8e3e8e07f06870eee411ae05754c0a9ad0f1569988f666a8d134dc646210c449c84055f7c58adae35b4ce41b555c8075f21291ecb01af5fdead50ee0c0f3cbd5
+EBUILD libXdamage-1.1.5.ebuild 520 BLAKE2B 1fa575cc69299b92c03a2d4630aa0ae34e59afd7523381340d8da30d382493498133a073350e6645b08f30c9ad3165d8cb3a49a9a062fcaf17c4e35081058b19 SHA512 c101f7f021a4b3e015ecb75f1494b76e4abd80980888750fa658089de29f0d26d2184e82e4aa23ddf489feb371e958b5046644db3a78fa2f62dd6e406141e14f
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXdamage/libXdamage-1.1.5.ebuild b/x11-libs/libXdamage/libXdamage-1.1.5.ebuild
index 3e0d33458472..d7e1a9668cdb 100644
--- a/x11-libs/libXdamage/libXdamage-1.1.5.ebuild
+++ b/x11-libs/libXdamage/libXdamage-1.1.5.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xdamage library"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-libs/libXdmcp/Manifest b/x11-libs/libXdmcp/Manifest
index dd440ca0cdcb..dd7cb6459c74 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 658 BLAKE2B 1e62349003198cdf1e323e403a69f190f4df8cd5e9910c7c7038bf01cb8673a843a0dd135e3d9782ff62eaa714eb6ec4d76a86b8477695e4777c1bbeed56648e SHA512 30dba18764e55b908508e0232be870f581e72e8177fa267938eeadb18461427bb922beff69c2a9a3fed16c692c6b48379760ecfb8dba38520ee913de8a25d152
+EBUILD libXdmcp-1.1.3.ebuild 650 BLAKE2B 9b4bc85a11205f14e1e768f03bfa3ecbc65a55db327027d34d116cadab13c598d4f03a15a8a4926c3da51a07ef5e936a61e4383eaf8762e97ec17316b24f90dc SHA512 d79c61b013d9511b458bbbb823a431014657dd043a0791b8d649c00a65549869da8fa0b16cff5658b6f932a7108b0e7f9ef59b57ed81e78c1c14458ec8987c8a
 MISC metadata.xml 310 BLAKE2B d30b368c138282f71b307e21c101bceac3df72c78519e9a20b124602e84d46d19f18c781e29ed797329122c63459602d56c2be4c5ad62e255e3586865a9a0c99 SHA512 fcfd052b3bd6c53658fea8bf241ca82753c12be1d0850536b02f700d9f9d830304296fee70a3b551ffd0c5d9378e13119c3bb12fd986764c940a644f3ac96656
diff --git a/x11-libs/libXdmcp/libXdmcp-1.1.3.ebuild b/x11-libs/libXdmcp/libXdmcp-1.1.3.ebuild
index 302b18cc16fb..aa70b590bf48 100644
--- a/x11-libs/libXdmcp/libXdmcp-1.1.3.ebuild
+++ b/x11-libs/libXdmcp/libXdmcp-1.1.3.ebuild
@@ -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 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND="elibc_glibc? ( dev-libs/libbsd )"
diff --git a/x11-libs/libXext/Manifest b/x11-libs/libXext/Manifest
index df143a438d9c..7d1c09c93d43 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 642 BLAKE2B f24633d1f54bdddc3b69d7873eb4a04c5f070f410e40aaae0b6f0ae7ceb5c3adc1e08a5f37dd47d172a0213c538848dfe327ba0137a0c899f5dcdfb5db321845 SHA512 8c36fb08c893d8d1e4fea709946a888347b7e7b2bb8f40f0f0c26838e113207f1c002d3f37a5dff8f9ebbf5a807d1c837129b6b811875d6b6fa8fa59f207ecaf
+EBUILD libXext-1.3.4.ebuild 634 BLAKE2B 5c66235abcb64cf785b12d15cb92608d20d301cbed5d91c9fd0cfb14900898a8d9095ae0d35e4beeefcfc796300f9ae0a8770d5560d948e123b685f6cbbb499c SHA512 38b7e458ef799981245e42c07eb50a9fd7a7a1b551bad9b61e7d4cef4e230987580a1466dc68a8febc2884f5766d60beac67de82c909cc56c37e9d4c2d5aed1d
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXext/libXext-1.3.4.ebuild b/x11-libs/libXext/libXext-1.3.4.ebuild
index 7c40d29b2b6a..7cc4afb69f39 100644
--- a/x11-libs/libXext/libXext-1.3.4.ebuild
+++ b/x11-libs/libXext/libXext-1.3.4.ebuild
@@ -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 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND=">=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]"
diff --git a/x11-libs/libXfixes/Manifest b/x11-libs/libXfixes/Manifest
index bbc4295c8704..7efcf0edbffa 100644
--- a/x11-libs/libXfixes/Manifest
+++ b/x11-libs/libXfixes/Manifest
@@ -1,3 +1,3 @@
 DIST libXfixes-5.0.3.tar.bz2 294400 BLAKE2B b9a6ce65bef20c24cd75985d7518ab19d7874419d508f4ca6767fe804adfd0e3baebaab69aa9c201901192b8ff5067f5de8d10362ef5c9b6ec12363553389639 SHA512 72d5ee496e5c0520c95ef6bbb52deff1ee4c29792f11aa17aeb25c8ec5eb992ca502de040c77ad95835d1b1432f315b6cb7a3308b434847c28b9c2c6f9d1ac10
-EBUILD libXfixes-5.0.3-r3.ebuild 503 BLAKE2B b60d3c040fad58077edd408d1a710d97e3c2f28264f4cd75f01f0eda77eb1af203ccc92a033bd63f2832c48bf6c3a0e45d29f1f9a1f119494f2c61746fa5fa79 SHA512 1f5bec3e448f0a0282b72fba3b7c83a221c830ae5542fbdfe64a5d1ac41c6bc5748446ff0276680dc9e782d03de424ff4912968914c693b322813a7c4717ef12
+EBUILD libXfixes-5.0.3-r3.ebuild 504 BLAKE2B a43e72d0da09a4e89c5cbff9e4c0983ad7d8aa08cbe1c0e0ae4c9d9a8130441d611cd2e657291ca103ca9c2ef1b525d8f481e8d9ffb03a7f86220c793b4f0e9e SHA512 4e817dc3d82e2c098351e21fb308b782f55634c82dfab72cb82c736e23a3425a3e49b188bbe245abddd2ce85592754430c124b3b867ba5195f2f9d8779197757
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXfixes/libXfixes-5.0.3-r3.ebuild b/x11-libs/libXfixes/libXfixes-5.0.3-r3.ebuild
index 73fa60b2fe2e..5d95edf5d044 100644
--- a/x11-libs/libXfixes/libXfixes-5.0.3-r3.ebuild
+++ b/x11-libs/libXfixes/libXfixes-5.0.3-r3.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xfixes library"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 
 RDEPEND="
 	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]"
diff --git a/x11-libs/libXfont2/Manifest b/x11-libs/libXfont2/Manifest
index 0db4cb2692f8..dda3bdcfd521 100644
--- a/x11-libs/libXfont2/Manifest
+++ b/x11-libs/libXfont2/Manifest
@@ -1,4 +1,4 @@
 DIST libXfont2-2.0.4.tar.bz2 513167 BLAKE2B 924cf8462a8fc593755080866b63d6cca6e58b5d875f1d25b95271a56d883e983445f72f8950adf1964e0bf10ca5b8bb2ddfe0c56d4395086e460952a5933bd7 SHA512 7cf6c58e520e48e24fc4f05fec760fcbeaaac0cedeed57dded262c855e1515cc34cd033222945a0b016f6857b83009fc2a6946c7d632c2f7bb0060f8e8a8a106
-EBUILD libXfont2-2.0.4.ebuild 795 BLAKE2B 51a911f3f0930d64e598cba48ba4fc1ca0087df6262794690fb0d75bf67c0f99044f48603670700016c6d3cbd48efb61a048d080c422653363922ba2370f59b2 SHA512 a0f9be7a6ade145445d7666e23bb2510d38659fd9bc731d9ed03489fcb74d255076b8eca3571e80cbabb7f513d370b1127b32d1887fb17c303a06ec3384e9f2d
+EBUILD libXfont2-2.0.4.ebuild 796 BLAKE2B 57b0ee8d1e68d997f4d1dd1b0cf1edff1aa7d4a685d66c409c48c7d2c4cdc4828e13719877823f7ebb96690a61ed242c0204d5f525abe645f919d83619f72e73 SHA512 ad58a07f767c19a6e306b3f9957968483fc478cf302173e855b878e28ea406c2892b6671d3bad417a7934031334ae7ab136fcf22f799c470748ee67a9dd1aa6f
 EBUILD libXfont2-9999.ebuild 626 BLAKE2B 2ff0a44a208e81f4ef7d6dd1b60e0c906e7d2e002cc58f9238c76feedbfb5a0eb7398063d6932c02bcde407f3dd2b0dbdf4a1305c8e3ab59715e420cd7884a92 SHA512 74f8f3bb14f814d9ce9f8630eb398bafeda87c28a15f95e6f7c3c1a306dc5ac6352bcaec48743510d102e31a31e983b3f969d94b16be69224cd7bc69a1d123b7
 MISC metadata.xml 475 BLAKE2B 8a544df9e1c34c23726d094b23cb1dc11e643dd6d9467840494a6aeeddd252a9ff41eaaf664879804e52344718f91a6e562ec0a397b2b81b3cb6fc0357f5ea99 SHA512 11c5f77e0ad6453c90b4403b7f336449ca7d72cd0f61bab37f14357710173bda280895736f098674ca0cb48b969bcd5d2a9c166161c1c717a036e09b777f7852
diff --git a/x11-libs/libXfont2/libXfont2-2.0.4.ebuild b/x11-libs/libXfont2/libXfont2-2.0.4.ebuild
index 320cd861f997..bfe5aa004441 100644
--- a/x11-libs/libXfont2/libXfont2-2.0.4.ebuild
+++ b/x11-libs/libXfont2/libXfont2-2.0.4.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xfont library"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 ipv6 truetype"
 
 RDEPEND="sys-libs/zlib
diff --git a/x11-libs/libXft/Manifest b/x11-libs/libXft/Manifest
index 77f5ae2e2638..dcc60b6dc5f1 100644
--- a/x11-libs/libXft/Manifest
+++ b/x11-libs/libXft/Manifest
@@ -1,3 +1,3 @@
 DIST libXft-2.3.3.tar.bz2 353465 BLAKE2B 05a91225d09b5e1800a8272c72f7220d9987e3828591bf73d8307a9c4fca1ce7c4c62b36805f44e385c3a4269ebaafdaed70d3b2006208e860f8e982b53c975f SHA512 28fdaf3baa3b156a4a7fdd6e39c4d8026d7d21eaa9be27c9797c8d329dab691a1bc82ea6042f9d4729a9343d93787536fb7e4b606f722f33cbe608b2e79910e8
-EBUILD libXft-2.3.3.ebuild 714 BLAKE2B c420e5a18ba181017115c82658f4e78e4510281ca8fe0082a84b85de93d9751b6943944bc1fd7c435c8b0d8ae80f475818be9d52f3baab50e43b8e0638aa6dab SHA512 ce17875249abbea81d05096c653e6a833de42e3d8d6d1a2549242a99ec8452aab0cbb085c7c611c5dc645f838fb62adb776a7501e822c1bd45b51963d3772889
+EBUILD libXft-2.3.3.ebuild 715 BLAKE2B e0869251e8b213a9dcd10f451a6099b5cc37581576f21bc5d588071997e480673c2efdf9745b0367c642ea060549d0062081facce0030c2e2f9813cc69131c82 SHA512 b79ba10c411cb043e0e5cb2140a657504d48dfff64218ae9689dca15f15e8a731da2d23dcaa04192e82f8118570094a1c2cf99dc8787bddb042312a4f7e4d26c
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXft/libXft-2.3.3.ebuild b/x11-libs/libXft/libXft-2.3.3.ebuild
index 1a4dcc2745d3..c07b921d30ff 100644
--- a/x11-libs/libXft/libXft-2.3.3.ebuild
+++ b/x11-libs/libXft/libXft-2.3.3.ebuild
@@ -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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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/libXi/Manifest b/x11-libs/libXi/Manifest
index a43505564e02..0dfe7642543e 100644
--- a/x11-libs/libXi/Manifest
+++ b/x11-libs/libXi/Manifest
@@ -1,3 +1,3 @@
 DIST libXi-1.7.10.tar.bz2 484519 BLAKE2B b4a3a090045d65c351d21a65fdf2f3d252e11546a5eaba9bf5f22c837b84ee758fe325eff39b32df55f65ab3d6cdc0d2c7ac7e134fec0983baeb0103d109c810 SHA512 591f0860bf5904897587c4990d6c852f3729a212d1ef390362d41242440e078221877c31db2232d5cc81727fe97f4e194b077f7de917e251e60641bbd06ee218
-EBUILD libXi-1.7.10.ebuild 739 BLAKE2B 35117851dffa7ddc2dc2967e84bcd80db2e46e97e475dc6db3a26220df9e97a3cc9f82d8522664051a7d876af7e53b77dbf903bfeeed6c5ac6ef90051d861a51 SHA512 6e373967c9699162603e32e7ebf0b22d2f3632339d3c0de88a02ac97589e243bc25df72d13f1851a38dab2199ec2c87a205455ab95a0b1104a0a14b1368a3878
+EBUILD libXi-1.7.10.ebuild 740 BLAKE2B dec98c277c341d4a23f3f825c5360b15d87316335b125f6b636e4664d88ecbebb2abb6e5dda14cf70a510bd869ce93001c6cda89962114102c58131b097c2be8 SHA512 96e31ed5f9e08ef2dcf9b6ebd307370c0807bcb3fca42f87a4d610e11a9484b63d83d76b7616d11672bae7ad0af464edd77a0e4a9fb46a0ac8a67108d43304f9
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXi/libXi-1.7.10.ebuild b/x11-libs/libXi/libXi-1.7.10.ebuild
index 4ad624437747..fa83855ce3e9 100644
--- a/x11-libs/libXi/libXi-1.7.10.ebuild
+++ b/x11-libs/libXi/libXi-1.7.10.ebuild
@@ -8,7 +8,7 @@ XORG_MULTILIB=yes
 inherit xorg-3
 
 DESCRIPTION="X.Org Xi library"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-libs/libXinerama/Manifest b/x11-libs/libXinerama/Manifest
index 36b562b5a6f4..53c0c7f1a6f9 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 510 BLAKE2B e13c3143fc8eaafc3eb9f49dd34c862bf0394d349e9e283af0e50556676e895a98b188f0ab57c584fb0524e94d231f0b1c8eed36041ca691e1e8f08b3808d031 SHA512 6c31795afb2ce6a3f97c98b07faca4ffb65bf2658c0761be54d6812ec208c97c79838686c948f96b857996c85a04f09245e168613ecbbbcb442e86420a1d0683
+EBUILD libXinerama-1.1.4-r1.ebuild 511 BLAKE2B 420b70e9264e98b5a47119a85f85cb79283c85578d2e8216359e5e816475b546b55411e9437fd64403a35d08b13a573aa0581b562b19df4d1e32941135c9bb34 SHA512 7319b12c4c34436945979a2718b55c6f8c752593c7cb9242cb46fa1a5991a898961187eba63fa45fd19a809288addaf5c2450133831a4f517d65941044b910cc
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXinerama/libXinerama-1.1.4-r1.ebuild b/x11-libs/libXinerama/libXinerama-1.1.4-r1.ebuild
index f269beaa60ae..523a8c1e45d7 100644
--- a/x11-libs/libXinerama/libXinerama-1.1.4-r1.ebuild
+++ b/x11-libs/libXinerama/libXinerama-1.1.4-r1.ebuild
@@ -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 ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-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 d3a9024c82ec..831cb747f520 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 744 BLAKE2B 506a4a08ac00da898bc1e5e8482b2125f9d4c6e8c9c05f30567f126064739623eb80e32c9bc0cfe83c07f0ef0331000316b999e5eb42fbbaa2c60dbf943419f0 SHA512 af6ebe9a6c23303abd4d5869370315791138c7f9f544951eb084a5c554b653c5770c533f9e846e2cc65dd0ef6272c94d4c8b1d6682b2e9151de2f7583f709894
+EBUILD libXmu-1.1.3.ebuild 736 BLAKE2B 4dc668761127af95a45cdf521ca2ab9e53330eabc4c71d66371a2d74ba55779ea1cacc9aab922887a4579e6f2ef53b5131093cc56629f76c10d2dde0b0d0ae34 SHA512 e4628ad38975e2d00598f34e04b072d26f2d191832df6326be09bdfec29a9e5842ec9290ee039fecdf3dae6fcf46891580d76494d85965cd52e370e9bddbdf0b
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXmu/libXmu-1.1.3.ebuild b/x11-libs/libXmu/libXmu-1.1.3.ebuild
index 55f6d6dc8da0..fdf878d790ae 100644
--- a/x11-libs/libXmu/libXmu-1.1.3.ebuild
+++ b/x11-libs/libXmu/libXmu-1.1.3.ebuild
@@ -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 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 f4130b02c991..72f48c578700 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 622 BLAKE2B bda9281247521282a21b15b4b34ce0ec43cd3bf1f6ce09a794335dfd8d9d5a4fd6e05a91cf7a005a16f849456121800be3427f2707cc2af82e9a4233f81fee11 SHA512 78f86436895533a6ed59449011289ef038bc06ddb47f68460acb968ebad88966c23a105a15bb303b611ee4eed586327b8a6df1497dbb51d42b3733b0b722052c
+EBUILD libXpm-3.5.13.ebuild 614 BLAKE2B 2433309e23601af6d0c5f4558cfaea06532ea89c1499b05e1294095838fe9689c226822ebcb61403af0ab3654b0c15e2bd0455c6e5370e11925d9b2755879cef SHA512 621ac1ee5881932d292950ca60c7e2b0c97ed11e471b35a76a68b424142eb12d43136edc278f60a029f1db00c1b5471cb867d0b5fbffc9eba82d57311a479eec
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXpm/libXpm-3.5.13.ebuild b/x11-libs/libXpm/libXpm-3.5.13.ebuild
index 997e201482b3..ad678cbbd6a8 100644
--- a/x11-libs/libXpm/libXpm-3.5.13.ebuild
+++ b/x11-libs/libXpm/libXpm-3.5.13.ebuild
@@ -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 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
diff --git a/x11-libs/libXpresent/Manifest b/x11-libs/libXpresent/Manifest
index 5c7cd0645dad..61e024a93fe9 100644
--- a/x11-libs/libXpresent/Manifest
+++ b/x11-libs/libXpresent/Manifest
@@ -1,4 +1,4 @@
 AUX libXpresent-1.0.0-add-depends-to-pkgconfig.patch 1021 BLAKE2B c7fd8665f66cffbf33ccbf010d0517c9b697f576fbafd55c57aa2263ca93ad748c8d36c93834323ff9a78b1352b9003ba4b96c3a8b3f4acafae744b7e025bc9c SHA512 fbcbc0a5839a2b1976aad4edf318fa3b47868763d5262ef8537ed6dccf911a2f9fad2b2182a90b4be578eb8850fe29403cbd52cc29ee8f0f09f9c85a7883a9c4
 DIST libXpresent-1.0.0.tar.bz2 263461 BLAKE2B bc35477c5f0d8bb3403c00650f94a6625994e857f249b24d59e434dbac9696bc4403d14fc82a8aa2f27c3c3c818ebb0665612305873f1ad49bb3bb1e08e7de5a SHA512 e88b4ec4fcbc0417a0cbecc0ecd73f8085c496dc6d1a4902b6550750a69a1cb8bb76c436c7941ee3bf3c61ffc85bbd8f8327fca30f14815dbef1cd53bb8db16b
-EBUILD libXpresent-1.0.0-r1.ebuild 595 BLAKE2B f07b32787f0b2ddb30eef61d783f8b031012865a02dc8de8865fbddaf2f7190ce7bb4cb08c58a13d4452534d2ec37d9598b389e17591e3e208559c1e1ff83468 SHA512 a307120df4377370fb70d7b39e4d74c3de0fc59fa62c6f0c628930fd5a7babdaae639cb3576ae101d6ba5becf23962d5e5f03836c2344fa530dd2265383fc9d0
+EBUILD libXpresent-1.0.0-r1.ebuild 596 BLAKE2B d5185fcb088ace6fb3c207a8e39ad54a91305c1e564b2e478c751dc504736d45c7857516c7c4a18b1aaec9709af3ebf0eedf49a46ace838fc7b663ecde82ac1f SHA512 c3809ac8a54c4d23dfa10fdb5e58a51c99f0484f0302d045b85fc06665df4c61a4d3c3689a2bd76486a2b064e5ebe93ed578aaa3c1d9cbab41767e3d80ba1cc8
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXpresent/libXpresent-1.0.0-r1.ebuild b/x11-libs/libXpresent/libXpresent-1.0.0-r1.ebuild
index 36cb42c766e0..d7974d21867d 100644
--- a/x11-libs/libXpresent/libXpresent-1.0.0-r1.ebuild
+++ b/x11-libs/libXpresent/libXpresent-1.0.0-r1.ebuild
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="X Present Extension C Library"
 
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-libs/libXrandr/Manifest b/x11-libs/libXrandr/Manifest
index a13f06c34e55..51980bf076a0 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 596 BLAKE2B dbac6d5da9fcf829c72fd4f2394c59f8a8a11d2dc0b6e81f0033d1e7197e528b787ae5df75b4a1ed79bf1e666ece98da3d89090c90911d8e563582bdf7cd650b SHA512 576f78bca352c6e0d91c3a76acd65c3ed43890d3dcc777d575731e05eed2363f667c083dc9102ae1dc7f77853d15686c6d6f1d7f590d60557a4011f7cb5f0fae
+EBUILD libXrandr-1.5.2.ebuild 597 BLAKE2B 7fd4cd456cd930b8d74d4f3751b11eb7529030eec6a9104c01e50645ad01e4fba10574f6cc2113139fcb8211635be5e024abaa1070c43e375a8d9c5bb16c0990 SHA512 44517f0b09b12285ca806d5a23362bf323bbc43bea02f666c00ce87960a7cb3e9c1766723411bbb00d39d87d08a49cd28ac5f08b14b0185dd5facf2e8d7fb27a
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXrandr/libXrandr-1.5.2.ebuild b/x11-libs/libXrandr/libXrandr-1.5.2.ebuild
index 4e0369b30d0d..e902b3f98220 100644
--- a/x11-libs/libXrandr/libXrandr-1.5.2.ebuild
+++ b/x11-libs/libXrandr/libXrandr-1.5.2.ebuild
@@ -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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 312fc050bab1..cc3d5dc8662f 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 489 BLAKE2B 58e262e56b3dcbc075f242e14c46ba090ef6be164d8514bcf8cb82ad03c575ba6c957ec1bc8b745c9b3060f1c428114072b9cd92a36800f47bb3bc34d89173d9 SHA512 d09e29100988516556a6882d518bb9320d7a438882a67c7008136e4ab392c38d23b16b2627ac6b1277cd7b8ee51dbbacd2c99dbc773fd8175cb70e3565f76cd1
+EBUILD libXrender-0.9.10-r2.ebuild 490 BLAKE2B 928582ed9f261202a8e4df9a3167c5534a0c3b58d838ce8cd4cf059dbfb764ac368e6c2d88bcb9b26a30fe8967e72c072326f884167a958c6d863a68ef346b0f SHA512 bc7c5269ac983d8022a93eea39c48d5ee187eb5beff088c71bd33e97735fb7bbdcd562d012b7ca3ba6d5d209c75f77510f1248456e7a96a3826af87d1d69975b
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXrender/libXrender-0.9.10-r2.ebuild b/x11-libs/libXrender/libXrender-0.9.10-r2.ebuild
index 3b5d25a68b10..582fb91d9638 100644
--- a/x11-libs/libXrender/libXrender-0.9.10-r2.ebuild
+++ b/x11-libs/libXrender/libXrender-0.9.10-r2.ebuild
@@ -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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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/libXres/Manifest b/x11-libs/libXres/Manifest
index 305d2b733dc6..9f288d906a95 100644
--- a/x11-libs/libXres/Manifest
+++ b/x11-libs/libXres/Manifest
@@ -1,3 +1,3 @@
 DIST libXres-1.2.0.tar.bz2 286635 BLAKE2B 0c0813118c7ecd5851b075a4001e0e34fa3df92bd8367717eee42ec20352cab3443d232715c1d40c5df313f6508d2dddc779980d11744a1f897cc7511bfdfdf4 SHA512 8eb5a36b1f030eb4e27e676cc4befcc073da66a7bce2b39089314e1facb629d13b087bb53ca2c95fe5291857da7ff9f80c6ab28fb3e245eeb9e0344937900172
-EBUILD libXres-1.2.0-r1.ebuild 426 BLAKE2B 61ca780e6e20a95b286094ad71d4c7d0502390dbe0899803d4364be2b25e7d55ebf80899ee6ba3737e04880dc8cc67070fdf7f900bddf9b017ca76fe8d9024a1 SHA512 81c161ca95a065c44d4121b8d7492779c19413c3e501a3acde4101b0c0a48e10ffd72bb581b6eb0fea9b2da08635aec12e5d82a7ac3c0bafc400b12ffc0000b1
+EBUILD libXres-1.2.0-r1.ebuild 427 BLAKE2B ca827d93720459237c2a096d00bc8db1cdfe6c27e31a714edf35f13f9d7632e42d5ee9563184e510201eaabe0664197a4c054dc73b1f6450457fbeef7960a961 SHA512 0c75a8085afbd6ef50cbefca231029893cc1bf3a290b31ee1e2103f39c80385bef7fc2827b5276d83b168ba2c6104c562f5ae05bfdec5fdfe368efae14273efa
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXres/libXres-1.2.0-r1.ebuild b/x11-libs/libXres/libXres-1.2.0-r1.ebuild
index 6e1ef72d6999..4743a654c4f1 100644
--- a/x11-libs/libXres/libXres-1.2.0-r1.ebuild
+++ b/x11-libs/libXres/libXres-1.2.0-r1.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org XRes library"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libXt/Manifest b/x11-libs/libXt/Manifest
index 3ee3da203aac..e763413d44a1 100644
--- a/x11-libs/libXt/Manifest
+++ b/x11-libs/libXt/Manifest
@@ -1,3 +1,3 @@
 DIST libXt-1.2.0.tar.bz2 810521 BLAKE2B dc60b8fb126f465122eec4df287d5a0d12e483457ba20abbd04a17a8a5fb8a1073d8765236b8020353ec3c5f472b1580ba7a99d6896ce5fcdabaed5f4fbc6753 SHA512 06248508b6fe5dfba8ceb4518475f656162351d78136eeb5d65086d680dabe9aca7bba3c94347f9c13ef03f82dab3ac19d0952ee610bc8c51c14cee7cf65f0b1
-EBUILD libXt-1.2.0.ebuild 861 BLAKE2B 1bcdeba9ad48b674d51b0d18db71b128c1bdc00eb51c384a24c4209f92f3fe1475280c244f4d2c507edd30573aee087fd6976d7a047bc10f09a2c2331ef6ff41 SHA512 47f10b8a43f46faf06e8d3ec407064e73c7491ff66fef6c8c0f6716264e253d349d5d13bd8a4344fb353cf9e412ccb8d0a803b348a1a16fb92d4a6fb1274bcb3
+EBUILD libXt-1.2.0.ebuild 853 BLAKE2B c211f83b23adb7307f018f332552bcfaf29276b35f394d85b01d4aa86b269df5eb63bab0f976cb45022d127ac1a86eed757e0c8278d5e843795d3d9347deb3fc SHA512 94456d88b530dab94255abb3684d108d3f671f3f32814a9b30557149440ecac8bf52f66be61382d7daeaa54b43b7d75531f0f875ec2e311fb2c00dae68566faa
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXt/libXt-1.2.0.ebuild b/x11-libs/libXt/libXt-1.2.0.ebuild
index d4f09d4ef89c..a4d5e7a9d83f 100644
--- a/x11-libs/libXt/libXt-1.2.0.ebuild
+++ b/x11-libs/libXt/libXt-1.2.0.ebuild
@@ -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 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/x11-libs/libXtst/Manifest b/x11-libs/libXtst/Manifest
index 2cead79a1d4c..70860a5017bb 100644
--- a/x11-libs/libXtst/Manifest
+++ b/x11-libs/libXtst/Manifest
@@ -1,4 +1,3 @@
 DIST libXtst-1.2.3.tar.bz2 321819 BLAKE2B 92a75d6ea9000fa7736093ce479d275c57a4a5bf849df2d6afae9478a53a07ba395013ba6676c2ea7dcb6a1f34475967ed6508b7c304b887f83ec44a611b8e6c SHA512 6f6741fd3596775eaa056465319f78c29c91b3893a851a4899df651a2023a4d762497b112a33d7d3e8865fe85d173d03e4b49daef76a66af1ae1eaab82a12765
-EBUILD libXtst-1.2.3-r1.ebuild 632 BLAKE2B 33f69bdcdbf010adc1069371f43524f89171d133b1aa8990c3405933aab707ebee6a741fd34ab416bcbeb5dcf443fe688cbf63308fef10228b236f0bbd89d11e SHA512 070db687b4d5f18229bf030bdc2de3c0d1dae482749605a7153d22ddcac0706851c337afcf4af0068ec78e28439eec2e0e7bdc4f08cd43301c42207496b5d613
 EBUILD libXtst-1.2.3-r2.ebuild 630 BLAKE2B 02d7e04ba0111f35b6c2425a2053716354e16cb2d963a8cbe34c51c65f61fd596d3a0ed6b28de6ce60012db2f91a3e7d67bfd36d750b98159f4a65fef29d8521 SHA512 18aab4a650681b29413fe2c54083d8e2f0f757d3df9de37a6c46afffc566065b42f5eab87275eb67379ac74fc25a79fb62966d80f72b7b729d44329e9342bc47
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXtst/libXtst-1.2.3-r1.ebuild b/x11-libs/libXtst/libXtst-1.2.3-r1.ebuild
deleted file mode 100644
index 358c3155ac7d..000000000000
--- a/x11-libs/libXtst/libXtst-1.2.3-r1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_DOC="doc"
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org Xlib-based client API for the XTEST & RECORD extensions library"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE=""
-
-RDEPEND="x11-base/xorg-proto
-	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXv/Manifest b/x11-libs/libXv/Manifest
index 0c24ef940552..e41e10e804ea 100644
--- a/x11-libs/libXv/Manifest
+++ b/x11-libs/libXv/Manifest
@@ -1,3 +1,3 @@
 DIST libXv-1.0.11.tar.bz2 317921 BLAKE2B 3c656e1f5cd02c936813b3e10a359d23e7a8643a45ade42ddd584084ba04d09cafbefcc68ab9356b78c1a716a050637062e956c7f50a03a522d28ff7aa31c3b0 SHA512 97cb3ab06cedc87799d06e1affd5cee32ed0e551903fa5c915f79e7ed92eded867e3220b4a663822f7ebd86fdc71b09943b7077d98f1200019992e8d24144e58
-EBUILD libXv-1.0.11-r2.ebuild 511 BLAKE2B 72874de3910af589ec030704cb794a4fe5c132384c38448cdd1143e16e52144ab9f0e9deb9e5063a37b4e7a262503f27ed3cfc2370a9daed926d047f95ede096 SHA512 239125d8ae8d80b70a4ed624419de61432f6019934214705b90deafd0181ff3f8ab0e36149b76bac546048f467d36cceb541c3897c659eeafe37edb257f302c7
+EBUILD libXv-1.0.11-r2.ebuild 503 BLAKE2B ff3e1d627ef2b61116ced19f9edd3270642a6f2bcb65a1a322a5d17c484a349fbfa7b5615e53835b33ef37498096d79bb24f70597fc2798ea9e34c9b3ea92072 SHA512 1bd8357e6b198be87c509ff5bdccb7cafb9fc1c35c353ae02e609d38633cb3e6a9555b28f03c083a855943a63159a6269bacac9b0d1a70a15d4b521e169a6baf
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXv/libXv-1.0.11-r2.ebuild b/x11-libs/libXv/libXv-1.0.11-r2.ebuild
index 8d0d00a4fecb..abad96471894 100644
--- a/x11-libs/libXv/libXv-1.0.11-r2.ebuild
+++ b/x11-libs/libXv/libXv-1.0.11-r2.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xv library"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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/libXvMC/Manifest b/x11-libs/libXvMC/Manifest
index 3508a33d4729..e05adafe4997 100644
--- a/x11-libs/libXvMC/Manifest
+++ b/x11-libs/libXvMC/Manifest
@@ -1,3 +1,3 @@
 DIST libXvMC-1.0.12.tar.bz2 306581 BLAKE2B 180867489863f45ee2cbeb259ae07cead3cef595652f6c02fcb5ffeadb8c286f4dc6fc8ef4b7df0c30b95ef51d8626798a76b50165689927c3449157fbe1a552 SHA512 62cb9a72b20af3b081d2d555a253b0e2b8b26b31f4fad10bd3e53bbf96e1663b61bd8df2b78b16f18218cd37cce0c9e6809ae16ded226b37a8b199e41b223955
-EBUILD libXvMC-1.0.12.ebuild 575 BLAKE2B d8a8b393a0ec0d826de6d13f52ed14060ff089c09c29b0e1f201da26972864f11b0959c580f8677ea5032e2cf0b2f4ea66bb2377b8cf8e26610f662eefaf7b8e SHA512 85b9bd3240d61fbb2114acbf7e23f4ea8e807d7e016852ddf883f9b9e1a73cccd6a310edb1b26372bebc7ae39647aa2c5a778d126ea99304ebc0183dbada3386
+EBUILD libXvMC-1.0.12.ebuild 576 BLAKE2B 7ae3c4f0c072c5f7b78fe54b4e30b77a713b6addf7e590a33a104d8d38df51dddb904a03d73fc759ba2c639f4bdef82bb2429cd8811be12d19360522061c2f8c SHA512 c4105723af334c5f73d25db6417c4a2b7c4ab0a6aefdf6d0ac99764a5207ac929525045e65270de653eb38cd8aaa520bc8c1fa4742e5809cea496160c9bc791f
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXvMC/libXvMC-1.0.12.ebuild b/x11-libs/libXvMC/libXvMC-1.0.12.ebuild
index 406053459516..2ae1d36c514b 100644
--- a/x11-libs/libXvMC/libXvMC-1.0.12.ebuild
+++ b/x11-libs/libXvMC/libXvMC-1.0.12.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org XvMC library"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-libs/libXxf86dga/Manifest b/x11-libs/libXxf86dga/Manifest
index ee4d39a79202..6fddcc2ec42c 100644
--- a/x11-libs/libXxf86dga/Manifest
+++ b/x11-libs/libXxf86dga/Manifest
@@ -1,3 +1,3 @@
 DIST libXxf86dga-1.1.5.tar.bz2 301685 BLAKE2B 8c70299e52cd2f34b4dbfa0d56707df20f7b368ab92321cf9e8c0fe15402a3b4e1b8eb62d0e53fd3321e95521bb4f35479493e412710a74779ac98ffaef966bd SHA512 0e77c4003aeba737b10c17d55aeefa935fc57c4ba9e8f79a834f3f8c690d6a1d98f69ad707eded784346c1cf40c41829719d257283b5eae3207147fb4c79ed89
-EBUILD libXxf86dga-1.1.5.ebuild 478 BLAKE2B c4a987b174c0ca4a98d6640196ec5bd5901ff452ddde1538ce9649315bb88631853ae79ce8ee25ceeb901103f415675f46ebfddb3bbe0bf9ff96d718b306646d SHA512 7c3d41f626214696e7ac66887aa3f83aa4d1c89aadc808e13bfccf72b527cbe04564a1bb5710f5fece37e3b76c7bc06bac079f8e45de75e7b54ade6e6f5107ee
+EBUILD libXxf86dga-1.1.5.ebuild 479 BLAKE2B 0fee8e177af401205c648a14bc0e08973ec19a7da7a067d13fcbf0f6e2a9c0e71f8f32f6d347627ac142a7854e3bf61424ff61093d5c1ef670953486663f7175 SHA512 2005d99d1abcea5a3a9db6d7c479e60f53dfff1b30fe36f8eb65d5f2cee843219d4bc3c2d356ab59f9f9e360a0727e3e090017a2a21f6244e9d5d1b3779b00f0
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXxf86dga/libXxf86dga-1.1.5.ebuild b/x11-libs/libXxf86dga/libXxf86dga-1.1.5.ebuild
index 2b6893fd7043..2d219bf2ae3d 100644
--- a/x11-libs/libXxf86dga/libXxf86dga-1.1.5.ebuild
+++ b/x11-libs/libXxf86dga/libXxf86dga-1.1.5.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xxf86dga library"
 
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 IUSE="doc"
 
 RDEPEND="
diff --git a/x11-libs/libXxf86vm/Manifest b/x11-libs/libXxf86vm/Manifest
index 176c78da8a47..f0fc095c46a0 100644
--- a/x11-libs/libXxf86vm/Manifest
+++ b/x11-libs/libXxf86vm/Manifest
@@ -1,3 +1,3 @@
 DIST libXxf86vm-1.1.4.tar.bz2 295346 BLAKE2B 22698db5beb0ac06663e9163e13f8afd99597afc6dbc9f9d4fb232682df6b41a155d63fc1beb58da3d83bd0e420872c457671696246dbf39a6451454a6e24b9e SHA512 c5f92d86e143db02ebb36bcd25618acaa2cb2831f5a23800a06dd431cd73b6702d95de8fe7407ce626336bf614c288d5256f4d87ea7781fad2ab6c517cbf09e0
-EBUILD libXxf86vm-1.1.4-r2.ebuild 529 BLAKE2B 30ac50d152483d8ee504000003c13d2634ace165dd11b41ef683b392655e80ec5867c38d82a89d468b73c45cb81574bddba697b70e6e116dfc6dcdd76c8b4084 SHA512 ce83c4ddc667f57205e4e765eb3939b313263597de0bc1ce81b079dd4ae4282d0464c206170a9f641c6979230110a5b51e7bd17bd1023a7f5fc1c53d21d973d5
+EBUILD libXxf86vm-1.1.4-r2.ebuild 521 BLAKE2B 622559afe89f9699f1813524f5490ccd1954050e8c3cfceb32771680c39e9936d4a2aafe3f88a9a39514cd7d7f82d8dbfad9d53ea7b6047cb005bed468d5bd16 SHA512 c3b4e3af2c23e4df298386083b095cd8a343407e6b08eeb87043884f3a234d445624b06955d7c453cd408cb3de3ab0d37a8f473af7460c361eaba36a78932882
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXxf86vm/libXxf86vm-1.1.4-r2.ebuild b/x11-libs/libXxf86vm/libXxf86vm-1.1.4-r2.ebuild
index ec322bfeacae..153b50828b25 100644
--- a/x11-libs/libXxf86vm/libXxf86vm-1.1.4-r2.ebuild
+++ b/x11-libs/libXxf86vm/libXxf86vm-1.1.4-r2.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xxf86vm library"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-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/libdmx/Manifest b/x11-libs/libdmx/Manifest
index c0b04f1fba23..08190f8ac09d 100644
--- a/x11-libs/libdmx/Manifest
+++ b/x11-libs/libdmx/Manifest
@@ -1,3 +1,3 @@
 DIST libdmx-1.1.4.tar.bz2 316517 BLAKE2B bede1dcf554fba15257277419c1a458125ab962365a4ae679b22a98d6a1e31584087fe09fc1a2e5a7e9b212c0fd332438cdf5c56c8a9d32b6ea755091026b6b0 SHA512 77aba6cadfd17db0cc7e1bc26f14d908223a0fdb135d46f86c3be34e3bc7e2f843f08d4d0ef773357e83b17122bffe56a0442d12908378c05a22177b10ae10e9
-EBUILD libdmx-1.1.4.ebuild 337 BLAKE2B 36e071f95e48b09c16391ebf99d5ffc5d819497ea3cc39e0498c5be4a1a5ef2278a44b14399ce0270cd0b05348aaa234415c491c0fa0ca27c73ea73597e4876e SHA512 973637062807e5fdef143ab5ecb5e3183505bcc72868f7b628eb040ad4655a206f3b289b45e1cc471d58ac4c299af108a88200080884d8cd0a9c44ef0209d385
+EBUILD libdmx-1.1.4.ebuild 338 BLAKE2B e2c39fd4bf3f59e2444684e4f2182f620ba677dd9119a260bbb3cee86a1bca56efa880653a75bb85ce5537ed5670c412579d02bd6e3a56a50db9f836de3d34aa SHA512 4dfb235121b6b877ad7cf29ca2a865717568a0cdbc969c54fadc4e47bc14a24b2801f6864f8273db6758fe116a18e5ed9da063110eaa4fb458f94500b810ff3c
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libdmx/libdmx-1.1.4.ebuild b/x11-libs/libdmx/libdmx-1.1.4.ebuild
index a8de25f97155..5cae09487b70 100644
--- a/x11-libs/libdmx/libdmx-1.1.4.ebuild
+++ b/x11-libs/libdmx/libdmx-1.1.4.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 inherit xorg-2
 
 DESCRIPTION="X.Org dmx library"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
 IUSE=""
 
 RDEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest
index f0c7156947eb..2e5580527818 100644
--- a/x11-libs/libdrm/Manifest
+++ b/x11-libs/libdrm/Manifest
@@ -1,6 +1,4 @@
-DIST libdrm-2.4.102.tar.xz 408844 BLAKE2B f3a5ddb96130d175e860984412949713cd30145a3a9e453f666b650ec9b7eedb1c8e230aa7c5769331a330d833fdeba3da28b339150d81c17716a96935267178 SHA512 386afd228efd809fe32776a6ff5d9dd95d1409a6a6a89b3806a3b42ed27e84f1e090f3b7834973f834d6b0d1342b7034447fe8690d072f85f03292d7795c3e0c
 DIST libdrm-2.4.103.tar.xz 412796 BLAKE2B 64904bebb923d79b83fbe1949aa24c697cff2a258f415c4633991f938772980e985df19f44df881d10b14268ea414ff99220c8f003ad09ac1decdc6c85249240 SHA512 15b098b962008271400692b6b15ecb7e22676f8698e0220ad969735ac2315ccc737d19558afb6abda82bae15117e5f306c048184a2369f434b85ecaa670ca885
-EBUILD libdrm-2.4.102.ebuild 1980 BLAKE2B 521ae5ff9a2b781e3fc22f089e4276a0f739bfae842e4379e3f332bdff0f6d0ff0a2bfe52d6346f3f4c6a81586878c2acd574441ca1cc43bab5db46353bde3ce SHA512 37b69924e37465600c6f48455646c3ca8fae6d0563581a0316e534a0671280c989b37fd9bd1b3d64c80f7655d21d68ed5a9b93f684dbdadca1d11deecb16ab64
 EBUILD libdrm-2.4.103.ebuild 1988 BLAKE2B 29c991df7e6d39b70b48b4e6056d944f12f630ab320d788b3e9560cf6e3b5e99b55c8aa100c475149b697a07e42a0fa27c22fa264f8aca5579e24b8c7792d79d SHA512 1247f74f71ed34d8b1cc7f5a1199e4d6f0bf0dfcf387db636c0ca2c0e179dc1e8ac757379bc584f4f489e559e73a92aa26391f38c58a6bd3d21b399be5b53982
 EBUILD libdrm-9999.ebuild 1995 BLAKE2B 48cca4911319a37b520a953c67935dfb49103445b91726876f3391434697aa5526628579b9abfc38c93953f99a08bd8d62136dd1fb9066f670b9576680b9171b SHA512 0f3db3dd331867ad523ba4f783fed48ebc57b48eb9198164573c830ca5cb07d4b1d9f826f7ab526254ecd4a2d9a8f537dec637880bb39197fc96db5ed48b2474
 MISC metadata.xml 406 BLAKE2B 2a08dbfc07e8d6ee0f61373821fe6b369130b98d30786ff4559dfd57a9a5189a4d2e0f9faae2ba19cffe023460433a4874d30aa26913ec3ff7263efb10ab0850 SHA512 703594ef462bb5b76a61d53268c043ad5f9b0febc907e48236f425ad047d931ae7fcc0a433d8b30acd8b6f0582eb0263586010bd95a17c4c383e7d703166b9da
diff --git a/x11-libs/libdrm/libdrm-2.4.102.ebuild b/x11-libs/libdrm/libdrm-2.4.102.ebuild
deleted file mode 100644
index d20191fc0514..000000000000
--- a/x11-libs/libdrm/libdrm-2.4.102.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/drm.git"
-
-if [[ ${PV} = 9999* ]]; then
-	GIT_ECLASS="git-r3"
-fi
-
-inherit ${GIT_ECLASS} meson multilib-minimal
-
-DESCRIPTION="X.Org libdrm library"
-HOMEPAGE="https://dri.freedesktop.org/ https://gitlab.freedesktop.org/mesa/drm"
-if [[ ${PV} = 9999* ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS} libkms valgrind"
-RESTRICT="test" # see bug #236845
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="
-	video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	valgrind? ( dev-util/valgrind )"
-
-multilib_src_configure() {
-	local emesonargs=(
-		# Udev is only used by tests now.
-		-Dudev=false
-		-Dcairo-tests=false
-		-Damdgpu=$(usex video_cards_amdgpu true false)
-		-Dexynos=$(usex video_cards_exynos true false)
-		-Dfreedreno=$(usex video_cards_freedreno true false)
-		-Dintel=$(usex video_cards_intel true false)
-		-Dnouveau=$(usex video_cards_nouveau true false)
-		-Domap=$(usex video_cards_omap true false)
-		-Dradeon=$(usex video_cards_radeon true false)
-		-Dtegra=$(usex video_cards_tegra true false)
-		-Dvc4=$(usex video_cards_vc4 true false)
-		-Detnaviv=$(usex video_cards_vivante true false)
-		-Dvmwgfx=$(usex video_cards_vmware true false)
-		-Dlibkms=$(usex libkms true false)
-		# valgrind installs its .pc file to the pkgconfig for the primary arch
-		-Dvalgrind=$(usex valgrind auto false)
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_test() {
-	meson_src_test
-}
-
-multilib_src_install() {
-	meson_src_install
-}
diff --git a/x11-libs/libpciaccess/Manifest b/x11-libs/libpciaccess/Manifest
index 8dc96b3b4c18..74dc1f0dbebc 100644
--- a/x11-libs/libpciaccess/Manifest
+++ b/x11-libs/libpciaccess/Manifest
@@ -1,3 +1,3 @@
 DIST libpciaccess-0.16.tar.bz2 366603 BLAKE2B aab7d49887f7f21e0a6abf1e2aedc50159a47c7aef67eb8605a30e246463a14f9a9993db9cbd2705ef59c93d1ff41080668f8f3723557a927ab4d1edb5dfa4ad SHA512 2f250048a270dfc0823d4bdd613aa272c58a80eaafd922850f56c4b6f7a45a263ed4cf521b52b49f04484ea44ebefb7407d079aa058318a5751ffb181e38fed1
-EBUILD libpciaccess-0.16.ebuild 790 BLAKE2B f438ebf464939a8e287539e9e6e17170b2787898848751d4e010a4b70d8ceb7854e2353a2d0641d7d9a86fa00afae6616321678dc9187f4253d4393d7ccc8511 SHA512 5fa2feeda0b9f742007e92878345eabcd45e7c1ec7742e82812b6fb4c248c2d00b37ae4db86e7ed7ba095ffd2b576050d19a6dad7cb03e55483b0b6334fbb41d
+EBUILD libpciaccess-0.16.ebuild 791 BLAKE2B 70e3b559f3a6ac0e0f7e975836bca1d29cdfe73437fde0125e02bfc116994a9eb34ee30fa1428241782581be579d26fb32b3254fb3dcc4507954b9be3f32d64f SHA512 018b2f13efcd82aea8751b7b844101323d3370c0a38f03bec15c87073add90e6ec4d7fa13eff7e33659717500722ab8a1d883cf8770ace970ecc823b1e2da700
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libpciaccess/libpciaccess-0.16.ebuild b/x11-libs/libpciaccess/libpciaccess-0.16.ebuild
index b91e544324ba..26d6ad0aa673 100644
--- a/x11-libs/libpciaccess/libpciaccess-0.16.ebuild
+++ b/x11-libs/libpciaccess/libpciaccess-0.16.ebuild
@@ -7,7 +7,7 @@ XORG_MULTILIB=yes
 inherit xorg-3
 
 DESCRIPTION="Library providing generic access to the PCI bus and devices"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="zlib"
 
 DEPEND="
diff --git a/x11-libs/libxcb/Manifest b/x11-libs/libxcb/Manifest
index 8242fa584084..2a1243b2cf3d 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 1440 BLAKE2B 83ca73659370a10b18b65634a0ca62b4145b9b49f4570aa3efbb3c570f9080d5362f82833306b1befc28c6990770b822c29fc32415aae07e9869e18fa7a1ee6c SHA512 edce93902c23b1a55efa1be452e3e3716b338283176ef1c6572d5d6868ab41707e01d82bf2add11d7238d4216526fb8bc877ffc9fbd915f915ebdedb4155bd36
+EBUILD libxcb-1.14.ebuild 1441 BLAKE2B 6c882c403c3eb25164cf4f4efc637e12050e6da303a3fd16db97ece6d40e6507a7b7d0bf426c69d6f581f94fbd77af4df236b8b62e06fa0085dec08f834fed25 SHA512 c0dfca5a644442cd585e06c2a919bccb354bac19d0f0f2d0cb17338ef148be43c0a8e1f2b512a3044d2d8148a6934a9131e159b46e6b1bf53b6d4317b97b8fab
 MISC metadata.xml 400 BLAKE2B e4de0bffe9b79f7c4a715ade0014f14d85ae7389a3fa523572b4abed6ed6849250902ea479e9aa90745f104c9020d671742d0aec8bffa539e20f0bd7b48f2e64 SHA512 f9688e8ee148768a072e6da7f72985a7a3971a445117bbfa8448f2337ce1b601296501eda1da531c6bcb50a0d3106376e8cda0b98ef10219882c2f66fe02f40f
diff --git a/x11-libs/libxcb/libxcb-1.14.ebuild b/x11-libs/libxcb/libxcb-1.14.ebuild
index 2c7edd1d000c..652a1da6fe8c 100644
--- a/x11-libs/libxcb/libxcb-1.14.ebuild
+++ b/x11-libs/libxcb/libxcb-1.14.ebuild
@@ -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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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/libxkbcommon/Manifest b/x11-libs/libxkbcommon/Manifest
index ed3fcef0e6c5..d9655f6fd1f4 100644
--- a/x11-libs/libxkbcommon/Manifest
+++ b/x11-libs/libxkbcommon/Manifest
@@ -1,7 +1,3 @@
-DIST libxkbcommon-0.10.0.tar.xz 383788 BLAKE2B 0e2cc110c35a4d07cfd55a46a4cc30038bc296f74522beb97b72d0318799adb76fa514427640f286254de7aa59fb8b8c26de5d8fd52f7e09c5ba3521febb97bd SHA512 58c523b42a8ea0cae7322d453fbc5d4624374221246cb067074e2ff9820eef3ceea8686283136432cdf0842acfc0858c7b2d3954de234b6501092ae1d27c9e79
-DIST libxkbcommon-1.0.1.tar.xz 432692 BLAKE2B 151e9c2260b517e7e646defea8dfa1891af87aaeeebbf52d41d8e6b52c2c1d5079ca55da9e998300145c83718ce981be13c3fa35d8825bcde7846dcd330e9dfd SHA512 929be7b52fae360a696f01e0a8f3aa9b585ad99db975a88680ababf623e46f4d98e6f7590a2859c24060856f45b27e7249072702fbbf5a7bd0d4a10791e6d489
 DIST libxkbcommon-1.0.3.tar.xz 432944 BLAKE2B 49dcefcc17cbbfe5623728e9852e700a623e07ad7e6df78c8d7c39784948eb230f9e141d8aaa1de94305cb552244fe54d384abbc8e57f5ec5846915b5ae484e3 SHA512 b05a2db0acd6628427baad1967979a161019dec90a078a926d41f4dfeffb84eab63e627803df1a401e42c8e48953d6c434ce08d7206eae21e890890f29b03d3c
-EBUILD libxkbcommon-0.10.0-r1.ebuild 1284 BLAKE2B d43d05a9366fe8a92d62f714a532d5f2b372443971c0a5f496387faecbfd91ab83841372977f4de853e0ac569545c2deab9828f4dccca580ca0539c406bc884c SHA512 fd009357bf396f4f9bdbcc86febef8536a84095a880bdd5d5dc135e59981113db959d909edd6340e5c6908163e939ae032307228f76219d7972b577f209e6224
-EBUILD libxkbcommon-1.0.1-r1.ebuild 1340 BLAKE2B 0904793785573e6738660848fb95c5d03d1f7fbab2aa0f5f173f0bd2c4b5da8605c649ee03cc5efe284450e4d0ea570c02bdc0f9789c9314a7c119cf82d54fdc SHA512 387d5c0a66382d5466aaaacead83ca12e7394881d1c77d7dd56e1faa950fcba5d4eb1cc32c229a8977153cba53fc4264d6b032f37ee0dd262ec2b592cdb5bfd8
 EBUILD libxkbcommon-1.0.3.ebuild 1432 BLAKE2B 5514381f7eb6cc03053fb2544516395fc6c67a59d7e1c6fe7348167c6ebc719428aa28e6e5b37181fdb49cdf4f36167df8847f41ddc484f2c76a9f44eb0ffbd8 SHA512 44dd4acfa62d35cf1a0a8f0cf39c56872c4c589ef6a0c67d7b4e7bc09e0c77241f6cd8bf68632c864993feddc3fa72d5be7096992316956f115609795a3f8eca
 MISC metadata.xml 325 BLAKE2B db764fac0ca1f4359bcd129dc165f78592535dee40bc25b6f2d7c662bdce43e01cc66b362765607665a75fc5b1703de204cf90eecae4f8d285cfaefcebc614b8 SHA512 ca2a116a574783f7b3c6191759c902e2cb059ec135456cef989b81be07fecc48f9ff56e02845d18c2376c99be3dd9711f39ad91394e421fa36d8fd6453c0a121
diff --git a/x11-libs/libxkbcommon/libxkbcommon-0.10.0-r1.ebuild b/x11-libs/libxkbcommon/libxkbcommon-0.10.0-r1.ebuild
deleted file mode 100644
index f98d9ab2f2a3..000000000000
--- a/x11-libs/libxkbcommon/libxkbcommon-0.10.0-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} = *9999* ]]; then
-	GIT_ECLASS="git-r3"
-	EGIT_REPO_URI="https://github.com/xkbcommon/${PN}"
-else
-	SRC_URI="https://xkbcommon.org/download/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-fi
-
-inherit meson multilib-minimal ${GIT_ECLASS}
-
-DESCRIPTION="keymap handling library for toolkits and window systems"
-HOMEPAGE="https://xkbcommon.org/ https://github.com/xkbcommon/libxkbcommon/"
-LICENSE="MIT"
-IUSE="X doc static-libs test"
-RESTRICT="!test? ( test )"
-SLOT="0"
-
-BDEPEND="
-	sys-devel/bison
-	doc? ( app-doc/doxygen )"
-RDEPEND="X? ( >=x11-libs/libxcb-1.10:=[${MULTILIB_USEDEP},xkb] )"
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )"
-
-src_unpack() {
-	default
-	[[ $PV = 9999* ]] && git-r3_src_unpack
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Ddefault_library="$(usex static-libs both shared)"
-		-Dxkb-config-root="${EPREFIX}/usr/share/X11/xkb"
-		-Denable-wayland=false # Demo applications
-		$(meson_use X enable-x11)
-		$(meson_use doc enable-docs)
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_test() {
-	meson_src_test
-}
-
-multilib_src_install() {
-	meson_src_install
-}
diff --git a/x11-libs/libxkbcommon/libxkbcommon-1.0.1-r1.ebuild b/x11-libs/libxkbcommon/libxkbcommon-1.0.1-r1.ebuild
deleted file mode 100644
index 4c225689f6c8..000000000000
--- a/x11-libs/libxkbcommon/libxkbcommon-1.0.1-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} = *9999* ]]; then
-	GIT_ECLASS="git-r3"
-	EGIT_REPO_URI="https://github.com/xkbcommon/${PN}"
-else
-	SRC_URI="https://xkbcommon.org/download/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-fi
-
-inherit meson multilib-minimal ${GIT_ECLASS}
-
-DESCRIPTION="keymap handling library for toolkits and window systems"
-HOMEPAGE="https://xkbcommon.org/ https://github.com/xkbcommon/libxkbcommon/"
-LICENSE="MIT"
-IUSE="X doc static-libs test"
-RESTRICT="!test? ( test )"
-SLOT="0"
-
-BDEPEND="
-	sys-devel/bison
-	doc? ( app-doc/doxygen )"
-RDEPEND="
-	X? ( >=x11-libs/libxcb-1.10:=[${MULTILIB_USEDEP},xkb] )
-	dev-libs/libxml2[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )"
-
-src_unpack() {
-	default
-	[[ $PV = 9999* ]] && git-r3_src_unpack
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Ddefault_library="$(usex static-libs both shared)"
-		-Dxkb-config-root="${EPREFIX}/usr/share/X11/xkb"
-		-Denable-wayland=false # Demo applications
-		$(meson_use X enable-x11)
-		$(meson_use doc enable-docs)
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_test() {
-	meson_src_test
-}
-
-multilib_src_install() {
-	meson_src_install
-}
diff --git a/x11-libs/libxkbfile/Manifest b/x11-libs/libxkbfile/Manifest
index afaace6a4ca3..ab0817857ffc 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 488 BLAKE2B 47f0e703931cc39666d58d70c7b051e14356cd6432ae31eb52485c80eb7f6dd0b1f2b220cbcfda80b529d23bff89c5fc3b7bfa941036dbf173a400392bdc0ca0 SHA512 633255b18e246dd716da6c96f5a6739f7fd3db7002ff36bf3bc20759728d0606bedd6c77eb382273407cd17921129e4b128f0a845cd6d98dbfed494fc2f6fe64
+EBUILD libxkbfile-1.1.0.ebuild 489 BLAKE2B 0803ea17525d2bd85ef5e668aafde54c394c42606bf8715bb5b6a9e5ae178efe3d128de8f265f556b0f0ce188714d34c3667e5dc213df4f0363bca392f4bf275 SHA512 3d1647acc8775b06c0251415e60a6dcaf72cfafe42137c1348c27b0c98e376213651c1a841ce4bd20f2eaa23c0b901d93f13bfd677dfff46d5fc8408bd2662eb
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libxkbfile/libxkbfile-1.1.0.ebuild b/x11-libs/libxkbfile/libxkbfile-1.1.0.ebuild
index 06c861af5c06..bc4d639de9fb 100644
--- a/x11-libs/libxkbfile/libxkbfile-1.1.0.ebuild
+++ b/x11-libs/libxkbfile/libxkbfile-1.1.0.ebuild
@@ -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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND="x11-libs/libX11[${MULTILIB_USEDEP}]"
diff --git a/x11-libs/libxklavier/Manifest b/x11-libs/libxklavier/Manifest
index fde61fa60f0b..a6ca69450907 100644
--- a/x11-libs/libxklavier/Manifest
+++ b/x11-libs/libxklavier/Manifest
@@ -1,3 +1,3 @@
 DIST libxklavier-5.4.tar.bz2 390428 BLAKE2B 3cd109c6200ef977533d39b1362c33f871c2cd0b011779b726546aa7dc95bf7dc89931dff7ca2e9a012a51aeec602a53df499591ab30e1dd813fcc823318a2e2 SHA512 e9342d94f6cd67e900e44d9751ee0d8c75bec8e3a7b30989612bd71a5f890be52ff843465162dbbe0bfc9004da76e1d47158a4671b8f915e51c91f9d82f7baae
-EBUILD libxklavier-5.4.ebuild 1339 BLAKE2B 496ea411063a41f3e85d3c3dd8ae4eaf9776c0dbc1ad40f014c30209475da63210127e51312086da543908499518f9c13faed3198122f6d9459734912ace283c SHA512 9e039838b629840942ff5738d5b416d6b8276520c8b07d4c2ca8fd6c410edb12c0e2aad5931d30ba9e2d4572e4cfeebecd7e4d118b7cab4f161f838b9c68ba56
+EBUILD libxklavier-5.4.ebuild 1360 BLAKE2B b9f8706bd197a42980eca9d5461de400c8871bd959b9258d10b5b0586e2176731026ad4f45c1b762b8bdbf5e137d0cc9f34e39e7650395cf049c7926afca78b8 SHA512 68b2c4c86f33f508a45bd26e92ba06a4288b77a10e98f0c078694dddf3eb0ff7a71d4f805a9575f164784e6f00cc8f59f4d12edf0448349e8e35c4bd64a0f555
 MISC metadata.xml 232 BLAKE2B b8ca675b002ba96d45a3afe7b6dd9f0e74d21db87eb002f72bae4e23fd49602115a18b372084596fdc09c3dccef80ae95ab540dad93fdf5dab0c9fb34f5d28db SHA512 21ba416ac701f1c9deb55d07f8afbf9da930fb04d274d84c5cf0df5e549554059959228ee6a4b8523d985fe0762af1a7c36aaefcb0e5b3c7baa5866e2841cfb4
diff --git a/x11-libs/libxklavier/libxklavier-5.4.ebuild b/x11-libs/libxklavier/libxklavier-5.4.ebuild
index 6506faf579bb..0a341f825e26 100644
--- a/x11-libs/libxklavier/libxklavier-5.4.ebuild
+++ b/x11-libs/libxklavier/libxklavier-5.4.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit libtool vala xdg-utils
 
@@ -11,7 +11,7 @@ SRC_URI="https://people.freedesktop.org/~svu/${P}.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="0/16"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="+introspection vala"
 REQUIRED_USE="vala? ( introspection )"
 
@@ -27,7 +27,8 @@ RDEPEND="
 	introspection? ( >=dev-libs/gobject-introspection-1.30:= )
 	vala? ( $(vala_depend) )
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	dev-util/glib-utils
 	>=dev-util/gtk-doc-am-1.4
 	sys-devel/gettext
@@ -54,5 +55,5 @@ src_configure() {
 src_install() {
 	default
 	dodoc CREDITS
-	find "${D}" -name '*.la' -delete || die
+	find "${ED}" -type f -name '*.la' -delete || die
 }
diff --git a/x11-libs/libxshmfence/Manifest b/x11-libs/libxshmfence/Manifest
index c6c786f0e933..6dff695d45db 100644
--- a/x11-libs/libxshmfence/Manifest
+++ b/x11-libs/libxshmfence/Manifest
@@ -1,4 +1,3 @@
 DIST libxshmfence-1.3.tar.bz2 308644 BLAKE2B 6e1e75fbe9d113cb258eb8f6a5106ea565f6749efd79bd3aa21222514063aadf8499d82d2a14bfcd0a69f7d4c4dce49a5efeb38d54d2019eb0c93345f0ba8a37 SHA512 c446e055f8fac62b9aa266132289a4cfc030282147974c45ce96d1768a98d1afb997470e58e4a68513174c404cbf373bdde2f0cd4b34abdbce1d89dd0b6fe2b7
-EBUILD libxshmfence-1.3-r1.ebuild 386 BLAKE2B bfdf3a185315e38828a9c03b287512b48a4d4ff6eeefb3a7f69569bbe0e62e718054415c4a3367d91f4b5aba07fba8ada6416ff7bc74645cfde1740f13edb4e5 SHA512 a71b58f12e9cd834cb86beb29b7fd02a43ad0de955d25c7be912fe9e90829f0e77e4854b43d1b0eb91795fd1efd5f8fce1fe6d8f9c22d6338d6f7f9de5b8df37
 EBUILD libxshmfence-1.3-r2.ebuild 376 BLAKE2B 865c7510f1481e1883276e6eefb1437edd6c95652436fb6e87b2c8e3bf00fcfbe0a66af531f13a4490ea50d776db9b2d29b1597bd1db0e0812bfa44ec83047ee SHA512 3e9b31d929f8156cfdb123d50442046fc998498293f1c155cb39fdf266e4abb6bfeb4bd2a4052c83c02d19a9345ab71867783091e1b21bb7f445164ea7c69f51
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libxshmfence/libxshmfence-1.3-r1.ebuild b/x11-libs/libxshmfence/libxshmfence-1.3-r1.ebuild
deleted file mode 100644
index 7551a9c6a8b9..000000000000
--- a/x11-libs/libxshmfence/libxshmfence-1.3-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="Shared memory fences using futexes"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=""
-DEPEND="x11-base/xorg-proto"
diff --git a/x11-libs/motif/Manifest b/x11-libs/motif/Manifest
index 8febbc99e653..45a259dc8a9e 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-r1.ebuild 3076 BLAKE2B 5a8c921a860f6ff8690af534c223877bdcc75d32ff0834ee6bcc993fa411bc875bc1cdf20016ad065899cd326dbc0fe091b0c7d2bafb14b09442eeda83acc1ab SHA512 62b786014fb577d4ab41d82f53c5e04b6981feb6303e07dc06374e49c877c0641e8f0cf3f34614194d493377e766fc0e7da4aaa8fc2fd648a0942e64be1aec39
+EBUILD motif-2.3.8-r1.ebuild 3068 BLAKE2B 7a84ac07ad89a247777df14edbcd1e4730d5685512322347c4bc3e550da65f0f88e879af8253e88e34997b91ec7b11f8d1ef61fcd65961b546cec2749590e15f SHA512 52e2976ae2df5bed8b7d66cfa833847df95b09edb6861c5b1498e1f3ea9f24a35ac238f7c27dd72c17fb4cb21c45d2868f18951584bdb89356e9aad477eb38b3
 MISC metadata.xml 394 BLAKE2B 8302e867353fbe09f017b4d54ec2ad043f8872643914ef29002611b41f4f1c0639959da9c7e06b4317c8fec4d0a5fba72cc3927991054a65a1d42a1f4fb9da17 SHA512 5a2fd548df5d694acb6c1bf1d51c8e80adb49915d4328879478a6b7c5a76cfbf02f31e58103967bab2c4afd4873752ffafd9f8f0839f68d09868d7f501542d3c
diff --git a/x11-libs/motif/motif-2.3.8-r1.ebuild b/x11-libs/motif/motif-2.3.8-r1.ebuild
index a12cad9e2ba0..28e1d310494e 100644
--- a/x11-libs/motif/motif-2.3.8-r1.ebuild
+++ b/x11-libs/motif/motif-2.3.8-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/project/motif/Motif%20${PV}%20Source%20Code/${P}.t
 
 LICENSE="LGPL-2.1+ MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples jpeg +motif22-compatibility png static-libs unicode xft"
 
 RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
diff --git a/x11-libs/neXtaw/Manifest b/x11-libs/neXtaw/Manifest
index 3e330bf3c3b0..e66049649516 100644
--- a/x11-libs/neXtaw/Manifest
+++ b/x11-libs/neXtaw/Manifest
@@ -1,3 +1,3 @@
 DIST neXtaw-0.15.1.tar.gz 577459 BLAKE2B c38e8fe482bf0f51a2f387ab76d62666778d569982e153dbe32988d557dad91876122cfe4d0e8940e5c1d8ca7a8a3af09c09631b8ed656bd6a11db21d16ae331 SHA512 5250b2ac6fc746b8de19d0c2504e6c21e0b6c6ac4ef1a841a9793a2fd2dff082b86a987f54f68e0e35ed8f798900a701e6fd9c6cf7b1412a4bd53179fd07cbf1
-EBUILD neXtaw-0.15.1-r3.ebuild 724 BLAKE2B dcbe03757c87fb376bda30bf5cec31f74fd6f7b3b14f98d7152bcb0195b8e974aee6f6832cb96cad5f535ef9f3323b7b951c9e988b45e628e26f4235b9541a13 SHA512 2ad578fc06131c03f036c17703472cf8c50fdc4b547a692dfc75bbc59ca916ea6ee494b0eaa0fe68c04a513475777ff14332e4210aa88d4c166391406c8da02b
+EBUILD neXtaw-0.15.1-r3.ebuild 725 BLAKE2B 7756182433942f0c24aebfaa4a630fdc2822c7bc40e7b16d3d944feb0fae2857f76a24854ac3e1673183b32bfd0acafba64999ffd564eccde292e0b8b3da3add SHA512 3cc14989eed5e220d8f9953dfe9bc3d292bbe7929d638d436be507526b2487d09b7fb5cc3883b8c880d13fc172835b0fdbc0d50923337b766ce7ba32916c886f
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-libs/neXtaw/neXtaw-0.15.1-r3.ebuild b/x11-libs/neXtaw/neXtaw-0.15.1-r3.ebuild
index 547227d7959f..9669ec610174 100644
--- a/x11-libs/neXtaw/neXtaw-0.15.1-r3.ebuild
+++ b/x11-libs/neXtaw/neXtaw-0.15.1-r3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://siag.nu/pub/neXtaw/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 
 RDEPEND="
 	x11-base/xorg-proto
diff --git a/x11-libs/startup-notification/Manifest b/x11-libs/startup-notification/Manifest
index 36c2ee84f220..9860f2af1f0f 100644
--- a/x11-libs/startup-notification/Manifest
+++ b/x11-libs/startup-notification/Manifest
@@ -1,5 +1,5 @@
 AUX startup-notification-0.12-sys-select_h.patch 928 BLAKE2B 048e3a834d6ec993d629bd72d13fc3008b7c52885cd34f5b057c77c5be3b8601e05d5280443eb567696ff5e590f49f3b6f184971c92e8bffc8b94cd1103e9b81 SHA512 5f89b2747a2e5d633229b2e858380919121bdfd8f5788898824115fe5c4f60ffb51d0303830b7896657a96f4c2468de0ada0a72782a48cb990d614a1805e91cd
 AUX startup-notification-0.12-time_t-crash-with-32bit.patch 3377 BLAKE2B 2ed2cd342d606e6d3a2065aa127b7c1e2f6352c9e8142795d2a3a654706d771ec5a8cd1c26d5f75538d8961d081577cc3738d1c169790ebe954d3ade07f1721d SHA512 b1bbef28012a08e265e19296f6f6b1adf4bf82efa2d585680f06a352258deee6f2d8b2f842a8f27febe78f23048afe5f39fe80bd555b826aec927d14a289928d
 DIST startup-notification-0.12.tar.gz 355285 BLAKE2B 9822de9745fdeef28d7c6422d2a967394ffc329e7f37e1676c79e900f8e776578698ef47ff199fa05aa795540382f5eab5cb63f6cb20512328897236df1ab152 SHA512 ea1246acdb50dafd9ced9914ec3c8f0d499c0ca3cfd447b43a444c768a6e9ea7135e5c42d9ca0089354698ac235bd86d42f12c70a3a17c9c79f998c07461f7ab
-EBUILD startup-notification-0.12-r1.ebuild 872 BLAKE2B aa6f745c0d5ac671cab99c5b0262df297437cb36ce50f4014014e6c1ea1584755a72476a7cffb6553c9ed3836a675d029485115e05be83c50f2487f9c4f6beb3 SHA512 19a725f974f325c5f41720163b9ef21c5d3786ff450f0781d21e944988eee5c45d5d00777854a5f604efa76c4690df28527939865e5180c86dd24bd7c7373f8e
+EBUILD startup-notification-0.12-r1.ebuild 825 BLAKE2B 449ac56ad5aa9d1c08841bfaf9720b93f14b07a54ce4fe2d8f9d4d8bde4c6a38cb4a2b3e92b8f6eafc00d57995e454c2acb547c91bfc181f7f2a4c5848a7e116 SHA512 46857b199b8c4c51fc0ae2ea7ebcfa6405f9beffd1e25a01d7c318063e3ae130b09b5d53d36506f3a831e668861f0fc50cb2e930ab054460e11db282b653d6dd
 MISC metadata.xml 224 BLAKE2B 50a08713f8b792454787823dd56f1dcc1a1970ded78fa6ddffc6fb7301e0de75018e1e7a8c7ed890b4910f2716d2588ad21c7ae88ad8013b51cab7ba401c46c9 SHA512 12da46d8052565f62c482e6bcc714d8c00cac256f85dc1602579c8d61e0b61af95da149d1a446e56b2eba918ab9d78b556f77c6fe034a2e578f57a9dbe62fc44
diff --git a/x11-libs/startup-notification/startup-notification-0.12-r1.ebuild b/x11-libs/startup-notification/startup-notification-0.12-r1.ebuild
index bb0bf32b48f2..56b8096f57e6 100644
--- a/x11-libs/startup-notification/startup-notification-0.12-r1.ebuild
+++ b/x11-libs/startup-notification/startup-notification-0.12-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils xorg-2
+EAPI=7
+inherit xorg-3
 
 DESCRIPTION="Application startup notification and feedback library"
 HOMEPAGE="https://www.freedesktop.org/wiki/Software/startup-notification"
@@ -10,8 +10,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/releases/${P}.tar.gz"
 
 LICENSE="LGPL-2 MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND=">=x11-libs/libX11-1.4.3
 	>x11-libs/libxcb-1.6
@@ -21,9 +20,7 @@ DEPEND="${RDEPEND}
 
 DOCS=( AUTHORS ChangeLog NEWS doc/${PN}.txt )
 
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-sys-select_h.patch \
-		"${FILESDIR}"/${P}-time_t-crash-with-32bit.patch
-	elibtoolize
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-sys-select_h.patch
+	"${FILESDIR}"/${P}-time_t-crash-with-32bit.patch
+)
diff --git a/x11-libs/tslib/Manifest b/x11-libs/tslib/Manifest
index b95312736a43..5fbac298e5f2 100644
--- a/x11-libs/tslib/Manifest
+++ b/x11-libs/tslib/Manifest
@@ -1,4 +1,4 @@
 AUX tslib-1.21-optional-utils.patch 610 BLAKE2B 0f25c58205f5bbddc62f278827d9689e58c88323d6c2797d3f36d165c5dcfc8fe18574225dab106eb9c01d3a7f54a3f7c3797be0853dd3b144bbb61529ea83eb SHA512 3c061d34e5a2f89c61754331d9a8efa9ffeb492169d3c0082b29107f03442adc75f6a39f289577c3902df2a9efc4166f9ac610867742989f09f10a8bfd69230d
 DIST tslib-1.21.tar.xz 349216 BLAKE2B e19623c9390688b0aa85e6547a57542d2e10498c8ebbb30f840157d240dc9975c3e6735814a5e6f02fb71c273a52f860695cf4772fef28522e74c5781cdcb02a SHA512 66c5e5dc4e2314277e19af29b5dce1181573579f13b0e79fa43e658838d4c19a77feb978b60d7c6458337e8d6100ee54a42fc4af3a99fd8d6840cccafa6323c4
-EBUILD tslib-1.21.ebuild 1538 BLAKE2B 313b7abb54de106f4020407b2669bf076be3b93a95a44144729cd6b7091ace381a2e4144d80cb48e57fb744393e5b433edb1740485250b9a664350cab29f6c1b SHA512 232cafeedeec1034c42b5a08b688e236140be7ccd2d471f0eeeda5a5b418cb480b190a80cd113d9e6b03e027fb9a0b6cd4b185df6f4640f9e326a57e70f24911
+EBUILD tslib-1.21.ebuild 1539 BLAKE2B ba3adc3479f9dbaae520a8f6228ab36ee5e23ee768ac1882d5abc92120609981394ef78ed066dc5c3bbe80dea988f314aabc029fdabf289c8abda7999c90ebef SHA512 2208273e73145a8c983ea019c84feb832e9d50452b1d294550592ae8797073fb3c139fe4abbd9449423c6821a4cb19ed591f2f73ca6cff3d444b525d8763c53b
 MISC metadata.xml 476 BLAKE2B 60986e648e86b87a797224b40bcb510af598d2aeafdc497850c714872d844b86c27d7f3c24cbbdad92ec91c8803fd1a8aeb9e06ffea5700ce3c42a2b3d3d8587 SHA512 f5b0def5c198a78dd8bebfb3e9b022ab37dc6466e1a3af7a7b0497f4133be7d155a205da190d63f98c4e10bc7fca6ee84e6aaa6e46e74e1ed0d8c2ac387a15e5
diff --git a/x11-libs/tslib/tslib-1.21.ebuild b/x11-libs/tslib/tslib-1.21.ebuild
index 785d56f95cdc..85369585a3b0 100644
--- a/x11-libs/tslib/tslib-1.21.ebuild
+++ b/x11-libs/tslib/tslib-1.21.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/libts/tslib/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="LGPL-2 uinput? ( GPL-2+ )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
 IUSE="evdev sdl uinput"
 
 BDEPEND="
diff --git a/x11-libs/xapps/Manifest b/x11-libs/xapps/Manifest
index 1f2f9eb2bc82..a69f231b5e1f 100644
--- a/x11-libs/xapps/Manifest
+++ b/x11-libs/xapps/Manifest
@@ -1,5 +1,3 @@
-DIST xapps-1.8.4.tar.gz 179340 BLAKE2B f6558b87320cbd73e73c5294f48a3c0c94c7239abc9ede9cd88e66ccd53fd0c9cba9c638837efbd5eecd8a4f372262fde759e05ba9e97ad9955ab74464c34c21 SHA512 483e8e334d4883e2172e06835d690d20af2752fcc195f63776053b83abc0ffcb25c757633450a02b153e70e67e98c477754de12169c167a2f9f3fea103e12bad
 DIST xapps-1.8.9.tar.gz 187789 BLAKE2B 37b2d2677cb6483533d79853a83d77b30033313c06db89e93491076bb017122f77cd97b30d5ba64ce53fb41a37736791e97da785f516953b76b1d979d341e2fc SHA512 95dd1cbf84b59adf6682d9025e0cfa7a414c24d4f584cde87d0cc6ea82c06338de2c320dad8d997e105980782ec5cb23f0def6f6d60ea84be7d74c90d7cd692c
-EBUILD xapps-1.8.4.ebuild 2044 BLAKE2B 604dd1658fc1a5cb2033defcec921bfb3217feae2d443a656e5f2eafcd03d6eab09b93f850c59c80eb4c48c4823e8c057affdced3cc51cfc34ea1c3f954b0070 SHA512 dbd39ff32234abc3bf8ed777ccea0e6fb586b5ec8d882beb63e6e1b4176731fc555fef2a7c67505988283ab80279b05bd9afbbcf2b4be83032ba85fb4c8ebfcc
-EBUILD xapps-1.8.9.ebuild 2108 BLAKE2B 06b128765e850184429940c95fdb45a198f628a28231d5ed20583344c7f61f1980b08495c0e2179e7fd70b1cd7076c82d3c8fbc30c02bdf1614e3d31934d0fbe SHA512 da7dd2e8368ecb0def80ecb874adb2a27d293db03798e673f269fe08d35bb97b488965365fc08a462e81036c9b09ad39f611e738d1dabb466797d85bcdb51f7d
+EBUILD xapps-1.8.9.ebuild 2107 BLAKE2B 12c92981529531e42640885ccebdd0407f70da60113b350c935360e49c2ec5798dbb952fe808571046bc9d0fd252404f8eb42cc5254277945ef53ab0363d2000 SHA512 19ac65a8baee5398a1929bf59f5a3803e0dc7a00811a333881d37b57340ecba2f8143271a8951fbb191b9ddaf2192b5ca50f4116815a8c9a1abb61c0c95101df
 MISC metadata.xml 577 BLAKE2B ed5786f6e30619e209d841a04547b52f7a9a09eeb5a64f0fcbe9f33031e936610aaef4b80cd29f45d662ac23295448ba336786c31a2b5f302332750497d0f545 SHA512 3af23ee720d2691213fccfbcdde69b5af42259fb0acee32e499c51e13dc8a5414fed038372b2a485db65548b38163886911d4b44ebaaca8ff0e0274c4c40d48b
diff --git a/x11-libs/xapps/xapps-1.8.4.ebuild b/x11-libs/xapps/xapps-1.8.4.ebuild
deleted file mode 100644
index 2768e92fb440..000000000000
--- a/x11-libs/xapps/xapps-1.8.4.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-VALA_USE_DEPEND="vapigen"
-inherit gnome2-utils vala meson python-r1 xdg-utils
-
-DESCRIPTION="Cross-desktop libraries and common resources"
-HOMEPAGE="https://github.com/linuxmint/xapps/"
-LICENSE="GPL-3"
-
-SRC_URI="https://github.com/linuxmint/xapps/archive/${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-
-SLOT="0"
-IUSE="gtk-doc introspection static-libs"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=dev-libs/glib-2.37.3:2
-	dev-libs/gobject-introspection:0=
-	gnome-base/libgnomekbd
-	x11-libs/cairo
-	>=x11-libs/gdk-pixbuf-2.22.0:2[introspection?]
-	>=x11-libs/gtk+-3.3.16:3[introspection?]
-	x11-libs/libxkbfile
-	dev-libs/libdbusmenu[gtk3]
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	gtk-doc? ( dev-util/gtk-doc )
-	$(vala_depend)
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-util/glib-utils
-	dev-util/gdbus-codegen
-	>=dev-util/intltool-0.40.6
-	sys-devel/gettext
-"
-
-src_prepare() {
-	xdg_environment_reset
-	vala_src_prepare
-	default
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use gtk-doc docs)
-		-Dpy-overrides-dir="/pygobject"
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	rm -rf "${ED}/usr/bin" || die
-
-	# package provides .pc files
-	find "${D}" -name '*.la' -delete || die
-
-	# copy pygobject files to each active python target
-	# work-around for "py-overrides-dir" only supporting a single target
-	install_pygobject_override() {
-		PYTHON_GI_OVERRIDESDIR=$("${PYTHON}" -c 'import gi;print(gi._overridesdir)') || die
-		einfo "gobject overrides directory: $PYTHON_GI_OVERRIDESDIR"
-		mkdir -p "${ED}/$PYTHON_GI_OVERRIDESDIR/"
-		cp -r "${D}"/pygobject/* "${ED}/$PYTHON_GI_OVERRIDESDIR/" || die
-		python_optimize
-	}
-	python_foreach_impl install_pygobject_override
-	rm -rf "${D}/pygobject" || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	gnome2_schemas_update
-}
diff --git a/x11-libs/xapps/xapps-1.8.9.ebuild b/x11-libs/xapps/xapps-1.8.9.ebuild
index dd0832591bb0..24b3b24bb2fd 100644
--- a/x11-libs/xapps/xapps-1.8.9.ebuild
+++ b/x11-libs/xapps/xapps-1.8.9.ebuild
@@ -13,7 +13,7 @@ LICENSE="GPL-3"
 
 SRC_URI="https://github.com/linuxmint/xapp/archive/${PV}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}/xapp-${PV}"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 
 SLOT="0"
 IUSE="gtk-doc introspection static-libs"
diff --git a/x11-libs/xbae/Manifest b/x11-libs/xbae/Manifest
index e33b48e2749f..c8fc158519b3 100644
--- a/x11-libs/xbae/Manifest
+++ b/x11-libs/xbae/Manifest
@@ -2,5 +2,5 @@ AUX xbae-4.60.4-Makefile.in.patch 751 BLAKE2B cc40a6d58a1e6ae6c68f2dd989807fedac
 AUX xbae-4.60.4-lxmp.patch 364 BLAKE2B c7defbca432abd679c5afbab2e95de3270097617d7a52cf4c781d3d44e36887c18901a045d9ca36d107aa71343e7f1ce974ec0634062318a56c14351335e8425 SHA512 90a348e0f67b3954ce2c1965e4252ef5b1be9b0c6c232981219a79af5a705dcc09bada6e87b7a2ae25e9d9220130c1321af90d079843317cc82d8e2a11dd78fa
 AUX xbae-4.60.4-tmpl.patch 182 BLAKE2B fb68a556359b2825879567ad53e4fcdcb3f5d41198cc8f3bb7626e45251881b8b7e7ebc4f244c4df0973d21e62a797d38b7a429dc94ca84a97700a4f2f9055d8 SHA512 dc360679441f2c8a4642a8b12b624acc739e4e7bd4ccb931d385212e418291eaf8d05501a420cb0407ab953826cd477634938c1b3fb89b3aa5ea1fefa57a8a60
 DIST xbae-4.60.4.tar.gz 1770938 BLAKE2B c9790dae438a4a35ca58274d96b3d4cdcf61191e3c8336e7df3df419a64a790bd010890f88082add21c304ec520ddec3545915c5babf267bd9ebb985b0acf0f4 SHA512 e9c2ea59ab598217a5d6a3df0b86ca9fa084c364116d9789334984a0ac83dec0d5b5e3fb643e067036fca10f13b175f6d5134325eb5041af614a4ed00745ba16
-EBUILD xbae-4.60.4.ebuild 1241 BLAKE2B 370d850ab05752803a7c5f4d8a84013ba53e9cc9c34e97aa6b1c36ffcafffb9aeab9db39baeb808070f69cedc8a761eb48f84c82d58ee2a0ca85829b7cc15e60 SHA512 26090390bbed7166ba6030bc61d7b7e2439584b758b6ba93432b08306646e90f2926f83a19ec38d844d98df9c0ffdd3d1a77ac2949323d97888f29b9d4fdaecb
+EBUILD xbae-4.60.4.ebuild 1242 BLAKE2B c26a94a50b428e28b8f6eafbdc3aab1bbf59aecdc5c9a353a5ff0452fd194ef74bdf649fba7c0417fdf26e0b23d9416a1653de3532642f70e36e914d7bb17918 SHA512 d460277798b2775815f3575e9b0dc9d124f59fa76addcfb06bb14100cbee0fec75366ade3a23a149a9744304fe20c31db20091e23326379acc9aa776d46167e6
 MISC metadata.xml 965 BLAKE2B f76eac30d4f1d0ab6d41cdc26f8cb309936558efba912f56520f2f84ffad4463c8653de937dc2e6cb9757ebd7f60a5e147fea5d3c15dea1dd5f1ee0234a62604 SHA512 ecbdf447ab2b5b6c41888e8d2f7f02547de650fa1ca1bf708195753fc5e76dfc0e43a7a108c9dcc39e176b5456032b2e5d94c492075651267de4499eddc67451
diff --git a/x11-libs/xbae/xbae-4.60.4.ebuild b/x11-libs/xbae/xbae-4.60.4.ebuild
index 053b59bd7120..97ef009e2740 100644
--- a/x11-libs/xbae/xbae-4.60.4.ebuild
+++ b/x11-libs/xbae/xbae-4.60.4.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples"
 # tests need X display
 # and are interactive so virtualx will not help
diff --git a/x11-libs/xcb-util-cursor/Manifest b/x11-libs/xcb-util-cursor/Manifest
index f64d632b72c3..3864669681ae 100644
--- a/x11-libs/xcb-util-cursor/Manifest
+++ b/x11-libs/xcb-util-cursor/Manifest
@@ -1,3 +1,3 @@
 DIST xcb-util-cursor-0.1.3.tar.bz2 295224 BLAKE2B 7a1a89c0f326f4ac0768110c4aa5a7818ddace1f231f6a0dcfacaf8b157a2d6aae53f5278a02cb945822d83eccb8a01ebb14ab98e8828d8f1d506e42f51431ba SHA512 be5eee7b268b18f356d6aae04820a7e1c51397dac9020d876df379e833200255b5194269541c245a9b4ac286edad4cfe44dae8e4fcfd16a4726dd7553c104c21
-EBUILD xcb-util-cursor-0.1.3-r3.ebuild 1041 BLAKE2B 49b65d3a170c4bebb580b70f92ae28d54cecb9582722f57b0d6c14792c4e9cf0d9100bf0db3b8ff6f3135b799f0c81cc03a6f0777453ed4a013c3fc853ea3c68 SHA512 a7683eba657e47f1132343681d68f6b5de1bbaacda039294f37534619f713b9259679ef699edf9b6f2ab0885e4b9319d0ad66c661e1101757a77a24a447b7eb6
+EBUILD xcb-util-cursor-0.1.3-r3.ebuild 1042 BLAKE2B 9471ee97d1944ce457a9516dcfca9c2b6003db6e2115729533654a0a16b02959f1430f30026d9a9cc2d0d7e2ec2ce71b3c82f240f1b13c584a643d1132519de2 SHA512 997bf80657ae5185f477cee431cc3df751e87a7f5bc6d5b8a56608b1579d69419e750697a7855783c28ccf15a058e99bdd78c41a5ec7429953ba86221904b72a
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r3.ebuild b/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r3.ebuild
index 87dbbb0e379f..2168542dc4d2 100644
--- a/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r3.ebuild
+++ b/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r3.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
 DESCRIPTION="X C-language Bindings sample implementations"
 HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb-cursor"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 
 RDEPEND=">=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]
 	>=x11-libs/xcb-util-image-0.3.9-r1[${MULTILIB_USEDEP}]
diff --git a/x11-libs/xcb-util-image/Manifest b/x11-libs/xcb-util-image/Manifest
index bc880d0c15fe..f24d8a7459da 100644
--- a/x11-libs/xcb-util-image/Manifest
+++ b/x11-libs/xcb-util-image/Manifest
@@ -1,3 +1,3 @@
 DIST xcb-util-image-0.4.0.tar.bz2 327891 BLAKE2B 022536e7b7410ba1ed129f9efc2ad48fda26d9a69e79e54fe6fd4510df38d1e957289d249dc1a5beb4385116b0808f3282ad496b3f2a246bc6f5762bbe8c7e36 SHA512 9b7202c054e1160f9ca97a86be1210d9fb47f2119f89ca85f15f20909cca884bfe0cb88e3e71c75b65e1a0a72b980066ccac810e41a91db895c74dde77440d4f
-EBUILD xcb-util-image-0.4.0-r2.ebuild 604 BLAKE2B 72f15d09858b0f49d2ecd064362b1db762cd68584709805dc388603cc5fa85b0eeed09df5b0eaa565c2eafb8ff8e0955c9c2266d1147a811d698adcc602c4eb9 SHA512 d471b8b1bb6f78508a1d02845c29225c8b22e886386f0e69b1c1450ca8d19e37da74fc99b41063c9bffab67e014d34d2e50804a5c87ccd6a5a8386e2c4ff3438
+EBUILD xcb-util-image-0.4.0-r2.ebuild 605 BLAKE2B 5763470856b420da8e1d700f7499fced3a1a3d0bd375fb4dbcc438c875d4bf5098bdee4be67087532c268b061b64c1e7e9acd4cb9df69adb45092f118a503c82 SHA512 bfd378b1812cd4fd57d104291ca3d60e9dc22b41f0d6e5c9ff93c5d828ecba2968671748ae8a4b9d669369b346ff6f8034679c8528b402213c18f59e1e00641e
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/xcb-util-image/xcb-util-image-0.4.0-r2.ebuild b/x11-libs/xcb-util-image/xcb-util-image-0.4.0-r2.ebuild
index 49c1474f6264..f587b57d46d7 100644
--- a/x11-libs/xcb-util-image/xcb-util-image-0.4.0-r2.ebuild
+++ b/x11-libs/xcb-util-image/xcb-util-image-0.4.0-r2.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
 DESCRIPTION="X C-language Bindings sample implementations"
 HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb-image"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 
 RDEPEND=">=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]
 	>=x11-libs/xcb-util-${PV}:=[${MULTILIB_USEDEP}]"
diff --git a/x11-libs/xcb-util-keysyms/Manifest b/x11-libs/xcb-util-keysyms/Manifest
index d8d8edfcb0b9..84fa771d3047 100644
--- a/x11-libs/xcb-util-keysyms/Manifest
+++ b/x11-libs/xcb-util-keysyms/Manifest
@@ -1,3 +1,3 @@
 DIST xcb-util-keysyms-0.4.0.tar.bz2 289880 BLAKE2B 5f55706fc74ed5c096ca0e8a8411ba392a023ab7f3c8185088c31570e5873345e16d72b693596b0983011350ecdb7cb30ae5fca118f4758710ee2fc2441883ca SHA512 b14b3100c3ae2379f9df799c0780a1ee39267101e58e4c1c6f390f039348ca2b370bb1df203b9bc68a170d664188d9c73e3553a7ba24d98abea3ed353e8dc0c4
-EBUILD xcb-util-keysyms-0.4.0-r2.ebuild 549 BLAKE2B af6134d4231928eaf69ceb64eb284df07b0deeca4fa1d7a3549ad70d2caef6be80df748a0c40f2e4688191ac4b1af700a321f69598d01ec897b7ffbf312098ed SHA512 81c061c78f76961dd5cae2780800fce740d6de14295e574dd6fd632f76b4599b2d7296ea09cabfc7701352ad3bdc8ff8042a53ec26757cc7925fcc36b5a02ec1
+EBUILD xcb-util-keysyms-0.4.0-r2.ebuild 550 BLAKE2B 71896c8d41c6696b7d0c0247b547c976cff35a781f9ee9f9399d8538070de1f08458a306cd76e1e17fd80eb588150fd251c1e47c80335ea1738be5cd1c4832e9 SHA512 081ca312cd61ab35afbb7d6628de2bf5011064efe80bfb6869d48bcbf3b9c1c115e5e33ee377c75480ff076abb14d0be84525f4dc8a56368b4c1f21a195388d8
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.4.0-r2.ebuild b/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.4.0-r2.ebuild
index 7c992ad6b3a0..a43f20e4f270 100644
--- a/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.4.0-r2.ebuild
+++ b/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.4.0-r2.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
 DESCRIPTION="X C-language Bindings sample implementations"
 HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb-keysyms"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 
 RDEPEND="x11-libs/libxcb:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
diff --git a/x11-libs/xcb-util-renderutil/Manifest b/x11-libs/xcb-util-renderutil/Manifest
index fd6580d92d31..e7552498cf51 100644
--- a/x11-libs/xcb-util-renderutil/Manifest
+++ b/x11-libs/xcb-util-renderutil/Manifest
@@ -1,3 +1,3 @@
 DIST xcb-util-renderutil-0.3.9.tar.bz2 292898 BLAKE2B 8de259f918f1ffcd82d054bd751baf3f0fe3514da86bc736b68c74ca1f285fb41dca364ca49153e1464691c10fb65f16a53eec0ec8102c1abade9ad7c80629e4 SHA512 24b567992ecde7e69a406efd0ffb62266610d73b4dc0e5c71093221090fa134c14b850680d1d28dc1f8f4a6f497b4118491e1894ec7c73d2c6ce959d106771cc
-EBUILD xcb-util-renderutil-0.3.9-r3.ebuild 561 BLAKE2B 3d4870d3161e4f62ba3f091df4f028fd2b757c7540381b68dccfeeb4497c46499b1de88d0c241a6ddb626901c64132f0e3c207828908e2174bceb3d50f40506e SHA512 fef15077122a39a5e32c7c6b1ade7ba26fce63c6a61dddc7618cef7c6aef843c72dfbd499d3d1befd80f2bcb35e34abc7ed53c07b5f882199db2fbed71ed6a3a
+EBUILD xcb-util-renderutil-0.3.9-r3.ebuild 562 BLAKE2B 84162af8994e75ccfd2257af86122b01e1d5e4fa7253fad5b4467aafd5f95bded9744d257cfcb41c8ce3eeab0806dcc6ea5b18e5e3cd71a5519c25f8f7a7f443 SHA512 b06754ca595655c2056ac9ba63f7ac4d674022190aa30365c69401068540d654d479ae5b2fc80195d3e40613597e00123fc6741f28599c46a024f9bad336d407
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.9-r3.ebuild b/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.9-r3.ebuild
index bc7f7a4d06b6..3d145025df43 100644
--- a/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.9-r3.ebuild
+++ b/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.9-r3.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
 DESCRIPTION="X C-language Bindings sample implementations"
 HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb-render-util"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 
 RDEPEND=">=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
diff --git a/x11-libs/xcb-util-wm/Manifest b/x11-libs/xcb-util-wm/Manifest
index 37b73b55e31f..acff31c3faf2 100644
--- a/x11-libs/xcb-util-wm/Manifest
+++ b/x11-libs/xcb-util-wm/Manifest
@@ -1,3 +1,3 @@
 DIST xcb-util-wm-0.4.1.tar.bz2 321855 BLAKE2B 095d1f39e4b42e85790830b46c1faeeb8ac3bd7b792c3db8dca15a998a0ce835fd4fa148e8ed896c81d82e2113d1b9650e35de7741e9629883908d3b81b927f3 SHA512 cd1b3bcf9fcfc52e329ddc42b370d50dcf7d473c8e94f01cf7ea7fdbe0dc9176790890214eecb2a8ac43405f4938c121e38d282ae988cd8e90a6610d214ef326
-EBUILD xcb-util-wm-0.4.1-r3.ebuild 552 BLAKE2B 72ccf508c2fc65f070e6f95cf4b4c182fc46ab5063a8b34ef05846a66fedc2aa090ff72e5f9b0bfcf14580a767b4a9798141c8b3fae210c5b37a8e827fcd2152 SHA512 9597823b05b761f9b8fcc88b3b5c68467650d6ae979d56fdf26a1dbb626144d39f49ba2135f5be2a73d16b2da2bc033bd87eca5e20238b3e01aa53f36bd59d86
+EBUILD xcb-util-wm-0.4.1-r3.ebuild 553 BLAKE2B 50dac2dee74a2913f2c4181b8fa06b65ff936cafdefc18714aa962714b10a429dfc5ee1d6640d4f3162ab13715790c8fae8ad986b4222302f3e2919315a8fe6c SHA512 331f02a552423711ded070c5a2fe113938175a84605062da8273ff37ed7701eb595921df61ecf94eeffb9c78caab96fbbf8bd507b95376ee932b06aacff9fe73
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/xcb-util-wm/xcb-util-wm-0.4.1-r3.ebuild b/x11-libs/xcb-util-wm/xcb-util-wm-0.4.1-r3.ebuild
index 707a5cdbde29..083e7f70430c 100644
--- a/x11-libs/xcb-util-wm/xcb-util-wm-0.4.1-r3.ebuild
+++ b/x11-libs/xcb-util-wm/xcb-util-wm-0.4.1-r3.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
 DESCRIPTION="X C-language Bindings sample implementations"
 HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb-wm"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 
 RDEPEND=">=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
diff --git a/x11-libs/xcb-util/Manifest b/x11-libs/xcb-util/Manifest
index 816629124922..c908acae4b5c 100644
--- a/x11-libs/xcb-util/Manifest
+++ b/x11-libs/xcb-util/Manifest
@@ -1,3 +1,3 @@
 DIST xcb-util-0.4.0.tar.bz2 297412 BLAKE2B 55970cddd8d4bfb313f5d6e4ea82a169a90311c1c0bb5ebf796ac1ceb1d1e1baea4268dc37bd8adf557514a752eec9f957ad3e3e0747384f2cf6e1985f26247f SHA512 e60aaa6f582eacd05896c5fd7c8417938318a1288146f3a5b339f77eed24e211c6099963f8813daa621c94173d2934228936b491c0ed79b09a8a67d835867d0e
-EBUILD xcb-util-0.4.0-r2.ebuild 847 BLAKE2B 70ecc368804cebe04096a2e92566223e5e931dc168ea89db130ce87400c4be78d07d70ae520e540e9e8a956f68903fe0c3dfe57673867a2c12e11845dc0bfe93 SHA512 5601698b244f8cad8f9ef6e2cd403465f186700a6dd2dcb7c03e38db6071614b84ec26eec2a601d43010e4d1132e109c11682e4050eb0e1b213fd6286f0868bf
+EBUILD xcb-util-0.4.0-r2.ebuild 848 BLAKE2B cd71381c1e1bfc8e443f2435ebb28a05dcd8bd848da4f9565703369a275bc20ec16afb7130bf6e46270a916bff323c7a35b408b725047f9318877735e270571d SHA512 9e3d2969c4993e8356388d6938b407adcac0cb4c5da8fc5dc108b166ea35302e80a72063a7e2a23710c3d6d00d34b90de2771a93167336e87108eecf3ba484f3
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/xcb-util/xcb-util-0.4.0-r2.ebuild b/x11-libs/xcb-util/xcb-util-0.4.0-r2.ebuild
index 9d10db2c4a57..ce7d321beac8 100644
--- a/x11-libs/xcb-util/xcb-util-0.4.0-r2.ebuild
+++ b/x11-libs/xcb-util/xcb-util-0.4.0-r2.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
 DESCRIPTION="X C-language Bindings sample implementations"
 HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb-util"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 
 RDEPEND=">=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
diff --git a/x11-libs/xosd/Manifest b/x11-libs/xosd/Manifest
index 119c591f5684..11d8ad4351a3 100644
--- a/x11-libs/xosd/Manifest
+++ b/x11-libs/xosd/Manifest
@@ -2,5 +2,5 @@ AUX xosd-config-incorrect-dup-filter-fix.patch 520 BLAKE2B fe345fcb77c8fd5788ec5
 DIST xosd-gentoo-m4-1.tar.bz2 5043 BLAKE2B c855a8c114911c2bec1bd582c19ef09f731a8df2c22a400a895d63ad5c4a32ad393330b47ee75fb7d8943a230df6d750094457e2021025035e91e5b1cf470e6b SHA512 fcf4d8a77cc80bc04a444a4faa9e072ea1e00950b3ce685b7944302d2ee3ebdfc5ec29ccb311495ee2e1fb5e61cc2d49350b303288d1d86430fa6bc8b3772483
 DIST xosd_2.2.14-2.1.debian.tar.xz 17276 BLAKE2B 77caf1f33ba66698ab7f1894da3da27e754fe5989814427de804b9797f71930e2d52ced403f72cdbac9522337876bec2c93fc83b0d97f7e0d05f8b78337d0b34 SHA512 ba5d86d2391e6dfdc6a2994e486f9c5ecd1934438815f4dc01c0633192d74a2fa2cabe647574052c4a87203e0c12b9bb8c38851975c36f19d113787dae3681ee
 DIST xosd_2.2.14.orig.tar.gz 418331 BLAKE2B 2f7b8fbc31a2341ede7bc85c35ede4209c1d3a74ce07dbc62f302aa6d81a00e5e0dd4880d8ac290c0ff0f3babfcdb8b5975f7375cdafdc87fa0747c8ed8295ad SHA512 3caf6d106d34488f4823e2a58fdff7a69b90f505b8da2443485167ff0362c6f27614c9a5019e738ff1f897d3c2249c934ff60953e3775566d66e8e9b30e4e473
-EBUILD xosd-2.2.14_p2_p1.ebuild 1278 BLAKE2B f082db2048d2c313ac1001f1d5d92fe2b900c515719fd51a8b3ae740f7b762a2117b24b3af3e5c49b41387d7e0c3a68d023994edd083a3ca0cc8aee5aa47bb36 SHA512 c629751377a885df7e192ced7f191316bdc0740b662db3ba9be29728e8182076eb114eb4556662b870e85222606eb8b3cd9adb208f3edd1dc196927d295b7557
+EBUILD xosd-2.2.14_p2_p1.ebuild 1279 BLAKE2B 19827ab402f39c742592f046948b918bc5be45355e48277afd4fa3fc7e6162b71d21230bbb0b6715c2f87ef3f490e245856fa0748a1c3f3ab18a5285f813fab6 SHA512 76acc63b1fff7afbf90ae53ea00fe975e59c6992198c6c0fb69065ffab0baf7d63e6f1dbe4c62ed6a20cef64057823f89d36cad30ef628bb40c18c8be78150d4
 MISC metadata.xml 242 BLAKE2B 7363ed5aa4ab2d52ba96610654eeb5e2f2f8f0c2e5ca4f695f6ffa88af926130fcc9ea41257f281b542a45703848ecdf78ff99c89f1fbe51116d8e6234095782 SHA512 cf2d021687f90caa78f0f9738a07a81fb632ff35dd323dbe63b080f3985d9bcc665e5cf8549840e2369d1c4427f9831a0d61d20c4b65bab93794464a98f82519
diff --git a/x11-libs/xosd/xosd-2.2.14_p2_p1.ebuild b/x11-libs/xosd/xosd-2.2.14_p2_p1.ebuild
index a25c22f6e5fd..2b11d58b4a9a 100644
--- a/x11-libs/xosd/xosd-2.2.14_p2_p1.ebuild
+++ b/x11-libs/xosd/xosd-2.2.14_p2_p1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://debian/pool/main/x/xosd/${PN}_${MY_PV}.orig.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="static-libs xinerama"
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-libs/xtrans/Manifest b/x11-libs/xtrans/Manifest
index d7f76b243d90..7979869e1464 100644
--- a/x11-libs/xtrans/Manifest
+++ b/x11-libs/xtrans/Manifest
@@ -1,3 +1,3 @@
 DIST xtrans-1.4.0.tar.bz2 185371 BLAKE2B 15e5ff810f8df94fa6a050dab00158646003ecc7b200e199eb713d8bd6e7ca8df1769490ebc3d8b8920915bb5f2ede698f01a1a120ca09acfc85f225c4d618f8 SHA512 4fea89a3455c0e13321cbefa43340016dbb59bdd0dbdb5b796c1a6d2a6b1fd63cf1327b769ab426286b9c54b32ec764a50cd2b46228e4e43b841bda6b94de214
-EBUILD xtrans-1.4.0.ebuild 651 BLAKE2B f684ea05a77113fdf8cdb408a47e256c5a5283782fe35d9c5c08ce9580a9b234d8a53aeb3e2ef4faa29a97bdba1cf41505f1ddd3c6bbd6d408ad68e6ec9d3c05 SHA512 8b5479f7db5923de2e2b246128044d9cde7e54880c564c81b3cb6cb282ff35f1a94c5651774fb1ddc8d33fbe5444b6cd6593dfeff3862c5f465c6a44fd600cb9
+EBUILD xtrans-1.4.0.ebuild 643 BLAKE2B 9a40109cd19f95839f0e04cc28acc34219a47d7869346c982c849b359028d2691c33789f87b452e4baddd1a1377d96d1ff1cf48319f56541088513fa793e5359 SHA512 9c6ebd6eeac4cae32ad2093fd33dd6a2f2b4a6c4db78aac4b3833761ce50ad44a18acf576ed1fc9a8835807ecf3f35d5cd9b228b153241bb81d201c1cdddc25f
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/xtrans/xtrans-1.4.0.ebuild b/x11-libs/xtrans/xtrans-1.4.0.ebuild
index 7d8ee58460e1..ddb608057094 100644
--- a/x11-libs/xtrans/xtrans-1.4.0.ebuild
+++ b/x11-libs/xtrans/xtrans-1.4.0.ebuild
@@ -10,7 +10,7 @@ XORG_DOC=doc
 inherit xorg-3
 
 DESCRIPTION="X.Org xtrans library"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=""
author	V3n3RiX <venerix@redcorelinux.org>	2021-01-01 21:06:00 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2021-01-01 21:06:00 +0000
commit	129160ec854dca4c3fedb5bcfbcb56930371da0f (patch)
tree	53bf797418ac5e9b99c41ca0382c87b82421e5de /x11-libs
parent	441d1370330332b7d78f238d2f5e13f7aed5e4e0 (diff)