gentoo resync : 13.10.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-10-13 22:19:36 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-10-14 23:22:23 +0100
commit: 4b19be30aa626b327c885dae62c559ec0e9fb935 (patch)
tree: 76e74807bc479502e13866b581b6bf86734ec634 /x11-libs
parent: 30d6f67c98d149508509d5e86f176d558793acc0 (diff)
203 files changed, 580 insertions, 504 deletions
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 1473ab64c455..acc36bbc7d00 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/agg/Manifest b/x11-libs/agg/Manifest
index e3305848f769..0377325be456 100644
--- a/x11-libs/agg/Manifest
+++ b/x11-libs/agg/Manifest
@@ -22,5 +22,5 @@ AUX agg-2.5-pkgconfig.patch 387 BLAKE2B 7f0034bf791618bf3fdc59ec60210732f582b54d
 AUX agg-2.5-sdl-automagic.patch 811 BLAKE2B 9cb34b0efc6980b5269f6d82e524ddde3557b11e369bcb5e351b4b7d814d92a52bc13cd9a1b85487ce9d3d42b897712e93fdb17fa191e0f8850160402acaa415 SHA512 11166f6b8ca9cdaef2e510c7752c643ee6c7a56051c6214111e56dd0274f2e0023be073014a806ecf9ffc086b1436adefd04b563fc82cdd53f9910d281fe2b8e
 AUX agg-2.5-sdl-m4.patch 6797 BLAKE2B 1050aa706618ad34f03d437105449b071478b37655b6799be0258fb5afe27238dfbd029aae77e339847372a97ab99946078a677d691895e05a046389e618b3d7 SHA512 880594c3ea43846e79529444608301b323acbec4dc1bb883880ae4610f8041e95ac31743f0edd042be7d70d36928295b571265910e9342f2538ee68e557406bd
 DIST agg-2.5.tar.gz 564313 BLAKE2B 6451688dad51fe9d0433218109fd555fcaea3dd5933ebb13bc5c6d935640885f007b5dba8607cf45c94f58f0974391ca4fcd2ea9fda954334c8a4309b881d994 SHA512 e2c79f0bf6da80e16e5b50e69638647224fbe778a42a83d72e9de444b3ea711735177de92bf16134da313b9f75e63eb76bd7b0aaf390059f4d0785454e8a6fcf
-EBUILD agg-2.5-r3.ebuild 1346 BLAKE2B 2385cb5a987a8ed519eff4aaf00c846985ede913b49a7d9334a18772842a2baf1d5379dcfab16cc304cfb5b77606dad25f02fc1c252789d6a38b84433fc69e7b SHA512 8c572853428ba46d2c3048997e66a5348dd3d0b1b1fd6c29f801ace6e546cc5fe193f263981c868334e36a88bf05d99ce440b63cdebb961191f47eef100e593e
+EBUILD agg-2.5-r3.ebuild 1336 BLAKE2B 9a6dbce63fb498b36516e000cea20aa1fb5cd2e46a1b7925b2df9875a45d0dce26d35b0c3acf124c3f5b212d69a5d2f70f684e07243e8f7dab9f5e5c662e68b5 SHA512 ac79cbc876ec25d1b06b8a771622bb09f4f792982c826fdf5e4dfbf82581a496e8707ddd944a91cd062b40becd1b74aa0ec4bf04e6a0d975fa6262985ad73591
 MISC metadata.xml 335 BLAKE2B 4f8f3f570b1640e3dd48210e17eba5e9e0749313f4ba21d1d2f2565d8dbb2a7ec16ad73852ddeb0dd11f25887319bbbc44b9bc1c7397e02e43c36123789d186a SHA512 014f102fc0a515f69a841d11f7485287fe7fd4c4b44f33ea972813879d20e6c26d0ff2146268caf7332219055f6c968feb5d59951ee2c0e3e4a439c8f7fef68f
diff --git a/x11-libs/agg/agg-2.5-r3.ebuild b/x11-libs/agg/agg-2.5-r3.ebuild
index 98492c566a25..78e303ff492b 100644
--- a/x11-libs/agg/agg-2.5-r3.ebuild
+++ b/x11-libs/agg/agg-2.5-r3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://antigrain.com/${P}.tar.gz"
 
 LICENSE="GPL-2 gpc? ( free-noncomm )"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~hppa ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+gpc sdl static-libs +truetype +X"
 
 # preffer X with enabled xcb, really
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index 830920494a41..5d70ea0caf3c 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -3,6 +3,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 3813 BLAKE2B 37ecf39e71c5d594d613e98f4f9cb07e58fc2d4a668ab46c0eabb47bed161a6e3399151165377c3e41a7fc276fd780827934491e9792fa52fe5b9ec0a2fdc2fd SHA512 3afd2f3665d2b3adfd38db0f5def6b184dcd7712a16581772a6d2973cd482971011b511a426b05dd9377a8fc3dccacfbae2b28fb09dc10224d06c6b1aa195b4a
-EBUILD cairo-9999.ebuild 3697 BLAKE2B f33815d336890636f83d2bdfdbdbb129eb6d1066cb76ba053da7a0c879c0306c0cff600006f5d152e696db31abd84f2ad4f7780f24339a91d8e90a6c055bba4e SHA512 0d2b3180334176378dc7ff48b4aa39c5e42cb5ffb27e054cf300dcfa8d4e43936d5a98dae01772cc57ec3c1f95833752e92b09ec73bbe930027a850c2bec06b0
+EBUILD cairo-1.16.0-r3.ebuild 3791 BLAKE2B b0f4ac3ca1029b8f601075f0ddc672bb4890c69cbe9c88e0678fd8f86a605855dc275db867dbead0be702707ca69ba655b4426d3fa1dc75b025957c41bce5c13 SHA512 24fc8bc6e543e89be069e556b304a592a7e6889f409b3edfd0024cfcfa09906e28f79067f4451a720b71c94f21bd3fb865a688fc1d6cdaa589c15332233d9332
+EBUILD cairo-9999.ebuild 3675 BLAKE2B 9c478f3c9a05ba8070fd952a52531a279066041ad7ed50a0da90f516e946ab2c7ccfc796672ee342cb02a83f46313db0ede84bb8199f7aa0d5dcaa22e975c591 SHA512 f590a7fabf8b67539752d41cf42586edb5c3ae471422bb794cf8927e16c1b5ca43dcf2c5323a74dbe701ba4d9fc794d039bb284df4fb7b63833870cc80c6b028
 MISC metadata.xml 704 BLAKE2B 25cce9fa8743e9f12ee5f41d189dfdb8850673c129f0ee1089922aead08d50a0eca451f926a9f58fcfe7fee256764db2102364968971d7f971a026f8f29fcfd1 SHA512 4c2c54b38569197ebbcb8145017b77c4f77fed2f6b6b6c4198386ee1e3f067b3ca4539cbf239bd7f3ead1e3d428992bae67b3e80edfbf8bcf48fad43d14256b1
diff --git a/x11-libs/cairo/cairo-1.16.0-r3.ebuild b/x11-libs/cairo/cairo-1.16.0-r3.ebuild
index 6c8fc8546e0c..b759d2048053 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-fbsd ~x86-fbsd ~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 ~sh 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 cc6873271ec6..f2e28c9ed364 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-fbsd ~x86-fbsd ~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 ~sh ~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/colord-gtk/Manifest b/x11-libs/colord-gtk/Manifest
index 9353ac384d3a..d94a4c96cbaf 100644
--- a/x11-libs/colord-gtk/Manifest
+++ b/x11-libs/colord-gtk/Manifest
@@ -1,3 +1,3 @@
 DIST colord-gtk-0.1.26.tar.xz 280380 BLAKE2B 6ddd52b81726f21a2c376b1ab0c773f7670859882f3e5fe6038bf8728d5a9f3308b469b4e563dc784873b5b9cbed8ca671552e9bcb9cbccfaf28cd8f85e0b5bd SHA512 14f59110e2bc100c542323a68566102e9fb5ab44b679da21bf29101960dae38e646e926d884e14f1838a5991e6ebe15af72d5338723265868eadd5f026545c3d
-EBUILD colord-gtk-0.1.26.ebuild 1667 BLAKE2B 5b7916e17ac7547213fc900ff23f847cc4f4ae3c5109fecba23fd45badc4e4b1f8fcedd10215de26d13825353848a56e6a8705f02901e884916722fa8300e860 SHA512 ef8afb956784a65ccc40711764db0bb978937dfdecd8291451548d76addbd23938088ff19c0f8992f6ba13ed3deddbdf33bd406ddc2f813fd9e3e5bf0a46a753
+EBUILD colord-gtk-0.1.26.ebuild 1657 BLAKE2B 60f3e47850b590f53ebb2bd6abf4a85625d9ba83178b88abfdaf522415968af32d19e7a540b2aa60ef6657d88bedb56a4d880362422bf352bfa46ed695747378 SHA512 22e5159dfd7c1cf21897ff4a27147cc30db2e77f3bb9287579931b6a8eecbc7c1d51f150a8075e2b052d4f79a09e78b4dcf941922f3d378a7f7067aebe2edd6d
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/x11-libs/colord-gtk/colord-gtk-0.1.26.ebuild b/x11-libs/colord-gtk/colord-gtk-0.1.26.ebuild
index ea830dad04d5..a388681d24d6 100644
--- a/x11-libs/colord-gtk/colord-gtk-0.1.26.ebuild
+++ b/x11-libs/colord-gtk/colord-gtk-0.1.26.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.freedesktop.org/software/colord/releases/${P}.tar.xz"
 
 LICENSE="LGPL-3+"
 SLOT="0/1" # subslot = libcolord-gtk soname version
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 
 # We still need to build gtk-doc, https://bugs.freedesktop.org/show_bug.cgi?id=69107
 IUSE="doc +introspection vala"
diff --git a/x11-libs/fltk/Manifest b/x11-libs/fltk/Manifest
index c629742ecf80..e5b1e6b183c1 100644
--- a/x11-libs/fltk/Manifest
+++ b/x11-libs/fltk/Manifest
@@ -14,9 +14,9 @@ AUX fltk-1.3.9999-conf-tests.patch 2259 BLAKE2B cb689918b807d75401ad3621deed635a
 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 3767 BLAKE2B 0d9bf5379a0ef12e54d89077d89dcae308ff5217d6fa345f71fe4da9e7e2a7c46897c68ecac427d596c289e15427e4ddb039e109fecd9a59963b26d686b3f785 SHA512 5c6058660979328aa1a1cf0b0b31b42123331faa7bdf8cf0f3239d0bdd9862cc0a51b94db984af5809b4d92e6c91834534e16e3881aa2daba01ccffbc1fcc185
-EBUILD fltk-1.3.4.ebuild 4325 BLAKE2B e0f6baeec8a670dd3ff9dba7d454d61de96c2b88fe160adf1baf0b15bc900c95a1cfb531ce0bfaffd42c467a7cab5d251ada155f4282038a339fb306c31407c4 SHA512 bfc2509e1cdef14292f267078f47a5346c9b9e2bbe4405e13520c096624bf983e4448a7ccdfee27b806e0ada9ad3f4cf798448a6d0cd16af99a3ba9fee46f325
-EBUILD fltk-1.3.5-r2.ebuild 4520 BLAKE2B 928734ae9eee59b85f822b7525e718a06aa0b74160498ab4ee433d387594c8202bcadbeefeee8d52a115c26c86067df9d7996eb57f85bb53c987f10575be991c SHA512 f50fa9afd9251c6dc8cc7d80bd627b04f1672f3243a9c449f1b5ecfec1af97451ffb691945fea4a52f648ec582b187f85c02cb8fc9c2103a62edca40aa922087
+EBUILD fltk-1.3.3-r3.ebuild 3745 BLAKE2B 2b785dcb2bd7112890d513be341badf09d56ec16a731524cfc45be2b20abddac858e31967857c1f48637f306bd5a64b1e794222f2fb54d25b5997509b4d83efc SHA512 f21765b853bc29a3f109c50c016ae645c58895f615579155aa45dbea406c6bd2a98544d013e422caf454b94932c61f43539cfda1a67fb27ddefc8c229fe4cb39
+EBUILD fltk-1.3.4.ebuild 4303 BLAKE2B 6a26c5124a1d561cb7f5d22e0c38221ddbb856fea9ac63a03eb0ff044b20e8acdc66bf4fe1cbbbb220a033796373bd29e35078b6da58068008e9909c986e7906 SHA512 600f392abbdb238a832a56d94ab50b98f9af22f9c0c9579f85abe99ceb79183bae18fbb9ffe02dc70afcf4f880a659da5351c13af82a9d8014426681938c44b2
+EBUILD fltk-1.3.5-r2.ebuild 4498 BLAKE2B ee877a763a130b267001832989a21cfe12734b9d6c10ebae9f0a6cb1308f430aedf7e17097ef262e512e310d83ac10cd5fedf4d0895920b0c4b8c2ded2ad49e9 SHA512 19725c51df550bebeb00fe378be390ffeb26ba87179732ef748976c81732f6dd581a3c0dd64d2dc8241d5f2ad0bfdb8b5309a6296b9ef9146f12acf3f65ebc7c
 EBUILD fltk-1.3.9999.ebuild 4518 BLAKE2B 719dbc412a4d3aa880146f7bda2d0859b41c03d17495d18e4a8226b3e103864dd8aba4d152a21c5fe139635913e8e18b65a0f24db1ac4201d4b4f90ab4f204d4 SHA512 07a58a821c8389207fe726d17663c06b777ae03efed187c2a8ff6dddae5da8ad8ea5f60e971819d13c6734646a27c61f1cfa3f338df7009d954b8ab20ce580ba
 EBUILD fltk-1.4.9999.ebuild 4551 BLAKE2B 2432478df1311381e0268b6abd710ee63494af57c5d6defefd323ce7a226aff9904d88b858e183a58032e06cabeb5a409a524c74a58ff88366078e33fae99a1a SHA512 a15b3a9955f01cc00745698b12a6df6a67f12cb56cccf4706b1e409bf3bccf11b3672a8f6bca3ca95caff526a49dd1bba5702a4060fe0842f73146552243318f
 MISC metadata.xml 698 BLAKE2B 5289c4920b3345c4cfb1bd9151974c40b6d45f6ec605c7c1d766ed3c5118d562d645094ea64b4b0baeb83cf7872ff1fe762e0a427d53899b3d8f517233a9665f SHA512 05565c7e9fe48f03536bdb10f0396c4d609ae7e52ecf6e1a04e956a3f8fa9ad68e2a79827ace0e51b60111859a4482054680b361fe7b391b824ebd39bdfbd24f
diff --git a/x11-libs/fltk/fltk-1.3.3-r3.ebuild b/x11-libs/fltk/fltk-1.3.3-r3.ebuild
index e0631dc59cc9..aaa5aa2bbd5b 100644
--- a/x11-libs/fltk/fltk-1.3.3-r3.ebuild
+++ b/x11-libs/fltk/fltk-1.3.3-r3.ebuild
@@ -10,7 +10,7 @@ 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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+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="
diff --git a/x11-libs/fltk/fltk-1.3.4.ebuild b/x11-libs/fltk/fltk-1.3.4.ebuild
index 19245b16e228..14c0aafdc533 100644
--- a/x11-libs/fltk/fltk-1.3.4.ebuild
+++ b/x11-libs/fltk/fltk-1.3.4.ebuild
@@ -10,7 +10,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-fbsd ~x86-fbsd ~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/fltk/fltk-1.3.5-r2.ebuild b/x11-libs/fltk/fltk-1.3.5-r2.ebuild
index 5688e630c5ee..1a7a9638b198 100644
--- a/x11-libs/fltk/fltk-1.3.5-r2.ebuild
+++ b/x11-libs/fltk/fltk-1.3.5-r2.ebuild
@@ -10,7 +10,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-fbsd ~x86-fbsd ~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 c11ca525a8c5..d4bf0d979b7a 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 521 BLAKE2B 3180b08d0c55585f0cbaedc43fab068ed68d02a47d51631f2bcbac6b88ffa76924c41c610f113c4ff8e60f505c9059db21de99ad5336e1dd32039b6fb19526f6 SHA512 8cbb277dbd1f60a13e7319aa5f8e9788ef96ca8bb6aec46ff765d8cd3e186b7dbbf0bc55671dc7bb90e5a6bc7f44fbaf101544dd3fbf0255e2c9a79326823839
-EBUILD fox-wrapper-3.ebuild 546 BLAKE2B b9754081417a1ff8d3bf3bd68a5e7679fa9fa84ebb8a5c0fc8ba75adc3a22d78b6fccaf8a48d2e64f083531e36aaac9e51f543c04c013b6040f9b4c7c7693585 SHA512 fd9344cccb19c121e737e3002ed4301e6e77e744eb64b35974e0f36a75c1e83d3b0a3599ce6db51ac80b688eeea00396101ec2d408c8c1efdc795245d4b167a2
+EBUILD fox-wrapper-3.ebuild 536 BLAKE2B 8c62923bf0e9e50c5d00fe50a957f85d9fb754b559182f03dd36cb5b593e90d1f96f55dbc3d3dde4e3b7844c771ea292bb9a9a26f57796c0320ed499e2ba48d9 SHA512 1fde0c35aec32402e54ccc5fca5abf0f2901baa339ef4f3dbd51d1f4c50248b90650a1b4efe1f82e225140176d919c2dccc1830f174bc08284b956d5a885a564
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/x11-libs/fox-wrapper/fox-wrapper-3.ebuild b/x11-libs/fox-wrapper/fox-wrapper-3.ebuild
index 6fcc4113bf1d..9826efa31296 100644
--- a/x11-libs/fox-wrapper/fox-wrapper-3.ebuild
+++ b/x11-libs/fox-wrapper/fox-wrapper-3.ebuild
@@ -9,7 +9,7 @@ SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/x11-libs/fox/Manifest b/x11-libs/fox/Manifest
index 88d324b48248..0d62b11d846b 100644
--- a/x11-libs/fox/Manifest
+++ b/x11-libs/fox/Manifest
@@ -1,7 +1,7 @@
 DIST fox-1.6.49.tar.gz 4383152 BLAKE2B a3d626786086e6b46fc82ce4396bd42d060c234cedf8c182257406de4714c29aae64568bc00a3ad794848eb2faff1a904600f82e4815e9145bcfa87e09390ff2 SHA512 cd7dd5fd26bcdde6ed69d547e2b08582f0e88b66b6f1bac9b5cd2279b543edbf5b9a63cc2ed05f1a1fd7e7309ede96404cf7a5d2d8eb8763dc0fb41d613b0ee8
 DIST fox-1.6.50.tar.gz 4381855 BLAKE2B eef3bd77d6343a65adf4bcc3a59690b1d47d1e92faf81b01a347aa4fdc46053ab17d05ce4016fd147ee64b66c8e582754536c895b87d3c3e073e45435ab9d4ff SHA512 195751d223e9af7d76a3bd3192ae7566a129cfe254f0ba3035b4f7e189c68b43daa8276edad95ebf2b1b403b6212a755000eebf1716a11bb7f06845fde4aceae
 DIST fox-1.7.54.tar.gz 5384000 BLAKE2B 8970872d1c626d7ac5b0f944e8ea26a29bb757e4c646116016eaa1eccc2c0328c5047438e87fb6c2deab0a65e2b34cc91e8458150329a3e574e93608694a2dec SHA512 cf14a09f9a6a812ac87839a5df8fd68f693e59050695e8da5dbfe018676f29bc263e4f9208dc06419068e4140b826a0dcf70a8925fec379edf3e4d0d0b693795
-EBUILD fox-1.6.49.ebuild 998 BLAKE2B 3b0c9e16007f3445c61b5ded6b926cd3f852b2fb6edca03a16324a439ec0ec2f6b71f06b18e1c0169659d1449ee35c5178193bf30d8fdf8eb517d963264447e9 SHA512 e033bf329528cd8a569cef5c3760e5aa92258f62a34cb28ef3c086322c8315fb9c7b300183ddf265257d3d5054d6cd04e05eaf7802a2596ca72213dbc83d9195
-EBUILD fox-1.6.50.ebuild 1016 BLAKE2B 3aaf84aa03724d7a117db9a39fdd6564a18c73e9f9d2a4a4aeeafebca891af91aeb8b2657d6d2ed75826588fe1b05ec16f7832f79cec4546cd952ccbed761228 SHA512 651329a14b50595ea6787953962d1988c8e2a7bc2e55a13a2c3668a618649c0fea66c228a4a2c3ca47d443eb23f03d639da012cf7b6d75c868e67976771e0589
+EBUILD fox-1.6.49.ebuild 988 BLAKE2B 73126b9060f5f0ac0c6f0d652b9796ca1b5aae48fe54deff87376f72d7a4692580354baaafeab75a1bdd4e0321fe6706c0a7eef3903d567c30ccb23a4d48657f SHA512 d87115e04521cd54c4272fee7675c67a1c134a488b5e472d20705b936e717db29a99be2100609d320bc748186f571d29355f041d92a5ebae1f8c0055fe2c2230
+EBUILD fox-1.6.50.ebuild 1006 BLAKE2B e9e8735407185025950ce1a2a7abda8cd1eddf10d44628d54932074bc27dabf4cfe867aac2e256ebe84171117f1e22d5f9dc8c3843d7b699352ca76119f6bc32 SHA512 8c6bfe0160549bf03178aacc1c7fa03fef129779da132bf530b9bb31b586e3b12acf78b0e69af9be6ac8c7b80d40f74e33373ff8a5bba87c70973bb0952669de
 EBUILD fox-1.7.54.ebuild 1296 BLAKE2B d5a19de333cfa6346b4e18532838c5c24295f443eddbb77810f8a7a7e55b1c59064913f828e61906e5215d5bc1d62e78b534aaca710977975e332cd6e461a3c1 SHA512 a9760a4ef8ff82d60b58592fc648ccb2de4d3c8e3ed3f1320f62eac8cae2a765a2ca7291486a32204ca6502c0345c25779c35e61c8c71afe46e62f68d4fb8785
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/x11-libs/fox/fox-1.6.49.ebuild b/x11-libs/fox/fox-1.6.49.ebuild
index fde8d32d03a4..ef0f71f8e066 100644
--- a/x11-libs/fox/fox-1.6.49.ebuild
+++ b/x11-libs/fox/fox-1.6.49.ebuild
@@ -7,7 +7,7 @@ inherit eutils fox
 
 LICENSE="LGPL-2.1"
 SLOT="1.6"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE="+bzip2 +jpeg +opengl +png tiff +truetype +zlib"
 
 RDEPEND="x11-libs/libXrandr
diff --git a/x11-libs/fox/fox-1.6.50.ebuild b/x11-libs/fox/fox-1.6.50.ebuild
index b44e36ac7869..330f85c8a759 100644
--- a/x11-libs/fox/fox-1.6.50.ebuild
+++ b/x11-libs/fox/fox-1.6.50.ebuild
@@ -7,7 +7,7 @@ inherit eutils fox
 
 LICENSE="LGPL-2.1"
 SLOT="1.6"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="+bzip2 +jpeg +opengl +png tiff +truetype +zlib"
 
 RDEPEND="x11-libs/libXrandr
diff --git a/x11-libs/gdk-pixbuf/Manifest b/x11-libs/gdk-pixbuf/Manifest
index 0137b97321f9..f29d6c8cac8f 100644
--- a/x11-libs/gdk-pixbuf/Manifest
+++ b/x11-libs/gdk-pixbuf/Manifest
@@ -3,7 +3,9 @@ DIST gdk-pixbuf-2.36.12-bug753605-atsize.jpg 80850 BLAKE2B 17e414ca097b7aaf51324
 DIST gdk-pixbuf-2.36.12.tar.xz 5675768 BLAKE2B da9e18b5dc55ad13a1bdab76d9c63a6233da1b45235ae5eb620e6e3f83888a0cc846f1ba17f72cb3b5af1ccd59a69631b3403bf09e262c53e0149e6f26896a33 SHA512 5d3bd620cf464bf92079b15c78f8400db48c427053c6eeedc4ea9652a4c290a09a26310100cc7eb487daf4b565df9f7e3a6edf14685f81ddbff6a0652fb6b41b
 DIST gdk-pixbuf-2.38.1.tar.xz 5509328 BLAKE2B 9180e833b264e4eb1bec1ec92e6ee7cb07a208459a7b58da9edd3f1872cdc1a98a6d7c27a147674d5dbded1b74098a4b1f197479c7addd1a6b307ced82a2e4dd SHA512 e50badaad2ccb3c816ba0849be386ecb75ea3c7df203d0b0144541c463ad1ace86c0d190b7550e3f59f0cba9639acc5cc048b7127484287894e4df6d62777920
 DIST gdk-pixbuf-2.38.2.tar.xz 5509752 BLAKE2B f78ba049edc7b1a6c909746ec68948764b3602988e110ee2ad752d26d8b3a37c3f2957a91d3c8a5fe3455cf11b477eaa43d097554048e8988c563b4074bfd751 SHA512 b0f83cca9bfbe45dab200b19a5ec6231b628c09633fd41348f433c226d523c2f9b805d41e4d955e9fd65c5b6d24df59c7c94193032379d6f09b0472ae988a0c1
