gentoo Easter resync : 12.04.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-04-12 03:41:30 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-04-12 03:41:30 +0100
commit: 623ee73d661e5ed8475cb264511f683407d87365 (patch)
tree: 993eb27c93ec7a2d2d19550300d888fc1fed9e69 /x11-libs
parent: ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (diff)
196 files changed, 593 insertions, 1489 deletions
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index e0f6316ed7a9..6c3811ffc2c1 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index 56d8b7980c69..2e83dff7cfce 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -4,6 +4,6 @@ AUX cairo-1.16.0-ft-Use-FT_Done_MM_Var-instead-of-free-when-available.patch 751
 AUX cairo-1.16.0-pdf-add-missing-flush.patch 914 BLAKE2B 6277dccf5e6fc70d885548b4814253084c5ba7946b29ee5c5209c2c207721d9699d9fbab83e40f6d10394e89fe7a23ea5dc194cfcb2495e3ac2b075e22fa83bb SHA512 569cc28538333cdd907e3c9f26dd6512e48188dcb761284f2414936d60d4239d7ac15a5836f1f390d4881cce71bfb62a0679e097386116ecf807ecd03bf0f03f
 AUX cairo-respect-fontconfig.patch 538 BLAKE2B 7cc137277ccb2e1d641fd8ca39ee7ccd0fd4981a07a25122387c2f1b6ca4cd89a830360357953706dee62e4233126cd0630e4622f0682f6782cd27fa31f20ecc SHA512 4d4d473f956b56f11b31f513de06751dcc77342e0f04ecf37064a74b8217f9d3536c0a8a41b09e580f34576ff2d06815b4cbc2bc091c201f947965509677415e
 DIST cairo-1.16.0.tar.xz 41997432 BLAKE2B aa37edf7fdf0c952484fd0adc9281724227db93958d6e4919216b30e9017fab670bc2340e3b975737080f1f67dec24025fe0e4680e275ab7703cfb9235eb1fe0 SHA512 9eb27c4cf01c0b8b56f2e15e651f6d4e52c99d0005875546405b64f1132aed12fbf84727273f493d84056a13105e065009d89e94a8bfaf2be2649e232b82377f
-EBUILD cairo-1.16.0-r3.ebuild 3896 BLAKE2B bfcedb2545157327f31d0e941e1a3bf0b8bb79cdd29a1a1f5f70a37decde66e9b05f38e152ce51d651bacfdc7901b5644440423feff97029a8080e4a34cf420e SHA512 c97b3ddd9b3b5aed1cb99348d9f3e82e76c5a053b25bc5a93251cddc257d704d8c7cd59f6c10812e6c2b86ee10e108de1de46e835989da3b0df3311ed64b0b6d
-EBUILD cairo-9999.ebuild 3779 BLAKE2B bd3415c9440e5b6a11a0324d5b3d7a3e224168e4a23f0098553b26e41e7e5ac3926278911ed1c94709ee52abbac97dcc622331e033ee0ca974a34a02b1b5cf0e SHA512 5977da525a738d51536adb855b5ecb043d0a8a9fe76adba73750eb7b7ab4ff4631331edb590dc7432dc2dc566a10d5fb14a5f42aeaf4ab3152d6d2d98d029208
+EBUILD cairo-1.16.0-r3.ebuild 3893 BLAKE2B 98e15a4b9625b26914e80598b84f47b7f8b85e8ab9a786f65f0fb78e96f407d814dd93e93da446b1ffbb6727df9d26f4b914151df174cefeae3754d8dc900ad8 SHA512 053b0d82dcba55dde60a6ffb9f7cefc018a511009c72ee27247575661274ad43483c3194c8cdbc68be2d3edbf33d58d6214bd3e715d706faed4ce0f062039c21
+EBUILD cairo-9999.ebuild 3775 BLAKE2B 881817b40ccafbf1b08d8625c14726e6cf4ef830a5db0db4ceb33184eb5281df9984ee8a878cd56817dd0cffd9b5c2f5cbd8f02584ae336462db73c7be6a11ce SHA512 b1a2b120987ca449367491559bb16af21e8b78ce0c4dc94f1284bc17068c04f387d816f6c8d15ccb0a822751260386f8e7b7640233b23fc57a6b6e9383d543db
 MISC metadata.xml 709 BLAKE2B 7cdfba4d24004ca9d45af33b49ec0f27344306a42d2269010957d085f527a8ef6e95b521f00344e3280852b1b57d06f4f84ead4b5e149baac7a2c5a48de44d14 SHA512 5ff7d97521b43486f6a9d51fe36c7546e229a66deeb308d9f5f84b5473678f5db869d3f58634d044fddc00af499a8e03699b22bca0582290b3a322dd6ae66b1b
diff --git a/x11-libs/cairo/cairo-1.16.0-r3.ebuild b/x11-libs/cairo/cairo-1.16.0-r3.ebuild
index 498e3f4cf191..541a19e9c301 100644
--- a/x11-libs/cairo/cairo-1.16.0-r3.ebuild
+++ b/x11-libs/cairo/cairo-1.16.0-r3.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~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 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A vector graphics library with cross-device output support"
diff --git a/x11-libs/cairo/cairo-9999.ebuild b/x11-libs/cairo/cairo-9999.ebuild
index 5c02af000a62..453aa1b0d5ea 100644
--- a/x11-libs/cairo/cairo-9999.ebuild
+++ b/x11-libs/cairo/cairo-9999.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~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 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A vector graphics library with cross-device output support"
diff --git a/x11-libs/fltk/Manifest b/x11-libs/fltk/Manifest
index ef89b5fe635c..4b122c4c8532 100644
--- a/x11-libs/fltk/Manifest
+++ b/x11-libs/fltk/Manifest
@@ -1,24 +1,13 @@
-AUX FLTKConfig.cmake 1217 BLAKE2B 72f293da76dfdf88d273db05f04bc9c16a3eedbd86c02fff8f0e43ab1edead74814a9fc91a9ffce63216032efe038b1e1bb64bf886bedeefb7a5333644dc131b SHA512 11fab963f33db7a7c86a10f9f5ddbfa99e718603e9338c23bc078ebdcc4e82f8fc4869a664f9eba9648ee22e5874471f9e7b45c92c8a1b7b72b8ce8ca084941e
 AUX fltk-1.3.0-share.patch 1843 BLAKE2B aff10c9f4ebf2512b89d641505d25a948bfcc594755139a592b9bb60a578e0e04f001362d43576fbe8719134e475db27409a125114d246a1ed702b2ccb43ece1 SHA512 d6c60614bc92125675758c1dbc635bd336282cef56844fe5c9de61c006a35359e521e01cda3ae20788f37f964d35b802e7ab286f4d5e10ca7e65a02955067af4
-AUX fltk-1.3.2-conf-tests.patch 2259 BLAKE2B 80139ba789e9b8e4251e9b109055e6199e98332aec39c530218a7764b44d939e260b7320a58ae09ae0147f2ffca854c879514e1a70372fc53848aa8a6c69765b SHA512 35d0ae931ef055066f71e674c2efe57b7f8d000a05632842e70c9dbf6736fe28810be25eb7a0a06ad739e72c758f60391373ce43be81ae4638e67f4d20852459
-AUX fltk-1.3.2-desktop.patch 420 BLAKE2B d00840d72c0d622c3bbfad719e7a1a2e96db6c4dfbc3534855bb98d34554c9be549b750db158c1972fa0c22d4d5cc0be93812ec4bd3e5c2a1ed871bac1575708 SHA512 be286fa414d9d7f411176f788e05f6ba43f6bccce2567430f42d2cd848b47aab6aaa9d0a7fb4453a30bc1a193c6c74e893a99311f6d73799259ea7faa042771c
-AUX fltk-1.3.2-jpeg-9a.patch 587 BLAKE2B a25a7993a40f20f83f22da01736001926132e56b21e040f58ca3557c27e90efd7c93b1c71151a5579ca77d6a38ad27f0ce5e5177dd7eea1f7faeb11e9a937bee SHA512 dd7e2c53cd9f114308be8098980de181d06a230f784ba494d13c9122fd46684dd234188c43d941d3f50c34a8f1f96f19f279bbab19954ed7c257d20a1d14eab1
-AUX fltk-1.3.3-fl_open_display.patch 210 BLAKE2B 75fd9035fd4e1fca29cf77ef80e3c66b5395bd867dd21212017fab19900f6c7dda02991dc762b8f58765a4f91541b9a2b0df27d7124d662e963e361e6690b6cb SHA512 902d69af29fa08dbb85ecadc709ea4c5999bee5d0acbb6338b62e2f561ae3baa90350fbd92c16791a58858635ffbdf9cc6512c54712abd1e2700f633122e082d
 AUX fltk-1.3.3-fltk-config.patch 374 BLAKE2B 586aed22e1661424b6221df46827c55204599095ca54a40582de7be04b495b02d23a87f047f5e4c9ecd25b3eaee2e79400ef8b5e41ffc5c2032be3e84f8fa8f7 SHA512 1e7bc815aed18708d7e7450079c9cb8d972b5d0f306bd665e0b89c4d108a7e8a21375e5ec1a5ef11114995d6a7997071040a76c4bfbb7b61a3e22f34be73b914
 AUX fltk-1.3.3-makefile-dirs.patch 230 BLAKE2B 517999f39b9de4f1f4f447e1d394ad562ead6354a94cf8a20e572182ab8f1e2e567406e07da365cc175ed427d9c94495f2287322cc6f6dc4ab24ffd43360472e SHA512 725cdbfa46b691a2adb55bb76fa44dc62cc1d8b83ad79c272bfee9dec9ec116cd1f974eba880e8f2a0d68365639cc4b65c40ca92304080f9cb73ce34a7f5df90
 AUX fltk-1.3.3-visibility.patch 781 BLAKE2B 7e909b6ec4ac6d915ac7dbab69a86b63166d002f23c51b770f6342d02cc0ea6d6bf1574aa40c25ed6cb5b2bc97c141f0787c67fa283ca8ef5b0753473d977713 SHA512 b9bf0ba24d27210702a98da3e5dbd4db7a36301a163ed8214362aaaa218bcc184d708fe1e249b5be4fd35e481dc5b85b2bf11db3e005436e57ad4436da2819df
-AUX fltk-1.3.3-xutf8-visibility.patch 4557 BLAKE2B 963c2dbc5d5466d3b5c35b411d53a59d4c8f08b186e9f14b67c5945ea3356ca697c804587b291fdee57c432d738106134dc12158230cc6236f4836fb39dc7e2d SHA512 621cedd0cb4516169f1c87e3286cad3ca9d1685509c7e944e3077243fbee57809d61c734757994d104630cee658d9962dc934cda82932a05e8d80611a1d5ac4d
 AUX fltk-1.3.4-conf-tests.patch 2259 BLAKE2B cb689918b807d75401ad3621deed635a883629c1e52ad0f797d77fb9e04aa28c9e9331399543f7d7fb63ca150f91d17ad0f7e71afef4364c505bf143bf3a7973 SHA512 a7ffb1c82e9a2c7bcfc7ffc1bfbf9fbf40daf4c5ca1ccb20c6e6d901846636de4c9166de8a63e739a730f4dc28c4527bec2c7390828611dc0b00b6c3e547b72e
-AUX fltk-1.3.4-freetype_pkgconfig.patch 1008 BLAKE2B ea91b4cf2b1a4cb26d7cb58d58b39e1851428fb2eacb13a30027cd315a7bb9c23109bc9abed954267d3d94494389ea8aad078a0d502cd1080cffacabec3c458e SHA512 8c13464b28639ae641e23aea799e23bfb6a4253fd8341ad656231116939f312e85b1117037089acbfce88c43a50a368493f311353b14dc0938444d56f49464f4
 AUX fltk-1.3.5-cmake.patch 975 BLAKE2B d8f068c7773522683797e2ad2059019abdaff79b0457f376b7e856419d1b1f7132de2215fbfa32cb00c5216cc7dd8f52df31ddf8c035e7c723474a3ad3b328d9 SHA512 bf67629bbc7a00b6b10a59028b56b69bb253510d0dce63a530b622e8caf71a7e3d84fae2100ffcbf8207990f61031bc5c330a239dd928440825564a8cae102de
 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.3-source.tar.gz 4986376 BLAKE2B 866d26cd8d7d1e985010f7601598ec87b44674f55d019239ebc0cbf8d70e04d9d1bce7a7c8463740bcd4c4a8ffcc8ef5e44b3f0cb591358d53d513844605c868 SHA512 277ba27e35c20e2d4fc5296bf418c5ab78c821870476e21d49f723765b99b3a559eed4ecd5215ac26d53a1091ada003e17f1553194cebaa97dd854809dd2885d
-DIST fltk-1.3.4-source.tar.gz 5284217 BLAKE2B 87da82cd04abe81cf095b92b997d4ca0fb7d77fbbb5602848f88ad79e5e41c9bff64b7c948b408b83833fcb658c07b3fe487f55c30357484fab444faca7e990f SHA512 92c236e426ad9b2a2954a6fc401bc9bf4c4c46d47b08f8c9b879da6031ac158ef9b944f28a8bea64d18072d1af8ceaa09c00abebd745fb76dd628636424446c2
 DIST fltk-1.3.5-source.tar.gz 5261324 BLAKE2B df05989d6581b570c689e29e9f31e5fc85fa91dee1296d70b5f5c3b4aab527749850ea78bec3ef5947151b21598c3bb04e52f78b5e6db179e7fd922627862b5e SHA512 db7ea7c5f3489195a48216037b9371a50f1119ae7692d66f71b6711e5ccf78814670581bae015e408dee15c4bba921728309372c1cffc90113cdc092e8540821
-EBUILD fltk-1.3.3-r3.ebuild 3768 BLAKE2B ded7bb2b8d768e1cff8fd0f05ee590721e61023a65b90be4b76e55c3a0e913fac784b500bd861f907dd94fefae3a9e3c877c9fe62244c1a8293cad73c6705bb6 SHA512 c3dff0663a97b4ea9b164dcc26e14f895080aaf9598f3f912f72797f670dbccccb2b9fa597a5f378cd77823177840fc64596c834d022a992d2ea469e075d0149
-EBUILD fltk-1.3.4.ebuild 4324 BLAKE2B 70e62743d4bcdd58e4650a8b38f1556cc06cdc77c6d453925878c72f16defeb032702ac4f10e29b2a979fbdafca958c3fd6468d1b1b5b7c0eb562991891383d0 SHA512 c889953042a4fc8843a2e2ab4cfea7019e668e09703f80e5b506c64345e3a723614aad2ff9335124c7bf8f48fffff5b3558f6f71ae25fffbf263be12de9e9d9e
-EBUILD fltk-1.3.5-r4.ebuild 4445 BLAKE2B a19ab85242cbc81e64f6111253a6e3319f6601e07787f34b4c2c29c5b13c459580e3cc866148a955c6b1585e3119d81d3a09d149c935ad93a0d8ff7c03d33572 SHA512 3e106bf157918b575fc43d565a6a8c0e0be84520d1f7cf9e01254d7da3e9d8c2a820ecff5320c44103f82937f77f91a87341d61ba9baacf604aadd885e30c7d2
+EBUILD fltk-1.3.5-r4.ebuild 4438 BLAKE2B 5acedca36b04560ac847112b0282c8d02a0aa7a68bdb0c525c5bc537864bbc0787f73c02af7bd1800f6f8a5da3769c5cd49ea238d477afe295bd655b34874bf7 SHA512 ff36a591984590fd580775a01d276ee5aa8ecc4bd663057262b3c6a92a1e741994b1e0bad000953539facba513d9d5533484a0b7c3d69a0ab906658f4464ae21
 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/files/FLTKConfig.cmake b/x11-libs/fltk/files/FLTKConfig.cmake