-EBUILD gdk-pixbuf-2.36.12.ebuild 4007 BLAKE2B de6f3819c976e33c87a1f9f84fc8d85ce16ca793b147282545a796493cd43b827e034c7a0f5f529f160165781c02465f71859a863c6af8fa9882aa1a8235aa72 SHA512 98f39a76ebec24dc4f22559b487fff324f2b714d3203a5e98d6d4a18e85b4b8ab7f9c584e0f9c57dbb5d3f727e66b932458901408bc20a3c84eac7aafaa6be03
-EBUILD gdk-pixbuf-2.38.1.ebuild 4014 BLAKE2B b9d4e2cee94e4ee563804f6e98ac687063b2604c4a37b9ec64a981e3632beb516d11a9588cab341d9e0dba4fa1ff176fc9d99152fb760191c01b301e160f5ae4 SHA512 b1f1061e9d833667d4ebf4c7107b7446b21d66a6d955f79fdf64043c1fc7ce13b329f11b0a738f4aab3bd2c2104f8733f7f1ff6da4586491fdcb014a259734ec
-EBUILD gdk-pixbuf-2.38.2.ebuild 4028 BLAKE2B 42e4a44d8b20ff9a173671f125570f33a7386dad045b4165042730da44780e6f6ba47aae6cb90d1aba26d10d51bd450085163c70ee3d3a588848db781c5cbdae SHA512 63959485fb45cbab1bff37e9ec17e88c649bde28296ad1f875439fecf2b8e03f9a51eb04d5da60c0a5a11540d2a70722cc227bac3f4c3819a458756d5ed2e4e8
+DIST gdk-pixbuf-2.40.0.tar.xz 5512160 BLAKE2B 26049a9ede60e7a50bdc5e9a731136e4bc6de031d01abd42667a0bf92617c36bcdc61d2dc18beb3c5223e32eab461ddb9fc9880a014ac1154763d3b7ee3e7200 SHA512 6512befd379494dbfd89a16fc4c92641842eb7b82fc820ec83a5b057526209947db646570db1124c073b0ef69c117bdf0f8d3fea807e302a4950db39187c35aa
+EBUILD gdk-pixbuf-2.36.12.ebuild 3985 BLAKE2B d300526a1cc0ba33aef18a84ccd7ed69f1c905f8266e01184819f97163af630028ba6141c048288a1df0eaf15c6b67346d63d55f7e9e16fd2f2e38bc49052a04 SHA512 c5619adee03329f4612eecf9b09c5518ccd3d9c23b12de46c31c91db1b83a9c55a55c7d683a56c28b4461cc83896a962205d817135efe21d56a45ab23cc35846
+EBUILD gdk-pixbuf-2.38.1-r1.ebuild 4019 BLAKE2B e504c2bf8227bd236f7f2a2de5166b396ec8edfaaa6592da40c6f63861e20add23f704ab2f57b53487d0ca424d3727820a3b9c9d93d02f7ff01084bd6943e6a4 SHA512 7716c02cc2b64cde65f434fa43f001a9b3fb4ab2608e4c575d50cac64b4a622c059ec158918a90eb1b329079c9aa78bd6613d139115ee6f145a3d8d938674fee
+EBUILD gdk-pixbuf-2.38.2-r1.ebuild 3863 BLAKE2B 664593a683237f7e987b5feeb8a13d713f0ee513a723dc41b16126c84388b3e7c2ac3132826a141393f91ffffc80e28ca8e6bf41e30cb408d34761fec782e7f3 SHA512 b9543eb2055d4c73cef3eafdfbc55b0d3c35f45e635737102463669e34f76f7eb444d1056d7d6fa12d33bcf66116d8d4d7973f61979e218154900fa9a5d41ed3
+EBUILD gdk-pixbuf-2.40.0.ebuild 3863 BLAKE2B 664593a683237f7e987b5feeb8a13d713f0ee513a723dc41b16126c84388b3e7c2ac3132826a141393f91ffffc80e28ca8e6bf41e30cb408d34761fec782e7f3 SHA512 b9543eb2055d4c73cef3eafdfbc55b0d3c35f45e635737102463669e34f76f7eb444d1056d7d6fa12d33bcf66116d8d4d7973f61979e218154900fa9a5d41ed3
 MISC metadata.xml 424 BLAKE2B 07b31586e47af1803baf8ce93c9e61334fbe566e8fae5bcc9d442d09b3ddfc51b06be8f02ffebf663b0307130c57e94b63ff57a83856ebec755704b8d3b232bd SHA512 3ef93327d28195a186bcc16c8acbb931c2cedcc7893173ca76af0db90eb088a838f5cb1c2f43f4b72fcf9067f6c483c96a5549c57c3542cccbb70450cce485bd
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.12.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.12.ebuild
index abf08b26b453..63600effa7dd 100644
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.12.ebuild
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.12.ebuild
@@ -11,7 +11,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-fbsd ~x86-fbsd ~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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="X debug +introspection jpeg tiff test"
 
 # Remove SRC_URI when gnome bug #795069 is fixed
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.1.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.1-r1.ebuild
index d6594527cccb..e9a368ec3121 100644
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.1.ebuild
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.1-r1.ebuild
@@ -10,7 +10,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-fbsd ~x86-fbsd ~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 ~sh 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
@@ -116,6 +116,7 @@ pkg_preinst() {
 	}
 
 	multilib_foreach_abi multilib_pkg_preinst
+	gnome2_gdk_pixbuf_savelist
 }
 
 pkg_postinst() {
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.2.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.2-r1.ebuild
index 35bdc66994e6..751e7ed0fff8 100644
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.2.ebuild
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.2-r1.ebuild
@@ -1,7 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=6
+# TODO: EAPI-7 needs gnome2-utils fixes - ${EROOT%/} and co usage for EAPI-7 in gdk_pixbuf_*
+# TODO: functions and eutils inherit for emktemp or some other solution
 
 inherit gnome.org gnome2-utils meson multilib multilib-minimal xdg
 
@@ -10,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-fbsd ~x86-fbsd ~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 ~sh ~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
@@ -109,14 +111,15 @@ pkg_preinst() {
 		# Make sure loaders.cache belongs to gdk-pixbuf alone
 		local cache="usr/$(get_libdir)/${PN}-2.0/2.10.0/loaders.cache"
 
-		if [[ -e ${EROOT}/${cache} ]]; then
-			cp "${EROOT}"/${cache} "${ED}"/${cache} || die
+		if [[ -e ${EROOT%/}/${cache} ]]; then
+			cp "${EROOT%/}"/${cache} "${ED}"/${cache} || die
 		else
-			touch "${ED}"/${cache} || die
+			touch "${ED%/}"/${cache} || die
 		fi
 	}
 
 	multilib_foreach_abi multilib_pkg_preinst
+	gnome2_gdk_pixbuf_savelist
 }
 
 pkg_postinst() {
@@ -125,19 +128,12 @@ pkg_postinst() {
 
 	xdg_pkg_postinst
 	multilib_foreach_abi gnome2_gdk_pixbuf_update
-
-	# Migration snippet for when this was handled by gtk+
-	if [ -e "${EROOT}"/usr/lib/gtk-2.0/2.*/loaders ]; then
-		elog "You need to rebuild ebuilds that installed into" "${EROOT}"/usr/lib/gtk-2.0/2.*/loaders
-		elog "to do that you can use qfile from portage-utils:"
-		elog "emerge -va1 \$(qfile -qC ${EPREFIX}/usr/lib/gtk-2.0/2.*/loaders)"
-	fi
 }
 
 pkg_postrm() {
 	xdg_pkg_postrm
 
 	if [[ -z ${REPLACED_BY_VERSION} ]]; then
-		rm -f "${EROOT}"/usr/lib*/${PN}-2.0/2.10.0/loaders.cache
+		rm -f "${EROOT%/}"/usr/lib*/${PN}-2.0/2.10.0/loaders.cache
 	fi
 }
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.40.0.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.40.0.ebuild
new file mode 100644
index 000000000000..751e7ed0fff8
--- /dev/null
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.40.0.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+# TODO: EAPI-7 needs gnome2-utils fixes - ${EROOT%/} and co usage for EAPI-7 in gdk_pixbuf_*
+# TODO: functions and eutils inherit for emktemp or some other solution
+
+inherit gnome.org gnome2-utils meson multilib multilib-minimal xdg
+
+DESCRIPTION="Image loading library for GTK+"
+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"
+IUSE="X gtk-doc +introspection jpeg tiff"
+
+# TODO: For windows/darwin support: shared-mime-info conditional, native_windows_loaders option review
+DEPEND="
+	>=dev-libs/glib-2.48.0:2[${MULTILIB_USEDEP}]
+	x11-misc/shared-mime-info
+	>=media-libs/libpng-1.4:0=[${MULTILIB_USEDEP}]
+	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
+	tiff? ( >=media-libs/tiff-3.9.2:0=[${MULTILIB_USEDEP}] )
+	X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+# librsvg blocker is for the new pixbuf loader API, you lose icons otherwise
+RDEPEND="${DEPEND}
+	!<gnome-base/gail-1000
+	!<gnome-base/librsvg-2.31.0
+	!<x11-libs/gtk+-2.21.3:2
+	!<x11-libs/gtk+-2.90.4:3
+"
+DEPEND="
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	dev-util/glib-utils
+	gtk-doc? ( >=dev-util/gtk-doc-1.20
+		app-text/docbook-xml-dtd:4.3 )
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/gdk-pixbuf-query-loaders$(get_exeext)
+)
+
+PATCHES=(
+	# Do not run lowmem test on uclibc
+	# See https://bugzilla.gnome.org/show_bug.cgi?id=756590
+	"${FILESDIR}"/${PN}-2.32.3-fix-lowmem-uclibc.patch
+)
+
+src_prepare() {
+	xdg_src_prepare
+	# This will avoid polluting the pkg-config file with versioned libpng,
+	# which is causing problems with libpng14 -> libpng15 upgrade
+	# See upstream bug #667068
+	# First check that the pattern is present, to catch upstream changes on bumps,
+	# because sed doesn't return failure code if it doesn't do any replacements
+	grep -q "foreach png: \[ 'libpng16', 'libpng15', 'libpng14', 'libpng13', 'libpng12', 'libpng10' \]" meson.build || die "libpng check order has changed upstream"
+	sed -e "s/foreach png: \[ 'libpng16', 'libpng15', 'libpng14', 'libpng13', 'libpng12', 'libpng10' \]/foreach png: \[ 'libpng', 'libpng16', 'libpng15', 'libpng14', 'libpng13', 'libpng12', 'libpng10' \]/" -i meson.build || die
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dpng=true
+		$(meson_use tiff)
+		$(meson_use jpeg)
+		-Djasper=false
+		$(meson_use X x11)
+		-Dbuiltin_loaders=png
+		-Drelocatable=false
+		#native_windows_loaders
+		-Dinstalled_tests=false
+		-Dgio_sniffing=true
+	)
+	if multilib_is_native_abi; then
+		emesonargs+=(
+			$(meson_use gtk-doc docs)
+			$(meson_use introspection gir)
+			-Dman=true
+		)
+	else
+		emesonargs+=(
+			-Ddocs=false
+			-Dgir=false
+			-Dman=false
+		)
+	fi
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_test() {
+	meson_src_test
+}
+
+multilib_src_install() {
+	meson_src_install
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+
+	multilib_pkg_preinst() {
+		# Make sure loaders.cache belongs to gdk-pixbuf alone
+		local cache="usr/$(get_libdir)/${PN}-2.0/2.10.0/loaders.cache"
+
+		if [[ -e ${EROOT%/}/${cache} ]]; then
+			cp "${EROOT%/}"/${cache} "${ED}"/${cache} || die
+		else
+			touch "${ED%/}"/${cache} || die
+		fi
+	}
+
+	multilib_foreach_abi multilib_pkg_preinst
+	gnome2_gdk_pixbuf_savelist
+}
+
+pkg_postinst() {
+	# causes segfault if set, see bug 375615
+	unset __GL_NO_DSO_FINALIZER
+
+	xdg_pkg_postinst
+	multilib_foreach_abi gnome2_gdk_pixbuf_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+
+	if [[ -z ${REPLACED_BY_VERSION} ]]; then
+		rm -f "${EROOT%/}"/usr/lib*/${PN}-2.0/2.10.0/loaders.cache
+	fi
+}
diff --git a/x11-libs/gnome-pty-helper/Manifest b/x11-libs/gnome-pty-helper/Manifest
index a444d885bf0c..896cd37d36d8 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 814 BLAKE2B 33767758b41d0b2075ca190e6977cd209090477c5690cd5499c604d7d4b4b646a0411e0706bd68a9e8f59cfec37314bcc816e9b19f278a47df5dd5961aaac959 SHA512 f0b45fe3c184ca60cbd828ee9935f63403b217a606f504f6485b5cc564b3bc5b934496a910bd3684f531df4f0c6bdd80fd26966a52ab05c3d994d9bfd2108c07
+EBUILD gnome-pty-helper-0.40.2.ebuild 804 BLAKE2B c359e05704377d07b6f98fd3e16ffdad63b71182fee44e26ef328492b88fa189a12c6cd03bdc6ac66fefccf214d1abde0d2ec9881c8aedd14279e061a2d3e1e9 SHA512 3e59f0c72e451aedbd81f8163dff395b077878d504845f32f716b6b5be739218d3fee3deeb9be41e277f14ce26c43c1a9135d22c5d735b29e94dba7c7581b760
 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 c254408c7ddd..095161f77245 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 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh 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 44b83825892e..e606e480e2c4 100644
--- a/x11-libs/goffice/Manifest
+++ b/x11-libs/goffice/Manifest
@@ -1,6 +1,6 @@
 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
-EBUILD goffice-0.10.41.ebuild 1254 BLAKE2B c412e0ae4ae8ada5a7d199313d915f7d4d9a1aead9742c271f9e741ec5d18159103cfd5396114b16f707647019eb6ae05bb7ca094d0ed4f805de7324c3bb5c77 SHA512 dd8935ebd5ecee474ab3057a440c622791aa83ee7a641c063f81b9c20cf207be766fcb468ad0c2d564af365606b810847b3bb7f167eaa472c1a7b18a4ccc8c28
-EBUILD goffice-0.10.43.ebuild 1380 BLAKE2B dae0ddb7c21e019690acb465722c91c124500972adba3e83eef6494270e55b8cb17428ee77fe67eadefd6d3623304a8d98c70a7101649b07c4077cc862c25b9b SHA512 84e08ab7de38952c5f409666d80d90e9430b93a64708549adb8576bff7b652b8c235aac400c3712b6ec816e5728a39d8997dbb77d7cc63c9d546902d77a3f20c
+EBUILD goffice-0.10.41.ebuild 1244 BLAKE2B 4d077c53840c1be6be76cd262fa4c1b9798861a429d5c1d4f9441e6f38e83162e24b478721b1dc14e9445582dddd2402a6fcc1d95da991f1da6f5f4d3c84535b SHA512 22a5e59c0b30d031841849c89dbc8258fd9bdd55b62aed930727fc4c33482672b8b464fc0d57f35ee9b0b2ed68f0dc1372d3093da81f3fb2747abc2845372f6f
+EBUILD goffice-0.10.43.ebuild 1370 BLAKE2B 7a40e2ca6b0cff35e67066879d46353979ad0549888672a5afcac8629fb892b037a4b8f12d6a4b7092bbeda9b9e70727b3486b72a4f34689ecd26c9e45757635 SHA512 e068b527f8b5438101310b27b7bccda66ce68dac8c82b8cd1c39ee6b8f99f6c84e349acf15615f67f62cd2c0a09366239501c5732981ac8337565ca2e0c82af0
 MISC metadata.xml 441 BLAKE2B d1239d813165b887ed43610e0b9a09afd739164ecf52a0b6a94e957550b5dec5e18dbf5777e4b7bf8e1d665edf89bc5777ad90ebd93caeab5af6fc2882eb3469 SHA512 69e822f6c8ecb89ae952b30074c2527e8283eeabe32ac6555d043576b21d0f5a40b968b0211574ce8b1836dac85370070ee86905551bdd8cf2418cdc2ac6c3ce
diff --git a/x11-libs/goffice/goffice-0.10.41.ebuild b/x11-libs/goffice/goffice-0.10.41.ebuild
index 6ce1d66a8ebc..bf0f4ec8c4be 100644
--- a/x11-libs/goffice/goffice-0.10.41.ebuild
+++ b/x11-libs/goffice/goffice-0.10.41.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://git.gnome.org/browse/goffice/"
 
 LICENSE="GPL-2"
 SLOT="0.10"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~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/goffice/goffice-0.10.43.ebuild b/x11-libs/goffice/goffice-0.10.43.ebuild
index 690248f0287f..c6f1937ccbd7 100644
--- a/x11-libs/goffice/goffice-0.10.43.ebuild
+++ b/x11-libs/goffice/goffice-0.10.43.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/goffice/"
 
 LICENSE="GPL-2"
 SLOT="0.10"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~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 802c878b53cd..e62a3fce1554 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 1274 BLAKE2B 2e7345e4607829163621cac030e5ac1751fd29c04cdca8601fdcafc9d8698fadd355bad59715b7643fbcde5bc80453064c99415fd5104e19fe3d493a3f8d7ded SHA512 047a944f0f6e8dd81fc125dd696e04ff50fd29ec8ee6f55f60c5dcad6ea8dd0af97258297ebf4d476d1aee34f6bd2ed1d1ffb28f4106c8a4fe4ec675f4f242d1
-EBUILD goocanvas-2.0.4.ebuild 1629 BLAKE2B 4a7cb39bce1596fb1f2e16e8b45efdf6798d2d154965eb469569c6a611aa66082f6bbe14448be5bf2a3a3f783db1c10756e5abfa216fd79abae42a4ed967fec3 SHA512 871ea6810f80edbcf72bbd461451d32aa20d744869884a7de865018e7ae113cb20b0fb33cedd5a33a552bb1099a96d71a315e518ad53f46ab268b35d27820f10
+EBUILD goocanvas-1.0.0.ebuild 1264 BLAKE2B e1357fdfe2b6786b5592d5f3fb2fbf47039392021ab3201000cb456bf6dc55d59b9ca443ed65542b891cf430a4c7e3fa9ead157f102afc8f79bf0d7981996b04 SHA512 f10066f466342fa93a52076ea94fe7c7d19c55dbe87059502d200e862c9b2561bf916f6b255ae9fa918afe48bbb0b2a4f93d9451027c7c72ac1df539a38883fd
+EBUILD goocanvas-2.0.4.ebuild 1619 BLAKE2B 50f6df03b21bfab21c3fe46c6ddb55a5b498409e2c4d766e5bc8796924566ad5c79be147cf109df31e2112f085969d7c15708e91012aa3aa7dfde5b15b4d964e SHA512 2dd4ae53b3d790121b4c02d042fbcc9ba90f9ff96719e9e8a9276756274432ebaefecf5f67b6f034ddd42f515ef06533520a32579908362e9dafbdedbb83ef76
 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 1f7e14547782..fa288d656dd4 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 ~x86-fbsd ~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 dcf4b83a0e66..411d9cb1b051 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 ~x86-fbsd"
+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 8aecf3394f77..fe2fe680aefc 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -14,10 +14,10 @@ DIST gtk+-3.24.11.tar.xz 20974300 BLAKE2B f338782d6141df64f83caae84649558296e112
 DIST gtk+-3.24.4.tar.xz 21102236 BLAKE2B 1ef6445d582217a54538549fd63c59dd1e7f14832b33a41e971d2dd184a8887876d1eb599cb9fcbd590ec1a16ca29f0be92bc96344b1e7d2fdf88456d63c9a7f SHA512 d1cce6d0d7f1c5ef0f4e8988b88372a32b9d8a2924da4cfc46a80ede91cf8a2aacdcd87eec122dfab1369b36fc849d875832ac11d79426cf6884e1730e5d4dd1
 DIST gtk+-3.24.8-patchset.tar.xz 3684 BLAKE2B 686356993b95f5342942764af5f92ab52b17fcd326ee3fd0de5179ed2a55b6e0192e16707ee882866d39ede7d28150b8b8bc6945355f04a4b191b671ae70fb7d SHA512 31f9b982592a81095afad91f16ad96e72a7a2b0e2bf812f0b719da56d70235bc06bc991b5f619fefded3e1634efc5b7e8ef00053929c89e967351d8625518428
 DIST gtk+-3.24.8.tar.xz 22419364 BLAKE2B 262384d0bf1d843edfcb13007eae3584235fa166286f071b8b98803d452df3f4f8934f2b1830427d0c0cd956b67170e576f8c3f733e9b6323b8f89f6d0ddea71 SHA512 a988ca2e25f0f32e55b2931f16c72f9649ed98405579d217e8a5e7f0ac10bcd1969090c622c5d9eb7d75235813ff7ccb90e30e252afd71ba283c6172ee459fe5
-EBUILD gtk+-2.24.32-r1.ebuild 10008 BLAKE2B 8bceca83e3a73a2565cd980c80d1baa5fa2a79de61b4b8cb984738bbf6740c59a5df4b04e878fa2282d46642970e11dc4db8dadbf479447576b854f597b274cc SHA512 f3dca376a7794bc8ecdc47362a09dc58d46de7636dc0fec7dda86727ed47cb0d2105d5901884b60ae0601159ba1a79d0da2e05d725e0d119d9382a7771369ad2
-EBUILD gtk+-3.24.1.ebuild 6911 BLAKE2B 2320cdd69304ba179e9d3a679f4fcbbbef233f454b4661fa1268e7f209401fac175d1a50f57c931ec669ff64168891d66abea8f057b84837cf3801404f6cc6e8 SHA512 0df091ae2f0ad31ef4a77c77ea62e1e6075af62234483bc841b9c027aff45e0c7632354895d3066f9d480177f90eaa25069b6082b21da48640e7525b96000194
-EBUILD gtk+-3.24.10.ebuild 7317 BLAKE2B 4e4b2de6f644f65b7bee0f3e6a64f55057219f6fa1312594426eef9a100af6f31cdc92a0ec42417a560152306e216c66ce305640d8e09c771d1fdb0ce8c03437 SHA512 efcb33b97b1a08616db76dbb4e25cabcb15e2fb0c73ee472dac5586aacecad08ef94b7260fb000939148d2cdbe9e63d0f02b1a122779d515e861a93ceed69de6
-EBUILD gtk+-3.24.11.ebuild 7356 BLAKE2B 932d654e21ebe74724571f013ec35d69722547071e106442180e0b5a79f234b3d2c84fff1d222e32e337f2ac9866cd1cc86a3745be0be503b4606f0af920cd9d SHA512 07e90ebf374fa35372121eeb46db27fefb5b349e98327b130fe1472beeeaba83c44153b6ad5e51123b6665bb00d04c9c35fc6bd8f041b382f5050c626adaeaa0
-EBUILD gtk+-3.24.4-r1.ebuild 7277 BLAKE2B 833c8d22a401ba319fce77e3dc17223213d96e3d170b382377af5aa95fcee179c357e69d7dabc02e653a21877e199c5871e9843f800887dfe87985e3a068e231 SHA512 a26d38f97f1186452abb836ae7508f1d70d8913f466915afc7f6970af52a389bfb1b16914ee933be4ef0e2cd9eed99684f7b3aa2c41cbd793a3d55bbb0b4e0fa
-EBUILD gtk+-3.24.8.ebuild 7107 BLAKE2B d7f5db20d8f6821c5c50568493ffa0a01fe0b50c935055cd6d4cc0ea0ee34ea8fb3cbb8737f15868267017430466c0404c2c8084f759001d4642af4970c25b99 SHA512 051a2cbad61cff75b30fc8c889f7a1884bb8ee483cf304f92cd5b04a81dadae664aee1994d71111b2b3ff8389f794b0d02dbf998826367ffab70a7441f5ce4b9
+EBUILD gtk+-2.24.32-r1.ebuild 9986 BLAKE2B 59dbdb49cf5600fc37402663acba725096faaa2eafe7bda998c231f7057f7477e0857624fc422ecb0c5811e6dbfd10bb61bc7b6df5794063bec65c3680725f47 SHA512 814faa5bb885e55db9d24a74d7571b1f61da82005768b891b9a737af8870a9bbe4e74fbad2b218bdfcddeb3f5309843f0bf0755746aacf6e4dd9a73c01d88456
+EBUILD gtk+-3.24.1.ebuild 6889 BLAKE2B 5a2493b590a26980386026ed1e70f32323ea24ea64dd2ae5897184226b016cbaaceaf4d0f184c981dabd55efafce6e592d6fab62043ffa528a226529d6f1d8e8 SHA512 7e0bdea9c47c39f84bfbcc8a31050b399b94ef8d996d29170ccf5b2cd9068a23f173f222343723499bcb36bee7b42a719d3f8acf48d2cecad0a43e80b76e8b81
+EBUILD gtk+-3.24.10.ebuild 7294 BLAKE2B 85907bd20f2f989a944304d13e632ce5adec47eb4411b3d93d1ecd99bc1f6188e344486d8d3fad75fbcf086b2810747be5c32911cb3117f84e4f6185a1cd601f SHA512 b76218f80bc002e477c6585ba2ca650df4441fa078733f5cdd5be5bc8c033fe389d14d30729191bca139832211de19301868536da70ce31f83158b2819bcb2df
+EBUILD gtk+-3.24.11.ebuild 7334 BLAKE2B 2c1ba3642f9565edeb04cadcdf2a74efb98bd78f5908351a026c01d81fb7a33516d6b7c11c14d47a7b4212956d605d547008fad4f58a0c5cd2c8909c6bca8ffc SHA512 51409aea0ef5464019b9bd38cb0662f33c7fda0d559d37ba6c60d5eefec37289b0726453714ff4640bc9cde3a680ea98ad238cb911bf4eed0fa1fa88c065682a
+EBUILD gtk+-3.24.4-r1.ebuild 7255 BLAKE2B 45402dc053928d65c2e6ebfe52d23038e3283fc543af7358b31fc543a7696d12cc6ae670aa915852ee62df827c1666bac98c2336012cbb0d019c0a4e79fe5ef5 SHA512 05a35c8edb716a2052527cfecd461af62ce256d6fc522669dbf475bc1c5f7115d90e62a4ec4c426c717ca28265920130d8cbbeae5cfa9635249c15c72e875429
+EBUILD gtk+-3.24.8.ebuild 7085 BLAKE2B 35a30df174c1bfb293919f171691b5af07a13ca4ed893f5624914e4e8eed0a96131bba6596c60f29030911cb38e39b51b522a3f282731af30ea940e26ba31142 SHA512 d72192a4c8c0bdf7f6ac4af3eeb17709547c7204dd267db9f35f5c08012ea0ac3aff7a45a6e9bec42755e29a858d3006f8ed6ddb5472df576a244a554889ec13
 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 59b152960347..3d5b08622f6d 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-fbsd ~x86-fbsd ~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 ~sh 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.1.ebuild b/x11-libs/gtk+/gtk+-3.24.1.ebuild
index b06c229a87d5..f11ad18ee97f 100644
--- a/x11-libs/gtk+/gtk+-3.24.1.ebuild
+++ b/x11-libs/gtk+/gtk+-3.24.1.ebuild
@@ -18,7 +18,7 @@ REQUIRED_USE="
 	xinerama? ( X )
 "
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~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 ~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
diff --git a/x11-libs/gtk+/gtk+-3.24.10.ebuild b/x11-libs/gtk+/gtk+-3.24.10.ebuild
index c6c3df1c4b19..2791a8697237 100644
--- a/x11-libs/gtk+/gtk+-3.24.10.ebuild
+++ b/x11-libs/gtk+/gtk+-3.24.10.ebuild
@@ -18,7 +18,7 @@ REQUIRED_USE="
 	xinerama? ( X )
 "
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~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 ~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
diff --git a/x11-libs/gtk+/gtk+-3.24.11.ebuild b/x11-libs/gtk+/gtk+-3.24.11.ebuild
index 02e0bf47e158..05a59ced16c3 100644
--- a/x11-libs/gtk+/gtk+-3.24.11.ebuild
+++ b/x11-libs/gtk+/gtk+-3.24.11.ebuild
@@ -18,7 +18,7 @@ REQUIRED_USE="
 	xinerama? ( X )
 "
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~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 ~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
diff --git a/x11-libs/gtk+/gtk+-3.24.4-r1.ebuild b/x11-libs/gtk+/gtk+-3.24.4-r1.ebuild
index cbc785377abb..e3217afab7e0 100644
--- a/x11-libs/gtk+/gtk+-3.24.4-r1.ebuild
+++ b/x11-libs/gtk+/gtk+-3.24.4-r1.ebuild
@@ -18,7 +18,7 @@ REQUIRED_USE="
 	xinerama? ( X )
 "
 
-KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~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 ~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
diff --git a/x11-libs/gtk+/gtk+-3.24.8.ebuild b/x11-libs/gtk+/gtk+-3.24.8.ebuild
index 2d9a9b11f63b..0f01ee9831f7 100644
--- a/x11-libs/gtk+/gtk+-3.24.8.ebuild
+++ b/x11-libs/gtk+/gtk+-3.24.8.ebuild
@@ -19,7 +19,7 @@ REQUIRED_USE="
 	xinerama? ( X )
 "
 
-KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~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 ~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
diff --git a/x11-libs/gtkglarea/Manifest b/x11-libs/gtkglarea/Manifest
index 21dffdc5e7c5..d427a71cf88d 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 1139 BLAKE2B f13aac25c39ef61c858c501e6852ee2200f7a2c0e2a7e9b4df8308cb4ce51bdfe95a6cac4955e1f5be9b5b0cd736978b11a888c903d4067abc2c43c3fb8c2f01 SHA512 d188db3b7cab7cc9029bbc4b984a2a129f4b30c93b81581df10f6a3c7b14c6b1820179574df509f2c60479bf421d11518369d01e669c3e3d13a335aacbd0a728
-EBUILD gtkglarea-2.1.0.ebuild 1008 BLAKE2B c8f44ac8c1af56ca583e91fb241db432d300edf964500932c7ec6f69943c416712457bdcfc86ff7e628cf7ce7729fee9c29796ba67695cd78d028783695e1675 SHA512 5f541f10c8126b2f671bd802e98b7e89726a9af433ca1a1804bda1d5fd719233fdf41bc31cab65f3cb18fe944c78938ba2405d1564f5847feb0d540ea559c435
+EBUILD gtkglarea-2.0.1-r1.ebuild 1129 BLAKE2B 8670d355a8a97d8e023aaec217a6be2e07ea291f695f63e1020cf2ee24019ad6bc684fa5994cdea57e3c3a12bebe61c313ea15f6cef92eb17500f8bd17c496a8 SHA512 8dd4b8c41dab632350e90bb9a0bb49060e9cd97d07fcaad948dfa9c35e152b7ebc203820ea8369c0c2315023e2fbbaaf463e8b4bf735e1c151c1ac0dbde37a79
+EBUILD gtkglarea-2.1.0.ebuild 998 BLAKE2B 713f8074722faee344b7242bfeaa9814709693aab52fe6608c5463d66da539506e70a385a3b8aec9b0518be15bbe63463044529186532c72dabf832294ab17b7 SHA512 6fb5d9ab7023052e68becef39895f401cadc14fbb68da90ddb57fa3582adc18863b8d082b8457df030681d08e901bf1472064c57aa617176bff6daf3900ed217
 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 cb9a9c4063be..a90b252b4c68 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 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh 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 ec6c963a1057..96ee0444ee5f 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 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 RDEPEND="
diff --git a/x11-libs/gtkglext/Manifest b/x11-libs/gtkglext/Manifest
index 5fadee272fee..15140fb2e9ad 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 1571 BLAKE2B 794112f04810808f4b0c73813c632316d0c5a1e7acea625735db9aad1e8fc1867dd3981ba9d335d966c0d1cb6eb25ad25ecc3bb96021bbf069e209b310b9a3b5 SHA512 904e87622ea68dbe38832a6abb7556106fe29bf7409c792b0656134cf13ac63d4568f94664fb9e56a24bf4c9f55e3a4a56fe177abbdbc7402b52948334aa09f7
+EBUILD gtkglext-1.2.0-r4.ebuild 1561 BLAKE2B 81f0539620d5df3a0fe39f7eb5f1aa57f53ab63ca6f11fbbab849d02e493b8d069f977c5012bd37f9af4ac1026a1025f4973a3e5ff98359a1d947995f5d13c75 SHA512 88c9f721d39f776f382f306fa40a1a32e96cf6493147f99e7a57547e84f410d2d725c1a6f1d65d9349dbc719649b54c1f9d492b06493d0c0e824f084171c607e
 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 4276833aa200..ada7eb76d176 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 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-libs/gtkhotkey/Manifest b/x11-libs/gtkhotkey/Manifest
deleted file mode 100644
index cb294b41b50a..000000000000
--- a/x11-libs/gtkhotkey/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX gtkhotkey-0.2.1-glibheaders.patch 726 BLAKE2B 53e4bc2502e6d8dc936bc201335a54a06160d03063a57b27c18800e05cdd2a7b84508b22f7239a26b59ad60fff7f0c1905a8d0de799d580b10ababc0046c5f48 SHA512 32ed2b19a0f61edb877c70353abfd3817c3ca59010efbce6ea7d4332455e0468d527fdb5c8e749d8e6240723063dcff27b5c2589290e40fa08b0f00e0db189d5
-DIST gtkhotkey-0.2.1.tar.gz 382043 BLAKE2B 05ed162cc1eec7e6c981e796a5dca125e5c940c38ed79d67699d7194fce0c77489f3aae9747ae8610c14417b9871859cb5024990f6adb3524e6e14265603a07b SHA512 7f7e1b9bd94ff806d98277f2dafbf5b6569efdc6f0367a83e885d38584a8f6e098f31d0f03b080f2ca76394eb73e43f9da07e0d944a2e6443a55d9f2e8fee324
-EBUILD gtkhotkey-0.2.1-r1.ebuild 1041 BLAKE2B cf88b914f0091229140f3fdc6fcd5f203400111fabc132eb4c1f16d19fb22335c723616787f68ec3268efaafb9d1a5e62c04fd96e1441a8d8e24a6a56cf28682 SHA512 66ae720ee97835b629692ecb52b6f2bf8a864d2a71e707758bcd6e54591a6f00ec68a68596914ebe7285d3232531f9d747ab39f0dcfa74fa6b0ca508a7356240
-MISC metadata.xml 244 BLAKE2B cd13229535e9e125ecc3f936c85809a9eaf68cd4af4700c9fe06202625ee69f862708fc27bb0623e54b8958610b0fed734a10257ff7d04bbced67aaf1a338044 SHA512 6fe538123e95fd8536bc8965f2f8316828a399536618130db5b27f08add330a0bdef412e1f5ac8360df5c7bd8df56789e716d6d1d8cfd7b31f8c5e126f64f391
diff --git a/x11-libs/gtkhotkey/files/gtkhotkey-0.2.1-glibheaders.patch b/x11-libs/gtkhotkey/files/gtkhotkey-0.2.1-glibheaders.patch
deleted file mode 100644
index 389db601c43f..000000000000
--- a/x11-libs/gtkhotkey/files/gtkhotkey-0.2.1-glibheaders.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -Nurp gtkhotkey-0.2.1/src/gtk-hotkey-error.h gtkhotkey-0.2.1_patched//src/gtk-hotkey-error.h
---- gtkhotkey-0.2.1/src/gtk-hotkey-error.h	2009-09-03 22:52:49.000000000 +0200
-+++ gtkhotkey-0.2.1_patched//src/gtk-hotkey-error.h	2012-02-19 12:04:19.483701649 +0100
-@@ -23,7 +23,7 @@
- #ifndef __GTK_HOTKEY_ERROR_H__
- #define __GTK_HOTKEY_ERROR_H__
- 
--#include <glib/gquark.h>
-+#include <glib.h>
- 
- G_BEGIN_DECLS
- 
---- gtkhotkey-0.2.1/src/x11/tomboykeybinder.h	2009-09-03 22:52:49.000000000 +0200
-+++ gtkhotkey-0.2.1-r1/src/x11/tomboykeybinder.h	2012-02-19 21:40:09.004325272 +0100
-@@ -2,7 +2,7 @@
- #ifndef __TOMBOY_KEY_BINDER_H__
- #define __TOMBOY_KEY_BINDER_H__
- 
--#include <glib/gtypes.h>
-+#include <glib.h>
- 
- G_BEGIN_DECLS
diff --git a/x11-libs/gtkhotkey/gtkhotkey-0.2.1-r1.ebuild b/x11-libs/gtkhotkey/gtkhotkey-0.2.1-r1.ebuild
deleted file mode 100644
index 3470b1d217a0..000000000000
--- a/x11-libs/gtkhotkey/gtkhotkey-0.2.1-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit versionator
-
-MY_CRV=$(get_version_component_range 1-2)
-
-RESTRICT="test"
-# Tests try to access live filesystem
-# See https://bugs.gentoo.org/show_bug.cgi?id=259052#c3
-
-DESCRIPTION="Cross platform library for using desktop wide hotkeys"
-HOMEPAGE="https://launchpad.net/gtkhotkey"
-SRC_URI="https://launchpad.net/${PN}/${MY_CRV}/${PV}/+download/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="static-libs"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.16
-	>=x11-libs/gtk+-2.12:2
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	virtual/libintl
-"
-DEPEND="
-	${COMMON_DEPEND}
-	virtual/pkgconfig
-	>=dev-util/intltool-0.35.0
-	sys-devel/gettext
-"
-
-PATCHES=( "${FILESDIR}/${P}-glibheaders.patch" )
-
-src_prepare() {
-	default
-	sed -i -e "s: install-gtkhotkeydocDATA ::" Makefile.in || die
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog NEWS README
-}
diff --git a/x11-libs/gtkhotkey/metadata.xml b/x11-libs/gtkhotkey/metadata.xml
deleted file mode 100644
index 67a70ede9b49..000000000000
--- a/x11-libs/gtkhotkey/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="launchpad">gtkhotkey</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/x11-libs/gtksourceview/Manifest b/x11-libs/gtksourceview/Manifest
index fe9a3026fe64..45c06833ffaf 100644
--- a/x11-libs/gtksourceview/Manifest
+++ b/x11-libs/gtksourceview/Manifest
@@ -3,7 +3,7 @@ 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 1371 BLAKE2B 07d773c8d95b87d929fc337d131d3c334a7063be8fd0af0d83631e02e14357aa3f57773f72f86c38b296e73fa8cc91b7d5e873e20041938cd5a214180bad921e SHA512 b4fb25286017d10ed43035293ed1bc7bd5e89b13ed411d3b3d22cfdc551dc2447c0ef21dc0efaf7c3ecb21b1a69c7d9f5dc9f15b78c358005f17987085f6b04f
-EBUILD gtksourceview-3.24.11.ebuild 1296 BLAKE2B 736ad7b853854ea395d1c57603c0ee8073b5a9c110fd9beb6234053c6109a8602575f5ea1b24a1d5eeb49093e495de849961f3296ca75369033ceb986a7407ea SHA512 083563db470de759fcb8a2e439ff54fe140222d721cdaa8d265d07c4a7df3a5bd1b4e7be594a30f14dd23d6a906c96a1f267213a49dd788ab81978bf53c4c5f1
-EBUILD gtksourceview-4.2.0.ebuild 1643 BLAKE2B b9830dd27e1a6b4bc713e9b0a4dff9f2bf7af6b3e034184b0eaee3a4db71c27182996b4d11f49c88cfd1d90ce4e7aef74a7e814cbaed8c6ae034340597004c3f SHA512 685641cb585b5eb62e555f104392b5951151c15422a49d066dae99086be92da62a0d0a7e868f357d48217e2184fcad096874b540d50eacdd063d61e6cebff963
+EBUILD gtksourceview-2.10.5-r3.ebuild 1349 BLAKE2B 8b14830933232b109206737f8eba31e6f11da41bfa548f14e21be2c2601a6a389b8eed33d34295107b6c3c4130d9a8425dfdb17960eab448df6cf2074fe1d2c7 SHA512 be97db9977bc8d76c5a4bf4f54159e3655bbbac0292047f5326132ffdbb05eade8d0620460bfeba96ba0f270ee7311f7d07c7476dd66eb4b08ff5fe95a24bad5
+EBUILD gtksourceview-3.24.11.ebuild 1274 BLAKE2B 3bdcf062591c4dc9e4155fb61691112347eb9d6dda047429bdc6891c3c427ddadb7390c4737ea1043f72183b9784f88d550ccd11378c1f7b1ff0ece41affe773 SHA512 d555b4b38474549935cab8dcfdeafc5ff6bc4a1a5708d3434586754e48575059f550f906578f9fada3d1c2c4ad19f334f3ebd600c4632fc8a1a04f6a8c85360b
+EBUILD gtksourceview-4.2.0.ebuild 1621 BLAKE2B 4e879c5489dcc9f8a5cde9b8a643dafabb323078fb8638834314aba639387caeb300287b0628a337351a0aea50a7aee2d0ec2beea30b160b009c0926df7ef73c SHA512 08749b912fc7850e370f61e17c25375c0f07fd57931759dcc3187f19eadb536614218ee5502ae83c856fa81465a42b075c50dadaf82591e80391ddb25ec2cec0
 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 d21a6d5a14d9..da35f28e5a6c 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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh 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 56272d5b1ce7..653d1abc6be7 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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ia64 ~mips ppc ppc64 ~sh 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 3fab679122c3..3f3ddb9091ef 100644
--- a/x11-libs/gtksourceview/gtksourceview-4.2.0.ebuild
+++ b/x11-libs/gtksourceview/gtksourceview-4.2.0.ebuild
@@ -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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.48:2
diff --git a/x11-libs/libFS/Manifest b/x11-libs/libFS/Manifest
index 6bf68ac899bb..b8dc6b02da5d 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 381 BLAKE2B e0373f04e00d65782d78d03284b1321991d6890e7265778244eeef520722c8afedacf1dac9ec6c9ec2b2e047f9313fb3fa4a4acad688dc7a2c14f7702f8189ff SHA512 2ad8811e1697b11ade5f7170715bf14ca77723bc6e2712de59c3075336457dc8249a3388b8d3b82a487c6a6b3c2159ccaacad5cc1d1965c87f92d14e868baa15
+EBUILD libFS-1.0.8.ebuild 371 BLAKE2B 8401cbbde61fddcacdb0c4c62baff4f75ec25ef9f05492d93c8b9aafe37d00d17dfd49742588bfd6d6227c5cc2059f66f4b42c14f0936b4f32db27de8d2c4877 SHA512 30a0005a00daaf9350546dfee710ee378b4c60609dffb9fc44d44fde4a113cd236ca0b6765b4f6cfc0ba86ff50d5f57d383b0449688d6734e8e19a9998c8ce91
 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 7819d9723554..62c6bf145846 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 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="ipv6"
 
 DEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libICE/Manifest b/x11-libs/libICE/Manifest
index 2ddb264b1848..d98d78557f41 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 676 BLAKE2B 3ebb3ef058bddb198651303192dcfc4646b4b1330040dc4db194d01b89130c79bca9f5c845dfd6628befd4783ec306c34f61a3ded204ead673a45d7c8175452d SHA512 78e0339a1f6f9afa9148cf85bba713c162c0ef0ae5e9244c82509efe2ee9d5debc0a7ada91fd174fb3782da70609e7a52228c8939da70b2c6163b13042081f87
+EBUILD libICE-1.0.10.ebuild 654 BLAKE2B c03a31522f2a361a37c64d686f162cbfdf1836d23cd8cc237cc31a1a59a259ebcdc66ef6cd73858e031665dd60872c0ca30996c89571a69109e9025ef788dc2a SHA512 f40c8f6d0630c572f8952fa0ca691ddde6860f2878ed108e5375709e6e3db61941d86f7327a2e2029da74b13e3a3b0be99c10acdf87959e467ed60732217f935
 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 5761add9e76c..47e970987211 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-fbsd ~x86-fbsd ~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 ~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"
 IUSE="ipv6"
 
 DEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libSM/Manifest b/x11-libs/libSM/Manifest
index b67dd39dd521..92ea333be714 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 1725 BLAKE2B 010e36b05d3573ab01dfc5648cafdfabc845c21e0a7267d5fd79de35c90ff290da794081305c3950307537cb6b565f8114a7da6f5bc606d46c49a88dbfa7d5eb SHA512 97090183d48cf4e34cdd9f0b5ab4966a1e068fb8899dd6d77cda56a6e95df55d4ddb5d11dfa4a64942d960287275d0be899416ffbe4c53e491a7c5a8bc4002c0
+EBUILD libSM-1.2.3.ebuild 1703 BLAKE2B 5a0a97fdeb971b6c6d18d6cc0e78f12aeaf55ee481b86373aa5f384f31f0d03a3d33c3afdbd1d73e10266167cd6743d4d42117a28371da0684304410bac6d4d4 SHA512 a6bfaad918d9d8175e357c3c2f1c6d7ee66f8e60f2b6159e6d45f9dacfe3ee38524cc8281bdda69511620f0efeeeeed81b100cac4e68fd33bd3b0694d828b936
 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 5ad07e3996c4..1db39ba474e9 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-fbsd ~x86-fbsd ~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 ~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"
 IUSE="doc ipv6 +uuid"
 
 RDEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libX11/Manifest b/x11-libs/libX11/Manifest
index 11ecd6942f6b..db95d9f266ae 100644
--- a/x11-libs/libX11/Manifest
+++ b/x11-libs/libX11/Manifest
@@ -1,3 +1,5 @@
 DIST libX11-1.6.8.tar.bz2 2395911 BLAKE2B 50f8871d7ff2aee14767085a6cf78e9f6e2b01c5143227089590c86db8006836432cb051d6259893850d78d2daea3332a26885a34f07989b869c14b8ddeefa28 SHA512 1de8e0ec466308bc48946d1ce7a7dc6bd3120b1b365cd01afd1bd51dd7369e3d1870dd379b0b7c5b07699095d59761bd23e2e02ab60929de32c39b6885016e76
-EBUILD libX11-1.6.8.ebuild 660 BLAKE2B c7aeec4439b9e54ee7ac99849c2337cabf7b2ce8b83738f6925b22c3f98e3d7b33af0ea883c337302743204a8d3198837530a72e6858d2482356f33627c36a9a SHA512 078bf5aa6955f5e10be5ef7bd86ba87dd0c6cc23c02358e9ff8705f2f56e05571dc79ba154f350b13a614793c7a4dcde4ae4754d7226de5b840d5a4a2126d4ab
+DIST libX11-1.6.9.tar.bz2 2283814 BLAKE2B 00fb965b9cd19bde79c4e598c677d21058c85a8ac37d9addab7fb0b2faf67e3d65b91e1864bcd7180e5fd8b0ab7ec3cf68ae7f95ac8e82a049529b5a139b43bd SHA512 fc18f0dc17ade1fc37402179f52e1f2b9c7b7d3a1a9590fea13046eb0c5193b4796289431cd99388eac01e8e59de77db45d2c9675d4f05ef8cf3ba6382c3dd31
+EBUILD libX11-1.6.8.ebuild 638 BLAKE2B df0bca68761f8a528cd02f5f3bfb0a302ac86527eff19302dc2272c1417a72da78de5ca2a4deef04e5dfc96b6722bae58c6209be305e67b098857ee00a34f8c5 SHA512 810880c3051469e8a2a0b172523db120036bccb7130ba774bf01c81410c19fc5ea27786d52f53492a9777074a29dd14431e7e2d897d67584fa67b41608ca840a
+EBUILD libX11-1.6.9.ebuild 679 BLAKE2B 76913392bde18272f013d7a2b8592c2f4f5783533c855f21873e52de2471cb65979baff576d869a48700dd6c1e713af708753539efcc637ed1567cb1511afe51 SHA512 a3c65e76bce76c8c77ade297ea3c8bdbc7a0a9e3a6cfdfc7d98e02b95f0c6594cb35f01f616e01eb436a300166bf06b1c029b0bfd7d79a7a5793048f4953432f
 MISC metadata.xml 311 BLAKE2B 1e5deaa311245a5794e72574f94028f60c1c712a06820551cae811b113d633816a60fd3920ff5f2ca287558dbcff28e57537d5c0d3ee3a325c7540bc0b98da13 SHA512 760d09a1ed93bf16d8e26a70fa1178c02c6b336dff9aa29f900d5eff305686b9c3fae4bc93bcce58c0427f567d3759dd3a8adcd8707d07fdd90c6db79d4e13f2
diff --git a/x11-libs/libX11/libX11-1.6.8.ebuild b/x11-libs/libX11/libX11-1.6.8.ebuild
index 378e2f72aa92..5eeda9313350 100644
--- a/x11-libs/libX11/libX11-1.6.8.ebuild
+++ b/x11-libs/libX11/libX11-1.6.8.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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+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"
 IUSE="ipv6 test"
 
 RDEPEND=">=x11-libs/libxcb-1.11.1[${MULTILIB_USEDEP}]"
diff --git a/x11-libs/libX11/libX11-1.6.9.ebuild b/x11-libs/libX11/libX11-1.6.9.ebuild
new file mode 100644
index 000000000000..ed1704469e0a
--- /dev/null
+++ b/x11-libs/libX11/libX11-1.6.9.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+XORG_DOC=doc
+XORG_MULTILIB=yes
+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"
+IUSE="ipv6 test"
+
+RDEPEND=">=x11-libs/libxcb-1.11.1[${MULTILIB_USEDEP}]
+	!<x11-base/xorg-proto-2019.2"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+	x11-libs/xtrans"
+BDEPEND="test? ( dev-lang/perl )"
+
+pkg_setup() {
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_with doc xmlto)
+		$(use_enable doc specs)
+		$(use_enable ipv6)
+		--without-fop
+	)
+}
diff --git a/x11-libs/libXScrnSaver/Manifest b/x11-libs/libXScrnSaver/Manifest
index 16f3e4c00d37..54fb3b78cbb5 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 519 BLAKE2B 49a00aa1c338009dccc855af237a2e0658dadcdc00fc375f949f5a71aec5ff7c6a37bc6408948fd815e3d87de6f2487b357bb6ff6c1fffb8ef6a8c02014f9116 SHA512 cd030b9805ae990e7ce69cd3334808517473618fe8a82e3260e10dddaf00ece2bb7e54d9de5eb0d2b76b4ed70c923430f4472ff6a8989904d32ad07894d21674
+EBUILD libXScrnSaver-1.2.3.ebuild 497 BLAKE2B 382b856888c59b8d4029ccb7de27e1ac46a85d914e328b43a744f1e7712f8108a29662f852faa824f3c88cf8695f34a791897e7d3c5240e7debeb39727ffbec9 SHA512 3dd180984cc19284976d7d028ddf8e8a4642d1b0a050409c543e7857c7c2182ecc9a47a3e548aba21180bb1db3824a88e9edeaf49b18cf4baf2a52ff3da5c6c3
 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 d02df00cc4cb..fbbabb0bee82 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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+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"
 IUSE=""
 
 RDEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libXau/Manifest b/x11-libs/libXau/Manifest
index 2ff69f5aeb8b..f4fcb3ef0553 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 498 BLAKE2B 4ee28ae4bb164bf96a6ba1df4944d20def17b6868839a7f1a22c6d8e94e08420c0fd10319e70142ca730615112b670d496bb4deea7d3e52fdce2b5e9db292984 SHA512 288ae86b0ec8f207b41cd7c80ce21404d3a319cec9431a5c1390338b9cd66fd9060f33c3d4e488cb199649a5a0054763eed774b7eb187bccb913b86508ac13f2
+EBUILD libXau-1.0.9.ebuild 476 BLAKE2B f03018bd70547244bd8d9965e0aabf152d4279602859cb24142e74e218a91eba9e992dc7e5567543face539c50f46c3d2c4987a47386639c57d65af376e0cbfd SHA512 0aa2b394708403676bb3f0e8c3f37480c16b9d109835e3c3f89fee814e5ebd3ff7503090577c4fd6966d9b895db54704c9e505c8ba1d5be3034f4174593645f9
 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 863ed99c4dcb..38d1b195d2d9 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-fbsd ~x86-fbsd ~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 ~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"
 IUSE=""
 
 RDEPEND="x11-base/xorg-proto"