deleted file mode 100644
index 09427aac2aa5..000000000000
--- a/x11-libs/fltk/files/FLTKConfig.cmake
+++ /dev/null
@@ -1,37 +0,0 @@
-#-----------------------------------------------------------------------------
-#
-# FLTKConfig.cmake - FLTK CMake configuration file for external projects.
-#
-# This file is configured by FLTK and used by the UseFLTK.cmake module
-# to load FLTK's settings for an external project.
-
-# The FLTK source tree.
-# SET(FLTK_SOURCE_DIR "@FLTK_SOURCE_DIR@")
-
-# The FLTK include file directories.
-SET(FLUID_COMMAND "/usr/bin/fluid")
-SET(FLTK_EXECUTABLE_DIRS "/usr/bin")
-SET(FLTK_LIBRARY_DIRS "/usr/lib")
-SET(FLTK_LIBRARIES "fltk_images;fltk_gl;fltk_forms;fltk")
-SET(FLTK_INCLUDE_DIRS "/usr/include")
-
-# The C and C++ flags added by FLTK to the cmake-configured flags.
-SET(FLTK_REQUIRED_C_FLAGS "")
-SET(FLTK_REQUIRED_CXX_FLAGS "")
-
-# The FLTK version number
-SET(FLTK_VERSION_MAJOR "1")
-SET(FLTK_VERSION_MINOR "1")
-SET(FLTK_VERSION_PATCH "7")
-
-# Is FLTK using shared libraries?
-SET(FLTK_BUILD_SHARED_LIBS "ON")
-# SET(FLTK_BUILD_SETTINGS_FILE "@FLTK_BUILD_SETTINGS_FILE@")
-
-# The location of the UseFLTK.cmake file.
-SET(FLTK11_USE_FILE "/usr/share/cmake/Modules/FLTKUse.cmake")
-
-# # The ExodusII library dependencies.
-# IF(NOT FLTK_NO_LIBRARY_DEPENDS)
-#   INCLUDE("@FLTK_LIBRARY_DEPENDS_FILE@")
-# ENDIF(NOT FLTK_NO_LIBRARY_DEPENDS)
diff --git a/x11-libs/fltk/files/fltk-1.3.2-conf-tests.patch b/x11-libs/fltk/files/fltk-1.3.2-conf-tests.patch
deleted file mode 100644
index 74022a72ffb9..000000000000
--- a/x11-libs/fltk/files/fltk-1.3.2-conf-tests.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -100,9 +103,6 @@
- 	touch config.h
- 	chmod +x fltk-config
- 
--configure: configure.in
--	autoconf
--
- config.guess config.sub:
- 	-automake --add-missing 2> /dev/null
- 	if [ ! -e config.sub   ]; then echo NOTE: Using frozen copy of config.sub;   cp misc/config.sub   . ; fi
---- a/documentation/Makefile
-+++ b/documentation/Makefile
-@@ -84,11 +84,6 @@
- 	  $(INSTALL_DATA) fltk.pdf $(DESTDIR)$(docdir); \
- 	fi
- 	echo "Installing man pages in $(DESTDIR)$(mandir) ..."
--	-$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat1
--	$(INSTALL_MAN) $(SRC_DOCDIR)/fluid.$(CAT1EXT) $(DESTDIR)$(mandir)/cat1
--	$(INSTALL_MAN) $(SRC_DOCDIR)/fltk-config.$(CAT1EXT) $(DESTDIR)$(mandir)/cat1
--	-$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat3
--	$(INSTALL_MAN) $(SRC_DOCDIR)/fltk.$(CAT3EXT) $(DESTDIR)$(mandir)/cat3
- 	-$(INSTALL_DIR) $(DESTDIR)$(mandir)/man1
- 	$(INSTALL_MAN) $(SRC_DOCDIR)/fluid.man $(DESTDIR)$(mandir)/man1/fluid.1
- 	$(INSTALL_MAN) $(SRC_DOCDIR)/fltk-config.man $(DESTDIR)$(mandir)/man1/fltk-config.1
-@@ -96,10 +91,6 @@
- 	$(INSTALL_MAN) $(SRC_DOCDIR)/fltk.man $(DESTDIR)$(mandir)/man3/fltk.3
- 
- install-linux install-osx:
--	-$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat6
--	$(INSTALL_MAN) $(SRC_DOCDIR)/blocks.$(CAT6EXT) $(DESTDIR)$(mandir)/cat6
--	$(INSTALL_MAN) $(SRC_DOCDIR)/checkers.$(CAT6EXT) $(DESTDIR)$(mandir)/cat6
--	$(INSTALL_MAN) $(SRC_DOCDIR)/sudoku.$(CAT6EXT) $(DESTDIR)$(mandir)/cat6
- 	-$(INSTALL_DIR) $(DESTDIR)$(mandir)/man6
- 	$(INSTALL_MAN) $(SRC_DOCDIR)/blocks.man $(DESTDIR)$(mandir)/man6/blocks.6
- 	$(INSTALL_MAN) $(SRC_DOCDIR)/checkers.man $(DESTDIR)$(mandir)/man6/checkers.6
-@@ -108,17 +99,11 @@
- 
- uninstall:
- 	$(RMDIR) $(DESTDIR)$(docdir)
--	$(RM) $(DESTDIR)$(mandir)/cat1/fluid.$(CAT1EXT)
- 	$(RM) $(DESTDIR)$(mandir)/man1/fluid.1
--	$(RM) $(DESTDIR)$(mandir)/cat1/fltk-config.$(CAT1EXT)
- 	$(RM) $(DESTDIR)$(mandir)/man1/fltk-config.1
--	$(RM) $(DESTDIR)$(mandir)/cat3/fltk.$(CAT3EXT)
- 	$(RM) $(DESTDIR)$(mandir)/man3/fltk.3
- 
- uninstall-linux uninstall-osx:
--	$(RM) $(DESTDIR)$(mandir)/cat6/blocks.$(CAT6EXT)
--	$(RM) $(DESTDIR)$(mandir)/cat6/checkers.$(CAT6EXT)
--	$(RM) $(DESTDIR)$(mandir)/cat6/sudoku.$(CAT6EXT)
- 	$(RM) $(DESTDIR)$(mandir)/man6/blocks.6
- 	$(RM) $(DESTDIR)$(mandir)/man6/checkers.6
- 	$(RM) $(DESTDIR)$(mandir)/man6/sudoku.6
diff --git a/x11-libs/fltk/files/fltk-1.3.2-desktop.patch b/x11-libs/fltk/files/fltk-1.3.2-desktop.patch
deleted file mode 100644
index ef72ba9c3ec2..000000000000
--- a/x11-libs/fltk/files/fltk-1.3.2-desktop.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/fluid/fluid.desktop
-+++ b/fluid/fluid.desktop
-@@ -6,5 +6,5 @@
- Icon=fluid
- Terminal=false
- Type=Application
--MimeType=application/x-fluid
-+MimeType=application/x-fluid;
- Categories=Development;GUIDesigner;
---- a/fluid/x-fluid.desktop
-+++ b/fluid/x-fluid.desktop
-@@ -1,6 +1,6 @@
- [Desktop Entry]
- Type=MimeType
--MimeType=application/x-fluid
-+MimeType=application/x-fluid;
- Icon=fluid.png
- Patterns=*.fl
- Name=FLUID
diff --git a/x11-libs/fltk/files/fltk-1.3.2-jpeg-9a.patch b/x11-libs/fltk/files/fltk-1.3.2-jpeg-9a.patch
deleted file mode 100644
index ed487e7dc24d..000000000000
--- a/x11-libs/fltk/files/fltk-1.3.2-jpeg-9a.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-http://bugs.gentoo.org/479774
-
---- a/src/Fl_JPEG_Image.cxx
-+++ b/src/Fl_JPEG_Image.cxx
-@@ -155,7 +155,7 @@
-   
-   jpeg_create_decompress(&dinfo);
-   jpeg_stdio_src(&dinfo, fp);
--  jpeg_read_header(&dinfo, 1);
-+  jpeg_read_header(&dinfo, TRUE);
-   
-   dinfo.quantize_colors      = (boolean)FALSE;
-   dinfo.out_color_space      = JCS_RGB;
-@@ -337,7 +337,7 @@
-   
-   jpeg_create_decompress(&dinfo);
-   jpeg_mem_src(&dinfo, data);
--  jpeg_read_header(&dinfo, 1);
-+  jpeg_read_header(&dinfo, TRUE);
-   
-   dinfo.quantize_colors      = (boolean)FALSE;
-   dinfo.out_color_space      = JCS_RGB;
diff --git a/x11-libs/fltk/files/fltk-1.3.3-fl_open_display.patch b/x11-libs/fltk/files/fltk-1.3.3-fl_open_display.patch
deleted file mode 100644
index 562f1157038f..000000000000
--- a/x11-libs/fltk/files/fltk-1.3.3-fl_open_display.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/Fl_x.cxx
-+++ b/src/Fl_x.cxx
-@@ -2211,6 +2211,7 @@
-   static int result = -1;
-
-   if (result == -1) {
-+    fl_open_display();
-     result = 0;
-     unsigned long nitems;
-     unsigned long *words = 0;
diff --git a/x11-libs/fltk/files/fltk-1.3.3-xutf8-visibility.patch b/x11-libs/fltk/files/fltk-1.3.3-xutf8-visibility.patch
deleted file mode 100644
index f30105e18c06..000000000000
--- a/x11-libs/fltk/files/fltk-1.3.3-xutf8-visibility.patch
+++ /dev/null
@@ -1,165 +0,0 @@
---- a/src/xutf8/utf8Input.c
-+++ b/src/xutf8/utf8Input.c
-@@ -18,6 +18,7 @@
- 
- #include <config.h>
- #include "../Xutf8.h"
-+#include "../../FL/Fl_Export.H"
- #include <X11/X.h>
- #include <X11/Xlib.h>
- #include <X11/Xutil.h>
-@@ -53,7 +54,7 @@ typedef struct {
- #include "lcUniConv/jisx0212.h"
- #include "lcUniConv/ksc5601.h"
- 
--static int
-+FL_EXPORT static int
- XConvertEucTwToUtf8(char* buffer_return, int len) {
-   /* FIXME */
- #if HAVE_LIBC_ICONV
-@@ -120,7 +121,7 @@ XConvertEucTwToUtf8(char* buffer_return,
-   return l;
- }
- 
--static int
-+FL_EXPORT static int
- XConvertEucKrToUtf8(char* buffer_return, int len) {
-   int i = 0, l = 0;
-   char *buf;
-@@ -160,7 +161,7 @@ XConvertEucKrToUtf8(char* buffer_return,
-   return l;
- }
- 
--static int
-+FL_EXPORT static int
- XConvertBig5ToUtf8(char* buffer_return, int len) {
-   int i = 0, l = 0;
-   char *buf;
-@@ -189,7 +190,7 @@ XConvertBig5ToUtf8(char* buffer_return,
-   return l;
- }
- 
--static int
-+FL_EXPORT static int
- XConvertCp936extToUtf8(char* buffer_return, int len)
- {
-   int i = 0, l = 0;
-@@ -226,7 +227,7 @@ XConvertCp936extToUtf8(char* buffer_retu
-   return l;
- }
- 
--static int
-+FL_EXPORT static int
- XConvertGb2312ToUtf8(char* buffer_return, int len) {
-   int i = 0, l = 0;
-   char *buf;
-@@ -261,7 +262,7 @@ XConvertGb2312ToUtf8(char* buffer_return
-   return l;
- }
- 
--static int
-+FL_EXPORT static int
- XConvertEucCnToUtf8(char* buffer_return, int len) {
-   int i = 0, l = 0;
-   char *buf;
-@@ -300,7 +301,7 @@ XConvertEucCnToUtf8(char* buffer_return,
-   return l;
- }
- 
--static int
-+FL_EXPORT static int
- XConvertEucJpToUtf8(char* buffer_return, int len) {
-   int i = 0, l = 0;
-   char *buf;
-@@ -373,7 +374,7 @@ XConvertEucJpToUtf8(char* buffer_return,
-   return l;
- }
- 
--static int
-+FL_EXPORT static int
- XConvertEucToUtf8(const char*	locale,
- 		  char*		buffer_return, 
- 		  int		len, 
-@@ -408,7 +409,7 @@ XConvertEucToUtf8(const char*	locale,
-   return len;
- }
- 
--int
-+FL_EXPORT int
- XUtf8LookupString(XIC                 ic,
- 		  XKeyPressedEvent*   event,
- 		  char*               buffer_return,
---- a/src/xutf8/utf8Utils.c
-+++ b/src/xutf8/utf8Utils.c
-@@ -21,6 +21,7 @@
- #if !defined(WIN32) && !defined(__APPLE__)
- 
- #include "../Xutf8.h"
-+#include "../../FL/Fl_Export.H"
- 
- /*** NOTE : all functions are LIMITED to 24 bits Unicode values !!! ***/
- 
-@@ -29,7 +30,7 @@
-  * Returns the byte length of the converted UTF-8 char 
-  * Returns -1 if the UTF-8 string is not valid 
-  */
--int
-+FL_EXPORT int
- XConvertUtf8ToUcs(const unsigned char     *buf,
- 		  int                     len,
- 		  unsigned int         	  *ucs) {
-@@ -137,7 +138,7 @@ XConvertUcsToUtf8(unsigned int 	ucs,
-  * returns the byte length of the first UTF-8 char 
-  * (returns -1 if not valid) 
-  */
--int
-+FL_EXPORT int
- XUtf8CharByteLen(const unsigned char     *buf,
- 		 int                     len) {
-   unsigned int ucs;
-@@ -165,7 +166,7 @@ XCountUtf8Char(const unsigned char 	*buf
- /* 
-  * Same as XConvertUtf8ToUcs but no sanity check is done.
-  */
--int
-+FL_EXPORT int
- XFastConvertUtf8ToUcs(const unsigned char     *buf,
- 		      int                     len,
- 		      unsigned int            *ucs) {
---- a/src/xutf8/utf8Wrap.c
-+++ b/src/xutf8/utf8Wrap.c
-@@ -20,6 +20,7 @@
- #if !defined(WIN32) && !defined(__APPLE__)
- 
- #include "../Xutf8.h"
-+#include "../../FL/Fl_Export.H"
- #include <X11/Xlib.h>
- #include <ctype.h>
- #include <stdlib.h>
-@@ -705,7 +706,7 @@ XUtf8_measure_extents(
- /*****************************************************************************/
- /** returns the pixel width of a UTF-8 string				    **/
- /*****************************************************************************/
--int
-+FL_EXPORT int
- XUtf8TextWidth(XUtf8FontStruct 	*font_set,
- 	       const char 	*string,
- 	       int 		num_bytes) {
-@@ -815,7 +816,7 @@ XUtf8TextWidth(XUtf8FontStruct 	*font_se
- /*****************************************************************************/
- /**  get the X font and glyph ID of a UCS char                              **/
- /*****************************************************************************/
--int
-+FL_EXPORT int
- XGetUtf8FontAndGlyph(XUtf8FontStruct  *font_set,
- 		     unsigned int     ucs,
- 		     XFontStruct      **fnt,
-@@ -886,7 +887,7 @@ XGetUtf8FontAndGlyph(XUtf8FontStruct  *f
- /*****************************************************************************/
- /** returns the pixel width of a UCS char				    **/
- /*****************************************************************************/
--int
-+FL_EXPORT int
- XUtf8UcsWidth(XUtf8FontStruct  *font_set,
- 	      unsigned int     ucs) {
- 
diff --git a/x11-libs/fltk/files/fltk-1.3.4-freetype_pkgconfig.patch b/x11-libs/fltk/files/fltk-1.3.4-freetype_pkgconfig.patch
deleted file mode 100644
index 32dcd3016349..000000000000
--- a/x11-libs/fltk/files/fltk-1.3.4-freetype_pkgconfig.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -1005,13 +1005,13 @@
- 	AC_ARG_ENABLE(xft, [  --enable-xft            turn on Xft support [[default=yes]]])
- 
- 	xft_found=no
--	if test x$enable_xft != xno; then
--	    AC_PATH_PROG(FTCONFIG, freetype-config)
--
--	    if test "x$FTCONFIG" != x; then
--		CPPFLAGS="`$FTCONFIG --cflags` $CPPFLAGS"
--		CFLAGS="`$FTCONFIG --cflags` $CFLAGS"
--		CXXFLAGS="`$FTCONFIG --cflags` $CXXFLAGS"
-+	AS_IF([test x$enable_xft != xno], [
-+	    PKG_PROG_PKG_CONFIG
-+	    PKG_CHECK_MODULES(FREETYPE, freetype2, [
-+		CPPFLAGS="$FREETYPE_CFLAGS $CPPFLAGS"
-+		CFLAGS="$FREETYPE_CFLAGS $CFLAGS"
-+		CXXFLAGS="$FREETYPE_CFLAGS $CXXFLAGS"
-+	    ],AC_MSG_ERROR([No freetype found]))
- 
- 		AC_CHECK_LIB(fontconfig, FcPatternCreate)
- 		AC_CHECK_HEADER(X11/Xft/Xft.h,
-@@ -1019,8 +1019,7 @@
- 			[AC_DEFINE(USE_XFT)
- 			 LIBS="-lXft $LIBS"
- 			 xft_found=yes] ))
--	    fi
--	fi
-+	])
- 
- 	dnl Issue a warning message if Xft was not found, abort configure
- 	dnl if Xft was requested explicitly (but not found)
diff --git a/x11-libs/fltk/fltk-1.3.3-r3.ebuild b/x11-libs/fltk/fltk-1.3.3-r3.ebuild
deleted file mode 100644
index 6fecfbecb1e3..000000000000
--- a/x11-libs/fltk/fltk-1.3.3-r3.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils fdo-mime flag-o-matic ltprune
-
-DESCRIPTION="C++ user interface toolkit for X and OpenGL"
-HOMEPAGE="https://www.fltk.org/"
-SRC_URI="https://www.fltk.org/pub/${PN}/${PV}/${P}-source.tar.gz"
-
-SLOT="1"
-LICENSE="FLTK LGPL-2"
-KEYWORDS="~alpha amd64 arm 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="
-	>=media-libs/libpng-1.2:0
-	sys-libs/zlib
-	virtual/jpeg:0
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libXext
-	x11-libs/libXt
-	cairo? ( x11-libs/cairo[X] )
-	games? ( !sys-block/blocks )
-	opengl? ( virtual/glu virtual/opengl )
-	xft? ( x11-libs/libXft )
-	xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="
-	${RDEPEND}
-	x11-base/xorg-proto
-	doc? ( app-doc/doxygen )
-"
-
-src_prepare() {
-	rm -rf zlib jpeg png || die
-	epatch \
-		"${FILESDIR}"/${PN}-1.3.2-desktop.patch \
-		"${FILESDIR}"/${PN}-1.3.0-share.patch \
-		"${FILESDIR}"/${PN}-1.3.2-conf-tests.patch \
-		"${FILESDIR}"/${PN}-1.3.2-jpeg-9a.patch \
-		"${FILESDIR}"/${PN}-1.3.3-visibility.patch \
-		"${FILESDIR}"/${PN}-1.3.3-fl_open_display.patch \
-		"${FILESDIR}"/${PN}-1.3.3-fltk-config.patch \
-		"${FILESDIR}"/${PN}-1.3.3-xutf8-visibility.patch
-
-	sed -i \
-		-e 's:@HLINKS@::g' FL/Makefile.in || die
-	# some fixes introduced because slotting
-	sed -i \
-		-e '/RANLIB/s:$(libdir)/\(.*LIBNAME)\):$(libdir)/`basename \1`:g' \
-		src/Makefile || die
-	# docs in proper docdir
-	sed -i \
-		-e "/^docdir/s:fltk:${PF}/html:" \
-		-e "/SILENT:/d" \
-		makeinclude.in || die
-	sed -e "s/7/${PV}/" \
-		< "${FILESDIR}"/FLTKConfig.cmake \
-		> CMake/FLTKConfig.cmake || die
-	sed -e 's:-Os::g' -i configure.in || die
-
-	use prefix && append-ldflags -Wl,-rpath -Wl,"${FLTK_LIBDIR}"
-
-	# also in Makefile:config.guess config.sub:
-	cp misc/config.{guess,sub} . || die
-
-	eautoconf
-}
-
-src_configure() {
-	FLTK_INCDIR=${EPREFIX}/usr/include/fltk
-	FLTK_LIBDIR=${EPREFIX}/usr/$(get_libdir)/fltk
-
-	econf \
-		$(use_enable cairo) \
-		$(use_enable debug) \
-		$(use_enable opengl gl) \
-		$(use_enable threads) \
-		$(use_enable xft) \
-		$(use_enable xinerama) \
-		--disable-localjpeg \
-		--disable-localpng \
-		--disable-localzlib \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--enable-largefile \
-		--enable-shared \
-		--enable-xdbe \
-		--includedir=${FLTK_INCDIR} \
-		--libdir=${FLTK_LIBDIR}
-}
-
-src_compile() {
-	default
-
-	if use doc; then
-		emake -C documentation html
-	fi
-
-	if use games; then
-		emake -C test blocks checkers sudoku
-	fi
-}
-
-src_test() {
-	emake -C test
-}
-
-src_install() {
-	default
-
-	emake -C fluid \
-			DESTDIR="${D}" install-linux
-
-	if use doc; then
-		emake -C documentation \
-			DESTDIR="${D}" install
-	fi
-
-	local apps="fluid"
-	if use games; then
-		emake -C test \
-			DESTDIR="${D}" install-linux
-		emake -C documentation \
-			DESTDIR="${D}" install-linux
-		apps+=" sudoku blocks checkers"
-	fi
-
-	for app in ${apps}; do
-		dosym /usr/share/icons/hicolor/32x32/apps/${app}.png \
-			/usr/share/pixmaps/${app}.png
-	done
-
-	dodoc CHANGES README CREDITS ANNOUNCEMENT
-
-	if use examples; then
-		docinto examples
-		dodoc -r test/*.{h,cxx,fl} test/demo.menu
-	fi
-
-	insinto /usr/share/cmake/Modules
-	doins CMake/FLTK*.cmake
-
-	echo "LDPATH=${FLTK_LIBDIR}" > 99fltk
-	echo "FLTK_DOCDIR=${EPREFIX}/usr/share/doc/${PF}/html" >> 99fltk
-	doenvd 99fltk
-
-	# FIXME: This is bad, but building only shared libraries is hardly supported
-	# FIXME: The executables in test/ are linking statically against libfltk
-	if ! use static-libs; then
-		rm "${ED}"/usr/lib*/fltk/*.a || die
-	fi
-
-	prune_libtool_files
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/x11-libs/fltk/fltk-1.3.4.ebuild b/x11-libs/fltk/fltk-1.3.4.ebuild
deleted file mode 100644
index b8168ff96996..000000000000
--- a/x11-libs/fltk/fltk-1.3.4.ebuild
+++ /dev/null
@@ -1,187 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools fdo-mime flag-o-matic ltprune multilib-minimal
-
-DESCRIPTION="C++ user interface toolkit for X and OpenGL"
-HOMEPAGE="https://www.fltk.org/"
-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"
-IUSE="cairo debug doc examples games +opengl static-libs +threads +xft +xinerama"
-
-RDEPEND="
-	>=media-libs/libpng-1.2:0=[${MULTILIB_USEDEP}]
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-	virtual/jpeg:0=[${MULTILIB_USEDEP}]
-	x11-libs/libICE[${MULTILIB_USEDEP}]
-	x11-libs/libSM[${MULTILIB_USEDEP}]
-	x11-libs/libXcursor[${MULTILIB_USEDEP}]
-	x11-libs/libXext[${MULTILIB_USEDEP}]
-	x11-libs/libXfixes[${MULTILIB_USEDEP}]
-	x11-libs/libXt[${MULTILIB_USEDEP}]
-	cairo? ( x11-libs/cairo[${MULTILIB_USEDEP},X] )
-	games? ( !sys-block/blocks )
-	opengl? (
-		virtual/glu[${MULTILIB_USEDEP}]
-		virtual/opengl[${MULTILIB_USEDEP}]
-	)
-	xft? ( x11-libs/libXft[${MULTILIB_USEDEP}] )
-	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto
-	doc? ( app-doc/doxygen )
-"
-
-DOCS=(
-	ANNOUNCEMENT
-	CHANGES
-	CREDITS
-	README
-)
-FLTK_GAMES="
-	blocks
-	checkers
-	sudoku
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.3.0-share.patch
-	"${FILESDIR}"/${PN}-1.3.3-fltk-config.patch
-	"${FILESDIR}"/${PN}-1.3.3-makefile-dirs.patch
-	"${FILESDIR}"/${PN}-1.3.3-visibility.patch
-	"${FILESDIR}"/${PN}-1.3.4-conf-tests.patch
-	"${FILESDIR}"/${PN}-1.3.4-freetype_pkgconfig.patch
-)
-
-src_prepare() {
-	default
-
-	rm -rf zlib jpeg png || die
-
-	sed -i \
-		-e 's:@HLINKS@::g' FL/Makefile.in || die
-	# docs in proper docdir
-	sed -i \
-		-e "/^docdir/s:fltk:${PF}/html:" \
-		-e "/SILENT:/d" \
-		makeinclude.in || die
-	sed -e "s/7/${PV}/" \
-		< "${FILESDIR}"/FLTKConfig.cmake \
-		> CMake/FLTKConfig.cmake || die
-	sed -e 's:-Os::g' -i configure.ac || die
-
-	# also in Makefile:config.guess config.sub:
-	cp misc/config.{guess,sub} . || die
-
-	cp fluid/{,x-}fluid.desktop || die
-
-	eaclocal
-	eautoconf
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	unset FLTK_LIBDIRS
-
-	local FLTK_INCDIR=${EPREFIX}/usr/include/fltk
-	local FLTK_LIBDIR=${EPREFIX}/usr/$(get_libdir)/fltk
-	FLTK_LIBDIRS+=${FLTK_LIBDIRS+:}${FLTK_LIBDIR}
-
-	multilib_is_native_abi && use prefix &&
-		append-ldflags -Wl,-rpath -Wl,"${FLTK_LIBDIR}"
-
-	econf \
-		$(use_enable cairo) \
-		$(use_enable debug) \
-		$(use_enable opengl gl) \
-		$(use_enable threads) \
-		$(use_enable xft) \
-		$(use_enable xinerama) \
-		--disable-localjpeg \
-		--disable-localpng \
-		--disable-localzlib \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--enable-largefile \
-		--enable-shared \
-		--enable-xcursor \
-		--enable-xdbe \
-		--enable-xfixes \
-		--includedir=${FLTK_INCDIR} \
-		--libdir=${FLTK_LIBDIR}
-}
-
-multilib_src_compile() {
-	# Prevent reconfigure on non-native ABIs.
-	touch -r makeinclude config.{guess,sub} || die
-
-	default
-
-	if multilib_is_native_abi; then
-		emake -C fluid
-		use doc && emake -C documentation html
-		use games && emake -C test ${FLTK_GAMES}
-	fi
-}
-
-multilib_src_test() {
-	emake -C fluid
-	emake -C test
-}
-
-multilib_src_install() {
-	default
-
-	if multilib_is_native_abi; then
-		emake -C fluid DESTDIR="${D}" install-linux install
-
-		use doc && \
-			emake -C documentation DESTDIR="${D}" install
-
-		use games && \
-			emake -C test DESTDIR="${D}" install-linux
-	fi
-}
-
-multilib_src_install_all() {
-	for app in fluid $(usex games "${FLTK_GAMES}" ''); do
-		dosym \
-			/usr/share/icons/hicolor/32x32/apps/${app}.png \
-			/usr/share/pixmaps/${app}.png
-	done
-
-	if use examples; then
-		docinto examples
-		dodoc -r test/*.{h,cxx,fl} test/demo.menu
-	fi
-
-	insinto /usr/share/cmake/Modules
-	doins CMake/FLTK*.cmake
-
-	echo "LDPATH=${FLTK_LIBDIRS}" > 99fltk || die
-	echo "FLTK_DOCDIR=${EPREFIX}/usr/share/doc/${PF}/html" >> 99fltk || die
-	doenvd 99fltk
-
-	# FIXME: This is bad, but building only shared libraries is hardly supported
-	# FIXME: The executables in test/ are linking statically against libfltk
-	if ! use static-libs; then
-		rm "${ED}"/usr/lib*/fltk/*.a || die
-	fi
-
-	prune_libtool_files
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/x11-libs/fltk/fltk-1.3.5-r4.ebuild b/x11-libs/fltk/fltk-1.3.5-r4.ebuild
index 30f91c3198fd..56edcb354e2f 100644
--- a/x11-libs/fltk/fltk-1.3.5-r4.ebuild
+++ b/x11-libs/fltk/fltk-1.3.5-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 6c00d6b5f204..2cb3f055ee0d 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 536 BLAKE2B abab0c02d26d546ec1c86dd2657a360799956d51501ff706446fa0be11934833a00059e833c51ef6bb6b30e5989cb45e49463a7be16ec6468d2433f25c57cd67 SHA512 a5c237e69c304858ac9768c29e4519026ecd2e1a32570dcc19852fbf61f2075b5b2549bf1d8831560df58d532bd406e3abff20a4b69481235b3c1fd676abb7ea
+EBUILD fox-wrapper-2.ebuild 537 BLAKE2B 024653c139e30f29b1404dd71640fb04eba065cc7e2dc5c7a8ae2594702a02739cef6115b90188a15705741b2d44a6cdba4489c268c6ea230652346c44331b02 SHA512 25a4b2174120b11e5745da741f85c57479e7a011aa244a56d5949837579c1c8b5dcd77799b885f9a672960e08ce7225cc65c89aab4c48ce8e97510d28295ad46
 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 31128f89cf4d..b4b834556c50 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/gdk-pixbuf/Manifest b/x11-libs/gdk-pixbuf/Manifest
index 931a2102287a..8a5de0f5c1e0 100644
--- a/x11-libs/gdk-pixbuf/Manifest
+++ b/x11-libs/gdk-pixbuf/Manifest
@@ -1,4 +1,4 @@
 AUX gdk-pixbuf-2.32.3-fix-lowmem-uclibc.patch 1075 BLAKE2B e6fc37605b136d12dbc7e7c95c59ec0b8d5f65f72c1675186b0c0cc105be5537e7b4660730dce3799227217a582a64f295afbd33a8cf52071f5fe8c4e153c0d3 SHA512 0a3e51c52f947d6231b472525b11e13fdc752b8eaa34c95ec3c76cfb0faf33ef3109c8381189261e8ebae76a4070af24e58c373bebc69bbb6b69399bf833395d
 DIST gdk-pixbuf-2.40.0.tar.xz 5512160 BLAKE2B 26049a9ede60e7a50bdc5e9a731136e4bc6de031d01abd42667a0bf92617c36bcdc61d2dc18beb3c5223e32eab461ddb9fc9880a014ac1154763d3b7ee3e7200 SHA512 6512befd379494dbfd89a16fc4c92641842eb7b82fc820ec83a5b057526209947db646570db1124c073b0ef69c117bdf0f8d3fea807e302a4950db39187c35aa
-EBUILD gdk-pixbuf-2.40.0.ebuild 3853 BLAKE2B 3e17902fa0abb0d16c8d7ceacbf5550220fa45f0dfe66cd3b02a044043b944ab10447d41c9b9275235d55d7682fbeab560e88b2b538b4afb1c9ae4739849581e SHA512 8c8dcd94309cb046abbd1680a3b2e2a46f6f938e1fbbc921658b94709b66058ec406b927ca8abd821e82ff3aa215e49984745834c5da225d55b2c33775cfa045
+EBUILD gdk-pixbuf-2.40.0.ebuild 3859 BLAKE2B 6323340183ab63df29d32bc7f207714e59fe85269fa12005189a2004f6e8f08137c0555de2a06cc6b53e7744ded3bc6968f30b71e3973da0c4ebd90dd7d96d74 SHA512 916e1b6f5dc694533109a32f343ecca40602e752e4c38ae16d19d53a961aa8857cd624fa99787818cbfab1ab7c73ac38f182a655556d7502e707b579f5bce86b
 MISC metadata.xml 424 BLAKE2B 07b31586e47af1803baf8ce93c9e61334fbe566e8fae5bcc9d442d09b3ddfc51b06be8f02ffebf663b0307130c57e94b63ff57a83856ebec755704b8d3b232bd SHA512 3ef93327d28195a186bcc16c8acbb931c2cedcc7893173ca76af0db90eb088a838f5cb1c2f43f4b72fcf9067f6c483c96a5549c57c3542cccbb70450cce485bd
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.40.0.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.40.0.ebuild
index 19b9055466f0..a9771c2a5045 100644
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.40.0.ebuild
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.40.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://git.gnome.org/browse/gdk-pixbuf"
 
 LICENSE="LGPL-2+"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~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 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="X gtk-doc +introspection jpeg tiff"
 
 # TODO: For windows/darwin support: shared-mime-info conditional, native_windows_loaders option review
@@ -32,7 +32,7 @@ RDEPEND="${DEPEND}
 	!<x11-libs/gtk+-2.21.3:2
 	!<x11-libs/gtk+-2.90.4:3
 "
-DEPEND="
+DEPEND="${DEPEND}
 	app-text/docbook-xsl-stylesheets
 	dev-libs/libxslt
 	dev-util/glib-utils
diff --git a/x11-libs/gnome-pty-helper/Manifest b/x11-libs/gnome-pty-helper/Manifest
index 55380104203a..6d3a560ce6d0 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 805 BLAKE2B 1b04600f62cc8c7370596580a20e389c00c12e9731632c3ab41a3e9756800df38b696c66fbaab9914058c03a45842ada37440d8e2324f3e04e1a557d6c8e6be2 SHA512 5801184c76256fdea7efcb6972d66a7fe94f498a7bf133108be7cebbb85386c5c9afdefb211353d37f1d7573094e656933353693322d8ae3ab16fca068a08831
+EBUILD gnome-pty-helper-0.40.2.ebuild 802 BLAKE2B e288a19e0eda05da2cab73081509dc6969bd716a56d92c95f2a1ab833b85e17d5febfd82e360b663f0e23e0ba1efbf476242972abcbb0660677cc34839f907b3 SHA512 a46f1e7e36cc696492b10f9e61b24ed948c6c588e9f7b7a3d8ea2849d4aae3c799644d9528e0ffa56a200f364043c1e27f2378dcc6af17d2011b68ef3db9e76c
 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 734617aba405..32bdb56b0881 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 ~sh 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/goffice/Manifest b/x11-libs/goffice/Manifest
index 922c794cf6e2..f9034f6044cd 100644
--- a/x11-libs/goffice/Manifest
+++ b/x11-libs/goffice/Manifest
@@ -1,8 +1,3 @@
-AUX 0.10.43-unittest-build-failure.patch 545 BLAKE2B 9157ee511bbc09a7cf9d091a4fc57250a533b8028e69dc3ace6d4b10ce6809b7f7d9fa1941505c12cba943657636bd69ad94a52f8c0bfbc5fa1e17ebced5b6c2 SHA512 2f0a4485a458efc7ad0c77ab8ada1cb1833834b1eb3fe3f0d623f963ba65555c5af53b9dbbcf9b1b75d54f19c3873820c839468b361ffca28e6734adab7c3ecb
-DIST goffice-0.10.41.tar.xz 2381656 BLAKE2B 7d73b892d91f917e3a47058f508094a16bb50860686dcf33c68ac8028b40e7ba74cc276f276672f29ddafef73b03887cf6280a2812305bd9b24ae3021c319d25 SHA512 d4b6a30b2b5d92e7500a1810626d20a2d4e5f66c1a879c904fe57df384bf4a480de322e9ae0a5fe7a44e73e060d9a33da6d56cd051c3d6cb1ebf0eae09fda2f8
-DIST goffice-0.10.43.tar.xz 2381804 BLAKE2B 60e305620118f80595a0dfec8192648273f845c9f868142adb957796ee291e1e53b0f3d3f2446064d8014ec54e7008ac03eca7f2f4925efa00ff42b98810371b SHA512 979ccf67fe08d09a2cf0413b4674a44208aa5f4802ab086a463ea2b449fc8c9d1c96dea7234c8e715064cf1726a47d2a5428728a2ff0d00759d5fe7017dc709f
 DIST goffice-0.10.46.tar.xz 2397976 BLAKE2B a05696cde60b1cb1ee915bebd3a6e99d1f0a31dc232481615a1c6bbc05ee5433cdebfb05d96160026b260c752c2cfb11c0aecc338079cda66fd40b653fb8b0d1 SHA512 23714fef4dabccc76fe96b78d8eba9c9adb01cb9b3e2f1a9768598fb2a82742b2d2060a7d2548279998488c59e313d7a5863a96b2eb380f540b61fb08e0330f3
-EBUILD goffice-0.10.41.ebuild 1244 BLAKE2B 4d077c53840c1be6be76cd262fa4c1b9798861a429d5c1d4f9441e6f38e83162e24b478721b1dc14e9445582dddd2402a6fcc1d95da991f1da6f5f4d3c84535b SHA512 22a5e59c0b30d031841849c89dbc8258fd9bdd55b62aed930727fc4c33482672b8b464fc0d57f35ee9b0b2ed68f0dc1372d3093da81f3fb2747abc2845372f6f
-EBUILD goffice-0.10.43.ebuild 1370 BLAKE2B 7a40e2ca6b0cff35e67066879d46353979ad0549888672a5afcac8629fb892b037a4b8f12d6a4b7092bbeda9b9e70727b3486b72a4f34689ecd26c9e45757635 SHA512 e068b527f8b5438101310b27b7bccda66ce68dac8c82b8cd1c39ee6b8f99f6c84e349acf15615f67f62cd2c0a09366239501c5732981ac8337565ca2e0c82af0
-EBUILD goffice-0.10.46.ebuild 1435 BLAKE2B 21b3248acb696e0110696071828797afe67d49952a4a3a43acef2c016eea09020309837cb8ce418c19a0a345721614b57f56da5ccf971a4fcdcfef7b806412d3 SHA512 992c2f665ee577dd8b459f7e2b7a83c720c4150ce9e5ee9b7f5639fbcb7feeb14c0549bc9040995c0f9f0e21c558273872de9d62c015597a5befb791d411ea2d
+EBUILD goffice-0.10.46.ebuild 1433 BLAKE2B 27245a4417af2d02a716e2a1d15150e51cec6ff313bf3e71672fa9c65bba7002f5caaa43ced59f322ed22e8ae50b98ffebadff79e6acbae18e1636c38dea5c9b SHA512 2e86d28586e2fc09a316f601d123d6dafbc3f66be7a933d3560584ac0474bc773f5d63bbf1e0dd25bd8052aacaa5202a3c1f02ff1df221c71703eee0ef01c655
 MISC metadata.xml 441 BLAKE2B d1239d813165b887ed43610e0b9a09afd739164ecf52a0b6a94e957550b5dec5e18dbf5777e4b7bf8e1d665edf89bc5777ad90ebd93caeab5af6fc2882eb3469 SHA512 69e822f6c8ecb89ae952b30074c2527e8283eeabe32ac6555d043576b21d0f5a40b968b0211574ce8b1836dac85370070ee86905551bdd8cf2418cdc2ac6c3ce
diff --git a/x11-libs/goffice/files/0.10.43-unittest-build-failure.patch b/x11-libs/goffice/files/0.10.43-unittest-build-failure.patch
deleted file mode 100644
index 8b9e89c3cf13..000000000000
--- a/x11-libs/goffice/files/0.10.43-unittest-build-failure.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 54098b6cd7dddc573b937f45048dd8a434f581af Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Sat, 17 Nov 2018 16:30:30 +0100
-Subject: [PATCH] Add missing string.h include
-
----
- tests/test-quad.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/tests/test-quad.c b/tests/test-quad.c
-index 49d751e8..379d91ed 100644
---- a/tests/test-quad.c
-+++ b/tests/test-quad.c
-@@ -1,3 +1,4 @@
-+#include <string.h>
- #include <goffice/goffice.h>
- 
- // A rather expensive way of forcing the compiler to drop any excess
--- 
-2.19.1
-
diff --git a/x11-libs/goffice/goffice-0.10.41.ebuild b/x11-libs/goffice/goffice-0.10.41.ebuild
deleted file mode 100644
index bf0f4ec8c4be..000000000000
--- a/x11-libs/goffice/goffice-0.10.41.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="A library of document-centric objects and utilities"
-HOMEPAGE="https://git.gnome.org/browse/goffice/"
-
-LICENSE="GPL-2"
-SLOT="0.10"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
-IUSE="+introspection"
-
-# FIXME: add lasem to tree
-RDEPEND="
-	>=app-text/libspectre-0.2.6:=
-	>=dev-libs/glib-2.38.0:2
-	dev-libs/libxslt
-	>=gnome-base/librsvg-2.22:2
-	>=gnome-extra/libgsf-1.14.24:=[introspection?]
-	>=dev-libs/libxml2-2.4.12:2
-	>=x11-libs/pango-1.24:=
-	>=x11-libs/cairo-1.10:=[svg]
-	x11-libs/libXext:=
-	x11-libs/libXrender:=
-	>=x11-libs/gdk-pixbuf-2.22:2
-	>=x11-libs/gtk+-3.20:3
-	introspection? (
-		>=dev-libs/gobject-introspection-1:=
-		>=gnome-extra/libgsf-1.14.23:= )
-"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	virtual/perl-Getopt-Long
-	virtual/perl-IO-Compress
-	virtual/perl-Compress-Raw-Zlib
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.12
-	>=dev-util/intltool-0.35
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome2_src_configure \
-		--without-lasem \
-		--with-gtk \
-		--with-config-backend=gsettings \
-		$(use_enable introspection)
-}
diff --git a/x11-libs/goffice/goffice-0.10.43.ebuild b/x11-libs/goffice/goffice-0.10.43.ebuild
deleted file mode 100644
index c6f1937ccbd7..000000000000
--- a/x11-libs/goffice/goffice-0.10.43.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="A library of document-centric objects and utilities"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/goffice/"
-
-LICENSE="GPL-2"
-SLOT="0.10"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
-IUSE="+introspection"
-
-# FIXME: add lasem to tree
-RDEPEND="
-	>=app-text/libspectre-0.2.6:=
-	>=dev-libs/glib-2.40.0:2
-	>=dev-libs/libxml2-2.4.12:2
-	dev-libs/libxslt
-	>=gnome-base/librsvg-2.22:2
-	>=gnome-extra/libgsf-1.14.24:=[introspection?]
-	>=x11-libs/cairo-1.10:=[svg]
-	>=x11-libs/gdk-pixbuf-2.22:2
-	>=x11-libs/gtk+-3.20:3
-	>=x11-libs/pango-1.24:=
-	x11-libs/libXext:=
-	x11-libs/libXrender:=
-	introspection? (
-		>=dev-libs/gobject-introspection-1:=
-		>=gnome-extra/libgsf-1.14.23:= )
-"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.12
-	>=dev-util/intltool-0.35
-	virtual/perl-Compress-Raw-Zlib
-	virtual/perl-Getopt-Long
-	virtual/perl-IO-Compress
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	# https://gitlab.gnome.org/GNOME/goffice/merge_requests/2
-	"${FILESDIR}"/${PV}-unittest-build-failure.patch
-)
-
-src_configure() {
-	gnome2_src_configure \
-		--without-lasem \
-		--with-gtk \
-		--with-config-backend=gsettings \
-		$(use_enable introspection)
-}
diff --git a/x11-libs/goffice/goffice-0.10.46.ebuild b/x11-libs/goffice/goffice-0.10.46.ebuild
index 12d2ce5eb098..e6023df8247a 100644
--- a/x11-libs/goffice/goffice-0.10.46.ebuild
+++ b/x11-libs/goffice/goffice-0.10.46.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/goffice/"
 
 LICENSE="GPL-2"
 SLOT="0.10"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
 IUSE="+introspection"
 
 # FIXME: add lasem to tree
diff --git a/x11-libs/goocanvas/Manifest b/x11-libs/goocanvas/Manifest
index 13b8b63be529..d58dcdb3e769 100644
--- a/x11-libs/goocanvas/Manifest
+++ b/x11-libs/goocanvas/Manifest
@@ -1,6 +1,6 @@
 AUX goocanvas-1.0.0-gold.patch 848 BLAKE2B 5d808bc92fa4acedd0be7610e8b75030a35934ade2b9a361b648aa119816d90fb0fa24b2ac148ebfa6b06df985ebd19ab0c4bfe7b091d559a7dc859652052f5c SHA512 8e61ca8a0e9d673bc77a90e9c8f8a5107717df32d094b34aed04ea2bb56383fd2a018e3fd3a4ece5b18a754adc83d29095a80fb0a34e24db0cd900a6fa8cefea
 DIST goocanvas-1.0.0.tar.bz2 570552 BLAKE2B 00b1a3d59448cc2f40dd20b0c97977cfc477a6656f32e2106b3f3bd5c42b8b625e270d9f96de44f30caf83b744b331699e7c6385b5269bf7b22e3bb25a879948 SHA512 fef4364b57dc777b6dcceb026f940121a24a8a3792e8d37d320eb47b7747ab0d54d8d7911b4ff77c21ca2b251937c9312da04221bbc246a07bbf4062689de644
 DIST goocanvas-2.0.4.tar.xz 584272 BLAKE2B 027ab47c1e9c241f74509001426367e86025ec8ea5901cf64c2014f8c32b83ce60870ca754dd15e8982a7023b77d3856b39dbbbdd636de6da47d361cb15a940e SHA512 e57dfd59d9b9cb64deadfeac193c11a89347c7f0e966377cfb98afcc2b46be13fe05d253a96e63dc7e6981c75e6e871040b83d8d0aee95cb62b79965d6be5688
-EBUILD goocanvas-1.0.0.ebuild 1265 BLAKE2B 163a0def631552a3139501755cb1d56d703dec22eed75b3825c67d7b2137fe6b1ba5f4e7401ea06ab4eb1cc245753a5ac981919d6bfe765fbc0af56a2ebce4bb SHA512 3683913dd837b030e44fe1a8e6fa1cbe88ed906fddba7eaecf344544f5a25bb7cd6ffe555e92efe54153d782d7d4768a63e0ae6b37e9afd290a2d2f7dbddda16
-EBUILD goocanvas-2.0.4.ebuild 1620 BLAKE2B d9fb82c529c2ca45208c1599b23a28afe0c12c454786b25cc3f8ca9bee26f6393ac60569792480dbe3117debeab283860b211c5c6d596126d84667db0670b97e SHA512 e9f2a8c6d92ef25153f8c15890ee9b30adef779789d80fb7d8a35e51df1cda907f0c2dce0f5e4859b75f60658d0bea9eed2f9abe73a19962dedd8de8428181a7
+EBUILD goocanvas-1.0.0.ebuild 1266 BLAKE2B 6a55137d0ae30995f922cd70525420f3bf7fb351ef0091728ded8d59646e30f825e7f82d3e5f96eb06cd8d8b0dcacadcb90f1f5c108c1de009a20c73f453a06d SHA512 584d3fccd213dff57f61b25d57a37fdbdf5c3c6ade0ef400cccd83cc8b724aa76d02d482643412b5fa42117658d3c85233ff6d0174fdbbcd8999b9d2d28ef2b4
+EBUILD goocanvas-2.0.4.ebuild 1621 BLAKE2B 80a626c3d7bb409b262c5e7757d4c3095fc7b5a68f76f777a98a2a95ae4bf692bd6a6d8ca791ac01c967b9d28fa1afcf0762da8d647102dea51fd7092a475eb1 SHA512 e773c3f8fc4d2f19efadea630557d278e1a7159d2d1c239ab5828cb8843b378c5bdeb94eabfd018b2e6037d36d16d736f706cf0323895dfc60193774a70ef220
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/x11-libs/goocanvas/goocanvas-1.0.0.ebuild b/x11-libs/goocanvas/goocanvas-1.0.0.ebuild
index 0fe33b0d0fc4..21cdeed5f8d9 100644
--- a/x11-libs/goocanvas/goocanvas-1.0.0.ebuild
+++ b/x11-libs/goocanvas/goocanvas-1.0.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GooCanvas"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 RDEPEND="
diff --git a/x11-libs/goocanvas/goocanvas-2.0.4.ebuild b/x11-libs/goocanvas/goocanvas-2.0.4.ebuild
index 1ae9aa589c1a..ebee51dd3a38 100644
--- a/x11-libs/goocanvas/goocanvas-2.0.4.ebuild
+++ b/x11-libs/goocanvas/goocanvas-2.0.4.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/GooCanvas"
 
 LICENSE="LGPL-2"
 SLOT="2.0"
-KEYWORDS="~alpha amd64 ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86"
 IUSE="examples +introspection python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 172db6a42f63..9a3fe002ebea 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -6,12 +6,9 @@ AUX gtkrc 627 BLAKE2B 57af25dcadfa09ea784ac485db383753deda23c42ce22582f03041abf7
 AUX settings.ini 96 BLAKE2B dd0ffe58f3c702d0518e1ad59930a511f98fd1b6e7139b2b2293a3dc8b0419a63a14260ba75b30dc9197f0423a375c675b4f3b34d593ce12828192d18e539fbb SHA512 76eff45e3413ed7b2fb6bb557c363cd6d8a65ae505709cf5ce26d579470e38968d51e72615779f47fac2994937a3c64ac4143c6cbd2cf5a2db23a01bcd9b6418
 DIST gtk+-2.24.32-patchset-r1.tar.xz 13364 BLAKE2B 15e5429b11cc4ccef1bf44105c790b5325e833ab12f393fe718c06470b90f3e4004bea4b51076a725f4bb10bcfd0c48b7063d9b9b021919ad0367d1b981be980 SHA512 1a15dce7578a914585981426d2e5d1cc45866866a70c3f443d1867ab1c0c28fb279bde6c3117b28eec2758a62c1b54bb6fb1b382ad6e9a7cf0114b13f2afd858
 DIST gtk+-2.24.32.tar.xz 12620860 BLAKE2B 03f4c0a8be98473f62bc8c86859937969c4169960a5f93d37ff6dcde00413215fa6c7125b15781bf50d67b40aa0056cb71b83fb50acb2c3467b5deb3c8d938f0 SHA512 8e8fd9ae32f1d6fb544da260f00599f0f05090d910d767b06ef086ab4f1f8373a29bb0da9767761c9b5f4cfd51b5c45d0fa5d39b0428c839ddf0a579df806696
-DIST gtk+-3.24.11.tar.xz 20974300 BLAKE2B f338782d6141df64f83caae84649558296e11240ab082d4db129480a77e85cd26f86dee66e7f2650db48f13a30b0cb7191a8deb4bc545c9c7ee3b73796638a98 SHA512 15e33169030aa38e363730e5b19bbde614897b1a0de5db29c5292940a97e3613383b3eeb1c83ab8c09015a2a3f3ad425511bacd8fdbb79b30e0a47d4d4b57008
-DIST gtk+-3.24.13-patchset.tar.xz 57652 BLAKE2B deda8cb4e0026431b52c0299266d60c4d4be2a2c870bee06daf3d9f63918d47243b88c73c4441f9415c859116fd873f276496b7ea9c2243a9540351ca53c5897 SHA512 dc8abad0812c936f7316425ca456d5892f3438ca6f843ed49fd53258695958b2a52a1df878ff25547d176aa054ea48ae9fc1b971698afc4d4aedae9cb643feae
-DIST gtk+-3.24.13.tar.xz 23206464 BLAKE2B d58130d490d8886d0656a3106ddd4f24c0b83a512b6daa22cbb6cbfa6f0582a22a8f6e0063016c120e15b031a3c5585a557bd3dc94b1e55ac0ae553da871d64a SHA512 9129d4574cca258b4a517d8d65dad246a746fc3dc574b78e098db9aa9743956ce227efbf963f63e1e0f1a1a09810716150526b2bfe8015a5960bad38b0c88406
-DIST gtk+-3.24.14.tar.xz 20420928 BLAKE2B 3113dd672b819a21cd13eb5849a34fbc659b8cba4e7f8a6667450cb13a497ad2c41878870047ede175ee42cfcbdaf3d3a32d07e12cd386892694d4eadf341e0a SHA512 a5ce659508933f6a3825aaafe9b30f51bd1357a62a6c66526ebd716627c829aa24543b4f8bd6f701dceda1d9fff94ad105f89f02a14d53749744e868bdff26bf
-EBUILD gtk+-2.24.32-r1.ebuild 9987 BLAKE2B 484ff6b317c25d3a7edd13caf9754c8104822d0e3537037a9485e5c0b67e7d158316ee37f46af97e92c17e99f70802d307320945192300030e494680465b862f SHA512 27188961315d62e394da2e4922e18c2efa725c54d8acfa27c6bd702e23ed01903396c603fbf4b75fada477ae0d8415a5fa6ed2122e4fca24652ebe7d5c8766fe
-EBUILD gtk+-3.24.11.ebuild 7325 BLAKE2B 9c00c7990a575d14f7f4b0205acc384e4382628c41725f5469f0d525e2aa032721a53b4cb0dab81fb7ec1b5fe1d6ca2ab296190f9824986d06eb59a510e7d49a SHA512 9daeaf3bb855045589887e743d37be7f4e14ec16c555abc4d005207622a25396325d5d6967278c425fd9d617d9c1bced9196098b6f7db50a0ee93dfbc56eafb8
-EBUILD gtk+-3.24.13.ebuild 7445 BLAKE2B ecea9b2c20e7325a7b3e0599e927ec509c62005e9e29de9cb17a5d73a11588743b66dad4cf3844e79314943c52f3ed3aa6f218d470e8f93a7631683739c6ba9b SHA512 b74efd978e684ec35309ffd95095213af34cd8bd49e0ed43951a8c4bd1d147b024bf97678b5e1b38ce901aeeb836cb8a52f71c6078979f6b4ca4725795a71407
-EBUILD gtk+-3.24.14.ebuild 7299 BLAKE2B 434b52b19048e22fe0d6f8f42cec0851ed36f2980559c4f41bbde6e4d4a33ffd5dd8178b0cad0ce08d99252b5306e09a70c6af038a94db678f56fd24d9932cb2 SHA512 bfc373c6e2f52632028a0338b07a2e741464e7bb59a7c56dd1b1ee25ddfa3257ae0405e7c72700587466cda5b718443c0fee6b252fea719bfb75e95309d5eef5
+DIST gtk+-3.24.16.tar.xz 20417592 BLAKE2B a0b18c72cd91ddb6533577efad7327df60870b5424409076698ce2b8cbe68a4382a12d947d7c60243ddf4eebe0e14ae9986d5b82a11bef64f1f0287949354986 SHA512 181d31dea038016357cd0eba5b9e8a17056bc061f4ae2ebc713bceee46cd30787993cec463aae658faddc57b9071549fa196f6a2a1f67c314d99e4365f50a0cb
+DIST gtk+-3.24.18.tar.xz 21292668 BLAKE2B 4d06789d027f9b9e070093460daa579afa88a14b9d5a3c028db3dbf20dfadbaab671ae56a9820eef5b2244a00f09f4be4413f1c06b11ac4db6c1044f824a01f6 SHA512 51ba13ae3cd0db9b62462ba399f08738885648adcb545bf0852c4e5b04bc2a1dd88629fafefc282f6a200daa8330e7606f22a70bd2ce6fde32a992a6cd7a0950
+EBUILD gtk+-2.24.32-r1.ebuild 9984 BLAKE2B 1f74417932cb9d97cced4e6974c75cb2157d283babb180a8f1f257e030a7db069fe0e6a1bd3540db6b88098df388b1e399bf96047e3b6be70882c5aea6bd7c7d SHA512 623ec582aa1e47f7a31612c6ef99e38a2b3c09b58c0033c6c0089bb180b24bc26a20bc7c73c08da93f0643e5e872e9945df4b531ba358ea90a905fad4078800e
+EBUILD gtk+-3.24.16.ebuild 7287 BLAKE2B eaea927928505ca1726ac2d1d0b5afc8a9d6ee8693309b8246d25fc793e7ddb25e4b516199d16d9ac5111c551ce90c5a0a266402b15c20283ac7f7864539dae5 SHA512 7925a2da1f33db5e03660d98920b1ccede6f620788ede140ec8c059dfde421778d21cc1e9dc24598d84b5a62fb830be79354c95d3935559fe25e22711760f818
+EBUILD gtk+-3.24.18.ebuild 7295 BLAKE2B 700c76d31cc2c33e4de1231ac69bce933fe4e017a3b66f123fdbab118f88315f2ffa45529fd665ba66c68500128d27fc2a44e11e6b1ab6442a6008e204a25fb0 SHA512 27306c420e6e12d32e96201f450b74428b226e57fe8b6f3d25207b4b95e7506d399b9d9ccb3c4c3fc5cf2aeca39c2f0999ab3e130e8cbb054e9802e8fb8418b2
 MISC metadata.xml 834 BLAKE2B 0b1145d2da83bf549af3758dbca4c5dbf734e5c90c99f3856404b98584dc18d913ac70a19480fb0a16cc503c9831e4209df77c0adf7283eb0d8146079a381fe9 SHA512 e1ec73c4c9433c70c17fc3826193d8289200e347a32d67a824b803213ac281f21364a08c21c819c3e93a2d8582d90bef48766f22ba9ed495099b3eb6071aa561
diff --git a/x11-libs/gtk+/gtk+-2.24.32-r1.ebuild b/x11-libs/gtk+/gtk+-2.24.32-r1.ebuild
index 8b91e66833b1..4e81883be6ca 100644
--- a/x11-libs/gtk+/gtk+-2.24.32-r1.ebuild
+++ b/x11-libs/gtk+/gtk+-2.24.32-r1.ebuild
@@ -18,7 +18,7 @@ REQUIRED_USE="
 	xinerama? ( !aqua )
 "
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~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 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # Upstream wants us to do their job:
 # https://bugzilla.gnome.org/show_bug.cgi?id=768663#c1
diff --git a/x11-libs/gtk+/gtk+-3.24.13.ebuild b/x11-libs/gtk+/gtk+-3.24.13.ebuild
deleted file mode 100644
index 9f99ac44d18b..000000000000
--- a/x11-libs/gtk+/gtk+-3.24.13.ebuild
+++ /dev/null
@@ -1,249 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-GNOME2_EAUTORECONF="yes"
-
-inherit flag-o-matic gnome2 multilib virtualx multilib-minimal
-
-DESCRIPTION="Gimp ToolKit +"
-HOMEPAGE="https://www.gtk.org/"
-SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
-
-LICENSE="LGPL-2+"
-SLOT="3"
-IUSE="aqua broadway cloudprint colord cups examples gtk-doc +introspection test vim-syntax wayland +X xinerama"
-REQUIRED_USE="
-	|| ( aqua wayland X )
-	xinerama? ( X )
-"
-
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-# Upstream wants us to do their job:
-# https://bugzilla.gnome.org/show_bug.cgi?id=768662#c1
-RESTRICT="test"
-
-# FIXME: introspection data is built against system installation of gtk+:3,
-# bug #????
-COMMON_DEPEND="
-	>=dev-libs/atk-2.15[introspection?,${MULTILIB_USEDEP}]
-	>=dev-libs/fribidi-0.19.7[${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.57.2:2[${MULTILIB_USEDEP}]
-	media-libs/fontconfig[${MULTILIB_USEDEP}]
-	>=media-libs/libepoxy-1.4[X(+)?,${MULTILIB_USEDEP}]
-	>=x11-libs/cairo-1.14[aqua?,glib,svg,X?,${MULTILIB_USEDEP}]
-	>=x11-libs/gdk-pixbuf-2.30:2[introspection?,${MULTILIB_USEDEP}]
-	>=x11-libs/pango-1.41.0[introspection?,${MULTILIB_USEDEP}]
-	>=media-libs/harfbuzz-0.9:=
-	x11-misc/shared-mime-info
-
-	cloudprint? (
-		>=net-libs/rest-0.7[${MULTILIB_USEDEP}]
-		>=dev-libs/json-glib-1.0[${MULTILIB_USEDEP}] )
-	colord? ( >=x11-misc/colord-0.1.9:0=[${MULTILIB_USEDEP}] )
-	cups? ( >=net-print/cups-2.0[${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-1.39:= )
-	wayland? (
-		>=dev-libs/wayland-1.9.91[${MULTILIB_USEDEP}]
-		>=dev-libs/wayland-protocols-1.14
-		media-libs/mesa[wayland,${MULTILIB_USEDEP}]
-		>=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}]
-	)
-	X? (
-		>=app-accessibility/at-spi2-atk-2.5.3[${MULTILIB_USEDEP}]
-		media-libs/mesa[X(+),${MULTILIB_USEDEP}]
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		>=x11-libs/libXi-1.3[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-		>=x11-libs/libXrandr-1.5[${MULTILIB_USEDEP}]
-		x11-libs/libXcursor[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes[${MULTILIB_USEDEP}]
-		x11-libs/libXcomposite[${MULTILIB_USEDEP}]
-		x11-libs/libXdamage[${MULTILIB_USEDEP}]
-		xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xsl-stylesheets
-	app-text/docbook-xml-dtd:4.1.2
-	dev-libs/libxslt
-	dev-libs/gobject-introspection-common
-	>=dev-util/gdbus-codegen-2.48
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.20
-	gtk-doc? ( >=dev-util/gtk-doc-1.20
-		app-text/docbook-xml-dtd:4.3 )
-	>=sys-devel/gettext-0.19.7[${MULTILIB_USEDEP}]
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-	X? ( x11-base/xorg-proto )
-	test? (
-		media-fonts/font-misc-misc
-		media-fonts/font-cursor-misc )
-"
-# gtk+-3.2.2 breaks Alt key handling in <=x11-libs/vte-0.30.1:2.90
-# gtk+-3.3.18 breaks scrolling in <=x11-libs/vte-0.31.0:2.90
-RDEPEND="${COMMON_DEPEND}
-	>=dev-util/gtk-update-icon-cache-3
-	!<gnome-base/gail-1000
-	!<x11-libs/vte-0.31.0:2.90
-"
-# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710
-PDEPEND="
-	gnome-base/librsvg[${MULTILIB_USEDEP}]
-	>=x11-themes/adwaita-icon-theme-3.14
-	vim-syntax? ( app-vim/gtk-syntax )
-"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/gtk-query-immodules-3.0$(get_exeext)
-)
-
-strip_builddir() {
-	local rule=$1
-	shift
-	local directory=$1
-	shift
-	sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \
-		|| die "Could not strip director ${directory} from build."
-}
-
-src_prepare() {
-	if ! use test ; then
-		# don't waste time building tests
-		strip_builddir SRC_SUBDIRS testsuite Makefile.{am,in}
-
-		# the tests dir needs to be build now because since commit
-		# 7ff3c6df80185e165e3bf6aa31bd014d1f8bf224 tests/gtkgears.o needs to be there
-		# strip_builddir SRC_SUBDIRS tests Makefile.{am,in}
-	fi
-
-	if ! use examples; then
-		# don't waste time building demos
-		strip_builddir SRC_SUBDIRS demos Makefile.{am,in}
-		strip_builddir SRC_SUBDIRS examples Makefile.{am,in}
-	fi
-
-	# Select patches from origin/gtk-3-24 on 2019-12-25
-	eapply "${WORKDIR}"/patches
-
-	# gtk-update-icon-cache is installed by dev-util/gtk-update-icon-cache
-	eapply "${FILESDIR}"/${PN}-3.24.8-update-icon-cache.patch
-
-	# Fix broken autotools logic
-	eapply "${FILESDIR}"/${PN}-3.22.20-libcloudproviders-automagic.patch
-
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	local myconf=(
-		$(use_enable aqua quartz-backend)
-		$(use_enable broadway broadway-backend)
-		$(use_enable cloudprint)
-		$(use_enable colord)
-		$(use_enable cups cups auto)
-		$(multilib_native_use_enable gtk-doc)
-		$(multilib_native_use_enable introspection)
-		$(use_enable wayland wayland-backend)
-		$(use_enable X x11-backend)
-		$(use_enable X xcomposite)
-		$(use_enable X xdamage)
-		$(use_enable X xfixes)
-		$(use_enable X xkb)
-		$(use_enable X xrandr)
-		$(use_enable xinerama)
-		# cloudprovider is not packaged in Gentoo yet
-		--disable-cloudproviders
-		--disable-papi
-		# sysprof integration needs >=sysprof-3.33.2
-		--disable-profiler
-		--enable-man
-		--with-xml-catalog="${EPREFIX}"/etc/xml/catalog
-		# need libdir here to avoid a double slash in a path that libtool doesn't
-		# grok so well during install (// between $EPREFIX and usr ...)
-		# TODO: Is this still the case?
-		--libdir="${EPREFIX}"/usr/$(get_libdir)
-		CUPS_CONFIG="${EPREFIX}/usr/bin/${CHOST}-cups-config"
-	)
-
-	if use wayland; then
-		myconf+=(
-			# Include wayland immodule into gtk itself, to avoid problems like
-			# https://gitlab.gnome.org/GNOME/gnome-shell/issues/109 from a
-			# user overridden GTK_IM_MODULE envvar
-			--with-included-immodules=wayland
-		)
-	fi;
-
-	ECONF_SOURCE=${S} gnome2_src_configure "${myconf[@]}"
-
-	# work-around gtk-doc out-of-source brokedness
-	if multilib_is_native_abi; then
-		local d
-		for d in gdk gtk libgail-util; do
-			ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die
-		done
-	fi
-}
-
-multilib_src_test() {
-	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die
-	GSETTINGS_SCHEMA_DIR="${S}/gtk" virtx emake check
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
-
-multilib_src_install_all() {
-	insinto /etc/gtk-3.0
-	doins "${FILESDIR}"/settings.ini
-	# Skip README.{in,commits,win32} that would get installed by default
-	DOCS=( AUTHORS ChangeLog NEWS README )
-	einstalldocs
-}
-
-pkg_preinst() {
-	gnome2_pkg_preinst
-
-	multilib_pkg_preinst() {
-		# Make immodules.cache belongs to gtk+ alone
-		local cache="usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache"
-
-		if [[ -e ${EROOT}${cache} ]]; then
-			cp "${EROOT}"${cache} "${ED}"/${cache} || die
-		else
-			touch "${ED}"/${cache} || die
-		fi
-	}
-	multilib_parallel_foreach_abi multilib_pkg_preinst
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	multilib_pkg_postinst() {
-		gnome2_query_immodules_gtk3 \
-			|| die "Update immodules cache failed (for ${ABI})"
-	}
-	multilib_parallel_foreach_abi multilib_pkg_postinst
-
-	if ! has_version "app-text/evince"; then
-		elog "Please install app-text/evince for print preview functionality."
-		elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
-		elog "add it to your settings.ini file."
-	fi
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-
-	if [[ -z ${REPLACED_BY_VERSION} ]]; then
-		multilib_pkg_postrm() {
-			rm -f "${EROOT}"usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache
-		}
-		multilib_foreach_abi multilib_pkg_postrm
-	fi
-}
diff --git a/x11-libs/gtk+/gtk+-3.24.11.ebuild b/x11-libs/gtk+/gtk+-3.24.16.ebuild
index 6549eeb965b4..d477b0005f60 100644
--- a/x11-libs/gtk+/gtk+-3.24.11.ebuild
+++ b/x11-libs/gtk+/gtk+-3.24.16.ebuild
@@ -18,7 +18,7 @@ REQUIRED_USE="
 	xinerama? ( X )
 "
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh 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"
 
 # Upstream wants us to do their job:
 # https://bugzilla.gnome.org/show_bug.cgi?id=768662#c1
@@ -45,7 +45,7 @@ COMMON_DEPEND="
 	cups? ( >=net-print/cups-2.0[${MULTILIB_USEDEP}] )
 	introspection? ( >=dev-libs/gobject-introspection-1.39:= )
 	wayland? (
-		>=dev-libs/wayland-1.9.91[${MULTILIB_USEDEP}]
+		>=dev-libs/wayland-1.14.91[${MULTILIB_USEDEP}]
 		>=dev-libs/wayland-protocols-1.14
 		media-libs/mesa[wayland,${MULTILIB_USEDEP}]
 		>=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}]
@@ -152,7 +152,6 @@ multilib_src_configure() {
 		$(use_enable xinerama)
 		# cloudprovider is not packaged in Gentoo yet
 		--disable-cloudproviders
-		--disable-mir-backend
 		--disable-papi
 		# sysprof integration needs >=sysprof-3.33.2
 		--disable-profiler
@@ -197,8 +196,8 @@ multilib_src_install() {
 multilib_src_install_all() {
 	insinto /etc/gtk-3.0
 	doins "${FILESDIR}"/settings.ini
-	# Skip README.{in,commits,win32} and useless ChangeLog that would get installed by default
-	DOCS=( AUTHORS NEWS README )
+	# Skip README.{in,commits,win32} that would get installed by default
+	DOCS=( AUTHORS ChangeLog NEWS README )
 	einstalldocs
 }
 
diff --git a/x11-libs/gtk+/gtk+-3.24.14.ebuild b/x11-libs/gtk+/gtk+-3.24.18.ebuild
index 29ca19b6baa2..ddb924517c94 100644
--- a/x11-libs/gtk+/gtk+-3.24.14.ebuild
+++ b/x11-libs/gtk+/gtk+-3.24.18.ebuild
@@ -18,7 +18,7 @@ REQUIRED_USE="
 	xinerama? ( X )
 "
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~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"
 
 # Upstream wants us to do their job:
 # https://bugzilla.gnome.org/show_bug.cgi?id=768662#c1
diff --git a/x11-libs/gtk+extra/Manifest b/x11-libs/gtk+extra/Manifest
index c4b41a5929bf..0a16c8df6a8c 100644
--- a/x11-libs/gtk+extra/Manifest
+++ b/x11-libs/gtk+extra/Manifest
@@ -1,3 +1,5 @@
 DIST gtkextra-3.3.3.tar.gz 1503817 BLAKE2B dc99923ad962348d617b8db2171b99e925d0dc06501110d805f166ba25cff72094c02031e3375304ddfd96cc7d3f76a1b06d56b196aec1d1868f10d154acfc8e SHA512 864fa2e957941a05a9c4b4a4283ae48e733d72ab334e2fb8440fc884166b0d1ad34d381924184f7a88f829d00bbd857d5f3f32d89f159e0133dd89233a8a93e9
+DIST gtkextra-3.3.4.tar.gz 1542795 BLAKE2B 5a6d5b72f34c8373db615961728a01d0c27005726f316c1233b0b4c4dba688022a53236cc3abe090891a53441d910322ea938ea864a13933a5cea87f18e3426b SHA512 fd61bce7070cf4f28129b47a6c0b01e974101d96b525be9ce1bc4b40ce94197f3c411d17fd8954f5549075c4cdd7ac58a6aaa6faa2f5d3013b761391559e570b
 EBUILD gtk+extra-3.3.3.ebuild 879 BLAKE2B 71b3eca32db12de4dea51e16220b1b27f588dd9fe8d143b3b74e3959e2f504ceac00b9de0e0282d95fca9e9ce11f2a68312be62c51040ae0c31bb19194239362 SHA512 bfd32583e4842b00261e039f5635e883de68093b0cee4d3adfcf41ab52dc0a2992705579da501636486f47f2977d5d9529f8b8000f2dbb16618393e3656dd4d4
+EBUILD gtk+extra-3.3.4.ebuild 881 BLAKE2B a27d417790ec2a05750500f4ee6298cff61c3a1577f846f43482627d881d2166cf13c07c34c829f2d57af9b80a59d09ab183d85cbdbcd8c33f3be1e1ab754074 SHA512 0da550b846fc77e7f1aa77f4644803e13ef24030a65f4354dda7aa6a7aa8d0dc5d22e412472b7a6312c70b887657ab2ec0fc0bcf85bf8b483e48e5c248f270cc
 MISC metadata.xml 331 BLAKE2B aba9451bf53641f26c08773cf5146351d4bce301ae44d153dfe6650de8523ca85144e850e1ad3363094afd27b592d54b551f02c92e3de58bf6b5733752a43fe8 SHA512 af4ad9c00fe60299ada4ee678335173a37696f53b35fb9409b477622952b9b952d897168eed5c1bdb18d11d1797a9a80b6cce3782f3b6dd487a7cb682bfe127c
diff --git a/x11-libs/gtk+extra/gtk+extra-3.3.4.ebuild b/x11-libs/gtk+extra/gtk+extra-3.3.4.ebuild
new file mode 100644
index 000000000000..03058820a695
--- /dev/null
+++ b/x11-libs/gtk+extra/gtk+extra-3.3.4.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2
+
+DESCRIPTION="Useful Additional GTK+ widgets"
+HOMEPAGE="http://gtkextra.sourceforge.net"
+SRC_URI="mirror://sourceforge/gtkextra/gtkextra-${PV}.tar.gz"
+
+LICENSE="FDL-1.1 LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+introspection static-libs test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=x11-libs/gtk+-2.12.0:2
+	dev-libs/glib:2
+	introspection? ( >=dev-libs/gobject-introspection-0.6.14:= )
+"
+DEPEND="${RDEPEND}
+	dev-util/glib-utils
+	virtual/pkgconfig
+"
+# dev-libs/gobject-introspection-common needed for eautoreconf
+
+S="${WORKDIR}/gtkextra-${PV}"
+
+src_configure() {
+	gnome2_src_configure \
+		--enable-glade=no \
+		--disable-man \
+		$(use_enable introspection) \
+		$(use_enable static-libs static) \
+		$(use_enable test tests)
+}
diff --git a/x11-libs/gtkglarea/Manifest b/x11-libs/gtkglarea/Manifest
index 3c85a6057b67..56fcb5a4e8f6 100644
--- a/x11-libs/gtkglarea/Manifest
+++ b/x11-libs/gtkglarea/Manifest
@@ -1,5 +1,5 @@
 DIST gtkglarea-2.0.1.tar.bz2 298744 BLAKE2B a60ee019af111b6f1da92a6c81cc0d5dac003fa79ae95aaf79f1f5bc38c558e1a084d69b556570d1710966d1d25590467a612d9e0f17a994084960537bd744f1 SHA512 54d3c23637e4347c9cdc25fa0159f720bc6bf76e167b025efd14361f1026af18f41686860444083100f939bec66309b1ffbb84c776c88e513d6ad4a06f66c79e
 DIST gtkglarea-2.1.0.tar.xz 264100 BLAKE2B 453a867581a09bab4ad2c71a5d66f567afe8fa8315467beb39d48e242fd46119c4b77b75a662eb1d4c88398811c0ccb4328b8695f584f692bfd53f43c8bcf4a9 SHA512 c790c1b542d85d86cd57f333c87ab2c930c8065d6f75320d588688b9a0adb8c4270522b6b88734720db1b71170f4f12c95e650e9a599a5d7e4b7baadf1f9f06b
-EBUILD gtkglarea-2.0.1-r1.ebuild 1106 BLAKE2B 54f88f2b645f78c02fbce3ef78c8e13aa5cf8d00d87e14be09fc94cf3508302d470eaccdc2e52c715c4756ffe732c25ba85f69685c1d7c671b52833ce8fa933c SHA512 f4f0ca4230712f2f645d5e2f18c2a2fecc3a929cbaa88cf29f0e16d0ab509e6a8ea72d8e0a7889963b899101bda519f308c37a3c26648a57ee33262f79cf11c5
-EBUILD gtkglarea-2.1.0.ebuild 975 BLAKE2B 2d9469350c76b26d5ac5f0bb81f97826226ad17a49f2f2e13dfdfa68392bc043d6e8330fa66a8e8c2e49f18a30236bd82ce49f69d0872c11b8550d6d5cc1a387 SHA512 0472605253acdf5e6100c3374b8622575daac29ba90c7d76681a27cc22537ebc79c7e827dbd02442cb7c214bd40a606c5c35f780fd74bf81c25eff5c3205eac9
+EBUILD gtkglarea-2.0.1-r1.ebuild 1104 BLAKE2B 05d9cf8c39c107345e98667c72fe3538f746d39dc483e7bfe0ea5250a741625badf3b2ad78a92db6246a22c4abf4b1d7effbe9b22d1d1c6c424277087260948f SHA512 eddd899c2126ee42565c269e75fc6083f5399dfc76f07eba952fd8fbcaad54afa037e2eb0f6b2bffabaf38901980a2c26244369ea9c63c4d4ea162e1240a50e3
+EBUILD gtkglarea-2.1.0.ebuild 972 BLAKE2B ac539a99a077059941ce67891412caee2cc5f636decbe02c977969c2f9c01bb549238070463fc7f1205dc1d336fbed7aa8809f4d7f3941717618498b5bb89491 SHA512 0c6d1396c8a450ba3c05c222a841a13903d19e036fe500821ffeb0272c05e259f0de44b15635921f0149e805712668ee9e2d13e1a41baa0cb7b2aede052d62ec
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/x11-libs/gtkglarea/gtkglarea-2.0.1-r1.ebuild b/x11-libs/gtkglarea/gtkglarea-2.0.1-r1.ebuild
index c70462d862ea..b4ec555df0c7 100644
--- a/x11-libs/gtkglarea/gtkglarea-2.0.1-r1.ebuild
+++ b/x11-libs/gtkglarea/gtkglarea-2.0.1-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.mono-project.com/archived/gtkglarea/"
 
 LICENSE="LGPL-2+ GPL-2+" # examples are GPL-2+, library is LGPL-2+
 SLOT="2"
-KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 RDEPEND=">=x11-libs/gtk+-2.0.3:2
diff --git a/x11-libs/gtkglarea/gtkglarea-2.1.0.ebuild b/x11-libs/gtkglarea/gtkglarea-2.1.0.ebuild
index a91c2801415b..883fed910522 100644
--- a/x11-libs/gtkglarea/gtkglarea-2.1.0.ebuild
+++ b/x11-libs/gtkglarea/gtkglarea-2.1.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.mono-project.com/archived/gtkglarea/"
 
 LICENSE="LGPL-2+ GPL-2+" # examples are GPL-2+, library is LGPL-2+
 SLOT="2"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 RDEPEND="
diff --git a/x11-libs/gtkglext/Manifest b/x11-libs/gtkglext/Manifest
index b83d4b9f1065..4451992b6910 100644
--- a/x11-libs/gtkglext/Manifest
+++ b/x11-libs/gtkglext/Manifest
@@ -1,5 +1,5 @@
 AUX gtkglext-1.2.0-gcc8-fixes.patch 791 BLAKE2B d0f17c83bccd6e92c640383fecdce384cd0ecb92868f3f70d87b16aed8a85357e9391134c3c233549f7471d64e02416bde03ff92028d8d2f19eacd3802542875 SHA512 b6240ce1f293e3bd37d71a09233417c4acfa2a7fce05ba65ba364181e6075f86fc72797586b93fb81e057ab8de2191ad345415bd6cc6e29e38945cfb4362f3cb
 AUX gtkglext-1.2.0-gl-configure.patch 11350 BLAKE2B ad0cadfa12bda13866da64433935520bcbb77a9fb430640d31c66b14ffb867a1ae1cb236e459b9d13c0493279185dbe8c8eddafce86abd14b2ab4b2d0a59a0f9 SHA512 b164b8e64ff8fbe6d9b3437100c35d1352056094c4395fc1df4a40d8c91edf7543317ec05e3a05af1da9fe432817e312e7a8fc80fd3343824365d4579046f8fb
 DIST gtkglext-1.2.0.tar.bz2 703821 BLAKE2B 985d84cf1b87a23cfebcf536cecb087bbfd050f5131cf70b2a09e9a2e556e7f2549ed1b4b26ec6eccf790a383e3530d27171a553145614b641437c7c2d8462b5 SHA512 c5452b7594195da3c1428dc3021a041d70bb8079a514b7310fe7b66f638748ad2399adead36047b52b60b033757581e72f0532c0301e033019bf909f7365071d
-EBUILD gtkglext-1.2.0-r4.ebuild 1563 BLAKE2B c5f8f9d77851943027cef58fd83570ccc575adc582bc6d58f38cbe60c034f96b15a268abb39fbf28a1c862d8358ecd1c8ed6aa3a466fcc5e7a69a22ea0df8058 SHA512 0d3fc5ad7d86e39815144f3279fdee53e29238f6a5c311ee35f4082770bd89e36324a4992809fca7aa97c3c8c0da842c70df6a1d30fd6bf00b875195f8b23543
+EBUILD gtkglext-1.2.0-r4.ebuild 1560 BLAKE2B 8aadd1c7a5866351ef59d81e65e0e31980f0cf73d34493792fdddd80cee09eaa17587d285bb330b3b5696d6f215eec2ce83f19f84adf4ef1d65ecf6e21f1287b SHA512 b7d40290c1683dd0e71560f2922ee7bf179af3d6ee254f9003d4f0d24c27158b8701ba5e0c759f966e9b717e6854e20aa7ed1c7951d86f808f913f896f5759b3
 MISC metadata.xml 331 BLAKE2B 214f9245eccb98bed5314d370a2e16d8605c46629c656c05a22c1a037e7aeeb9d3255f24203405b148fc73276241db48243303a86abea879c08a944025cc51b4 SHA512 8c9768b7a27485752cb816de376d4e9e352e6522e42eb489d41aab48f0fd47541483913c7fec9ec4bbdfea3aa846c35bedab83ac2524901635337a7111f14ab9
diff --git a/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild b/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild
index a61ba76bc495..e37df52431b7 100644
--- a/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild
+++ b/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-libs/gtkmathview/Manifest b/x11-libs/gtkmathview/Manifest
index 227efbb0cf90..ae0665901f6c 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-r3.ebuild 2065 BLAKE2B 46230ea8b278ba7b7c0350b5f838bbe5af87aaf404bc97d2587ca85a212853cf168393bdd19c47b6880d6d31a1d07e4a4bd77044ea54f08d5ad1495d4fddd828 SHA512 44ccb2a539f100d5f26886a08d315c8214912e261488133603467991d966d7cf11fb6064c659df5f523d014afaca9bf279d2c2b4d5359da1a0df339cb3e037d6
+EBUILD gtkmathview-0.8.0-r4.ebuild 1954 BLAKE2B f5044043a278afa0dba9be2770f0b9e5a5ca27b9e89166a2503626e8d1c87a1564261e8638f4ad36245c9586a6b0ed9deb5079e4b40ff40eef78654be15ea943 SHA512 430c2be365a7adcd7f715ae49a42471a200d36cf01d8dd9c467e9d35cabc38e1c1e3b6824ffc76b1d1cbb1425f4172913238a3301fe008259ef380db1a0abf3e
 MISC metadata.xml 413 BLAKE2B 795e9acaab179d9cf4e0ab6f3232dbf079b418420a55ff58d06f5b81b2fa785121a6b4bb734f45f4df9b15435b3af8bf26abf773100b70c362a98805057f8a38 SHA512 734ee7fb5aa123fb2794a22b1a374e514a92a640e7bbd35ee53de045126d0b330f177db4018ddf76e9932f984a2f5c1646d3a3f642b29972df0af88f64fb1352
diff --git a/x11-libs/gtkmathview/gtkmathview-0.8.0-r3.ebuild b/x11-libs/gtkmathview/gtkmathview-0.8.0-r4.ebuild
index 6c7874cbe82e..06c60839782d 100644
--- a/x11-libs/gtkmathview/gtkmathview-0.8.0-r3.ebuild
+++ b/x11-libs/gtkmathview/gtkmathview-0.8.0-r4.ebuild
@@ -11,19 +11,13 @@ SRC_URI="http://helm.cs.unibo.it/mml-widget/sources/${P}.tar.gz"
 LICENSE="LGPL-3"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86"
-IUSE="gtk mathml svg t1lib"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 sparc x86"
+IUSE="mathml svg t1lib"
 
 RDEPEND="
 	>=dev-libs/glib-2.2.1:2
 	>=dev-libs/popt-1.7
 	>=dev-libs/libxml2-2.6.7:2
-	gtk? (
-		>=media-libs/t1lib-5:5
-		>=x11-libs/gtk+-2.2.1:2
-		x11-libs/pango
-		x11-libs/pangox-compat
-	)
 	mathml? ( media-fonts/texcm-ttf )
 	t1lib?	( >=media-libs/t1lib-5:5 )
 "
@@ -65,7 +59,7 @@ src_prepare() {
 src_configure() {
 	# --disable-popt will build only the library and not the frontend
 	# TFM is needed for SVG, default value is 2
-	econf $(use_enable gtk) \
+	econf --disable-gtk \
 		$(use_enable svg) \
 		$(use_with t1lib) \
 		--with-popt \
diff --git a/x11-libs/gtksourceview/Manifest b/x11-libs/gtksourceview/Manifest
index 3669e549d641..bd939c558e33 100644
--- a/x11-libs/gtksourceview/Manifest
+++ b/x11-libs/gtksourceview/Manifest
@@ -3,7 +3,9 @@ AUX gtksourceview-2.10.5-G_CONST_RETURN.patch 6799 BLAKE2B e3276c433d2bb6286ea8f
 DIST gtksourceview-2.10.5.tar.bz2 1253321 BLAKE2B 810a3eeca69bab4356b21c64129bb852e00d02c7937ad4a2ce3af9e48700da943d8d6834efcce9810dd49a54f39d4a074dc086a557128da51a593b2f23e58d48 SHA512 6f64acef6196bfc5953e0b148d7e460d366073b5e21367c01b01fc4d1c86ffe8aca71ecd77cf0814e47d8fc3085495f25bbbdc69e746987b02fd02fcda64886d
 DIST gtksourceview-3.24.11.tar.xz 1438232 BLAKE2B a25762255a12887c8151465689e3acbd5864a6638044500acd087832888a092b8aad5d885d31c9dbe057ce183510afa2342bccb2a2675719dbba7e82be72368a SHA512 3490b34c6432a2e2ef292ad5bf982fdd22d33b1472434549b4ea8ddae0fc8808e128ef947e4d0dcb41e8de5e601b202f52532bbbbfa11d35050acfc42f9936b2
 DIST gtksourceview-4.2.0.tar.xz 1410764 BLAKE2B 8f20a762c16a0abc47ff191a2ea4d6b44a397cabee056e98263d0ba59cbc7207ac72341a630aa83fe7855804bd6add77e0d93e706ac9561c9577843f17e00246 SHA512 f2350b1e7042309c01be0feda6059d788a7ef55c4ccd48e16b4c92a71292ed6f92243455ca42aa0950db61de8d68f4a76f4fac46cd46316b690bcef1ea34c641
-EBUILD gtksourceview-2.10.5-r3.ebuild 1350 BLAKE2B d6a4b76673dd749063f430079c2e1f7dbcef5762536648e20a34d330ed46d98286c3a999f3369d0334272fa10604670d1292bc5c6c00b721bdb610fd5cd55597 SHA512 b1fea5379165c4b4f9ac23b82678d857f538693ffa5d6f77244c8b90b2a73da54bad711168e6a70b2f5301b99c599ef1eba17d3f7543c250f4e4d90cdcf4e760
-EBUILD gtksourceview-3.24.11.ebuild 1275 BLAKE2B 256784e04cb8e27d1a24ea8c14e85f7fdefc244d2206a81be4fc57cace2de756bddc0f972783ce0633d08f4c991aabe8ebe064d0976020240e1f5d66d2357961 SHA512 4d481c7b614af7ed5205ebed3051eb066a3bf53bf25753b80846941ecf6a051af273dd0d053b0647635e054ea2df274f24f8098681af6427b979f925af393e41
-EBUILD gtksourceview-4.2.0.ebuild 1621 BLAKE2B 4e879c5489dcc9f8a5cde9b8a643dafabb323078fb8638834314aba639387caeb300287b0628a337351a0aea50a7aee2d0ec2beea30b160b009c0926df7ef73c SHA512 08749b912fc7850e370f61e17c25375c0f07fd57931759dcc3187f19eadb536614218ee5502ae83c856fa81465a42b075c50dadaf82591e80391ddb25ec2cec0
+DIST gtksourceview-4.4.0.tar.xz 1105776 BLAKE2B ef4ed4ed15435daba60795598ba41624b2680b0518246d5d6ade3630cb96e2bac96fea08105e72db7b5a07e714f9270ce27c11e9448fd1b21e8d3942989b2255 SHA512 068e723525290c5356c5ce3f5e5b5b8ecc9f7b1ff2f8234da247d1a84bed63ff5601cad6550981720859286e107705ec25cc7793b754ada164ec6569df0df9eb
+EBUILD gtksourceview-2.10.5-r3.ebuild 1347 BLAKE2B 906f89f5840c70e6b971f5ee4d4a84cdce5ad71081d1762c434d34ebf6534eff74450ae81bc796201fb74c20537eaec76a97774d9f5eb1a6cb2c65a20a29b4f0 SHA512 c864e339c432308d99a494da8a3366de9c299cad4c109fa2d96aea4ae82a3f7be9453a5c5ab1f8648233d922f90343fcf5ad85b33defb3f0e37f3937d1bbb7ef
+EBUILD gtksourceview-3.24.11.ebuild 1272 BLAKE2B d606bbfed3a72adf6478175516be05045a5ccdeace5b4f6e36c1f9cce337e01f27ab680f1da56462c187b5085a543cfe272088f3dc9ca385ee1c3b28af2ea2e1 SHA512 f54f0e0a88a3e5310c75f985eee92ff3cfe0db3b930c7eb520879b519d214394604c84155c3ee9fef23a12477b81d4de1848ee1c29aa6c352af986b0247b3489
+EBUILD gtksourceview-4.2.0.ebuild 1617 BLAKE2B 8d6bc885c6d14db37bd52b5f6b2b3a43451b9e8caee6a46dd2c6176da09752d1e2dfc108e8f4b6e37dae3e1151718b9390acdc11bfb8e5315ac14bbc6f1706bf SHA512 0244079fd5423b8ef8492e1f5aa1ca887783e0558301d602cb3def54e618b0a4ec7bd468e5f675683b1e4b0f11f66a5ef57201911621cbad3d955d5a2edb17cb
+EBUILD gtksourceview-4.4.0.ebuild 1735 BLAKE2B 5492f9b865213c8f07cd2aeb7ccf65cacfc0acd4bb87a046e49ae7cace8abee7226e1f661e555d3cfe149ffa3a4ef7bac8eb6dc02e18bd2fa44ec1106e38c48b SHA512 5056cdc4c0dfaca8d2c838c31ee5e8324e4860357c21d998127bc58a8876fc575276abd680aceb92220f8887a2600469d12e41ad439d77c430200ea35e271cce
 MISC metadata.xml 318 BLAKE2B 63b73a76e8f01503afd3f29f3329056ce6b95614aceef233ee4308ab7589dd5f0f35b84f317ecdf5829847a01bdf18987ca87e345ea7e92bf9556d81b15dde1f SHA512 c0954dc93b8b12dbad5d31805afc40d8075c55aafc209d6292cdbc50727f4e17a24353d115004e1e6974fdbb4bdfdb1588ff86ad93b6a60cd1ed430c13865ac5
diff --git a/x11-libs/gtksourceview/gtksourceview-2.10.5-r3.ebuild b/x11-libs/gtksourceview/gtksourceview-2.10.5-r3.ebuild
index 9e055e275045..fda495015019 100644
--- a/x11-libs/gtksourceview/gtksourceview-2.10.5-r3.ebuild
+++ b/x11-libs/gtksourceview/gtksourceview-2.10.5-r3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.gnome.org/"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="2.0"
-KEYWORDS="~alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-libs/gtksourceview/gtksourceview-3.24.11.ebuild b/x11-libs/gtksourceview/gtksourceview-3.24.11.ebuild
index b1f7610499c2..353bbe0234ed 100644
--- a/x11-libs/gtksourceview/gtksourceview-3.24.11.ebuild
+++ b/x11-libs/gtksourceview/gtksourceview-3.24.11.ebuild
@@ -16,7 +16,7 @@ SLOT="3.0/3"
 IUSE="glade +introspection +vala"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~alpha amd64 arm arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.48:2
diff --git a/x11-libs/gtksourceview/gtksourceview-4.2.0.ebuild b/x11-libs/gtksourceview/gtksourceview-4.2.0.ebuild
index 3f3ddb9091ef..b0a2c2c951bd 100644
--- a/x11-libs/gtksourceview/gtksourceview-4.2.0.ebuild
+++ b/x11-libs/gtksourceview/gtksourceview-4.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -16,7 +16,7 @@ SLOT="4"
 IUSE="glade +introspection +vala"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.48:2
diff --git a/x11-libs/gtksourceview/gtksourceview-4.4.0.ebuild b/x11-libs/gtksourceview/gtksourceview-4.4.0.ebuild
new file mode 100644
index 000000000000..7de4201a29d2
--- /dev/null
+++ b/x11-libs/gtksourceview/gtksourceview-4.4.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org meson vala virtualx xdg
+
+DESCRIPTION="A text widget implementing syntax highlighting and other features"
+HOMEPAGE="https://wiki.gnome.org/Projects/GtkSourceView"
+
+LICENSE="LGPL-2.1+"
+SLOT="4"
+
+IUSE="glade gtk-doc +introspection +vala"
+REQUIRED_USE="vala? ( introspection )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+
+RDEPEND="
+	>=dev-libs/glib-2.48:2
+	>=x11-libs/gtk+-3.22:3[introspection?]
+	>=dev-libs/libxml2-2.6:2
+	glade? ( >=dev-util/glade-3.9:3.10 )
+	introspection? ( >=dev-libs/gobject-introspection-1.42.0:= )
+	>=dev-libs/fribidi-0.19.7
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	gtk-doc? ( >=dev-util/gtk-doc-1.25
+		app-text/docbook-xml-dtd:4.3 )
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+	use vala && vala_src_prepare
+	xdg_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use glade glade_catalog)
+		-Dinstall_tests=false
+		$(meson_use introspection gir)
+		$(meson_use vala vapi)
+		$(meson_use gtk-doc gtk_doc)
+	)
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test
+}
+
+src_install() {
+	meson_src_install
+
+	insinto /usr/share/${PN}-4/language-specs
+	doins "${FILESDIR}"/2.0/gentoo.lang
+
+	# Avoid conflict with gtksourceview:3.0 glade-catalog
+	# TODO: glade doesn't actually show multiple GtkSourceView widget collections, so with both installed, can't really be sure which ones are used
+	if use glade; then
+		mv "${ED}"/usr/share/glade/catalogs/gtksourceview.xml "${ED}"/usr/share/glade/catalogs/gtksourceview-${SLOT}.xml || die
+	fi
+}
diff --git a/x11-libs/libFS/Manifest b/x11-libs/libFS/Manifest
index 5505f792d77f..b0b723517e65 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 372 BLAKE2B e2b830ec7bbc743f20d83f198e24eed4e0c1a88fc95ea5e56fe15919d84ce1602f8907b50579920ec686bc95d4c1ca6ab901b5e46321f28fd70fe44e5bf1dda5 SHA512 fe390791947d79684ebafa036990bb07b591651c31ecf1457acc23a9d81fd0991e72fcacbee1cab0eb0def527184127a4bebb5283fe8f08ed4cfae12d5c1699d
+EBUILD libFS-1.0.8.ebuild 369 BLAKE2B 046faa24932f34a23d4ac775d57293aec0275d8af87b44b3faf696adbcc192192973a75e67c640618daa85089149b4a38ad69f94fee5ca08bd3ea4e1430d582d SHA512 9f0d0add429a4170e06c152e72e7cd3395c5b2499216b77861272f8c4c5cdeaf22eeef0d72f98329b287e1cfbd8fe8332fb5bbfbaaac64fed3840ab006d59a7f
 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 33e58ea56a15..2338a4d8ea39 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 ~sh 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 1dce692865f4..d02e2f39e6e5 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 655 BLAKE2B c6c037009c6640e6bbbe2206027d940b37c8d422001c9fef6815619680dd2f1e87f60f46c5343af493e90be3d23365e36287807576c5aa323b7390d179744949 SHA512 c04c95c0af7142fdff4e730dfdad3b3fb9bc7661f7e6be287d6ad066f2e311de8e57c61a35b8d74c50302e16b9641f456fbf448faf349f663e9aa7c8f1bed0e4
+EBUILD libICE-1.0.10.ebuild 652 BLAKE2B d76792962e6c5fe54de0093d161dc8d1de6a288da17bfaccb8c012f8494b6e9711682f7252cbd2c130805e3bb7ab1c7a4d7922bcf51309ee2458940bb8314139 SHA512 943e411fccc2b04ab2eb399b76b614faa8c2654471df1aaab3ce0e45e9147f6066eb098900515361c966b1365b28a2c6096d470d29b24c5893e99f35bf4d331c
 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 670aae156294..03ead5ac2d4e 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 s390 ~sh 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 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="ipv6"
 
 DEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libSM/Manifest b/x11-libs/libSM/Manifest
index dfa8c740bc46..2faa353a5598 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.ebuild 1704 BLAKE2B f997849bf8c8e8261264f6faf7599e0ad13d532d58e41409d4c2d41d8f9d5500c249d555c64b9bdc09fd7b7c3a40b578a2151ef3c8fac855dfb26344701db0d0 SHA512 ebe2718bf1dc6fbaf2a32665689d245ec00653d43eb2c25e825e46d7e13fbce56eac8294f14fde84a2832cbfd397be1ace4609abe3282df48522f224922ee016
+EBUILD libSM-1.2.3.ebuild 1701 BLAKE2B 80de3f03ca0d9153efd44adb945754ab913641371c6e92d7c27ff613d1f54c46b078900f27b31cc7f77b9eb0c407c4ea9a8d117cab3ff2d1123defe15a9b6ccd SHA512 dd3cb2c239fae12ac931afc4f50e8113c101cb838df02dc653b3c1acba7b747cb93450783e40904725159bcf3923a7433dcaafc863ec4cd125e0871a71b0b7d2
 MISC metadata.xml 348 BLAKE2B 475822d6499e8c44bda145b3fb4d72b0f462c03ddddf44cdfb8359a2b0a0e44917a0004a53ace75218efa01c25491fd66e52c1bc0c7e392c88ba9cdbbe414e54 SHA512 4fa0439dc05b56a6fc0280c020ccbc52438ba0d22a4a9b8c0e4830844fa50bc6af8096498336b0d9752687b6e30dce581a24b4b67a812d2e7a62783e37af86d5
diff --git a/x11-libs/libSM/libSM-1.2.3.ebuild b/x11-libs/libSM/libSM-1.2.3.ebuild
index 8c292e6c7450..e54c21ed13d1 100644
--- a/x11-libs/libSM/libSM-1.2.3.ebuild
+++ b/x11-libs/libSM/libSM-1.2.3.ebuild
@@ -9,7 +9,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Session Management library"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh 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 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="doc ipv6 +uuid"
 
 RDEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libX11/Manifest b/x11-libs/libX11/Manifest
index 1e0bae566b21..89fd7f8ad215 100644
--- a/x11-libs/libX11/Manifest
+++ b/x11-libs/libX11/Manifest
@@ -1,3 +1,3 @@
 DIST libX11-1.6.9.tar.bz2 2283814 BLAKE2B 00fb965b9cd19bde79c4e598c677d21058c85a8ac37d9addab7fb0b2faf67e3d65b91e1864bcd7180e5fd8b0ab7ec3cf68ae7f95ac8e82a049529b5a139b43bd SHA512 fc18f0dc17ade1fc37402179f52e1f2b9c7b7d3a1a9590fea13046eb0c5193b4796289431cd99388eac01e8e59de77db45d2c9675d4f05ef8cf3ba6382c3dd31
-EBUILD libX11-1.6.9.ebuild 697 BLAKE2B 791a30054337f1a5a7dda5863f6bd4f61f15ae00d31707a67ce76cf5eb7b4a1c2c59fdca55d1df3538b4f5bc15d4458c5d113b962187c9faaabe4cbe7b39a266 SHA512 7e19a332afaddc2f95cd66088e82372e4ca0f5b34c2d68a9699f43dfa8bf7bf7602e638627bc271ac6e67151c8a05c1b9b2aef5aa6982171c96a0736518c3994
+EBUILD libX11-1.6.9.ebuild 693 BLAKE2B 9c679aa628f39b4fddc4141f10b26be3a01d2ee5fa477bc80e6eaf0891a5c2cf5815e5c25556b370b31dfcd6846973c45e6b56ce5b73d5d1ff64a755a00be4ed SHA512 5114bb518dd2bb22cb6a43d8425f20e14a13344d6e0a235a573dfe077e07e96fecdb65d79006731b7948299be0c8af5898d06fc78ee7905f7b7cc7a9ea70e926
 MISC metadata.xml 311 BLAKE2B 1e5deaa311245a5794e72574f94028f60c1c712a06820551cae811b113d633816a60fd3920ff5f2ca287558dbcff28e57537d5c0d3ee3a325c7540bc0b98da13 SHA512 760d09a1ed93bf16d8e26a70fa1178c02c6b336dff9aa29f900d5eff305686b9c3fae4bc93bcce58c0427f567d3759dd3a8adcd8707d07fdd90c6db79d4e13f2
diff --git a/x11-libs/libX11/libX11-1.6.9.ebuild b/x11-libs/libX11/libX11-1.6.9.ebuild
index f65616924f0b..10c68c7a868a 100644
--- a/x11-libs/libX11/libX11-1.6.9.ebuild
+++ b/x11-libs/libX11/libX11-1.6.9.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org X11 library"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="ipv6 test"
 RESTRICT="!test? ( test )"
 
diff --git a/x11-libs/libXScrnSaver/Manifest b/x11-libs/libXScrnSaver/Manifest
index bdb2d4838260..f637014c1ab9 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 498 BLAKE2B 1d7dbce39f083bd69e98c4b6bc5ed67088cfc9bab8de59a6c71b64a1c00948f49b54c5d1a8727e7256cc47f1e9b2a85f8572a55c66a24694e370b169f3b80a8f SHA512 345a9cec9c293822d96ff2169b95bda4f48cbe3eb13aa4fbd4125e397bfc6e2ece50dd9cb5dbe2b92c614ebae41127911870c0483d23bd8b38fa7a6593525362
+EBUILD libXScrnSaver-1.2.3.ebuild 495 BLAKE2B 4fc3a927797743d8ca16b394f11d69f532acc78c621d357b3b9d0bc8c050eabc30f685fc628b5f8a660a8f471b09f71f19a72b3e951106661ea1b474bf2246ce SHA512 5f2affb61d597f9e2c9dda213e913a19f77f08fcf6745b49b283bf05a59d6859b2539f20aac7f585d3bafd673da219445b4e7fda1e52224f1653c93fc9b6f3b0
 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 522087547a77..50ea188d6f3d 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 ~sh 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 ~ppc-aix ~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 51fe2ee74869..fa7e1193df39 100644
--- a/x11-libs/libXau/Manifest
+++ b/x11-libs/libXau/Manifest
@@ -1,3 +1,3 @@
 DIST libXau-1.0.9.tar.bz2 322650 BLAKE2B 0bc9eb01b99f13a8f978edd7ff63d76f89071ac27f1cd946f9ebc96165a892e7ba7cdcdc52f73e8ed6d5b3d672f8a29a24582195fe14d1d24730a797a592cdd3 SHA512 3ca454ba466a807ea28b0f715066d73dc76ad312697b121d43e4d5766215052e9b7ffb8fe3ed3e496fa3f2a13f164ac692ff85cc428e26731b679f0f06a1d562
-EBUILD libXau-1.0.9.ebuild 477 BLAKE2B 8cfd173667cae357c08c76fdc3e7e0eed1ab7085a830d36c8a88e4e9af2e1329298cc29cc37cbce3ab669f0684f32268d5bfbdfcada4bdc7736d3fc4a26ba922 SHA512 3bb4e2866cdec2d78f2a73eb9711e1fe5c54b992a89da8aac2af26678984d0f7787fdfa9754f0ef31067cb0057040902a39d3478ec047c9fce94e72e8e44aa8e
+EBUILD libXau-1.0.9.ebuild 474 BLAKE2B 9f7b74e6f5c183b91cf92b892df357407d1898132aa386b72b1c30b2bcca87b2b84b68f4884ec62f3a982dc23a90f478de45d87e5712410fdc1a2740f5732794 SHA512 a92a61c1abf46a69ff83d7ef342742e61005ef6278406a62201a78f3d39f55775a8d14687d99b057124915acf98184e2989f5dbaa6d1a5cb13205d5398e5a2f4
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXau/libXau-1.0.9.ebuild b/x11-libs/libXau/libXau-1.0.9.ebuild
index d7142517be6a..85f36a1183b0 100644
--- a/x11-libs/libXau/libXau-1.0.9.ebuild
+++ b/x11-libs/libXau/libXau-1.0.9.ebuild
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org X authorization library"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh 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 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"
diff --git a/x11-libs/libXaw/Manifest b/x11-libs/libXaw/Manifest
index 13e70c9e63c8..de8c4bba0072 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-r1.ebuild 879 BLAKE2B e3fa3ade3ab348472e3568d0eff23d30c8c0d069021cbc4be62347d7a10ba7ec9ab64db7dad4f6ec09f8e312a16ad1285f85f24d3431e77708eebfa6249627cc SHA512 2056a3e08a249b74e4ba506811b8a998b04fb5ea0bda2adb5819f7478c6b7919fb7d8b0846b047556e104c1f7f8b279e41a7e7259c91e8a25e103b5058ace74b
+EBUILD libXaw-1.0.13-r1.ebuild 876 BLAKE2B f580b1fa6791ea8f0e5444bf7c5a392a155b06e1717165914a0fbfd0c5825d78a9dffc1a8dc85aa0068c3f933679b1823186acea0b4ba2b2f82932d3bd15568c SHA512 daf10e307f9071c9812f5f6661a60bbef1af69bc9685bd7f792d4adc3fce37799be23239beafe1ef9400936e420b366eae76ba39830f247161920374f9363f45
 MISC metadata.xml 308 BLAKE2B c8b1bdf11408b82ade3364323648bf367d76ddec0711a46f3662f4fe34aec46918c7acc617a782312725ab0169e82c25d480194a2ff22bc3429f5f3c1d4e434d SHA512 331203494a47823877466669591ec0de413400dc18f51e96c18a06b7bece2fe56a73055cd7f1e4ffcf6cc9cc9bdd488a7a5ce2830def9ce5a6ae187c52dad364
diff --git a/x11-libs/libXaw/libXaw-1.0.13-r1.ebuild b/x11-libs/libXaw/libXaw-1.0.13-r1.ebuild
index 11cfd2251541..4f65e1ca4a4a 100644
--- a/x11-libs/libXaw/libXaw-1.0.13-r1.ebuild
+++ b/x11-libs/libXaw/libXaw-1.0.13-r1.ebuild
@@ -9,7 +9,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Xaw library"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh 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 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"
 IUSE="deprecated"
 
 RDEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libXaw3d/Manifest b/x11-libs/libXaw3d/Manifest
index f2e8ed6b432f..27bfb021b0b4 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 716 BLAKE2B fb4a3fe589b4e71af6a79d91de2dc819d5443bb03a0d8c7977359ce26fde5b6d1af671e29e9c046ca1f2bcb8911423f22cc7f6294527dfe6db5b164644336223 SHA512 4715b6a0d74f6c235da550d551eda8c4406a5f6ce563112e1142c885b88463d175e6fba135966421f49a5af6c5f9e80a26862cf0d693437107a8a99e7dfc8336
+EBUILD libXaw3d-1.6.3.ebuild 713 BLAKE2B 2f21a7756b25f9e296c22651a62b1e1f7819292862091765f61fe1fe3cbd72ce9be8f29de18acb9850d2fdd7140a95751ff3b01e42e5d794533be16b27e180df SHA512 1a8c2b21a7bd66504a55d1ab0ac1e809c16d7a3a25a95eac838f0a018e2ae0fde29f5ecb57afcab88044e8a0957e34f772c84e6538a1985f7131d616becdf0d8
 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 ea8531d6b890..c0981dea6a40 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 ~sh 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 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 7ae49ebd6cb6..01cf53476dca 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 607 BLAKE2B df09e5953e6614333de415510de8b1a7b7e34783409d0b2eadfc742d619699fea72c21833af26c362ce70d9b6b8d606c84ce5b871e3dc156cd3a2c70462b4ad6 SHA512 e8e5ce9377725ca1ab31c5a02c21a47b1f37b49e628f5a01c5946f2b56d2cd05281b5fd58a0b4759b5bfa6e5b9afe624ab63d0d50ad36e2d8f25d0601028bb78
+EBUILD libXcomposite-0.4.5.ebuild 604 BLAKE2B eb59cc9969cbde250870484976f797eb55c28fff44af941c777721abb6b91ba97dea4af861b84a39655bb523438859361035f6b59f60af378f51e39a464737dc SHA512 6c5ea8ef06ccbbae69e9310840f980e4a6891db6531cd70beafc6539ae96a99dacbc11e9716f29a7eeb6b10347fa4beff613f3ab50c5e4d781921462e2ddd743
 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 a8547d763111..af9569a717be 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 ~sh 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 c96f82c3531b..84d62e14cad1 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 875 BLAKE2B fd1c3d41dc18578f1fa0c5f155a69694121840aab11dc1fd76fc95a8ea224778201c4c2efbce89ccad2d4236b9c4e534c2634cfb5c228284d9829a1e35c1c53c SHA512 1c3b16a100576d4302c610d8f4a0364ccbd91280517ab91a25f0befec38914f780a51d62728ca257220eba01cb32eecf9418e49ff27ab387e6d13333330911b5
+EBUILD libXcursor-1.2.0.ebuild 872 BLAKE2B fa0c37fa8f6dc3b642406f10155b3eadd349b9be5cf65ce0f1b37b045aee122973b88cbd2a484ee6c5cdadf2fbec7d800d1ac48090b1394c17afb49a01fa4332 SHA512 7f5b3b04273e39b36645f775b01d57c788da2394b5bbec4536619981d428b79492c429f2d3811094859e15d1a4a0152cfb4aadb5431cd21e7e0891746892f565
 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 fcededdd59c2..55402fb5281d 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 ~sh 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 d878b27ddc1a..a937eefe6dba 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 515 BLAKE2B e9ea5a247a71c756bf251df1507c1958ddaefbde18008cc11486ffbe87c31084d6817cfbbf03dd45ca197a3dd4c929fad526196a0a6118ada0b8223e02ab3b9e SHA512 476443a9ff404eb32471f91cd53d2f6fb43a529d35d71de53b1620f4b2f6ea16af4e0709b7871f0ce106d536eb04fb7d2531cea6c02f5afa126c5b624d7a0f55
+EBUILD libXdamage-1.1.5.ebuild 512 BLAKE2B ed5daa523838701e0a357ebd1b7184e53312fbe0a2ec042f126ef2ad65f6883fbdaeb1751c00f29450245f2e12e1b015e2f26a3fb2457a3975f47e08b46a1d0b SHA512 a7ad9dfb3801edccc34891a2c89e7c2567811d4c3a94a0a880723f8a7579d50ed47b5bdfcb80ee34accb2f37eadb91889dd221645ac21c0cdc18d9c9c6d8675d
 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 16df1fc36320..3db214720c91 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 s390 ~sh 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 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 d4f1ff608cc5..1b0cd470101b 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 654 BLAKE2B c44250005988ecc305a5f0f6f0baa0643dddbed34d196ca4a5792035f0730b11dede2a197e2a1ed51db01112e1c67ffbcc887e8bec20c0ee056e9562852cd2af SHA512 e73d5c87d4c623a6e2cba46a5241567c69d2ce7e75deb1a8bc2fe389042b73c1364c136403619f1b967944157ef2dd4e41a467453a6699d0d28d6bac59a9911d
+EBUILD libXdmcp-1.1.3.ebuild 651 BLAKE2B 77c1da3658cac24081495cb7cd40c49370ab7b5af3d4d6aa5c156a6dd420759f6993a2d47ca1f799fb3c3dc27f3c7c7fc7c07d0d0a68b814e26c4c4ed9653eee SHA512 bca5a09000c456f207670e34f6e3f651a4237f5bd22ff13634ca60226a3c52cf1cc7c718232ee3d1761d52e29fe540b0077c8b5e2bd53cf455865fedad0aeef8
 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 a3ea890a5457..12c01730cf30 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 s390 ~sh 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 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="elibc_glibc? ( dev-libs/libbsd )"
diff --git a/x11-libs/libXext/Manifest b/x11-libs/libXext/Manifest
index d6df80490483..ee3fc78b55da 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 638 BLAKE2B 66b8d7a68e1c27c247aebe3ba4175b698186a14b7e27733d21998d31788795697aca9255309f3f61d62fa0d4d9766f9af6f7a822205eeb039a71d917a617217d SHA512 671793e4996fb218f4123d9e9ccd61420b5d9c768bd32e5e192a3ed30c20dec57c8c212d4ea7949e941919099f13d62de1e9215c1da285049563be4ddc3bfe7a
+EBUILD libXext-1.3.4.ebuild 635 BLAKE2B 28bf31c69ec2e0f15fe9aba161075ff8ed869c0541e406ea12483ad468eacbeae682a55a4d5e41599ec1841ac2795f4a0b60757f7594518aee98fa5545967170 SHA512 90ba3d1be481d45fe565ec88f70890191c6351c5723da442073274c318a090c786d64be5a6b95e8c231515b0347d5e8fdf9a6207739da7226ca3b68c7874c4ce
 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 0e12bb3dc342..a42e64f0aa37 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 s390 ~sh 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 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-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]"
diff --git a/x11-libs/libXfixes/Manifest b/x11-libs/libXfixes/Manifest
index 68ddcb3ad2e6..93de598d0644 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-r1.ebuild 492 BLAKE2B fd3e9cac4d9d13396c2a5fc0fd25219ca5853f51a67d89f435612cf02ac8a283fa32e8d28ce133b4a8ca67a32a837aa3c6a91a2af22db8ca2d5a1522f68dee94 SHA512 6dd5a2d7f4c3a1e92584dd9e82ed1e37dc2a82083575ac52257cc9fff534f622fbe5f716ee6a3f7fb5d51ace1cf9a069e7491d087583014b901c5383e051c125
+EBUILD libXfixes-5.0.3-r1.ebuild 489 BLAKE2B a2acaa7b4adfe1a04cb01419f773cdbf1b9b62c1d3a3398dd07e2cecbec58dc5cbc29d93c1a0f51be924ca2bc23e52121bf6f31c830425abad4610f76d1ab8a0 SHA512 3ba58b1623f986908f0e57864d5d98eefde2bc838c2164a62f1832c78b73618c21022fc61cdd862ed9360ddc295908fbf9d30f840c63f8d563d2ddf80e5190cd
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXfixes/libXfixes-5.0.3-r1.ebuild b/x11-libs/libXfixes/libXfixes-5.0.3-r1.ebuild
index 7339679b651a..b5970c8e602f 100644
--- a/x11-libs/libXfixes/libXfixes-5.0.3-r1.ebuild
+++ b/x11-libs/libXfixes/libXfixes-5.0.3-r1.ebuild
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Xfixes library"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh 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 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-base/xorg-proto
diff --git a/x11-libs/libXfont2/Manifest b/x11-libs/libXfont2/Manifest
index 28e20b5d5509..02a2dccf8ac2 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 791 BLAKE2B bcfed4dddd7c8074b6555b7b3ea17704ac15fb844599cda0d3effcbdf18dc5c2351f3be4effb0f1476a2e7e2188063132251b9657f166020002c4fc8bc08cd0a SHA512 f113230527423b04e41169c48551dc830650d36908d29d059c85ef7cf036eb9061733da143a1b9bf4c2bdafc2a172359754b69bbf37fd59c4447ced9263ac334
+EBUILD libXfont2-2.0.4.ebuild 788 BLAKE2B 576f8b2ac500b09c587d2d9032b564808454c0d7271d1fbc83951cda43539f404525495311da936f668b9efbdc7e6d8b40e894031458d9f399092fd3a038a8ac SHA512 81b2421892e10424bc056a2351e1c66cb08f25c0c1f74631dc849270caa84a04d5d4f56b923362678387a77559ba0ee9c8616fdd932aa9e2b0e583b800648c79
 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 7c6ba55c505b..fa279ce88edc 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 s390 ~sh 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="bzip2 ipv6 truetype"
 
 RDEPEND="sys-libs/zlib
diff --git a/x11-libs/libXft/Manifest b/x11-libs/libXft/Manifest
index eea9c053eafd..6ac4a65dc7dc 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 710 BLAKE2B 3c46edd8a99f4d06ceab6978ea0b27bdd22eb02ccd8811a8d5ffeba392e4c8918747a3209806b5b4000131c9063e5342247ef99b3d7d819cad97a9599c6a4c9c SHA512 37b6f3f0cb44e87b606a96a34990994ff53ec06267a37f666573fcae594f0d3d390ddaefb6e1592fb253b9605dc0600a3a49d4ada6bee67ab2623491e09506c4
+EBUILD libXft-2.3.3.ebuild 707 BLAKE2B d6daa56c1a4665e05d5edeaacc38d36250dfd868fdae4deef7ed7bb2ee3d2d423635184648875bb3cc6da1e8b4640f92cae9092d1426b4716bc3a9e319432c82 SHA512 f2f92e2e92b1131aca245e728c83871f32aa4c6f117889dece8024d531ba2220226c52f14ee0d881eee2126c7c9bdf69ecc60539b5f52504980352e3360012d3
 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 7cacab3366d7..4dbd19d6d348 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 s390 ~sh 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 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 ce926486e2c9..d18b8c08ac79 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 735 BLAKE2B 1f7bcd1465020ee928be60a9372fa6eeb80a1f132fd51d2708fcc38c2efbc35342687719c1bdeecb86edab267ef6f230e9ccf28d65ef23ccfe1971541e7fa924 SHA512 b6450515e2a8000dc61fbb62cc662df868963ca1c4e623cd8ecb2972b26305a362f409e03f94612dfd6efc34ba9f3e1e3926cd4499b19c0331ff796a093faf02
+EBUILD libXi-1.7.10.ebuild 732 BLAKE2B 602c5eccf826c4842e312b0cdcd0d606deac72eb046922e6863f2cae936332269cc6f34bca199cfb736f7cb771fea5a339eb7d1301c43dc232a92491f8c0e618 SHA512 8ce57ebf5294ec49545df636180d6a2d240c2ddb29542824810de5ee3d8c76b6b668c2fb71b7b7346d67a3f80b6b12bfe27ecee137c276c0617eacfcc4c1ea47
 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 d07c26c8f679..5524ed44cbd1 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 s390 ~sh 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 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 217fd5d6e176..c4ca3df54609 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.ebuild 501 BLAKE2B 201636f1adc3cef880e4b5f1bac029889213215c9d37d884872d7c83f5e5c4d906adea200417a727c83c290b90b088794d8a5493f67f58da7d8e7659d8a92362 SHA512 beb021acbddbde7c74e9370ef6e13ad03586d6823be3fab67bc6e0059fa076e541234fb8a25c40ac2b6a89383deaa9132cfb619497ec550214b11c1640b50aa1
+EBUILD libXinerama-1.1.4.ebuild 498 BLAKE2B 76b64a264c312f5d75945b79cfbe04231a88fb18ef487c38631bcaf87597e00b38897ec2a07747456fd253f2bd9a4c2a5440ff806a2ec710b1920a2c213f8b97 SHA512 1672fb8b0df66e205b8c74c1de922f3cf9d8ef95b1b5d5b27531d610b12537b7c3d1514d8b3e8e6b068de7d1394817a9f1cfa8aa1365ecf8d7e1bd5fdf7ec0e5
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXinerama/libXinerama-1.1.4.ebuild b/x11-libs/libXinerama/libXinerama-1.1.4.ebuild
index dfcd75669e21..7b17509be5c0 100644
--- a/x11-libs/libXinerama/libXinerama-1.1.4.ebuild
+++ b/x11-libs/libXinerama/libXinerama-1.1.4.ebuild
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Xinerama library"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh 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 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/libXmu/Manifest b/x11-libs/libXmu/Manifest
index abf3414cb040..5098ae1b693a 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 740 BLAKE2B 707e78399efd2f97ffbd632d9d7d29d9393ff9b7e371b23e6851e30ee87065b93411f78ad6a224dead82853e12a27501dfab55865ec6411a7109ff0ec2de14e1 SHA512 2b4405afc4fb025285d51449b560dcc45a1e0fe8c13ed98e1972f9eca4ca11807d9ff9e3aedbaeaa9fea5691489125dc7c6aa8953303ecc711706834e3bf2cc6
+EBUILD libXmu-1.1.3.ebuild 737 BLAKE2B 6f53b51e19a933da3951c133081a6bf7ac5ff59bed7c27b8e293ace93c8a32669b7a90fd9cf2068707e6433eff81cf791d98fd0f707573ee93d44c3cece616b2 SHA512 4ac020d4a0d49b8e16cfae81309319d5024f3e1dbc065dc24aaa7136ef3da2b328ffc74fb9dd02dec8e2fa34d86b869d26ad911afd2b88b52d6c89465a4eed57
 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 9c5b7c8309c0..cb728135828b 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 s390 ~sh 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 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"
 IUSE="ipv6"
 
 RDEPEND="
diff --git a/x11-libs/libXpm/Manifest b/x11-libs/libXpm/Manifest
index e91ece132702..c97704dec3d3 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 618 BLAKE2B 9ca38dde45d221aa0b7ea0ed1d40e7fce61055898a538aa038c32d9107eb59e03f4b356fbd895ac3cb7d09b64ac42353ca088302f19a4945d294de7a59b09baa SHA512 e612674dc80a061cd179539b8975d7399bd9707d79c239e94707398278b4d272005f8627f1465416e5155ac62e5cd8e346b477961db0b3dfcea5cfcd4d74bbbf
+EBUILD libXpm-3.5.13.ebuild 615 BLAKE2B a75e9365f9ec42afc57752dcda518d7c92038ea9270e8e38044803ce89f9240df29e08661a940e1b45316d92cb138a88ed54093ba4ae3321c0065939409b5b1e SHA512 158a6a37dca9eed40c944d14659f8ce8f888e043355f173d88a9e336d74458cc608ea66583a4f5a54754640d3ee81c0b8bcd63c00ff3adc27966102641281100
 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 c8c5a92e65fd..1c952f151c47 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 ~s390 ~sh 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 ~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"
 IUSE=""
 
 RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
diff --git a/x11-libs/libXrandr/Manifest b/x11-libs/libXrandr/Manifest
index 191f0da06a58..ab10c202e3b8 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 592 BLAKE2B c2c6420e6783871058825695bf52d4602a5fa59add4d5638dd4068c638251abcc7c199602ebd670e49b8635d221de31bfc45449e44e82421199a25837fa48a5e SHA512 c856c1b794d0a3246a97a8575accca356f74a413279380c92ea6015451bf5e3a856fb7a85f40d21e2cf92d6c8a2058c16d1441f9eb3c253e7a16965ed7ab9e5a
+EBUILD libXrandr-1.5.2.ebuild 589 BLAKE2B 2ac1a0632ad6f04e14ba6e3f03314fa46325572d26d490afcbcf294d0114e10f07107bd3d1e52292903c9ca207d0ebbd6563ecafac05ac34869f0a479082a99b SHA512 a0767cff554cf06e81a1bae351a309c0d1d8800d6c4d8357773ff5bdcc277c6dbf2fd42bab983469a385f2b327888164a8d30403fba05ff029aafe33ea79c1af
 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 bd12f8098fda..321ee557d984 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 s390 ~sh 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 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 313b54ff0d51..fde262cdf61e 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-r1.ebuild 493 BLAKE2B 971a5878942bd957f32c7d227bbed2f05206991f3741d007984623e83cc23661670cef8a5d13e79a7a8558deeaeb28581c36a75b5499ab01b64b2a1a0f62a891 SHA512 bb21a47260ef8d703da94fe7c81ac8150612f91548c73ffbced93e7f32087090068319e366db34cd91b99697bd99a38a5890e4c77efaee0c81767e0af825752e
+EBUILD libXrender-0.9.10-r1.ebuild 490 BLAKE2B c46a62f2506e765d239db0ccaa8ee1691b2da1991ce7d06cbfc622f67fabbba423aedf6bd1f9c48a89faed3d816bf5ac20306513e38f39a6c6e10c89a136bbf9 SHA512 c58fe7e1ba93d268db6d657ac5635e6a7788e24ce0dc7ba7c38e7772fefb0e625da38af2caf95f56bcb99df5853ae1060d45c7132487bd30cfe21b2f3cf09e96
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXrender/libXrender-0.9.10-r1.ebuild b/x11-libs/libXrender/libXrender-0.9.10-r1.ebuild
index 00fdf17bd48b..fb3071e83370 100644
--- a/x11-libs/libXrender/libXrender-0.9.10-r1.ebuild
+++ b/x11-libs/libXrender/libXrender-0.9.10-r1.ebuild
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Xrender library"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh 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 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-base/xorg-proto
diff --git a/x11-libs/libXres/Manifest b/x11-libs/libXres/Manifest
index 0fbed697ef7b..10c0d4f2c73f 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 422 BLAKE2B bc52148c432dc381921b6856b6a15acface7f64a9c75e31929a344e380a6597f6c7fb79bdf5b444120b6db886609e383f7c1e3f6a3a5bcf77652e4418cdf9e3b SHA512 41fd3a917a679acf27cf3a986b40ec8a9c6f58e67ffede21e7b458363dc114bb00b10f49f4007753e59da42fbfe24131dc8bca95fbfe78060d079fb38f8402fe
+EBUILD libXres-1.2.0-r1.ebuild 419 BLAKE2B c3e809d0461b0ef0df94a11f8c213a244c124cdec00b11fc0788c298aab47a34eb11a9925f85ad7312fe1e984ab55d3fc839191526abf735563911b148349ec5 SHA512 bdc07b380c9f58c0c434fb7a33887b4a10f6615586ecf07803646848a74d940196d4d8f33f5ba76cace7c39c9193d05d4fc64d15e6268734fd3cf42c0a5772c5
 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 0cd2f36ff572..6516b7f4a2ef 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 s390 ~sh 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 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 084ebb4410fa..5f63f2a81286 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 857 BLAKE2B 587e1053a21fadce4e2a90ccee6eed8535623e5d0be8646fa9ac719b6d17879f60a9993935b3735dd6acb7c00eb6db0ebb54e381ecfc6eeaea0961f112a7f9ff SHA512 3a96a8b41c90e7383b35c0eb3e8af8cb3f17089257c4d406dce0e9df430b127fd4996be4f243b2be46e7d3daf09bb48a691460dca40049441bdb3f4419919131
+EBUILD libXt-1.2.0.ebuild 854 BLAKE2B f38afff1faf42ae8ed8cc505e3e0fb14181b35f407b4b89c912d74a69e541adcc0b3706a7a98b48e85bb4097727b840f6f994eb67d17e0d12e0beeb34db535c5 SHA512 51208a1355ae49593c12a65648bc061974d3cd01b0a3d6fe3c6f5f55e4595bd92424abfb6e93c0943d3d0c5c80573ac42f54c66346ee1c69875094611b103d91
 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 f5250c95200a..5f0a40ed243a 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 s390 ~sh 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 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="test"
 RESTRICT="!test? ( test )"
 
diff --git a/x11-libs/libXtst/Manifest b/x11-libs/libXtst/Manifest
index 0ffbc56c4181..dcd58d319dce 100644
--- a/x11-libs/libXtst/Manifest
+++ b/x11-libs/libXtst/Manifest
@@ -1,3 +1,3 @@
 DIST libXtst-1.2.3.tar.bz2 321819 BLAKE2B 92a75d6ea9000fa7736093ce479d275c57a4a5bf849df2d6afae9478a53a07ba395013ba6676c2ea7dcb6a1f34475967ed6508b7c304b887f83ec44a611b8e6c SHA512 6f6741fd3596775eaa056465319f78c29c91b3893a851a4899df651a2023a4d762497b112a33d7d3e8865fe85d173d03e4b49daef76a66af1ae1eaab82a12765
-EBUILD libXtst-1.2.3-r1.ebuild 635 BLAKE2B 97f94c3db5a8497cce539743fe74d89b9ca27baf92a346f5b9b9da81e760298a464726493a27dabfdc81d8677b5ff2cb100800cc2199eedf0594a345fac41dbb SHA512 e908440708f7d7e0e2793b93aba907d4bb1859fbe43cc4c802933e9efef859f2f53ac35961f6ebce6257953b53a7f3a9cd5767192bcbe41abfad31cf18772f95
+EBUILD libXtst-1.2.3-r1.ebuild 632 BLAKE2B 33f69bdcdbf010adc1069371f43524f89171d133b1aa8990c3405933aab707ebee6a741fd34ab416bcbeb5dcf443fe688cbf63308fef10228b236f0bbd89d11e SHA512 070db687b4d5f18229bf030bdc2de3c0d1dae482749605a7153d22ddcac0706851c337afcf4af0068ec78e28439eec2e0e7bdc4f08cd43301c42207496b5d613
 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
index 05191b0a1d7f..358c3155ac7d 100644
--- a/x11-libs/libXtst/libXtst-1.2.3-r1.ebuild
+++ b/x11-libs/libXtst/libXtst-1.2.3-r1.ebuild
@@ -9,7 +9,7 @@ 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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+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
diff --git a/x11-libs/libXv/Manifest b/x11-libs/libXv/Manifest
index 4c633a001160..555ee2cf60d4 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-r1.ebuild 515 BLAKE2B da68a23d33102ee49cee5e7b2f0f842edbccd5ac05f880316b0fd21967a760ef5e6f958f0d02d4b1096d33ea8d46b8804ab8a12afbd95b43c7f4b918a4f601ba SHA512 55488d847b94a18d93deafe27db62e182452dda38a3ef9010b2dd3667e938215d168edf31d3f47769c91985027720d7926e9f4a0b4b86be25236efcd82e9c854
+EBUILD libXv-1.0.11-r1.ebuild 512 BLAKE2B b92b867454b81f310384eb946b62464e27cd6f84b9d7bbb3907c5f3a59cc2bef64281799e407e2435b715b7026521c71bfbfa1b99d68149274f47f012e7f43ee SHA512 f4207d9f725f75c5569d1680b6e665a6f87463fe83b757f3f0225850e3c723116508ab72f6905b90f4c1645a6289aadfa833a69b3d924781dcb0e13ef6e05627
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXv/libXv-1.0.11-r1.ebuild b/x11-libs/libXv/libXv-1.0.11-r1.ebuild
index e94afd5c197b..542f6414c7b9 100644
--- a/x11-libs/libXv/libXv-1.0.11-r1.ebuild
+++ b/x11-libs/libXv/libXv-1.0.11-r1.ebuild
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Xv library"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh 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 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libXvMC/Manifest b/x11-libs/libXvMC/Manifest
index 8dc4e0e2fec6..8fac48a24561 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 571 BLAKE2B a1ee3cdcb0a29347142124dbbab94dcc040bd8e75d2ca3d9e087b9e9323b0f6bf9a6e812877550a562c80b969e24e92006d7008e7268ec7d80bb7f3a0db63f19 SHA512 cd0d65393d23a0b05fa5dce6246880bf4cf7f89a60068268ddd35235bac4c3b81403565c908295f4fe535e7a9a18d03523377c15560698d9c3a2f09e069a74df
+EBUILD libXvMC-1.0.12.ebuild 568 BLAKE2B 054f506125445292a169b34af7e9d96d2ef197372046d89825ace858300e261b16dca14b2b13e97900337447217925bba794db26e53403b201ccfdde1f51639a SHA512 13583193dced24fa90c2500e0bde3d6aae6cef8c3cc347a86f872cc8b04dd6f5e6468d54617c15097187dea13347d3cf078f2e804c0b132abb3a81f6effe2f7f
 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 481e501cdde2..4c60cab7e1c0 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 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~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 9268566a0023..ee4d39a79202 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 481 BLAKE2B 5b9c29ffa5eebd428652ff9f49f245b04d8831ed88703014c6c1a989d817385c95fcc4faa114d911f8414705e4ad095d684e8789a15e186946ad5bbf3f57ea69 SHA512 43afd4c228edfb314a873a6f110806d269010af4b97e6d3bd1597d205c09e84c2919f2981c1b0c8211135fe8fe861960d39380c9b2b1ad7f5a855e9028d1721c
+EBUILD libXxf86dga-1.1.5.ebuild 478 BLAKE2B c4a987b174c0ca4a98d6640196ec5bd5901ff452ddde1538ce9649315bb88631853ae79ce8ee25ceeb901103f415675f46ebfddb3bbe0bf9ff96d718b306646d SHA512 7c3d41f626214696e7ac66887aa3f83aa4d1c89aadc808e13bfccf72b527cbe04564a1bb5710f5fece37e3b76c7bc06bac079f8e45de75e7b54ade6e6f5107ee
 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 858d77ca3508..2b6893fd7043 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 ~sh 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/libXxf86misc/Manifest b/x11-libs/libXxf86misc/Manifest
index 638749549ebd..785c13688fd3 100644
--- a/x11-libs/libXxf86misc/Manifest
+++ b/x11-libs/libXxf86misc/Manifest
@@ -1,3 +1,3 @@
 DIST libXxf86misc-1.0.4.tar.bz2 282048 BLAKE2B 5d60bc5d04f232444143aa1d89b5760a92aa5951efb41b83eed449916219346d049f0c2b7893858c7ba5148dcf273bb0d2b558e43843f897d057780362d0ccca SHA512 1dbd51a51188a060f676b88e5d98809ea355f69933972ceb7721c83289b5bb94c1f7b889baa83209a5ed864e67dd8a4ed62f1393634e97cc99ce36a2cef447fb
-EBUILD libXxf86misc-1.0.4.ebuild 440 BLAKE2B 50896cfd54fc5961a1338f6dd3a1b612d3943e2607b15ccc6f8d8a2e3254603db21748ad8b4887c1391ca1efdb52a1be5aa231ec9062ff74bd55a666b37f046a SHA512 95e0aac7c9b640cedc26e3adc8497a362c3dbdfcd4e1f435eb0c2bf9a9464195345f8c6dfb1fd53f4107fdb4bb117443c0673f8025a6946807dd5036c1878bb5
+EBUILD libXxf86misc-1.0.4.ebuild 437 BLAKE2B 37193e12e7484fde862eedd85d7214f23d8c5078c531115db2d840c3f35f7107fea59c6643a2fa8e611830ccb1beb3868fe361c5089584cd2d5f823797813526 SHA512 4029661526cbc1ed7948477ac5bdece0ad6c4874ef11999e8f8a42ab5f525a93a0ff40b86b164e368a42c762874502ca51b66ff92e24c2a11717c45f24204c82
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXxf86misc/libXxf86misc-1.0.4.ebuild b/x11-libs/libXxf86misc/libXxf86misc-1.0.4.ebuild
index dc1e5bb01076..77d0a9236e43 100644
--- a/x11-libs/libXxf86misc/libXxf86misc-1.0.4.ebuild
+++ b/x11-libs/libXxf86misc/libXxf86misc-1.0.4.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Xxf86misc library"
 
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh 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 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libXxf86vm/Manifest b/x11-libs/libXxf86vm/Manifest
index dd7634c42d9f..5036ef6508ec 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-r1.ebuild 520 BLAKE2B 78931c424e1afd6c80c3a1e3629c74eba3bb29bf6ad8de9dbe1833d5d99928579d3f6d9a85fc3df30d20b5dec3c2267f065af271163786e0f7382110bb20aebe SHA512 2bd56f99614c8ef2155a9f2fcbe9985b7a19c386a56c71d4569c3b94ace2560062ae30ad6a2a808a57ad780fc738ca7a1b741af5624a073303de8a623c78b5b4
+EBUILD libXxf86vm-1.1.4-r1.ebuild 517 BLAKE2B 38382ee1b5d771f6e193fb4b62c557323a3af31096523c8802f4e37eb46ab2b29bab09fc0bdd4a5618304b841391ef44e6ff259856afe3c37eb9066234958b69 SHA512 31a5f830acd96c23405b003c3d8cb3d2bc8c6793b4ba313adefaffd85188b02ef0feefaed50557bd423eda23b31397ee0a2dfe9b0d2f116f8a4ac805a8d9a211
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXxf86vm/libXxf86vm-1.1.4-r1.ebuild b/x11-libs/libXxf86vm/libXxf86vm-1.1.4-r1.ebuild
index 124eeec56090..5136c718ee31 100644
--- a/x11-libs/libXxf86vm/libXxf86vm-1.1.4-r1.ebuild
+++ b/x11-libs/libXxf86vm/libXxf86vm-1.1.4-r1.ebuild
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Xxf86vm library"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh 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 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libast/Manifest b/x11-libs/libast/Manifest
index 35c397b22322..fade53e01c22 100644
--- a/x11-libs/libast/Manifest
+++ b/x11-libs/libast/Manifest
@@ -1,3 +1,3 @@
 DIST libast-0.7.tar.gz 508654 BLAKE2B 0c5bf31d5b73fe11d4665bc0d8e1c9a987b944fcdcd89106a47ebf01eb90c2895b3e74e39874b360e91f027b8beaf5698363e9920ad879bfd241b13ef0232870 SHA512 0af1d508af88ce0a2f29fe7841e23759be7c6540a1e2698980c289245ba284fdbf76c593e457c0cd6cfc54dcb6d891b01a3fd4d4a6ecc511fb2de698c9a3046d
-EBUILD libast-0.7-r2.ebuild 925 BLAKE2B 8f698f8dce80ecd56212b2dcb6b7166037447e02a31f5c095d15582046a64e6a8ed3e2e75e3c4d3821c22dc0ffc13b32105c340f86c598b7b9ef92c0ec01abf8 SHA512 78163a3187c2ddc2277a56c33dca2cd874be14741901de771a423703abaeb99f0c0516e39be83f95861b65500803b3066b9e4cc05d2218c62dfcb01e9f977e0f
+EBUILD libast-0.7-r2.ebuild 922 BLAKE2B 5928ced96113c14f0b012db40aa1f05eb08685ac42c850c6efdc18990e47d839d78aa86e29564d3e4d43e8721b4ff671de8ea824cec346bd5496a8c8b97d1f72 SHA512 8a8ba4ea69de12571753d41e941d45d0063febc6bd3931c06e8d68fa750d6d153c923154abb41fdc006bb29e3c27026e86ccbc61403d1aa8130f6faeb7c37431
 MISC metadata.xml 736 BLAKE2B 603c1752552864610f08d8b3144503837feb5c7bddb3ebfe108f4d090e25d38fee56ed63f392c98f5468c69b6bc47ecb65e53bed8c335e6996351522e4257df0 SHA512 a2fd1a0875f0a0c866845b4fcc63d0ab715ad73fdd1cde271e6174606180ee5e1f4924270171c08074a0ffc7af52fb9299dcd32a5f057c1548175bf638598acc
diff --git a/x11-libs/libast/libast-0.7-r2.ebuild b/x11-libs/libast/libast-0.7-r2.ebuild
index 105b818030af..1d705a9e46f5 100644
--- a/x11-libs/libast/libast-0.7-r2.ebuild
+++ b/x11-libs/libast/libast-0.7-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.eterm.org/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="imlib cpu_flags_x86_mmx pcre"
 
 RDEPEND="
diff --git a/x11-libs/libdmx/Manifest b/x11-libs/libdmx/Manifest
index 2b4b8488978b..dc0f672bc653 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 333 BLAKE2B 61963bf46a1fa155fd4d45de86b8707441cf1e2e3696d444a2bcd3fd7be8f0daf6fcaaf45bac7c667277692967ab7aff576ac308dc078aa07134e0394ecac449 SHA512 a11f922c57efc9bb712baa89ac13a1cb596b3061a6c533c7cefb66a4a280013271df4e71794a0ec13b372cf154fdaff7f6b13d2d304b504384cf2fe226c12790
+EBUILD libdmx-1.1.4.ebuild 330 BLAKE2B fca80a3da248b0f8d2888dc10e74f4b4c9944e9260b874fac02f98d2cfc73cba6a54edeb8af45cfa587f0dc3e8fe7945c8ca8ab091c123cb0afbeb1174e3f99c SHA512 5e99324568a1e4f9d91ea8b6133f5380fa7858d3721f74d3d919094e3ac321723c0b8783368a58a973179d77cc91789ccf66f8e4d1b96a9dd775a578440fe9c1
 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 bff53db653ea..cb4400adde85 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 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE=""
 
 RDEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libdockapp/Manifest b/x11-libs/libdockapp/Manifest
index 8c3e566b34fd..36720921997f 100644
--- a/x11-libs/libdockapp/Manifest
+++ b/x11-libs/libdockapp/Manifest
@@ -1,3 +1,5 @@
+AUX libdockapp-0.7.2-fno-common.patch 775 BLAKE2B 33d2f778c6e68ff4b8d4a198ffaa0dcd575711b999811b201cf54625eabea928e7512551fbd9234105c07b39b8d9f109ed39b9ed686a166a748ef72fa5bb365a SHA512 ee7b9b097ddddc47f1600a5cefae756a2ddb9f7e1e6a559baef090cdd60450f5f1ad7e8c705ecc87958957959574828fe6cc8dc5bf7ff992813a7a96192fe624
 DIST libdockapp-0.7.2.tar.gz 40462 BLAKE2B 8d4d2e3d9b1856875a275661cba809852e7c91867ffae33052bc472208db911c19caf1b77b16e367f007e1606be6add6d9bc5a1e76ea8fa2b8616163e922f21e SHA512 a2f216ac1105abe0efbea191691bae986b6022510f96c78b08c1b809cff131794c81810197af7d1321f9b248202376cc7092e79a4d4afa3fb93e9ed8000c9d79
+EBUILD libdockapp-0.7.2-r2.ebuild 892 BLAKE2B e5af18f8d50ac9ff2fd3c410867bc2d4469f30addc9d47e3f248c20f5babd751414318acfd63ee0ada89565a48b2740c4d9d1f54b3008499250d44e8d7ca9c0c SHA512 4db9eb1c9b743aafd5640a5ae4ee0f820adbbb8544d6101c8fd561663056a41d80e5a09dd87f859303ac0bf5548999db14c5fa72c5373973d630261cba242f04
 EBUILD libdockapp-0.7.2.ebuild 830 BLAKE2B aaec8142bd21ced4cbff4e9e229dd6384a853822b2daaaa1b9053c8637c813408fc150c2088f049ab7eeb71ededdfdb932adc8c0978417a3bfb1fbc600a3a417 SHA512 ce7f15c60ee3dc001fd2bad5366193c0d41cfeb0b3b1a4291a0454cf5ed5d53f78e3933259f61240b3e2339825a0d8321662bc1ba0cbb625502199235cdcf1cc
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-libs/libdockapp/files/libdockapp-0.7.2-fno-common.patch b/x11-libs/libdockapp/files/libdockapp-0.7.2-fno-common.patch
new file mode 100644
index 000000000000..80f54c88cf26
--- /dev/null
+++ b/x11-libs/libdockapp/files/libdockapp-0.7.2-fno-common.patch
@@ -0,0 +1,23 @@
+diff -Naur libdockapp-0.7.2.orig/src/wmgeneral.c libdockapp-0.7.2/src/wmgeneral.c
+--- libdockapp-0.7.2.orig/src/wmgeneral.c	2015-10-27 10:32:25.000000000 +0100
++++ libdockapp-0.7.2/src/wmgeneral.c	2020-03-29 17:12:56.648083089 +0200
+@@ -85,6 +85,7 @@
+ GC			NormalGC;
+ XpmIcon		wmgen;
+ Pixmap		pixmask;
++Display		*display;
+ 
+   /*****************/
+  /* Mouse Regions */
+diff -Naur libdockapp-0.7.2.orig/src/wmgeneral.h libdockapp-0.7.2/src/wmgeneral.h
+--- libdockapp-0.7.2.orig/src/wmgeneral.h	2015-10-27 10:32:25.000000000 +0100
++++ libdockapp-0.7.2/src/wmgeneral.h	2020-03-29 17:12:41.411042265 +0200
+@@ -66,7 +66,7 @@
+  /* Global variable */
+ /*******************/
+ 
+-Display		*display;
++extern Display		*display;
+ 
+   /***********************/
+  /* Function Prototypes */
diff --git a/x11-libs/libdockapp/libdockapp-0.7.2-r2.ebuild b/x11-libs/libdockapp/libdockapp-0.7.2-r2.ebuild
new file mode 100644
index 000000000000..146ca4db16de
--- /dev/null
+++ b/x11-libs/libdockapp/libdockapp-0.7.2-r2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools font
+
+DESCRIPTION="Window Maker Dock Applet Library"
+HOMEPAGE="https://www.dockapps.net/libdockapp"
+SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P}.tar.gz"
+
+LICENSE="MIT public-domain"
+SLOT="0/3"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+# Required for font eclass
+IUSE="+X"
+REQUIRED_USE="X"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXt
+	x11-libs/libXext
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+FONT_S=${S}/fonts
+FONT_SUFFIX="gz"
+DOCS="README ChangeLog NEWS AUTHORS"
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
+
+src_prepare()
+{
+	default
+	eautoreconf
+}
+
+src_configure()
+{
+	# Font installation handled by font eclass
+	econf --without-font --without-examples
+}
+
+src_install()
+{
+	emake DESTDIR="${D}" install
+	font_src_install
+}
diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest
index 2546cbe2545f..77cef689c70d 100644
--- a/x11-libs/libdrm/Manifest
+++ b/x11-libs/libdrm/Manifest
@@ -1,4 +1,6 @@
 DIST libdrm-2.4.100.tar.bz2 855793 BLAKE2B ba2c631de860b8e2a8bb34d8ac0ba2ed11c05cc98a156bb81ffafa0395e22f79878b9936efd1ae33c31049c2a5cc281586a867a974eeb4018dd713a8481ed269 SHA512 4d3a5556e650872944af52f49de395e0ce8ac9ac58530e39a34413e94dc56c231ee71b8b8de9fb944263515a922b3ebbf7ddfebeaaa91543c2604f9bcf561247
-EBUILD libdrm-2.4.100.ebuild 2123 BLAKE2B 9aee90f7a8d0da7b135b2a6d895991d22e7f27488b1314742b545f11a373db6dc46cd9e6262a78e7c505d3c11f5bdf3b84f4d17cd42b01a3b997c2c677cd0c75 SHA512 8c7ad36e3a1aa40af4b95db26084148e39e401ef55a146174dbc302478fec93f31e7b1e91735dc79ebf7d2acc78109a445dbedae14a7c7d518d0b494ce03dab4
-EBUILD libdrm-9999.ebuild 2132 BLAKE2B 355ab8265fbb85c26623fce83ab593b860248b4b8350d1daf8183b5492a73e8621abc4f99edcd017676b6333d63cbf84b2703ca8d2da7d737ded91ea7d99d4c6 SHA512 d4d44bd07c2815a299a8f32ded02c76a46529d8430684164227f5b47d6806d97a76f4e65c32de72262744190abb01b1c35702535f56f6fcc8eac3cc0746d8f1a
+DIST libdrm-2.4.101.tar.xz 408856 BLAKE2B 4b2ab7ecf6c360bbe259913943aadabacdbc4fe2eef72cddced4e2abf830e253230d28c8c2e595f93c20a48813eeeef6eb8d20250a8afe1ddce76c48bfa3988a SHA512 658cfc6f478b674b77b4613e1af9ce8f4fd2ace8a18e75729de254d14b7c1f5d67d4bfdb58744aea74abca0f6521326225f4156bd5cbeeed79ca3e025f657e8c
+EBUILD libdrm-2.4.100.ebuild 2120 BLAKE2B 97b0766f1a0b6bd1b796d4049891323c7442bc2d05f3f58bfab236d335b21c76c0cf4312702e3b0d57f6de3fae681bc3eeec97ae17e80a0b6783a11c23921e1d SHA512 e136099e103664353af667600f77f2bdeb8594395cc15f27a5e06b85f18ca28962ac81e955b886e0db157e5e8caf1b59c6ffe952d2286e5d3c9131d5ea9d71a3
+EBUILD libdrm-2.4.101.ebuild 1988 BLAKE2B d8456210498cfd377691e05d37ef8abb1412de0f3fc871f7ffc4cc141a34a95b196ec843ce0939719e3d9fee6d6dffd46de6fdae4b6d1426235d591ff9268022 SHA512 9ed3335d53489a17d895493c948c7ae44ec645c07ea6b8d1271deb62203a02c8b38120d0a717c15de3e8061098a7ad57f5b6f2ee96ebebd06bdf37758975e801
+EBUILD libdrm-9999.ebuild 1988 BLAKE2B d8456210498cfd377691e05d37ef8abb1412de0f3fc871f7ffc4cc141a34a95b196ec843ce0939719e3d9fee6d6dffd46de6fdae4b6d1426235d591ff9268022 SHA512 9ed3335d53489a17d895493c948c7ae44ec645c07ea6b8d1271deb62203a02c8b38120d0a717c15de3e8061098a7ad57f5b6f2ee96ebebd06bdf37758975e801
 MISC metadata.xml 406 BLAKE2B 2a08dbfc07e8d6ee0f61373821fe6b369130b98d30786ff4559dfd57a9a5189a4d2e0f9faae2ba19cffe023460433a4874d30aa26913ec3ff7263efb10ab0850 SHA512 703594ef462bb5b76a61d53268c043ad5f9b0febc907e48236f425ad047d931ae7fcc0a433d8b30acd8b6f0582eb0263586010bd95a17c4c383e7d703166b9da
diff --git a/x11-libs/libdrm/libdrm-2.4.100.ebuild b/x11-libs/libdrm/libdrm-2.4.100.ebuild
index aae3267d6665..83a5eaf7240b 100644
--- a/x11-libs/libdrm/libdrm-2.4.100.ebuild
+++ b/x11-libs/libdrm/libdrm-2.4.100.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+	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"
diff --git a/x11-libs/libdrm/libdrm-2.4.101.ebuild b/x11-libs/libdrm/libdrm-2.4.101.ebuild
new file mode 100644
index 000000000000..46ea35c8a426
--- /dev/null
+++ b/x11-libs/libdrm/libdrm-2.4.101.ebuild
@@ -0,0 +1,71 @@
+# 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/libdrm/libdrm-9999.ebuild b/x11-libs/libdrm/libdrm-9999.ebuild
index 7178075e7431..46ea35c8a426 100644
--- a/x11-libs/libdrm/libdrm-9999.ebuild
+++ b/x11-libs/libdrm/libdrm-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/drm.git"
 
@@ -16,8 +16,8 @@ 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.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+	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"
@@ -30,16 +30,11 @@ RESTRICT="test" # see bug #236845
 LICENSE="MIT"
 SLOT="0"
 
-RDEPEND="elibc_FreeBSD? ( >=dev-libs/libpthread-stubs-0.4:=[${MULTILIB_USEDEP}] )
+RDEPEND="
 	video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
 	valgrind? ( dev-util/valgrind )"
 
-src_unpack() {
-	default
-	[[ $PV = 9999* ]] && git-r3_src_unpack
-}
-
 multilib_src_configure() {
 	local emesonargs=(
 		# Udev is only used by tests now.
diff --git a/x11-libs/libfontenc/Manifest b/x11-libs/libfontenc/Manifest
index 3010f3d41c75..5fe5be70bd19 100644
--- a/x11-libs/libfontenc/Manifest
+++ b/x11-libs/libfontenc/Manifest
@@ -1,3 +1,3 @@
 DIST libfontenc-1.1.4.tar.bz2 320492 BLAKE2B 34da17e220789f5078e870329390c0e3ee665598db3432ef5a33e78d1db4b12460c7467bcbcc1dad67e9f6ade0173f9fad915a2fbbee51f0be23feedc242e7bd SHA512 76fa851d00113241f15fdd5b5bb7e927b8d8b9a82ce3fcb0678b8c7e32cb5e8d898c4bda1d60dafb7748145049d3240627ac34a2360c64e98a7a912ea7c30582
-EBUILD libfontenc-1.1.4.ebuild 516 BLAKE2B 3b69cb0a74569691c82730a711599eb546c9b336f04ff2336dccc8502f29330764dbda0fb55955421bffcf61d66fe3af9bb70a762c069f3d12aa07f713166bfa SHA512 951cad9090e921245373f2085dbdc607cc2e5fe3466fff83c2819dcbf86fbc2f4c6ee14d99da4c4f7e08f95427a9fd5d3f6989f0c224c630cf02e3bbdef22bca
+EBUILD libfontenc-1.1.4.ebuild 513 BLAKE2B d1c3afe358fb8d7fad58a7220158125f1a78f050f9c9d8966cf4a58be7e4794acf6de1a0624b78ce2910eeb4fdc89cd4993fc03fdbb7f64e8a062bbc6d16caba SHA512 4ef538c0654335e1fe1d4fdda578553278624a64567d832d6684c3e5507691873d52d63498128490d5e3d26e909d411764d535460b26e6e03af5afe81fea7903
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libfontenc/libfontenc-1.1.4.ebuild b/x11-libs/libfontenc/libfontenc-1.1.4.ebuild
index 4c7373207728..478830d35f27 100644
--- a/x11-libs/libfontenc/libfontenc-1.1.4.ebuild
+++ b/x11-libs/libfontenc/libfontenc-1.1.4.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org fontenc library"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+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 ~x86-winnt"
 IUSE=""
 
 RDEPEND="sys-libs/zlib"
diff --git a/x11-libs/libnotify/Manifest b/x11-libs/libnotify/Manifest
index d4ef33da064b..c02564ed257c 100644
--- a/x11-libs/libnotify/Manifest
+++ b/x11-libs/libnotify/Manifest
@@ -1,3 +1,3 @@
 DIST libnotify-0.7.8.tar.xz 108436 BLAKE2B 0a73eabe58faca55e16774cda6f649ab3187bd73a1f87b538d5098f390571a6a34078883dbd2447731d6e4cae315d8286e9e8acc06e85590c8b05a693a83e7f7 SHA512 9973d7a1af5dd7cfbaa0d0d2c9e72a40df9d814967fde47e95763a69690cc4ed32ecf713d75f91f3dff99a693eff9dab963be124e0530ebf231d517a44e75e94
-EBUILD libnotify-0.7.8.ebuild 1490 BLAKE2B 4d8fcfd5a2672eeb49267ef4480fe9727bf4cdc02d11997008e8541cc613b063b7d5809bbdf8a538544a2749268794cb8f7bfe0cd23a33992233fce26ce5fdf5 SHA512 9ba946a81126f5b5bdd57fb8590d933ee975a80d30e1d7b880801a2c48c6bc79d7d47e9e1078dc1bc89bd2c318d1a8546cfb55647f3e9b7efe715011549b52d5
+EBUILD libnotify-0.7.8.ebuild 1487 BLAKE2B 8a9775a033e8ec479ade134d3c92323d5bd4c19844355a8bddac9802fa124bdafbc2662d0bc0d938d03d79b6e363a9fe6a16008ee21baf308c9af04ec5aea3c8 SHA512 f9bac7d8cd49a15213e9b16abdeb0ed69cde22a59bac91f4a7bd2bca5189db275efb48bc5ce147246ca44468d801c95135f70b504c2ad74fec92e4fb8ea8c345
 MISC metadata.xml 276 BLAKE2B 889856a4e8b234e03eb27d32a4bce748a561f98ca0faa36de124e58e3832d804d1492f59db1154c4ec0e2e0e46c7d9cf38d9911ee83dd0863699581000610f31 SHA512 673180ba375ea401c0a8f197d516417b3f9361b11943c71bac88b0d0b1407b0bc657f5763c6fb6e429cc6ee112869a2247083fe56743e9ce918855c0ea929e59
diff --git a/x11-libs/libnotify/libnotify-0.7.8.ebuild b/x11-libs/libnotify/libnotify-0.7.8.ebuild
index f518209a833a..67c486a9bef8 100644
--- a/x11-libs/libnotify/libnotify-0.7.8.ebuild
+++ b/x11-libs/libnotify/libnotify-0.7.8.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/libnotify"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="gtk-doc +introspection test"
 RESTRICT="!test? ( test )"
 
diff --git a/x11-libs/libpciaccess/Manifest b/x11-libs/libpciaccess/Manifest
index 62377ecb04f9..bf7f39cef889 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 812 BLAKE2B 1d763d69ba3bc3a114a028836c1902833b28fad2bdc697203da1dcaaebc6527bb8ffafbb44665fa60cded7dcb449007dac4adda80dc8fbb6a15ae765cf13de99 SHA512 2890ac08961b8d20298483a8fac421cfd27281f22c26f46457b260990e35ff8e99bf61f3ad960899a7e9aef18b644ab09834059a662a7916d1004c4bba0bae4f
+EBUILD libpciaccess-0.16.ebuild 783 BLAKE2B 6cb2ff759879aeb4ec2860116acba8b8822b5f529c4269144751c683596d07d9881977705f785b9de33347017d419a81f7fcf5988a979039871058db6f61b899 SHA512 36f34be54b79d3b7f14653b305f5b1a86410439384e90ba5e1a580b3a0bb223328b8d85c2f516ed181d8551eb3094b3c9633ada3a2e9bd0fbf0561f5898d934d
 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 2df9c45fd63a..322abda1f522 100644
--- a/x11-libs/libpciaccess/libpciaccess-0.16.ebuild
+++ b/x11-libs/libpciaccess/libpciaccess-0.16.ebuild
@@ -7,10 +7,10 @@ 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 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="zlib"
 
-DEPEND="!<x11-base/xorg-server-1.5
+DEPEND="
 	zlib? (	>=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] )"
 RDEPEND="${DEPEND}
 	sys-apps/hwids"
diff --git a/x11-libs/librfm/Manifest b/x11-libs/librfm/Manifest
index 30f6fa89c9a0..a8a4e5024abf 100644
--- a/x11-libs/librfm/Manifest
+++ b/x11-libs/librfm/Manifest
@@ -1,3 +1,3 @@
 DIST librfm5-5.3.16.3.tar.bz2 3304424 BLAKE2B 6651ef8a3967956e1858d4c94af055bddee1b0f2278fe3c0323232e1824e77d8d5d56533d23af3770a9641a2c8ea64eea35157e2cd02cd73f6bcbddd99ea9da8 SHA512 e3d00b0337c9368bbe939bcb2d7f6b1c3f3b6b5a810074c5d6bc7afccd938c5284075231a0326b5be2b93436bee346871fb47ee30c130e6ce00756148d214000
-EBUILD librfm-5.3.16.3-r1.ebuild 903 BLAKE2B 7e597d0a1f459e323733a587d0280094a85f90dc07319b1ae264780a6121b40dbb36ee4e853836a04a9cc2d19bddebfa0d29dc0316ab6d0e4cf71de3440cc31c SHA512 e204fa18f13f123758973d105a4796e7fcaf575b070d39fe92fd8cb6e4ae25280cad1c5589dbb24ac3e65f7de8b2bf633773167e41208c8359573778f7657051
+EBUILD librfm-5.3.16.3-r1.ebuild 903 BLAKE2B 550d0ae26936ba8d6f564f6f131e20a8a821eaa46f166a7408fb5683f7d259f64597af41f976ef9f48d7964a5bdaa60ec2532a2c2c56690aa407687c28777c74 SHA512 56dc528f21e0a41cdcb7e2a5b9db4ac9adb6b83dc5509c02bc8e0738770c67f44ff846d60e8dd3848594f78128fe2a89df67b70937d92ac81a75cb0d9d08855e
 MISC metadata.xml 239 BLAKE2B 3db5d07e4322fa5b0559623be6edcd78840caf77d64fcbd2bf4eb74d5fc2850e9e6287afbd59cc7d1a01ce4307462e37cb3158690de39be8f0294fe6e11f7201 SHA512 b0230e897c2fa3dfef69e8aca50d4775aeaa9f3c41986585ddd2f2fc0f8913221b2d6b57508aae6322b7b2916d05d2423f45de9dda9b9ef94d0fd753490ca248
diff --git a/x11-libs/librfm/librfm-5.3.16.3-r1.ebuild b/x11-libs/librfm/librfm-5.3.16.3-r1.ebuild
index bba8880c72b0..265bef469574 100644
--- a/x11-libs/librfm/librfm-5.3.16.3-r1.ebuild
+++ b/x11-libs/librfm/librfm-5.3.16.3-r1.ebuild
@@ -35,7 +35,7 @@ S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
 	default
-	sed -i -e "s:-O2:${CFLAGS}:" m4/rfm-conditionals.m4 || die
+	sed -i -e "s|-O2|${CFLAGS}|" m4/rfm-conditionals.m4 || die
 	eautoreconf
 }
 
diff --git a/x11-libs/libva-vdpau-driver/Manifest b/x11-libs/libva-vdpau-driver/Manifest
index 4556aa2ec2b1..257838a0ac48 100644
--- a/x11-libs/libva-vdpau-driver/Manifest
+++ b/x11-libs/libva-vdpau-driver/Manifest
@@ -4,5 +4,5 @@ AUX libva-vdpau-driver-0.7.4-include-linux-videodev2.h.patch 772 BLAKE2B 69265c1
 AUX libva-vdpau-driver-0.7.4-libvdpau-0.8.patch 446 BLAKE2B 3fd96d388be5d55541a3c15a7eac4248d4dd4601a0d116abc09dd1383b407f926a86e448e470617f65ba3f303a4f8421efee97fd6593419e60e3960a5bb6598a SHA512 49555a2efb0b8a49e2dcf942d97c4b862f67e22947adcad2694bc3ee7f94d2e784dddba474e097e0c2f6575afb7ecf5041d2c95ebc8573ca9e3f5bb641fb6cab
 AUX libva-vdpau-driver-0.7.4-sigfpe-crash.patch 742 BLAKE2B c1e3a3af09c0c121747b0da28cb256ab4f9783254349be6accad512b7c4872065909bb6701ff0bee07c04e8c7ed34b93a7f6e50b964a1207501209d75f70d26b SHA512 f56d7e64bfc36f0c54eb5bef8fec3ce0b3efcbcec3fbb4dcda599fb4d553f2ee494a87b8b8a7a1c642598dcca385872b68b612b31f965eb1c943123e75630ccc
 DIST libva-vdpau-driver-0.7.4.tar.bz2 316729 BLAKE2B b9cd0bbbe1e638ad29363cd0d8c6452de222023017283ce81f138730c7ba3396f3ffca40478746cab4b93a8855e73de405aa783e44e6c1179c5e347bd7eff657 SHA512 89f98dc1d7d590fb68f440dd1e37e025d64a621324e013e85dd1367681c07b09132fd2089539fc5b48934624648887a8a97539b4f07ddf9f56a8a456ad030094
-EBUILD libva-vdpau-driver-0.7.4-r5.ebuild 1202 BLAKE2B ca4e6a9cff0490739885a7c4eaa0274f3061903abec0583e6ac9f0a04c73d1d39d6641b3560a4cfd547c4b37d0ceae4f3cdea99aa32b62d8fb1ae141e8f8b95f SHA512 96be908983cb395f53f5314f839b331b05c15c2d43c22d7bc4559be420c98866d04fbc966131aadec59eff5a850c811041894f78d3ce9e57d3316a707c7890eb
+EBUILD libva-vdpau-driver-0.7.4-r5.ebuild 1179 BLAKE2B 7e4c10786618f490a7f9479d00e5ed524f88c47b1cf103d246f0e132471e1f156ff904eb126ce06ea4ef712f688be8b0d61dad867ef0240a2105db4145b26f40 SHA512 0e5f44787ff6f4b5b5295d154fe723eedbce2e71eba9304a24e07f7efda18141056b3b389d04d10f1288f1d79c2cde84d9f0a1d66553ce5a61f2d861b0c2d130
 MISC metadata.xml 354 BLAKE2B d83783f14cc4b4e0c43c6fc50fc3324a8b1fc19af5457bfdaa48ce3ade989764d06a4a12702aaaddbf292900903896813beb30fe4506e3e8029d966c446880fd SHA512 99a9dd9651a16776c22ce528709e588a956d4b20d305392054b3c65e59bbd1ef855c2e916f2458cfda9797efa2570ac0ed706ca20d1df2f878435c6f4f6ca2cd
diff --git a/x11-libs/libva-vdpau-driver/libva-vdpau-driver-0.7.4-r5.ebuild b/x11-libs/libva-vdpau-driver/libva-vdpau-driver-0.7.4-r5.ebuild
index ddb4845f3a42..fb2ab0369c15 100644
--- a/x11-libs/libva-vdpau-driver/libva-vdpau-driver-0.7.4-r5.ebuild
+++ b/x11-libs/libva-vdpau-driver/libva-vdpau-driver-0.7.4-r5.ebuild
@@ -16,8 +16,7 @@ IUSE="debug opengl"
 
 RDEPEND=">=x11-libs/libva-1.2.1-r1:=[X,opengl?,${MULTILIB_USEDEP}]
 	opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
-	>=x11-libs/libvdpau-0.8[${MULTILIB_USEDEP}]
-	!x11-libs/vdpau-video"
+	>=x11-libs/libvdpau-0.8[${MULTILIB_USEDEP}]"
 
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
diff --git a/x11-libs/libvdpau/Manifest b/x11-libs/libvdpau/Manifest
index 7109970adc8a..c1f5501ba989 100644
--- a/x11-libs/libvdpau/Manifest
+++ b/x11-libs/libvdpau/Manifest
@@ -1,6 +1,8 @@
 DIST libvdpau-1.3.tar.bz2 139009 BLAKE2B d535c7723638339d4e67002721e9d0d8aae89a6001fccc41d9c3b21d52f0fae9237705bca448fbf1c244dd7eeb71f5fc74ed81f05c975bed798fce503a571c90 SHA512 c06c23062816e8b207d38d9d53df43a1b193bb9836b48bd6d79a63d76522e87d383c446285b9877fe9c99faa0d290da8a49ccbb58eefa138cc38d0929a8e1330
+DIST libvdpau-1.4.tar.bz2 139525 BLAKE2B 74c56d8d26b0dc3eb0658ef4c61cb18a6b2008c65dd0ef63e7d244d90366c64842708e07b9b1ef28f8a2b67d1ebc331bd83ee1968d80489531d3e90c6197ebf2 SHA512 2eeb4cddf7ea58cb59a6ac6cc49094d47910f60035ceea752756d9d817a189c95b268ef6819bb5fd7af5addc4f6eb6482f1bf8ca7f25840ef522a79ddab96805
 DIST libvdpau-libvdpau-1.2.tar.bz2 140017 BLAKE2B 0420961c48fcd5c92e7e98f84f629946f6234c28781bd7d8c9eb4aa2ab11b76e89e05f50cc423a2935b3376ff3b919ad9e6ef1710ff3549369567f298b5efa50 SHA512 f76c2283a1bd2e854aa6b86a564f7f08c1ff7da34e971c7c39f36e77fbd51fe0440d1ba01bff0b80be6c0326817ee4e6bff719dbe8dbf5e1ec7a94fad5016b7e
 EBUILD libvdpau-1.2.ebuild 1073 BLAKE2B b6b30a1065a56c6c17ebe03db3667f3ee4098a26c6c8000c765afbabbd327c2b416d74c61c7f44e89ba5dd126935f43154d219c5f33bc1c972f2d24837218ffd SHA512 ad19038048c4ec1aafbc940912e6b5f214bdbe899b63d8c7ae2990be9d1d52c54d11ba1963afb187e8bc8da49deb7ca53e30c0eb58851ebd087c9b331bb70c1b
 EBUILD libvdpau-1.3.ebuild 1160 BLAKE2B f8b155db62eee4a49ceaf03d399052673ad39cd932fefa9ae77f1f00113a7c64eb5edf3adc467c35f7b83e7dfc19ed4224248b9fed1f7993c0368f555e856137 SHA512 b399f7ed6b67a88cd372921c34bce9e0f21b2e7d5b279e84275ea2a03f44994659fc8861660a44fe4c98cd4f5f3365815abefa892f4b583b6fd84f01565c5e09
+EBUILD libvdpau-1.4.ebuild 1207 BLAKE2B 3e1e9f9ff4ce8f7b7e39c5e0ebfadbe46ae7d5b032b311e114d4c3705033d22d6eb7f6dc9a35ed2d137e280a484dbda582d280e9bfeaa6c4b641b93fd2063380 SHA512 b1db8adae123ffe3183d653da07eb33c31d47badf02fbade6c120a0a6305409e22d45c69d8875c309b1c7c1b1cd4392cdf5699eaef10466372ae9955ffb1a13e
 EBUILD libvdpau-99999.ebuild 1122 BLAKE2B b2e74c53c093e22e58257b67b91b59f51e98cc3715f68c67958a57e366df36bb660436e3bb7abdcb0fe11490f60d6a0c5bc8b2658c58d3979125385f6d7f7276 SHA512 8da6e8637191f4b8c198498e4f81fb4e7a0f5fa8108c16edf3ae89d52ee7ab360a2c2e505b3b5341076e7cfe18f1ad1093c251cad96f456ad81f134fdd940851
 MISC metadata.xml 244 BLAKE2B 9c6750147c240d7416fad33e04b53730dc89cbb615648a7f3defeed3ec058aeee6dbed55a1f81241417b42ca9f7daec177c725692166a5ba08765b5dcf5a6bc5 SHA512 1da71f4fae0251c97a8fcfa1e13b0a3f8b95a856fa919ebd30bf4f2f1b8fa900841db09ebc2a0ae9fe0d91f786ac40b63290382668412fcb05bca15b0746f1db
diff --git a/x11-libs/libvdpau/libvdpau-1.4.ebuild b/x11-libs/libvdpau/libvdpau-1.4.ebuild
new file mode 100644
index 000000000000..d971e801f496
--- /dev/null
+++ b/x11-libs/libvdpau/libvdpau-1.4.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VIRTUALX_REQUIRED="test"
+inherit flag-o-matic meson virtualx multilib-minimal
+
+DESCRIPTION="VDPAU wrapper and trace libraries"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/VDPAU"
+SRC_URI="https://gitlab.freedesktop.org/vdpau/${PN}/-/archive/${P}/${PN}-${P}.tar.bz2 -> ${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm64 ~x86"
+IUSE="doc dri"
+
+RDEPEND="
+	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+	dri? ( >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+		virtual/latex-base
+		)
+	dri? ( x11-base/xorg-proto )
+"
+S=${WORKDIR}/${PN}-${P}
+
+src_prepare() {
+	sed -i -e "/^docdir/s|${PN}|${PF}|g" doc/meson.build || die
+	default
+}
+
+multilib_src_configure() {
+	append-cppflags -D_GNU_SOURCE
+	local emesonargs=(
+		-Ddri2=$(usex dri true false)
+		-Ddocumentation=$(usex doc true false)
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+multilib_src_test() {
+	virtx meson_src_test
+}
+
+multilib_src_install() {
+	meson_src_install
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/x11-libs/libwnck/Manifest b/x11-libs/libwnck/Manifest
index cdf5f572f845..417170e65487 100644
--- a/x11-libs/libwnck/Manifest
+++ b/x11-libs/libwnck/Manifest
@@ -1,5 +1,5 @@
 DIST libwnck-2.31.0.tar.xz 630792 BLAKE2B 8201537d3c9a8a0a8668fc16d33a8eaa05c14312401f1c763c922402df04ef03260dd259f5c46508f85390f7aefd551e83143e654b24b412272dddb7c7c4bd62 SHA512 54262a08882021f08f3ba7f2ddfa33fc1f02e391a0f61cf999a50a089e0d277dfe13ab133c1a46e9abf0599bd24c21dacff80b51013cbb1375d2cd71ac9abbe9
 DIST libwnck-3.30.0.tar.xz 800296 BLAKE2B 5917ac8a69f6f1e0d639f301a77349015226ca6d0fc12e8b23c00a81e18f6e9dbb7716b01e50aceb15bdbd64b5b1a8295be5b931d513e120508cdf14d2d15a23 SHA512 79842e4645de828941ac030eeff9d232b18a51fe0d18baf5ceb2beaf897d328ee5bf3b297501e2b27e66c63d42f6546a7605a37c6d7d52ff76e9b2bc5c328128
-EBUILD libwnck-2.31.0.ebuild 1256 BLAKE2B 842c81051480aadf3e6ce0c3e6ca8536c09ddd82c754264da815645f971abb955b263672a3d523f4763dca7fcb1922974de880e4a7b45c29e33901d195f9ff7b SHA512 426a0497c62d5c6bca927a9969eb0bb7f3afd34890c7c15846ae9756b8ae714d4d4ddd36c8d090de1e48eb153c65abb77e60bd5f8e0882875c24af7baf107b44
-EBUILD libwnck-3.30.0.ebuild 1131 BLAKE2B 20258cdac0cc669cd3140695977a63b7a49cab8899cd7c16129571d1d8aff011345a6786d24395bec3fed69be88fe8916424e9ee01c2c542f959bc935bd3a191 SHA512 e5da6db0bb47ce398b5812eda2bdef14c1f6d6f4dc7ae96a3d2c592b7311a3ee5bbe964d359253dd52c4a24d8e3f3147088cec594959c89d61b8a880f4bbd2ad
+EBUILD libwnck-2.31.0.ebuild 1254 BLAKE2B 1d8afcf0321cbe2a441c321217a3569a241f60dc34354f247641ede6c219be27b8e6a604079c64933443bed98e6a706bc24736b1d0fd6aa3a2b739809ae86999 SHA512 54786170bbde0e1142f60a9cb3aab7bd60e367c106a43e50a1817301ed49f014ff7304c4190c7b569e3d4ad691685f5906bc162ebf85d0198aaf06284e359eed
+EBUILD libwnck-3.30.0.ebuild 1128 BLAKE2B 5bdc7da7bcf9edbea78f5c12615caa119d5153e400fc8c5a54952eb5c9a04acdb335197a91d7a671e6fa423ccd7a7b8655296ab9be358943c26e35aaa32afe3f SHA512 e0e947c028ef2ded5a2f714f3daffd12b7420e9d07990957c80d922f28bee3ffc00c3819838b16cd936d47c484c0f40676a12ea060c46e731c0429846d7883ba
 MISC metadata.xml 364 BLAKE2B c8583191e40b2bf98262fbd4401a0ac47e53ec64294178a919499695b014f3ae8ee623de803cfffde58b4d63eda4572035703c5f1d550f14f4dcc974e9035c65 SHA512 47cae64c0f13376c312169703c6213582e37ccc70f00599754d7fa3daf0511e5da4221cd659e9ad98fe90d7791b0d513db45d2d0b7f1d833ef125f64ba40f2ce
diff --git a/x11-libs/libwnck/libwnck-2.31.0.ebuild b/x11-libs/libwnck/libwnck-2.31.0.ebuild
index c1e5436bd2d8..4b2ede845578 100644
--- a/x11-libs/libwnck/libwnck-2.31.0.ebuild
+++ b/x11-libs/libwnck/libwnck-2.31.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.gnome.org/"
 
 LICENSE="LGPL-2+"
 SLOT="1"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 IUSE="+introspection startup-notification"
 
diff --git a/x11-libs/libwnck/libwnck-3.30.0.ebuild b/x11-libs/libwnck/libwnck-3.30.0.ebuild
index 1eb3247c2db4..716085618174 100644
--- a/x11-libs/libwnck/libwnck-3.30.0.ebuild
+++ b/x11-libs/libwnck/libwnck-3.30.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://developer.gnome.org/libwnck/stable/"
 
 LICENSE="LGPL-2+"
 SLOT="3"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 IUSE="+introspection startup-notification tools"
 
diff --git a/x11-libs/libxcb/Manifest b/x11-libs/libxcb/Manifest
index e56bb86cd97b..18e4624640e5 100644
--- a/x11-libs/libxcb/Manifest
+++ b/x11-libs/libxcb/Manifest
@@ -1,5 +1,5 @@
 DIST libxcb-1.13.1.tar.bz2 506778 BLAKE2B eca685a21d40f664b611c0c8da845e3464126b101320a86db27ee4d87b85ac0ad1a41950281b7f0ecca06883c591571d059a913591b0281890b339f279b7af93 SHA512 763edff9572623674f75a858adc57b5c09591f508cc5d5093218e7bb047abdbe0a0108bd465419a8bf15c7dcdc85efdd2d4d9fd56605c41475d15dc992640c23
 DIST libxcb-1.14.tar.xz 439404 BLAKE2B 63605e02dd32b4d26b3ac6d3b93b7383dbc30701b9a063e8efa5b387215c9325196451f80c7b0b357df1773c6fd1224eea8eeca2a456055a2cdc61082c726111 SHA512 b90a23204b0d2c29d8b115577edb01df0465e02d6a8876550fecd62375d24a5d5f872ddd5946772ddba077cadce75b12c7a6d218469dc30b5b92bc82188e8bc6
-EBUILD libxcb-1.13.1.ebuild 1459 BLAKE2B c8ea9d7be5ff74720b17b160132ed5fb4b942805f5f6a58c150fe2cec3ad8f8ac522604b4b698a94b2ad90731bc7fcfee335e2e7f846886b015f896a794e2d8a SHA512 240e560d0297079cb032242595f85bb74d5eb540c414b14eccd41e85e7b38b051ff6cc1f79b630a940828b0fa260dc905436882e20c7d2721c91df45d7fe0739
-EBUILD libxcb-1.14.ebuild 1270 BLAKE2B 692867051475177447349111f9b9901e4369d33f125d4820ec199e94e147d171bbf6e2d32007274952ea60da58633f8d72e94d90337332e93bb1f42d9ad10f5d SHA512 2b61d581ff005b8a34fc7263a47edc3ddc158e3385f6057d2df06060e7a91df4b4701cd7f1306f5e56d9179efa1b50d309008794fcbc2f14c5dd15c51482da71
+EBUILD libxcb-1.13.1.ebuild 1456 BLAKE2B 926fe40639249315fc0c91c019ca8369f2aa5ddd87e5ac23818f17e76054c0c672af94298fb78307544f305712080a33180727b5437e7042c60eba5dae5a6ad1 SHA512 f2932a09d32d3685e447c5813f532a53b905b9c4b360ae814b2b285eac19290a936b61c79d2ff476ee997ac2b1fda9c3733534802c3a1c57c2ededa98f6b9d0e
+EBUILD libxcb-1.14.ebuild 1258 BLAKE2B 97156d6f2496113a2f21ef322a0efce3ff07d8824fa14652d8e4f0f45e22d397b465a6dd1bc3a08de7fabd3f0408213e5c451b11a6e9ee46c6e109b4891efecd SHA512 b2286d3191e1618dad4c78936cc07c2486396379eb0a96d5aa73e3aadb6f4520a7c60032247a53657b3a96d3426d8d24eade12e5f4e1ca2d251cab80ae802a45
 MISC metadata.xml 400 BLAKE2B e4de0bffe9b79f7c4a715ade0014f14d85ae7389a3fa523572b4abed6ed6849250902ea479e9aa90745f104c9020d671742d0aec8bffa539e20f0bd7b48f2e64 SHA512 f9688e8ee148768a072e6da7f72985a7a3971a445117bbfa8448f2337ce1b601296501eda1da531c6bcb50a0d3106376e8cda0b98ef10219882c2f66fe02f40f
diff --git a/x11-libs/libxcb/libxcb-1.13.1.ebuild b/x11-libs/libxcb/libxcb-1.13.1.ebuild
index 6c971b7ee8f6..7edd83f2255f 100644
--- a/x11-libs/libxcb/libxcb-1.13.1.ebuild
+++ b/x11-libs/libxcb/libxcb-1.13.1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/l
 [[ ${PV} != 9999* ]] && \
 	SRC_URI="https://xcb.freedesktop.org/dist/${P}.tar.bz2"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh 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 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/libxcb/libxcb-1.14.ebuild b/x11-libs/libxcb/libxcb-1.14.ebuild
index baab92359da0..b6a3e1743883 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 ~s390 ~sh ~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 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 b59d82220019..78cfd518f674 100644
--- a/x11-libs/libxkbcommon/Manifest
+++ b/x11-libs/libxkbcommon/Manifest
@@ -1,5 +1,3 @@
 DIST libxkbcommon-0.10.0.tar.xz 383788 BLAKE2B 0e2cc110c35a4d07cfd55a46a4cc30038bc296f74522beb97b72d0318799adb76fa514427640f286254de7aa59fb8b8c26de5d8fd52f7e09c5ba3521febb97bd SHA512 58c523b42a8ea0cae7322d453fbc5d4624374221246cb067074e2ff9820eef3ceea8686283136432cdf0842acfc0858c7b2d3954de234b6501092ae1d27c9e79
-DIST libxkbcommon-0.9.1.tar.xz 376164 BLAKE2B 16c95081136ea9ce742f494ae2192cce815f3fb4a3d33d3e525f8ad61f1f720fa6bfe74088a9ab88f3c6ef9cdf78c4d8d4dc87e7478fd84e4b09e03a337efbdf SHA512 8d4551a06e7dd4936633f544409401dc33f8f1900adb5daa6403615c71f321d17212db739f89a5b3e393d729b3f33167691404849a25d5526b403fd9ec3e8878
-EBUILD libxkbcommon-0.10.0.ebuild 1226 BLAKE2B 838ec970caa72c84b24c3c67389d91ba5dcbdc23191151e61abfe574b77809b6b98492a47f7e696a0aedf96d08d8867334938e09e7dcce168861092dc7293725 SHA512 de971c96b741b86aac3b9e9e9764f011ec1546d05f1eb0b0d164f3a66ac39b952169c59eef67c121c82b1be762c3ca13dd993eda7d819ec7e70553a5bd8382e8
-EBUILD libxkbcommon-0.9.1.ebuild 1217 BLAKE2B 0e2eaedc1cb28ae3190b571ee1d43989a395724a4c151ceedd280837ff3ef212ccc89ec5d1d28479b96b64853815311053b896db6a88d19113eb74bb98ab3a84 SHA512 aa6f372ae61965cabe760bfbc7b5f82d9f6d09c50908b8b0d5087748e17e635024eaaedd978ac7f1ec4680104a8ce0abb32170279665b145572830a69cc2b80a
+EBUILD libxkbcommon-0.10.0.ebuild 1218 BLAKE2B 3b48076803a2d153b2ed82b24c28839deebf1de52d1ca2f1b830ffd774a0dcf4d29a8a5701ea3d7795d374b516fab4303225aacbd499cf2e9e15402a78d2c05c SHA512 9700d6fcfb3e0580d0e6b3c01d20b8778f5363f3b6bdd67e5014b846980786c7a68537ba5e71a177e5c2a3b05322fc28b46992efece09a1be62faeb04d81dbe0
 MISC metadata.xml 325 BLAKE2B db764fac0ca1f4359bcd129dc165f78592535dee40bc25b6f2d7c662bdce43e01cc66b362765607665a75fc5b1703de204cf90eecae4f8d285cfaefcebc614b8 SHA512 ca2a116a574783f7b3c6191759c902e2cb059ec135456cef989b81be07fecc48f9ff56e02845d18c2376c99be3dd9711f39ad91394e421fa36d8fd6453c0a121
diff --git a/x11-libs/libxkbcommon/libxkbcommon-0.10.0.ebuild b/x11-libs/libxkbcommon/libxkbcommon-0.10.0.ebuild
index 473a7228d16e..356f8a40eb76 100644
--- a/x11-libs/libxkbcommon/libxkbcommon-0.10.0.ebuild
+++ b/x11-libs/libxkbcommon/libxkbcommon-0.10.0.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = *9999* ]]; then
 	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"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 fi
 
 inherit meson multilib-minimal ${GIT_ECLASS}
diff --git a/x11-libs/libxkbcommon/libxkbcommon-0.9.1.ebuild b/x11-libs/libxkbcommon/libxkbcommon-0.9.1.ebuild
deleted file mode 100644
index c1e2382ee1e0..000000000000
--- a/x11-libs/libxkbcommon/libxkbcommon-0.9.1.ebuild
+++ /dev/null
@@ -1,55 +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 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=(
-		-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 06f6cbaf26a9..538c12ccf1b0 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 484 BLAKE2B b665e5fd961a3967057cac523c989ca388015ccd8ebd654271f3fb50568cbbe5714149c643380627f8c4b6933b42f1e6eb2d8fb68a1429b88e89a95a02a9616a SHA512 014c587b92c525785a2e1ea41259331e3e8a33a702a30aa5cdb795dced8f206615f9546e2fd43e17081cb4b0444371348f63e7003d65d1b9331d9b46a1d389bb
+EBUILD libxkbfile-1.1.0.ebuild 481 BLAKE2B b018ffe08d9cfd3a64685a1c87bd0878af401f260b23827012e666df377f8ce9797ab30d1ff5ace942edd81de9c3fa524a5869ef8e66ef49e1e25caa60088baf SHA512 303408ce6594385faf72aaf6cead7832e545e208c65dbe86841b24e3b0d68a0e2b204ac2e03cba500208f9e4f91549fb918a23960b53cfa04cb1880aa89fe622
 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 34f01de543ce..0c90d407fef9 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 s390 ~sh 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 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 f73ffbbbe360..fde61fa60f0b 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 1342 BLAKE2B 200ed3cbec04cf5272205801ad7c3e04b89e81fd99b6b6e0fcf59908ce747b776869a02c478945a4e964312aefbe97f902fdc8df96da4ce778bf8e4f59c58110 SHA512 f5c3157069bd2120b4b0b8cccfe44b7d2ff742146f7f5297bfc22ac6f65613c6d4683da30c33bde5107d62e6cee9714f9935d9ddbbfe716148d2d01311d073a6
+EBUILD libxklavier-5.4.ebuild 1339 BLAKE2B 496ea411063a41f3e85d3c3dd8ae4eaf9776c0dbc1ad40f014c30209475da63210127e51312086da543908499518f9c13faed3198122f6d9459734912ace283c SHA512 9e039838b629840942ff5738d5b416d6b8276520c8b07d4c2ca8fd6c410edb12c0e2aad5931d30ba9e2d4572e4cfeebecd7e4d118b7cab4f161f838b9c68ba56
 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 245b23451c1a..6506faf579bb 100644
--- a/x11-libs/libxklavier/libxklavier-5.4.ebuild
+++ b/x11-libs/libxklavier/libxklavier-5.4.ebuild
@@ -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 ~sh 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 )"
 
diff --git a/x11-libs/libxshmfence/Manifest b/x11-libs/libxshmfence/Manifest
index 858400ef3419..1019bc97cbb0 100644
--- a/x11-libs/libxshmfence/Manifest
+++ b/x11-libs/libxshmfence/Manifest
@@ -1,3 +1,3 @@
 DIST libxshmfence-1.3.tar.bz2 308644 BLAKE2B 6e1e75fbe9d113cb258eb8f6a5106ea565f6749efd79bd3aa21222514063aadf8499d82d2a14bfcd0a69f7d4c4dce49a5efeb38d54d2019eb0c93345f0ba8a37 SHA512 c446e055f8fac62b9aa266132289a4cfc030282147974c45ce96d1768a98d1afb997470e58e4a68513174c404cbf373bdde2f0cd4b34abdbce1d89dd0b6fe2b7
-EBUILD libxshmfence-1.3-r1.ebuild 389 BLAKE2B 17ef2d4e226d44e4786e68abf6277fd9b1790e99806f9e14ad10d6d72ad60905be3109d817024a9fdf725e2ed6dfbae6190f94c34b6e39d0bf3594b5042c3219 SHA512 afc78b8a99c234603a6839654c56f57e8be7015791b69b3ac648eed7542921e8be100f4584f22ad0eb346fa219bdb5ce6b54efdc5632af4beee5ccd83728a147
+EBUILD libxshmfence-1.3-r1.ebuild 386 BLAKE2B bfdf3a185315e38828a9c03b287512b48a4d4ff6eeefb3a7f69569bbe0e62e718054415c4a3367d91f4b5aba07fba8ada6416ff7bc74645cfde1740f13edb4e5 SHA512 a71b58f12e9cd834cb86beb29b7fd02a43ad0de955d25c7be912fe9e90829f0e77e4854b43d1b0eb91795fd1efd5f8fce1fe6d8f9c22d6338d6f7f9de5b8df37
 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
index 0dbaa703c0a2..7551a9c6a8b9 100644
--- a/x11-libs/libxshmfence/libxshmfence-1.3-r1.ebuild
+++ b/x11-libs/libxshmfence/libxshmfence-1.3-r1.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
 
 DESCRIPTION="Shared memory fences using futexes"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+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=""
diff --git a/x11-libs/motif/Manifest b/x11-libs/motif/Manifest
index c013b7480efe..f16052b6b83c 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 3111 BLAKE2B 199142e0a94cd57560c738e03dfc62aec8cb128497424f8b68cf725c137781751b776f08a66b4e56537cf29af285337a1808937397b6698bb5f92c3d53084373 SHA512 9ab6a399050b6ea35072b852cd0355519ad0f1a746a2cbdfa9cc573504791cbf1fcdb79b58ab758619bf7db0f776df5a4d3018edd80f18bec5fafc73804058d5
+EBUILD motif-2.3.8-r1.ebuild 3108 BLAKE2B 2d41dccad935d27483148630237c6f6e0104bfcdca4a007a386ae3aa2394709fd6ae58fecfc8685aad798ba7d48dede5b0d17a830a4ca0fe5545b6a87ab597dc SHA512 fb5351cb7815c97a91adab561e33c24cd8a9b3b64bc5be9f998367f7f039adc521a405e5e8f7355e924ba3f1a13f136cafc7f00ba3fd14e17e89200c8dd08cff
 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 6fbf54519aa8..9467ae789907 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 ~sh 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 ~ppc-aix ~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 5b4efad126b7..5d4ed563d89c 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 717 BLAKE2B 2716aee22a49b299bce6f365a3549eaceb96ddd5b8cca10e0662147958e5bdac816cc448824853960ca8ce8e3e028a00b3c3fd12a74d87b7a186055cca78744f SHA512 10cf9f0fb79eb9dc43547ae91a29603be482a49a7d8e310f21bcd0cb9829696edd0335d0bcc4530b9f4656ed5e6770e220440d689890caa2fc4990e32278a5bc
+EBUILD neXtaw-0.15.1-r3.ebuild 714 BLAKE2B ba12167299da73bd99e741a721f1a952f7faa8b69b6adfed30acd66533ee5e4b4da1d24778dc700c93a67699ea89704d5d9a855b1bbef0452d80b28babfd0971 SHA512 393bb5c57a3723171b12e0828bf4517428ab6d824b3521dd3814daa7e1cfdc300323935ffc01a0806594651907b5cc1e6c4c33030165f84d0daa523c7ecea9dd
 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 1cd5cd178c3c..cf5551a641aa 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 ~sh 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"
 IUSE=""
 
 RDEPEND="x11-base/xorg-proto
diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest
index ec96e4090f85..0c9afac84b77 100644
--- a/x11-libs/pango/Manifest
+++ b/x11-libs/pango/Manifest
@@ -4,6 +4,6 @@ AUX pango-1.44.7-tests-test-break.c-Only-test-Thai-breaks-with-libtha.patch 1148
 DIST pango-1.42.4-patchset.tar.xz 6040 BLAKE2B ec3f1a6a4de30e0864e7f0bf0950cb7a7b4bada8c3db496a8e5b1e770f221ae72b43167178445ea9cd0d6b88e51d2af49e7fdf27b2e792997fe7c37e55d429c1 SHA512 b7654c3493931e3c6d3cbd40ee49c5cbebaf403954bae75dea80e9f03e12dd5082548aff6a9e778821b8f935e227a7efaad4c1b980fa108e7258042221cadfc1
 DIST pango-1.42.4.tar.xz 833876 BLAKE2B 7de1094a29750b9e59ea1e5c92644fa5d6b835828d027963a53cce3f204ee1ea0042ec492e209de9136f05ca131ccda959bc477d4f6e9c72e5f620ddf4235f26 SHA512 993e97f647eba0c5ed90bcfcb8228bf67fa3f20b1f4331e4e40a30788d7c3ac55eee1209471bf21df125cb8fc6121acc8062a9da2f8a7d6cbe8e9ad13a9320dc
 DIST pango-1.44.7.tar.xz 521384 BLAKE2B 9917efc1bcc9115331149d77eb9b15373d4331ed6a8e5542a97fbbbb480eb0557736d4f1817c0fd56262f442e4b3c2c68607baacdd38b1684def1af58a583bfb SHA512 6e0a3d5cd32c209fd71a2ce5f705a60db318c2133bcca07360a047a73892f642a1661c1f0fb90353fc43e75336dfc22909bf4969f1bd03324c9689344af08350
-EBUILD pango-1.42.4-r2.ebuild 2336 BLAKE2B 3835f1cbe395082c9b778254b9623c1427da38c6694a37f1ee0f1f39e5eb4c5f4899d321cfecd252542798bd9daf28d5bc9a2b851cb20e3998e7a4ec03a33ae9 SHA512 e1d030bf09c672873da815f9ef9b3cd5f93332122cfb97e4ac34e484feca0c50c981f39e6a90db7df73267b3cacde482e136f9132b15dcdeb4aae3de51bb6366
-EBUILD pango-1.44.7.ebuild 2130 BLAKE2B bfcdb0933b2ebb918af19114825ee980ce82789aed37d623201e31ae4144ccc50fb7112f2e8a0fb33dba54898e83468cb3e2f18f73941ed79fd0cbb00c3e64a2 SHA512 801b623e141178b6b7c709157ed42ac657e2d760f04f083ac70700ce02a3b0579d75ff35e3f4344046aacbbfa4aebc17da7a85d2d259b109c9bf7a559a986088
+EBUILD pango-1.42.4-r2.ebuild 2333 BLAKE2B ad0587b093dc85e34d2cd2ece07112537ba0c1028d1f264afe56a6f626208ac7c18b4a2eb7ba0fa2ba7f789e8e7858824c44f552cd8b202a39b1d0bea806608b SHA512 2c7cc219bb0be4b7afd5e26f3df8c7bb60f1c7cb1ed6cf552150f7021df27400d5c0b1dd8524132ec55ccf8ca000259c3e9e58282af4d810d3b810206a71aa56
+EBUILD pango-1.44.7.ebuild 2126 BLAKE2B 525f326870ff30dd33938dccda5372901b2fb245e81bb3055323222e47a9367ac4731425e718560e78fa880dc94c580cd56fbb384d672d29f6381d755836b473 SHA512 4214755838a5c5e9a907d9d13d6c21022a53ed50397354ccc6532b41f0016c675bf7d4320dfbde17eccd235e83505996dbbfdc6f7776580964fb7c09971b5def
 MISC metadata.xml 412 BLAKE2B a35a48a5b045c8d88090806f3ae50702a22a89828429c18682810ab492f743b4c1ef48369a7cb3b2a473eb059da899d20810d7533a63295ae848ac1b1c44f490 SHA512 bf95749c7606d0556904e6a6db1636fe93a919b35c6ab8252087f11658c40dcb08aa0dfce74fafe67e609b2c20f9e8ec632dc878a80e467442b7994d03dea27e
diff --git a/x11-libs/pango/pango-1.42.4-r2.ebuild b/x11-libs/pango/pango-1.42.4-r2.ebuild
index 81db75e25067..96d5811c15c3 100644
--- a/x11-libs/pango/pango-1.42.4-r2.ebuild
+++ b/x11-libs/pango/pango-1.42.4-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
 
 LICENSE="LGPL-2+ FTL"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~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 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 IUSE="X +introspection test"
 RESTRICT="!test? ( test )"
diff --git a/x11-libs/pango/pango-1.44.7.ebuild b/x11-libs/pango/pango-1.44.7.ebuild
index 18e01824352b..7100e6c4679d 100644
--- a/x11-libs/pango/pango-1.44.7.ebuild
+++ b/x11-libs/pango/pango-1.44.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://ftp.gnome.org/pub/GNOME/sources/pango/$(ver_cut 1-2)/${P}.tar.xz
 
 LICENSE="LGPL-2+ FTL"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~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 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # X USE flag is simply a stub until all revdeps have been adjusted to use X(+)
 IUSE="gtk-doc +introspection test +X"
diff --git a/x11-libs/pangox-compat/Manifest b/x11-libs/pangox-compat/Manifest
index cd6b02cd750a..1e5e6f5d77bb 100644
--- a/x11-libs/pangox-compat/Manifest
+++ b/x11-libs/pangox-compat/Manifest
@@ -1,4 +1,4 @@
 DIST pangox-compat-0.0.2.tar.xz 267396 BLAKE2B 364761c9610e497e3bc2c8a1d311cffa0298256b3cf68754c5ea4e31ce096d136cd50e2deca473d2b34aedf24e50577e8e8c37ca2556ed53c9210e4d3ff663c9 SHA512 fd3e257157d78c3d86c948e7909226fdebe52408d02a52432de8a295443b64b80b37cb795fe646d581515e6072bd278f2dcab0e43cf27b63b03a82c01eb6b9b3
-EBUILD pangox-compat-0.0.2-r1.ebuild 784 BLAKE2B b279886efc3229e90e15ebe608bfb7583aa37594be8d396db9efa62b31e78bb61daab1bd17198d694ea4ccebc41063a3c4047f367370f12a22506e9f67f92811 SHA512 8e55390a778a31b7e81fc906748c409bb5842034927f70e26508b820ed36ba5ef518db3c96561e8b9eb875cfa7300e7b7e46159c0bdb6fced75eb44245140879
-EBUILD pangox-compat-0.0.2.ebuild 633 BLAKE2B 79cee0fcd8b8e72f6c3e2afa34b5bfe1f4c87d73417bf79ee511385b1eb6927f42e044ad3c92a16821f67856ae4da4db686fb0acc0170b81b19a6256d5e0888d SHA512 c9afa4d2ae9949960fb0a0f9e44c6af3ef6943d060a70e445d63d0cd5a8f36a057147439cf65355fc7c5c68c0715d66e16ab561a4261f7a69744041cb3c7f038
+EBUILD pangox-compat-0.0.2-r1.ebuild 781 BLAKE2B 8a6a5c8eb7b34ba12833581be829705083614841165f9f6af85d0adf7c9be7ddd346d1d7bc53be8273dc126a993e55cb4c866dbde13479465e767853da49d700 SHA512 8596478fe1013220bc439ca6b43f36a930760024766990793c1ae38174e4dabd3bb9f9963cabd11a6f38bc5685cf3dc926776a1d3b6ac5698077953cd0de1a87
+EBUILD pangox-compat-0.0.2.ebuild 630 BLAKE2B 02fafde7a98b6e836ca725ec508ec5f25ad4d4bf970e6d1730175576ff5a56f05865def1a83092152d328fbf03c6fa49681f0129d5aa71e4f7ca1957d719510c SHA512 7752dc5eeaded0a3e4c58777f2b300a063ac21057aaf7f1781ac8897188540e8d2f7e4a334c2752e43b8e77434a28086c63fa87bb0ef7e4befb4f56975e93610
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/x11-libs/pangox-compat/pangox-compat-0.0.2-r1.ebuild b/x11-libs/pangox-compat/pangox-compat-0.0.2-r1.ebuild
index 0a1ea07640aa..9b8599f1f5f4 100644
--- a/x11-libs/pangox-compat/pangox-compat-0.0.2-r1.ebuild
+++ b/x11-libs/pangox-compat/pangox-compat-0.0.2-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.pango.org/"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh 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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND=">=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
 	>=x11-libs/pango-1.36.3[${MULTILIB_USEDEP}]
diff --git a/x11-libs/pangox-compat/pangox-compat-0.0.2.ebuild b/x11-libs/pangox-compat/pangox-compat-0.0.2.ebuild
index 0bfedba4661c..5b7a845e893c 100644
--- a/x11-libs/pangox-compat/pangox-compat-0.0.2.ebuild
+++ b/x11-libs/pangox-compat/pangox-compat-0.0.2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.pango.org/"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND=">=dev-libs/glib-2.31:2
 	>=x11-libs/pango-1.32
diff --git a/x11-libs/pixman/Manifest b/x11-libs/pixman/Manifest
index dcb621fb7003..768e69760241 100644
--- a/x11-libs/pixman/Manifest
+++ b/x11-libs/pixman/Manifest
@@ -1,4 +1,4 @@
 DIST pixman-0.38.4.tar.gz 897926 BLAKE2B 2c27069411e709391a1cc0af6c37acf2f06b4fad433a3197e24a0636d5d828ddbf1ca339d91470514d75e126452bc2300d14a2b862671bd11a8b85057d86b31c SHA512 b66dc23c0bc7327cb90085cbc14ccf96ad58001a927f23af24e0258ca13f32d4255535862f1efcf00e9e723410aa9f51edf26fb01c8cde49379d1225acf7b5af
-EBUILD pixman-0.38.4.ebuild 1732 BLAKE2B 3332239ef01823012018472523321c67c38be29c24cdcc6357b376144decf4147116bd184f9e6aac8e3ac3f8da8544be59097e405dc9781f084eb2edf017a164 SHA512 854da8cf16a7d65e412a2451910dc0d6d425c4a7f408c108f2f8954c56308a9e42de1a725d9ce3213530a0a1566f173242b9da2326a6e3d23dbe84ba16478307
-EBUILD pixman-9999.ebuild 1731 BLAKE2B 1d1938888a233829df28bb28caa95551b0687ddfcc6ff986096348a2a94bf0e96eb0cedb46b02b53977bc58c9a2a27cd178ae60c33f29f23b3eddf407d3050d9 SHA512 10398c86d789d7056907a006cd66d2c2ae32271ef44103487dcaa6880ec322565c8d990f73824a3baf9d4adc3f8a4ebf7ed737203d635bb4118270c61d153c98
+EBUILD pixman-0.38.4.ebuild 1729 BLAKE2B ce0f18be74b4586a2227b3b517af19aa0029d478c9a50a1d83c2d07a222dfc70395316853366a3a4f22395ccde57b4faff6488755c7046877b671fb5b5cfefb6 SHA512 412d23d206071fc1357940328f4f8697cbcf7bf0d5cc9d20e033304d376dff3b92a0e8256af0e5d5bced1e30a8af8101a3d00cb4088ad7cd341f64a05eaa2e3d
+EBUILD pixman-9999.ebuild 1727 BLAKE2B fcb7154fb5f18e0bfbcae19ea8af13c9ef88a5b9f20d21baac2d0444fb75eced412aebf07d03d145835df06ff76ea7b7c9e8c8857f6c713cfbc9da11dbc9b195 SHA512 5b8f6171e540b07e41a8b40ca6c1d0ae277f9ba6b3f912e303ff09f6e75f2cc961130ecb27beb0a0995b94217bdca890e9440860324f87afe77f800a7db35df8
 MISC metadata.xml 391 BLAKE2B 201ddfb7a766c48fb4e5b48d67564de3b6ef85847a8369cd56acdce186716872be35ddd8501604fce1d30502eb5ea4c328c01406837bb0e0d90c81655a859233 SHA512 3e9dfb3f70cd8c7dfa763bae9fb3415c276bf0104822122f72cf6df47bdc7926a654ddd653321e5ec4bd04ed7f0dd1335a4924e23d1ac37f63c05a536c1defbc
diff --git a/x11-libs/pixman/pixman-0.38.4.ebuild b/x11-libs/pixman/pixman-0.38.4.ebuild
index 5e5a9e4f7a77..e327798978a0 100644
--- a/x11-libs/pixman/pixman-0.38.4.ebuild
+++ b/x11-libs/pixman/pixman-0.38.4.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="http://www.pixman.org/ https://gitlab.freedesktop.org/pixman/pixman/"
 if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
-	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh 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 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 	SRC_URI="https://www.x.org/releases/individual/lib/${P}.tar.gz"
 fi
 
diff --git a/x11-libs/pixman/pixman-9999.ebuild b/x11-libs/pixman/pixman-9999.ebuild
index b8c477a351ee..ee4a7b6b0de5 100644
--- a/x11-libs/pixman/pixman-9999.ebuild
+++ b/x11-libs/pixman/pixman-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ HOMEPAGE="http://www.pixman.org/ https://gitlab.freedesktop.org/pixman/pixman/"
 if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~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 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 	SRC_URI="https://www.x.org/releases/individual/lib/${P}.tar.gz"
 fi
 
diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
index 737ea51d1cb2..7f302e668c28 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -1,5 +1,3 @@
-DIST QScintilla-2.11.3.tar.gz 3006383 BLAKE2B 6238aaff44d6136a64e8c38e38c4886357eb72aa4067f54eda1e876040c41ebce8577e244b81a062e9020c4d142439f5612ca88055d0ba87172ff5b8893938d7 SHA512 83406ef2f425c6288fcac52b01417853186ba860e33e14b236801271e034c327cbb00817cb7247e98bafc1844aeff9f24ec4878ac8ec4bd52d0d2d9778f6b884
 DIST QScintilla-2.11.4.tar.gz 3007719 BLAKE2B b0f88a15a3636a0056d3bdac6e5d5bb05a065461c7de7fe0d5ad1740e87ca78a47bc1fd1af90a8751b553e8e326c830088a4cb38c9ebcad6be8bf9ebdb49bad0 SHA512 90fc2427121ca9ae55e34cf636460099bbdadd844318d9ef05f86790a36e25fb64528264bb7bb99e46b7add96378eff0cc69bb692940c6a1bddfadf86a9abdbd
-EBUILD qscintilla-2.11.3.ebuild 1954 BLAKE2B 249d3628025e2ecd7c026290d337a1eefa30efb5700612b76189adc35a346593814b6c0d581cf7d31746d5ed631680440185dff5ab0e3e91810a1aa910ac027e SHA512 3df250303393e3b9cd8408cb47fffd83c7063e7b0f4961eab6ed24f45c2a9dc0cd4d19016d850e048c209d90cd944b74d7be7ac073bd51c268d85e1b844d3517
-EBUILD qscintilla-2.11.4.ebuild 1957 BLAKE2B 84a7752f28ce961ab39d41f5c2c63c6c040bb78ce4789075305496024d5fd0878689b095af9d01503998bc8c9c070750827314b6c1ce1abdb0ddc4c9235f2702 SHA512 d139200a4e02325878bded6c8f6858a47ed0444a1a6044992e783e79034b3896fe2aa68726f917faddf83dc112ae6b1764eac305394aea55efa7c6d069150078
+EBUILD qscintilla-2.11.4.ebuild 1961 BLAKE2B 86dfccd17bcf5d2aa8b20209aced0009fde39020466a7424f81f434a7bea536c72a93d9a82db006fcc9f65aedd29a757712f40c5131a501550b8bfc1cd4ca106 SHA512 cb82aa14bfdfb8f986ba9c28a0e0697ce969d433ad08eff97e4919506db36ad618c4bbad81839d0e2387e9c09269bf611d9695e986b10aa89f8ccff5c92c0659
 MISC metadata.xml 604 BLAKE2B d353a492de987b1b7898a206a1d29fff43dc25ec7809d95fe8ddd816507c24b7fea26de43ce16cb0b939e31d663d280231202b787fcff2f6b79d4716c9a00713 SHA512 ff45db818793a808f2fee2a85fbf9d3a069bcf406f8d18c5a49f527d332002cad64295ae9b31f5297203610a4497db12e5aace0861069e55f127c736a4065580
diff --git a/x11-libs/qscintilla/qscintilla-2.11.3.ebuild b/x11-libs/qscintilla/qscintilla-2.11.3.ebuild
deleted file mode 100644
index f6b4a37b4593..000000000000
--- a/x11-libs/qscintilla/qscintilla-2.11.3.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic qmake-utils
-
-DESCRIPTION="Qt port of Neil Hodgson's Scintilla C++ editor control"
-HOMEPAGE="https://www.riverbankcomputing.com/software/qscintilla/intro"
-
-MY_PN=QScintilla
-MY_P=${MY_PN}-${PV/_pre/.dev}
-if [[ ${PV} == *_pre* ]]; then
-	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
-else
-	SRC_URI="https://www.riverbankcomputing.com/static/Downloads/${MY_PN}/${PV}/${MY_P}.tar.gz"
-fi
-
-LICENSE="GPL-3"
-SLOT="0/15"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86"
-IUSE="designer doc"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtwidgets:5
-	designer? ( dev-qt/designer:5 )
-"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	default
-
-	# Sub-slot sanity check
-	local subslot=${SLOT#*/}
-	local version=$(sed -nre 's:.*VERSION\s*=\s*([0-9\.]+):\1:p' "${S}"/Qt4Qt5/qscintilla.pro || die)
-	local major=${version%%.*}
-	if [[ ${subslot} != ${major} ]]; then
-		eerror
-		eerror "Ebuild sub-slot (${subslot}) does not match QScintilla major version (${major})"
-		eerror "Please update SLOT variable as follows:"
-		eerror "    SLOT=\"${SLOT%%/*}/${major}\""
-		eerror
-		die "sub-slot sanity check failed"
-	fi
-}
-
-qsci_run_in() {
-	pushd "$1" >/dev/null || die
-	shift || die
-	"$@" || die
-	popd >/dev/null || die
-}
-
-src_configure() {
-	if use designer; then
-		# prevent building against system version (bug 466120)
-		append-cxxflags -I../Qt4Qt5
-		append-ldflags -L../Qt4Qt5
-	fi
-
-	qsci_run_in Qt4Qt5 eqmake5
-	use designer && qsci_run_in designer-Qt4Qt5 eqmake5
-}
-
-src_compile() {
-	qsci_run_in Qt4Qt5 emake
-	use designer && qsci_run_in designer-Qt4Qt5 emake
-}
-
-src_install() {
-	qsci_run_in Qt4Qt5 emake INSTALL_ROOT="${D}" install
-	use designer && qsci_run_in designer-Qt4Qt5 emake INSTALL_ROOT="${D}" install
-
-	DOCS=( ChangeLog NEWS )
-	use doc && HTML_DOCS=( doc/html-Qt4Qt5/. )
-	einstalldocs
-}
diff --git a/x11-libs/qscintilla/qscintilla-2.11.4.ebuild b/x11-libs/qscintilla/qscintilla-2.11.4.ebuild
index 9c5354a9b46e..b6721fffe964 100644
--- a/x11-libs/qscintilla/qscintilla-2.11.4.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.11.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0/15"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
 IUSE="designer doc"
 
 RDEPEND="
diff --git a/x11-libs/rep-gtk/Manifest b/x11-libs/rep-gtk/Manifest
index 0d323a659ec3..07ab348ce3ae 100644
--- a/x11-libs/rep-gtk/Manifest
+++ b/x11-libs/rep-gtk/Manifest
@@ -1,3 +1,3 @@
 DIST rep-gtk_0.90.8.3.tar.xz 120616 BLAKE2B a0ada2bb13a8104d0dd532f35b64e6b049711284b60b4c4960b730909061ecce058a0ee79517cc508db95647d93f9af95c5ca73cf76e26b59467c8441064ac07 SHA512 d33de562c94731c0ce0fbca574952b9f36c2f2cb084783976486c8751daba5de0d20bc781a06ebd2005e541bbbec3f984453ef65ba6233bb7acfefa31b1acaac
-EBUILD rep-gtk-0.90.8.3.ebuild 980 BLAKE2B fee17ee32e1af210a717bdbe8b925510e95528fef4e3f62c53d0813970915fd214020da535bbe1054b412b5ae56c008ffc7878755f5b1818be309c68b1915015 SHA512 8de382a6c9d77b08c82f856bbfdf51a5e22225b5ef0fda89c9f36ef862bfbef21fa5711a8f9d3d946118609f1434ff1f6f018820ca43068e3e500d4e79d0ce05
+EBUILD rep-gtk-0.90.8.3.ebuild 981 BLAKE2B 4c51847b68e233f9b4039025d69becb5f5c33318e9b3a67c7e1657dd81ff90c73932103727927ad9bd641125bab47fa8859becc7ca2dfa7e2cab2db5c493f660 SHA512 b6a6f9c56bf39c539fe1ad4e8651c713f958f152b952ac126a3369ff78685a100710a7d1c5c80eaa06b52977a7fe2c621bc552ab24a3a5a318e5397b96efc241
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-libs/rep-gtk/rep-gtk-0.90.8.3.ebuild b/x11-libs/rep-gtk/rep-gtk-0.90.8.3.ebuild
index c8c7a9b3293a..35cfab023dca 100644
--- a/x11-libs/rep-gtk/rep-gtk-0.90.8.3.ebuild
+++ b/x11-libs/rep-gtk/rep-gtk-0.90.8.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://download.tuxfamily.org/librep/${PN}/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="gtk-2.0"
-KEYWORDS="~alpha amd64 ia64 ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~ia64 ppc ~ppc64 sparc x86"
 IUSE="examples"
 
 RDEPEND=">=dev-libs/librep-0.90.5
diff --git a/x11-libs/startup-notification/Manifest b/x11-libs/startup-notification/Manifest
index ca83bd9ff17e..36c2ee84f220 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 875 BLAKE2B 3c6a1023fb69b756aa15c969a01643957d7a3443139ad7050db94a0912a9217394a056373f506cc05d649e9e6b2e87f531e459002a031269dcb3402bdd83e346 SHA512 f4e7ec1a9b446ff9e8b9dc6295c16f2da393879b467487dc6fb834effc54984a954ce924789ecffd8a3321c367c7d5ed5840bd60902fefbe071ed62101d6dece
+EBUILD startup-notification-0.12-r1.ebuild 872 BLAKE2B aa6f745c0d5ac671cab99c5b0262df297437cb36ce50f4014014e6c1ea1584755a72476a7cffb6553c9ed3836a675d029485115e05be83c50f2487f9c4f6beb3 SHA512 19a725f974f325c5f41720163b9ef21c5d3786ff450f0781d21e944988eee5c45d5d00777854a5f604efa76c4690df28527939865e5180c86dd24bd7c7373f8e
 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 c3d69b7d0afc..bb0bf32b48f2 100644
--- a/x11-libs/startup-notification/startup-notification-0.12-r1.ebuild
+++ b/x11-libs/startup-notification/startup-notification-0.12-r1.ebuild
@@ -10,7 +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 ~sh 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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=x11-libs/libX11-1.4.3
diff --git a/x11-libs/tslib/Manifest b/x11-libs/tslib/Manifest
index 70d7fb2a36cf..88496a45d27f 100644
--- a/x11-libs/tslib/Manifest
+++ b/x11-libs/tslib/Manifest
@@ -1,7 +1,4 @@
 AUX tslib-1.21-optional-utils.patch 610 BLAKE2B 0f25c58205f5bbddc62f278827d9689e58c88323d6c2797d3f36d165c5dcfc8fe18574225dab106eb9c01d3a7f54a3f7c3797be0853dd3b144bbb61529ea83eb SHA512 3c061d34e5a2f89c61754331d9a8efa9ffeb492169d3c0082b29107f03442adc75f6a39f289577c3902df2a9efc4166f9ac610867742989f09f10a8bfd69230d
-DIST tslib-1.0-patches-5.tar.bz2 6602 BLAKE2B 3cd67f4eeacd0651354af8ee4637e27084e9ad61246e6cab631ef52c7435e6d37acdaffd4ca72d8435335860f12d2b0fb4205b33092ea603aafc837e2dba6885 SHA512 dcde900942a3c9e9114e2c36d1d9554eeae8e5ca64463d69c52188a30734b19d6ba0439e8bb009b0d535dfae3f8f8e688a6861ec0a0371fdcb0e9986abb963de
-DIST tslib-1.0.tar.bz2 47522 BLAKE2B 99f43b5175fadef240a973d0e88c80a227b5ffe518c97c6d890fa4194148ff099055b98e7b5b3fee542249bb9c9bae88a22d1d050f2f7ca1563d03b453aac34c SHA512 a12e569b1d9cd809776a605775c3000f4e405789d95eeda21451d3911b5aa67003c921d9988f5ea8eba8b32108c8b0816e6609b5f013a2594d27b6e00e75de8c
 DIST tslib-1.21.tar.xz 349216 BLAKE2B e19623c9390688b0aa85e6547a57542d2e10498c8ebbb30f840157d240dc9975c3e6735814a5e6f02fb71c273a52f860695cf4772fef28522e74c5781cdcb02a SHA512 66c5e5dc4e2314277e19af29b5dce1181573579f13b0e79fa43e658838d4c19a77feb978b60d7c6458337e8d6100ee54a42fc4af3a99fd8d6840cccafa6323c4
-EBUILD tslib-1.0-r3.ebuild 1104 BLAKE2B 686322e0b7c3dfc9480c162f61366429a7f7af9e33101c6b55f4a966b2abf2ce0814a0d46c397229761b32226509bab433cd3a8ddfa00d43c0abddcb756760c8 SHA512 480bad9584084fffd1221b74aa241fb5e5ca181a67b3c4ae5dfead8622961dfdef216b0eb2682ef8e464522e149e367522f438b48cc63edbdf910cde9175963b
-EBUILD tslib-1.21.ebuild 1563 BLAKE2B 5298a755e9b729ee8600df6af038ec81888ccbef2f06cbab9158b2c29262db1ed891ce224b2761b8a5c68a676b3b2977d5209e2c6056f54c1a24e3cf45c5fee6 SHA512 adf7cceb50a52d1eb58c733344c28c0b2de98c945dc1b3bc84f7f273c6a64bb4ca36ebbcbd56def8fa21961770cf92d0b64d94a174d5695192da079725eae4e9
+EBUILD tslib-1.21.ebuild 1559 BLAKE2B f0ff88b979032b3c81a40e881e2d3b414ca009fca5f8e1f35bf86ffbab0630ac4996860b2e6753b494ee652f81e3b9e4f30f3cb47a07d708cd2f2cd6d9f07e09 SHA512 a0bb7ba84a2c8715d3f9abe75d92c6c5e2cf29100cd6138cf66f05274f8888aacabc45cdcc10d57b1b1d92f2537d08747e33b06d2a38b4c1c51af6f13fece68e
 MISC metadata.xml 476 BLAKE2B 60986e648e86b87a797224b40bcb510af598d2aeafdc497850c714872d844b86c27d7f3c24cbbdad92ec91c8803fd1a8aeb9e06ffea5700ce3c42a2b3d3d8587 SHA512 f5b0def5c198a78dd8bebfb3e9b022ab37dc6466e1a3af7a7b0497f4133be7d155a205da190d63f98c4e10bc7fca6ee84e6aaa6e46e74e1ed0d8c2ac387a15e5
diff --git a/x11-libs/tslib/tslib-1.0-r3.ebuild b/x11-libs/tslib/tslib-1.0-r3.ebuild
deleted file mode 100644
index 4747625c4ea4..000000000000
--- a/x11-libs/tslib/tslib-1.0-r3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils toolchain-funcs autotools multilib-minimal
-
-PATCH_VER="5"
-DESCRIPTION="Touchscreen Access Library"
-HOMEPAGE="https://github.com/kergoth/tslib"
-SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.bz2
-	mirror://gentoo/${P}-patches-${PATCH_VER}.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
-IUSE=""
-#extras arctic2 collie corgi h3600 linear-h2200 mk712 ucb1x00"
-
-DOCS=( AUTHORS NEWS README )
-
-src_prepare() {
-	# patches come from buildroot + openembedded + suse
-	EPATCH_SUFFIX=patch epatch "${WORKDIR}"/patch
-	eautoreconf
-}
-
-multilib_src_configure() {
-	# compile everything. INSTALL_MASK= what you don't want.
-	ECONF_SOURCE=${S} \
-	econf \
-		--enable-linear --enable-dejitter \
-		--enable-variance --enable-pthres \
-		--enable-input --enable-shared \
-		--enable-arctic2 --enable-collie \
-		--enable-corgi --enable-h3600 \
-		--enable-linear-h2200 --enable-mk712 \
-		--enable-ucb1x00 --disable-debug
-}
diff --git a/x11-libs/tslib/tslib-1.21.ebuild b/x11-libs/tslib/tslib-1.21.ebuild
index 3891d1a0b2e1..bd2fc9d88d55 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 ~sh 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/vte/Manifest b/x11-libs/vte/Manifest
index 102214142a6b..4b9d109dfc3a 100644
--- a/x11-libs/vte/Manifest
+++ b/x11-libs/vte/Manifest
@@ -5,6 +5,9 @@ AUX vte-0.30.1-alt-meta.patch 2490 BLAKE2B b5046bea09bb7fee5f03eaaa0c88f88a9e05c
 DIST vte-0.28.2.tar.xz 962340 BLAKE2B 1e4b5977962265be77917ccfc9118ed93232c03d7a16b6c08a27e721fe71f8c1dd1783a439530d7b3d915111cb8cc78281f1e9e351d6a83edd31f224309ca1e9 SHA512 d6a50481aaa8946cca3779e0b328fef551be534d70366a75385d1f8ead3fcddec57bed85c7d4bc2d9f34546532129e63083aafa33cbb0efcbc7dc9d66e7c45f6
 DIST vte-0.54.1-command-notify.patch.xz 3428 BLAKE2B 75b0c22720276300be2e49e8444aa68fed77fb7a6cc6b0e93a5c2d41257626bd60ff1084d68579769cb3d85e7ec567927591746de48e860b138d0c1f24f64cc7 SHA512 a53da569f8168c8e9e21e186dcfc00bf9fdb78a0c767ba35033c1c1e4f836406b4d9bf70ee3e071f6c749fd6f72101a6960d201617bd0bc23021e1eeaac6fd0c
 DIST vte-0.56.4.tar.xz 1100952 BLAKE2B 3c3ec69f4078bdb07a4501df4aeb31aaeb7f9fa5a4631152d486fbb2c950362612cd9dff4abe25b93da6c712a37a20ccbf050ad33d96ec7b997bb1409189f60b SHA512 5a6c79b30f07c1f5848ef59028864d893cc605b9ad8f49ae819958aaed962d2ff96baad379f126381b8bf00015003c5a6dc28c792e4e050ba35090338bd7dabb
-EBUILD vte-0.28.2-r208.ebuild 2951 BLAKE2B e019bc44f99b4700922ebc95f47538d47119ab3a10d4615e42e34b75e9ab99a825777e2152b0434cedc796fd0a9e8079a7d07cb7208417bfd210228f6d52cc0a SHA512 5ec053f35a65755b4f4c20e3f336d6b55bac6148719ce6332d1db55c5e30ecdad185b64e3b5319c9042263e18a0ce89affabb9511702a2f7ff6b801469cd28a3
-EBUILD vte-0.56.4.ebuild 2281 BLAKE2B 0f539efb17dd2f16d4ea0ae80310e6220d3574e2bba4dac18bfb5c170d371cab9e54d3cb7c643e1ccd7cb42031566a2ea10306af8347ddc96b58804d07dbd2c2 SHA512 b52015395c5391e5d1b2855a6ff55024b20e097b40ea7a48fab67bf8bb0815b87ae18f6cbdaed1937cac8ca894c38448fe9cfa0c0f6e727c87f122035ee36396
+DIST vte-0.58.3-command-notify.patch.xz 4964 BLAKE2B f8414d3bf124bd3de4c08e22a051feabdb11fbded7562a0bf9858fb8b8cf6327a3fdf7e18592eacd9f3608af5b720fe9a0cb598092a12c816d37d36899d88f6b SHA512 0de06ec0019127ec2729950228f8cae3e61a306207e177b8427789d4f6477f102d78232bd7f1a6e02cc218f507474427ad8366bc3c16c8a305b432dba96ba685
+DIST vte-0.58.3.tar.xz 514844 BLAKE2B 1f48e95ec81397937c8a5a3d34ea9a7d1835d6cacec6e1b90b78568505d509b375f55678462428dd01da00e7290e4543bbab2dbb0aea46a322788fbaf022427b SHA512 b0a38eb1cd7d923b0431af943dbdb89932833f9a2b0b8fc1fa9ee728c87418c1f5a424b2ccee661721093a80c569f3b41c721b0ba2302ba0c3a42d4c5e31aa9a
+EBUILD vte-0.28.2-r208.ebuild 2948 BLAKE2B 24401f7eb05692d9e546e11e5f47862a43a7e86664078a6210c0f2f1899e4d5dcddcef89a1da5014adbcbaa57739d006bfe003a4163b9bf7672ad13e218cdd1b SHA512 73bcd40d14e4d7443af62f104865002c6a3938d62473da99fffa455dd0dbd231eadfa2618ba4a335b1c63eb8d0a4d13cf3264694b78116653832e3b878f30a9c
+EBUILD vte-0.56.4.ebuild 2278 BLAKE2B 347a664688e8445ff35923e39a11db7910959b5430622da6c950b7f1c9b83a182fe12d596106a38e149ad3b96fffaefaeef77b1b138b964bf795d1410a6a9dd4 SHA512 04a3aa68daabc18b652d29cd4438f863121900761964c6553bcb4e36e978e5d0138ebb45f892690cd2c8ae2ced98aa1e1aa54f54420f385ef5f8ed3765625a27
+EBUILD vte-0.58.3.ebuild 2079 BLAKE2B 98de36c557eafdb8088686c4bff7abc9cee545ddcbf94643630abb5f3ce25becaf83aefd9b641a55dde58e8218b7e187b9e48d1c32e5f1d8e5aa87ab2b6637b8 SHA512 9e7ff50a0e716d2e1228c4ffa76f097d110fb29170d5e2f317167e9de44ca0bca23daccbe85757174b1a2742edc7ee6de69b473280c68f4129cf4a6b89210de6
 MISC metadata.xml 348 BLAKE2B 3bf56ab8eced6c72e3d4dcb9979464b9652010b09d6576da3f1b9061f92b508d9bfa11ae081083ff07b2d7ec05c8e72123e25d6ec8c6edfa738b241a9f4339cb SHA512 3e3da8172df02c72e955968530e757124b502cb2b3ff750fdc3c52f28c763f22d918fa9b2f08da7d1b87bf3719e4cc726528c9496adde96eee3111f08a54d8d4
diff --git a/x11-libs/vte/vte-0.28.2-r208.ebuild b/x11-libs/vte/vte-0.28.2-r208.ebuild
index d4ddb9c31aa5..c579c5a9a8ad 100644
--- a/x11-libs/vte/vte-0.28.2-r208.ebuild
+++ b/x11-libs/vte/vte-0.28.2-r208.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/VTE"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh 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="debug +introspection python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/x11-libs/vte/vte-0.56.4.ebuild b/x11-libs/vte/vte-0.56.4.ebuild
index 3540e289448c..c9fc52ee3441 100644
--- a/x11-libs/vte/vte-0.56.4.ebuild
+++ b/x11-libs/vte/vte-0.56.4.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/VTE"
 LICENSE="LGPL-2+"
 SLOT="2.91"
 IUSE="+crypt debug glade +introspection +vala vanilla"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh 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"
 REQUIRED_USE="vala? ( introspection )"
 
 SRC_URI="${SRC_URI} !vanilla? ( https://dev.gentoo.org/~leio/distfiles/${PN}-0.54.1-command-notify.patch.xz )"
diff --git a/x11-libs/vte/vte-0.58.3.ebuild b/x11-libs/vte/vte-0.58.3.ebuild
new file mode 100644
index 000000000000..386611ee38a8
--- /dev/null
+++ b/x11-libs/vte/vte-0.58.3.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+VALA_USE_DEPEND="vapigen"
+VALA_MIN_API_VERSION="0.32"
+
+inherit gnome.org meson vala xdg
+
+DESCRIPTION="Library providing a virtual terminal emulator widget"
+HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/VTE"
+
+LICENSE="LGPL-3+ GPL-3+"
+SLOT="2.91"
+IUSE="+crypt debug gtk-doc +introspection +vala vanilla"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+REQUIRED_USE="vala? ( introspection )"
+
+SRC_URI="${SRC_URI} !vanilla? ( https://dev.gentoo.org/~leio/distfiles/${PN}-0.58.3-command-notify.patch.xz )"
+
+RDEPEND="
+	>=x11-libs/gtk+-3.16:3[introspection?]
+	>=dev-libs/fribidi-1.0.0
+	>=dev-libs/glib-2.40:2
+	crypt?  ( >=net-libs/gnutls-3.2.7:0= )
+	>=x11-libs/pango-1.22.0
+	>=dev-libs/libpcre2-10.21
+	sys-libs/zlib
+	introspection? ( >=dev-libs/gobject-introspection-1.56:= )
+	x11-libs/pango[introspection?]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-libs/libxml2:2
+	dev-util/glib-utils
+	gtk-doc? ( >=dev-util/gtk-doc-1.13
+		app-text/docbook-xml-dtd:4.1.2 )
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+
+	vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+	if ! use vanilla; then
+		# Part of https://src.fedoraproject.org/rpms/vte291/raw/f31/f/vte291-cntnr-precmd-preexec-scroll.patch
+		# Adds OSC 777 support for desktop notifications in gnome-terminal or elsewhere
+		eapply "${WORKDIR}"/${PN}-0.58.3-command-notify.patch
+	fi
+
+	# -Ddebugg option enables various debug support via VTE_DEBUG, but also ggdb3; strip the latter
+	sed -e '/ggdb3/d' -i meson.build || die
+
+	use vala && vala_src_prepare
+	xdg_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use debug debugg)
+		$(meson_use gtk-doc docs)
+		$(meson_use introspection gir)
+		-Dfribidi=true # pulled in by pango anyhow
+		$(meson_use crypt gnutls)
+		-Dgtk3=true
+		-Dgtk4=false
+		-Diconv=true
+		$(meson_use vala vapi)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	mv "${ED}"/etc/profile.d/vte{,-${SLOT}}.sh || die
+}
diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest
index b37075e09c90..9194a83ebe86 100644
--- a/x11-libs/wxGTK/Manifest
+++ b/x11-libs/wxGTK/Manifest
@@ -4,6 +4,6 @@ AUX wxGTK-ignore-c++-abi.patch 1657 BLAKE2B 5d865c83174f2540b798a2930f8d5ae8336f
 DIST wxGTK-3.0.4_p20190713.tar.xz 53640 BLAKE2B 89eabc44660f8f9b19fc850717eb83244a746f2f8c28bcec89fa9ccd1828f103df114bce24406ff14875220de86276f9e51870d58e716f0c94d310707f7eae4c SHA512 44a4e92ccc9c143a0e70e015116e952b0529001a3a1e23193d501826720a505259ead6feaa08de75b4a7a8753f8b16f5cc14e4bff5d15585870066ccd1de53b9
 DIST wxWidgets-3.0.4-docs-html.tar.bz2 24122986 BLAKE2B ffd38d50e6cb44077f346597863a8dfb1cb5172b9380995082acb23b5b5dae060bc1e3d14307a1146ccd93b5ae9c4fd8fb206346c8d5aced5a535cd3d7f8961a SHA512 2b4cefc98f5f034a8c36237c4979bd02e8b0ed60aaeb31946d8661fb8e5297172cec807e45c96fe2939b012f093950721cda8bf9f750697b50e3741711011ccd
 DIST wxWidgets-3.0.4.tar.bz2 20204622 BLAKE2B 97b9f3f44f080104cae290bc3e162b51ce27a96fb22b191d52f30db1f1dc7951defcc220afc4dcb8417cfe23490762c2a25f62164ac21809f73ccf442dd19347 SHA512 c9e6b35d541a99921c54cfdac260843f574f146b27f924a7a0fca5007344fa99865a96ded95e6802329ad9221b4880d62b92277a1b4c1ce71420acb672ad9158
-EBUILD wxGTK-3.0.4-r2.ebuild 4021 BLAKE2B b7498e9c19ff1100ff4354defb166a6dae9fddffc375143a5dffbe2a9a4f089179b6ff9d0351e70b07bcbe18b8f137ce900d82a267df38a4c095d9f05ccb415c SHA512 bbe6309f3bd93713e2fa6cb1d2280a7b941330ad5941588406845cc4eb7dc0a29763eb47808943a690b3b99d3463f85fb28ef3363d83efc90fff6cb2b7da052b
-EBUILD wxGTK-3.0.4-r302.ebuild 5246 BLAKE2B 9b49c08d97448521c72631cb842f03d3fe959cedd0e06245cd325913b54b4242e5b791bd2dd9fc81995ed992d7e883b31c59c154f4de22d5bb1fa306f6a884c8 SHA512 4f6a4e59078a6d6a4bdd7f2841d88f1d1a4cb11995b039618cef0cf21f784e9c8be51770e536fcde9849555cb5345e33da7fd7d9824368bf46e6cfd5020711af
+EBUILD wxGTK-3.0.4-r2.ebuild 4018 BLAKE2B e73f952d16dc6f4b3cff0836d0625ed82ae5cc3e070a84682e6ba417f6bbf5c2048067b5db4444810f520f1170cc961a62c4a2a9a3d22b59faf00123eca799f0 SHA512 136676187e6839c45ab28d58b8345c91af27d41b111986eb493438b9eef299b37ae711bfc4f9bc200a64fa792559f5a6bbec647a389e3cac9e3f49dfa2b4b859
+EBUILD wxGTK-3.0.4-r302.ebuild 5242 BLAKE2B 10936a8d077d8db01bb9f676a893ab1229baa2d024296779949dc4f0d743ab93bf2bbcc732bf31f03a76a97c79f797700b4e32089ba813ff1b8bc14fe7ff4328 SHA512 c6a303eef25b149157bc17f4920f381e8110c04347596c97971cc4db1e9aa8f071240abbd3dd22b89040d0e63c36047167989e8f16c4f226fbabdda1f54fd907
 MISC metadata.xml 759 BLAKE2B 4bafb6bd1d082eae5773d84fb116779f337e662090c4d01e22296f891114458de4a50f1f10775b61f06f22c6db7d4288c66c0c59836cc362298c23fecef499af SHA512 a7bf3b8cecf7ffba0dbfded9884fb7df3866c1a00c473f9ecb2d3fc1c84c5713dcde949f6acc35ee688741efb2da74fc189ed9c58b24bd2874c7e95908eb1f60
diff --git a/x11-libs/wxGTK/wxGTK-3.0.4-r2.ebuild b/x11-libs/wxGTK/wxGTK-3.0.4-r2.ebuild
index 124c5e3d8806..c7da89e676d4 100644
--- a/x11-libs/wxGTK/wxGTK-3.0.4-r2.ebuild
+++ b/x11-libs/wxGTK/wxGTK-3.0.4-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidge
 	https://dev.gentoo.org/~leio/distfiles/wxGTK-3.0.4_p20190713.tar.xz
 	doc? ( https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}-docs-html.tar.bz2 )"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="+X aqua doc debug gstreamer libnotify opengl sdl tiff"
 
 SLOT="3.0"
diff --git a/x11-libs/wxGTK/wxGTK-3.0.4-r302.ebuild b/x11-libs/wxGTK/wxGTK-3.0.4-r302.ebuild
index 0b9aa87a724e..e081aaad649e 100644
--- a/x11-libs/wxGTK/wxGTK-3.0.4-r302.ebuild
+++ b/x11-libs/wxGTK/wxGTK-3.0.4-r302.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidge
 	https://dev.gentoo.org/~leio/distfiles/wxGTK-3.0.4_p20190713.tar.xz
 	doc? ( https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}-docs-html.tar.bz2 )"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="+X aqua doc debug gstreamer libnotify opengl sdl tiff webkit"
 
 WXSUBVERSION=${PV}.0-gtk3			# 3.0.3.0-gtk3
diff --git a/x11-libs/xbae/Manifest b/x11-libs/xbae/Manifest
index 14e8356814bf..e33b48e2749f 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 1240 BLAKE2B 6e63fde3f9bbdb50ef7fa69fd55fcb95bf577e921a74d263c1279ec80ae6e64369f675ea0bc43438d4326ce9e3dda1d365ac0ebb823493bfbe8a7ef711803eea SHA512 660eb8a127b24a5c1856f3fa2a530c6ff1732f57a3491a846c70a50881355d02c17bd6ec3fc04f56062a3c03c5dd3e9a4335972d467fc0dc8865f77047fa111e
+EBUILD xbae-4.60.4.ebuild 1241 BLAKE2B 370d850ab05752803a7c5f4d8a84013ba53e9cc9c34e97aa6b1c36ffcafffb9aeab9db39baeb808070f69cedc8a761eb48f84c82d58ee2a0ca85829b7cc15e60 SHA512 26090390bbed7166ba6030bc61d7b7e2439584b758b6ba93432b08306646e90f2926f83a19ec38d844d98df9c0ffdd3d1a77ac2949323d97888f29b9d4fdaecb
 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 632415031682..053b59bd7120 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 42c73a67a027..fc92cf501c06 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-r2.ebuild 1376 BLAKE2B efa0d596d3ab94195a357558e0bdcaa55699260efcf17aae4247d404d664fc9459c2ad5704b5d76b806efdd0c5264e1653616bb7d6af9dfbd2819874a14b101d SHA512 29dfdb6cf774324a08986073601d28003e504546717ffb753f5ae45691533e1fe3c5501955c6b2a31af66b42f0aaa9fdc7184ae3ccaf5fe2740a678321f4acb5
+EBUILD xcb-util-cursor-0.1.3-r2.ebuild 1373 BLAKE2B a562ea63ae7d0ab61737a1da2b4aa2e178630ff385fa92c50f8ba8bc75215749b4d217e0a8f3c5ebe6b1f311607601d7869a3ef5a42c5dd62bacd7a523429c14 SHA512 d790475278909a5163af2e1c9dbda90adc1d68e6998ac14c2ce5be456dee42bf221af55d0565ab2abf7de3531fce32af303a801f2d43f3535c39bd85a11bd7d8
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r2.ebuild b/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r2.ebuild
index 1a6a22763cf5..89c2412cb38e 100644
--- a/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r2.ebuild
+++ b/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r2.ebuild
@@ -15,7 +15,7 @@ EGIT_HAS_SUBMODULES=yes
 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 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/x11-libs/xcb-util-image/Manifest b/x11-libs/xcb-util-image/Manifest
index 75fd991180f7..4def7e73dc0f 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-r1.ebuild 975 BLAKE2B 9ff3ea8c21154f1d545300dedc48217c37bf93266ecd71265e3e59699ecab105031cda0ba416c7dcee83c6bc424e69f9e3cdf2c9932f3ee87bb947104e04e24d SHA512 745235bcbd7efabd71f8d3c8b69adbb6b1a0dcfe3a0727eb292939df4a21ef6a84f9adf118003db5a07b1165b630e3a7dd7cad1664e97de9efa7547e72b16bd5
+EBUILD xcb-util-image-0.4.0-r1.ebuild 972 BLAKE2B e7763db6a983e1f1a77061f1892083f76ace5af13b5140844a5ab7e914fbd1ef6cd6b8d9b542a4bf5bf725cb54f68ffcf3e65a0aa3cf054b042c038faeecc002 SHA512 578ef56dece7935557e778d79f6373a59fe7ce0caf55a28e4eeb1c7033ca14362b587c3752a1dd007b80b94004da8e054b0a949d346b273de1724e005e2a076c
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/xcb-util-image/xcb-util-image-0.4.0-r1.ebuild b/x11-libs/xcb-util-image/xcb-util-image-0.4.0-r1.ebuild
index d1f63d1e450f..482024f64369 100644
--- a/x11-libs/xcb-util-image/xcb-util-image-0.4.0-r1.ebuild
+++ b/x11-libs/xcb-util-image/xcb-util-image-0.4.0-r1.ebuild
@@ -14,7 +14,7 @@ EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/lib/libxcb-image.git"
 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 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/x11-libs/xcb-util-keysyms/Manifest b/x11-libs/xcb-util-keysyms/Manifest
index 4488056749f2..c0d899b7c38f 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-r1.ebuild 922 BLAKE2B 4cd7dc8249e413f06c7e02906ba67e44006b077b72376d9e3f8e92c724a5153930cedc2cd4313f6b907816887d4879501820f6fdb24039ee1a122a470b49fe4d SHA512 6b7f0fd974fc63f9a2a28c26c465af25009c716e39db4646c319eac34b36f26b36f6e50ecb0b5c29e55d1a27bce3e75319ad330a29143ca703e3c55988faba6f
+EBUILD xcb-util-keysyms-0.4.0-r1.ebuild 919 BLAKE2B 2397ac2d3cd413f73a4c03064a3cea2a135cd096a9756c1d25c0a5f4e1bc363ac1dd1992b097cffeb620078477f9b7c3577f404579b601cbb0b80b26d8b00059 SHA512 11adeedddac342108bd08c6bbcc3589e0729cc47daa9e1865eac69b42e6fc926766c786fcd861665cc58dfe80741dca19d96b270dcd14bfc669dd68d12ddd8a4
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.4.0-r1.ebuild b/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.4.0-r1.ebuild
index c63743579e54..e7d51513b02a 100644
--- a/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.4.0-r1.ebuild
+++ b/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.4.0-r1.ebuild
@@ -14,7 +14,7 @@ EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/lib/libxcb-keysyms.git"
 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 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/x11-libs/xcb-util-renderutil/Manifest b/x11-libs/xcb-util-renderutil/Manifest
index db911fd58510..8e3584b76f98 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-r2.ebuild 942 BLAKE2B 42c774941ee85c168be8f5f8367f7935611e7f18dd6bfc507b9dc838cc3d9a1e604a324d3e3404f07acbc5bb3f687c03fb4dd8d89c051bd1325963c42d81932e SHA512 16e1159299499ee743c9678e07ea4bd975df475dbcc2a26e76eca7b0765a63982097e6007fc5677400f6481bb78629fba5ee3c6624b462e0a05169e28c24c61a
+EBUILD xcb-util-renderutil-0.3.9-r2.ebuild 939 BLAKE2B ba23a8e39462d745bb748f3f1b9bc131e433d016d47ae3cc0491edf54d8063b80dfbc5fb4f56ef4e412387da30237a003dfb9b834b904766e7470421ec7bcc6b SHA512 d7be2a7f1ca40ec0a9de97ded92158912ac2dbf6af07a7f463c15383b2ccc4d2d8390e06eaa14e6445d6aedfacac0fcafa691b9d750036bc7ee2230095261cf5
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.9-r2.ebuild b/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.9-r2.ebuild
index 1e585b806c3d..304d5773da98 100644
--- a/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.9-r2.ebuild
+++ b/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.9-r2.ebuild
@@ -15,7 +15,7 @@ EGIT_HAS_SUBMODULES=yes
 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 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/x11-libs/xcb-util-wm/Manifest b/x11-libs/xcb-util-wm/Manifest
index 5a2c69a2166c..6c8889b74f2e 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-r2.ebuild 923 BLAKE2B 3a3323fb659c31d3daf9b6cbba59bdd88e0210960e953013a23fd139e64225168b3bce08347a71d115cb66e172a3b2588f3dd1255862faaa5052d81ed5b3351c SHA512 6416a42c3a389f8767389e96b5c7d40d3444e178b38a1848e9444a494c6ea5b22f37656d5e2062f06cf30d42683a4d69222f1d165bef377fdbc77b7a536790bb
+EBUILD xcb-util-wm-0.4.1-r2.ebuild 920 BLAKE2B 5762a21acb7c3278af572aa5922ce15956ec81a2822c64de241a22b27692557222f3f496b28330c6ef6fed5250478f505d9fc4dc1355e710360d035dd1ca5227 SHA512 1fbadcfb495abb85f78e38acd1d5f890af7002d1847381af1ea3b0cfe124c717b22610e8a33b9f925d4b6b9264864f9e8a29220f83fd6abde7ee211c18661e09
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/xcb-util-wm/xcb-util-wm-0.4.1-r2.ebuild b/x11-libs/xcb-util-wm/xcb-util-wm-0.4.1-r2.ebuild
index b506228ab155..160f8dc8699f 100644
--- a/x11-libs/xcb-util-wm/xcb-util-wm-0.4.1-r2.ebuild
+++ b/x11-libs/xcb-util-wm/xcb-util-wm-0.4.1-r2.ebuild
@@ -15,7 +15,7 @@ EGIT_HAS_SUBMODULES=yes
 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 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/x11-libs/xcb-util/Manifest b/x11-libs/xcb-util/Manifest
index 56c973f779d3..d14982e50b17 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-r1.ebuild 1196 BLAKE2B ba5196c611b09ce2d8d28fe471047b5896e751c3cfe6fd6b3f9320fe1ebb95932c7ce60bfc7922316dda96a1470e44823735ca47b20b150bfdfd17b711939cca SHA512 6674525edc1a354fd942102be33df3959b3419035422f529709788ba684eb24352867720c2eb55757f64296e78f251630978e0eb16dadbc2bef3494bbe109e7c
+EBUILD xcb-util-0.4.0-r1.ebuild 1193 BLAKE2B 963f6060498a3f40ab19fcfd27247528ca60317c822daff96c854a879d21cd64e6db9f71d6e8a8a0c6f86ef3913b804b156a18b707b53fb1f84f22bef39ebf7d SHA512 1ef915863bd04a4ddde1b5f1c28e59256612b8db727c972a9c25f4733ee7587e50c3740043a8caf1bb89babc66a41d194949ff2f63c68738636e46ac000041d4
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/xcb-util/xcb-util-0.4.0-r1.ebuild b/x11-libs/xcb-util/xcb-util-0.4.0-r1.ebuild
index 80013a1a01b4..36b3edb1583c 100644
--- a/x11-libs/xcb-util/xcb-util-0.4.0-r1.ebuild
+++ b/x11-libs/xcb-util/xcb-util-0.4.0-r1.ebuild
@@ -14,7 +14,7 @@ EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/lib/libxcb-util.git"
 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 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/x11-libs/xforms/Manifest b/x11-libs/xforms/Manifest
index e0ccfe84a7b3..158a13375bd0 100644
--- a/x11-libs/xforms/Manifest
+++ b/x11-libs/xforms/Manifest
@@ -1,3 +1,3 @@
 DIST xforms-1.2.4.tar.gz 1438503 BLAKE2B 5027fbd06d001f3291419e5d4e71f7c55e97394b7bda5bf0b4796ba34d7804e7b0bdd12271c082de150d7718039fc3ec6da1b1c530f6a36dcc3a7841c2cd416d SHA512 58669a64b2390da4f4c8b76b1dc34c2e6a4094ebbcfa7f75e0846db4d5c4455d772d9ef59e5aff09edd777957140015faea129c180600634a8d0962b01b912aa
-EBUILD xforms-1.2.4.ebuild 904 BLAKE2B d4f0bb021c055d4a388ae56b74890b46f943bb6c4ba95d9dc03291d8e5f16cb3bd87f770f3ab176c6a7b03526429810a8ac5641aeaa132ee654b03e4ddf1e61e SHA512 c752ace25a90031f313cf3d28bee06ce0d6a237150a883e791a9e69131d13d3726a84df19931ddf3db0950d11e214399b17c1c97cda7b4471687d412fa5d5401
+EBUILD xforms-1.2.4.ebuild 900 BLAKE2B d78daacd5dc30239ee5f97d5919eac394a25e844d7f20933fcf1f415349d3111e01c555c139da68eecc89f233ff8fa1c96dbe2322eab2a664761f7317348b262 SHA512 b2d0194145754648b26e0d96acf9605f788527a443d5012e1f05bbc9426c716531235c4a29511a7aedd1cdec09efe0876a602af870651de0f5e5ca9bf61a75b0
 MISC metadata.xml 251 BLAKE2B f3c965f619454b2d17e1039b6c218308c83af9214f41a5b18244ce9bd811b0a0b6e0227fdaac9b1659a2e2467e6b992b771ff6cf431220648363ab8173ee76f2 SHA512 e8203a24b5e739dcf0d94742215ee6ccdccbd00bb43001f9df58d27100fa427b01937065e1d7399e3552532b09179611e06099e3af14aac5fcf9ddc4ca5463da
diff --git a/x11-libs/xforms/xforms-1.2.4.ebuild b/x11-libs/xforms/xforms-1.2.4.ebuild
index 30c185fca723..cf658a52cc1a 100644
--- a/x11-libs/xforms/xforms-1.2.4.ebuild
+++ b/x11-libs/xforms/xforms-1.2.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~monsieurp/packages/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="amd64 arm ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 IUSE="doc opengl static-libs"
 
 RDEPEND="
diff --git a/x11-libs/xosd/Manifest b/x11-libs/xosd/Manifest
index 761fb82aa8e9..119c591f5684 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 1277 BLAKE2B ac6a515c7169e6661b79ef9664055a28d0969bb6ee4c70aaaf3bf961c3912768dbf6b5fa7fd6956a842b72d10f68ee74531271de670e3cb7ceba09dd1125e8f6 SHA512 e165611cdbed7b6941ef08c2962dd2356c25cdd466014b3f605b6229ad6067d6a57a8dbb5b406a97ced2645d9d5ca71e3b4fb67a13208422907fd76072ff0e03
+EBUILD xosd-2.2.14_p2_p1.ebuild 1278 BLAKE2B f082db2048d2c313ac1001f1d5d92fe2b900c515719fd51a8b3ae740f7b762a2117b24b3af3e5c49b41387d7e0c3a68d023994edd083a3ca0cc8aee5aa47bb36 SHA512 c629751377a885df7e192ced7f191316bdc0740b662db3ba9be29728e8182076eb114eb4556662b870e85222606eb8b3cd9adb208f3edd1dc196927d295b7557
 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 83b588e0744d..a25c22f6e5fd 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 1700d474d272..6eb72ff40570 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 647 BLAKE2B cf423cacda363bf3d9ed6d31811f9249912021b2cc7affc6c2d9a1c23c6d04fb783a5d9cac62f1a15344974571dc616954bf21cd8c06ea251660db95330067fa SHA512 32e1a7f4bacd8f2f66fa0947e365ffc7f81be87826626cc766f4d27a757b664a57cf2a82d5d14c7282634ec02b3a88990cb060a9c1f355d9a5987997220ce071
+EBUILD xtrans-1.4.0.ebuild 644 BLAKE2B c844c353338fa6f587bb965c5d123fbabbe1c3a612df688639c626aaee82fdde50dbd5fa3377d8f404736c182952711f2dd440de0760fa989f4ee89c314eac3a SHA512 c01b7b42da152cc85466ccaf6e9a3eb1fd6e369248f0a00c5ca7bb6714417ecc6d0585dadb7e961dddfae9f9197edd959691e5874ee42821a02773daab977603
 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 4987eebb29f3..bbf5e21fbac0 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 s390 ~sh 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 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"
 IUSE=""
 
 RDEPEND=""
author	V3n3RiX <venerix@redcorelinux.org>	2020-04-12 03:41:30 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-04-12 03:41:30 +0100
commit	623ee73d661e5ed8475cb264511f683407d87365 (patch)
tree	993eb27c93ec7a2d2d19550300d888fc1fed9e69 /x11-libs
parent	ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (diff)