diff --git a/x11-libs/libXaw/Manifest b/x11-libs/libXaw/Manifest
index 01be39de9091..6af78966f976 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 900 BLAKE2B 46876d283e52e4c947a45f531f24caaf4de66b0d2bc084a1914025e92ff56e557faee1db00952288c72cff36509c92193f87bc3274361da11aa8b7f506feeb52 SHA512 3a92af3fb912ea4e2254d8283720ef974fedaf3496b552631aa46e6b65eda08ceb7d34c93976b069639fe86a5f02096032427add5168ff5ef7768f09aca92f93
+EBUILD libXaw-1.0.13-r1.ebuild 878 BLAKE2B 157eb7e67abf02b6f1ea32b65159f562922bff864a4ff2228e0fbacd8264d8ccd9e348ce72da7ddc7cc67dd89908d958e20ef170b94e8971d2bf35c03101f1b5 SHA512 c58a45627577712cb696fbcdfd920780737d90b446c47c862d4d551dba721487d5c719ac45063b1837f034a73dab844b7e104f65a6b35f49a3c1d4107f9b5b21
 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 170868ae3bc8..4fd09c43a820 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-fbsd ~x86-fbsd ~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 ~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"
 IUSE="deprecated"
 
 RDEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libXaw3d/Manifest b/x11-libs/libXaw3d/Manifest
index dcc3cf18c6ac..87d98d30b50c 100644
--- a/x11-libs/libXaw3d/Manifest
+++ b/x11-libs/libXaw3d/Manifest
@@ -1,3 +1,3 @@
 DIST libXaw3d-1.6.3.tar.bz2 561594 BLAKE2B 85f3fb6d39a9a0ccb7d2c529eff84a4a9e85bf81be16487f2119da0a670e40c2d328e17b06ca237f69029e8d43daf6eeba8488029e6e4d2f56bc1093a2f305ad SHA512 f79f997ff8442563c74f38c7d76fab2c9253691743ca3143047ce698adb4c126d02dc968be7bdc79ab3052b785fd705375d2f01171e3a3266736beb531c91424
-EBUILD libXaw3d-1.6.3.ebuild 737 BLAKE2B adab85c75d00f6cb6c54cbce1898570aed72eb324195de3f8da7cc18cc09fb8cee8d7bbe37a5348631ce9cfdc39529483139632890a3e07e2c44f1c4dba0477a SHA512 ba1e3e2507b915828d8431b57bbbf020cc831b5ad4135448f26327515e8007c828b9b6f1e58202b408e15b667898c25c580b489b2bbee72d1f385d000503a530
+EBUILD libXaw3d-1.6.3.ebuild 715 BLAKE2B d12f7463a5cc2959cc1c54b851f55ada643e19b4ec64727f7c38ec1f170b5ac7d4b165b7129535419f26b1074436a74daf09110932fb6b33c7a04b75d92e58d6 SHA512 640876c75508682a030e7a256cc2044ad4eb2632c9219c0713fb33152be7fe22c7f297d7ff9dda74c82ae0c393f3c4f51f2fe9b6bfa779d8049eee5617f998b9
 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 7b0215fa2e7c..aabaaa038943 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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+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"
 IUSE="unicode xpm"
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-libs/libXcomposite/Manifest b/x11-libs/libXcomposite/Manifest
index a502f6e61225..18ab7458573e 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 628 BLAKE2B a417fb43f8d6eede8361bfbf88e065402663aaa2836dfca8bd5b9c3805da700a651a28befbdbd7c996d5260393ea4691c05f0b924ae94ffc312e755bcd740083 SHA512 fcc8f991b331d81d8db2985509d8029cf9411fc9cb2e03cc5e0d0594a72127a96bc2b0fec48e632449c4c1b2c5db2b05d24c991058c8a1d699e1b141387fe848
+EBUILD libXcomposite-0.4.5.ebuild 606 BLAKE2B c398a3eceeddde9bd17d37cf3ca351e1b8192d8d94fe3ebef42e1fcadd5c4788ccad2b1c4f58219c1a18b4dfef83456fe3f0df045c845c54814196d88f23b403 SHA512 b27a35074ca94cec065b7bb3242f3e83964125cbe0da90d89a47292f4f9b2da0905b2970892e0cc2eab94c2eb167f524d81ec2a6c522746c29ede50149d56371
 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 aaf238779f56..9f7608cbf871 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-fbsd ~x86-fbsd ~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 ~sh 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 c95f14639c42..bba7d4bbd5d7 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 896 BLAKE2B 400b1592d19bae78c3a4915eec58b4d71ad1eb3b8776bae8f8054ae6bee251d8285019078c9877de893d288bd252ce1e83de2d81d31320828b8438e4f80da80a SHA512 af4d507bd55ac530e06683727cfb3cc0ff5467868237420976953dca810f820bb486c7af53e16a28ddf036e3947c408b3663bb2b8bb0e841ce1ced8348eac360
+EBUILD libXcursor-1.2.0.ebuild 874 BLAKE2B b3c9e7cb8662e1930f7495334e9ab219b9692f40433bd0c89c2e659e5247cc2327c9b741aa4f2e37051a1efb426e30c3c6eb6f55eaef7c13c7ec593537498d2f SHA512 1db6e888b5f1f31b3b11822e8d3ef6a50ae5e10d980ed6632877054393fddc76e3180aa8675ffca897f6b1eed606a06e87628f54046c9b13c5352feff1014766
 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 0b21cf280e71..eca02e82efb7 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-fbsd ~x86-fbsd ~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 ~sh 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 84445cc0f1dc..dbff90064304 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 536 BLAKE2B 4031fa1ac1252fa8d1cdc5a430e20836d5ef4b99c2452aa2c54747b5e8fc7eb6fbbc0d6522c075866c7732b9c92fc3a4def62a427ee3d252bce2e7a7a6c7202f SHA512 72f3a59f31c8f0aed54a7f989cceb2dae8cd2af4309e94ea9fc2ce93e466a5cab4e1e10cf1e757249f01f12fc5a441866ddfe21106c57e8f6c68cca8c84240c2
+EBUILD libXdamage-1.1.5.ebuild 514 BLAKE2B 809e17790903bc8d852198ffe50af32729d1a2b8e8b83d653d52668259b973ab94c81b9ed5e443b0a5f6c6253c5af1b29694dfb6e34fd91e9c5dfb9f859875fb SHA512 e5183027bdb62dd79cab3e13ce70b301c7d2e470e9fd5168c8b5dea3127cecf3a5ab9b6ffd4ac9350747a909be37760a2fe39e3b34cfb28514675e4c957744e2
 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 d3d80e924f66..a673bbaaf66f 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-fbsd ~x86-fbsd ~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 ~sh 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 935094cc3a0e..b992fd3c372a 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 675 BLAKE2B 64beb2c9eac2c56d2c65ff231605535778313158bb2f4426957abf8dfb500894217e243bae1f80c4ef1b6b981c7647e8a20aad603c77ebddb680bb8bd4e8bb7c SHA512 524693085023b54c098eb4cdd0757d8f7a49ccc42f208c08b32bbfab4684e4835d7b9a5bd835e6f29b61495dd2e5d4c28dfc840567eaf6c6df8459ad606130e2
+EBUILD libXdmcp-1.1.3.ebuild 653 BLAKE2B feb686981ae005f002150ed607a799d02f7427ed49f5ccf71d3d048f0204580a64ba5c2f1c7378cdd5ccc7b390145821f52faffbef7bd345e036737d89394e80 SHA512 56382770511b1554f469fcefeb76044fa4261c2214377d8b6086f964325c871c318de8d466041ea342a0640a7360408ae389630f5309fb74a79f9b37884a568c
 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 b6a22aa7caea..feea6fc3056f 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-fbsd ~x86-fbsd ~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 ~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"
 IUSE=""
 
 RDEPEND="elibc_glibc? ( dev-libs/libbsd )"
diff --git a/x11-libs/libXext/Manifest b/x11-libs/libXext/Manifest
index f1f95c03a248..b4e4768a8679 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 659 BLAKE2B e08f2a526ba833a79415be2facee790fc1ccf4c89601d724cf1391614918816b89a0f600fb87468502d8cd6f52281022d414c7e832ea997a14d6aedd7eec0abf SHA512 f712bdeb57b55f55a2d7571fb224e8ddc6332f1e3fa9492bdcfcdd99031fd19a841bb9155c963b885f5ad870f2591d7ad7c464bb7e3d66f52f9a7c75ff6fc488
+EBUILD libXext-1.3.4.ebuild 637 BLAKE2B 238f5f998fe88f1615af50389659d699ba13d878d314ad92a79c381f7458729050f71ab0bb86d6df3d7d12e80bb36d36a8ddae936e4cc120b027b8544c70f337 SHA512 b4c5abcea77d442b9f1c748135924f7a60cccb6fc2e56dab01fd51c0c792134b5d8f37121ea7c640161222aa548323574dbd567558c51935f2002408a3cd1425
 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 b62c20f07a81..d2ac43ade890 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-fbsd ~x86-fbsd ~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 ~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"
 IUSE=""
 
 RDEPEND=">=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]"
diff --git a/x11-libs/libXfixes/Manifest b/x11-libs/libXfixes/Manifest
index 823ee2cfa61e..b148cfcf9aaa 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 516 BLAKE2B aad2b5acf849cdb8ad64457d444bf73440a22f18e2f56a63f05c1524ca04601707efb29bb28f215a5fe91ca29dc5a363490ef0ef8063d67f1a00aa600e730fd6 SHA512 047b79695ac40f474e944a4a44f439a79827e87782196b81efb31fe27632843410eda151ce99eb676a543e7547338f9829e0f5e25a94ed3167a978217c59f383
+EBUILD libXfixes-5.0.3-r1.ebuild 494 BLAKE2B fb602d080370e12c5cc5392b418b3a685026e9e93937bb73bdce8a5dcf855c519ff984a8b55b8bdce09db3e2b4a5f5faff0d5056e547015a821766c30784906e SHA512 06cb87fe042c9eeb7ee4947be584bfb55ef16670438ede4d7bc886b097f37d5986474add14d60ee5217f565f56fac86e1e219690b62b86e7e5078f32e40057c0
 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 e92d14351fc0..32fcc3a3fb09 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-fbsd ~x86-fbsd ~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 ~sh 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 a2cd8a89f31a..05d1352554c1 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 812 BLAKE2B 082bbce5ba1522b37274bea9cfab1ca10ea2404eaf558dd0af1b2d4af26031f6298da7fad30e848444570532784840cd4ab588ddff7267dceeaaa895b71c15af SHA512 70ac8fd02e436ba094e736f431178f531613498c7b14c2d6c6c9317a512404e3db3287112558b14866ad2826fce2e939726f37bef3c7d95663061e1a132a660c
+EBUILD libXfont2-2.0.4.ebuild 790 BLAKE2B e56788317bf0f2bc194fcdaec45802dffe634870bd3e89036681cdb42ffc5b857191b161642906dd13b11f95ef1e31ec501edbe3cf99af66de2c229d424a9d4b SHA512 ddc53ce64b915a5ddb931a96dfb3118f39c63e324626e9b65d4cc4e4a4406358a7bf97cc4def266613a6f07326d334005895e5f22c9501b5d24ff4457517d964
 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 659a660a9649..84f1af84a080 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-fbsd ~x86-fbsd ~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 ~sh 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 d4b2169928d7..1fc8d715982c 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 731 BLAKE2B 3484e5bc2936d6c1c83ef25f6475b461670cb633e7d995d8a23389508ec5fe928e23af9e430b7de38192193b6ff4dc6e8a162c03a04117df15f343306cc64f32 SHA512 731f8ec97925a4a60537724856f20fee621221623726b8625e15e539d22d60914911a4dc7373d26f74099e45f4b8b45e7605eaf0693394f4171ecef7401813de
+EBUILD libXft-2.3.3.ebuild 709 BLAKE2B 161cb32f9e2216f55e836404bfce01cbe8d58fbc8d4dacaf911c7ffaa1efb658f0c26ea95fde4439f7035790d04ed63549bdd7cfecc2787c9f5bc4abab4fa9ea SHA512 74dd85d1c9bf2f3549e7fc4f3a4d61d7e6f8a3d05bf88106618c401f1fcc582500b0ad9659c742b2927084eb7711e236fd5cce1cc6773027cc5028f22f592f0f
 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 88f315e0188b..c09a279c8c86 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-fbsd ~x86-fbsd ~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 ~sh 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 5f63bd36a246..2ea2fcaa579d 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 756 BLAKE2B 221fa1dd86c5f5f9e26bedb093b393017913d7b9ca2824624091c77bb19a47380fe4e3db4fe57d3b9acde5f1f64d35ec30995e31a83a026e7c1f5dcde2fcd940 SHA512 bd7aec0591e9b994a4fe4f7b7e25684385028fce8857f01b5a4b0877f94daabfb4495bb6758dad9c4d7b34d0e53edd77c91968b7ec11465e0c7bf520bf1b661f
+EBUILD libXi-1.7.10.ebuild 734 BLAKE2B b9a3d005387c6c9982c4615fcdf699f91217025b14f1b700db9db6d2d8a6e0fb6ba089014da5a9063d3eae8153dab1285e116525501618299d68a345128b88f7 SHA512 d3ea43bcf6bbc0ccd273831298989978ed31564d9fced1015ff25cdde476f39918895658858f1d45cad214188d43870a1cd8995ab1782c57de3da442c7ecb588
 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 1d09b6065486..cf71dd8e561c 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-fbsd ~x86-fbsd ~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 ~sh 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 9df3b304d4fd..5449602413e0 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 522 BLAKE2B bf47782397bea59987b5afd2aef56cf216a42d9fd4d37745abf8d2dbe6d36d69683ce1ea947b2cef2be5166aca38b59352310af1a6c8ef919506761d9b66ada6 SHA512 70fed838a6e462caab62f0979fc96fe6711dbad76a7d8586ebfe97cda94f6828cb2fccca6634d378f15298077ec8dd995b214cd1013866308a05b402b9cad352
+EBUILD libXinerama-1.1.4.ebuild 500 BLAKE2B f30eb62a57e56c0f45d36e3ad1184b5532f26e5b72fa18aa0626adb2b175f625a17d788badafc3698a115ec2650337f810dfc9bad8045e9501470a5e81aa0d43 SHA512 5908aef4e02a7ff3fd87d91918320106f10489ff09250bc820e5bea938180ee24433ea5da6a4b043403b7b0c91ed17678c06b563f7fa104c08d4f98261926730
 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 0dbff84a96e4..d368d6b710c2 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-fbsd ~x86-fbsd ~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 ~sh 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 6aa39f394ff0..067feaf4f132 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 761 BLAKE2B c7d65fcde0fb76ef89c266f95855414910d5d49ee03c99f9e81c3463a700b78519b48fd9889d84926ea33707433214cb3ebe3808eebcbac7fb925b97fcd3fcaf SHA512 3f0b8715a9f53e9c370dda939800f9d644bac2c825756737f96c654f9daef893acadd25ee6c504c66c0dca7acfcda7068472029f82a18601a0d7358b5a88be62
+EBUILD libXmu-1.1.3.ebuild 739 BLAKE2B edc3979bc95b54ba7d500b088e9e371bb02e08910cbc0a8687356281b4cbab52d328f4328361d712ccbb6ed8686b0a989c5a453ab1bbad5831878e7c444f2240 SHA512 516fa2f5b3e6582db9c812b4ede72ca5cccb6726bb8f27d5eab87e7b2e2a82b77052c50ef88dc93d658f60c8ac8c61cfb64a40c6ca4eb0372a8ea1cb5070afbd
 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 982da180edbe..299a6267c679 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-fbsd ~x86-fbsd ~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 ~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"
 IUSE="ipv6"
 
 RDEPEND="
diff --git a/x11-libs/libXpm/Manifest b/x11-libs/libXpm/Manifest
index e7b630a8dd20..ca6eb430ea1c 100644
--- a/x11-libs/libXpm/Manifest
+++ b/x11-libs/libXpm/Manifest
@@ -1,3 +1,3 @@
 DIST libXpm-3.5.12.tar.bz2 430736 BLAKE2B 738838f37643e4e8ce489d34adf33d2459e7bcd7b1eafb21415cd44620c3d4eb18750381a80d1e2c9a2f44ccf00159a029df18164ea7a7834dfee8d104303783 SHA512 a5707d5f758d577414101b0723af334fc8ac223e5b9f869994765735e1cbd8dafed48ea2851ebc479fecaf84381bfd5fbef842ec971a487f7fa9e77d54d3a17e
-EBUILD libXpm-3.5.12-r1.ebuild 931 BLAKE2B 05254bd4eff6d5f5b16c224f92c9a7271a7fb8933918be34741095ccfa26e4e098eb56129dbd4d8b809873d26887a15739e5805ef3b4b7921cc90319db0a5b67 SHA512 b7a353456b9b03cb3d575c6a442ebb19b5c28a31a750da5d0cb949f5dee0fb6d1632463f3ddc65b8bf2d1abb92e52d0db173163c7f4e34728820853f15d7e471
+EBUILD libXpm-3.5.12-r1.ebuild 909 BLAKE2B a0d4a798ade6ef57afda0b10910ef82429c4c0b33d4183901107830a64aa2c4e560931d719953a76ee608d7a7f060c846c2f1d034850b209f5c130120326bd78 SHA512 8c69439be41fe1dcf9ddaac7e7ab67e8d039e28d28dae97a65c3c3e33d07ae104a739fef50ccc603df51c1f7b4744c918e74e287e054356e4cd711a77e79b7f6
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXpm/libXpm-3.5.12-r1.ebuild b/x11-libs/libXpm/libXpm-3.5.12-r1.ebuild
index 9761493ffd88..84d3cc4c7584 100644
--- a/x11-libs/libXpm/libXpm-3.5.12-r1.ebuild
+++ b/x11-libs/libXpm/libXpm-3.5.12-r1.ebuild
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Xpm library"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 ~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"
 IUSE=""
 
 RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
diff --git a/x11-libs/libXpresent/Manifest b/x11-libs/libXpresent/Manifest
index afade4985452..a7356eb532c4 100644
--- a/x11-libs/libXpresent/Manifest
+++ b/x11-libs/libXpresent/Manifest
@@ -1,4 +1,4 @@
 AUX libXpresent-1.0.0-add-depends-to-pkgconfig.patch 1021 BLAKE2B c7fd8665f66cffbf33ccbf010d0517c9b697f576fbafd55c57aa2263ca93ad748c8d36c93834323ff9a78b1352b9003ba4b96c3a8b3f4acafae744b7e025bc9c SHA512 fbcbc0a5839a2b1976aad4edf318fa3b47868763d5262ef8537ed6dccf911a2f9fad2b2182a90b4be578eb8850fe29403cbd52cc29ee8f0f09f9c85a7883a9c4
 DIST libXpresent-1.0.0.tar.bz2 263461 BLAKE2B bc35477c5f0d8bb3403c00650f94a6625994e857f249b24d59e434dbac9696bc4403d14fc82a8aa2f27c3c3c818ebb0665612305873f1ad49bb3bb1e08e7de5a SHA512 e88b4ec4fcbc0417a0cbecc0ecd73f8085c496dc6d1a4902b6550750a69a1cb8bb76c436c7941ee3bf3c61ffc85bbd8f8327fca30f14815dbef1cd53bb8db16b
-EBUILD libXpresent-1.0.0-r1.ebuild 611 BLAKE2B 2b0378181481c64e80c94a1f9b626e6af1cd4f14a99352a5b815c7e1dfbcdba857cba531e1c21145747c98a1c6d595f607719a7ba63bba9b4cc18c03fbb14b16 SHA512 19c44ceab26cb83d3f7aae8472558741201fb3fa6218a857f43af92ff3e7318611814c32795b5f10e6f5f08cfdf8cbfd2d6ddadc16d0e9702c4127cf8ca17d92
+EBUILD libXpresent-1.0.0-r1.ebuild 599 BLAKE2B 2b2ee6a8a49a51b505897e514beda9f034d21b52976cfbcc6c0ed0eeabd9e71996d14d585de36af0b0cf91394014d58de1f70859b221bbe14d6fb028b1a21ff2 SHA512 f9b786f583247fd61e40711ce0753d1ad191449de3a4fe30b34a5b2154fcefb876fd1dd00a22f75cef2856137aa1d53f85a020f3f81f742c6b79121c9f0cdcd8
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXpresent/libXpresent-1.0.0-r1.ebuild b/x11-libs/libXpresent/libXpresent-1.0.0-r1.ebuild
index b78713721bbf..497f8e46a72a 100644
--- a/x11-libs/libXpresent/libXpresent-1.0.0-r1.ebuild
+++ b/x11-libs/libXpresent/libXpresent-1.0.0-r1.ebuild
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="X Present Extension C Library"
 
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-libs/libXrandr/Manifest b/x11-libs/libXrandr/Manifest
index 833235e9cf7b..28669cd13cce 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 613 BLAKE2B 91faa071a40ec67a21b48890ca6166b675cb33c86e5c8d7584e095e1b4f3bb848e271b499291390467f521e92495298072b291c6f41c78cfab3951931c4a6b95 SHA512 b9b61852f94ffe8fecaf20ca292428ff4befd1ad56d9175205ad2dae22268750dab8da0037d5d4604e74f8417d724d035e4d2141cda88220d5f664cd03251826
+EBUILD libXrandr-1.5.2.ebuild 591 BLAKE2B 8aad67498e126699e0a212ef7277bae7ed2ec997cdd3242040c21dac021bdcffbf108eb39cfb2600bee4d1d708eccd1b9d9d4ab75ca27282f1a340c387d71930 SHA512 9073d8055bec4a5b2f2f536e75562f126c00359d293db311d07f19382d65dfe65a50252fed07d32eee173a062e56140339ae53d53a13082747cd5210a4b6a321
 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 8ede69321012..28dd1b0b99de 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-fbsd ~x86-fbsd ~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 ~sh 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 aeb4481579cc..b9d5a7e87e65 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 517 BLAKE2B 66e31a8733e3d621958a051b37d9bcbe4f31e637296367d850cfd83026d033747aa15b106a8e3367db299ccc62fc5921b783c90f7ec7bbbb644284d8016418af SHA512 168e9e019d9f57db160eca03ed5b594b170282801d2a3d7a8542433831faf41cc145eaaa4568ef397a440a69c400ff407caa37dbedea5a31d499889a187ff0b2
+EBUILD libXrender-0.9.10-r1.ebuild 495 BLAKE2B 85e90be294148153614d4bd882240179306a0f23358c3b5237bff5789cc0fd465860e0a46b12caea91032595df1157b3746bd5d2cd0371dba60800a5d5bcf20e SHA512 ef8713fa0b6101a9c2e37be06660d795071defdcf9d564820de3555552c136e5194c5a61d3b82e305159250ba3fa73224e4585b12b58a705e2906e0e3cd545de
 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 b205dec2a0c0..2bc7074a391f 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-fbsd ~x86-fbsd ~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 ~sh 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 74e079c1366c..738fc33dbeef 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 443 BLAKE2B 1a084977455bf1225e85fb71283fa70532bf0011a94b82b3f39f7450d2e6bc3c710be9990f23590ac32a5b114691429ba817df8a45451e9130312208170e9ef9 SHA512 e5659dc724d6f13d1b29c60b868e3dbfb6b40094f0e8334dcaa2d9805fb1e39494443703b17fcddbcbf9a0d5bf50e275f739ea81f08c35c2fa731f82e096cd03
+EBUILD libXres-1.2.0-r1.ebuild 421 BLAKE2B 3acada4d4aa7ca6c4e21fbb847e5fdf66718eb9078c3523cccf4fe4b1fb113fc66ed4a1a43a677de88fe5831ea9a4275cba5423186ca65efc2e404241a44cd1f SHA512 e912090514854f7613c7d564d716f6e5694b7464512cde299066dce8185e57defd671c425639d00c4d922106510892eb18c91f9e8360b23d6aac21b268688532
 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 f943dd0cebcb..b9db64bd2dd7 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-fbsd ~x86-fbsd ~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 ~sh 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 efffc5b9f8c8..a6fb1909104a 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 851 BLAKE2B 2a0fc36cd9a345317d340c91b868cf48adb6785a835e5280c835c64c28ffe215b9a36cfd64da40565f7b34814f60edd40bf4341c2382aaa92796b4c2b1c609e0 SHA512 9f25690a9b29173c7c017f054a55030658bef159c0d712f7ab723e8c2350d914ce25e0bc716e015715044f1240ea4106c60af21a606cc770444d9fa7028efc59
+EBUILD libXt-1.2.0.ebuild 829 BLAKE2B 9fa906da2488b911adf9fb09ebff62eca21da238470b41e8bbf10271c584f73f9253e089cb0d675240044886924adb1e084f14f0bc3dd68630b2589b7e49a5f6 SHA512 e38c49292f2db6629c54c425a38309c22a6e326449b9dfd8b3951748f681e689fda1c94127d313728afe68e312476b5558d1dc1a30073de7de5b3b46b6f3812f
 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 c12e5e220c51..a3031eda5bdc 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-fbsd ~x86-fbsd ~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 ~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"
 IUSE="test"
 
 RDEPEND="
diff --git a/x11-libs/libXtst/Manifest b/x11-libs/libXtst/Manifest
index eb8c31024b9d..e8968f972077 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 659 BLAKE2B 455658fd97fefa61cd992205b6f67f9d88b4df08ad5f3154667f662bb656077306115c21ce6eab696272b8eb4a6b1fef5588448aeecf809536d69b9b3debb1a6 SHA512 eb8ca035527cddae766b4cfdfa3d519d8f79fce112d7aa35e627d3e1d743ac68277f312288928087a25b807b23583a0675a14de40ac6bd8c46769a4fdd20148c
+EBUILD libXtst-1.2.3-r1.ebuild 637 BLAKE2B ebca34347a0f022d7908d499a310eefa1f33158da8b42d639cb15f9dd37d7762df8cfcc4d135fb00940fcb000d81b558c3605fa251f1bcb06ff2b6309227e1da SHA512 f4e014bab3d5c58a2f6e53ba049f825fc45d568d7341c18529d47b7a49bf1d62cd089e1febe6768bbd167183c775a8b38daece0ce7ee2368e58e1eada9bf35e2
 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 756a51d159fb..ddac2c28ef0a 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-fbsd ~x86-fbsd ~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 ~sh 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 eabb46819ed3..57d53075160f 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 539 BLAKE2B d8c96854ae892f4454693468f149e0b49d9b12565760228f87efc5303a5cb2a634d74d03b11914982e1124975de1d91c1abdcfecec8304c963aed93d2bc23111 SHA512 5918875d9bab7767884862cb1662586967f64380d05078775fb8f2d64eea2e324df3fa55ace07d6b38be5d3473ea408e827f26e393d019d461e09d23cda9cdb9
+EBUILD libXv-1.0.11-r1.ebuild 517 BLAKE2B c0ab599bfb1a5740c8b7f912694be6c406187694861459ea6c2cad71640a1612dd2b423e4f84f0b49bc883c3456b39531d8aa7ec08d72de1a4f6a2a365f602ea SHA512 d2035ca647bdba7a2a6c62c5969ff7a07d5dada48a4e07370b85ef996b3dde09e880dc2b0a53956f54f5c33e3c9cdc149c85de45669b9ce713ad30735ebbecfd
 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 608ec8e0dccd..91a53ce718b1 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-fbsd ~x86-fbsd ~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 ~sh 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 3c59e5b80be6..ed9a7b146456 100644
--- a/x11-libs/libXvMC/Manifest
+++ b/x11-libs/libXvMC/Manifest
@@ -1,9 +1,5 @@
 DIST libXvMC-1.0.11.tar.bz2 303516 BLAKE2B df1a34ead982c9b88428143d1c6250ef7d4353a6fc4e151c587f62ab91195e3e2c3b320beb1817b5e0b8a6db485aa0b839084361ec60a798ac1476b684542af3 SHA512 4fe49e956ac97a45d851292cbba7bf242706aaf3bd9eb7ea4d2fc50e40745115d857a4fe179d2b87bc7cb6f9ac93911e89a167f02f6d1ae25a59df9a517a2476
 DIST libXvMC-1.0.12.tar.bz2 306581 BLAKE2B 180867489863f45ee2cbeb259ae07cead3cef595652f6c02fcb5ffeadb8c286f4dc6fc8ef4b7df0c30b95ef51d8626798a76b50165689927c3449157fbe1a552 SHA512 62cb9a72b20af3b081d2d555a253b0e2b8b26b31f4fad10bd3e53bbf96e1663b61bd8df2b78b16f18218cd37cce0c9e6809ae16ded226b37a8b199e41b223955
-EBUILD libXvMC-1.0.11.ebuild 561 BLAKE2B c953baaf4ad3a58c66d04548d61cf43f2b4c21a78dcd326e08ef3784c8a860de9c2a80e9aaee205afaf6ce6a8910e7c4bbbcbe9392e1405e193afa86bdf8a366 SHA512 ceb481b9ed6f856150da175cebe9a1142279e0ee95faac19d0ab7485df090ee421a16a64e309b4ae16e1a1c830a9909ac9ce58619a5e0654c50b96687b90c148
-<<<<<<< HEAD
-EBUILD libXvMC-1.0.12.ebuild 572 BLAKE2B 55ea00c93304e27424d491951048c6b1f1ccdec48debef77f16f04e3bda4ec1a92df69f74339256acc0abe790b7dfc517675fcd6874c895c5835d12d00fa1c2d SHA512 6eb785778d93e81b398d207215a52a1159a589f91e79b591ef2068db5fbd42586d705eca7b7facf4ae9e6846216135fb5a57ff9128d0d8a7a51205ac1f8bf0ff
-=======
-EBUILD libXvMC-1.0.12.ebuild 602 BLAKE2B 69cc678431a16a42c4def165c4fdade82a46c5a96dcc4e93e2a6e7b9a7ed130c04a64c8dc99446c73cac5c65c0c363330f790abca1bbd6a944083ebec579d0b4 SHA512 7e769d6b7341c1bf300d7be28c0254ed8b09063b76d91f73eb6c220a8d045fbfc3c90d3c96cc36d64fd9659482d089213ecfefcf36157d6e5c4fedbf43320733
->>>>>>> next
+EBUILD libXvMC-1.0.11.ebuild 539 BLAKE2B 30e26a39dafd451010ff967f187f88a46716928bcf06654ea6cfb83e5ac95c7cca7a7747ac2b7bb5be57c89c8b40014188932dbe53b7c428303e4457d8589fc9 SHA512 ab0cc15158645e6231e531143b9ce496ffcd792833619e0dc48d765387f0dce96dae536d5329446226f66706de4c98e62e4c64e14d72038712c884f81af498f2
+EBUILD libXvMC-1.0.12.ebuild 580 BLAKE2B adfab6307321fad2fa2568dc80fef644561a9372c6469502f243e23ccea61ca6ff711551c61ca50dbac60680b20c798d8f8bb2265db0e4353ed34fb8b5656418 SHA512 e4f63d8e2c8814ff51e0f2e07c7d578f5cdba3d3de91c6e0280e0a7d78154bececdf5a4e4dfe128794d3da028a0992191cbc222b5a3aad4fdd57b1d8c8f45e16
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXvMC/libXvMC-1.0.11.ebuild b/x11-libs/libXvMC/libXvMC-1.0.11.ebuild
index 85a4fb51580e..95960c872143 100644
--- a/x11-libs/libXvMC/libXvMC-1.0.11.ebuild
+++ b/x11-libs/libXvMC/libXvMC-1.0.11.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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-libs/libXvMC/libXvMC-1.0.12.ebuild b/x11-libs/libXvMC/libXvMC-1.0.12.ebuild
index d3db40e39822..bc7f23ae07be 100644
--- a/x11-libs/libXvMC/libXvMC-1.0.12.ebuild
+++ b/x11-libs/libXvMC/libXvMC-1.0.12.ebuild
@@ -8,18 +8,14 @@ inherit xorg-3
 
 DESCRIPTION="X.Org XvMC library"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="
 	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
 	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-<<<<<<< HEAD
-	>=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]"
-=======
 	>=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]
 	!<x11-base/xorg-proto-2019.2"
->>>>>>> next
 DEPEND="${RDEPEND}
 	x11-base/xorg-proto"
 PDEPEND="app-eselect/eselect-xvmc"
diff --git a/x11-libs/libXxf86dga/Manifest b/x11-libs/libXxf86dga/Manifest
index 3ca9eb0cc881..d1ba9c3a43a6 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 502 BLAKE2B 941323657c99d3fe5125d7c690079ccbf69310dcf5d33766df0bf00e478aee239a579b137d08f7e0e255cf8fa75c6975c06206af1c19a39c5ab48de2046bb434 SHA512 a8408808f023fe42e2ea37dd016e2b0154c94ef5dd1f12c4967aed0b9d4f1cac623430ff803e13a17d8d73bf745db1660dd27a2148e15c69f634ce68b1a3e9d4
+EBUILD libXxf86dga-1.1.5.ebuild 480 BLAKE2B 328de179c1a182aa5821129ff43cd1a0d1e977a83183eeec41504cef5054a6dabb33381f2012e01fffbceddae357459e34bf20a09fb0f4cd42c8c82f246e467f SHA512 56a7924e9c5a53d56d91d0bc7bab45b7b1c700cb80c5453261273294d0368a9dbeba0691752b1be642683fa043750a5c61057f7c2fbd8954f800f4eba7f6351d
 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 8f51193b1a57..c1276b7d99e5 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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh 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 193111a4cf82..efa2ffc55984 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 464 BLAKE2B 9d4c0a880b2e67461e01e482ccf7f7ff816a1cdb613c39d2598b101768d68b7c008e78ad481e3b2c87a4d1c3f30da0a713ad72f15a17ba9825d294cd33cfd10f SHA512 b57de4675b3c79b09a6bf3c78a7f5da2583d910361f02c8cf14c5964a371991b12dcbf76aa917399487e8ba3c5a9a69ea5935bde87327218e38ef32c221cd6fe
+EBUILD libXxf86misc-1.0.4.ebuild 442 BLAKE2B 6c96831f11d74ae4bf38eb7d32732050971e2bd56e82870d8afaaf7d78f833327b23484296ad18c0a92c9c196289f4c2f30722cdda62c6f1542d285a725862b3 SHA512 5d5883ebccab6cd899b6a3c54a7e5dfc77191ecfa6d03c6aee368ed9f137d1b8addb12c4cf85a96a20926891082e90d89ea854f41057f40d2b3aa0ba542b4278
 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 1c815d1e57e4..fed84544102b 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-fbsd ~x86-fbsd ~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 ~sh 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 f6f164d60dfa..8289f1903163 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 541 BLAKE2B 3545b85699f634ef0ade1d595755ed6a70b6b142b3ef0467795ed6861b435d2ff13bee60f85ac30a1ad92857dbd47d36252309a93236c6488ea54225c1723537 SHA512 e549a29414d487a85b0faba8dd92e4e08c231f569a89ec4fd319535482f8d9652ff6b2c0387926543ae90ecc4c1b8a7aff7a7a63451997a9b5eda07509598a23
+EBUILD libXxf86vm-1.1.4-r1.ebuild 519 BLAKE2B 0ae9b3ce7bcb6f144cd120cbc0300c85382b96d1fa7964f3b8e4679560c8f2ac1dc1eed3117790518f78591bdb8f5ec7086dcaf43d19b1c30aa5cc38208575fc SHA512 f5bf0975e88f54a4acd749436ef02a64eaef0693c4e57a74bb48f840e159693935ed5afd708092b470a72a6ff6fe74694c9200c3134a166855be57afd3ba8590
 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 e8e42c003784..e45264fc8369 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-fbsd ~x86-fbsd ~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 ~sh 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/libaosd/Manifest b/x11-libs/libaosd/Manifest
deleted file mode 100644
index 8b5c44aa94e9..000000000000
--- a/x11-libs/libaosd/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST libaosd-0.2.7.tar.gz 51560 BLAKE2B ad14feef95e7218c81074daf77dfc50bca6bd02ea527dc7b8bc7d8674bcd69d1662f49909ea5ffd2fa25c0273f8b594fe5121cf5851c9395e904e960d29c8328 SHA512 ebe60b992b0315026c024db83c788ed9c829f1400e0c6da51caeb17d58649825fafb14d7f73cc80a82866f53f108a1e18f921109f940cb59fce038a12f214329
-EBUILD libaosd-0.2.7.ebuild 859 BLAKE2B 98dbe2c74d35c95b79d56c48bfb2cea43eb8184225394373e0e980cd7dc51b4b274f623ba0b9d8027369771f8abb50855657186cdef62a3486f6f758fccc028b SHA512 37c12f4b7b25a5f27ac1d94c34f07e0cc0db8d206be6e62a668880a45073824e5e433e4dd49e5220af149231040d497bfa56f58748dc67e5625e4215583ef704
-MISC metadata.xml 414 BLAKE2B e9393d39710fda90dc9490b804460515f028986a1b88eb3bb4a5cb66535eccda8a1174f9409b6f4218f3dd107e6a3cac33c329b4e92fee2e4ef9ca0c038df40e SHA512 467aafb4c9def817ebf1a7e0f44bf4d241f1c511dc266d5207734c07efdb723836670085ba919a1446385338c4e3432e8f6c19bc4d7ba825d591bfc3f280dd4e
diff --git a/x11-libs/libaosd/libaosd-0.2.7.ebuild b/x11-libs/libaosd/libaosd-0.2.7.ebuild
deleted file mode 100644
index 6c2522feccbd..000000000000
--- a/x11-libs/libaosd/libaosd-0.2.7.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools-utils
-
-DESCRIPTION="An advanced on screen display (OSD) library"
-HOMEPAGE="https://github.com/atheme/libaosd"
-SRC_URI="https://github.com/atheme/${PN}/archive/0.2.7.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc sparc x86"
-IUSE="pango +tools xcomposite"
-
-RDEPEND="
-	x11-libs/cairo[X]
-	x11-libs/libX11
-	x11-libs/libXrender
-	pango? ( x11-libs/pango )
-	tools? ( dev-libs/glib:2 )
-	xcomposite? ( x11-libs/libXcomposite )
-"
-DEPEND="${RDEPEND}"
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-DOCS=( Changelog )
-
-src_prepare() {
-	AT_M4DIR=m4 eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable tools glib)
-		$(use_enable pango pangocairo)
-		$(use_enable xcomposite)
-	)
-
-	autotools-utils_src_configure
-}
diff --git a/x11-libs/libaosd/metadata.xml b/x11-libs/libaosd/metadata.xml
deleted file mode 100644
index e7487235d122..000000000000
--- a/x11-libs/libaosd/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<use>
-		<flag name="pango">Enable the textual helpers (requires pangocairo).</flag>
-		<flag name="tools">Install the aosd_cat tool (requires glib-2.0).</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">atheme/libaosd</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/x11-libs/libast/Manifest b/x11-libs/libast/Manifest
index 4cda3fa399e2..0f76ea51f8d5 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 949 BLAKE2B b7dd3edb036b951690c70983d33cf01ce2fb816acb2faef09bde94cdf3681d581d87d28dee24d4e12fc4d20bad54cfe1ea57029f9bafc4c1dd98adc126bcc4da SHA512 d067d1355f62d7a8a7fc601ac1a5bef185e23a0353e7f1a960f4cff0dea39c4772af1191681d63a2c530ade60f1d0719b69f380ee8a46742940387d7ee76862b
+EBUILD libast-0.7-r2.ebuild 927 BLAKE2B b9a107334c439f888eb069bb8b9f406367735fd941a373b96cc7121fb1f17898c625c75503354222372aa6a94e755a8a0a09e7bb48eb7f983932a6370f40400f SHA512 a7dbdff69c55f225391ecdefa51b071b69e618dc60c5feeec14e4eb7b082acfcb4fb879e96ed4c3a1a1b34ab9bc8f335f80973f9bf2fc35a7310742d14449da0
 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 e357c168a6a4..f8921d81d98a 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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="imlib cpu_flags_x86_mmx pcre"
 
 RDEPEND="
diff --git a/x11-libs/libcryptui/Manifest b/x11-libs/libcryptui/Manifest
index 96077e552092..bbb76fb05595 100644
--- a/x11-libs/libcryptui/Manifest
+++ b/x11-libs/libcryptui/Manifest
@@ -4,5 +4,5 @@ AUX libcryptui-3.12.2-gnupg-2.2.patch 708 BLAKE2B 29f7a7b19f9267c1aa43835b599254
 AUX libcryptui-3.12.2-port-gcr-3.patch 4932 BLAKE2B f711e6f0c6c8dec3c84d47e2ecc931dfaff197529028ffdca1ff8bec3d4e3ac75b2feda56de3ed9f0a78fe17ee2918e2d888ac863cd40f746b185f4b1ee7590b SHA512 3ffa45e6a2636bb4e6933082c92b83a2eedee927ad6a7d214df1bdb1b4c5ca41ca22c0c06469f3a6fe1c81e94888a3a5adca56e6354a00bebdc68faaa009e4c6
 AUX libcryptui-3.12.2-prompt-recipient.patch 1447 BLAKE2B b36b71220a48540ff2a4dc2ac2de2368ab9a4ea2f12721ec84d3f4459e3e8cf348fb1d51318064e40137aab2f424c881bd3f17d25ae988c0e95826cd87c52393 SHA512 4e38c0f2e813bf0ab76f2205045a3b5240d0ccb9701de8c7a73adc4edc3540ff49eff6fcd5bb011c9e91984c9b82eab8a6bef32d099501895eaf9d6187874c43
 DIST libcryptui-3.12.2.tar.xz 1163784 BLAKE2B 4a13f5dbe4229673da293115dd0d57added87f0522d6ed41d3072780e738b64bfee7c1b9af5872e9877ae22117492a5e3e1b119d4842536c2e762870fe8de85e SHA512 50ef407f0a9fe2ac8f4ab075e125fe8eabc55160b9b96a852d34e52c46be04e04b2a7c8288d2669e24865a89dc179af6bb0da8f6799e8b07fff7bc667c8eb1f0
-EBUILD libcryptui-3.12.2-r1.ebuild 1847 BLAKE2B 95dd89260b896046d73d67a7ca59ec6ab0415320040ea61d2961379d1b202ca98c427e86d148bcbf8c0eccd2abce1827d81b72e2169dac3a85bbf93d0adbbf1d SHA512 4624515a7af1970dc66a37c0d94470057b83ef68a9fda9fa953631a35cce01200a07e4bb47be05a3998eb45196bf4ba8a6bb178b45528d2b929c0604348f84ab
+EBUILD libcryptui-3.12.2-r1.ebuild 1837 BLAKE2B c32f1eb229e8fa8dea900ee3aedaa1b22f7f5eed4b69f7f1b30d37ef0c0a2771df5e445c9af5c23426336bf96ccb02dce304ff17fc34bb655d0438c60816575d SHA512 ed5d171fdd38fa1bbc2983417601141f600b52e639b62ca28d60f2e170861f9e8171bce9c0c543d754657631ce537788fc55813e8b8a895ead57aaadf72ab187
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/x11-libs/libcryptui/libcryptui-3.12.2-r1.ebuild b/x11-libs/libcryptui/libcryptui-3.12.2-r1.ebuild
index 833983133db8..f9dd72c17240 100644
--- a/x11-libs/libcryptui/libcryptui-3.12.2-r1.ebuild
+++ b/x11-libs/libcryptui/libcryptui-3.12.2-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Seahorse"
 LICENSE="GPL-2+ LGPL-2.1+ FDL-1.1"
 SLOT="0"
 IUSE="debug +introspection libnotify"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 x86"
 
 # Pull in libnotify-0.7 because it's controlled via an automagic ifdef
 COMMON_DEPEND="
diff --git a/x11-libs/libdmx/Manifest b/x11-libs/libdmx/Manifest
index 2c3ec51fd145..ce68440b0be1 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 354 BLAKE2B 3b32fd6cea9f7fb90d7a12865df00a3f1ac0ad0ae2ef650498530df2329ad6ec9ae111995d37c7bb3d58c94a49a1565a171fa4d7e5ab6b39caf6e8180af2289b SHA512 d50b1f45520ef69dd2857f6b8a4f6cf8657cc194de62f5958d2695a7488a9b29a3c28ed436be5ac9fd7fe946f3f6bbf6dee0e9f2e35a928a1728ae436b6598a4
+EBUILD libdmx-1.1.4.ebuild 332 BLAKE2B c7b08e72e1cd24ef22b15936b1f7867dab9ccbae04af68e0258edbc26e7e76c3146525593e23d60dea33ca36199fea9a96d7719f5fdc107f325bc140d15ab9bb SHA512 d39a06f21ab0f4c6c40e714e1ea9773d723daaaa2631ca5882305415459996f453998d8b65159541de5fb0655d87cf61fddc346c09c3553c378eaaaba621b744
 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 9b17f213159e..8c13dd56a5a1 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 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
 IUSE=""
 
 RDEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest
index 7eee8aaf8be7..676e5191d6fc 100644
--- a/x11-libs/libdrm/Manifest
+++ b/x11-libs/libdrm/Manifest
@@ -1,4 +1,4 @@
 DIST libdrm-2.4.99.tar.bz2 853659 BLAKE2B 66fb3f757ab468b6f6285ae740f67d6c38473f3866b57c6a1e24b322bdd46f2d21132b5ea7a737f1d3fa8dcf55162d4c904f181f17227c239b3322c0af50181c SHA512 04702eebe8dca97fac61653623804fdcb0b8b3714bdc6f5e72f0dfdce9c9524cf16f69d37aa9feac79ddc1c11939be44a216484563a612414668ea5eaeadf191
-EBUILD libdrm-2.4.99.ebuild 2143 BLAKE2B 3e2c8d221b892ec17c3f36036be0398061ac3aa50b05259ef89acc2b86309953a5c87382cdda95df152a603ff624216b3108c9754a6bfe88b6c6053ccd24a06f SHA512 30cfc0c66b0a8b6b303e68c891ed02239a9a9767289523d7cbb74b37ed7b592975450d0f130ed47ed67ff82e0ea32250a7d4e3d07706ae1030e32096e8e0a108
-EBUILD libdrm-9999.ebuild 2154 BLAKE2B ce5a70ac7497f4dd11c616e24ae1407a4a0d4e96635fcc2a3c915777c2892b7dfe3cedf561e5391d2df13f15a06a07c13cfc0f693f8a19342a0e89b2f9429642 SHA512 99bf291b61db6b47ddfb2f2c515ff2d58a169186e4ae8b6b7f8366d04b700fed9c7c720149a16209f18b829a7c96e57d7da59e8a87ebce39e840f5d21b87331c
+EBUILD libdrm-2.4.99.ebuild 2121 BLAKE2B 56438f523d5b51d46aa69a4d93a6aeac3eb6dad195ac54117327b3dc106f2cb94d9e5d0c5b43ab488feb76d0f54f35b343109ef76b00ea6517757c1dc5f9bbea SHA512 0554b9dba51949e6c14d80c01b87431b8deb1c4f917129c4929e37adb3036826ea3267cb69c69c41b9bd26f8fbf0d562d0ea87d0ab631f68604e36099f248800
+EBUILD libdrm-9999.ebuild 2132 BLAKE2B 355ab8265fbb85c26623fce83ab593b860248b4b8350d1daf8183b5492a73e8621abc4f99edcd017676b6333d63cbf84b2703ca8d2da7d737ded91ea7d99d4c6 SHA512 d4d44bd07c2815a299a8f32ded02c76a46529d8430684164227f5b47d6806d97a76f4e65c32de72262744190abb01b1c35702535f56f6fcc8eac3cc0746d8f1a
 MISC metadata.xml 406 BLAKE2B 2a08dbfc07e8d6ee0f61373821fe6b369130b98d30786ff4559dfd57a9a5189a4d2e0f9faae2ba19cffe023460433a4874d30aa26913ec3ff7263efb10ab0850 SHA512 703594ef462bb5b76a61d53268c043ad5f9b0febc907e48236f425ad047d931ae7fcc0a433d8b30acd8b6f0582eb0263586010bd95a17c4c383e7d703166b9da
diff --git a/x11-libs/libdrm/libdrm-2.4.99.ebuild b/x11-libs/libdrm/libdrm-2.4.99.ebuild
index 76499a8ff61b..0c94777c8673 100644
--- a/x11-libs/libdrm/libdrm-2.4.99.ebuild
+++ b/x11-libs/libdrm/libdrm-2.4.99.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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh 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-9999.ebuild b/x11-libs/libdrm/libdrm-9999.ebuild
index 29daf988738c..7178075e7431 100644
--- a/x11-libs/libdrm/libdrm-9999.ebuild
+++ b/x11-libs/libdrm/libdrm-9999.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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~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/libfontenc/Manifest b/x11-libs/libfontenc/Manifest
index f1c7a8adce90..e38eb049f605 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 537 BLAKE2B 825fa6e31419ca70f6e1e159ada681fd177054cb30af49691717c9ea7c2dda074b2b7162101554d804751cd2af1a8dff21f313f089c59533ebfe3f92dc8ff47c SHA512 662015465c78c282ce7b1fd0354bdce58faa85a8f3a15cce688442396d36db2a14369396050050aa9ac4901166f6dedb348a756bb052d8e1b227becabb99a39e
+EBUILD libfontenc-1.1.4.ebuild 515 BLAKE2B e55593108eb3bd6935407cc7e4ebd5a06a58e39b1681503a4cd895485dbf030cfd5fea3ce6c1195e346c49095c67d21f022268904b7189fe161e28a037e7bdd1 SHA512 d4c2c68212d73b86210b3412cdc9be5c66cee778f2cf0a90cc217219f368ac509d7eb698d1f4550100a049cd1ddac8f30d01967ef4e39e8230e9bf7d017d178f
 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 6d9ac818b874..8780178c9b1e 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-fbsd ~x86-fbsd ~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 ~sh 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 344e404e50ef..ffbd076f3e7c 100644
--- a/x11-libs/libnotify/Manifest
+++ b/x11-libs/libnotify/Manifest
@@ -1,5 +1,5 @@
 DIST libnotify-0.7.7.tar.xz 285356 BLAKE2B ace0eedb1beecfbb89726960e441821d64f5ac456dfc6294b051479078726aed6fbacbd1e8cb17578933adbc4c94711b0d69a292778ba4bce096552a5197722b SHA512 133874114407bf12267ef609f5941657181760bc7cf115c5973b1810cb72bf55072b621c143e32be1e7e8b49f244851925d14bc3f9f26457747b8a8695ee9954
 DIST libnotify-0.7.8.tar.xz 108436 BLAKE2B 0a73eabe58faca55e16774cda6f649ab3187bd73a1f87b538d5098f390571a6a34078883dbd2447731d6e4cae315d8286e9e8acc06e85590c8b05a693a83e7f7 SHA512 9973d7a1af5dd7cfbaa0d0d2c9e72a40df9d814967fde47e95763a69690cc4ed32ecf713d75f91f3dff99a693eff9dab963be124e0530ebf231d517a44e75e94
-EBUILD libnotify-0.7.7-r1.ebuild 1512 BLAKE2B ca400d192f50f5aebe03a7c0452e168f0a99540c6efa97a809595481b782b2fbba8b0ececa51a693daeb0d32b529d35faf2bb9b492ebf60bf42052077319754b SHA512 5e57b543c4472d6f7b8a627624ad56c7f5f4ef8f4678406744cb00210b7e1c626e085c90d44e63487cc14b401b85446d158f6daa99f56d7a11e5a5fe824146d4
-EBUILD libnotify-0.7.8.ebuild 1384 BLAKE2B 73af3c2f90aa1622c129f989a917f068de916747ed484d3a828386d147eb0c8fa711abdd59f72e5a7a28bdf94970fdb7f8b3195a974143236f3daefc03bc2fd6 SHA512 f3cf46429083c857de5be24898f6da633424b87f3c969bae06ff56cffce94153fdeef3a835c6b8534a687ab350bddbf989731e8afd2ccaa76c81a207d66ce081
+EBUILD libnotify-0.7.7-r1.ebuild 1490 BLAKE2B ca47ca4beeaa35f52278c3ce905cff60e863b45df9c9f723c262c0826b7b126c37b73b98ad670f36029d515de70e9dbd8bb4251dbe585ee652db83c4474915d3 SHA512 25c15ae5af5b5f6c5804b6ac040c037af1fdf7a018b9a80fee67d91372fe22f1802940d0235b6568eda9f50fb9db6468978e563dd28b66ee54a76632f97ec0cb
+EBUILD libnotify-0.7.8.ebuild 1362 BLAKE2B 8f05b3b0ff6aacf396433697df0f97f8137ac33e92c054375a3e14bec4b490af2c5340640a11c4796756a8289653281fbeae1b6c1b0daaed7149cff36c2f1e80 SHA512 52894c86ed7bfa52e5c51dba8db8572f12e9edc2562d66f322eb5832501d4660bf2df5c2ff03dafd961528e6462733ac652322f3a344f13d016f6b32895a4dc9
 MISC metadata.xml 276 BLAKE2B 889856a4e8b234e03eb27d32a4bce748a561f98ca0faa36de124e58e3832d804d1492f59db1154c4ec0e2e0e46c7d9cf38d9911ee83dd0863699581000610f31 SHA512 673180ba375ea401c0a8f197d516417b3f9361b11943c71bac88b0d0b1407b0bc657f5763c6fb6e429cc6ee112869a2247083fe56743e9ce918855c0ea929e59
diff --git a/x11-libs/libnotify/libnotify-0.7.7-r1.ebuild b/x11-libs/libnotify/libnotify-0.7.7-r1.ebuild
index 0d78cf58394b..25aba2e29347 100644
--- a/x11-libs/libnotify/libnotify-0.7.7-r1.ebuild
+++ b/x11-libs/libnotify/libnotify-0.7.7-r1.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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="+introspection test"
 
 RDEPEND="
diff --git a/x11-libs/libnotify/libnotify-0.7.8.ebuild b/x11-libs/libnotify/libnotify-0.7.8.ebuild
index ff9add88c106..538f0001f934 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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="+introspection test"
 
 RDEPEND="
diff --git a/x11-libs/libpciaccess/Manifest b/x11-libs/libpciaccess/Manifest
index ba72014f72cf..9fca3d9decd5 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 833 BLAKE2B a49cb92b7617b4c069c1ca3f9901006b62910de4e93f6965acbefbf7a1fd83a9a3afd857a138342d2011fbea09a62284fc7f1415f9a5760e9df5986f116ef5ba SHA512 220daa7b6abca009e2caeb84c6a52b5a8f4dc3c711d5c03a837424e6060603501c8435817033eff72cfcab3a2de01e63e199cbd399c5b276b6f7958adefe0615
+EBUILD libpciaccess-0.16.ebuild 811 BLAKE2B bb6f9d623ee771d5a7a0fe22803cfef6efbb84bec6c5047be5fb8c4e2a229eecc95d6c846b9019a44e56469d810f8e3f8c6f499d2a8183f0d44b88d2dd625d70 SHA512 96f9403de46366bcc28ae5b957aa436e77f654724e240caa1dc9832e99304aceef28930ca842cd580e96a4cec53d7ea2bc28b5d3d849e45feeef3d1e3dc855a6
 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 666beb73d274..0b575e1c91dc 100644
--- a/x11-libs/libpciaccess/libpciaccess-0.16.ebuild
+++ b/x11-libs/libpciaccess/libpciaccess-0.16.ebuild
@@ -7,7 +7,7 @@ XORG_MULTILIB=yes
 inherit xorg-3
 
 DESCRIPTION="Library providing generic access to the PCI bus and devices"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="zlib"
 
 DEPEND="!<x11-base/xorg-server-1.5
diff --git a/x11-libs/libproplist/Manifest b/x11-libs/libproplist/Manifest
deleted file mode 100644
index 69d8a5c3a16f..000000000000
--- a/x11-libs/libproplist/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX libproplist-0.10.1-include.patch 156 BLAKE2B 71c5e24fcede47e1982f9567f0dc4b1538d0220284c54ed9572a873239c4774f6265b75b1f19a800aa90ea0ac8aba478b3eb3ba60dbd4874a3339ac96b09a915 SHA512 d7e97ce94508a9b75a0f578b9a2f33b4e9072bcd7274b57222bad0a88f57afb48f9b3943cf5dcebd8234da9b838662617ec99d2233ca9cbece5295fee565691e
-DIST libPropList-0.10.1.tar.gz 152625 BLAKE2B 203ffe001248c58733bde8cbe86e84a1f3f90bd55b1155e86af3c1306b431569cce5138664f1f8108c97bef7b0577ff19d1495c9b7283e8ae80c0e94329898da SHA512 8ebad2ffedda9cf0f0a01320340c1b6b9f7d9d9af06d886da9c82d626b5ad799692daeab4c7569e85f756ce8aef3fedf6f662ee38fd4e13e2ec52c7dbe843c39
-EBUILD libproplist-0.10.1-r4.ebuild 667 BLAKE2B a023acc53280d789ae51f3d5ea76cd93769ef361b9588dc99474f01caf2163590f6f2da6703876d8aea96183970cc46d72535d9e26d3199e9940779605399e6c SHA512 460eb635691601ac1fd9d05248021264d366d64cfa63dc59dedac11970b8830d54a253f9a7263cdef0df1540e2bae5ba3680904e6865f860d7f65d4499c5b755
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-libs/libproplist/files/libproplist-0.10.1-include.patch b/x11-libs/libproplist/files/libproplist-0.10.1-include.patch
deleted file mode 100644
index 3fd8fa696324..000000000000
--- a/x11-libs/libproplist/files/libproplist-0.10.1-include.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- comparing.c
-+++ comparing.c
-@@ -4,6 +4,7 @@
- 
-    */
- 
-+#include <string.h> /* strcmp(), memcmp() */
- #include "proplistP.h"
- 
- /* forward prototype */
diff --git a/x11-libs/libproplist/libproplist-0.10.1-r4.ebuild b/x11-libs/libproplist/libproplist-0.10.1-r4.ebuild
deleted file mode 100644
index 6f1c7afa1e3b..000000000000
--- a/x11-libs/libproplist/libproplist-0.10.1-r4.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-MY_P=libPropList-${PV}
-
-inherit autotools eutils
-
-DESCRIPTION="An library to mimic property list functionality from the GNUstep environment"
-HOMEPAGE="http://windowmaker.org/"
-SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="static-libs"
-
-DOCS=( AUTHORS ChangeLog README TODO )
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-include.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	rm -f "${ED}"/usr/lib*/libPropList.la
-}
diff --git a/x11-libs/libproplist/metadata.xml b/x11-libs/libproplist/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/x11-libs/libproplist/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/x11-libs/libvdpau/Manifest b/x11-libs/libvdpau/Manifest
index ff4e677bd327..151b84f530c4 100644
--- a/x11-libs/libvdpau/Manifest
+++ b/x11-libs/libvdpau/Manifest
@@ -1,6 +1,6 @@
 DIST libvdpau-1.3.tar.bz2 139009 BLAKE2B d535c7723638339d4e67002721e9d0d8aae89a6001fccc41d9c3b21d52f0fae9237705bca448fbf1c244dd7eeb71f5fc74ed81f05c975bed798fce503a571c90 SHA512 c06c23062816e8b207d38d9d53df43a1b193bb9836b48bd6d79a63d76522e87d383c446285b9877fe9c99faa0d290da8a49ccbb58eefa138cc38d0929a8e1330
 DIST libvdpau-libvdpau-1.2.tar.bz2 140017 BLAKE2B 0420961c48fcd5c92e7e98f84f629946f6234c28781bd7d8c9eb4aa2ab11b76e89e05f50cc423a2935b3376ff3b919ad9e6ef1710ff3549369567f298b5efa50 SHA512 f76c2283a1bd2e854aa6b86a564f7f08c1ff7da34e971c7c39f36e77fbd51fe0440d1ba01bff0b80be6c0326817ee4e6bff719dbe8dbf5e1ec7a94fad5016b7e
-EBUILD libvdpau-1.2.ebuild 1141 BLAKE2B 58d92ed94816b94efc377b9e8788853b6e0e3c6474998727e03ea5287814007f960f921f0b38b978ea7caae78cc915bb85fb42c07cfecd36cc43df01688f6b62 SHA512 ca5e09592d0de74fe1b430b562e486d0bdee721eb42e0fcf41cbe54b4fcb46f168a36f882097f0903e276257b6bbacecd98194322949910099536f70a5b472a6
-EBUILD libvdpau-1.3.ebuild 1184 BLAKE2B 9f423e68f5c409a5444a659d70bbaa8410770ac5908c2c906cfd79b8c6a913e609c4610b2bbee874691c067e349c96977793797b65d20b4830f320bc3db5fc9b SHA512 1d8c4175393e0b88bbc40965f8f7c456fc7b0d2876c022a192a17630b2704f4a7d8a2ef45ef5ef61f230bdf4088bfc3f97f5e66913a00ecf8adfe585b6eba9ab
+EBUILD libvdpau-1.2.ebuild 1119 BLAKE2B 85f160e0ea734453d5fc2f5edc0e50d9417e49c022b7d600f6cf9dbbd2363aeec29a0f93c4822a8d9fff85bfe46378e12d2a1df88dd0dca3abab8cba9f0bbd70 SHA512 c1decab86618c605a93820d22d2a91118b56a53d9e709458d04bf07607fdf2ec4057e9ebe5372391bd2f5876f2d8726f2dea0e8111c6167bfdbd24ec005aa622
+EBUILD libvdpau-1.3.ebuild 1162 BLAKE2B 62f0936564742325ecfb8fb2b0c3fb0183096f2bd57677871ea40a09dd0dc51c17ab76070a3cedece1c8f48a11fa24c248da595b10276fcdaf69200c83a36988 SHA512 e08715578018052c4d14a5dfec2ab4fe689aa2c69a89c1844681c368302ae1d60c8b6df1742eeceb56f3cd78303de5c4f497b0a23103df05822e89de00ac440e
 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.2.ebuild b/x11-libs/libvdpau/libvdpau-1.2.ebuild
index 6c0d86d35a77..14027d0ac570 100644
--- a/x11-libs/libvdpau/libvdpau-1.2.ebuild
+++ b/x11-libs/libvdpau/libvdpau-1.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gitlab.freedesktop.org/vdpau/${PN}/-/archive/${P}/${PN}-${P}.ta
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm64 x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm64 x86"
 IUSE="doc dri"
 
 RDEPEND="
diff --git a/x11-libs/libvdpau/libvdpau-1.3.ebuild b/x11-libs/libvdpau/libvdpau-1.3.ebuild
index 2dc4d12a5faa..260b116d8271 100644
--- a/x11-libs/libvdpau/libvdpau-1.3.ebuild
+++ b/x11-libs/libvdpau/libvdpau-1.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gitlab.freedesktop.org/vdpau/${PN}/-/archive/${PV}/${P}.tar.bz2
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm64 ~x86"
 IUSE="doc dri"
 
 RDEPEND="
diff --git a/x11-libs/libwnck/Manifest b/x11-libs/libwnck/Manifest
index bbf40d8e366d..7499cc1e1475 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 1277 BLAKE2B 521bf8ecde7f1c5907a6c82fa76c6262aa01b1dc0d47c61d58a36b8738fc95c8cc953c25d3f181cebbcfe565b9ea2d03c650e741c9f67f7f8cdb78d6e7681716 SHA512 df4fb078670c4ccafac707d6987a1a681cd2b3e6567b093b6ecdf7550d9bd097852738502757347fc761f3d6488d261625b91204b6228b73410a6114efad8779
-EBUILD libwnck-3.30.0.ebuild 1152 BLAKE2B 8db1b7a1079fad5c540a83f72e7c1cc20a0085252433cb6cd824cf94a3833abee89bd6da9fa5a5688421cf5681a15cc9e76a70fee53c9fda12a96bbe1e096aa4 SHA512 af62a7da17c09def2a66248e172fe0f76976ef390d0f93231710d1f854111f33e8ff1153894ad5b1f1e50a257545971a801756067fec6c2955f53acdc58d3388
+EBUILD libwnck-2.31.0.ebuild 1255 BLAKE2B 26eb9690e2ba746e176c9f8dc69b7b971ff60e473fe59abc2bb021fb276ea4958e5d4a9076ff075dd175ad557b42b5fe8a7d9110b94cbda892138270e04d113b SHA512 9ef305ee7ffd8ac7e55ad300de9d95a616fe967d907f7bf0c9661776b58d60fdca24e1a30bb14616df9a7823de8d9054053a37467d6a725ef107fbf5ce35de43
+EBUILD libwnck-3.30.0.ebuild 1130 BLAKE2B 16a4dca2d08989cb9a3af65adc34e87fb4973a414dcd97741d1a268d4c212cc3258c564fbd15a7279150464d9ec465030232c01b0bf6ab9ad99ba3058ebed967 SHA512 b2f9f1a442d8f9358aae0cbcb8efa8f39623079e41ec90d99ef23da22702dce7af96d31ac274d3cd73d621060ca838b0cff6b98a82b95d91ca3f9c02b44d7010
 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 ef06538442c4..525c7cdbc1db 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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+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"
 
 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 36b74e5febe3..b7cde39c5565 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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+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"
 
 IUSE="+introspection startup-notification tools"
 
diff --git a/x11-libs/libxcb/Manifest b/x11-libs/libxcb/Manifest
index d8c13fe8f24b..a10ed239eabf 100644
--- a/x11-libs/libxcb/Manifest
+++ b/x11-libs/libxcb/Manifest
@@ -1,3 +1,3 @@
 DIST libxcb-1.13.1.tar.bz2 506778 BLAKE2B eca685a21d40f664b611c0c8da845e3464126b101320a86db27ee4d87b85ac0ad1a41950281b7f0ecca06883c591571d059a913591b0281890b339f279b7af93 SHA512 763edff9572623674f75a858adc57b5c09591f508cc5d5093218e7bb047abdbe0a0108bd465419a8bf15c7dcdc85efdd2d4d9fd56605c41475d15dc992640c23
-EBUILD libxcb-1.13.1.ebuild 1457 BLAKE2B e073eaa4ae6167b5de1ff2296f4c47085dca5d9699cc3e2b73686b7bc8b8f8f46833aa5a0bbf2d7de27b9fceb6dfceb3effb7c1b37df0ab3ca1381dd527bb33c SHA512 68a0345e90049f6dfb6e62b70f91486f2b281944b7791d3eafd67518e75f319c786d9fee9a7a628c4ab5743f724f1ae72bcc3ac7110bb17a0ebfb7a01cb756cc
+EBUILD libxcb-1.13.1.ebuild 1435 BLAKE2B 6e026dcc9b760a79bfe3d42fefb1e95cdba5e3c0b017061aec062a4ea3a1bbf9b57fbea4590f885e8f574c7719dfcb17a98b97ce75f8de08d44af637f3784070 SHA512 6a24339f9343c62d9538fbdbe789c04213533c74633a49e858bbcb900755ab57f96be34bc60d45f51a33892230246b7b0900fdf16981741aa3ef92a67805dc93
 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 fb517c56a07f..8cd3208c9f4a 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-fbsd ~x86-fbsd ~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 ~sh 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"
 SLOT="0/1.12"
 
diff --git a/x11-libs/libxkbcommon/Manifest b/x11-libs/libxkbcommon/Manifest
index e16c17647da1..513b0ce89386 100644
--- a/x11-libs/libxkbcommon/Manifest
+++ b/x11-libs/libxkbcommon/Manifest
@@ -1,3 +1,3 @@
 DIST libxkbcommon-0.8.4.tar.xz 648592 BLAKE2B 6205ca08f1ccb6d85320428317e9d023e2f2a56dcaa77e34a9f9ea42bbf67c9ee27a3123dd8e880ead3fa92c4cd7718bde55a255c52f16fef8d33c395c2511a9 SHA512 dbd441d0d7d5ba4fb352d64d150d163d4cdcf8340059457c291dc1fc69d1606ff6589732cb41a7fcfe106af0192977b243d7d68c4d95b90ece7abb620df360e3
-EBUILD libxkbcommon-0.8.4.ebuild 883 BLAKE2B a15d0aa82065f12f9259df5d3e578525b10e5f1448764d9286da355fbddb756448c974628edfe1cfb30cd51db79036836a680ff8eef8ece73f185f03ec1f0d75 SHA512 e8df23bcc8d74d04264c2fcfbecf563d7b01960b929bde15d1d139de915a74098c8c17c5a87b0c9fe0bbcfe3f8324eb072c4cd9a78f134ec8ecf703dd99e1141
+EBUILD libxkbcommon-0.8.4.ebuild 871 BLAKE2B e1ecb34684b9999a0a68f1561ecd5e27870308abd51ad2713fb5ece66b2b99b222252d19ef0c01be3b8e8e27d32ce42a963912bae89dcc5c40f8dfe19ab5e27b SHA512 9af26d68f893e7fcf17415df441e3d86ffb7fee253b5092c7000f145d9ca5a5d0db1ac09399c3af4eef5719b6d2461e82d7d4d720891c434c2665ae7d0d33967
 MISC metadata.xml 325 BLAKE2B db764fac0ca1f4359bcd129dc165f78592535dee40bc25b6f2d7c662bdce43e01cc66b362765607665a75fc5b1703de204cf90eecae4f8d285cfaefcebc614b8 SHA512 ca2a116a574783f7b3c6191759c902e2cb059ec135456cef989b81be07fecc48f9ff56e02845d18c2376c99be3dd9711f39ad91394e421fa36d8fd6453c0a121
diff --git a/x11-libs/libxkbcommon/libxkbcommon-0.8.4.ebuild b/x11-libs/libxkbcommon/libxkbcommon-0.8.4.ebuild
index 2b838286091f..e92a52c52bd9 100644
--- a/x11-libs/libxkbcommon/libxkbcommon-0.8.4.ebuild
+++ b/x11-libs/libxkbcommon/libxkbcommon-0.8.4.ebuild
@@ -17,7 +17,7 @@ inherit xorg-3 ${GIT_ECLASS}
 
 DESCRIPTION="X.Org xkbcommon library"
 HOMEPAGE="https://xkbcommon.org/"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="X doc test"
 
 BDEPEND="
diff --git a/x11-libs/libxkbfile/Manifest b/x11-libs/libxkbfile/Manifest
index 1ca265eed39f..cb777b96187f 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 505 BLAKE2B 9cd957ecca930acf400f7a771f27ad83ac43d2f90c4f4e06a6e7eaa6725d1d884b5c3fdaf8648a3b785e9529001cea13ca56982610117e3bfd07b6b9afbcffcc SHA512 67806292bb103b646792eb770cc472823b4c565e4f6e214aa9d99d2b65ec101ce32b930c996df62c1ed75b1f6513c8eed743c2b250d95fa25847e5ededab16bb
+EBUILD libxkbfile-1.1.0.ebuild 483 BLAKE2B 53f78d54fe174ca60845c7d6dd264b88d6beaa7b7e0f36e440a2a630c97e6de11f485e4117d6e5c7d772df9ff9919599dab84ec8f9e3a16808dfbca35ea9ee39 SHA512 7007a9b01815f7d3dee1b5cd6bbb2963615dff347d132d989e9f2a3ae3d792b2fc7495b04ca924f0301b2662fbcb251b3eb39057fb817f81b41522e30796812c
 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 15eb831dbc34..1225f3449f0b 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-fbsd ~x86-fbsd ~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 ~sh 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 f1c182fcf690..07de1a83dc6f 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 1363 BLAKE2B acc5ac0bcdc29c582074dd3ab1767dbc5e9310793e801783f6265e7d9b797064a9126cea6011ce1cda10ba9eaa3692afdaf5aa2d5984bb69231c293b01172ea0 SHA512 214585c4b371c8c9fd20c4916ee546205ecf3e9747169071bc5b5cc95eada5e3dccf9ed83177cd1c44e9682eb9b9836d9c43307194aa691f20281efc1bb17e77
+EBUILD libxklavier-5.4.ebuild 1341 BLAKE2B 8e71cea7b90ad0cf59b61df1f11998edeabd6c6ae14f9cb23901e6efebac3020af7f0dc7bf673b8df0245fa8469ee54b13997084cfab741963fc90a807e87169 SHA512 04188383e4ed96d501a0f1d7c0a9c7d52ac99ea19768a5b5901e90029d0407c3f679f2a7f468d943da733ba2477542088007f23e250319ddeec0d943ef40d94f
 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 10cb8a219444..ce4f9c400f0e 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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh 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 201131500a28..526e41222e0a 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 410 BLAKE2B 9be629f85d869c534e04a7ab6250295ead8e36177eadda5cf77846b83cc6ae048c063df8356293c3b7fa331d5cc71cad37a419f86fd6a7ce56e3e787c6c1ede0 SHA512 fe7f28829f6d73f43f51770ce2e8017ddd72b12d543dfcd50d1258ac313fe8b4f996cc30ba07531a944b1307a72ddb6c22ef7718cae0db4abbe890a87bb69647
+EBUILD libxshmfence-1.3-r1.ebuild 388 BLAKE2B 4f607cad56a349b25f1ef67e833117e9323578a3b6e3a7abe454f041870af85397ff1c4d1b28a1a534dc264e28445651e0a0fb10268eb4240e76e911ab25849f SHA512 f3b9260ef6af94c22e767ea7201568ce6da7b588168b8ae7d9e73a3a00e3460077da56ad43cdad1183afe21aba73b40bfa0c42edfcf369da7c9d0b394e9a3aee
 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 18d71fd532e7..b206ebcb15d7 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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh 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 08cf40de4ec9..42b9d655b03d 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.6-patches-2.tar.xz 1600 BLAKE2B 03ef74773c581d09ad89f35f26e9d01ed01ec8b40344cd4d6aba106de80bfe0ce69d65551aafb4c53daf61cc31d1e703c9762c2b4a60729c73783b649a00e6c3 SHA512 09c857f7f2ec0d48660e6fff8afddec99416084e2b80a8793401e7641a3669fbe4eb10811e60f3d9dc106c828a87324dfdd27cc91a62bf3dedbd9154542c7619
 DIST motif-2.3.8.tar.gz 5704328 BLAKE2B 3755b7f46e50240e1e9e7046aa439fa89872e54ae5d03860383f509b6d0f09edf85bd7d92ea4d37925efd2e44401028aa2752d940c42d9cccb652b2bd1d85459 SHA512 1ab8e8eece25ef97e948592b5fa3e19d98e932695290a18b7a8e90f1aa2766bc4f082bdbc3999dff5660e684821178a149040f76bb477163e53ca06474d02b55
-EBUILD motif-2.3.8-r1.ebuild 3384 BLAKE2B de3162774006b1bbadafe94f4bbd5b1d1b172b2087d5b6c888b03a8baee9ec65af67355d845385e76797eae1246dc8235c15c0bcbc532c4f3ac601a477c08196 SHA512 6cc2daf8e9f7c787facb0b44675f2c713f05cbb9a358219afd0f6002af9cb23b65b48a22ec668c10b456e29f01d8601b687858fe9f04994c4e3e40ceb207f475
+EBUILD motif-2.3.8-r1.ebuild 3362 BLAKE2B 993fdeacb0b1523b483ac3c2f714ab6db77c534f64c7d09585f8d7d6486d64cd59b8daae87c9d27212d6e323433ad5cff6e0905cd4606934cff66ecad5b99c9e SHA512 e1d95f503e5d1159d1d4e90a52152da6fb0f3679553d6d05a6b5ae790d0709ca5a261522d93ef233eca48915e28143c0d323ce14ac648b7287748640c62b633f
 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 f5478550c05e..6f17e1ab2e9f 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-fbsd ~x86-fbsd ~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 ~sh 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 5635e7d447ec..7f8180e5ba73 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 738 BLAKE2B a0ab1208494f5766504b626a52f4b1aa9c65a58d19acc62ce2e43c331e9825dce5763f383630ff5b0cb9457cc93e7d044f64920951634b9a1bf01ea75b5b11e6 SHA512 180ad9afab6672d5095b3ed8874bf9cbaf9d99ae0116495ad9e02eab261fce8f9faa079b6a430c13f073744926a8f0a6acb752a4ed7ab095aa611f195a43ebf3
+EBUILD neXtaw-0.15.1-r3.ebuild 716 BLAKE2B e3bdbe1eb4707b0ead97fc437a872132460af3cf241665672dd882e47f13e38e43eec4d8ea6d73795727c3fd39e099880b077b4c80d62a7594f41637e6eb12a1 SHA512 bdc1ba796254062cd41adb8c0d8090703cdc2713bc5dd0024df46c3088213448d806f2e9fdbeccce597c7903152cff363d080155a331f4208934e5a01385ea01
 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 bda42cb10d4b..d1d73b5a863b 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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~sh 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 d825fce20263..bb3acbec9bae 100644
--- a/x11-libs/pango/Manifest
+++ b/x11-libs/pango/Manifest
@@ -2,5 +2,5 @@ AUX 1.42.4-CVE-2019-1010238.patch 1088 BLAKE2B 7517b2b4c3502546a554d3b592c8c48af
 AUX 1.42.4-pango-view.1.in 2771 BLAKE2B 6cc529600d8bc0479a972046c0680139d1910fbeb1629ca66e9d50a80d6c805db1dc8bb1c6de77e73197f98b2b5ec8b8afeb4128ab588b155019fd287cee3105 SHA512 e26c20b889784a3f7aea0287ced559e25fdd23fd915949ab9c538f10d0a6c7200457132ed48061d2c47e004858f7307cf4c7c1027d6b2abd642911f5e81f72c6
 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
-EBUILD pango-1.42.4-r2.ebuild 2330 BLAKE2B a8a28d031cccd35f3a8b7accb93351c1627740608df580d099a9df1f743100b9ffa887803392f055062eeace16fbd55b7c3573ccaf630aef8fd788a9e9b5dc17 SHA512 ea5892786884915465815b497928f144239212c172f7b38e12201bab3ca38072bb23e7a0c83c0caf8b65d584d3b5c0f30c637a3e98548f903edd3aff7eff2947
+EBUILD pango-1.42.4-r2.ebuild 2308 BLAKE2B a436048985ecb5e8f37b5d650d90eca0ca8abd0ef8ca5afb345db1f52beec2cbc38a03453b30147ac0c0c418b6a02aedb0b11ddcc8dd8e407d8ab5e0e0a617dc SHA512 0cfd417cf6e82c511bf0f87c3387958d15bfd5412127c7505cf04525d3e0e1f9a943a3552974c6ad283a773bf957f3acca1860e1c9a18629766d9bbf589ca974
 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 f9f788295a87..667c939a2b03 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-fbsd ~x86-fbsd ~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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 IUSE="X +introspection test"
 
diff --git a/x11-libs/pangox-compat/Manifest b/x11-libs/pangox-compat/Manifest
index 43a073dfc772..5b665174755b 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 805 BLAKE2B 5e9a841badce35bcc2efbcf6e3f7406fd5be0f545e96e61b61f0627006d5f1bb00f0ae4d7515b8a2b436045b30f2aace79dfa054c9193eab6f347a1dea754f07 SHA512 d1600ba3f28ef688487662ead8b6c35057bb9797e6e3348b3107d73f7db2c71174491960146c75aad61df88c155d2b8c8a6545e5ac54746206c91d9cc344e4d1
-EBUILD pangox-compat-0.0.2.ebuild 657 BLAKE2B f1232c58b686630086e57db3a396b30af233710be816d1cad67c33e93993d009dbd1a193f042bbf4f1656d659e619aa93a72270a82dce38b50c3e0e7a8ee55cf SHA512 afa7f9f7cdec3aad745c95f9a6f63ebe869ec7253c7661d2b6ec06b1a5d717b142a63f92fa0beb90ed67e1491e0e6e00d25a4ae62f4cecd61fe910a31fdf0228
+EBUILD pangox-compat-0.0.2-r1.ebuild 783 BLAKE2B 71d3d4b6ab1eeb6f4627a3f93900839a553a6a3a71b49c5ea4fdd36ba8f001c1199b013a0c10a460a6f59b03bf098cc8000e4358c56b60080d99aaa815f25e86 SHA512 1036f3a53570faab857bebf147d61fd19fba78b4112838093b168e545ac7ab7533f1649feba4aba0ed62462b87835a70ba06d1fa2fc4fc17ac42cab1f2082654
+EBUILD pangox-compat-0.0.2.ebuild 635 BLAKE2B ff370f1903ab0928a3a872b9bc1b65e85dcfc2282d50465e1529aab71644d7db3b8aa868d802fc7f6cf3f6fae03e82cced9041448a6caae12d87a5e071ee495c SHA512 98a6b35663e39280573abb52a05bf6642698786b380726426ebeac5ab84da711de52bfecdb0af5997bdbd7d1394eaf4fd984510a37946e3607c88037882068ec
 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 0194f284d590..c0fcef606f2b 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-fbsd ~x86-fbsd ~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 ~sh 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 a079bc01d1de..461ea69dc1cd 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-fbsd ~x86-fbsd ~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 ~sh 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 c260d5edaea0..930bfcbbc690 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 1753 BLAKE2B e86ec9678222c2c6db62519aa6fc2838a88ce2e6ec9ea700a8fc8748b59a18cd4fd6c489cf866d43394352ddc470df0098e49d56e918abd9938e5b420dbcfe13 SHA512 e842f8d972f82f218d5426a819b00b3c44690ec2437fd5612a06d349b32cb3c87bbc7701cc36f697cedf808f44f18b9f8c26c2170cc8d90652dea98b6b3f1fee
-EBUILD pixman-9999.ebuild 1753 BLAKE2B f6388f72690d3675f71bc30cd0788e534cc7f41c0c631bef3dd92dc92313bd85241aa4c737ab95381c51baccec31d14ea8973a4406a75322333981ccc043871d SHA512 cf3e78e6ce72008a489368627811e079ecaaa9e7a7566d2846d834df97be6d4b39104298398415b737618c49b04bbd04bae6fbead44004241c74cc439d20cfef
+EBUILD pixman-0.38.4.ebuild 1731 BLAKE2B 23595d62da78c3f77390ce44f2135e235035fa8557ba3c5f0da8ae41de5ffbbb589ce74c3ae438a83c5c715927546752b25a92a23999332353514d3e225e11b2 SHA512 a37b75dec6ae3c8ec3f18f710ffab49df25f5857a7af1583fa2972a65267c3acfa13394925d91176ff7fa147a7b0777e6568db4b92f12ad4850477611d329c08
+EBUILD pixman-9999.ebuild 1731 BLAKE2B 1d1938888a233829df28bb28caa95551b0687ddfcc6ff986096348a2a94bf0e96eb0cedb46b02b53977bc58c9a2a27cd178ae60c33f29f23b3eddf407d3050d9 SHA512 10398c86d789d7056907a006cd66d2c2ae32271ef44103487dcaa6880ec322565c8d990f73824a3baf9d4adc3f8a4ebf7ed737203d635bb4118270c61d153c98
 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 91bb30113a62..e1d98ec9a93f 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-fbsd ~x86-fbsd ~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 ~sh 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 95726ead8e99..b8c477a351ee 100644
--- a/x11-libs/pixman/pixman-9999.ebuild
+++ b/x11-libs/pixman/pixman-9999.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-fbsd ~x86-fbsd ~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 ~sh ~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/rep-gtk/Manifest b/x11-libs/rep-gtk/Manifest
index 6f5e8761d969..cfa3a36a0fcc 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 992 BLAKE2B 07fdc83b91f99f1a69af90774e296876f558fa70edc3ef4e1b61bd8a9f59bdfb08384f39d448b6f883068562d9722eb4f00e5b86a8ef5d361b3b79e90311a160 SHA512 c2128a9ddf5704242b74633bc0a0ea601a9bf640361efeb0e34ccb627fa89bbff9f4a5431cb612e63b258779316af85df998ad8c3da17668c6de7a6587ae3ae8
+EBUILD rep-gtk-0.90.8.3.ebuild 982 BLAKE2B 839bc8f77dd0d45613f8173bf7981658932c6697611693c32c7db4589c9ea4b2a66882bcbe125535626d974694f01290da204e327bf3476a446f96648b6a0383 SHA512 9800ebc2dd842a6266afafa719831cbc602908221c4260713411cb918c6f6fadb452314418c257bc6cd499acdd1cba7a7804b494715aa21fbd84c051f056171a
 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 80b9fd2b78fd..e099e52a4bd3 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 ~x86-fbsd"
+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 3717c26e438f..06ed0479befc 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 899 BLAKE2B 856aa9910d949b6fbdbffdf6900ddf74c02619541e8230760861db77ce2c0a2b8a55488123289d18d58ea227a56d021086612ff5705ec68927adb1bfa3892c93 SHA512 f9f4d01dd1157d3dad263a94e677aa7e1d0ae335431f27f1b8818be18c9cabb83809901ad69d77e576d0f3000a4956c449305ffd9d2eabb6c3c548bc5185a17b
+EBUILD startup-notification-0.12-r1.ebuild 877 BLAKE2B bc8155f5d49145db4713b5586970fc0f1bc2e8811c6a42dfd248c63598d4cd8181375a1747a065c7db0ecae1a4c283c9bdb4ed19afb5e69aa76cb95e1b02d2cd SHA512 007163bbdea20a6fa44edf359ca43fd163a428ee5e9e14c65f8f4e5221900983b44f1159dda385a7f514ad724a9180a99ec707962d9da080faac743cbec5cde0
 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 84aab9058959..46df2448200c 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-fbsd ~x86-fbsd ~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 ~sh 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/vte/Manifest b/x11-libs/vte/Manifest
index 11fa1d9acd0a..995cfc90b9bf 100644
--- a/x11-libs/vte/Manifest
+++ b/x11-libs/vte/Manifest
@@ -8,7 +8,11 @@ DIST vte-0.48.4-command-notify.patch.xz 5500 BLAKE2B 88b655403d2bef034604a283b17
 DIST vte-0.48.4.tar.xz 1008296 BLAKE2B 9f946d6909d38896ec80db2a02666d809155997b27109724fb318d28200220f1514fb23e4cdc90263a756914b5db442c947578c8854a535cb960a06f7bc03a77 SHA512 4b75bd881e58b5043bc44e391ef3a826a2c25d0f1bb5ffb890367e11a60b1bcbce091575ede6972a89ae043b39c51897f91fca1faf6872664d602e503d8020fc
 DIST vte-0.54.1-command-notify.patch.xz 3428 BLAKE2B 75b0c22720276300be2e49e8444aa68fed77fb7a6cc6b0e93a5c2d41257626bd60ff1084d68579769cb3d85e7ec567927591746de48e860b138d0c1f24f64cc7 SHA512 a53da569f8168c8e9e21e186dcfc00bf9fdb78a0c767ba35033c1c1e4f836406b4d9bf70ee3e071f6c749fd6f72101a6960d201617bd0bc23021e1eeaac6fd0c
 DIST vte-0.54.4.tar.xz 1087748 BLAKE2B 65fb762414e832930ce1519dc99fe306b3c9c3860bf8116c29e66b758178d1f0a52705cd6f7ab1be30374fb2956a01aaccc8f6859d0af971f2037809421bb502 SHA512 7e0f4140a4c474fad9a48eaf0e4c29f83e7bf50719087983c238b362c6303824836c34485eb2ca135be0961fa4b83a318d08ef70d4cf0dab0d37dc2e36710c41
-EBUILD vte-0.28.2-r208.ebuild 2962 BLAKE2B 7004c56381a05ed2c0c309736581f2e03478faae88903ca6eb2b74acfefaf37464fc8b1f1a077d3bff1344ad6a60383f4338b0a27ce2521bb0f68727eb252da6 SHA512 bf607001b0dd305cef30e4f1ae3389b73ae30c747a52915e4dd3df9bb051c44f29317c591a2d47add9bc0e95559ead75155338a69acd31fea9fb79c57f18577d
-EBUILD vte-0.48.4.ebuild 2454 BLAKE2B afa4f22fe6dc8cca9404be315b8f483ac710ca25f2b0d51077350191789fa9369f3d0683d7877117f671ec0b005caf2498e2a6f8cac325d17405d1f2c6a857c8 SHA512 177d216a4ef222f60fae1cd77aa1e0605d02e5c32f22f1726c5900728689b637637b0077fcb34144eb56d0389b82d88f642dd36ba989446cd591de0e4a436ed2
-EBUILD vte-0.54.4.ebuild 2372 BLAKE2B f06d6a983494e7e9d3f5855614c878f1823dec35cb6278c391040092237ceb5886ff1b9d73ecbd492338e8ffd26711ea15aa9ba3b35b2971ebc2f530cf390813 SHA512 5b9d03b07bb8036e9f07fee6320d974a4cf671385a6696ae65158f5839ec08d73e493c1a7b82ca2755e9a8a50f8ae687c721f26ae6d21cc9514c963108523590
+DIST vte-0.56.3.tar.xz 1100584 BLAKE2B 7fd1e041c52aab93d95d6ce91f6dd7d4bc9080e22cb82041d1636946973f1eee86e257f2c357af93417eeec52142edcb7df3bdbcf90727e40fb61a1e4b2d9292 SHA512 f78b3d532ca47e53c1bb51db6780697ce4692d493c0030d2dc4beb63a2595e44a43eb409ee31b94e4551eae259ac1baa8f06825a02fd66df8352e192f4ea1988
+DIST vte-0.56.4.tar.xz 1100952 BLAKE2B 3c3ec69f4078bdb07a4501df4aeb31aaeb7f9fa5a4631152d486fbb2c950362612cd9dff4abe25b93da6c712a37a20ccbf050ad33d96ec7b997bb1409189f60b SHA512 5a6c79b30f07c1f5848ef59028864d893cc605b9ad8f49ae819958aaed962d2ff96baad379f126381b8bf00015003c5a6dc28c792e4e050ba35090338bd7dabb
+EBUILD vte-0.28.2-r208.ebuild 2952 BLAKE2B 40d1d998937dceb5b3f614a4c5ad959721463b4e11829f3618a54d60c3ae7f854dce7e218eeea7a8dbc79b760f39f04f3c94daa8dca4a307ec1e3a2a6023323a SHA512 06889f2d68a032d8b68bcc8815b0641bb7254945514988b32547cc9c3f4e032bdf23279681bb8c5fbb4eb6901b0f064b299c69ea53a188c008ebabf7e6ae8fb9
+EBUILD vte-0.48.4.ebuild 2444 BLAKE2B 3b5f8f9758b15039aacd4dd88845383307802cb8069e85616e0979d5e9f4167927d41c77e83eadc5d006ba0e750fdabb8d9a0cfed0ce0c4344176ce4ae4839c1 SHA512 4612220c197a3fa90170e5e97e52ee6a1ac63a61f6d346f5d00a315b359a3a80935ef5e9000966e4aea68ef1fc1bd61199c6ae229fd4075fbb8148964c7f31f8
+EBUILD vte-0.54.4.ebuild 2362 BLAKE2B 4fd6478ea2fe7abf6b56d4ccbcb2edd53ec112b4bbf01393d2dd59bdc612909aa535ef92cdc00be191ba87865af1618facd805909cfa1bc5e19118526d16b9d6 SHA512 9b2698e69433cefaa16b21089b4d42565d6baf60f195780ee481f4f7aa39d80ecbd186ee4ee57d0152fdd84bbb7c0a47ebb0c7ca46dae808c4683c86d1a2ab2b
+EBUILD vte-0.56.3.ebuild 2287 BLAKE2B 667fd7416f0f552d15e243ad688f83e46f0126ef65dcf7b8e9ac8d27ebab17298f7ffd17b66de9e1bd072adf596b757cef91b2af2288c56aa41b8ab5b0fb432e SHA512 7031557db7b036d17af586af95539db8c635f30edebbaad596178f86d6958a11326f7155ab37e83fa4120bb575f67641932dd39c0445f0da252e731d08007c18
+EBUILD vte-0.56.4.ebuild 2287 BLAKE2B 667fd7416f0f552d15e243ad688f83e46f0126ef65dcf7b8e9ac8d27ebab17298f7ffd17b66de9e1bd072adf596b757cef91b2af2288c56aa41b8ab5b0fb432e SHA512 7031557db7b036d17af586af95539db8c635f30edebbaad596178f86d6958a11326f7155ab37e83fa4120bb575f67641932dd39c0445f0da252e731d08007c18
 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 ee46bf6bbbd9..ad2f3425c457 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 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh 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.48.4.ebuild b/x11-libs/vte/vte-0.48.4.ebuild
index 779dabd7b871..5ffe7d62e34b 100644
--- a/x11-libs/vte/vte-0.48.4.ebuild
+++ b/x11-libs/vte/vte-0.48.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 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 REQUIRED_USE="vala? ( introspection )"
 
 SRC_URI="${SRC_URI} !vanilla? ( https://dev.gentoo.org/~eva/distfiles/${PN}/${P}-command-notify.patch.xz )"
diff --git a/x11-libs/vte/vte-0.54.4.ebuild b/x11-libs/vte/vte-0.54.4.ebuild
index e11d9d2ec6bb..5aa7db15493d 100644
--- a/x11-libs/vte/vte-0.54.4.ebuild
+++ b/x11-libs/vte/vte-0.54.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 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sh 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.56.3.ebuild b/x11-libs/vte/vte-0.56.3.ebuild
new file mode 100644
index 000000000000..a1d0b27dbcdd
--- /dev/null
+++ b/x11-libs/vte/vte-0.56.3.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+VALA_USE_DEPEND="vapigen"
+VALA_MIN_API_VERSION="0.32"
+
+inherit gnome2 vala
+
+DESCRIPTION="Library providing a virtual terminal emulator widget"
+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"
+REQUIRED_USE="vala? ( introspection )"
+
+SRC_URI="${SRC_URI} !vanilla? ( https://dev.gentoo.org/~leio/distfiles/${PN}-0.54.1-command-notify.patch.xz )"
+
+RDEPEND="
+	>=dev-libs/glib-2.40:2
+	>=dev-libs/libpcre2-10.21
+	>=x11-libs/gtk+-3.16:3[introspection?]
+	>=x11-libs/pango-1.22.0
+
+	sys-libs/ncurses:0=
+	sys-libs/zlib
+
+	crypt?  ( >=net-libs/gnutls-3.2.7:0= )
+	glade? ( >=dev-util/glade-3.9:3.10 )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.0:= )
+"
+DEPEND="${RDEPEND}
+	dev-libs/libxml2:2
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.13
+	>=dev-util/intltool-0.35
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	vala? ( $(vala_depend) )
+"
+RDEPEND="${RDEPEND}
+	!x11-libs/vte:2.90[glade]
+"
+
+src_prepare() {
+	if ! use vanilla; then
+		# Part of https://src.fedoraproject.org/rpms/vte291/blob/f30/f/vte291-cntr-ntfy-scroll.patch
+		# Patch distfile for 0.54 series is re-used, as only git hashes and co changed in patchset.
+		# Adds OSC 777 support for desktop notifications in gnome-terminal or elsewhere
+		eapply "${WORKDIR}"/${PN}-0.54.1-command-notify.patch
+	fi
+
+	use vala && vala_src_prepare
+
+	# build fails because of -Werror with gcc-5.x
+	sed -e 's#-Werror=format=2#-Wformat=2#' -i configure || die "sed failed"
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	local myconf=""
+
+	if [[ ${CHOST} == *-interix* ]]; then
+		myconf="${myconf} --disable-Bsymbolic"
+
+		# interix stropts.h is empty...
+		export ac_cv_header_stropts_h=no
+	fi
+
+	gnome2_src_configure \
+		--disable-static \
+		--with-gtk=3.0 \
+		--with-iconv \
+		$(use_enable debug) \
+		$(use_enable glade glade-catalogue) \
+		$(use_with crypt gnutls) \
+		$(use_enable introspection) \
+		$(use_enable vala) \
+		${myconf}
+}
+
+src_install() {
+	gnome2_src_install
+	mv "${ED}"/etc/profile.d/vte{,-${SLOT}}.sh || die
+}
diff --git a/x11-libs/vte/vte-0.56.4.ebuild b/x11-libs/vte/vte-0.56.4.ebuild
new file mode 100644
index 000000000000..a1d0b27dbcdd
--- /dev/null
+++ b/x11-libs/vte/vte-0.56.4.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+VALA_USE_DEPEND="vapigen"
+VALA_MIN_API_VERSION="0.32"
+
+inherit gnome2 vala
+
+DESCRIPTION="Library providing a virtual terminal emulator widget"
+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"
+REQUIRED_USE="vala? ( introspection )"
+
+SRC_URI="${SRC_URI} !vanilla? ( https://dev.gentoo.org/~leio/distfiles/${PN}-0.54.1-command-notify.patch.xz )"
+
+RDEPEND="
+	>=dev-libs/glib-2.40:2
+	>=dev-libs/libpcre2-10.21
+	>=x11-libs/gtk+-3.16:3[introspection?]
+	>=x11-libs/pango-1.22.0
+
+	sys-libs/ncurses:0=
+	sys-libs/zlib
+
+	crypt?  ( >=net-libs/gnutls-3.2.7:0= )
+	glade? ( >=dev-util/glade-3.9:3.10 )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.0:= )
+"
+DEPEND="${RDEPEND}
+	dev-libs/libxml2:2
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.13
+	>=dev-util/intltool-0.35
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	vala? ( $(vala_depend) )
+"
+RDEPEND="${RDEPEND}
+	!x11-libs/vte:2.90[glade]
+"
+
+src_prepare() {
+	if ! use vanilla; then
+		# Part of https://src.fedoraproject.org/rpms/vte291/blob/f30/f/vte291-cntr-ntfy-scroll.patch
+		# Patch distfile for 0.54 series is re-used, as only git hashes and co changed in patchset.
+		# Adds OSC 777 support for desktop notifications in gnome-terminal or elsewhere
+		eapply "${WORKDIR}"/${PN}-0.54.1-command-notify.patch
+	fi
+
+	use vala && vala_src_prepare
+
+	# build fails because of -Werror with gcc-5.x
+	sed -e 's#-Werror=format=2#-Wformat=2#' -i configure || die "sed failed"
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	local myconf=""
+
+	if [[ ${CHOST} == *-interix* ]]; then
+		myconf="${myconf} --disable-Bsymbolic"
+
+		# interix stropts.h is empty...
+		export ac_cv_header_stropts_h=no
+	fi
+
+	gnome2_src_configure \
+		--disable-static \
+		--with-gtk=3.0 \
+		--with-iconv \
+		$(use_enable debug) \
+		$(use_enable glade glade-catalogue) \
+		$(use_with crypt gnutls) \
+		$(use_enable introspection) \
+		$(use_enable vala) \
+		${myconf}
+}
+
+src_install() {
+	gnome2_src_install
+	mv "${ED}"/etc/profile.d/vte{,-${SLOT}}.sh || die
+}
diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest
index 3408d2c4cbb9..8f0312bf7098 100644
--- a/x11-libs/wxGTK/Manifest
+++ b/x11-libs/wxGTK/Manifest
@@ -10,12 +10,12 @@ DIST wxWidgets-3.0.3-docs-html.tar.bz2 23803675 BLAKE2B 181305a2b8935adee8d50873
 DIST wxWidgets-3.0.3.tar.bz2 20054446 BLAKE2B ebbe977a59f215fb2e35300aec91ad6d042d099586c4f6624d817c689feae090ff6df5718baa94a79e8e46120a6b4a154a7e9a584e14363e832602841502f0f6 SHA512 dfe53682d7cda1d460f336a890603c4e823078be4b05e7cf43ab36cb49247f702808aa939d9311705bdf5f96eaa076e7a8f77f4415bc07c5bfdc19e5deff1dd1
 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.3-r300.ebuild 5056 BLAKE2B 187c4e043e912beee9a58c9796866493fe83b85e5c814b30029bf5e4d92a3c561d814cd41e635028d97b9e9d8b7dbdb9b19694023caed063976b9ec1b919d5fe SHA512 aa1ba5f27f7593e0a3f57010509169173ab6521f66890400d2f654f636cbc154723cc2fea403c02bdfca516ef7ec5cf83e71be74ef5cdc543b2676d01ec3d65e
-EBUILD wxGTK-3.0.3.ebuild 3982 BLAKE2B 5b49474a6ab03648d801c2cc1e1df298bb52b2cc61c2e957368f1d2bb06f910d20b533ab1cf80dcf9fdf124b9c37b56b9233b775e3fc07803173d440e3a28e29 SHA512 4c63f058ba1c7eded7978a9adac5637d3d4b40de6cdb92eb079eb697a3792581a32641f4d8e6062181d1c2e763e2528416691f5b4fe8d88d7bd41092eeda0509
-EBUILD wxGTK-3.0.4-r1.ebuild 3989 BLAKE2B 114505f94787230c4dd9cdf61211178fa0cf738ffccee3d73bda054d6611286084a7025fc1317508d93d263547cd90414a78ca619f328407fd30f1bc49c2826d SHA512 481a9bad6508a6bddae036838394560a82aea6be5591ec6b53e56e97aaba615b70486362bf142497e0980c8a25105a6730bae6dff6cd6175cfac0f636ed72581
-EBUILD wxGTK-3.0.4-r2.ebuild 4029 BLAKE2B 1a694bfe23eff849225ba8609da19af4df65f106ab10a42ad2636d953e11d72e1e9d96b4997180ae413a85e3c994b517df51f8ef78741cb8607bfb503320507a SHA512 40c7efb74afc2f9427c60870f1dcf8d14874fb730856eca9e2af75b69fa872235053c9df85ebee21b64f4fcdcbaa7dac118d2ce54969f4df228054ea25012a88
-EBUILD wxGTK-3.0.4-r300.ebuild 5206 BLAKE2B 2dd0c671bc03e6a1d5e1725c04abfe182ddf9e580a20fc5c191d6ae108cada7df303514022feff00e40c76a051d34348c1f1d8ddcf7a7c1f69d1d8ae924a142d SHA512 a529c3de9c9bcd54770661ae1861a1331402153018969eb592b1e04e743a8faf0ad8c8157151da29cc84f55fb8854bcf12d3205c25953d7ac0950b0d0f6886ff
-EBUILD wxGTK-3.0.4-r301.ebuild 5206 BLAKE2B 3f3b13b90dfc95527d7c2a0aaa31728f5a299143cb43b7faa5077167e9191273e9f150ac1f2e5b8be90b9d11d2d9c5fb8603254c6a22794037e85fb8d0d58a9e SHA512 4283fc65d9284b98ccbffc689164bbdbe70d1b9160003b9c722a855ec58b73ea80f57efba8320b66ea6124a9197e8fa76c5aaf49bc294491c4abb1867507e34e
-EBUILD wxGTK-3.0.4-r302.ebuild 5256 BLAKE2B bec5507d4187e8747cd09a4355114e85c2d7ed3cef57b7f6c68cba094449b331f82d87ae2d9eb1d8a2e5f8ded854d676bd10f33395ed6393b8ac7a1a3f39b0d1 SHA512 8f82e33fc023ca59eaad59687a1c5cfd08392a1d122709a78e27dd9d4d66d91b69e95218c7c79a416589bade18dbb090abb3d85829921a01f3480168416a2be9
-EBUILD wxGTK-3.0.4.ebuild 3978 BLAKE2B b11f966c518da65ab09703128eec655f13fb5713b2736c934dd82e941ec5031cd8ca1448f2895df5210a91f2a91dd40ca55129cd3016bb2bf4a83a3feb78f902 SHA512 39ad229bab491bec77d88336b7ff036aff0f5628e8648ed933d0573a9dae8ef1107ee2a0d06d73efb54012094834b22cfc7e1121f6d9866d80e7d3460e893aa5
+EBUILD wxGTK-3.0.3-r300.ebuild 5046 BLAKE2B 686dd2de3291981d965c9a30c2a3fd6d883217bd0a91729e6c751462e74022295326ef3d1d23dab5a0ee1b4bcccb627e49a2e6d6980ef62b7cbd26a0a3576c65 SHA512 a41f3ff4af20034a8b4fa6faa7fa8b0e81769d641f4cb6ea214d9f100c1ec6ca99cf30b9218d65118af7bca31a740e44445c28b6801c35044ac9495e25a1ca26
+EBUILD wxGTK-3.0.3.ebuild 3972 BLAKE2B e4e180572b8a8edb94fb0f1339806a37d1b099333eff3dba6891629a3076b2efb36e852919eaac8cb3ad43941c7d1fc2d13fd93f67f67199f136c8ab75bdc038 SHA512 71495f3150fa391260a9d459dcc5164aecaca4dc802e9a05e8fb269ad37e6836b51c925e896fd52d63f60dc4f801570178c5ecbcd885f729b588ed9d0d4c4b50
+EBUILD wxGTK-3.0.4-r1.ebuild 3979 BLAKE2B 982ab0b79b36078acea50118a213c1953fb8290476a2a54faf32edd955954d6f9fd22fe0abccc0906121c930993103cffd17e11491908f3e7e079409cdc1a5e6 SHA512 0df4930e67b6c3dc3d20161ef8ff8bac0e046d4dfd65f83e5db0e787788b55b4f1e733dc288c1a4534fb93fed6a00b0ccc8b83fa732c245398129027257cc703
+EBUILD wxGTK-3.0.4-r2.ebuild 4019 BLAKE2B cd50069649dc49d052f05deee87df25a1c27ec1b79610e9ada579580b74f30be7bee1b14f62dba2760b4b2fb74382d0d23c4ff7a2e89f374878eecc3e25472fe SHA512 27a512e2cc2f7029b4a5319125344d31cfe8cc912fe3ed1ec937121b699c90cc7c431ccb4a1badcad71fcbd54538ff836cc212b8313a23ea9e5e43877b40fc86
+EBUILD wxGTK-3.0.4-r300.ebuild 5196 BLAKE2B eb76e91933d3e1c4d287c45e01057ec98ffa1b6319b932c4fa1da18f8a657a9e395135601e9b486434be55f7b26ba206e7f30d0947051016ce8051262cf52b6f SHA512 b37d2c799a516bfb4a31fce5c9471c025680795acad84f977935c6b85e216667af02076ca36490293867431e2227d633740d4579871288977d46e47230cf6007
+EBUILD wxGTK-3.0.4-r301.ebuild 5196 BLAKE2B 5acd5b07b33a893139dbe20d697bd0e4e155d5b936a527853ae35930fabe4581981d891a03814d821434dd20b61b25cf36d514bdd02d91e5f9dcae8b04c789f6 SHA512 e4b9e789f0a333d030e4bf4d7a2ad2142b8092b6790f7106e8b8a9898e694382eb120f432af8e5d09f25522fc9b227bed70b6018cbe55dcae00579dad904b49b
+EBUILD wxGTK-3.0.4-r302.ebuild 5246 BLAKE2B 9b49c08d97448521c72631cb842f03d3fe959cedd0e06245cd325913b54b4242e5b791bd2dd9fc81995ed992d7e883b31c59c154f4de22d5bb1fa306f6a884c8 SHA512 4f6a4e59078a6d6a4bdd7f2841d88f1d1a4cb11995b039618cef0cf21f784e9c8be51770e536fcde9849555cb5345e33da7fd7d9824368bf46e6cfd5020711af
+EBUILD wxGTK-3.0.4.ebuild 3968 BLAKE2B 9f52ba9de546e02a417c7c0bba94574510c7c5d0a3c6bf7ea6aa90b272b6ee3399d219809e366eccd7a34944cbff37b6e0f4b763c147735d58d96046360be829 SHA512 04ed82d44ca6a7e6de0521e5e12e964f46c21f0638e74c3466c31d038b09bde3d2c3dd13b7d498314aa5f1ca68bd9e885519183f60a77515041262f0814359fe
 MISC metadata.xml 759 BLAKE2B 4bafb6bd1d082eae5773d84fb116779f337e662090c4d01e22296f891114458de4a50f1f10775b61f06f22c6db7d4288c66c0c59836cc362298c23fecef499af SHA512 a7bf3b8cecf7ffba0dbfded9884fb7df3866c1a00c473f9ecb2d3fc1c84c5713dcde949f6acc35ee688741efb2da74fc189ed9c58b24bd2874c7e95908eb1f60
diff --git a/x11-libs/wxGTK/wxGTK-3.0.3-r300.ebuild b/x11-libs/wxGTK/wxGTK-3.0.3-r300.ebuild
index 30890d5025f0..4fb40d29f627 100644
--- a/x11-libs/wxGTK/wxGTK-3.0.3-r300.ebuild
+++ b/x11-libs/wxGTK/wxGTK-3.0.3-r300.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.3_p20180104.tar.xz
 	doc? ( https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}-docs-html.tar.bz2 )"
 
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~sh 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/wxGTK/wxGTK-3.0.3.ebuild b/x11-libs/wxGTK/wxGTK-3.0.3.ebuild
index 866cbd7ed0a7..eb34842c551b 100644
--- a/x11-libs/wxGTK/wxGTK-3.0.3.ebuild
+++ b/x11-libs/wxGTK/wxGTK-3.0.3.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.3_p20180104.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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh 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-r1.ebuild b/x11-libs/wxGTK/wxGTK-3.0.4-r1.ebuild
index 56faa601ce26..cadb5dd21588 100644
--- a/x11-libs/wxGTK/wxGTK-3.0.4-r1.ebuild
+++ b/x11-libs/wxGTK/wxGTK-3.0.4-r1.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_p20181106.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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~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-r2.ebuild b/x11-libs/wxGTK/wxGTK-3.0.4-r2.ebuild
index 13c4e43a5f02..62e063a1f837 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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh 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-r300.ebuild b/x11-libs/wxGTK/wxGTK-3.0.4-r300.ebuild
index 2556c14de1eb..cb5280813658 100644
--- a/x11-libs/wxGTK/wxGTK-3.0.4-r300.ebuild
+++ b/x11-libs/wxGTK/wxGTK-3.0.4-r300.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_p20180507.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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sh 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/wxGTK/wxGTK-3.0.4-r301.ebuild b/x11-libs/wxGTK/wxGTK-3.0.4-r301.ebuild
index a4027d4e263e..66769f55bf3e 100644
--- a/x11-libs/wxGTK/wxGTK-3.0.4-r301.ebuild
+++ b/x11-libs/wxGTK/wxGTK-3.0.4-r301.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_p20181106.tar.xz
 	doc? ( https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}-docs-html.tar.bz2 )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~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/wxGTK/wxGTK-3.0.4-r302.ebuild b/x11-libs/wxGTK/wxGTK-3.0.4-r302.ebuild
index 84bc2610f00c..0b9aa87a724e 100644
--- a/x11-libs/wxGTK/wxGTK-3.0.4-r302.ebuild
+++ b/x11-libs/wxGTK/wxGTK-3.0.4-r302.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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sh 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/wxGTK/wxGTK-3.0.4.ebuild b/x11-libs/wxGTK/wxGTK-3.0.4.ebuild
index dfe66ea8f45b..a31c63e26a38 100644
--- a/x11-libs/wxGTK/wxGTK-3.0.4.ebuild
+++ b/x11-libs/wxGTK/wxGTK-3.0.4.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_p20180507.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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh 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/xcb-util-cursor/Manifest b/x11-libs/xcb-util-cursor/Manifest
index 5c58b6be12f3..81f48221ac65 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 1370 BLAKE2B 622b3e2558863251cb88568230850eacd966f571e367b2b4e84575e4bad54cc604f4c2d4ce552fc0378194f41afe2ac782070757691f4ad77451ef34452e33fe SHA512 83f20284a3091ab71370c036e84e8cda053b433a4be2533952dd4c496c1c18545085a111eae575e5019753b93e7be429e4138f6e0b386548880d2a2a64c610eb
+EBUILD xcb-util-cursor-0.1.3-r2.ebuild 1348 BLAKE2B 2ba24cc7b0c776d4b45acc4436f6c183b62bb91d7bf543dbd665b130469a58cb3e20d1d73a6da32abaebad911242f70aa7c89d68cec1cfb2ca55100907a7731a SHA512 f569bb941fb180c24008ab5996325d5ca3bb4d463084f7419548a3a062d119058a7dd6aeeeee02cc22af6a430053250a3572ae9d9e4a46d30b6ef57eac57a828
 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 53b7223a8b19..1834b93a127b 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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+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"
 IUSE="test"
 
 RDEPEND=">=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
diff --git a/x11-libs/xcb-util-image/Manifest b/x11-libs/xcb-util-image/Manifest
index caeb2dc30b68..c6da297ccfb7 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 969 BLAKE2B b660b1aa90cbd26dd3db039b276db0ed327144c3bbca461623088afe265ef1da09f8d18a612dda8adde69e160f9112e02874992f66182a1e10522a40777b572a SHA512 2e9ea0a6705caf1c86e59feb53c211225ba63380c12fc2fc906d453ac4e680a925f12a85b17bcb793fe92652f0c916b508842f8f04cbe86cfe8ec0da17522655
+EBUILD xcb-util-image-0.4.0-r1.ebuild 947 BLAKE2B f9ea878298f6f3b67620806f10327fbd3ee4b431564bbb5aa0b96bf95a79f635899d24c9e790266ffc6c41087a8dc333bb713024411aefa8ee996ea34a8faeb7 SHA512 cb0e0d134de82c7bed16e07bb219c81ddfecd574cffe87d05c215865afa98ceceef1e52d7fd0c7c6c4cba30189f7def534a0228a50c06c8cf12cffb121febda9
 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 65e88314ce5d..78f7fa079303 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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+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"
 IUSE="test"
 
 RDEPEND="x11-base/xorg-proto
diff --git a/x11-libs/xcb-util-keysyms/Manifest b/x11-libs/xcb-util-keysyms/Manifest
index df0bcc9d4fe3..94cd00cb75b1 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 916 BLAKE2B df46ee21a0caaf24f78ddf5a165607872d5fcc76e03f2fd250d173204a220402a6a77d41c735dd622d4a2479ca06c2562e6dc9f7738ed1b09371639e5c73a25e SHA512 331fb025852e480e304d139d1beb64392704f26ec9d9abb3d2e89a7dbf615603019efb80ca0ee6e0a2be5f2882f12399ea1a544a52f6ed04659ffa90f3cf739e
+EBUILD xcb-util-keysyms-0.4.0-r1.ebuild 894 BLAKE2B 48e1fdccee45e302cb40c8238d11dfa12edb5aeb468137d27a0c4f78bc286e247337477f4f287de309e207544235e0d6d59dca03ba42c310aab6cf89feedb5bd SHA512 2b144a173eda2a36dfa353fb2d730a9ab63b9d73f40310ce46d31e76192f5b9b0a8a81eda3fcffb050616b4b5ffa5c744b50a6fa174a4b40a76e31291ee3af85
 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 0390fce9d628..90590ca324eb 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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+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"
 IUSE="test"
 
 RDEPEND="x11-libs/libxcb:=[${MULTILIB_USEDEP}]"
diff --git a/x11-libs/xcb-util-renderutil/Manifest b/x11-libs/xcb-util-renderutil/Manifest
index 8b24087601cf..298361966652 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 936 BLAKE2B e1356b9a5cf902a8ef2da8afbeaf84b9ad85802d7730ece7142903f29281b17d1454c1ffec07f7c8c8e9d0189515a748c16aad3a8795c2ba0b636b71f39cfeb3 SHA512 914ec4827a88a0095f8fdde81c34b0554d37c2420ad964c9fadca5c2d05da73647e6d29a96ef42dfd90951bbfc45ee724270b596a8f9a6a4c49617269c15c50b
+EBUILD xcb-util-renderutil-0.3.9-r2.ebuild 914 BLAKE2B a73f6b8b75ce8640158cb9026ad29bd67fff14f74a11d896ea970f2a0916fbc18805e4ca14c9c619eb8a7c3c51a69a8ee5d3e00402dc2e4c03a33c9da2d29836 SHA512 64bdd4d5ae2e91114dd3385da94846c827bd01999ffbb74878764f8656a189edeeda19c89a9b5eb13261efaac7deeaa7b365fb79128047517a277539d22d6db4
 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 1c2e9b8587d5..4bc4fe6626e5 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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+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"
 IUSE="test"
 
 RDEPEND=">=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]"
diff --git a/x11-libs/xcb-util-wm/Manifest b/x11-libs/xcb-util-wm/Manifest
index 82371e034d59..0fefe6a70e51 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 917 BLAKE2B 1795b94d133f4271c2343089d560df2346d398c38dc80aa2d6820d02b9ee402cdd1090f675412a412322c6c7303703d701dc5b139cf0c7527ed61aa5d4a83b31 SHA512 c7cde7014d7ec006c007d3f3a460153e6bfbffab5fafb80ccc49d2afaaa6b3bf4f654161e118c7fa6e1278e82f9bdb020d1d50819cade4dc4f3388e2e79050af
+EBUILD xcb-util-wm-0.4.1-r2.ebuild 895 BLAKE2B e29f3e9f468e0b2759775aefd9de42e4481a47739edc3d4c031620a2e840377eb528c9b79631beae587129e4a99b943979a387bb686cf7b1830543f937653ffe SHA512 d8c4929768a18a36c5e6ee21c7c66d3571899510b39fb52f024023413ab7c9385b8acdeaaf6978a9b33a8f66502fdded5a98ad36ca5b2d8f8b676c0bbbd50a47
 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 db1390311f07..2514f2919205 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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+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"
 IUSE="test"
 
 RDEPEND=">=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]"
diff --git a/x11-libs/xcb-util/Manifest b/x11-libs/xcb-util/Manifest
index 6cb1b9786a56..b1c5694807ba 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 1190 BLAKE2B f6fc62390771b3c429f2dbb6dac6aae0f5ab05e8e0cbc52d299ae425afb1962c8d5cbc9be42d6bd68d9e03c364a9291e54b463fec6dd88f6a82c04549af6de6f SHA512 ef0b93ade3b7f5083c0adecdc066e6fb088ca4476097c45895d5b618672060d11a103e06cd0ac6cda98e15af6c8558b3553e927171221deb701f1170971f222c
+EBUILD xcb-util-0.4.0-r1.ebuild 1168 BLAKE2B b54d56c4ce29b23565c5d9a2e8d405710d390c671f0ecfd6a77e8d277c9efa5dc0b926c1516105fe68fd062c2e0223270e8b820adbf673e46acc5979e0a89878 SHA512 92173e408e8b11df4448c98e3399c1933a1fb32118c9cf91b7a88622051e04205a5324043b2ab2d4b9ba874c038604880eedfe845d4824e6386de9631f954b3d
 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 019f7ed03500..c026a21ea9ac 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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+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"
 IUSE="test"
 
 RDEPEND=">=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]"
diff --git a/x11-libs/xosd/Manifest b/x11-libs/xosd/Manifest
index 47c06b2eafc6..761fb82aa8e9 100644
--- a/x11-libs/xosd/Manifest
+++ b/x11-libs/xosd/Manifest
@@ -1,10 +1,6 @@
-AUX xosd-2.2.14-m4.patch 242 BLAKE2B b10c0b6178ba3ecae2b82e4408fd5742e6c211146b3172f8a3eb9a10873b15eabe5fbf0c3deca59c97deb1a795432064cf6c25f1826d745b91929ec7cf4ea361 SHA512 022be1d08f8798b98f647023f7c90774bd6a12959de0c2a621ff730e8470af109e9dce06bcdbaae64145ade4a277bf301dff3129597cda7baf6059a35873eecc
-AUX xosd-2.2.14-makefile.patch 480 BLAKE2B 2ddb462b8d7945e069e30338ee6a084cc5f46c56e0431c7f72b90343750a3d2c86332064a6423befe4006ba4d5bd7a7b968ac9079a93066af39a592c255aa1fd SHA512 3a51c49358d432e4fe8a28aabfcfa5a457b8334815298fa8b9b313ca6c2caacbb261e65fcf92df71f4e5fd0042a43ac02d06bc842cf299ba59c182d6de21c249
 AUX xosd-config-incorrect-dup-filter-fix.patch 520 BLAKE2B fe345fcb77c8fd5788ec55d2baac5bc0d2efa0242939c6d0dd2bbc63b65ea62eb9929af84d6645a5ae493313691670d3f9a46728c73d1b1809269d8647e25a6d SHA512 cd7726a0c616d11d20eabefca3ff4a63c76e49b1e725ddc5f3ab3452e64a46e94e5584e0779cdc4b23705fb1b17a8d2535bdbb22fd1b0ee88782bca1d4d5c248
 DIST xosd-gentoo-m4-1.tar.bz2 5043 BLAKE2B c855a8c114911c2bec1bd582c19ef09f731a8df2c22a400a895d63ad5c4a32ad393330b47ee75fb7d8943a230df6d750094457e2021025035e91e5b1cf470e6b SHA512 fcf4d8a77cc80bc04a444a4faa9e072ea1e00950b3ce685b7944302d2ee3ebdfc5ec29ccb311495ee2e1fb5e61cc2d49350b303288d1d86430fa6bc8b3772483
-DIST xosd_2.2.14-1.diff.gz 8616 BLAKE2B b9eb96eee0bd561923507fb2bddf87e8f9ad986aae1cb8c820d1bf3de00685934b3813dd0e697406855afe1c0aa5111e214260cb2e425725b479a23617fe5c75 SHA512 257ada9e0261c45c4c182acceeb24b95bbce08ec2ccae7ef49f9c5ee7a1e9995bd9527df725e0a871d48fa444899669320dc536674d0de71b766e9106097f86e
 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-r1.ebuild 1099 BLAKE2B a9efbbb9e7b743c9d04f1ebc6c803c427a312ea3e792c1fa5903136a3cf32fee16c1e53358dbd6e9d890c59d7b8665557c247ab8014a30b6bd6b18a372e512ae SHA512 b0b66039f6275381f403a9be4f5354cd4bfbee8b8ac006aff95fe20b0876dbdb866ea01be8ea3b5eceb374cdb21f5ed988edd8d021a44988b0679ee060ba954a
-EBUILD xosd-2.2.14_p2_p1.ebuild 1299 BLAKE2B 17b626b5b5fe3a3575c1c5e920a3540ee3dad816090f4144fb2d020734043d19b1756af3b13aad2be880de7ce06eb672bbad6f2133dd862b4df818fb0b3be995 SHA512 b4c294dec4978c8bb2ba6b16d1505f678877b814c1fc0d9231cd085f829177017441b0a0e5fe80215729d069e4702a5d4931b4df97fb26bdb8f110bff15f5b55
+EBUILD xosd-2.2.14_p2_p1.ebuild 1277 BLAKE2B ac6a515c7169e6661b79ef9664055a28d0969bb6ee4c70aaaf3bf961c3912768dbf6b5fa7fd6956a842b72d10f68ee74531271de670e3cb7ceba09dd1125e8f6 SHA512 e165611cdbed7b6941ef08c2962dd2356c25cdd466014b3f605b6229ad6067d6a57a8dbb5b406a97ced2645d9d5ca71e3b4fb67a13208422907fd76072ff0e03
 MISC metadata.xml 242 BLAKE2B 7363ed5aa4ab2d52ba96610654eeb5e2f2f8f0c2e5ca4f695f6ffa88af926130fcc9ea41257f281b542a45703848ecdf78ff99c89f1fbe51116d8e6234095782 SHA512 cf2d021687f90caa78f0f9738a07a81fb632ff35dd323dbe63b080f3985d9bcc665e5cf8549840e2369d1c4427f9831a0d61d20c4b65bab93794464a98f82519
diff --git a/x11-libs/xosd/files/xosd-2.2.14-m4.patch b/x11-libs/xosd/files/xosd-2.2.14-m4.patch
deleted file mode 100644
index 3e529728f8b3..000000000000
--- a/x11-libs/xosd/files/xosd-2.2.14-m4.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-Fix aclocal warning:
-/usr/share/aclocal/libxosd.m4:9: warning: underquoted definition of AM_PATH_LIBXOSD
---- xosd-2.2.14/libxosd.m4
-+++ xosd-2.2.14/libxosd.m4
-@@ -8,3 +8,3 @@
- dnl
--AC_DEFUN(AM_PATH_LIBXOSD,
-+AC_DEFUN([AM_PATH_LIBXOSD],
- [dnl
diff --git a/x11-libs/xosd/files/xosd-2.2.14-makefile.patch b/x11-libs/xosd/files/xosd-2.2.14-makefile.patch
deleted file mode 100644
index ed6da80fbb61..000000000000
--- a/x11-libs/xosd/files/xosd-2.2.14-makefile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- xosd-2.2.14/man/Makefile.am
-+++ xosd-2.2.14/man/Makefile.am
-@@ -3,7 +3,7 @@
-   xosd_display.3 xosd_hide.3 xosd_is_onscreen.3 xosd_set_vertical_offset.3 \
-   xosd_set_pos.3 xosd_set_shadow_offset.3 xosd_show.3 xosd_uninit.3 xosd.3 \
-   xosd_get_number_lines.3 xosd_set_align.3 xosd_create.3 \
--  xosd_set_horizontal_offset.3 xosd_destroy.3 xosd_create.3 xosd_is_onscreen.3 \
-+  xosd_set_horizontal_offset.3 xosd_destroy.3 \
-   xosd_set_bar_length.3
- 
- EXTRA_DIST = ${man_MANS}
diff --git a/x11-libs/xosd/xosd-2.2.14-r1.ebuild b/x11-libs/xosd/xosd-2.2.14-r1.ebuild
deleted file mode 100644
index 1279eb3dc264..000000000000
--- a/x11-libs/xosd/xosd-2.2.14-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils autotools
-
-DESCRIPTION="Library for overlaying text in X-Windows X-On-Screen-Display"
-HOMEPAGE="https://sourceforge.net/projects/libxosd/"
-SRC_URI="mirror://debian/pool/main/x/xosd/${PN}_${PV}.orig.tar.gz
-	https://dev.gentoo.org/~jer/${PN}_${PV}-1.diff.gz
-	http://digilander.libero.it/dgp85/gentoo/${PN}-gentoo-m4-1.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd"
-IUSE="xinerama"
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXt
-	media-fonts/font-misc-misc"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-m4.patch
-	epatch "${FILESDIR}"/${P}-makefile.patch
-	epatch "${DISTDIR}"/${PN}_${PV}-1.diff.gz
-
-	AT_M4DIR="${WORKDIR}/m4" eautoreconf
-}
-
-src_compile() {
-	econf \
-		$(use_enable xinerama)
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}
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 98ff80fc919a..83b588e0744d 100644
--- a/x11-libs/xosd/xosd-2.2.14_p2_p1.ebuild
+++ b/x11-libs/xosd/xosd-2.2.14_p2_p1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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 ~amd64-fbsd"
+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 9985f2688fd6..4e5fd1c0c2e0 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 668 BLAKE2B f7a98998e6bd7e45fd7802476a38c4d88bd8f892bffc314dae41c07de35b8ced539becb7a23a56b8c58202bc7e72b9373256980b54daccd0f07df90d088ed877 SHA512 ca954aa445bfdb53fe7a1c936a3a03e4680bda05c75f32ccad9d1040a76065b393544866423d2ea338d1a2a10ef9b7072b54665102fbe18cc1f73eeb6163a5e5
+EBUILD xtrans-1.4.0.ebuild 646 BLAKE2B 530cafb2e5a1c3caaaac0ce17d6ef18989fc0b674e1c73b6664eb06daed6a4e245f3ee52c1a525aa1ca2f4545cf0a4be1280d28f7900882b674be8c749e84704 SHA512 09db3cccd4818c1c1a122af1ff7f717bfb542bcff56d67be8b8bc9bc7ab9c6135907f846932c4511f01195ef112b4c65f2864304a56cd493fc600f2169eaba29
 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 516d060aff40..a9392aa423c2 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-fbsd ~x86-fbsd ~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 ~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"
 IUSE=""
 
 RDEPEND=""
author	V3n3RiX <venerix@redcorelinux.org>	2019-10-13 22:19:36 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-10-14 23:22:23 +0100
commit	4b19be30aa626b327c885dae62c559ec0e9fb935 (patch)
tree	76e74807bc479502e13866b581b6bf86734ec634 /x11-libs
parent	30d6f67c98d149508509d5e86f176d558793acc0 (diff)