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-misc
parent: 30d6f67c98d149508509d5e86f176d558793acc0 (diff)
182 files changed, 364 insertions, 562 deletions
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 24dcc9f0cc63..d640268d1b00 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/alacarte/Manifest b/x11-misc/alacarte/Manifest
index 9c516877cf5c..056301f1bd8d 100644
--- a/x11-misc/alacarte/Manifest
+++ b/x11-misc/alacarte/Manifest
@@ -1,3 +1,3 @@
 DIST alacarte-3.11.91.tar.xz 199128 BLAKE2B 711baf87d48b79cf52ad41bc9292c848a0f69477388580b9dddc068c8184178ae1e3c455a5b9ac6d99ef442d4b36544a45852aa134744379fc14b6c69c6a77df SHA512 b4b5ead4ba0b9742ea0530ecb5362afa970125d29750aaf147be6fd477f238b9c360307ce1df2a56330a69cd9c849a0dde4be44b36bf55377f42e30429411935
-EBUILD alacarte-3.11.91.ebuild 1345 BLAKE2B 8090fc298348ce418210e7c235a209f43bd1ac0699509a9e8fd203e76f04f9589eaac72720ee1401eb02993bdf216ebfadfe5210e3807a91a2ee5b72c381abe9 SHA512 e020e5a94f9e008daa483b32d7f9c7799943879ae2b3c74549c1ba43be0f71915b4fe3f7a3962bb8b780ffcc5f693a86a34c5d783bcacc8373bfdb37fcb7e478
+EBUILD alacarte-3.11.91.ebuild 1335 BLAKE2B baa5b6b922f92788c6dbe63ad969f6e512d66edd3fa62f821b6f0e3775861d32377af03132347e5ac610deb0e2170342f548d9f341f7aea2f60aaa8aa13a4b39 SHA512 9bf1bc0ce59f8ff04ec425850d720c7e8f9ec3d3bdfec7dbd1068d292b7fb332bfcb1185a8edcb5a16f8d1a2233b83ddd36290b6550ee5b2cd7ed65fdd14da53
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/x11-misc/alacarte/alacarte-3.11.91.ebuild b/x11-misc/alacarte/alacarte-3.11.91.ebuild
index 957334c13ffa..6d193c90411b 100644
--- a/x11-misc/alacarte/alacarte-3.11.91.ebuild
+++ b/x11-misc/alacarte/alacarte-3.11.91.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://git.gnome.org/browse/alacarte"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/x11-misc/alock/Manifest b/x11-misc/alock/Manifest
index 7db1b31e16ed..fbc0b620e437 100644
--- a/x11-misc/alock/Manifest
+++ b/x11-misc/alock/Manifest
@@ -4,5 +4,5 @@ AUX implicit_pointer_conversion_fix_amd64.patch 440 BLAKE2B 604de647696dc0bd518d
 AUX no-xf86misc.patch 3220 BLAKE2B 1588866bdb372b5bfae031569a981e1fc0be716ec2b96cc46aa4118cd8db3e500760fb90a9394abbf792872d7cf65963daaf47c46a5db87249fd172370396711 SHA512 a27a7dff601c35ad5b41170be0aa3b2453c2b46c679f76ad4ae0b229731aa0d1e13e3c3dfeffbe690e119048a51c76ae091fa3673db8ceecb2f82f81d3857488
 AUX tidy-printf.patch 801 BLAKE2B 3015b266465ac1da7127cbc2c871daa729c22ce97c8bf9e88dff5ec3228192bc81bbc0fc31239add4256b8a0d44a852eb543079fbdecb909db41ac57f43ec070 SHA512 253f731e5be75676ef56ab320ee52625bee17a0a8f2bbb025efb8b9ac8a49da7330e5123bb0070eaa9c01f3cd66fadb85ead65c75c9412e6503744705402e9c4
 DIST alock-1.0.0.tar.gz 71497 BLAKE2B e61a5fd9fb9a5bcc23a535fcc81da7ae2006300c636a6103132125e0c84c18977690e0f44f489788bf8228f0af900638066ab8706ef731fdf32604dc013684e9 SHA512 7f2515410919ef1324019cd8d218650f54537f9fddf1d74bebd255c7572eff9433ded92f2d1f4ee5f352151dd15f4a7f53f7b639f82d4e6f936f831262d508a5
-EBUILD alock-1.0.0.ebuild 1610 BLAKE2B 56c877e764ddb6ca65c70f74b3b6564142e566f52572ae4edf52022289e14ae6264c000129a69f9bc1a757dd4d083d53ed8faa2226be3429c796cb054c6a5897 SHA512 27e25e8264bc7d6e82a0e859a451bc0d949f79d16314384d0d14ec8685b185669e6deac4f15225ca592d813c3838b47acda8b77a473355bf254e9418869b568c
+EBUILD alock-1.0.0.ebuild 1608 BLAKE2B 7ac1986864426e57eb1eba263f573be9ce9ae8959542433108453afe9119ff8c9ae44cf2b54da8a2f1a8236938150ab3cf2347c5727b2d0b0634cca45e17f09c SHA512 baafe0409d511e372116233a1b4b1da0c2dc70f6a2c219acb2574444c550a375e36477022b1d931cf25b12d77cf363966e5f1ad2edfee1d0be5a2f44400669cf
 MISC metadata.xml 602 BLAKE2B 4afdc04e15531b1ebc4312f67e1c3afca07841f4fc0053994b95ea0e1758b6ab6e146ad1d4e67cd816ee01212f02ff6a1ca9ddb25b8085db17e128c724a72bb8 SHA512 6c78760e2037a294560a54f09469b7fd2840379c7d2cdf417c72f7953e18df437fa327e61efbff1346a0ced4eb443f2e23376a247a24e0286ea186eca636fbb6
diff --git a/x11-misc/alock/alock-1.0.0.ebuild b/x11-misc/alock/alock-1.0.0.ebuild
index 92f0dc70f0e2..8488326f9503 100644
--- a/x11-misc/alock/alock-1.0.0.ebuild
+++ b/x11-misc/alock/alock-1.0.0.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
@@ -21,7 +21,7 @@ DEPEND="x11-libs/libX11
 	x11-libs/libXrender
 	x11-libs/libXcursor
 	imlib? ( media-libs/imlib2[X] )
-	pam? ( virtual/pam )
+	pam? ( sys-libs/pam )
 	doc? ( app-text/asciidoc )"
 RDEPEND="${DEPEND}"
 
diff --git a/x11-misc/apwal/Manifest b/x11-misc/apwal/Manifest
index a4e34a32c6bb..f5654699f282 100644
--- a/x11-misc/apwal/Manifest
+++ b/x11-misc/apwal/Manifest
@@ -1,4 +1,4 @@
 AUX apwal-0.4.5-makefile.patch 1796 BLAKE2B cf6ff8051f5fd6ba5659b6bb873aa709f3f0816e87da46cfd3b221e60b004d87cfff660171558e70efc4fe391a04773ae31571764d60d3ad203693a80824cd92 SHA512 e87ea9d0fdc328d46fb9dc345135efdb6b2801da583a1a6dc5569869f2854e062ca3c676c5477a23f0b07bc0557cf1af9a76383115bd44111dd0d17d4ad97f74
 DIST apwal-0.4.5.tar.gz 73999 BLAKE2B 6e20dbe611c305188224bd334750ccb0d3f9a855be74e658e6e68b5c575ce4620f87a2b405a41990df89ea90affef97a92170e7ade0a36ac35f4d7b44acd7ac1 SHA512 a37f5453d49bc276d2e16d4fd739cb9034a841af1a60f723ec705751da1ea77be79e63d6a29a0f16b52f1021368e73e513c9081a3d73f34e0332639f0f243dc9
-EBUILD apwal-0.4.5-r2.ebuild 582 BLAKE2B 15d60ac305b291ac3f1b528d7541c6ec767bb607e9a46d23b8325bb2f50f2a0a8c52480c05e618f5eb3da017b38e4a2fa2dcb3da42424d03686adfec59fee540 SHA512 55ec053855e5a1426dbe8046b8b882a6284212881dc15f7244fe56db015a454e32301ac6e6f3065755b1fd004d5018e90244bf56f675ea4ca52e9dd2c9c4a52a
+EBUILD apwal-0.4.5-r2.ebuild 572 BLAKE2B b51a0ed9018c4c25f20c1c35b6e718d87e0a64395bc3c69d22d7194832605b7489cb70a23081d86ddc49cfc9d4c71460c4dd4b00ace98492da842c2c1ab4c7ba SHA512 8b261cd564fc4dd47a1149510f47e5e3ace8019a53321a19459c14614bf32bcc99428a372b3039114863aad4270c9c4c50815cf0abe002cd3eeb108639717b2b
 MISC metadata.xml 272 BLAKE2B 4dbd2b5ae92564a97b2a06ab0ec6562e8dce2dd636aaf0788ee09f8688ca5d5b6483084a65366dfbe6d144d30170e5558bc5759adecb96abb405ea96a5147285 SHA512 ebe67da08587903b5b82fc194aa3c8f1ab65371f60d2c134928362e089550d9e9fd9531bffe8b676a345b5bf0ab209ce7f50d37d98201a88176f002e17582493
diff --git a/x11-misc/apwal/apwal-0.4.5-r2.ebuild b/x11-misc/apwal/apwal-0.4.5-r2.ebuild
index 0ec395f371f8..90f5f0196d25 100644
--- a/x11-misc/apwal/apwal-0.4.5-r2.ebuild
+++ b/x11-misc/apwal/apwal-0.4.5-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://apwal.free.fr/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 
 RDEPEND="x11-libs/gtk+:2
diff --git a/x11-misc/bbcd/Manifest b/x11-misc/bbcd/Manifest
index 7daf31bd204c..460530b2a1e0 100644
--- a/x11-misc/bbcd/Manifest
+++ b/x11-misc/bbcd/Manifest
@@ -2,5 +2,5 @@ AUX bbcd-0.3.1-gcc3.3.patch 547 BLAKE2B 202470e473c5742608afc1efd42e54cb6e1c0988
 AUX bbcd-0.3.1-gcc4.3.patch 254 BLAKE2B 7ace4e13e7423fd0e54801b9ef5738545068ff47670f887dbc694176971c7e134bb9066bdc85f56959179f17974667f7f5eb9e7e35774fb09f22c548e88cedc0 SHA512 8bee8daa0579736f5678f59023ebe54617106fbd53aa0b938ebcbae1b6d7b15e4798baf7e81ae4b3f84ffe36cd18789639ac13657110271d174039b9723fa737
 AUX bbcd-0.3.1_0.3.1a.diff 1794 BLAKE2B 233815b158b32e738e2849f9bd475cf5c3eabbcff30685c7aa1ac460dca466a4d4c38b6aaba054e39929d845cfeecd37201640e1693cf7707d45e8bb149df240 SHA512 422ae54b3e18e3d9dfaa4adc28e8d0285d127cb28a175fce2772ef4d3577755e95c43bdd15e1000469da64dd9b6693cb2f11d92c5d261266cc791b9671cdfd82
 DIST bbcd-0.3.1.tar.gz 74853 BLAKE2B 446f295b7716548f9a6ded07ee10323483bdac460d53b9308bd6dd22483e8c664a24bfd9848caeca730801d3273de3000bd771e925a9fd334a2c009453f773b3 SHA512 817c41e8989d28fed45b3a797ffac193ce2060bae7d8793253a8f2812945b0f72e2f14ecd607329f769fc07773b678ca507a84c7f3b214fb5ac4afd62d77de7f
-EBUILD bbcd-0.3.1-r2.ebuild 583 BLAKE2B f44f81f8c1586c0047b3d39aa38c04dcf0c94ae699f4ea8ebf02c9806afe616466057ecf49c15e3e4a77217fedb73bf1f52bfde53162f428492a750cff05df17 SHA512 6f0891892cca2bb9274f2f98890cd29915f148afc6d290e1f4976b7ade0701db9921bc1de89f5bba135dcd6190532404d3d5ad0368482a0b4ac39d143ca7b37f
+EBUILD bbcd-0.3.1-r2.ebuild 573 BLAKE2B 5794106d9f28ec57aef179f24cd9b4d9dd39ae4f7a777cb684d9c682b2a3052d6fdeae9c0334bcaaaa50b0f2f8c7382f9ad94b5fa76cdc4a78eabd501ca00de5 SHA512 55c82f321fe06fe12912b18530d92be9a878ef39f6db012639434a20f447ddd6e8102c241bb2c4fa04272de27a5af801dede14421e85b1d163faa737ef83e42c
 MISC metadata.xml 241 BLAKE2B 2b2407917254b37340fffac1ea444e78f5c08385c14f1f86b4f99418bf1d8349838210059f95adbbf50d6af65d1931b40a8ca9aece34cef06c799b7200983e7b SHA512 fa9ab655c8afc6023086bbfbda56113653deee76679bff4f0edad7e86412a4dea3c943209426bee532ad0dfe0b5967aeefb121a8f45cc2f091fc79d429d7b71d
diff --git a/x11-misc/bbcd/bbcd-0.3.1-r2.ebuild b/x11-misc/bbcd/bbcd-0.3.1-r2.ebuild
index 6bfbcd066254..58d5201d0f0c 100644
--- a/x11-misc/bbcd/bbcd-0.3.1-r2.ebuild
+++ b/x11-misc/bbcd/bbcd-0.3.1-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://tranber1.free.fr/${P}.tar.gz"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~amd64 ppc x86 ~x86-fbsd"
+KEYWORDS="~amd64 ppc x86"
 IUSE=""
 
 RDEPEND="media-libs/libcdaudio
diff --git a/x11-misc/bbdate/Manifest b/x11-misc/bbdate/Manifest
index d9024e8d2257..18b7a79b4056 100644
--- a/x11-misc/bbdate/Manifest
+++ b/x11-misc/bbdate/Manifest
@@ -1,4 +1,4 @@
 AUX bbdate-0.2.4-as-needed.patch 619 BLAKE2B 61672a67abade794501141c897f602c9d1bf865d56aa822383f84eda68db04c53b5bd60d0faa6947abc88f903ecf61f6bf526de0203c310e4d69683c234e87d2 SHA512 eb533f3802c64a557ebd791dc93e42f62eff0808ca49c07244396b4fc6ee22b59b7f75091b1e0f60403e0e1d1945a0e42953da071213a389c4a6f61447c3db10
 DIST bbdate-0.2.4.tar.gz 60644 BLAKE2B f8e55a9c4c041abb6ce8155c46653034f1d1380d3e65851b80898a93fab6b988db6c9e3b20663f4e1fd6cd6427ff0738cb1ca35766a47c7805c171e36ae31ab9 SHA512 90c51249a6ad0b90aea640b1f94cee4e9feb3ca46e4407ab3be645f92a32e7c3f1879c58a236c487dd7bfb24aae1f6a03da0a535c9218fbcbcdbd1e6f043d041
-EBUILD bbdate-0.2.4-r2.ebuild 939 BLAKE2B f8688d55c91a82af3abd6ecc7e8aa29d66dcd4981a78a7881dd31004e7c69b59093b1403ac80f8782906200cd052ed1f5538a8aece90d754ae9111471821ea71 SHA512 67eba6092449b6731e952282ca946814820473e4bc078da50fa400e8bfc1575f463feeffee0504661ec04be4c375cfb2e6a2fce26e7bc369e2fc1bb55a5583e2
+EBUILD bbdate-0.2.4-r2.ebuild 929 BLAKE2B cd68fb740988e3f765142f20c1565f965bf31edcc53f62226d0d9682bbc240418adf6544bb44da13e4559b147449d57f5f1a2d90bdc439c2cf0a552d8912565c SHA512 3d6460ac7b435576dc6bf67d3b0ba348c8b67b5e7d5e616291ca1c9ebdc063368f16af38fe9b90e508e46b0f6f916337bcdd3ff54e955219770acb373f3fb407
 MISC metadata.xml 309 BLAKE2B d09efeb368e3d2d88b9a68da9e3b24ecae3408ba9fb458e77ff856fdfd0c9d4faf70b8756fdaf7238ebb2ac326d6af9d46ccd6217fdcb69f87161752be0960d3 SHA512 ee8557b2406913cb007554644e1b510229de4aa8428af35dce200754dbbb5ea8d2bd3e3f044b039cb403d894d713ae76eca87e224bff6be093ea4473a8979c07
diff --git a/x11-misc/bbdate/bbdate-0.2.4-r2.ebuild b/x11-misc/bbdate/bbdate-0.2.4-r2.ebuild
index 4ec0772b332e..c1edcb8f5506 100644
--- a/x11-misc/bbdate/bbdate-0.2.4-r2.ebuild
+++ b/x11-misc/bbdate/bbdate-0.2.4-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/bbtools/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc sparc x86"
 IUSE=""
 
 RDEPEND="x11-libs/libX11"
diff --git a/x11-misc/bbkeys/Manifest b/x11-misc/bbkeys/Manifest
index bc4d08da5826..026005c0f1ce 100644
--- a/x11-misc/bbkeys/Manifest
+++ b/x11-misc/bbkeys/Manifest
@@ -1,3 +1,3 @@
 DIST bbkeys-0.9.1.tar.gz 226941 BLAKE2B 43a946210f25679dfe7d5a383fbd3f938ae71b19a635a288590b958fc47f3588c690a1e901b44fdb1b31eb1a8ee7252ceeee85b5d012585b261de61cc0f012ab SHA512 c8643d51dbb8f080cf70149d545f33160d15f00a0c3cefdd6d3856dfdee224ff3f63fce0988669036249c75f70878be63711a697dfaa45d4357d2141a28b13bd
-EBUILD bbkeys-0.9.1-r1.ebuild 617 BLAKE2B 4b026291bdedeb3a2e9b6a5e684f6cc5cc9163aa4ea987239c4ed73e96b21c20f09992227123d723e31a07e7dfd8eb9666ddbde07cabcf3760443ca9d2d120bb SHA512 edaa557e8b8b2710d0de82a687f580920c30ebf507680b1d239545ed28adcd10c5c5a106ceeac489cb636a8199719a4526ea62d10b5d4d4cd4e15e255cc7d3a1
+EBUILD bbkeys-0.9.1-r1.ebuild 607 BLAKE2B 182c46ffe49e0ba9a6bed1839e2c24e7ab93328722fab4c0db963a2b59b743b959bba0184e41e11059315c88e7afe2376f6bbe4648617a085cbfd983046285ba SHA512 ab113543bc7396c1702d3da34ba6e54ad8b17a92daa1af2daff5e906346e7b2ce42f8fee4c1e9057422c44e176be63b65ae1bc9983aa557294155685a3413fe2
 MISC metadata.xml 318 BLAKE2B 21dea9539e3c3d2449806722447884e705f11482ef597b931d3d0ed513fe25045cd72905e885e98b4ca096e7a7b412e8ebe8fabfb432a889e7bbc6eee3d4415c SHA512 346baeec555112d1e81cdfb8304d0b9efb91ef1f507d12c52a2ab68cb9d82a3f873922b57ce40ba4f247b28c831ddb420647303e09ddbae82b4e561282532005
diff --git a/x11-misc/bbkeys/bbkeys-0.9.1-r1.ebuild b/x11-misc/bbkeys/bbkeys-0.9.1-r1.ebuild
index ca00b59d4ba5..1ea30179adf6 100644
--- a/x11-misc/bbkeys/bbkeys-0.9.1-r1.ebuild
+++ b/x11-misc/bbkeys/bbkeys-0.9.1-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ppc x86 ~x86-fbsd"
+KEYWORDS="~amd64 ppc x86"
 IUSE=""
 
 RDEPEND=">=x11-wm/blackbox-0.70.0"
diff --git a/x11-misc/bblaunch/Manifest b/x11-misc/bblaunch/Manifest
index e954dc6d5e91..920c19921592 100644
--- a/x11-misc/bblaunch/Manifest
+++ b/x11-misc/bblaunch/Manifest
@@ -1,4 +1,4 @@
 AUX bblaunch-0.0.3.patch 311 BLAKE2B a26747862849f6fa59693da243ed70c0572adf4dde1599092739643673433030bb13d0df821f99105d3607ef855987615331838fffdf379bdc0aa6b9b9f3834c SHA512 649a16bff8ece92b6540635085efcace7135114272fafe2ee63e957091bdb258b08131e46fc57402c9cbf8956c94ef9844ed2536b86524fdf7b8ef0f21abf43d
 DIST bblaunch-0.0.3.tar.gz 31719 BLAKE2B c356156a33ac96d364b0c33f9878ce84265b41b6611a3fc1648b6746e33ef367ce81c319aaf584b85a5b7a6fac8d24de44ac015b5bd5bfae8def9181748812d5 SHA512 8814021a802705970b947078e3af040d0ad0b63a859dcefe7b5adaeac392446d1556d7200631e0cd872473f821d21b0ba50c0173f193f3614ffcd438fbb9f224
-EBUILD bblaunch-0.0.3.ebuild 394 BLAKE2B 09c6ff4448070d4ff8bc2c3dbd652469f7a4265d5657fea31d9f55910bd97f76cd87e1ac850e6e3cdd57424a1a062c428c5f54105c664e07edcd1b8dfd31d78c SHA512 355afc38c8bccabd9562146a63c3f383cc5eda897688358dea20859e20a45005f0f19251c3049e80afa74e93f435eaf1df21d40eb1433c401c09da2130629f87
+EBUILD bblaunch-0.0.3.ebuild 384 BLAKE2B 99d6ea0c4c2955ef942d47257414d760991f1dae392d534533aa63c661783f5f01a4d721418359e6ccde70040c068cb9a430c4fcfc51a54b2dce09f65c0fab4f SHA512 62ef672ab7af6a2bb308100b6f84372d6835067663d454e2c4b665041d3e0231b2a18b5089233cc44f6362e8baa04481570338d9d597744daf86ab08e99a2ff2
 MISC metadata.xml 333 BLAKE2B e360f1384989b577e1917624909d18b3e9d08fddd978e3ee0901063b7fad33640b89a4044de9ff9b45c08c514f4e5a5d19e0fb0a3f04f90fce56bb2a4aa26cdb SHA512 f617b6293996687d7df4fa5c9e676995531732ab13c91d57e82b15e91fb2023890c5ea1f917d659c005eed59ac37da0713e9b73bcfbbdb5d8822076121c7b8eb
diff --git a/x11-misc/bblaunch/bblaunch-0.0.3.ebuild b/x11-misc/bblaunch/bblaunch-0.0.3.ebuild
index 51d8f0de93b9..7028400502e8 100644
--- a/x11-misc/bblaunch/bblaunch-0.0.3.ebuild
+++ b/x11-misc/bblaunch/bblaunch-0.0.3.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="http://blackboxwm.sourceforge.net/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="ppc x86 ~x86-fbsd"
+KEYWORDS="ppc x86"
 IUSE=""
 
 PATCHES=( "${FILESDIR}/${P}.patch" )
diff --git a/x11-misc/bbmail/Manifest b/x11-misc/bbmail/Manifest
index 39d83c591fb8..9f1f3a10aa3c 100644
--- a/x11-misc/bbmail/Manifest
+++ b/x11-misc/bbmail/Manifest
@@ -2,5 +2,5 @@ AUX bbmail-0.9.3-gcc4.3.patch 1419 BLAKE2B 393a9b16060991d3ef047687b9149072754ea
 AUX bbmail-0.9.3-gcc4.4.patch 2776 BLAKE2B b65b33d0f6d841a58e7032460deb85a57f1fb6522c01701e1c51eb0a8e834e05ef3435b97517a9815f8dcbf90cf73327e50af623ca109337a3c72c5e856d5414 SHA512 b9e822b518df2f2dab6fd734ece1fdb51f2c3b9c36d6d358f6e1e6709df06c2947923aef963047c809b8d1d9d0e5ef8b4e36fde700a5395183a54c55424eece1
 AUX bbmail-0.9.3-shebang.patch 276 BLAKE2B e6d685f91e5faf598cb9df8494b305de986b8d493b3b1edf1cd053b672f625c121b84ee908dff296161e63cfe4c010ab3f6df86c7e3cff187e588d4f3bea6d55 SHA512 3d84c579f461e97f542a1e21fe365c4fa86731dd9af0e4cdfcbe9bfa83c8b0e10f3a18b67515e35046f218c3b704838115d4695b84c8f2b879a90c89d97d8752
 DIST bbmail-0.9.3.tar.gz 186433 BLAKE2B 9fa31bc3495fc9f4c0fddbf38645c7fd8a3c50ebf364cf487d8d4e01e160e34151e741472f86c2edfa26869f7077051919456c00ba566815346d66edb161c0c5 SHA512 2c0e22092e08d247edf170e22054b6d108ebf84d3f606ab8e9f1af28154bf4bff26828b5ca55622563eb2cb468d88046d5859b79c0f272895c8785becd69c860
-EBUILD bbmail-0.9.3-r1.ebuild 683 BLAKE2B d85a58fad5ae58defd7a1569cf5a608ceeab6273ab045308b734f8d4d58ec59930955bd54e81d68d961afd8039c64938fc69c5cc50390564ea38d6a94261ff29 SHA512 6702f73f87db60b8615362a3c27eead80c759606477287ce47ce9691a7a08a03349d9c29e0a60758446ab4bd7b923e186c32234d399b2fb7a839499039043688
+EBUILD bbmail-0.9.3-r1.ebuild 673 BLAKE2B acc7c866f3ce651698dcf34378cbd014769063dc1b973413af405ba139b0d9453b81c1a560b77dd4fb4926f646b7806aec5773ecff1e489dec1617320df57718 SHA512 e104a8ede3d3015a87e6685aa4746c9c3ccf7355a2c4d389b279e8e56e20eff8094cb5d78c2b23313eb1bdc3fd3978d06080e5ab26eac8c029357cba64dcb8e2
 MISC metadata.xml 324 BLAKE2B 04cbb4f74c577a1a780d1a11507a6e9ba64f23b0f12ed887e68fb27afdfc42ff57f21e3c8173344fa64145e8f3f92e29da34a790fad4a1c8fa6ca508b958d13f SHA512 a22b46d17d0c950a42a5fa84a7e8fbae3530f4f9f9a14be3a016284254e5cc35026863843fb165e408130e9a3adc66083e44be9aa239b9f02eefb9098824ba3e
diff --git a/x11-misc/bbmail/bbmail-0.9.3-r1.ebuild b/x11-misc/bbmail/bbmail-0.9.3-r1.ebuild
index 6acd544ba6b4..68dd29947a56 100644
--- a/x11-misc/bbmail/bbmail-0.9.3-r1.ebuild
+++ b/x11-misc/bbmail/bbmail-0.9.3-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/bbtools/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-misc/bbpager/Manifest b/x11-misc/bbpager/Manifest
index 414244558a38..a255bc9ecebb 100644
--- a/x11-misc/bbpager/Manifest
+++ b/x11-misc/bbpager/Manifest
@@ -1,5 +1,5 @@
 AUX bbpager-0.4.7-as-needed.patch 2695 BLAKE2B 024405437506c3185a1256bc6ff7b115519572052c34b8dcf7b42970b7c6756bf4bd4b215c7cb61a8b1bc5a99b18d8abe6a68599c3c8a80795af2fdeb44023b1 SHA512 8a54cf3e4f68682cb1631fcd1abcbec3801cd57fe0f230f222447fa39dacd5f469965d29ca980e9c3285dda5e0e0c54e6f4935552c9c45e00399472506ea6079
 AUX bbpager-0.4.7-gcc43.patch 1031 BLAKE2B cfc58c4cbb983fb139c051ac26029031cbbe2508f707c3b0464e953c156c02db6690c4923ff8c049e8545a9999ca49abddb8d641bf08c8be3d3fdf19033d19c6 SHA512 41ec95853663e89b356cd781719675fbc49a6d117886dcfc85c202fe1fe73d23151fb313c9694f946055ceca9f222e05b36a6b5a981672c6a832ddcf906109ef
 DIST bbpager-0.4.7.tar.gz 170575 BLAKE2B b8c7b8259f1c1e15ac0d8fafb908a8e84598bb44111a35aacf511346fad9f611fdb0e750a2c8412c86f5a4fb8ee5b99f3b0f3e2166cd309a5bc22de0999f06a0 SHA512 33202efd4d55639ab4c5f9fe54b9b0a6e4d32dd822119fb5517d5d2231922962d6985b51d7fa84dc3eb909ddea05033965a3882cda2dc10193aae2f873da1869
-EBUILD bbpager-0.4.7-r1.ebuild 686 BLAKE2B 2aa99609b5cb4a29cf629d762a1a901fc75b6888adf71245a6ceef5d0215b713815fbfe3e41a2e42fd343cf8b1ee686278831e7ca6c168703659719fa3744bdc SHA512 0d9b61b2320b8a627e37a241770ae83c3eb18f15dd69ed8155a8837ec43f193fb83de797a3673106425bbfcc7405c6f00c3720d5e1b3c740fc477dd53722ed12
+EBUILD bbpager-0.4.7-r1.ebuild 676 BLAKE2B fff46339d9551ebfc68e4126c4af2b2e12ef8e08810f186809626dedd9f0d8ad8b9e8fece194ecde024765c42e8c8c8b51549d4e43db82706a0557ca81eb6276 SHA512 d8d93b4d02c4961aa43e70cbca3f005dc9908ba5c15b88743a01c2adc46d6cfb038f74a752c601c5f9b22b521f3a31edd02625dfb1425cb544c9ca79b0f7a4a1
 MISC metadata.xml 327 BLAKE2B 2cc9b23ab91634035c99b0c815b653f36f88f536e7dae754d3ccbcef2e6751964ddfdda0b924fb85a4ba41ccef13e407681c94cb3ec3932bb996147e876b8c71 SHA512 2ffa2d598b532967cbfba44f3e285f10cc7a49029e61bb6fd06d2eebd2330d2eae075a3bbc509aa72c56ec95bf976e50e8c94a51e0167ceded1db92039beacad
diff --git a/x11-misc/bbpager/bbpager-0.4.7-r1.ebuild b/x11-misc/bbpager/bbpager-0.4.7-r1.ebuild
index 34cebb7d9083..dd26ebbbdab7 100644
--- a/x11-misc/bbpager/bbpager-0.4.7-r1.ebuild
+++ b/x11-misc/bbpager/bbpager-0.4.7-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/bbtools/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE=""
 
 RDEPEND="x11-wm/blackbox"
diff --git a/x11-misc/bbtime/Manifest b/x11-misc/bbtime/Manifest
index a15767ec1383..30ada0ac48ea 100644
--- a/x11-misc/bbtime/Manifest
+++ b/x11-misc/bbtime/Manifest
@@ -1,4 +1,4 @@
 AUX bbtime-0.1.5-asneeded.patch 1082 BLAKE2B da63c4f38d1e6accbfcc071df4d26773f8e62609978d10ae53d95d7ec94b1d3cc8d46f3841a7910d753ed9cf1bf216c81082e0184981e336c3573592371ffe66 SHA512 23fa8c215f936d1a2235469780f3518c64a8333c5314a7273c6d1c824eab1162144be7fdea24511beee405142f146c6f947239220c521056ea041c0f3cb28494
 DIST bbtime-0.1.5.tar.gz 68842 BLAKE2B 33b66fd284d97d2e6780b29293ac6e67ef69ee2273362fffb7435d4a3fcdd2b33ec89ec3e6389676a9a603a34590a3912103fcbfd69ac663cfff5f091ba1a1cc SHA512 a27966e3a35b2e59b440547680daeecf46bd50ed4fab52e5c50fdea32a307da4a78e4c19e493f72e2f58d806cec74098312d549e8610214e227b99fd4074e669
-EBUILD bbtime-0.1.5-r1.ebuild 855 BLAKE2B fe3b37ae044b364b9e0e37d0a0a1f47bec054001fb04239d8cdc921b73c3a038659ca7484675c34a1b1b0d1d163ef02cdf97ed7482931cedf93e429009667924 SHA512 070a760b123b4b2639b68c0b8f01ca0e22d1b6943ea1a100bedc23dec7e23d0c8c88174b88ef0e35b3b45d89f5f3addac50d1b6bd81783d0f8733e22642cccd9
+EBUILD bbtime-0.1.5-r1.ebuild 845 BLAKE2B bb2a8d685847ebe948070e49f589b84aedd37b94dbcd8e46f66e974707b9f9447b507fee5341f1663d17982750da36fe93ef01d16ae0636801c533b1b025b540 SHA512 f38b6f4b5239b4efbb8876d15ffbda5ca41b89039ceeb9fbd6fbdc0918aeafe24dbe6b28f01cac092460955af1e925f9a4b10a40460dbc0324fd268f9e25f7b2
 MISC metadata.xml 309 BLAKE2B 37a902f1677404549d39b6d6c771d3757078e4a45bb40d623057c0804f9bb4dd9240f17f6b6becc678f6b9e7af2b175d12847fc56511fde97c7c8b85c279fb7c SHA512 7650eeea3eda0519f8045ba584d9e7d409ac3e8e07d44faca27ace597ceae3f8f32cce20ee7b4163acb710807556f706915ccc0e78360f9d19d5342c6438b7ef
diff --git a/x11-misc/bbtime/bbtime-0.1.5-r1.ebuild b/x11-misc/bbtime/bbtime-0.1.5-r1.ebuild
index 0b4a858cf867..dd663336a5c4 100644
--- a/x11-misc/bbtime/bbtime-0.1.5-r1.ebuild
+++ b/x11-misc/bbtime/bbtime-0.1.5-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/bbtools/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ppc x86 ~x86-fbsd"
+KEYWORDS="~amd64 ppc x86"
 IUSE=""
 
 RDEPEND="x11-libs/libX11"
diff --git a/x11-misc/cairo-clock/Manifest b/x11-misc/cairo-clock/Manifest
index df4252ae7f8c..6302b29a7761 100644
--- a/x11-misc/cairo-clock/Manifest
+++ b/x11-misc/cairo-clock/Manifest
@@ -1,5 +1,5 @@
 AUX cairo-clock-0.3.4-desktop.patch 599 BLAKE2B 093c409f14c171246dba3f6ac7a39066af78271c3ec5b96f205d573f49cd1a40966509403f0cdfdff0e25a473fd116be18150cf4071996a6cb47f56d567a006e SHA512 f0dcf4dc5baed7969f7515bda571a6f40f8ed8a365c665d0553c73b0224c47c64626f37ccf3a543db88d4b3f494247c86a761bd2b68b8c33f581fe26867c3577
 AUX cairo-clock-0.3.4-linker.patch 617 BLAKE2B 1f7c5de0cb985da7f404754bf522f677ac6122761b4cc69fdd47684c1734080e16f0074cc4408c3291b2369b997f38603cb756a06b0bbd311dd1a697e7556dfc SHA512 7a5f4235fbde60a932e26fc8ad60dce20f2f64ee53a1ecc3ebc7437225432d7256d2edd6d7b2a10cff31fefd6a94329b7516ba4e6202aa4c8b6f857ea19e9a64
 DIST cairo-clock-0.3.4.tar.gz 832968 BLAKE2B 93d4acb621af05176cb19041872aeb0da563c3dc37a660c8b761a31f6bab2809d23b04bfbce88e904427430a5b80337b28a04ff1f20ae94759fd3a507a1c9cad SHA512 b26c3005d4e2b22dcaf6967b8892630f5fd44e366b7482f374ea6215ca8863cf1b3f489fe2279eab73dfd4aaed1793d753e84fe4c929d105a6e97cde6da6b628
-EBUILD cairo-clock-0.3.4-r1.ebuild 718 BLAKE2B d14623676fb77cc1977909aeb6a23d20b03d0b5f28d40ea6ce378eac606a123b60d2bd0e77a28bf8812b2622c87b0f2c27eb63b4c4ab4855785ad8cfa391b692 SHA512 aef067398c8fd057b78160c4f5a2596be9e4f39eee9e0762b52888b792eb6640649384a0171e3ec999e3158ec7b003479ccf91633045ad64c23d23b74949958e
+EBUILD cairo-clock-0.3.4-r1.ebuild 708 BLAKE2B 53c9e674cc6cf01ae511a225ab0b47c42d3cd8dce4eb259f683fb7d3927f7a98216bec4bfc49b83bdf0004a33178cdb5739063aafcac2b03aad99d7685bb2cc1 SHA512 9c650f2d923568fbc34509826fd23370646b936f97fa14f97c3c9327556c707386884d438a8017f594228d2c45ec8a79c0d170701d5ffe24ab2daf571da1c5fd
 MISC metadata.xml 355 BLAKE2B 5e1068bc4b2d05c9c2f228b1117cf74043e75692749c37d6304bb13b77fbc15472926e2c3f6fc374bf6b9b637c6920c61ec3697b8fbe94441adece973b065b47 SHA512 8d3c73cf909e4efbec6a89e44cb80dd5e6d13d0c15b4c5de5661ed5db8a6b775d6196cddfe4a53a63564578da7bf10bfec0638aa8afe884c836cf2c85da10641
diff --git a/x11-misc/cairo-clock/cairo-clock-0.3.4-r1.ebuild b/x11-misc/cairo-clock/cairo-clock-0.3.4-r1.ebuild
index 39f3d565031d..3cc8a83d4971 100644
--- a/x11-misc/cairo-clock/cairo-clock-0.3.4-r1.ebuild
+++ b/x11-misc/cairo-clock/cairo-clock-0.3.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://macslow.thepimp.net/projects/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.8
diff --git a/x11-misc/cbatticon/Manifest b/x11-misc/cbatticon/Manifest
index ccc0e4d168c5..d3a294d7ad4a 100644
--- a/x11-misc/cbatticon/Manifest
+++ b/x11-misc/cbatticon/Manifest
@@ -1,9 +1,7 @@
+DIST cbatticon-1.6.10.tar.gz 32402 BLAKE2B 91ba6eb581b4cd0b31ae5a49b12970fc7d02d1ba790bffc80886c05ad2b0573ee1aca479d90591498dd6d816bb7e24bee6918e5a8fa8823cf376a3a3da598993 SHA512 cf499eb7ac1d775918a7af01700a9e8eeefd9e31a44fd63c9f38bff83945cea9fb21dde960052768f8d0a0c004caeea115f2d80cb3838789859d43e432eae055
 DIST cbatticon-1.6.5.tar.gz 27951 BLAKE2B 41d43bd7bfd5741e37365bed1541c88e255998a4ba69143f80a9c59ac4f51c280b7d07f3f9aba95063a8c3779c9637f7b4e27b771fade0e6092215b529813bd7 SHA512 5e1648cf3b31fe42aefd0a5e79c4e5dc22c3ce4b6f594f0933229494ca6f2e28e44a7e078ef839de1df0b8c1ba494fce8a58866ad70d056799320f4dea32713b
-DIST cbatticon-1.6.7.tar.gz 30086 BLAKE2B 460f185688e7aa8eec3f075454440705e1b6989ae9640f026f17c50511518ae181901e69efd987a879eabad47df5725c444bee9973e2faaa2d78775d2f6d83a9 SHA512 730d1be1350ba9b906f438c58c4e3172c4041d0e7c73ffbd91cbe5a01688e400bb9a7d89ccd86bff658afc803776dd5691323c720e6d41b1b1e3aeb58707f6e9
-DIST cbatticon-1.6.8.tar.gz 31185 BLAKE2B d8d7d2fe13764bf4b9c091eaebb8bd90b2daeeb10a2093c3b3724c5009a5f56e55788e0390cc81ad2e5c50937f8348bbee74d32f0768a15114a22ad9e02756ab SHA512 61d6f64cc57672f672869f8eb3b5ccb8f95dfdaa0b6eb1e91c824e22e4aba195cc164aab0b0353599c1c1a07f6d00a7a2f177829a15534c96a4e24e4cdfd0986
 DIST cbatticon-1.6.9.tar.gz 32257 BLAKE2B de10cae916ddd80638e2f2ea4c64038d5141524c102abce0dcf090517eadd8e375a383d438778e06b9881e617d28cfb999476f75e37ce1ed2a04a811abf5ac4e SHA512 bbaef2b24eddc52e3ad63033e063620960aa791f6bcb06cd1b981ca2a4f38450ee2c2177426b171ece2b5fff0db8f360bd9ca9ef1a3351ec9ad1f5ea34f925f4
+EBUILD cbatticon-1.6.10.ebuild 894 BLAKE2B d1a76d208bf08908caf520b4d5d62601bab12ead57e6ccb8896240765596c725f0204af8c80bbf604c8890da5f689146ad7ae9dd7f48943bd9f18618861aa3b8 SHA512 7c5306b31250105bbca99800c5a49a6fcff0c059c14599267d7d31bdd50dba1da8536e8cc65ad3320278110410e02af55e9e7a7dbd6a8c4bfff9c823fb2c3b03
 EBUILD cbatticon-1.6.5.ebuild 861 BLAKE2B 2aa73a0b824ce558392943ec003d97f4cf15e736676a890f9f6fc474321410c11849cb306deec6c585c6174421f1a6f797f97fe4c5a34804941bb189a57aead7 SHA512 cbc37a6d09c1a8be7b0f9436a5d97d210b884d8e439570650339a60bd2a5ba2e9dc903c730979e4f7bb4166906a540209d5586d7610e47cce61ed94426438225
-EBUILD cbatticon-1.6.7.ebuild 863 BLAKE2B d5ad3deb930f3ebc3bceefa27a5aabad6fd56c9e65acea5ebc0fef4e5a286fc8415192a247800a776235988ef80115de90d067a795771f6ade5b9533116948b5 SHA512 5fdd82dcb6ac1014e5271eb98301977fd87f640ac3ecc3dfa1b61982faaec5a47d7c4f2ca067672873b2292badfa34461448bff193e840d8aa4b4a8ba5db416a
-EBUILD cbatticon-1.6.8.ebuild 863 BLAKE2B 283d0730e351d0b7951cf0b09213fa8d3eaab4d0e74b6539c329239d7d567876e9a6142fe45b92ebf448ca8081421fbf23c0c5543bdef99fec4b766661d57b41 SHA512 c93c2c241e890401b9948c51f11f5f241dad37b7078ba00e29b008f47229ebe0e2ea9c4155bbc9092423ce931dc50c50d17487cc5661a393c70220fd56546497
 EBUILD cbatticon-1.6.9.ebuild 894 BLAKE2B d1a76d208bf08908caf520b4d5d62601bab12ead57e6ccb8896240765596c725f0204af8c80bbf604c8890da5f689146ad7ae9dd7f48943bd9f18618861aa3b8 SHA512 7c5306b31250105bbca99800c5a49a6fcff0c059c14599267d7d31bdd50dba1da8536e8cc65ad3320278110410e02af55e9e7a7dbd6a8c4bfff9c823fb2c3b03
 MISC metadata.xml 361 BLAKE2B df663be776d229d5ab74adc1b1d5dbf1df0754c1fcf773e93ea73b0c03557a1c088b3afe78dc939cadade3a2a106d7be77c81c46bbeb406979c1e402dc849c2b SHA512 854a12b8d9eef3ad16aaedd57e7d371979a8788641759c032aaf025de3331456430325d1101dc9046bf38be86a6ba5a4b3c29eb9daef2d9aae094853c67423e9
diff --git a/x11-misc/cbatticon/cbatticon-1.6.7.ebuild b/x11-misc/cbatticon/cbatticon-1.6.10.ebuild
index 397212d04700..c50d042f8226 100644
--- a/x11-misc/cbatticon/cbatticon-1.6.7.ebuild
+++ b/x11-misc/cbatticon/cbatticon-1.6.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -41,6 +41,7 @@ src_compile() {
 src_install() {
 	emake \
 		DESTDIR="${D}" \
+		DOCDIR="/usr/share/doc/${PF}" \
 		LANGUAGES="${LINGUAS}" \
 		V=1 VERSION="${PF}" \
 		install
diff --git a/x11-misc/cbatticon/cbatticon-1.6.8.ebuild b/x11-misc/cbatticon/cbatticon-1.6.8.ebuild
deleted file mode 100644
index 66391be03708..000000000000
--- a/x11-misc/cbatticon/cbatticon-1.6.8.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A lightweight and fast battery icon that sits in your system tray"
-HOMEPAGE="https://github.com/ColinJones/cbatticon"
-SRC_URI="https://github.com/ColinJones/cbatticon/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libnotify"
-
-RDEPEND="
-	dev-libs/glib:2
-	x11-libs/gtk+:3
-	libnotify? ( x11-libs/libnotify )
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-
-	strip-linguas -i .
-}
-
-src_compile() {
-	tc-export CC
-	emake \
-		$(usex libnotify WITH_NOTIFY=1 WITH_NOTIFY=0) \
-		V=1 \
-		VERSION="${PF}" \
-		WITH_GTK3=1
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		LANGUAGES="${LINGUAS}" \
-		V=1 VERSION="${PF}" \
-		install
-
-	dodoc Changelog
-}
diff --git a/x11-misc/cdm/Manifest b/x11-misc/cdm/Manifest
index 7b0d55f28332..254f6dbf508b 100644
--- a/x11-misc/cdm/Manifest
+++ b/x11-misc/cdm/Manifest
@@ -1,5 +1,5 @@
 DIST cdm-0.6.1_pre20180107.tar.gz 16541 BLAKE2B 19b7a8f6ef7541333b96bb3c2d6a9d3b7ce3bffdcf6653a3799d963d3b3bab3fe3553469a9cbf0f493109ad5308c739b25ce9e5801d0904f5d7b6e78b680e2fc SHA512 dc5587debb304636be25afdf60e8328b1eb9b961694813b089df504567f63cfeac6de17df715d589cec597f51044b8c121242ebefbe5bfeccf6aa072b1c03a40
 DIST cdm-0.7.tar.gz 16154 BLAKE2B ca240e253ad4ed6b5e634069b98c90c00852fc6d6550ca1f72b3399435264055cfca31f88f6061daa3e2e3445bd1a8ad9f950b44968df4c77d6c8150b2782a34 SHA512 51591b953ec83c06a5a4407c6d6083ac11e7095c7fb22e491ed3d6626217462529d3dd3590c2a256273b3668c7246b13bfd1f2f682f5bd860ca8a34aaca0b6f5
-EBUILD cdm-0.6.1_pre20180107.ebuild 1851 BLAKE2B 6b9fe3ccc497f06c1941401b9246e1a5379be522b8b95d7b235fe3cf5a9cc40115a17797720dc9dc0e0d6dfcc73965a23f3cd4604f1a2ebbe2d103c5008467ee SHA512 ada7bacbae684ad50ae25c4eb92b23ab11c6c0d63e670c440f5b8f52cfe487ec12da1406008c9d3024f32212eee98347ea715417ed82d2fe9282c412a2b872ee
-EBUILD cdm-0.7.ebuild 1865 BLAKE2B d24fc52915b49253327b7f1719621da33e8532ce39aee76c373609cc72185f392e84e62dc623b999532f7979e9e25c65bc3871bd86d8e360987f714af23251b1 SHA512 eeb099553a7395f47d1c9f04a31a57094c79f34b768ccfa6127c5cdd6d373f136ca3c6426a72e0e71c0889e2778ca780ee3caf9d675e68758e5170ebbbd3931e
+EBUILD cdm-0.6.1_pre20180107.ebuild 1849 BLAKE2B 6897da58d05c7e624ffe5aa993c0e1a68d413c681a2bb65c4000517fba71035144b56c76f5a1fb856a25adfa71a75e0125f812121fd43131ec40b7ea3737cf76 SHA512 6f6bb180a4cdd09cc922ad8d48ee194f51159479f7e32d3f0721ade34a3fddb3e9990b4402ad0ac401f1712f89942d3fbd6f64cde369e05c149ecb2dbdca9baa
+EBUILD cdm-0.7.ebuild 1866 BLAKE2B b2bd6acd3e399422fe76801a00901beca3e71f2d0af5c68800c21bf1b56752a071f56446284f59bb0bcae7b42601e1cb9fa09b6ae31d68211fe3a3ea6a9dfcbf SHA512 efc860cb1668cf3547ccdd6b1b947c3dd41f613f743cbbb2320dbd037b918810eb04447884dd5795976fdbb78b7f08bd008db44182cd5c28fe1e24bea397ca78
 MISC metadata.xml 717 BLAKE2B 08ac966702b39c5c912ab82c1115a3eb9166719fe1e87cbd193ba7ba61b8fca81546c86361ad9c5c51ffb7bfbfc283c4e89d250b58925c5d034d8f37d72e1357 SHA512 cfabe6705c7af59ba703ca849a7cddd649cad9c0dbd939c4fb5e2fcc2cd5383f5771f0d259b1259516037c9d8c41bd2b59a86d70109494d7e4a131ce232b5929
diff --git a/x11-misc/cdm/cdm-0.6.1_pre20180107.ebuild b/x11-misc/cdm/cdm-0.6.1_pre20180107.ebuild
index d131c8978632..9702b5d25cc7 100644
--- a/x11-misc/cdm/cdm-0.6.1_pre20180107.ebuild
+++ b/x11-misc/cdm/cdm-0.6.1_pre20180107.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"
@@ -22,7 +22,7 @@ RDEPEND="${DEPEND}
 	x11-apps/xinit
 	consolekit? ( sys-auth/consolekit
 		sys-apps/dbus )
-	pam? ( virtual/pam )"
+	pam? ( sys-libs/pam )"
 
 src_prepare() {
 	default
diff --git a/x11-misc/cdm/cdm-0.7.ebuild b/x11-misc/cdm/cdm-0.7.ebuild
index a2ed855b1c53..ec83965c22fc 100644
--- a/x11-misc/cdm/cdm-0.7.ebuild
+++ b/x11-misc/cdm/cdm-0.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -22,7 +22,7 @@ RDEPEND="${DEPEND}
 	x11-apps/xinit
 	consolekit? ( sys-auth/consolekit
 		sys-apps/dbus )
-	pam? ( virtual/pam )"
+	pam? ( sys-libs/pam )"
 
 src_prepare() {
 	default
diff --git a/x11-misc/colord/Manifest b/x11-misc/colord/Manifest
index 41342be9549d..c7261d8ef4bb 100644
--- a/x11-misc/colord/Manifest
+++ b/x11-misc/colord/Manifest
@@ -1,3 +1,3 @@
 DIST colord-1.3.5.tar.xz 1263488 BLAKE2B de70f3f76e81d3cec826f444e4c6a1603c03b7d97fedcd04a0b9e1977d1e487d7e1327c8b2738b3cf74e9717fb6803d543786c749d3a244faa1a6480e77e3436 SHA512 a0084ad2c08ae88c8023b8bade68f6cf25e13c77a6a37ef127b2914e86b06e6a7a783f9ab3585243d975dbbe1120d5daae13bdb586aefe519bf675458683025f
-EBUILD colord-1.3.5.ebuild 4350 BLAKE2B d81dd2f6e173b4a794298e765986ec12732323eb5dd60a7195c89e77cce3ed5072968540f5636ee44359c99b56a8290d8600282c5cccacb399f6dd645b3addb0 SHA512 ac0c8fe53be7e39d78d5fce3cf54ce2dbacbf2c6443f96a47df3ed90d58cb6ab34f438b4de9bf9cb2d0524dfe905b18a3f17bc3c252803342d77d7fb43e8d50f
+EBUILD colord-1.3.5.ebuild 4340 BLAKE2B 888b461d4c762c35fa77d1bdd1f6ac89123f8cb6335dee2fa2100c711b06d8b12973c67a4a13099bd06bfb6307a3ba5600251283f08dac7524d10fe491413aab SHA512 880062ce2e5908396df892e108d1bb524d8e7a62bcdb8deed719c5d591d64ac2b3b4fd5c1d1147e84a8b2065b6e6d7b2546c5d0b2643c22b0a2068aaa4589ec0
 MISC metadata.xml 563 BLAKE2B b35a641da198a98fc9dc69dc0a49b0796060df467dfda31fa7cb1dab328a618e283f5ee9e05d7ad34742052e9441780b243f62f71329d88c1d93dfa83acc46a0 SHA512 e358961e8d31c2e9582d93875bdabe119e574b62d674e5b16028cccfa2e0604d39384fc2c5683aa343b9cf6d543f8fc35d2eef35662de43ea97fd0f50536df3a
diff --git a/x11-misc/colord/colord-1.3.5.ebuild b/x11-misc/colord/colord-1.3.5.ebuild
index ced318c57eca..35e1273e8b79 100644
--- a/x11-misc/colord/colord-1.3.5.ebuild
+++ b/x11-misc/colord/colord-1.3.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.freedesktop.org/software/colord/releases/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0/2" # subslot = libcolord soname version
-KEYWORDS="alpha amd64 ~arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 
 # We prefer policykit enabled by default, bug #448058
 IUSE="argyllcms examples extra-print-profiles +gusb +introspection +policykit scanner systemd +udev vala"
diff --git a/x11-misc/dmenu/Manifest b/x11-misc/dmenu/Manifest
index e44449e70078..87413e2e401f 100644
--- a/x11-misc/dmenu/Manifest
+++ b/x11-misc/dmenu/Manifest
@@ -5,8 +5,8 @@ AUX dmenu-9999-gentoo.patch 561 BLAKE2B 6c0d69737040068fae1ed2286902d2afea9e4ce6
 DIST dmenu-4.6.tar.gz 15057 BLAKE2B 87469e86400fc5d99c6c62666f6903c2dee6221739a52aab0facd4e417b1ddc88b138440b62e410d8230e7dec89ace1c684348eaab223fc7027eda0b6712e495 SHA512 e54fd10c0b1274eb90173aea442f0bfc496f4dda861a36d94f939e1fd835594f9aa12f3d0f90043d64e519d919b9a5273ab65012230ac022f727ee6bb64862e3
 DIST dmenu-4.8.tar.gz 15658 BLAKE2B 8e027905a3c32d0db20f22ac911bcd69c39d00b2c426c1fa79a9b6253c13223ddc79413b9f8ecf38f3258aada3d7c4a91535fb930a5d2a9fb239f398a6b6af07 SHA512 fa2700018cfb912a21f867ef3ca771a58a25c2cb8e1fb37acef046bb15d8d8b92dcc5bfce486befae0f143495d0283910988e181a9eb143be3bb1b5be9738d77
 DIST dmenu-4.9.tar.gz 15972 BLAKE2B 56ba03a3dfd24e2fb0f45feaaaac53e441b63a0d72adbc36499a97e2eab7c524da2088e3a15c6599c513bb35a6a049663b97220e671e03bd577baaaf711f228a SHA512 c2779209fe012de8ca1cdd72923da6d594f4a8368c85c3c0e0afd4ae489a95fe0e6f05a947d115b6b389aa7170ab14c2c645a2031353b0a08f38327ab461fe65
-EBUILD dmenu-4.6.ebuild 1268 BLAKE2B 525a04d499b2b5f6cf2f3b4abede52af3c7cf637185cff3174841b2c833468887b16a54614c7ce97f5a74a924031bc971706a0b79b427197878087fabc6105cf SHA512 6950b25d07543312738ee66bd8031d6a12fa3b19aa9323f1a1847bcbdf79c18e5f23f813b40784b649f4543b64816d5c019b8e5c87c275ea1cf91e468cafd98d
-EBUILD dmenu-4.8.ebuild 1337 BLAKE2B 3982faa7c70a14d9af9172da682a27c40a631a001ec46cfa1f4a6b413a4db033f27f21b1ba9dad630bc726bfbcf2150826edada2e270e5aebf037e8b17f88059 SHA512 2c891ac9e9c21df2787f337a7bf8139e1c0efaeadaeccd9720f7bdf21c15ff23b0963029cebf1f38056ad5b8e124d16c346b9644085344de23b3f36781b24b2e
-EBUILD dmenu-4.9.ebuild 1424 BLAKE2B 3318e050fc27188448df4875d8f76bc2343fe83a6fb075e26ae712a1337aee3a0b3d2f0306bde2b4095f44ef83e4c5d954e5342e1fbf325bb0887d17041709ca SHA512 eeb74f5a268a799972f6d7b41d5ff8fd7dda864735e58a516c8d1ab6193f30f5b1502a6e9fce93c38b3d430261ed39a9519bc4ee085e1b26bbc139a384caef4d
+EBUILD dmenu-4.6.ebuild 1258 BLAKE2B c3883bd914b23d2d2da1b10a7ab17c99a869e17599954a1abe2b780cc1aa88855055473d8866c5f8f52d65cbd8e866288719ead3222db5ac9fbb90c403ae5e38 SHA512 b930ff6c535abbb65cca483cbe1412bd46e31fab64fe3427c773720f87c742f42872c8b2a7327ebe5c78ca1d63df9329cd0ca889157f1f1edc3ce28d4c478cdb
+EBUILD dmenu-4.8.ebuild 1327 BLAKE2B 8c582b520297c9565731de782807988eb92e52458bb7e22a0c426846e7247d42d23b99732b0759995e0477221ae19382b9f4cbb73c6c84b24047f5ca407ecc8e SHA512 32168e95e0dea54adc7e7efa2cad776b637cd3b5cb6bf610d2df68abba3b0b48f841fb96fa19ffcfbf495a9c9b1fc5dcb4b3929ecac0909aeb84d9d7b49702d9
+EBUILD dmenu-4.9.ebuild 1414 BLAKE2B 25a16db270e58b5e68f2630a370bb95451d873dcec7fa7d3af21040d44713d68ba8c02188b5c530ef3e39fb29464fd1c9f206a6ea8915666633215f179dc61e2 SHA512 be96af4189cbe5b9ea489869995ae362abec9439f4d1c0577840ff18862d0c1c6fd9f526f2543d3bbbe756f61582b2a6449f2d891ba5d8cf8b9ace81df7fafe3
 EBUILD dmenu-9999.ebuild 1375 BLAKE2B 35a86f3d75697c2c2cdf2c7298103dcf0a97dec40b11432ebe571f3d0df3deee399035ea5a59ea2af5deddd768e5e7825e75ad02a32836153cf0b401aabe25aa SHA512 670b62a9a32187a0ec812c4d0069f9020e5711f46aad32fc8671b290a7e986ed544c04020b5706cef980801aa5265fe9091ece0db6e40aedf0cf9ae6f519ede8
 MISC metadata.xml 361 BLAKE2B 40b663e4c351f9f6696f958b5a3006a3c18782dc2a4931584e566e2cdc2ea118f1fcef6a1ea7ad60724687e6f35bc1b25bc63351c6ffac03844ba0fb977576c8 SHA512 0be9c5e4fa1f72b02220088179c79f53e07928ee2890f78a24659e47961470d12ed7b8fe56b78ac4b493a2f42ebd491a8ebff405b013e7b7943de74892eed476
diff --git a/x11-misc/dmenu/dmenu-4.6.ebuild b/x11-misc/dmenu/dmenu-4.6.ebuild
index 5d02c8d814f9..1d874c2d3f67 100644
--- a/x11-misc/dmenu/dmenu-4.6.ebuild
+++ b/x11-misc/dmenu/dmenu-4.6.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm hppa ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm hppa ppc ppc64 x86"
 IUSE="xinerama"
 
 RDEPEND="
diff --git a/x11-misc/dmenu/dmenu-4.8.ebuild b/x11-misc/dmenu/dmenu-4.8.ebuild
index 916ea5565a58..9cd1cc2ea328 100644
--- a/x11-misc/dmenu/dmenu-4.8.ebuild
+++ b/x11-misc/dmenu/dmenu-4.8.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 hppa ~ppc ~ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm arm64 hppa ~ppc ~ppc64 x86"
 IUSE="xinerama"
 
 RDEPEND="
diff --git a/x11-misc/dmenu/dmenu-4.9.ebuild b/x11-misc/dmenu/dmenu-4.9.ebuild
index c8171c859d8b..29be48084efc 100644
--- a/x11-misc/dmenu/dmenu-4.9.ebuild
+++ b/x11-misc/dmenu/dmenu-4.9.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
 IUSE="xinerama"
 
 RDEPEND="
diff --git a/x11-misc/dunst/Manifest b/x11-misc/dunst/Manifest
index fd8f5d52193c..8690395eb614 100644
--- a/x11-misc/dunst/Manifest
+++ b/x11-misc/dunst/Manifest
@@ -1,3 +1,5 @@
 DIST dunst-1.3.2.tar.gz 121575 BLAKE2B 97f0011ce960a7852dca5a2917e328de2cc1a052ad0b7c2f07e878e3b6eb5281e49a070a574885b9a66eb6dc30ac07fdfd6322b44cbb7dbc1edf8d193a68b538 SHA512 eb7bff16a19d8f60e2f0eec419a0ffb2f8822b5ec2ffbe535303a71cc7d4ef528e5dbf2fe5f8f2f6f5bfd1ad2d39eab79b68054af924e118c646e059b6929465
+DIST dunst-1.4.1.tar.gz 160124 BLAKE2B d618b3bffc8f4518f58d28e108a8aadf1ff71164f581632bc198b3d0a81f6efa0fff73513fa5d46ec4a7058bb1beb8d8a51cb01e4621c76f8d3f8653cc6e2270 SHA512 43667898e123ef0dea59e2ca55a76686785906e44b453b2a86bdf361045b3f6b751a2e81fa9f562127f80bf47f8c9248960c37f8365dbbe409d72ddc3deb34fb
 EBUILD dunst-1.3.2.ebuild 1075 BLAKE2B 89736d9a5e43f9e4fc19161b5de87c95c118da9dfb9dce9c3d3abe7fa1337ea875b01510eb8e640d7a20248cee14284f5f3fb6a53a832944797cce6d0c9bf56e SHA512 d947586261ef7f110c1aec75f73de72071f45ec90be1732c8d3ce586fa47e365e878555567144497f954272989ddb3d03632d8e765bc539b09fe4b31439dd3c2
+EBUILD dunst-1.4.1.ebuild 1047 BLAKE2B 347c276d48f404f9020dfedd3d386f203be02b2209131ff039e9998e5ec8d2225b3d5954d0e90a614b2a9336179ea760d916838647b7456d85bfbf455061a254 SHA512 3b1855db88be8572bbe8bac7a28a42a21354a143a4566fe1ba0b41037d9234690815efe4d10e43c0dd9fc7ad78302e2c3bc1cb23e2cefce842eb0b0a35329aa7
 MISC metadata.xml 448 BLAKE2B 088d419b835ebdb800e07ae00892d0c01bef6f862d72ac3976d58202e532870c1c0f8e96ea292c95e9579bda48b5c81952f954afee300e250a21167af639bf7e SHA512 4269d385c94e1dcfcd89f9ba95486da2a7feea2370fe1cef33051a3886e8c7612911bca2da15fa049d6692994c8c342e308fdfa2645a5f576ad93080e8d54d73
diff --git a/x11-misc/dunst/dunst-1.4.1.ebuild b/x11-misc/dunst/dunst-1.4.1.ebuild
new file mode 100644
index 000000000000..b4cd7451bb5a
--- /dev/null
+++ b/x11-misc/dunst/dunst-1.4.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DESCRIPTION="Customizable and lightweight notification-daemon"
+HOMEPAGE="http://www.knopwob.org/dunst/ https://github.com/dunst-project/dunst"
+SRC_URI="https://github.com/${PN}-project/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="dunstify"
+
+CDEPEND="
+	dev-libs/glib:2
+	sys-apps/dbus
+	x11-libs/cairo[X,glib]
+	x11-libs/gdk-pixbuf
+	x11-libs/libX11
+	x11-libs/libXScrnSaver
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/pango[X]
+	dunstify? ( x11-libs/libnotify )
+"
+DEPEND="
+	${CDEPEND}
+	dev-lang/perl
+	virtual/pkgconfig
+"
+RDEPEND="${CDEPEND}"
+
+src_prepare() {
+	sed -i -e "/^CFLAGS/ { s:-g::;s:-O.:: }" config.mk || die
+
+	default
+}
+
+src_compile() {
+	tc-export CC
+	emake
+	use dunstify && emake dunstify
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="/usr" install
+
+	use dunstify && dobin dunstify
+
+	dodoc AUTHORS CHANGELOG.md README.md RELEASE_NOTES
+}
diff --git a/x11-misc/evolvotron/Manifest b/x11-misc/evolvotron/Manifest
index 4f9079b83d76..ea809a5c9308 100644
--- a/x11-misc/evolvotron/Manifest
+++ b/x11-misc/evolvotron/Manifest
@@ -1,3 +1,3 @@
 DIST evolvotron-0.7.1.tar.gz 179516 BLAKE2B b73c813fdf134e0e4c7882e06a12bc06acfb6dcdf4a38043c4c30027bf00da10df85d6877abdbd8ca6393496038ba9fa0c32a16b0f37dd14d72cc63c00a17d1c SHA512 74f48dc0881a82d999ccc910df026da80fcc46a906fe2fbb8edbae50a1fa42a3379087f00dd21fd9e5d69cee7c6fc745b80f8703b1af1ebc3a1cdb52ffbe16e9
-EBUILD evolvotron-0.7.1.ebuild 925 BLAKE2B 6042cb371b400dd465fc41bd0d43796d265d9d2dee0a409f66a513b537d102f4890b4ce1e6180d8db5363884c842003a57c6fadcac292cccc47858f660bf05d4 SHA512 f95c0e4bc41cab5b2149b0628362fde25d1071fd00fdb154305e80412cd797506fc358c1a4ed282b424ce4575c2cd222db8048f46bd396dd5a74b0b00ca02fdb
+EBUILD evolvotron-0.7.1.ebuild 915 BLAKE2B 796e1d56e5d036c21432a325260bb467a00c8c921a912c9ce6fa1361c9e19f8b653612405c381b69022bfc87df3ea36c0fbc168aed0f00aa6cc92896e5a95be0 SHA512 b313b4b261973140839382dc561fe62811797a031c35bdc45cc025beded0f99ffc46f09adf87de111a0e4b27ecda33ca518b8b9a0a117cb3b47c292670704a9e
 MISC metadata.xml 356 BLAKE2B bcffe50af78659801374955b8bb13970760d0d565c89a210d2ee98059078df0bbd5634e95f2cbc9e922e8b29f21cacb7b6339b6004ac4619b21706b7da85be14 SHA512 7cea09fe7cfe3d43572ab13f83921cd252cb4a12bfc9fb4e2629cbd96c90a07fef8613090514ad562ee112960f88bdcbbe18daa185470780bd714e95aa6bfb47
diff --git a/x11-misc/evolvotron/evolvotron-0.7.1.ebuild b/x11-misc/evolvotron/evolvotron-0.7.1.ebuild
index 3e902671da9b..dd964488f2e3 100644
--- a/x11-misc/evolvotron/evolvotron-0.7.1.ebuild
+++ b/x11-misc/evolvotron/evolvotron-0.7.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc x86"
 
 RDEPEND="
 	dev-libs/boost:=
diff --git a/x11-misc/fbpager/Manifest b/x11-misc/fbpager/Manifest
index 6843e6e2dee9..a22ba8ecb1a3 100644
--- a/x11-misc/fbpager/Manifest
+++ b/x11-misc/fbpager/Manifest
@@ -1,3 +1,3 @@
 DIST fbpager-20090221.tar.bz2 267876 BLAKE2B ed7dea903258544ff1ed3c506c0d01342d5a43b4af035b3b428cb722fa86e1cdd996c9e41e2e197a56fd3bee5eccdb2da3ef00ecfe3fc77c410b958b004e5343 SHA512 fca9a43a3f71b1eb7b27befb3de4b0010f4974cb8898050325bec6def19f1b99a8e549eec04c14ef7777da8d23c25f8e799798160384e08d5a213c9c202bfd7a
-EBUILD fbpager-20090221-r1.ebuild 538 BLAKE2B dfd94d702bb86747df8a3e2e7d564c8fe70023fcd8a8166db27d554e28593583aa6de4b43ccdc92de12302f8a7abb5678c7e0f29c47ac53afc31a62c7accca09 SHA512 99305d1b08518a798dd3283195d9097b6da123b7ebc085e57b4fa1115afae88dc0ca9229d51d762df277fb325f7dd73a28e8d543955143af0bd86c9c04bd6cf9
+EBUILD fbpager-20090221-r1.ebuild 528 BLAKE2B be5a5448b873f94ccdbab1be99e4a7cdf07da5024a345a4d1b072ba3e468059fac2b07b7cb4f2a4357abc5a78d0ec49942d1b7cefce04015fbcfbddbe12147ef SHA512 1f519f11d2136eea49c857f7e21c6d57f8c95882eadfc92fcf3e39d2b7e0855e3b9a2fb19b68657962482613db481272e70028a4d1b4c70d3b4c94eeda8fbb9b
 MISC metadata.xml 276 BLAKE2B 1ea68f71eafa2d8403685c082a3c438c5cfd9ba24867a7b8eb481fcd5a254af9c94df97b5f04b190ab37ab10a37761489fd5eb8e3d22795db6f28f6f16a90db5 SHA512 d76e1098807ba35b104af6ab87ec9e5616840fb7901b3d29b8d588338d837902d5d429864aa7804abb97220d4dcc8d086162891389a8b2df134b803577add9a9
diff --git a/x11-misc/fbpager/fbpager-20090221-r1.ebuild b/x11-misc/fbpager/fbpager-20090221-r1.ebuild
index 844b63b2d8a8..8ab9daa7f17e 100644
--- a/x11-misc/fbpager/fbpager-20090221-r1.ebuild
+++ b/x11-misc/fbpager/fbpager-20090221-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~mips ppc ~sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 ~mips ppc ~sparc x86"
 IUSE="+xrender"
 
 DEPEND="x11-libs/libX11
diff --git a/x11-misc/fluxter/Manifest b/x11-misc/fluxter/Manifest
index cab282afd9b8..9141670b1f7d 100644
--- a/x11-misc/fluxter/Manifest
+++ b/x11-misc/fluxter/Manifest
@@ -1,4 +1,4 @@
 AUX fluxter-0.1.0-asneeded.patch 1127 BLAKE2B 8e2da410cdbc5b0ea94767099696c0b161b7f90bba0ae79f198ab0bf67166318707c9d94dca8dc0b8d450f97483bb41e762b4b1f2d11e29d62f5c381b86c8f78 SHA512 33861bc6f8e5acf31c83207c10e5953bb8bf49837bf55f0006db9d2d547e96208278cac742c5ce124a5c95afd5a385ae3cf1c46fc914af06fda55792ab5caf16
 DIST fluxter-0.1.0.tar.gz 99522 BLAKE2B 9586d3d48cdf299e5a850110b5549ca784e4af4f1d3c2385883c5e2e920f19ad42234c264da25b34896173d8dd64a809fab3b0540a31bae0d478444806474888 SHA512 92dbb74072b33a59fd356ca055e3b183276f314753f42591da0ecb845de271869a7717bd206e041e6d7a077cc8f931df3cfa1ec671a1ecf36ef565ed21382786
-EBUILD fluxter-0.1.0.ebuild 646 BLAKE2B bdf4f235abeccbc60b178cb4fa829ef5f69dd5f190b9f26724bd7d55068e5a3e142d22481916414f7004c9fd351ab50db54736d62c497b794f67c11ea668126c SHA512 0b28b5361b137d258cef43f9ff588feaad6c74b916a919834a17266181ec5dd9137f19a8ecb72fc5d87d806be0187bcd29a27d243adac53e516a6effce3127f4
+EBUILD fluxter-0.1.0.ebuild 636 BLAKE2B 03566a94c764f0b19e5708bb4f37362a3508e5635cbc339e5973e1be6e1b3d130d2ffd2f074b3f7fe8c2c51913edd51631c74ea594e68cfc31aa02185e5107b3 SHA512 41f21333cd39b1109371689a2fbbd520d6288eae0cab6a3bcbed54e198e45b60cf0967b54073e172b679f0b9e4119dd84a1a2fa11df173eeb1e953e5bcb6b3ce
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/x11-misc/fluxter/fluxter-0.1.0.ebuild b/x11-misc/fluxter/fluxter-0.1.0.ebuild
index 302d3006b641..daadac869e34 100644
--- a/x11-misc/fluxter/fluxter-0.1.0.ebuild
+++ b/x11-misc/fluxter/fluxter-0.1.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.isomedia.com/homes/stevencooper/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 hppa ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 hppa ppc x86"
 IUSE=""
 
 DEPEND="x11-libs/libX11
diff --git a/x11-misc/gccmakedep/Manifest b/x11-misc/gccmakedep/Manifest
index 4b670f438deb..f00bc68f4835 100644
--- a/x11-misc/gccmakedep/Manifest
+++ b/x11-misc/gccmakedep/Manifest
@@ -1,4 +1,4 @@
 DIST gccmakedep-1.0.3.tar.bz2 104766 BLAKE2B 4da8c3d4423f55fa110b1be748e9488b713a36b575f065f58d68c24eb4fdfc337aa9c715b82dfaac6eaaf8cb2037ab4d0355297a61c39f7e7672f136bb1395d8 SHA512 563b2897770a4df2792ea3eae8183a1f9e78192b7efc9c8296ee68d1cba6e72fa962a88e3251bb780df776e2aa7e80d74d5096675c61526c232aefa4f9e6a5fc
-EBUILD gccmakedep-1.0.3-r1.ebuild 971 BLAKE2B 165d1e4122b98b3a8e8ececcf30531da872ebc0f15c7654a2fda6172e1fa65b1ef3ea754ea5b279af870b53cf22d07ed1cf25962fa919191d36d47db5f326103 SHA512 fe274aeb8f04771b0d47a81ca7f6078ad078e0d5bdb8cef1812ba77521cb2a22ed79362365cd3703faa80566c16789df69dd69c6187e8d9aa094cc8af2bd4aae
-EBUILD gccmakedep-9999.ebuild 981 BLAKE2B 1c9d4d14d895ae8a517287549614e2379c988dc7aaa774ecbeb4cf32cfb8cb6f755205bc4d49bc3a7e14cbfa99aec9eedb6c69c49d20bc7a5cbe689fb4c2533c SHA512 3c02e522de69e27289f47f313dd19d401a33ddea4c70cba4ecb3bf23e32d05c5da49ee9127a76047cae6639924cb49dea20892e47b3f732896ce8c02db1f6763
+EBUILD gccmakedep-1.0.3-r1.ebuild 973 BLAKE2B c14817b3f0f619815be87e4b4fc3bbd18a96c1d24cbfc5a3bd665e6ac5d44ee22b385625b76e28b9f9f4f9cd1ffa0735cc094c30503244d79a9e95e0daf31508 SHA512 071d407df847a7c341eea723cfcf577f8545de7ba8a01361241ad86f1e9eab3895fb0523c2ec61db819cfd727f85d8520d7643aafbcfcb099acd86ea46415cd8
+EBUILD gccmakedep-9999.ebuild 983 BLAKE2B 61da2435abe08bf6c47a57b2f6405b2c31fe2cb89ae58179a4abeb5520f382e81141032624dceaaf28d0fe9140c14a0fd616e1015c3e8f183e64d8a8281ffc1a SHA512 7f611f405a342884af259517e430d3aecfd1ba34b436e3109d13c709aff661899ca039cac6c85b6a627d3a620cfc44f3da0e0108107705218690a5b2818e30c4
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-misc/gccmakedep/gccmakedep-1.0.3-r1.ebuild b/x11-misc/gccmakedep/gccmakedep-1.0.3-r1.ebuild
index 6e6e5f1c58d7..49ae6de71d79 100644
--- a/x11-misc/gccmakedep/gccmakedep-1.0.3-r1.ebuild
+++ b/x11-misc/gccmakedep/gccmakedep-1.0.3-r1.ebuild
@@ -12,8 +12,8 @@ if [[ ${PV} == 9999 ]]; then
 	# x11-misc/util-macros only required on live ebuilds
 	LIVE_DEPEND=">=x11-misc/util-macros-1.18"
 else
-	SRC_URI="mirror://xorg/util/${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 ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+	SRC_URI="https://www.x.org/releases/individual/util/${P}.tar.bz2"
+	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"
 fi
 
 LICENSE="MIT"
diff --git a/x11-misc/gccmakedep/gccmakedep-9999.ebuild b/x11-misc/gccmakedep/gccmakedep-9999.ebuild
index cc6ee3f93480..f973a69d1557 100644
--- a/x11-misc/gccmakedep/gccmakedep-9999.ebuild
+++ b/x11-misc/gccmakedep/gccmakedep-9999.ebuild
@@ -12,8 +12,8 @@ if [[ ${PV} == 9999 ]]; then
 	# x11-misc/util-macros only required on live ebuilds
 	LIVE_DEPEND=">=x11-misc/util-macros-1.18"
 else
-	SRC_URI="mirror://xorg/util/${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 ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+	SRC_URI="https://www.x.org/releases/individual/util/${P}.tar.bz2"
+	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"
 fi
 
 LICENSE="MIT"
diff --git a/x11-misc/gcolor2/Manifest b/x11-misc/gcolor2/Manifest
index 99a940827956..8b3fc84304bb 100644
--- a/x11-misc/gcolor2/Manifest
+++ b/x11-misc/gcolor2/Manifest
@@ -3,5 +3,5 @@ AUX gcolor2-0.4-pkg-config-macro.patch 240 BLAKE2B 3cf9e2836caaed0e4d0976f58af91
 AUX modular-rgb.patch 800 BLAKE2B 2bfa38afc6c781d6686e5a95c99d442bb7694487ef27b34915e700f540efad746a0d2bda5112cc15e8d3c79d9f99a9b15ab0004a00d9f9baea2dd7761655d2a7 SHA512 bf2ffe9bb489869e67b8b595fba649d3a8e0fe6dd168156c61f2a1165d865ac15199e03896c9b8e6a65d6cf84e8445f303f9b8eb190c60478e1334b60716572f
 DIST gcolor2-0.4.tar.gz 375217 BLAKE2B c8bc8581c9790106a9461cda03e40c201faec95c9c0d7890dbb8903346a85208c506dd8c9cd0735036b4a294205f44c857edbae8282574d195e77f4954bae91c SHA512 9b9677b4be8797c9b03deef9bf1b96e6497d2adf85f74d01f1b478f04d92cb912790c4d5fb74f403295219cac6c0d3fcabaa7de340975bbcdb68b0347f6042a3
 DIST gcolor2.svg 12742 BLAKE2B 40f5e6624a0a90d8d8c81dd5814d836741bab04f19d73cfbd96f224baa78165447d1642c18a55ef282771a02de4bddd77d975c4aa75bb74b98d63227f87031ea SHA512 377dbd494e5a3f881df65415ee66310cd96b4e4ac668101aa068bfe6f575b694c930817cec942e885f93465d05ccc604950f2154e26be95618d6f272d81ffe1b
-EBUILD gcolor2-0.4-r4.ebuild 1040 BLAKE2B 90c898bf347aa70076d694646b0d717601142996a5da292295acd5a8a8672347835fdb30ce1a61c2e3fb5f641a9bc5e0002096e803ad6578cdaf45aa37e9a4ac SHA512 7e7ec9685c487cff341a90174376af9eb9f7cf9fcfd1fd7ad75f285134fe24d318edd560427f4d8a0b60892ed8a4427b1b6bd0724420cd85ec320c0fb46eb783
+EBUILD gcolor2-0.4-r4.ebuild 1030 BLAKE2B 01c252a591e73b8abfe3b90488f92e1c9e8fadfe08bc809aa43103ea7e9491475b53e0b02fc9ff548ba0871508972b0dc08df0924b5b51194d790d9dacdd51ce SHA512 4749498596653dd27afff678ee521934d9a538d5173061ef94e3e66b6047c554cddc1f69cfab171d1cc2b71969e962fefc46ab2612a9245bdd4b6e8a54f4ef30
 MISC metadata.xml 330 BLAKE2B c19955a2fb7320cb01c45f1c478f0ca6adc253862399ee4fc52e64dc728ccc2550779b3c6d9e4784ad59e303947a45009a7cff803cbe278c51aa50d41a5b1c39 SHA512 93ca94884b92665bd0e26010bdc1120a3014a0c22ab2de2b06bfff14ac716ca28017e04ec6607a0ec4b90818692ecd6d701147b8e5068e933b3fe0641a7f735f
diff --git a/x11-misc/gcolor2/gcolor2-0.4-r4.ebuild b/x11-misc/gcolor2/gcolor2-0.4-r4.ebuild
index 56f2c4a0bdca..0b164ecf00f6 100644
--- a/x11-misc/gcolor2/gcolor2-0.4-r4.ebuild
+++ b/x11-misc/gcolor2/gcolor2-0.4-r4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 
 LICENSE="GPL-2 public-domain"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE=""
 
 RDEPEND=">=x11-libs/gtk+-2.4:2"
diff --git a/x11-misc/genmenu/Manifest b/x11-misc/genmenu/Manifest
index 262d0d9870c5..9f5168fad87e 100644
--- a/x11-misc/genmenu/Manifest
+++ b/x11-misc/genmenu/Manifest
@@ -1,5 +1,5 @@
 AUX genmenu-1.0.2.patch 490 BLAKE2B 43aaff9996762a20292ffc5973150a7b14660ec301f1959903ce7cb7e48df13860b357eb4adc53c4629f525cef168a9cd07bc82e5d8496660fdf032561085956 SHA512 f31a67c696bea0dbd2f2ab8e57a636af9ebe64f286421bfd70c4fa81b537e2726f3d0e41810e4f6a11f36e91a7f5382c428eec8b5481416f3d64af24500ee90e
 AUX genmenu-1.1.0-remove-openbox-support.patch 1110 BLAKE2B 4f4cdcf189ada28b4bee08a823d9bdc156efac6e3c08dc7038e828586a50cf7f578e363547d93eef166ec0b47589e288c0c30b560f65b0ef0cc532cf4567a020 SHA512 6e2e81d643c4b11db886ce855b277f113bbf4f157b565c656c23147a74c623575685a074e14cc1b772dd02a17fdfaab2f1317973946e5abc03dc790e7199f71d
 DIST genmenu-1.1.0.tar.bz2 10728 BLAKE2B f262c866d8844d9a956785aef38bf442d49465110725415cbb169822c5e10068e8a9aa410f08134d5db13cc59b97bc2d623657db65a35526e5928d341e51283d SHA512 eb87db30f6787570ffe844c7b9b25542652e485296ec061ab1da8f2b1bae40942630c9ca141cf8c7b55ce4d99d1b173511850247a5e07243256eb71588515e54
-EBUILD genmenu-1.1.0-r1.ebuild 518 BLAKE2B 6aa6baa1db59acd55d35154afed07b33327374d01f2d51edb0a73d15e03d2e4ea81ca0f678721821c9f3aba607d5a2e4b05bac459a34f8099ebb39cd4341b93b SHA512 165df57fb4bf9e8003a7dbc2ccc3b4f202d5c2f3385491d7269ca776e6a795c96821a092986147a767428d22ffc0e22c8c5e424d8ed88329efa4fa4b8c375714
+EBUILD genmenu-1.1.0-r1.ebuild 508 BLAKE2B c19d47da517294b3244bab9ede251eba2b4afef56b7cb6ed5b8db84e01289be687ccfdfd662793ece0167131904499da95d5ae72fc2f0d86788008b29c382368 SHA512 480cd8454184edd5115a6e3f25dbd8de01b97ca7a0999a980c1e61a3fc833896479383a122e49e2975f9047654e7ebdcb0390160fa90e4538de7cf0de4b7b67c
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-misc/genmenu/genmenu-1.1.0-r1.ebuild b/x11-misc/genmenu/genmenu-1.1.0-r1.ebuild
index e35bdf67eddd..06c91e668080 100644
--- a/x11-misc/genmenu/genmenu-1.1.0-r1.ebuild
+++ b/x11-misc/genmenu/genmenu-1.1.0-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://f00l.de/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE=""
 
 RDEPEND="app-shells/bash"
diff --git a/x11-misc/gigolo/Manifest b/x11-misc/gigolo/Manifest
index 1e43db797a42..66a72c43813e 100644
--- a/x11-misc/gigolo/Manifest
+++ b/x11-misc/gigolo/Manifest
@@ -4,5 +4,5 @@ DIST gigolo-0.5.0.tar.bz2 246473 BLAKE2B 23459a57467fefcc13c61483397837da51294fe
 EBUILD gigolo-0.4.2-r1.ebuild 707 BLAKE2B 3e9ff659fa2c0c36ef33f71d62c4a706917e3d6e2074fe77644b283b7052d2ce0635a31d50686b4915efd1b2a18e161edc60c5b82f36a71e51d9db8e1ed2241c SHA512 f342f5f9aa1bc19757f599aa4dd78047d37bb0ef1df172b8f9139ad92a4e52386b22faa42cec253c6e11df7d88f18335de0c122daffd8034242754b7b1bed053
 EBUILD gigolo-0.4.91-r1.ebuild 849 BLAKE2B 3931d06fef3c8885abc8baa7d5a9c1c724cad0562d2f7cbc5c105b0ac6790ec640d0a10d1376c8c8ff4753da9913efa82b1696d617f24c6a5a784a1c38d28794 SHA512 c2b1cce69c9645eb87ffdaa37ec3b06c72212e2b861b3d9382821bfac3b63072725606b1b4abfa3a9ebcd1e44738c583e5adde1721a536e7ba53cf00bb8acf51
 EBUILD gigolo-0.4.91.ebuild 704 BLAKE2B 72ac4bd1f1071a5f48a6e01ef142952e19cc76f38b1165ff4df54ea3b09ff30073c4025f076a955e536a5033024420cacadb69a870f0fa01e652042c7e0858a4 SHA512 b9cf5b7c221121359edaa12046c26e517ed287da5ed3fe12422233f032b3ef6b55f545c7629e0422f3ff49acaa5cf46b929ade4ffc07f687657de130299443bb
-EBUILD gigolo-0.5.0.ebuild 704 BLAKE2B 254a89e7e5c4102a9bfbcbec7fa4065020ab3e192c0d439b70fcef75ffa989eda044d8467061c063d3f4a9e3187fe5c1e46ad0a8b71e7d6f92cd47798cb1846f SHA512 d9ef1ab87166707baa6f1a8c721fcd2e3e32e6208554addf37e56e7346609abdaf5082bd782ccc43ac9b7b856ec6c15e943a1612636f53cb9b7e66f443ab8bd1
+EBUILD gigolo-0.5.0.ebuild 702 BLAKE2B c05d352b9fba57108decb65c9a05c2d6ae8fc147dd1d5007f6b76fba846d114ef5ba6a012d01de013792071ad2a530acde7effeb6e0013eb75dbb9a6fe27e709 SHA512 62df9d4fc278e42ca269679bc375aba360f4ef231008f7f1cb4aef2e0275e061056fc331dcc3b3155bffa5e8ba9f7c972842cc1c76cf0d9896bb2a96fc0ceaaa
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/x11-misc/gigolo/gigolo-0.5.0.ebuild b/x11-misc/gigolo/gigolo-0.5.0.ebuild
index 697b86b30161..c5127ee8b4da 100644
--- a/x11-misc/gigolo/gigolo-0.5.0.ebuild
+++ b/x11-misc/gigolo/gigolo-0.5.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.16
diff --git a/x11-misc/grsync/Manifest b/x11-misc/grsync/Manifest
index ff2e714b2420..9004430ada4b 100644
--- a/x11-misc/grsync/Manifest
+++ b/x11-misc/grsync/Manifest
@@ -1,3 +1,3 @@
 DIST grsync-1.2.6.tar.gz 333540 BLAKE2B 20719580309aba5737b74e85629b21b9715ceb8d97bd00d1840a5eda0e04316439d90999b7b787cdf8b368fff90ba489dcfc3b91992dd599f7ae05f4a565f1e7 SHA512 a7aac0cf264c968d50896156730dc0b925045def6e513adf1f2783e19fd1cdd423aa69480963479b95927fb4e863f110f3fc0439661ef7cfcacc7376fe95ff1d
-EBUILD grsync-1.2.6.ebuild 496 BLAKE2B ce9eef255c3e3212ac54f12253264633b48a8f4b103dd35a14d3b94786e3ed7e3d708146a36127c95cc0a19422c083a15de6ad6109cd9600884a3f9119b6fc18 SHA512 de5e2c0f10f9ad3d812c6d2159bdc88f95c54c5edbb8b5988c73a2e617778d6c1bb22bb2adee79fa995485760a46a85f6710ca3d132875dfe2c097b0d7e45886
+EBUILD grsync-1.2.6.ebuild 486 BLAKE2B 72ed686223e487c66f634c1ceda754a2f1013612b37257d0caba1562b60139c3dae87f41e8bc0cd670fe018513c8f74507bbb87522f48708b605d9dfbb7ad479 SHA512 e82b9210b749c08510ef6f12c4cbc332c21b3766575e16881be52e7501a9b7965a2563da576958ee7adc1c289826e6183c90e528210ccbbecb0e4f524f2bcede
 MISC metadata.xml 258 BLAKE2B 46e283e28202f000bdb3b2b01ac3b3e4aa25a42715e1940135cdcef61181c745865042fe44a908a5d3e83308f7f98f0eff2b8519c0a4691e3bf5637799de420e SHA512 9909d39f5a2a4d3c92d1c105ea5250603f505e9fbb0ff433c25290ac5c2b53f00d96fe8dc0a98bec2240298b3b7060503f59caf04cb47484a63e4057bcce82c6
diff --git a/x11-misc/grsync/grsync-1.2.6.ebuild b/x11-misc/grsync/grsync-1.2.6.ebuild
index a799b0ffda98..4115d15bc3b3 100644
--- a/x11-misc/grsync/grsync-1.2.6.ebuild
+++ b/x11-misc/grsync/grsync-1.2.6.ebuild
@@ -7,7 +7,7 @@ DESCRIPTION="A gtk frontend to rsync"
 HOMEPAGE="http://www.opbyte.it/grsync/"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE=""
 SRC_URI="http://www.opbyte.it/release/${P}.tar.gz"
 
diff --git a/x11-misc/grun/Manifest b/x11-misc/grun/Manifest
index 57d20f67f723..365cacf01adf 100644
--- a/x11-misc/grun/Manifest
+++ b/x11-misc/grun/Manifest
@@ -1,4 +1,4 @@
 AUX grun-0.9.3-no_nls.patch 220 BLAKE2B 6c215b3b18ed72a5f8f5138d5a86e2432cec84eb8b8d71351f2051eb0d92a5dfcede1f35800b848e1c31c4e34cc35adb7a46a0166405115c216d1f5c2ab29785 SHA512 decb938f75f520c214d905bda0670094360bd3fb98381e81fd2855e6ff7e96ab5cb44f920a2d20f79bb3f39ffd2086a150f2d47e83a731c8f79d4d947b1d40b9
 DIST grun-0.9.3.tar.gz 368318 BLAKE2B f80ac152c4b6f6844ad4537acbb4f8a3b0ffae05eb080a6aac8c24df228a8ce8a645ca6bbd26e29b58abbe5dbabb6950e3d4ee4ab445fcfd2c3d9da0e1587782 SHA512 cac78955f59d9981b2b39dce701fa508d00b1d39c8c05ac417cf8ed81419092949765e572f2f3d01bc1d916c28d0a428f84282111264adda9078261fa286e7d0
-EBUILD grun-0.9.3-r1.ebuild 845 BLAKE2B b70c484cbd4fb11d5544c92ff4395163012bb632e4aea69ce9b4a4ec5925c432ae7708ab08a54bb6223667737dd1314a84adcddd0a2e7580286b41eafde6528c SHA512 e28080d21b2250b017391c2910d63b78667fe2e44b02be1216a497e45e54f3ab174cabbcb443f91307e76403e1f642ca5f296ec74507d3c104744e002eb8b782
+EBUILD grun-0.9.3-r1.ebuild 835 BLAKE2B 2e64748ac44e7f1ca4a37cfc4b64aacb44a6f028e097caf0845451bc7b435f94623229489b8711313039bf106c22d3d42ba2680be16ec8b3465457603cd21e50 SHA512 20dfd3f85301c3dd92d0e845efe5ad0b5fd24fe8fbd761d8146c6b341f90ca792413c9986606028d19c921e44c653bf830fc8c32583792a65972699beafa660d
 MISC metadata.xml 399 BLAKE2B f105a06f42e1801309a64d5087574d07788bf469b84dbd8c4a642dd6a45a510ca1d08be3bfaba592d8c5cb5d673561e2ec952a5ac7b36b64df441738f9109531 SHA512 5794614fb0c7e1af15fdd73c8ef8fef474382cfccb776442adfe62cd71b3abe044ef4271ef0f07a262430682d31ffcb1f5cf1921e4d3d5ed912df86003b9459b
diff --git a/x11-misc/grun/grun-0.9.3-r1.ebuild b/x11-misc/grun/grun-0.9.3-r1.ebuild
index ff8bab19f5b6..46abc996d141 100644
--- a/x11-misc/grun/grun-0.9.3-r1.ebuild
+++ b/x11-misc/grun/grun-0.9.3-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://grun.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc x86"
 IUSE="nls"
 
 RDEPEND="
diff --git a/x11-misc/gxmessage/Manifest b/x11-misc/gxmessage/Manifest
index 638554b2561b..aff54f47395f 100644
--- a/x11-misc/gxmessage/Manifest
+++ b/x11-misc/gxmessage/Manifest
@@ -1,5 +1,5 @@
 DIST gxmessage-2.20.3.tar.gz 274110 BLAKE2B 9863e680b1d23ba3d69c35e2de826106f1078f585c0be36d1ad51946abbeef8637bc2f872f9fee20738c978146adebfbe47548de48be6b12b92c314ed93d9c32 SHA512 8f677d0ee899c88a40c912ba68b59ba9a21a0ae21db467c64756daea41fbf2a7fb566e26c74e72f89e6009b1e8029af9bd5748f92099f681346399fe7e9d8e27
 DIST gxmessage-3.4.3.tar.gz 275354 BLAKE2B 2801944c3a6542d250f91388a90736ba781013e5c370e42783db620387a07b315b176bac60e30af6e623d4f664291fdf567786e66a1f9e8c383dc772a64547e6 SHA512 4e3c455595db723e2d78060c4913f1a87b8f0c5cb6017427d48cd02652655592bf8aa1001adfbfecd5598cc0c613c78a74d71a59a7f1f0787acc29774328e93a
-EBUILD gxmessage-2.20.3.ebuild 851 BLAKE2B d0b7315257ae7aa09db15c7da5625909b241e1f8556e4462483534e4f9da4ecfc56fbbab7da7f99545ab31cde696499804501dd37456cf9fa981555ea1b006c2 SHA512 2d51cc5dda9e95f29214e928197d5a15e7a7594eb4aad230671743731f5fc9df965c04da6d406c7d5f7e64c10224263e36b2addac54794d2ae7e07c6a3b9b903
-EBUILD gxmessage-3.4.3.ebuild 877 BLAKE2B daf263c07b80ff2fe1eb143582373d14c7410833e07a11138799b78226b25e60e25b08be17bc4bbbdf2b0769f97cb51a279fa697def6ba096dec87dbb5e4901a SHA512 40599f39d099218580411a2dfb4b9fd83fcfef4b5ec91ccd011961e8fd12f2d14f152ef464258b2339c4c808bff6c56c70c4053ff61e32977495b54788234c8f
+EBUILD gxmessage-2.20.3.ebuild 841 BLAKE2B 26fde7e4dbc1b331f9cae6775ac56b4261e4deade272bb43441372ee982605c61a1d41ea9bbcd2070a857c1f467a0213fb55a6cd6ff9252893e9bd99f351818e SHA512 320cf1739969fc9c5d82c5c40892a99706ee0b94fed71df842f6465b904d785fc7cfe351e915f533e3169461e087e6198faa31e188e9ed7499774c0a0aeba82a
+EBUILD gxmessage-3.4.3.ebuild 867 BLAKE2B f8b771ad4cd8490bbd3bcb6ebd8a19847bf8c57a80c25ef40e5df2a9e08958aaa3be06dc2597bfa6436e971bba042e440a8be97a56c65b958fdbc3fbe53bfcdc SHA512 e35a84714028debd44d59ce5e54305a90a556d12af2dcfd5257b7a3b4081e02331d79ced5029c9e179148f2f207f3edbd49f85fc6ff9eb32458a0b9966c59a3f
 MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-misc/gxmessage/gxmessage-2.20.3.ebuild b/x11-misc/gxmessage/gxmessage-2.20.3.ebuild
index b8496ea3c9cb..3de3cbc42142 100644
--- a/x11-misc/gxmessage/gxmessage-2.20.3.ebuild
+++ b/x11-misc/gxmessage/gxmessage-2.20.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
 
 LICENSE="GPL-3 public-domain"
 SLOT="0"
-KEYWORDS="amd64 ppc sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc sparc x86"
 IUSE=""
 
 RDEPEND=">=x11-libs/gtk+-2.20:2"
diff --git a/x11-misc/gxmessage/gxmessage-3.4.3.ebuild b/x11-misc/gxmessage/gxmessage-3.4.3.ebuild
index d06b773c8c53..48f933861c53 100644
--- a/x11-misc/gxmessage/gxmessage-3.4.3.ebuild
+++ b/x11-misc/gxmessage/gxmessage-3.4.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
 
 LICENSE="GPL-3 public-domain"
 SLOT="0"
-KEYWORDS="amd64 ppc sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-misc/habak/Manifest b/x11-misc/habak/Manifest
index ae2f22e35e00..f859ac713000 100644
--- a/x11-misc/habak/Manifest
+++ b/x11-misc/habak/Manifest
@@ -1,4 +1,4 @@
 AUX README.en 6729 BLAKE2B e7c97c01b774d6813bb87373b8634000b71094ad6668e6402805d8fd5ee6ec1cea523bd4239f0ae1b7d4f53fecfc7545c4990a172b87a13a8a0615d53b81ecc8 SHA512 2857284f10734223fc03c57150f796bad07ecdcf9fd687893155f16b3633903df322d397be7f5e51f2c5ac87ae27d246549dd098b36e061ffa2d2dd3ae610e58
 DIST habak-0.2.5.tar.bz2 22657 BLAKE2B 10b3c4808251b255bcf26935974514a2df5946520bd4bc080b9bdc551c727925c8b9a7485124013303654769b9daacff42d54fc0e5d567b26d99c5a75a0a50c2 SHA512 256ac24a3b322397b6cdbd2ca8add5938c77d166092a783234baa6186c3b4e01aeffd0b890749c7ac14aa39961e5fc6326f614ceb04eadfc5e4af282d04b7188
-EBUILD habak-0.2.5-r2.ebuild 965 BLAKE2B 578a45e00020f338579dc8bcbe1964bccae314300f89682b6a5df9209a7319d6061b0a3ea60840a9bec06c33668bd7a2e52ab616b6489f04583cf4a682120b73 SHA512 ddd4d9f6714cb4b15c7e14d0dc557e5a6b23db5dc34248b48a35cfc35ade02b0fc97051bf6b68939d5cee34039bf6800a778777ba49e791e5b7cbfa9a0dea67c
+EBUILD habak-0.2.5-r2.ebuild 955 BLAKE2B ce9836d9b21573542341bc80036cd83b0e5305be8e2fb446cb8896820dcd1beb375b5d5d41769660729248483ff7202c957703015c3d94b46c0ad56a78fa4590 SHA512 32324ee7e7f9401b99e3186d6f684581ec9855e1f9ebaf18fda0d016abfb5d7a7347d91fe68e5aeadac3e76c35aa17416652f2fb00d2dc168284d2b0ab3a6bd6
 MISC metadata.xml 272 BLAKE2B 4dbd2b5ae92564a97b2a06ab0ec6562e8dce2dd636aaf0788ee09f8688ca5d5b6483084a65366dfbe6d144d30170e5558bc5759adecb96abb405ea96a5147285 SHA512 ebe67da08587903b5b82fc194aa3c8f1ab65371f60d2c134928362e089550d9e9fd9531bffe8b676a345b5bf0ab209ce7f50d37d98201a88176f002e17582493
diff --git a/x11-misc/habak/habak-0.2.5-r2.ebuild b/x11-misc/habak/habak-0.2.5-r2.ebuild
index d7fbf4a80f4f..0fe95e372ed3 100644
--- a/x11-misc/habak/habak-0.2.5-r2.ebuild
+++ b/x11-misc/habak/habak-0.2.5-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://download.gna.org/fvwm-crystal/${PN}/${PV}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND="media-libs/imlib2[X]
diff --git a/x11-misc/i3lock/Manifest b/x11-misc/i3lock/Manifest
index 215875c0f92d..e75c367fec5b 100644
--- a/x11-misc/i3lock/Manifest
+++ b/x11-misc/i3lock/Manifest
@@ -2,7 +2,7 @@ AUX i3lock-2.11-version.patch 395 BLAKE2B dee64a9c8b255e3cbadd27419929da66a8fe66
 DIST i3lock-2.10.tar.bz2 23171 BLAKE2B 1c1d0f8e3a85dcebe4a9ee181e399a4ff447ececfbdf5f9488df849316e47233118b7436c269a986fed4e907e6162f3758c8bdad2d20ac156e95a8be185a744c SHA512 ea865b202668212b58d0b97d0263171847e1bd0c529e2fd3d26c15ef253861b9a8357ff2efaa6a4f342c4d0d1ab03bc00f95f4d4008760ec8e0767ac29195517
 DIST i3lock-2.11.1.tar.bz2 145434 BLAKE2B 9a2ff0be922162710f9dbbf597f93ad939684641d2264c6ed38dc8a7eeb77c253f61aa1a2e873f03de2c8cc6d661e79ff166e4302c423261a65f66582749c962 SHA512 8b779aa0a560884adc1a508e1f07f712bdf043f72c377c24d5e7e186a6b97f34a5bda7aa67de41f5e15a1a541f4a2c2d28bc284057926a5833d70b67437d073c
 DIST i3lock-2.12.tar.bz2 147521 BLAKE2B 38ae5b4d6a92f918bc432e425301e8d04f9cc3bf8569e5f4e443dafed5aba19abf6604bfa102bc00ea5db87052583f1e9927a4f8e55906545b501829d95081e7 SHA512 84f1558368381bcad9a64f41ab6134a6614dea453d1ee5ecfe886185b9e1baebeeca446c4635158deb8dae5b25c09d47d3990239d76c44e5325ca5bfaad9b2ad
-EBUILD i3lock-2.10.ebuild 670 BLAKE2B d0da8763dd30fc3f354176f3c1d8e0ec2bc0758c4a732c485cdcb9b6510445644117a3b3bff77a78e2eb5c45df09b948e75c8fe186888baabad0d3e06d3e9a2e SHA512 1e77903498fc04b1f8daea6ceebace300dffa77eb97156c33e0be880cc73dfdd89827bde6ee1db23d83f23f8b9466b3520cfd6f9ef57397d515fa1a785e5fd14
-EBUILD i3lock-2.11.1.ebuild 789 BLAKE2B 612927a6c0f810b9516070a650dddcb67571ca544dda01c99e574df67013364cfb3defd3bc2bcb2dfa7cbcef57f618a13628f6ad9fdfdc9b4e64435b46ab4a27 SHA512 3891d25eb3dcd515356e2892fb6f0e1404de3c83c9d6070cecfddc4be9ef1e1b42494768cf35c25d897167b7f85055ac284f3ff413ffc9be1991f3eb023eb14c
-EBUILD i3lock-2.12.ebuild 737 BLAKE2B 4910116f82b6c5b3b851e26832ea669f803f88110a075f6403a497a3c69125abb79e723512d0352b9b8395f3bb24725fbd5db13c35139d9f1519f1d249a43bf2 SHA512 53a5827f0c81ec0e9543141e41faf8563a1d800f29699a5280603868d8ac3d047c3fffefba0981d0f547be632f8db4a82d9c58570ce2b582f8b945a31496c0b7
+EBUILD i3lock-2.10.ebuild 668 BLAKE2B 00d134bee246cfba1f0298b643567b7391957ab1b14f6af870be4bb652ddf946af7e5dede7d6e2c3d633e7f8d73ea227cbd7064664caa12b69d3c91ecbe8d5d1 SHA512 1bd9ef51ad54be02c1a4453a3f475d5a31b7cdfc86894a9209bdddc377161b28839b7e2a78f0f6bc0f33df6978b3349f146c7ddc8c31761e3916a7953c098ecd
+EBUILD i3lock-2.11.1.ebuild 790 BLAKE2B 8a311c12cc01d3e28eeb46bfc11de3780d3104f10404b292c2de6a6c5ea9f71f9ae01d3a4d97c54f03b50d2b3f2bfd541b246bf5f74f261ef44e87f935d545af SHA512 77586791aa53395f6827ebbd848bc7815c158f3f4f1ab388515406aca200372e02d153cb252539dd6a73b87fa0b98d1cee4dd18ce396eea2aaed7fa2761d36b0
+EBUILD i3lock-2.12.ebuild 738 BLAKE2B cf3794a2ddb8bcd09bae4eb505715d07a236ced7584a034c90b418e628be093549c437db8b4440f6e6380fdf9ee8c22a94b9c7dc03d2a55e917bfc79ecbfdae5 SHA512 0271a8fe2098bad84dd51369248b08451fd433f7e9194ebba9969aa21990de23e52da9a5b07539475e63f338a3cae0b7ccba035b48d529a2ae6e077004b5bf78
 MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-misc/i3lock/i3lock-2.10.ebuild b/x11-misc/i3lock/i3lock-2.10.ebuild
index 9579fdae9707..327b500143e5 100644
--- a/x11-misc/i3lock/i3lock-2.10.ebuild
+++ b/x11-misc/i3lock/i3lock-2.10.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
@@ -17,7 +17,7 @@ IUSE=""
 RDEPEND="
 	>=x11-libs/libxkbcommon-0.5.0[X]
 	dev-libs/libev
-	virtual/pam
+	sys-libs/pam
 	x11-libs/cairo[xcb]
 	x11-libs/libxcb[xkb]
 	x11-libs/xcb-util
diff --git a/x11-misc/i3lock/i3lock-2.11.1.ebuild b/x11-misc/i3lock/i3lock-2.11.1.ebuild
index 2df68dac048d..855ba37b6d0c 100644
--- a/x11-misc/i3lock/i3lock-2.11.1.ebuild
+++ b/x11-misc/i3lock/i3lock-2.11.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 RDEPEND="
 	>=x11-libs/libxkbcommon-0.5.0[X]
 	dev-libs/libev
-	virtual/pam
+	sys-libs/pam
 	x11-libs/cairo[xcb]
 	x11-libs/libxcb[xkb]
 	x11-libs/xcb-util
diff --git a/x11-misc/i3lock/i3lock-2.12.ebuild b/x11-misc/i3lock/i3lock-2.12.ebuild
index 68246549d68d..e1d59ce65c9b 100644
--- a/x11-misc/i3lock/i3lock-2.12.ebuild
+++ b/x11-misc/i3lock/i3lock-2.12.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 RDEPEND="
 	>=x11-libs/libxkbcommon-0.5.0[X]
 	dev-libs/libev
-	virtual/pam
+	sys-libs/pam
 	x11-libs/cairo[xcb]
 	x11-libs/libxcb[xkb]
 	x11-libs/xcb-util
diff --git a/x11-misc/icon-naming-utils/Manifest b/x11-misc/icon-naming-utils/Manifest
index 4c73cc82182e..5d2c47497d92 100644
--- a/x11-misc/icon-naming-utils/Manifest
+++ b/x11-misc/icon-naming-utils/Manifest
@@ -1,3 +1,3 @@
 DIST icon-naming-utils-0.8.90.tar.gz 70321 BLAKE2B e4944c6a279ffe38c8966783c799b1a84ba626a0611c3c29a7bccc982dfd45c7ae9d38d8b99f2e796466812a98a9216a440e871058b73aad537a0f2f4339d5ec SHA512 6c23f6138e053f9fc6de9d56f94b80849f29f9fde46cdf54b705720cb48b0c660f315484fb36fb9936d4ceade7768aad2d17280545a4b392aa56185c9452999d
-EBUILD icon-naming-utils-0.8.90-r1.ebuild 586 BLAKE2B f4d05e98491114e78ff7ea34369207002366260a9dd25afbfa2302a98a9dc09684e9fa9b6a6f2632ec20f505f68bc06f5bd33cc7c0481cb788ea1c718b51918d SHA512 f3e70ba1adeca29ed84ee96a5f90ec76e82b05b7e6fb704915ae3f42cc686474db1879c0c9eed5080441fcb1bdf9b3769af663f0fdb31a9fcf9ea5113b741f0e
+EBUILD icon-naming-utils-0.8.90-r1.ebuild 564 BLAKE2B 738a7ae383a25570420c28ccbf13f1f04bfc14868dfe9fc7932456dd70572cd0c87ce3733c68757e94044ce22cc109df226866188688e2bea1a0f1fe49cafe3c SHA512 dcccd159a7e145f05fa13f68cffbafb8684567169b0c9077696fe53de19cc63e57ad2f5fbfd3b2dd661c4d43265b765493c3a56534e05b916f0a26d5260b9965
 MISC metadata.xml 228 BLAKE2B 6b6559027915d8578c02e363cc855e812c338acf7716fe4108a8b85c09152a086cb578e7361f4613a44e8b550d7e205ff43aea39dd9488951fa18c6e15042278 SHA512 4f5e63f918a0f8790db49c5b12173c673f86935f00796a04acfed573f618379b73b05b1869941e11f881fe69d4958f5287ce815fd710eadb6ac9f2680894caae
diff --git a/x11-misc/icon-naming-utils/icon-naming-utils-0.8.90-r1.ebuild b/x11-misc/icon-naming-utils/icon-naming-utils-0.8.90-r1.ebuild
index 568bb39727f9..e44c11d26098 100644
--- a/x11-misc/icon-naming-utils/icon-naming-utils-0.8.90-r1.ebuild
+++ b/x11-misc/icon-naming-utils/icon-naming-utils-0.8.90-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://tango.freedesktop.org/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~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 ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=dev-perl/XML-Simple-2
diff --git a/x11-misc/imake/Manifest b/x11-misc/imake/Manifest
index b4ee2ab8d1e6..3270017d2d24 100644
--- a/x11-misc/imake/Manifest
+++ b/x11-misc/imake/Manifest
@@ -1,3 +1,3 @@
 DIST imake-1.0.8.tar.bz2 159398 BLAKE2B 2ea03a06daab883a35ac4ef5c5598db89c84b2bbc41105902f64ffaf66a2e5cebaa28bef0ee7d258eb7279eaa95671b8798701423cafffe87d8feced5bc1b63d SHA512 5352b0148664506c8eb7ba80f95fced146d150398673547ba0b2c7c966a382bc21de43dfb8e0d74e38a0a563f16ddbec48bf8c8e6daa1a0899a95403579d7728
-EBUILD imake-1.0.8.ebuild 484 BLAKE2B d221f406577088ae2b014c61b972c4a12ef2bcb78af7bd90623eeb189aa144534cdb99273ccc0d20f3153d6a676389c8153c5554bebe2f8d10701600e3f51fb7 SHA512 9c728439da7a5ae5582a9688cb972648861e91a8a1d783fc59dc369e0a8d3caed52d5818d8b03bd51bf944bdfb442a077ce81fdef16eec5202a46a97681745de
+EBUILD imake-1.0.8.ebuild 462 BLAKE2B c7ead61231b46222e6dd648e695cd042a101315bc299f84836bce4b8917fb3103345c46dc72751ed3cc8e5c14ffeb3cf9753852eda251433ffbe10a63fb08ce0 SHA512 755e3ee7bdbf8ab319f63716a7e5231fe12beb9132bc0f3ef58f599f3393bc83963a10594dc3f238160df32a1b787702b29ced478f4a30d96ca4d39e4c529901
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-misc/imake/imake-1.0.8.ebuild b/x11-misc/imake/imake-1.0.8.ebuild
index 3114c42dca1d..01a81c36cb19 100644
--- a/x11-misc/imake/imake-1.0.8.ebuild
+++ b/x11-misc/imake/imake-1.0.8.ebuild
@@ -7,7 +7,7 @@ XORG_STATIC=no
 inherit xorg-3
 
 DESCRIPTION="C preprocessor interface to the make utility"
-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=""
 
 RDEPEND="x11-misc/xorg-cf-files"
diff --git a/x11-misc/imwheel/Manifest b/x11-misc/imwheel/Manifest
index 9d9732bbe442..a74de258c04c 100644
--- a/x11-misc/imwheel/Manifest
+++ b/x11-misc/imwheel/Manifest
@@ -1,5 +1,3 @@
 DIST imwheel-1.0.0_pre13_p20100827.tar.bz2 125776 BLAKE2B eda41d2d3ce7f057dd71fbbfb4304064134fe37068788182880fcfc6727c12f5748bac40f3115e8be0093c027373689b7375c58487fe8c5a97d0b1e9c297431e SHA512 3b5ae23a1762122f6fe86610da6ad65118e8e743a88f370d6f6cdd084b4aa5f08d3089fccf3fca3a69b06560d7c2d7cfecfde1375154af9f519c0d4fe996080c
-DIST imwheel-1.0.0pre12.tar.gz 186424 BLAKE2B a13dc0df0d9c580eeb08e0c51deb9127ff29ad86826e941e15fadc60c41a00ac2e82cfcf11b020ce5a37b431a90c8c081b7fda30f8c7f161ab1f8623a2739bbe SHA512 4781f8c05e81f931452fb74745a93c907c695ed8b8b25442411db3a91ce4d3834e9f2a0789c950d7e515ad89aca28017844250affa5033988e79e5f7ff33f112
-EBUILD imwheel-1.0.0_pre12.ebuild 1029 BLAKE2B d5c7adee30bb17af0109798c90b5abda0ebad41a8fa05058dd6a1c26d8c2d350cde729336eefebe3ba8df0396b249cd29657f22745050e16432f5113de94447d SHA512 2303e8e95ef50f8c0ed191417de66a2e21ed841632df5162d4de2928b9abdf34f87ee443d0f1aa31604edd0ea63307fd348f1eef9716fcfb3af1e2438e37881a
-EBUILD imwheel-1.0.0_pre13_p20100827.ebuild 695 BLAKE2B 3cd45e002aa88f048062e333fbb31b973b26347e0db8fe68b467af1f37dda219afe616983b2be5b835cd1c995ce8a9e89574ac737d07f7621437f895dbd9a542 SHA512 e9e233e58751384d2366463d6860084e10b30e9caad3f636aeb4570e74341597db370fb33bde20c37867854f4c130d215e144d4ef35a1f173d8d04e62cf79c69
+EBUILD imwheel-1.0.0_pre13_p20100827.ebuild 689 BLAKE2B d534d2384f4db666e061aad547007effc41c35d8ff53194f6c8ff5aef0cc02be7259832b8ae4828c7a654081773cb99004f0326e94a23f7006792d83f5a750b6 SHA512 b5cddb76ec536eaed2eb74880169295ca7eb61b7660475372d233a0e9784de48abb6adf141efa74abe4e3b3d39ddee6a6ee5bb5feb866d303a116b19de4bfda3
 MISC metadata.xml 353 BLAKE2B 4d6fa01905f2aa762571614af6aa45f09e2972d06af9e6d4b09b4be4844e4ad42fa1c9010995a53f1365ec53e7fa712dc385406b8b607e5ca07a2e174af7a48f SHA512 2cf1e0e8cf35f3aa5b0e543a694ab9869f28ed457dbd7294463bdbe96960cbd63709fc8557f7e1c8ef0d2c77e1a6ffebf4d39ed6a5e52a3683d8d6f336d76ef5
diff --git a/x11-misc/imwheel/imwheel-1.0.0_pre12.ebuild b/x11-misc/imwheel/imwheel-1.0.0_pre12.ebuild
deleted file mode 100644
index 116f0bcb67a4..000000000000
--- a/x11-misc/imwheel/imwheel-1.0.0_pre12.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils
-
-DESCRIPTION="mouse tool for advanced features such as wheels and 3+ buttons"
-HOMEPAGE="http://imwheel.sourceforge.net/"
-SRC_URI="mirror://sourceforge/imwheel/${P/_/}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ppc x86"
-IUSE=""
-
-RDEPEND="x11-libs/libXtst
-	x11-libs/libX11
-	x11-libs/libXmu
-	x11-libs/libXt
-	x11-libs/libXext"
-
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-	>=sys-apps/sed-4"
-
-S=${WORKDIR}/${P/_/}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	#epatch "${FILESDIR}"/${P}-gentoo.diff
-	sed -i -e "s:/etc:${D}/etc:g" Makefile.am || die
-	sed -i -e "s:/etc:${D}/etc:g" Makefile.in || die
-}
-
-src_compile() {
-	local myconf
-	# don't build gpm stuff
-	myconf="--disable-gpm --disable-gpm-doc"
-	econf ${myconf} || die "configure failed"
-	emake || die "parallel make failed"
-}
-
-src_install() {
-	einstall || die "make install failed"
-	dodoc AUTHORS BUGS ChangeLog EMACS M-BA47 NEWS README TODO
-}
diff --git a/x11-misc/imwheel/imwheel-1.0.0_pre13_p20100827.ebuild b/x11-misc/imwheel/imwheel-1.0.0_pre13_p20100827.ebuild
index 6069accc2864..0898ec96384e 100644
--- a/x11-misc/imwheel/imwheel-1.0.0_pre13_p20100827.ebuild
+++ b/x11-misc/imwheel/imwheel-1.0.0_pre13_p20100827.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
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+KEYWORDS="~alpha amd64 ppc x86"
 IUSE=""
 
 RDEPEND="x11-libs/libXtst
diff --git a/x11-misc/lightdm/Manifest b/x11-misc/lightdm/Manifest
index 9c94ebc2118c..4072b0d6af0d 100644
--- a/x11-misc/lightdm/Manifest
+++ b/x11-misc/lightdm/Manifest
@@ -6,7 +6,7 @@ DIST introspection-20110205.m4.tar.bz2 1220 BLAKE2B 01483c1a7b73568e01cc4d84b43c
 DIST lightdm-1.26.0.tar.xz 516092 BLAKE2B 0bbbe11959a2ea0c21e723d10e8831fc0d9e15475a415869634cfb41c6d576b77fd87720be33dae8456063947dd1b551e88c263ed76ef9b120c43df8c42513f3 SHA512 67c0671753587493ed064b66f94be58853028287c914d1101e66499bebf1408e14d33245887ce89d1c4931960225ea3984e5e625b22dc4e3020be34a3087d8e7
 DIST lightdm-1.28.0.tar.xz 517460 BLAKE2B 98a0b60623dcac07bbb6bff95fa20da9425b714fe5da0d7d86c788362e40604bea2b46675c57e70c70356f71a542adbd6431723e40b815db8565d67ddecc20a1 SHA512 e1e8a952e723bbcc106043d33a64278b228a5a47a7e54235375817b08483594cc5e46ec52f5cbb9d258266e44b045785bca1d4c62daf83071c0f668b3c480071
 DIST lightdm-1.30.0.tar.xz 509220 BLAKE2B 5b6fcc6b955d7a7eb3a810a7e28707a812810d7f2568d6985a4411b1bf6f06b35ff721bd8a9388a85a4e4a64a39f5e30e86a9dbaa6d344e898ae49e9f39785ff SHA512 bca25a0aa73caf7d51e5882889a1707d2527470a170658c1be98ecfb96c8f85fd616494fc5bed658e744f91b9f8b0a98d2a0cf42f9c030242ae470c8a27145ce
-EBUILD lightdm-1.26.0-r1.ebuild 3851 BLAKE2B 818d44e66767fc8ca55c143ec008632aab9985abd2d00697db4ca46f129c7cde81f4a385b36f10ef67664142f4b464fa95519897c18d4af61f559587acb98765 SHA512 816e627aa18bb213f41e629160d6466494459720e264f0051e5888c870166f818dc5067a75341899d46b9e34f019cbd5cb1f160060666b849bc3bd0f3f1ec426
-EBUILD lightdm-1.28.0.ebuild 3919 BLAKE2B 16c4efeacce0d6b427377290028bcb9ce4a29d572937fd4e2571cab89b2705716d28d4a4dc5fe8bd7e7dd700162fbe6caaf2eaf0bc34b318ecb1c60a789a731a SHA512 5f093583e400151c196da0460f9bc95a7d1b8b8a5c1390caabac3d4b23d539aad4687c6f4cddda0e71abd566976d9b5f71f58300fee56183196e8a9f3768240c
-EBUILD lightdm-1.30.0.ebuild 4272 BLAKE2B 4b237666154d7bf814c566f653ecc730e0b01e9649fb45cb418d4f4ccb5118f60dc28990290a040b41e07694be4e11fa4a7239494e2ff848a2a9990c6919502f SHA512 78f56a3dd074c960cbfea0595ff4fcb3e9ce328717f4d26c328d0a6eb92ba2f0cdfe99f4c0f3fedad051c7b5e15224d392cd5067e3ea74870f59e2c544eb16d5
+EBUILD lightdm-1.26.0-r1.ebuild 3852 BLAKE2B 1e4f195f81764e403483adf2cf96e80133f4ceef2e3cc9d19fcdec533c27dce1e02bcfaaab922f3caddb16036a271257ef7855125e9a95ec995c432b4d236512 SHA512 6c6d381e593e27a6896dca626e52d735f7300e8c6f6055fed81c927266f6084fd911a31541d2d2fd2e8d0d6dc0573e14a4e19e835cdad4658fe78b3d4579ed33
+EBUILD lightdm-1.28.0.ebuild 3920 BLAKE2B 9a50dfa326aac3c678291c95efad0d700f6a940b1bff0c5d8b414777e4029502d4260b6e9afaac7d770bb30231c07a9f98dc1799fc6875b609206e75a249e312 SHA512 3ae4cbeaf8a786861a2a88e47693ebd713350b6139991c91a57abe7a741009480fd82706ac98de1fdedee570d2475f9373a80ef0a8b21bcb9679c640185e5004
+EBUILD lightdm-1.30.0.ebuild 4273 BLAKE2B c05b7258f91bb7e33a2a7b66f062882ebf986f342f7eb711d3c50d4739d8a8bc71dc5a834e6d3aba56df65cbf01f4ca3c00137b31d6e802a312ddf501f889783 SHA512 057d9651bec29fa4abb83b53f97355385798d75c2048d1464e487fe2c1331734ade8e1b75c7c33da0d9b532cb9b4a690111839f8fb940ed45a0d9b9ddc7f54fe
 MISC metadata.xml 462 BLAKE2B 8360d85d185558b5d6c3b2d18d5210c532537d1cc93007b0f0b91d37b388d02c966dda14c298ff8c3b47bd39696b332f989fffa6e1a68001116ddd69141b21d6 SHA512 d76a144235e233e46103c3f10ee64d3b5306b82220366e006671851dc725027ddbf600ca8fab8370c7fca3b09182cd7c85b458d79e7ddca681f279909f4737ba
diff --git a/x11-misc/lightdm/lightdm-1.26.0-r1.ebuild b/x11-misc/lightdm/lightdm-1.26.0-r1.ebuild
index 15b2902a69e4..e33f430d4dab 100644
--- a/x11-misc/lightdm/lightdm-1.26.0-r1.ebuild
+++ b/x11-misc/lightdm/lightdm-1.26.0-r1.ebuild
@@ -18,7 +18,7 @@ IUSE="audit +gnome +gtk +introspection qt5 vala"
 COMMON_DEPEND="
 	>=dev-libs/glib-2.44.0:2
 	dev-libs/libxml2
-	virtual/pam
+	sys-libs/pam
 	x11-libs/libX11
 	>=x11-libs/libxklavier-5
 	audit? ( sys-process/audit )
diff --git a/x11-misc/lightdm/lightdm-1.28.0.ebuild b/x11-misc/lightdm/lightdm-1.28.0.ebuild
index 7c68ee63049f..07340664b29f 100644
--- a/x11-misc/lightdm/lightdm-1.28.0.ebuild
+++ b/x11-misc/lightdm/lightdm-1.28.0.ebuild
@@ -18,7 +18,7 @@ IUSE="audit +gnome +gtk +introspection qt5 vala"
 COMMON_DEPEND="
 	>=dev-libs/glib-2.44.0:2
 	dev-libs/libxml2
-	virtual/pam
+	sys-libs/pam
 	x11-libs/libX11
 	>=x11-libs/libxklavier-5
 	audit? ( sys-process/audit )
diff --git a/x11-misc/lightdm/lightdm-1.30.0.ebuild b/x11-misc/lightdm/lightdm-1.30.0.ebuild
index ab19d4b3216e..66fa6db0d07d 100644
--- a/x11-misc/lightdm/lightdm-1.30.0.ebuild
+++ b/x11-misc/lightdm/lightdm-1.30.0.ebuild
@@ -18,7 +18,7 @@ IUSE="audit +gnome +gtk +introspection non_root qt5 vala"
 COMMON_DEPEND="
 	>=dev-libs/glib-2.44.0:2
 	dev-libs/libxml2
-	virtual/pam
+	sys-libs/pam
 	x11-libs/libX11
 	>=x11-libs/libxklavier-5
 	audit? ( sys-process/audit )
diff --git a/x11-misc/lineak-xosdplugin/Manifest b/x11-misc/lineak-xosdplugin/Manifest
index f2bc4c6f5f3a..a1b1ca29c44a 100644
--- a/x11-misc/lineak-xosdplugin/Manifest
+++ b/x11-misc/lineak-xosdplugin/Manifest
@@ -1,5 +1,4 @@
 AUX lineak-xosdplugin-0.9.0-gcc43.patch 260 BLAKE2B 388a7c6e3e89ec3d4ab779127df0a3f83dae83dda8ac60889a8a29189e82e6b41f9c324f076cd3df8da5e22bcba97e92aa7df4ad46dc4c44fe6c665fd7746435 SHA512 3f4d9c929ba3bc1c831bbea2fefa78229e73f9d2f863bbe0e0695eeff84eac6d5d162c6ad4fbf608811c169ec8e75c811623858196c907a59a652498f5cc9fae
 DIST lineak-xosdplugin-0.9.tar.gz 802367 BLAKE2B 76e9f0fd088a1323eb72deca02aa325a908b4308f2d76e10e33c57af7dc41823a6b5572ef861ba337af9b76d07d650b31539aba7d0a4815b19d2abba3ad0cf7c SHA512 5f38616a770dea9336e1af93c209ab1c5232d783e301d949e54ca44dc5b9dc462e8fad6448c6ffbb81d6494f5da91f507da2ed3835e62ecb6ef794f68b5f8009
-EBUILD lineak-xosdplugin-0.9.0-r1.ebuild 754 BLAKE2B 2cf92b49777f7a9f4fa86faaafb4449eafa7024dd91a031c35722992f373d06f8e062abcdf67555fd5e3fd7e29be06792648cd6ae140aa73f752a2551cbd47cf SHA512 9eada73f60942e9b8e5d29987e4f180b8623e6f7f70e86a7cc524cb6f71e46829141cbd326f4b229f8f144e51f0471340d2aa8e2240a016ffefbbc88da9b2d5c
-EBUILD lineak-xosdplugin-0.9.0-r2.ebuild 792 BLAKE2B bd80b6ea6e8249252879a6d78605104cadbf8101364bbd848c7744858b4ad46b5ce50ae80ded8ec84e59e47d92a1ab416e8323a66443746f3d2c382f28a26052 SHA512 3b3b22079966e527f7cb96294469916954db85fadb0491acc185ddcd724469b6b635fdeb49a0e374e339317392e3305a5587110ba5540e7a91a2ae98d6993974
+EBUILD lineak-xosdplugin-0.9.0-r2.ebuild 789 BLAKE2B f04d6c162105071ffe37e63c963aca51116ba51736eb7409ada5afb7b81c7fb66e534892502f6bd817bfc712230402b1b47b401a8065983b5eaa2adc40c56300 SHA512 f32329e80162d0429974995e89100c69df8cfccd0b08b16dad818a7def67c3abf5870c45818734fdd5ba3c6d1a0d0ddde6687d0074316d82c2021cf72b3a2992
 MISC metadata.xml 352 BLAKE2B 4110d9b5e116df93d0d52f464d392dc4b55d95615b20db7c92e8792ff684e60c84ed9c9703272eb7ce70688de54ce1943c99d90b2f6d81ed8342898fbe710346 SHA512 1abdaf434e7034702a0dfceff233083abc0bdaea90e215687ace13b6d005502da7193794cdc7beda708e741c5562313b93fd41677fa07d4f68bf8ef7cfa81939
diff --git a/x11-misc/lineak-xosdplugin/lineak-xosdplugin-0.9.0-r1.ebuild b/x11-misc/lineak-xosdplugin/lineak-xosdplugin-0.9.0-r1.ebuild
deleted file mode 100644
index cb2170039631..000000000000
--- a/x11-misc/lineak-xosdplugin/lineak-xosdplugin-0.9.0-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils multilib
-
-MY_P=${P/.0/}
-
-DESCRIPTION="Xosd plugin for LINEAK"
-HOMEPAGE="http://lineak.sourceforge.net/"
-SRC_URI="mirror://sourceforge/lineak/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="debug"
-
-DEPEND="=x11-misc/lineakd-${PV}*
-		x11-libs/xosd"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-gcc43.patch
-}
-
-src_compile() {
-	econf $(use_enable debug) --with-x
-	emake LDFLAGS="${LDFLAGS}" || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" \
-		PLUGINDIR=/usr/$(get_libdir)/lineakd/plugins \
-		install || die
-	dodoc AUTHORS README || die
-}
diff --git a/x11-misc/lineak-xosdplugin/lineak-xosdplugin-0.9.0-r2.ebuild b/x11-misc/lineak-xosdplugin/lineak-xosdplugin-0.9.0-r2.ebuild
index 78d709a75198..5499b6eedf13 100644
--- a/x11-misc/lineak-xosdplugin/lineak-xosdplugin-0.9.0-r2.ebuild
+++ b/x11-misc/lineak-xosdplugin/lineak-xosdplugin-0.9.0-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/lineak/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="debug"
 
 DEPEND="
diff --git a/x11-misc/lndir/Manifest b/x11-misc/lndir/Manifest
index b5db64af5f7b..bec0c6b5c9da 100644
--- a/x11-misc/lndir/Manifest
+++ b/x11-misc/lndir/Manifest
@@ -1,4 +1,4 @@
 DIST lndir-1.0.3.tar.bz2 114392 BLAKE2B 2e9feb3057f1508a118c4dd6212305e626ba25dd32296d35a553b5c42cb441e494d386d4c9afe15f150a9a8da2b7fac0ae7a128948544c4545ea740d7e7e21a6 SHA512 c9f03c825c627935abe399bf8292bbf69304cb9e9d65a4c860b49e32e2ed4dde25bf658a5ab2116cd215381d0a52f464a8a53469c27adddbd9fa2bfd135a7289
-EBUILD lndir-1.0.3-r2.ebuild 886 BLAKE2B 4cdfc54e747b4cde1fe88c9befd259e77862c138a05bae7737708c06bfdb161389dad858e147c93a2e030b6cba3f630db5087c2f72227f15c8b27ec6b6fde7b8 SHA512 aa967e0fb3c117f7eb06936d6c37c3c23ad98bad8b81cfe7cb046bbbb0edd36cb416f50bdb15df319dd911af58d7c660ab9ba4383656e205e8b18e07d008bc1d
-EBUILD lndir-9999.ebuild 891 BLAKE2B 1d12ad80e23faf59a408764f979fed8fddbe8459b86dc1b995f01edebd0a86ae1dfc2a7df9e5fc39bc4bcc7751aab0de2b1cb71235ade7d87d68f5204fc4ad7f SHA512 d2c4d3484e37809bdf780df5ac2fdc5c85e9938538e4b7cbe25c19c64f23a1d5d9dc0c2fbef2c64206d83042f0585bb1f7dc54dab5c2df30d52213046cdf3f9b
+EBUILD lndir-1.0.3-r2.ebuild 910 BLAKE2B 906a5caa398da8f4292fe88dacd9bb00ddad281bf61574feb42413e583aa9404615c92634ebf74a8d1eb0b0314953593e45a5657249db16be0d23f4c2bcf10a4 SHA512 33ad53cf1cdaef8960bae040863d01eb1f05ca5122f08feeb81059d3f1eb3cabcb611c0fda9117b58936cb21350d6c723d638cb02c54ea4db9bcd610329e7ea8
+EBUILD lndir-9999.ebuild 915 BLAKE2B 5d39545b53476c04a51537deae25f6447bbc7988adfc0b06346dcf767bc699203063eef4030aa2bb6c7a4015fcf69fe4631a6f7bbfc5897998a14c0b71e1086f SHA512 c909db16fba15ac836c801a7d383169fc7c45bf49a8202ac668b8bd3c05fac7565eab7d22a1def4b858d8c3e4c1af9641a728b72613bf9ffad36185fda9e61d2
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-misc/lndir/lndir-1.0.3-r2.ebuild b/x11-misc/lndir/lndir-1.0.3-r2.ebuild
index 5129dbabb0a5..57a38b96a8c8 100644
--- a/x11-misc/lndir/lndir-1.0.3-r2.ebuild
+++ b/x11-misc/lndir/lndir-1.0.3-r2.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
 	# x11-misc-util/macros only required on live ebuilds
 	LIVE_DEPEND=">=x11-misc/util-macros-1.18"
 else
-	SRC_URI="mirror://xorg/util/${P}.tar.bz2"
+	SRC_URI="https://www.x.org/releases/individual/util/${P}.tar.bz2"
 	KEYWORDS="amd64 ppc ppc64 sparc x86"
 fi
 
diff --git a/x11-misc/lndir/lndir-9999.ebuild b/x11-misc/lndir/lndir-9999.ebuild
index d9e6b13b90cd..14cec61a311d 100644
--- a/x11-misc/lndir/lndir-9999.ebuild
+++ b/x11-misc/lndir/lndir-9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
 	# x11-misc-util/macros only required on live ebuilds
 	LIVE_DEPEND=">=x11-misc/util-macros-1.18"
 else
-	SRC_URI="mirror://xorg/util/${P}.tar.bz2"
+	SRC_URI="https://www.x.org/releases/individual/util/${P}.tar.bz2"
 	KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 fi
 
diff --git a/x11-misc/makedepend/Manifest b/x11-misc/makedepend/Manifest
index 5c857fe2e8d0..6d65664667e3 100644
--- a/x11-misc/makedepend/Manifest
+++ b/x11-misc/makedepend/Manifest
@@ -1,3 +1,3 @@
 DIST makedepend-1.0.6.tar.bz2 147616 BLAKE2B 6e9538e435d602ab3bcfb35a5398d6f11a23e4c9fa19bb2e3f651967d3fb1945557af2a5d84fae3e46112aae9ec411894cf8605e4856a46b120b660ff4b95ea4 SHA512 eb0e8ee8ab7515806d7d98a060cdcd392ec38e4225e5e05db26daa6651f185d0b764aab403edeea904d4d23211b1f7db20daeee6eafce8abe65225784ed0aa42
-EBUILD makedepend-1.0.6.ebuild 438 BLAKE2B a5846b4c23cf93d392b95c7157bc20bf5c8304ddfe25524b4535bdd56f2de9afb9bd01487a7c2ba6d222a536bdbcc1e1b257d2c213d2094cb8541a19b96ecccf SHA512 4ec9434da71002de86cb6f0bda41151136558298d9be9a420152f656eeddf1a486c1783ba4e123a860468e50ca771ec3ffb880297a5a837fa5725e8db548e154
+EBUILD makedepend-1.0.6.ebuild 416 BLAKE2B 276863a05377d0d45994fe7a8f5afa9cd571ac0645578e60c60c8b68f627905a512b6eb5b696ccde94a7dcc3da13cba5354fd6107e55282579e8a56d854c6e4f SHA512 db57a74ca5f9b163e53fd85dbff1338874446b87f1b7d51a505211fa9d449dc78d1e0a16064038c3811a6ec37fad99942c41513449f56eacaf80d5669abd0199
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-misc/makedepend/makedepend-1.0.6.ebuild b/x11-misc/makedepend/makedepend-1.0.6.ebuild
index 7a08a112104e..2b5e681677d1 100644
--- a/x11-misc/makedepend/makedepend-1.0.6.ebuild
+++ b/x11-misc/makedepend/makedepend-1.0.6.ebuild
@@ -6,7 +6,7 @@ XORG_STATIC=no
 inherit xorg-3
 
 DESCRIPTION="create dependencies in makefiles"
-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=""
diff --git a/x11-misc/menumaker/Manifest b/x11-misc/menumaker/Manifest
index bcf228f6b235..8db98518a742 100644
--- a/x11-misc/menumaker/Manifest
+++ b/x11-misc/menumaker/Manifest
@@ -2,6 +2,6 @@ AUX menumaker-0.99.10-AM_PATH_PYTHON.patch 2517 BLAKE2B 45fc07e14f0b89106464b925
 AUX menumaker-0.99.11-AM_PATH_PYTHON.patch 2579 BLAKE2B 67b3924544429c998229b439cdaac12aaf6e24aeaf647fd604a9602a25d24250a59c398d7c403744445adf81cf0dc4dcaeb88a07edb0f6181104e0e81aae175d SHA512 f36c5d30981c2e39b37a626eb235f7e9117de18bd774e91058350cceb9859ed9f99a11233f9a72a8acff7a7f84bf657a25e86935623a65986d63ce86734b3c3b
 DIST menumaker-0.99.10.tar.gz 202580 BLAKE2B 2fb53359a6e4b14fe8966c3fbb6d0f381a3ad9e52463d37edbef47a409b0ecf4f17bd7221395987d4cd49f363007aa97f0d6182595a571f1baab4e7977c06bff SHA512 e7a731ac848089cbdb845fdb0e344b48e70d3bb7220870127d3616549d31fa62b61a48e3efff52d7767b597a4407a8548e776c16976072d0aa7f5c96740cd207
 DIST menumaker-0.99.11.tar.gz 205196 BLAKE2B 5f1fa9cbf4fd739499db86f9173fbbea2c96900597d13185f2a2f2b5746a0a2c05d12b115782488cb5b1df1f48638bb831dbee4bb14c414fc11328f43d241c46 SHA512 b45b8f2de4e63bad673bf4463ac074b068d4889cf37644962d51e1514d07bef827679d060d1503e59ea4bfc460fdc643d850921b3a02babd1ea57249511ffa5a
-EBUILD menumaker-0.99.10.ebuild 1114 BLAKE2B 98ea44a42dc7599ba5790c8d2ae2968a14b88455fc0f88b60a7a089108bb29c33074cc1c81250f932dbfe44b295b64896e28a3f8e1fc6b833180011832823dae SHA512 b8d07d4b5e886b07231c66ea5deae6e56c3ebf431a6900b39c0a6f87ab93cedb3e4596c10aa3eb1ae6c8e094ef521e9b528bbff41d2df545387b4c36827c29c1
-EBUILD menumaker-0.99.11.ebuild 1105 BLAKE2B d74a2093d783ed3c1a0dc19e597329252777ad87d615f6de04de4f405553afa2ac5acee2c7e00e6c0e53c8cf5c52d5a74648e5ebc061acdd2b39479aee660c35 SHA512 233629568bc5d4e1978dd3b5c1334089b2486c4632530e4168d23c0aa8c9f11531d0a3bf64ac8c7852d1ab9b2879a041975333bd222e5390141080409bf68fd5
+EBUILD menumaker-0.99.10.ebuild 1104 BLAKE2B 2782727d4c1dd000ef0faca3582247a635fa038a044662affd70acb5d20d2a6b687910244c133bf338191d0585c2c464b89c576603baddcac82ad05879578e29 SHA512 e2acb93e90ad017f234cf2da40461fa0c1d23b1db87e77f6d929eb2ef9119e05af49428e3343fbcedc45e11b756960344178a3d69fc3d8af6a10a5847f962ce8
+EBUILD menumaker-0.99.11.ebuild 1095 BLAKE2B 090bc1cff45b7354bc2ece658b4de91aa25a33d46b75ac39077d2f0e96bf023f938d33a52f72577145b3a1b5d686188133882b3f9cf36aa8359fd6adf1aadbf2 SHA512 0838c88c1a979f90b20c1ff466fd0fce40f8f12ee294c056df25fa5bf9bb08fb8d91564dcee3100a78ffe2579fb58bc5481a94e19e0a8a08800e1de648a09011
 MISC metadata.xml 439 BLAKE2B cee25e15ca49508e651ba46d0598ee61f0c959bdf46a28337ab0d6071683e6779e8e0d50e36d9aa84ef761f251773ea101eae4dbf1a3b7494d08d2f8778f90e4 SHA512 5f68ee720bbfc364f200335a1045982b4c82aab73e24a8e5143d8a776919b6b676088c5af49ea74cdb09d09cf1f055b596471915f173ab6afbb17bc553a6b07c
diff --git a/x11-misc/menumaker/menumaker-0.99.10.ebuild b/x11-misc/menumaker/menumaker-0.99.10.ebuild
index a3ee47cd857d..c2950bbcf4ae 100644
--- a/x11-misc/menumaker/menumaker-0.99.10.ebuild
+++ b/x11-misc/menumaker/menumaker-0.99.10.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc x86"
 
 IUSE="doc"
 
diff --git a/x11-misc/menumaker/menumaker-0.99.11.ebuild b/x11-misc/menumaker/menumaker-0.99.11.ebuild
index ab1ac978b110..14d2b4ab3443 100644
--- a/x11-misc/menumaker/menumaker-0.99.11.ebuild
+++ b/x11-misc/menumaker/menumaker-0.99.11.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
 
 IUSE="doc"
 
diff --git a/x11-misc/mugshot/Manifest b/x11-misc/mugshot/Manifest
index d76c7251b2ab..649ac3f6804d 100644
--- a/x11-misc/mugshot/Manifest
+++ b/x11-misc/mugshot/Manifest
@@ -1,5 +1,7 @@
 AUX mugshot-0.4.1-missing_default_face.patch 782 BLAKE2B be9ef8633839b505c37ae13430ebca92b95a0632fed667c49b5885cc393ee0bb6743453e9e5fa621959113c43b87590842e56d735f8666533bb22a6522606027 SHA512 5abb02cd511482c3f32e56a7f121bf6cce102dab7dfee196a105ff5ed2cbf3d9ee3f20f0d75eecfe192d0c16603dd80555fcdc872cc85bffa74de7d0bbab79b1
 AUX mugshot-0.4.1-use_office_phone.patch 996 BLAKE2B 4c8647647f424775a1557f176b271e7f23d5df99a4db3246c37f7d108640a1d18bb6a8185f1e1bdd2f31bba2cbc62fc4d39df5172edc72e3142dd3954afee329 SHA512 488f99fde5c09aa2e15bf9b78bb19b6e244476a1b0e8053f3af5e0e6ef70febbc92d3970f774332dd961af7893e29a5fab7cc7e964d24ffc46d67c9567e2579c
 DIST mugshot-0.4.1.tar.gz 121660 BLAKE2B ce0c0d4b76184f35e4ba5204b984393412924c0288b09fe51ec0e6635b1556e24ed98ce4a893ae57f25810bb39ce035fb40b6990e1b6516406cb0f670acdbac0 SHA512 f7790b3f80fc98d9b19e9b9dd74eafc41ae7598e38f70e148502056b4bd375922271cc72cf4664280f1449b2f5e1d89052ecc5d37c6dc453041e5312f736bbbe
+DIST mugshot-0.4.2.tar.gz 121020 BLAKE2B c092e25273dbd8ef9cbfbc001fb5f86b134ed8f9bf5d84993d5f46664f17eb74eda5c121ee70b5f0c4b0adb5aa1fc4d21d8c59d3f0cf4a4f67991d06690f5aa5 SHA512 721629cf4a7e4d84fd8505279cf88c88ac88c7b6c995ac84a2fd6a9b978c92716bbe20d7b0301ca70e99c007698e4cddf41b6cf1111bf496eec4d39591cd9ed1
 EBUILD mugshot-0.4.1.ebuild 1383 BLAKE2B 56ab49a4fce25c48c20501c836e912a2428ad94fd433c578250ce7ef5d1cabb745b321df330d0197b09b9a59a44a48d768ce71916a72a809dd4ce273f0cf17a4 SHA512 3b1d071637e5bf52803f6eafdfe4d1d182a1759d58700bc26e2bf165b0f7d1f93abde45ca7810714b72b74cdcaabb10b03a9c16d2439b1c92e27192af4dcbbcd
-MISC metadata.xml 1046 BLAKE2B a0aed33d0d8110e8fc4038e3831d39f4696dfc712d4fe0c7e963c9f5861b2bbf7f087d6d74e519f1fbd8cc1212110c7298617bf5e9481dffbb7da820580440d3 SHA512 3c2cad8d7defa4719ba1497605dab8a3ef271decceddb690f2e5c5a24d4caad53dca82e347f65eda7cf70af29f558105b7daa4d0ed55891d2ff1a38565ec923a
+EBUILD mugshot-0.4.2.ebuild 1414 BLAKE2B 02dc1988ee6d855feedda855ca86480f20b1d876cc3538c2097e9033032d60948bb4305843c0861f64eb4e75dca30fe909eb8a1164d1b7f7ccaa9bdff9b7903a SHA512 dfaa9c8e353a3150d72db7fcf531636428b46a43ffefc13dba3b4e9328b02704e9b9ed45c5a3eb330d4525547c1a0e135d92440d8aaef1c96538ba45149d04cb
+MISC metadata.xml 1062 BLAKE2B 4605018f3dbdffef5f56c7d2c31b709f9c97e7de79b1186590e154972cfc606b1644f7f1891aecb485da24423b4c5f8d79e0a54696a9c4bc6d5a0f94d4366244 SHA512 11760483e66c46f574994cfd078e2d3cac936c571bbc869154442bb32b1e9239f1d1014d035a3caf1c5d3afa80fc2bdf9129ee572db23616744e26d51ab0de78
diff --git a/x11-misc/mugshot/metadata.xml b/x11-misc/mugshot/metadata.xml
index 70aef0f5e797..bea9f9a88f76 100644
--- a/x11-misc/mugshot/metadata.xml
+++ b/x11-misc/mugshot/metadata.xml
@@ -20,7 +20,7 @@
 		<flag name="webcam">Add support for setting a profile photo in <pkg>media-video/cheese</pkg></flag>
 	</use>
 	<upstream>
-		<bugs-to>https://bugs.launchpad.net/mugshot</bugs-to>
-		<remote-id type="launchpad">mugshot</remote-id>
+		<bugs-to>https://github.com/bluesabre/mugshot/issues</bugs-to>
+		<remote-id type="github">bluesabre/mugshot</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/mugshot/mugshot-0.4.2.ebuild b/x11-misc/mugshot/mugshot-0.4.2.ebuild
new file mode 100644
index 000000000000..49f8a2302259
--- /dev/null
+++ b/x11-misc/mugshot/mugshot-0.4.2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+
+inherit distutils-r1 gnome2-utils xdg-utils
+
+DESCRIPTION="A lightweight user-configuration application"
+HOMEPAGE="https://github.com/bluesabre/mugshot"
+SRC_URI="https://github.com/bluesabre/${PN}/archive/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gnome libreoffice webcam"
+
+RDEPEND="
+	dev-libs/gobject-introspection
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/pexpect[${PYTHON_USEDEP}]
+	dev-python/pycairo[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	sys-apps/accountsservice
+	x11-libs/gtk+:3
+	gnome? ( gnome-base/gnome-control-center )
+	libreoffice? (
+		|| (
+			app-office/libreoffice-bin
+			app-office/libreoffice
+		)
+	)
+	webcam? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-good:1.0
+		gnome? (
+			media-libs/clutter-gtk[introspection]
+			media-video/cheese[introspection]
+		)
+	)
+"
+
+DEPEND="
+	${RDEPEND}
+	dev-python/python-distutils-extra[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	dev-util/intltool
+"
+
+S="${WORKDIR}/${PN}-${P}"
+
+python_install() {
+	distutils-r1_python_install
+
+	# Since DOCS are installed twice, remove the wrong path
+	rm -r "${ED%/}"/usr/share/doc/mugshot || die
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+	xdg_icon_cache_update
+}
diff --git a/x11-misc/netwmpager/Manifest b/x11-misc/netwmpager/Manifest
index 477a65664fa7..d5aceeb64a3e 100644
--- a/x11-misc/netwmpager/Manifest
+++ b/x11-misc/netwmpager/Manifest
@@ -1,3 +1,3 @@
 DIST netwmpager-2.05.tar.bz2 176877 BLAKE2B eac2386fd88ebfaa4c690b845151ac022f9573bd882adfa82f14bc5c271365a962829e9c579883b3d76afe4578e5ddc405b089af1a96129711a3beae005ee712 SHA512 246c8f0a1d1eee9a9576c66ac338a03d2f391a413ac82f5a0140142582df93c4cad1908ea1124c9149445051c877feb552d889e78022f95f9773d910f9f171ad
-EBUILD netwmpager-2.05.ebuild 759 BLAKE2B 24b2f657de29b9a483f75f490b129e517f17ca80b31e0285707c5a90d9c19d8c9ef7866ede4dffba451eb4511be20bd720c5a6f6aabde62f666fe354d857abac SHA512 ca3eb20e179c93165fc1d1d8be99c87e7b5f9331ecfa6565fa0494d2f368d0e0af8bf6b1d77c6e1a0b2f90db690d0db50548b334ae2f1d4748c4bb291f8b10bf
+EBUILD netwmpager-2.05.ebuild 749 BLAKE2B da78281fd0247a180c5907c816f44836767cd1f0735fc509815e460c1fe2efa4250ced000c8a61f7593c136624665f267c2c406e86c35373d0414d2e38a8a36e SHA512 76190cb45db5514862991a2a8da152814768c2f262bfb466bfa66d1f1063edf193e7b58646e6dc2621dfc14ebb33567f7cfb8a6f980e1a1af091e43880bdb89b
 MISC metadata.xml 246 BLAKE2B fdb264ea0fcdffe3b15f288ef6958a743a7c88bc85f82e13d20af443e93182007ffcf8ccfd62071b57660a668f9c25753c12baa7a409c9d42a408293c21f482c SHA512 be42da502b805b08126629fdde43bd1473535fc5588faf7c65c05e923736fb18f0249fe61ac5c18c4de1619bd52e4865449d1f02ec19f2c2581f6c2e23a5ed4c
diff --git a/x11-misc/netwmpager/netwmpager-2.05.ebuild b/x11-misc/netwmpager/netwmpager-2.05.ebuild
index 88a563c5bce6..027b1dcf1cbf 100644
--- a/x11-misc/netwmpager/netwmpager-2.05.ebuild
+++ b/x11-misc/netwmpager/netwmpager-2.05.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/sf-xpaint/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-misc/notification-daemon/Manifest b/x11-misc/notification-daemon/Manifest
index fb0b19424c61..22ca03e5575d 100644
--- a/x11-misc/notification-daemon/Manifest
+++ b/x11-misc/notification-daemon/Manifest
@@ -5,7 +5,7 @@ DIST notification-daemon-3.14.1.tar.xz 280344 BLAKE2B 8e965cd52f97129f8f6116c9e2
 DIST notification-daemon-3.18.2.tar.xz 329196 BLAKE2B cc4b00474ea20435fa412c1c27a95614baea06bfc00bf09c25b539e44ec8c41621eb7903a9245407e23a2a098290160d970e66dfe9cabc3bdf1ce3663a418f06 SHA512 962d84eb1970451d12d07027d4ee6843a96dc42c7d954dcb79bac55cd9918dcc84a2903b4ee032a0fd8f25d269e5e965a1deaab3da34b4181ea304df2adbae3c
 DIST notification-daemon-3.20.0.tar.xz 340752 BLAKE2B 9ded1efdb38de0097495ff570b9b91eb151e5eb030fcb9364a5ac04a4a5631c0a8483dc4068dd806d54ef0a096062ca92f9783f2030edb57f681b82015cf8584 SHA512 d9311c71a2915cb6e55bd1408e60b4d7b7fc24114410b8bd8cb358fe86c100198567099843b967f7e01ca03c91afe3f3980fb30b7f2c138bdab949e0e196a0f8
 EBUILD notification-daemon-0.5.0.ebuild 969 BLAKE2B 2a68f40ddd286ffe671223695c6787b72572a20e5e65f1ec613c06a56b2acdd23c4ea3729b2fc6d3a17778756e057be117819349ab8eed9145a364526997f35b SHA512 c280d0805d07355a65b7dfc6de6f028eb73d153968a31cf3e41139b0dde29820b7ae8fa69542b6ec81618044113e783f63990f380b55567508dff9a321bfda3b
-EBUILD notification-daemon-3.14.1.ebuild 988 BLAKE2B 0faddfdb82d045022ce71e84d2193827379161abed2ff5384ee2b3ecee6fb4989bbf3e29579ac4435cde59bd1b0ca4711514d6f720ac8670bd01f0af8b49e6a7 SHA512 60f13a07051b020b47ff323a63313a41d7dd475d9eedd923beddedc9e41cb8dc77ec4bbae4f2bd46fc9d5a7d1539a86be89c95854623eea287f0d2d36b13ce97
-EBUILD notification-daemon-3.18.2.ebuild 962 BLAKE2B 62221336f94d9898d4d7922e967a78ec56e27069e44e8650cfeac3e2232ef97bf8267fbbe52b319008660f6402392568cf6f772481b075a140111adfa6f2346c SHA512 73fcddbe382e142bdaa74e4976e2b2555c9a086112374ec2b337ffbcf222c67bcfe6c65d121feea91eea80ae811385e9f21c3ebdb4de500f5093d25c1f14cea1
-EBUILD notification-daemon-3.20.0.ebuild 957 BLAKE2B 00e2b6c8151114b81bcc22da52981d069673e09c368fa537d4413eddbb514a642c8aab804f749102dab52e5c88b18e62796143e411eae05350a66312e17e9028 SHA512 f2483c4f05b4eab83c1ac1b647e9a2a9d7878124bf5b56413c40d31cb320526e6dd41629c2de26e6c2070c59de434c6c13c500be0946aa8b11879a51233efcdb
+EBUILD notification-daemon-3.14.1.ebuild 966 BLAKE2B 3f67ad0660fbb59b9e89a08b287bb2824206b0acbeb61ebb6483bc807c11ca1ccd2e98d66f1fcc0d6e9ce16dfa393887fe8f014c6351b91868b5a9a76935307d SHA512 3d08e510c89430f9b00f4a711909eed031ea7d5e699c69d91af331cd609ee5ccde3d78b3e197715fa9add92e505d8007d6b3a9739c1f73e7483cb081dd25d08c
+EBUILD notification-daemon-3.18.2.ebuild 940 BLAKE2B d265bca0c9bf017e0804e1315518dd2b9fe0d388aa07371ef21d9c67772f2d2d6a2a632da907133de90f3bc1a706da085fafd836632ba807dd9da3a33a13f8ea SHA512 ea61831fda3a51c6e06e4100f3a4cecc7c4ebd9e5f3f97b84ad5b14f3bf16910920d29724051d84a4cdf73345fdc098b15f937290e9962bfe84d5675a2a77d79
+EBUILD notification-daemon-3.20.0.ebuild 935 BLAKE2B 2a6564545b2787298fd503e2a40798aa58cf49be73dbc57ba3b86826eb0f3ff7f342a3cabbcc2494c66e38de454c1c7e698eceb6272ccaf5e5adfba18661ded4 SHA512 c361641e82d40c238bacd3e2c0fc286e2abc9d85110afe16804b37f9ad6cce661071cdd5b45cc0c668004f5b08b78b53e4b99358bc5927a4124b5122d7b0c5ca
 MISC metadata.xml 270 BLAKE2B 9c2dafa0390cfc7b94b5c44505d72021bf57cf8ffb35be7a3327f4316c3e4b2dbbfa0325d97243a8ea933440a5678cc5d35c639f5aa210b1d5ceb8ab65eb5d90 SHA512 92c366ec57074ced42e6f9960f97d1cd1a022dba7450b51f3617a6a5e00c755496dfa84aa4ac259f4b00c676366b1eaa3ec30eeb9bcb0bf41253d1910005db2f
diff --git a/x11-misc/notification-daemon/notification-daemon-3.14.1.ebuild b/x11-misc/notification-daemon/notification-daemon-3.14.1.ebuild
index 690247f940f8..320c2bac021a 100644
--- a/x11-misc/notification-daemon/notification-daemon-3.14.1.ebuild
+++ b/x11-misc/notification-daemon/notification-daemon-3.14.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/notification-daemon/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm 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 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-misc/notification-daemon/notification-daemon-3.18.2.ebuild b/x11-misc/notification-daemon/notification-daemon-3.18.2.ebuild
index d05dfce74b96..d39b268759da 100644
--- a/x11-misc/notification-daemon/notification-daemon-3.18.2.ebuild
+++ b/x11-misc/notification-daemon/notification-daemon-3.18.2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/notification-daemon/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~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 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-misc/notification-daemon/notification-daemon-3.20.0.ebuild b/x11-misc/notification-daemon/notification-daemon-3.20.0.ebuild
index 07a5e708c20e..96e4bd4b1523 100644
--- a/x11-misc/notification-daemon/notification-daemon-3.20.0.ebuild
+++ b/x11-misc/notification-daemon/notification-daemon-3.20.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/notification-daemon/"
 
 LICENSE="GPL-2"
 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=""
 
 RDEPEND="
diff --git a/x11-misc/obconf/Manifest b/x11-misc/obconf/Manifest
index f3f86f08857c..0eabfdf2203a 100644
--- a/x11-misc/obconf/Manifest
+++ b/x11-misc/obconf/Manifest
@@ -1,4 +1,4 @@
 DIST obconf-2.0.4.tar.gz 456523 BLAKE2B ef3b3e4664ccd1095f5e1cd468fa3d021cd469a641930309a41c7b1cf418b9d87b2d8f4420342363dc4781d8e3aca3e8ffc0b9aac0151a2399579c5ff0997cc8 SHA512 b8cf6f363fa8c2f1d21142a3f79687a72f683f564285b05751c822ddf7a421b09c3440cbc5b08eb09d151601c6ada835ff5cc940bf5abeec2210cca26b552294
-EBUILD obconf-2.0.4.ebuild 812 BLAKE2B 18db2cfc9da637b3d25f8d1efbfcd7fc890c4321a6713a346b9f783cb163d1be806dd7207c642f97c968bc8c6d6c86767aec2afc8839ec00b7f526b557a71900 SHA512 bf49d4fd6b9b28662b066cfef0c45d7bd72a509d56cf756384532c82171197358effd1bd52a4f86711070e005988faf8e25982bf0bb4c0db645f422ffd4d506f
+EBUILD obconf-2.0.4.ebuild 802 BLAKE2B 1fa01f1a08903165185929b71048be1e2f0bb9a5a3dcbe954d5a6e242a2ac97c3af4f16fa688ff38e11aca5ecff33248712877451ee73a534cabb7fef53e7b3e SHA512 f4fa7f8bda2cd099e1992cd752836e9016f13b1c0f7d0a90ae49ed1de5cc9629b333b1bb879928d485b072262ac1d8bd07addce4ea68919b80fabfb9cf400548
 EBUILD obconf-9999.ebuild 767 BLAKE2B 83d6d4c188108b33926b8afa8f1115a00dff7fb0ac2d3f4ccd94f0930567305ca2bd626f5159ed5e0683a6b2619e9bf6b0c6f563268a7db6be2bb218a861a364 SHA512 cc71a7f24edc705f8155ddc52e368027beef8bce3f5abc063ff1a7a6f71e8baa0bdddbcd66d95a79be6a64b682d27b8aa607771bd6ce90abbefaf667072cf71c
 MISC metadata.xml 245 BLAKE2B 26bf988c73d073000ab8d21ea881c4088b90e7081410938828744375bfa8de31cce2c78154ccfc61105c853c1f24f4994ca4e5cbb80c4c89dfd489bbd10a09ee SHA512 ecb8a4621081ccdd43f08e4f560b0bc820c27d6a282c87e1a8f77137ec8b215188fe31f11fc6379533afee2ebe7e14d5395a45c1aab9abfe423fd832dba692a4
diff --git a/x11-misc/obconf/obconf-2.0.4.ebuild b/x11-misc/obconf/obconf-2.0.4.ebuild
index 783341609823..1db86b9bcd5e 100644
--- a/x11-misc/obconf/obconf-2.0.4.ebuild
+++ b/x11-misc/obconf/obconf-2.0.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://openbox.org/dist/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~mips ppc ppc64 sparc x86 ~x86-linux"
 IUSE="nls"
 
 RDEPEND="gnome-base/libglade:2.0
diff --git a/x11-misc/obmenu/Manifest b/x11-misc/obmenu/Manifest
index f1391f326949..026db2548514 100644
--- a/x11-misc/obmenu/Manifest
+++ b/x11-misc/obmenu/Manifest
@@ -1,3 +1,3 @@
 DIST obmenu-1.0.tar.gz 26375 BLAKE2B 1667cebcce4308777c2ae049a43bc2dd1a9b02eb9c6f78692d2f91fca336d6e6ee096ff4529856ce89fd12a13649c895787cdbc488f4f9d3ab8e78367d9474ed SHA512 64f36c5847c9e20ad989ba1e5a1fd780e420ad52ed3c188b06910a5bebb54373ad6b826621916fbcb1f900a34569f1d7c484094de99a227ed31cd2ff87ef78c5
-EBUILD obmenu-1.0-r1.ebuild 398 BLAKE2B fe1961c3a3d19a6ae90995d2516c5168d48fac0cdc746278a50f7d4edfb93205e96f2ffb9274d0d549dfead3f04faaad0ebba2ce48526962e934158968e48024 SHA512 03b7548f4657d4fddbdac58b8039a175095e9fa695f3b86fc30792e10aa17a6cff5c8967146a65e7adac51d055fe3010e85d29e803816e55cabcd9dd3a04f5c8
+EBUILD obmenu-1.0-r1.ebuild 388 BLAKE2B 42bd7a9bab612d60053448151eba97db840e53186d504773d93b4f61d6b3ea269e5c1cf1c39bde7c77afe1fda57490f54883480a860d2629e47783d8f0aa59cf SHA512 e846335fc694119428d14c1afde8631b53a13330c2887e91d4a820d48275163f787af855027ddad986b0052c6ebfc5f2421c631748dbe51aadf3b4f801eb23a2
 MISC metadata.xml 243 BLAKE2B 53ca6951e895433d722b097b4ba0164e3001c6bc2442dcb38ba14651d83026a18b599f390539cfa3810f6dd49b4b6d05cc391e633a2e1d7e39c9178c8153ddf8 SHA512 f507a7ed16ad39c33a24e0d4ff7a310748064d9bc0b3352fb288aab198085810caa20187bf4d5504f8973c23e2625eb6c332bff668b0cbe0d639204cb3e247dd
diff --git a/x11-misc/obmenu/obmenu-1.0-r1.ebuild b/x11-misc/obmenu/obmenu-1.0-r1.ebuild
index 939832fa0877..b595f0e3ad72 100644
--- a/x11-misc/obmenu/obmenu-1.0-r1.ebuild
+++ b/x11-misc/obmenu/obmenu-1.0-r1.ebuild
@@ -11,6 +11,6 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc ppc64 x86"
 
 RDEPEND="dev-python/pygtk"
diff --git a/x11-misc/py3status/Manifest b/x11-misc/py3status/Manifest
index 6e443d79cf65..a808e7567509 100644
--- a/x11-misc/py3status/Manifest
+++ b/x11-misc/py3status/Manifest
@@ -1,3 +1,3 @@
-DIST py3status-3.19.tar.gz 391159 BLAKE2B 6ccf84d1970449e28c932f03bf4208de10d32bf8e4d5dca402f4ef11fc606773624826b123961e8c9b238ac14da6c386008a6ea3bc2abaa611b566fa212c5af4 SHA512 171aeaf5777a375209665542529efc0d294ec0756ec6293813bbfd6bdc6b5616fcaf0c568b8e620c872d0692891c2825e99d5c0ff613e52cc9df1393188b7e62
-EBUILD py3status-3.19.ebuild 727 BLAKE2B bb056869027dd91f5608fde7b83ee4771bace3171bec976007b436ff84ee09d21f198dc354120655faa7cbbefdd949519140a09803c3069e7dd022eda0ce3456 SHA512 b93f5666683892101224570bc15e63ab77cb8430c892c3dab13aa1a095d0886bc67c230ccafe00e7175f7403241df98fd191731c15c52c80568c00d8f7947ac9
+DIST py3status-3.21.tar.gz 398586 BLAKE2B 9ca738aa36da54752d95766d8e03ef2e6b89724fbe88e2fd5154f7624f83fac7160a203cdc3400acd053afa69ac99724211401d1e951f8195bf4139d490a4cdc SHA512 4d04b44777bc0f9eb07da266b0719fcd6a707cfdb95e1b98673d244b290276e6179584881ae605933966bcf7682181554669badad1ca56ef604e6e9a3feae6a2
+EBUILD py3status-3.21.ebuild 727 BLAKE2B bb056869027dd91f5608fde7b83ee4771bace3171bec976007b436ff84ee09d21f198dc354120655faa7cbbefdd949519140a09803c3069e7dd022eda0ce3456 SHA512 b93f5666683892101224570bc15e63ab77cb8430c892c3dab13aa1a095d0886bc67c230ccafe00e7175f7403241df98fd191731c15c52c80568c00d8f7947ac9
 MISC metadata.xml 742 BLAKE2B fb30bc364ed1b07670aaff51142a99a185c06b7f20661e3ed9cab9b3a21040fcbc15db807102af9c580a6c80071267c6883fe4d5a152c109e14f9d03e213f2ec SHA512 2a30e73f6450a2227574cda7f1f0d10a6eaa6f5919fac21c51578e025efe02a831582237013648b66b1061241c51f6598ac6f0c31e6edc9d05a4d5be8417f2de
diff --git a/x11-misc/py3status/py3status-3.19.ebuild b/x11-misc/py3status/py3status-3.21.ebuild
index e0e182b53d5d..e0e182b53d5d 100644
--- a/x11-misc/py3status/py3status-3.19.ebuild
+++ b/x11-misc/py3status/py3status-3.21.ebuild
diff --git a/x11-misc/rendercheck/Manifest b/x11-misc/rendercheck/Manifest
index 4bd7812a27eb..c5a9d04115e6 100644
--- a/x11-misc/rendercheck/Manifest
+++ b/x11-misc/rendercheck/Manifest
@@ -1,3 +1,3 @@
 DIST rendercheck-1.5.tar.bz2 143656 BLAKE2B 50de34193aeb4751f967fbc04b54e75909672dc7bbac29a1fbf6ac0e648ac032c877bc215586feb44c89cb7625fc2ac2317d03ff30dcab83625290d85aad6cda SHA512 ffa1abf317f85a8bcef3544e3f810b34567553524ac0a784d2a67470e0811854d7983af8600a04aadecf42871ccb83ad5c0e9e25179142fda2a8f5853a07f616
-EBUILD rendercheck-1.5-r1.ebuild 578 BLAKE2B 116ad0049242d6329516f44b7ddd58e51a6e9895c3c80e317e6e17f3590fa01a114b7ff53bf443b28810ea6513c2a599892dfb9b257ae9c893208908d8ae241f SHA512 2cd0f51b9399c8d32dd806ab6b1a1795cc0fb925b7b0acd0b863b474a077b3732290a98ec0a823eb33d85f00e3707833e2f3d3848bb7874fdcfebe3b1b7121d2
+EBUILD rendercheck-1.5-r1.ebuild 602 BLAKE2B 44306492c63d8692eda628ab313b40fff6c66716ffbdbba98b681f879a21f2730f80be735b7304d3a25224a55f86c7b81beaa63e04cc69ea2ed815975fd242cc SHA512 1e85f99580ae9c40e9a97311c76b8e567ef40de04d6f2bd1c3ce6c7bfe1d5dee5d8882b2c52c6e66e3f4825a76e8eb7ecf83230600945648c64edd65d480fb9c
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-misc/rendercheck/rendercheck-1.5-r1.ebuild b/x11-misc/rendercheck/rendercheck-1.5-r1.ebuild
index f7aedd6447ca..2b27b2a2f34d 100644
--- a/x11-misc/rendercheck/rendercheck-1.5-r1.ebuild
+++ b/x11-misc/rendercheck/rendercheck-1.5-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DESCRIPTION="Tests for compliance with X RENDER extension"
 HOMEPAGE="https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/test/rendercheck"
-SRC_URI="mirror://xorg/app/${P}.tar.bz2"
+SRC_URI="https://www.x.org/releases/individual/app/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/x11-misc/shared-mime-info/Manifest b/x11-misc/shared-mime-info/Manifest
index 0189e42f3cb8..562da7e77f61 100644
--- a/x11-misc/shared-mime-info/Manifest
+++ b/x11-misc/shared-mime-info/Manifest
@@ -1,4 +1,4 @@
 DIST shared-mime-info-1.10.tar.xz 616800 BLAKE2B a63c97aba9184e7926db01968aef2a741ef089a46ab9365eb8dad5a78f585f90171751baeaa3bc62ed0a37eed6e93d60598fbe1e7e63168106fc8aa05f2f5cc8 SHA512 efc2b63cae11e6b0332f8607ba57a885dec68a23ac299bbda3eb6e2c7ed071c7c40dba73e9cf23ab675fcaa86ea3777fa931a9f25000a08ec6a748734c88beda
-EBUILD shared-mime-info-1.10-r1.ebuild 1781 BLAKE2B 0929ef986756d30652cb65728ec213ffd69c4c7a2ed6e7888151742d67d089b317754f57a95d816f59cfd26338024c358b6c81a71bdd978d936bd1016e6ef234 SHA512 3a08f096b7897d3934b0152eace5faed4b519ae5aa56e6099e1be62daf1698c0a69fdfb779ce3970a75681b31a8d9a39112b99e2db2348d54d7ae6d6c2501b0c
-EBUILD shared-mime-info-1.10.ebuild 1494 BLAKE2B f958e53f7f581f9b081a16f962e82a4f56c31056b9203bd1969be5f97e393505018c37efd3502f95b64a95ec03d434e107e934ba8ca8af6fa0793c79ce568e01 SHA512 9ac4861ae32f3bc9120b1a84d318f0ebdf5b026a4bb899a538833ac365a46958637f7698cd4d7db561a7a26cbb003e0c09208ae535a34f69258b12092a9c2880
+EBUILD shared-mime-info-1.10-r1.ebuild 1759 BLAKE2B ef93bbbd091b7e4530cbb795a10ca2c1a02bfb89e6e9cf760cc78471ea6f8a696e39e1d238c0abfc338df0176ce5d049dfd761f4c3f0382f27d53d7f47fa43e8 SHA512 64258a4a461c32005660875903b93271f94a838f2df17a2ee9306961144e3576c7b427a68a8ef35df710c1bd3b6d067b2aed522275904f5e6978d02a8d26b07c
+EBUILD shared-mime-info-1.10.ebuild 1472 BLAKE2B 5ce4f70a6417ccaad0d262c4ad576b6b6bbdbe7b6d2af033b937593b96633df0768ed6c8495532f3c8d8c0f53916b3856ccbb98df757df3f3b5d0b986bf00ec1 SHA512 6f8c959366f3a2b5a3bb7c1659b54f1b2c8427d232749b454633ced240e870a6abb8f0a499b2ea1d3bf44efbd47a13686b29a48a85186b40a5b95ea00155296f
 MISC metadata.xml 228 BLAKE2B 6b6559027915d8578c02e363cc855e812c338acf7716fe4108a8b85c09152a086cb578e7361f4613a44e8b550d7e205ff43aea39dd9488951fa18c6e15042278 SHA512 4f5e63f918a0f8790db49c5b12173c673f86935f00796a04acfed573f618379b73b05b1869941e11f881fe69d4958f5287ce815fd710eadb6ac9f2680894caae
diff --git a/x11-misc/shared-mime-info/shared-mime-info-1.10-r1.ebuild b/x11-misc/shared-mime-info/shared-mime-info-1.10-r1.ebuild
index 229204b90d27..a6b8f274a815 100644
--- a/x11-misc/shared-mime-info/shared-mime-info-1.10-r1.ebuild
+++ b/x11-misc/shared-mime-info/shared-mime-info-1.10-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://people.freedesktop.org/~hadess/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND=">=dev-libs/glib-2
diff --git a/x11-misc/shared-mime-info/shared-mime-info-1.10.ebuild b/x11-misc/shared-mime-info/shared-mime-info-1.10.ebuild
index 6d7292882049..bb690b733ed8 100644
--- a/x11-misc/shared-mime-info/shared-mime-info-1.10.ebuild
+++ b/x11-misc/shared-mime-info/shared-mime-info-1.10.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://people.freedesktop.org/~hadess/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-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 ~m68k-mint ~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 ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND=">=dev-libs/glib-2
diff --git a/x11-misc/slim/Manifest b/x11-misc/slim/Manifest
index cdb9fff5b37f..e4ba83ffa12f 100644
--- a/x11-misc/slim/Manifest
+++ b/x11-misc/slim/Manifest
@@ -14,6 +14,6 @@ AUX slim-1.3.6-systemd-session.patch 820 BLAKE2B 39345e96a1dc2cfc7a94b874d5be4bc
 AUX slim-9999-config.diff 2480 BLAKE2B 11dcd073dd0cfb83e49bc545fde0190a2d733104a63b502822a7adb6b1ed21b2e227ab6ab6957e33741a3604852ff4164b106d64be039c779f2be5c23d06bd5e SHA512 6018c5eadd0c63e86b07ad8662ffc046fd1f586c101dc84bc9452295a9a11ed1a82a6a8a228bf8d5e064cc5d17b1bcea8662f957b831c96f8ba21c0f55a0d216
 AUX slim.logrotate 102 BLAKE2B 8b41d56746b9889ee7f13f3cef08f80532c0c58505061ce09262aa629af5ec77dc35278ce979c717cd53f6ba586c529201e0dca47a28044231bf2d0b9cd8f317 SHA512 b49ce2dc1a1943c5f8eea8e6394cc27b014832e2d9908220f32ffd21fbe69442ec45b18f6e435430c6cbed074e5983e2136ebade10218bb073bb13106716f5b2
 DIST slim-1.3.6.tar.gz 232547 BLAKE2B 3df58fa128cdf2b2ab005e8f41fccc076cfcf8adf7767075539f2b8edf51a92660b031837b3cdaccb261f1c1eb24104100317fd4e68ad0298242502d4e6bb506 SHA512 345b1dee5d6f0c3716dfa7c5c16274adbf18586bdaaa6af4f310e24c5a61f79a297ffac921a5ba545523317e9fe120916df226c36b9c9b49c2ac9c1ca21dee0c
-EBUILD slim-1.3.6-r5.ebuild 4185 BLAKE2B b6caa9a24635afef43ef751a50bbe02f5b6e168cf3c6e48bd9a8227932870d96d2f96e1357d1cc4398520147a3c365dcc16686c0d45132ad972323589f052301 SHA512 5e753674aa49797f8c264b8d21aa35f12f725df368c3da7a8fb9332f57216a903d3c5c011f11bc76492c8d3ec65551f43b677c40058731f2d02dda2e4233dd76
-EBUILD slim-9999.ebuild 4017 BLAKE2B 35ec802f7ebe715086ef78816b2ab7fcbf356f2885b94f764d2f06060ce213d3466110806f9c6c238b4e5a6464c201cdba122e1febf18c2cd402cb152edfb40d SHA512 604c28588ceb8cf881eb8ffef3ed948c562bc61df78f6ab68bb7abc974e94ea55185a92fed6c4c0b4a54ac5c310e4e738357d74267037b4ffde2d74535249081
+EBUILD slim-1.3.6-r5.ebuild 4173 BLAKE2B 3c5f8a25ca6993e91cdc1a017aa8bc4710c7e2b296266ced0335540f692a353bd107f768b898c2839ddd244f6e66d686c116f59a65ec566dc14ee2a04e6d33e1 SHA512 088936053faf8b2b5711d47ca1817fec1ee0693c89a4dcc0c563cbf6f76b2f8e173856f82b091bf39ab2f45a2207fbf99be91fcd09e18b67d97f89c3ad70e936
+EBUILD slim-9999.ebuild 4008 BLAKE2B 2c3fa21ec5c16e4ecf5d46837d67799456f50d02ff919d4b2b39dd33a9c712b77a1e0a9ad2ea54bd9a6aed84959f233ff0473269bf3c5eaf93a27f77787f960c SHA512 68520716656b6f19d112bce9afed4f764b5d26fe200dbd763cad5f64af76a925375e88ca7da1d02f1a3a552d46add95bc723f3308171157413a59afdd82f23b9
 MISC metadata.xml 514 BLAKE2B 30f0fae6144c9bed109df03b4b77c25ddc0b2e8a69b8cecf08eb14ac3ecfa364d206d2b6832892e74986b28e293d51f51f6ae7102348d81f8a0f5594f8f95c94 SHA512 28f99f92bda5c50f97a164aa53915ecc458dfd84e6c3dbfb9dbfd6e64d0a98b7de9bfc202949506b2af91cb716a8b681f1db07b974d3d3776f15e2cdf5129950
diff --git a/x11-misc/slim/slim-1.3.6-r5.ebuild b/x11-misc/slim/slim-1.3.6-r5.ebuild
index 79f4540da207..9b1efda4c881 100644
--- a/x11-misc/slim/slim-1.3.6-r5.ebuild
+++ b/x11-misc/slim/slim-1.3.6-r5.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=5
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/project/${PN}.berlios/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 arm ~mips ppc ppc64 sparc x86"
 IUSE="branding pam consolekit"
 REQUIRED_USE="consolekit? ( pam )"
 
@@ -25,7 +25,7 @@ RDEPEND="x11-libs/libXmu
 	x11-apps/sessreg
 	consolekit? ( sys-auth/consolekit
 		sys-apps/dbus )
-	pam? (	virtual/pam
+	pam? (	sys-libs/pam
 		!x11-misc/slimlock )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
diff --git a/x11-misc/slim/slim-9999.ebuild b/x11-misc/slim/slim-9999.ebuild
index 42f6d06b502f..90753c4f0d6f 100644
--- a/x11-misc/slim/slim-9999.ebuild
+++ b/x11-misc/slim/slim-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://sourceforge/project/${PN}.berlios/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+	KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86"
 fi
 
 DESCRIPTION="Simple Login Manager"
@@ -30,7 +30,7 @@ RDEPEND="x11-libs/libXmu
 	x11-apps/sessreg
 	consolekit? ( sys-auth/consolekit
 		sys-apps/dbus )
-	pam? ( virtual/pam
+	pam? ( sys-libs/pam
 		!x11-misc/slimlock )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
diff --git a/x11-misc/slock/Manifest b/x11-misc/slock/Manifest
index 5961d0935d2e..64e33cdfb56e 100644
--- a/x11-misc/slock/Manifest
+++ b/x11-misc/slock/Manifest
@@ -1,3 +1,3 @@
 DIST slock-1.4.tar.gz 6889 BLAKE2B 67f956fd00e7536a9db81b82e85e4128b537569d16cd25428822607a5c2f3b0310bcfec896f7e83c0091e85d21b68438f6f42da715a55cad7fac90d0d0d64b8f SHA512 ad285360dd3f16a225159abaf2f82fabf2c675bd74478cf717f68cbe5941a6c620e3c88544ce675ce3ff19af4bb0675c9405685e0f74ee4e84f7d34c61a0532f
-EBUILD slock-1.4.ebuild 1164 BLAKE2B ab005c6260ad0c46173e1562f3140363a1a0e5b5b527efe65cc2cfad5dc5149217ce62f12ab0bfa327444a48b8a7414f0bd08b36f5bb2018f198ebaa0cd58392 SHA512 0c1529248944bfbe903397b2c56d87cda8359efa6e068c24fdb0ace21153fdf18090b5d9ba1aee9e40ed368f20ea6b8e5f364e3b57fd6d99ee27ecc40568e02d
+EBUILD slock-1.4.ebuild 1154 BLAKE2B b41c82706e1066216efe83a939a62c97337be6fdff15e6f5b98472f99371624185ddc26edfebf4248a3aaf6fd92e188bbe2f24e70f1a693b5291387f29ef8a36 SHA512 1060e582d61d758049dd9e184965b5ec1e5418fa193c556965acc789627966a5309888e18aada49dd8e3f06ffe0a07ab6b459bcc02376352f23e8f32fb1bed71
 MISC metadata.xml 347 BLAKE2B 1f37fe6210fecce67b02a14defcc2510c14189876257d2a5419a50c00c237100dbc37dfff653434245e0b78daf7389121e34fe76aeaf7119280dc154f5dfc95f SHA512 5939bd8c1055a98efc2987fce141841116bb531301b8666d85c7018ff8fd0bcdb21d5fa8eb5d39ccb384666a3c53834700cfa442262624714a4633aa0ac49545
diff --git a/x11-misc/slock/slock-1.4.ebuild b/x11-misc/slock/slock-1.4.ebuild
index 8f6a2d972ac3..a8d677de1b6d 100644
--- a/x11-misc/slock/slock-1.4.ebuild
+++ b/x11-misc/slock/slock-1.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 hppa x86 ~x86-fbsd"
+KEYWORDS="amd64 hppa x86"
 
 RDEPEND="
 	x11-libs/libX11
diff --git a/x11-misc/synergy/Manifest b/x11-misc/synergy/Manifest
index 1887c71b3305..89e1b6d8ce21 100644
--- a/x11-misc/synergy/Manifest
+++ b/x11-misc/synergy/Manifest
@@ -6,6 +6,6 @@ AUX synergy-1.9.1-qt-5.11.patch 1211 BLAKE2B f457b5d8afa5c9fe0d750a5d80a6baa44ed
 DIST synergy-1.9.1.tar.gz 6694745 BLAKE2B d7e19fd3e55e60b6a41dffa04d6a53c897c0a7e4895ff65ddfae18b06892959e8c7e56092b3d49f123768b3ce92d59fc890afe756192b3625db664b5fa19331e SHA512 83301f2d035bd91578cf83e335d721748791f62c85252156fd27d09db7b5216a745cfa81c06b27995d1785e676ee4c75f795b5fad2b9a700a981d27d05e5a8fe
 DIST synergy-2.0.0.tar.gz 5892923 BLAKE2B 661f42031499c9c1b2cbb90d9af45f5210c8e1b109f62cfc1cbdedf264f8c358c394005f4a040a8071773d538383adf3e85a059bc54ff67284aaf86990e0a6fa SHA512 69b8e4ea9d22f5699d3a0761cf9811d0689b06a920056b4b4dde466767ec89caaaa8c5736a78d0857ebfb814aaa3bf07591feaf0e64e0555949c5ee6d6974a13
 DIST synergy.png 26910 BLAKE2B aa9c5c7c0647937eadc82edbdf7a5a374dd25e9450d6861f1092d8569155e38b3d0729bafb69809e62660802d471899c472a0c9d2066e4b7fcec379f34470535 SHA512 0b5a1813c71fd2923adca4cf7b0f840fc37c73a2f18ad68f8bb2fd2ea312d9a884e2e2bcd78f6dd0f13d1f31ea3991379e141ec62d970a18c3a9c46b26720c5d
-EBUILD synergy-1.9.1.ebuild 2132 BLAKE2B 7f927c9685e55fe8f4c6bb86a408bae210798a1287c92c74923d2c8102dc3cba2dcefba103674ffb325cff77405dcc14cfd1db7a11e359f7a79028e6e6e8f34f SHA512 4b18a9c63af2318cfa519f908553b6e5e16e2a74c1f399e91194b4b47c0f34d306ae1ee0bfa05c7c0788e7f6e4133f9d5538fada98a4e41f21e8cce8968c1ccb
-EBUILD synergy-2.0.0.ebuild 1440 BLAKE2B cc1834ef9b4d29f9d7af6c3905628cbe9279c28462131a4538f1420347c5309e11dfa10b32a810d8cd8c8b110dfe040cc75415036b93bf57e22db21460634043 SHA512 4812a614433ece4c96afcda75360dc6f2b96554c01b21242f0e8ed5393d87fe7d8b85ba0d0b94fc4536f7b3a92a891bdf89ab96f088aebf22c0ac9e9ba2723cc
+EBUILD synergy-1.9.1.ebuild 2122 BLAKE2B 91f77786b74b63cb1cd76d07aec1e243a2ed7f38340d21a163df715881811708844526514ba9bd3d6b203de62612489492386036c136e60863bb3f37f79bbd8e SHA512 e1ceee5eeb5c384aa24cfbeba0d6e39e42b4d3c7af305441b249828a2de5f7965a28e19f9a215ab50aa5469849222643d97f0a824690fb90a79306ff35c0354c
+EBUILD synergy-2.0.0.ebuild 1430 BLAKE2B 5388633604e11ba49c5e036d3b3380be541a139348eba20b4f136139bde20d67a0a464d5bec1687b5e24ea30b47a5c5a8cdf26c87b5149c4c27dde2e227f6fcc SHA512 777a4a082e5620d39a19aa50e2306d72740bcdd4b197989a4d950784e992eace84e8f24eb0d21cb894b424392466cd022e69b5e0018ec54de0768f07ecc097eb
 MISC metadata.xml 408 BLAKE2B 2572799c57cee21427948e30551975170b9f655fb2fd0fe307eb7e01eba868a1355fd69df540be767ced000847547d107ad36ae4b8658f0b8628f5960dd4a983 SHA512 381d9d6b5beb883c7bef9453577d76d96bf0160dd891a88d146e5f6b44d6d91dcca02c26ec61f9d50c1e4c920c3a843859a2f3bdbeca81c0208f4e33b705e2d7
diff --git a/x11-misc/synergy/synergy-1.9.1.ebuild b/x11-misc/synergy/synergy-1.9.1.ebuild
index 63e9799f3bab..4ea9dcfb6a03 100644
--- a/x11-misc/synergy/synergy-1.9.1.ebuild
+++ b/x11-misc/synergy/synergy-1.9.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="libressl qt5"
 RESTRICT="test"
 
diff --git a/x11-misc/synergy/synergy-2.0.0.ebuild b/x11-misc/synergy/synergy-2.0.0.ebuild
index 24579a8395f3..0177ac90cb2a 100644
--- a/x11-misc/synergy/synergy-2.0.0.ebuild
+++ b/x11-misc/synergy/synergy-2.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="libressl"
 
 S=${WORKDIR}/${PN}-core-${PV}-stable
diff --git a/x11-misc/util-macros/Manifest b/x11-misc/util-macros/Manifest
index f9548392fcf6..7ebc1e1406a2 100644
--- a/x11-misc/util-macros/Manifest
+++ b/x11-misc/util-macros/Manifest
@@ -1,3 +1,3 @@
 DIST util-macros-1.19.2.tar.bz2 84139 BLAKE2B 94eeeca771042671c6915c562e055c8b965f874c3a5aa1c8107abe38ca984ee32293f68a51ca73d65ac82d245dec6e02ddd62939ab14aee12b4b6fbf350b8c39 SHA512 3f51504b27f0478c136126f15110cf3cdbba218c4d74a8e974cca1381c6e8364609bd0c444f2fb19aa86a7f4e848dfce4f4da940463b224036f75a60b3d88619
-EBUILD util-macros-1.19.2-r1.ebuild 717 BLAKE2B d833a239ec516771db4094f2686af764cd51f007598edaee0e8aa167ea366468cfc60b7f01077abed7b80f7cfacc97bd9d529a4adc3eac207e34a210f01abef6 SHA512 e0caa3fe5cc62e060798d14e429815333ee6b885833718114f1b0b48c1dce0b570ed812a31a402572205ee270e6f79ac3c68622e038069c2ee9cfa758b36182f
+EBUILD util-macros-1.19.2-r1.ebuild 719 BLAKE2B 2b7a5d86eacfb4c9f94817ef472d044312e411a824613e96d6bff9ebbcba98cc9fb94ab637e2916b88968476f52580e0e75a52ac8e8ee6b828f814402ec0d066 SHA512 622aa9111132abd629d742054d267f0c60c73f361fcb68f23ddd3dac982518dafe2d705bd7afbd897b61655467004cea87d284566b2fc3003b396e311321ca29
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-misc/util-macros/util-macros-1.19.2-r1.ebuild b/x11-misc/util-macros/util-macros-1.19.2-r1.ebuild
index 30b7160e06ab..b70d210e8079 100644
--- a/x11-misc/util-macros/util-macros-1.19.2-r1.ebuild
+++ b/x11-misc/util-macros/util-macros-1.19.2-r1.ebuild
@@ -5,11 +5,11 @@ EAPI=7
 
 DESCRIPTION="X.Org autotools utility macros"
 HOMEPAGE="https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/util/macros"
-SRC_URI="mirror://xorg/util/${P}.tar.bz2"
+SRC_URI="https://www.x.org/releases/individual/util/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-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=""
 
 # there is nothing to compile for this package, all its contents are produced by
diff --git a/x11-misc/wdm/Manifest b/x11-misc/wdm/Manifest
index d0e1463206bd..313c6669bbfe 100644
--- a/x11-misc/wdm/Manifest
+++ b/x11-misc/wdm/Manifest
@@ -3,6 +3,6 @@ AUX wdm-1.28-pkg_config.patch 779 BLAKE2B 9455f411e2f1884522836033ba104ec588fe88
 AUX wdm-1.28-remove-fakehome.patch 950 BLAKE2B 127755e61a73772d20625c32e9263f386a26f3b6b9103765d4597d77e0d8d5afa6c81023e3f096747b7020e3ce536a05781ca13120c4abc358ed02419d3538fc SHA512 55ce47472f0d7ba03bef88af52ace7db88ded7f45862d884a7bb3409a122ec17002a40195cef078f57bcaba24cfcb881d156e990bc856ca7c4f1f4dabbb6764c
 AUX wdm-1.28-terminateServer.patch 422 BLAKE2B 6d85344c1b045a8dfc206c6b0b4f5375be3d62fcb69335c628e1d63b131d62cf54784a9f84a27d49e7ed1c0aa48982bb4c5fa95249bfe6e0203991e1e6c0b381 SHA512 f00685ce1ff38f34df57864d05dd52b7148d27a81177f2c560157a470b089bd9b981ae73bcc6da8c1995822d8b74c6dffdb6166dff33adcf4cd4daa2bc9dc8cf
 DIST wdm-1.28.tar.bz2 381522 BLAKE2B 72105e949c5bc8043967f5b36838c171e32728a40d2ef5f6fe618b04337e3f37329696a7f9f1cee591bf1a037de4ca4168f270a316375e27fd7ce0c919880833 SHA512 393ace12d3975e978c05b90be691a7c27921e7e2db0bdef5f4fe06b324da56edea4936200dc123130c6de9e45af5dac6175559d641957fec104d66bad67c03a1
-EBUILD wdm-1.28-r4.ebuild 965 BLAKE2B 6645dbbe18a762aa1f0fe6f78069546892226def6e55fd2545132b5ba55341caa05534acee32c1884de9a53021281331f9933a350de2e87a560a5827b40949b8 SHA512 cb058ccd55ab042ddcd3d0291acb1788c2b697dc8fe7f23bd6de0ddac2a68187be732c808859246c20aa99ee63a0dfc971baa7c65f8b5b224ce767fcf9c04fbe
-EBUILD wdm-1.28-r5.ebuild 1138 BLAKE2B 4048408d5e9a2fd33a7536e6641081e83d6451339647093531ed3813885045b7d89f99728019c3c00d0932bc7a94ca75e82866c4ebe1887c02f674d805e3dcc3 SHA512 b00ab1c0ee09cd4d32383727d309c887228a8f5ad2f191c8f80f506ca6d3e5e1f5ca044628b46502e3349a947ae212152674cd56a946c8b83962901fab05665a
+EBUILD wdm-1.28-r4.ebuild 963 BLAKE2B 2b6cd7d943b89e17d6ce0ab0d838b50d0855491ebde34caaeaa5c80eea7bfc033583007ab0293cdeb4dc34eb6e01f694c6fc4f84a9f084f60115a33a33022da9 SHA512 950e638fa97548441418fd01e2d7bcc294551db59f28c5301ae066159dac33c54bebfbe4dbd32b512190f6fff2e8e6f8d85ae15286b0368b654aa82c8d223dea
+EBUILD wdm-1.28-r5.ebuild 1139 BLAKE2B 095ce6dfef68e23c0df67a6c407b72219a4f5dfca5e15454d24b3204798061012e60c84087c0c587871472f41403adc6d15f4aef09986333b8ac01bd6b45da2f SHA512 69ef29063c09cf477ffb0625cca76cb904c37949f6e286dbd371d023a1870a229f9baacc16cd1ffce427c79eade9db658358ea44309b5e52b3217ffe6b94c28b
 MISC metadata.xml 350 BLAKE2B 1b1cab426ff16f13bed9114bca2d0d543457d97400f739a78cc1a1975683a7ae7c48630af6033f9f94268fa61f9382b6caa056346b2eb3038a83523261b4c8cf SHA512 deecfc72a65212b6498334be4dc9abc35d9f22b64f041181474bbeca8fd71d1e3ebdcccf9a98f57ccc57bd37958b206944c9f520bc7c4cd2d8329f9ce14a0b19
diff --git a/x11-misc/wdm/wdm-1.28-r4.ebuild b/x11-misc/wdm/wdm-1.28-r4.ebuild
index cdcecc0c486f..9c93686627a8 100644
--- a/x11-misc/wdm/wdm-1.28-r4.ebuild
+++ b/x11-misc/wdm/wdm-1.28-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,7 +19,7 @@ COMMON_DEPEND=">=x11-wm/windowmaker-0.70.0
 	x11-libs/libXmu
 	x11-libs/libXt
 	x11-libs/libXpm
-	pam? ( virtual/pam )"
+	pam? ( sys-libs/pam )"
 DEPEND="${COMMON_DEPEND}
 	sys-devel/gettext"
 RDEPEND="${COMMON_DEPEND}
diff --git a/x11-misc/wdm/wdm-1.28-r5.ebuild b/x11-misc/wdm/wdm-1.28-r5.ebuild
index 9a7b26373b7c..f31e2f6ea263 100644
--- a/x11-misc/wdm/wdm-1.28-r5.ebuild
+++ b/x11-misc/wdm/wdm-1.28-r5.ebuild
@@ -18,7 +18,7 @@ COMMON_DEPEND="
 	x11-libs/libXmu
 	x11-libs/libXpm
 	x11-libs/libXt
-	pam? ( virtual/pam )
+	pam? ( sys-libs/pam )
 	truetype? ( x11-libs/libXft )
 "
 DEPEND="
diff --git a/x11-misc/x11vnc/Manifest b/x11-misc/x11vnc/Manifest
index 67bfe5359bb4..c00dcd126b0b 100644
--- a/x11-misc/x11vnc/Manifest
+++ b/x11-misc/x11vnc/Manifest
@@ -4,6 +4,6 @@ AUX x11vnc-0.9.16-libressl.patch 4083 BLAKE2B 0b95dad69a0f7180edfe71da6df2c9e602
 AUX x11vnc.conf.d 1435 BLAKE2B 8403d61a4941c56127e869d6ac90d4f85237af9af786f864d32afbedf3e736528b74c8c83fcf3491794b9e62db6ef2a354dccd61f368c8e9251f915e2bd683f8 SHA512 dedc94fab89a06ca6025b99c2c944cabe77640487c8fc761a6420e5be7062ee4c1c383f3846c17bed434ad4f3ec3b994badb493919acb99da3f61caa40c60246
 AUX x11vnc.init.d 1728 BLAKE2B 45680af6aad530a9b36f29adc61c1f90ad272bd7201c30f29b3d6c5b980012ddb299c878ae1bb20734496c4f2b8b1e1c507cadee875305167e3f298993947a9e SHA512 8de7966b79b5acc83c8cebc3c2ef0819196f5a33eabad619991d04c7c059a68afbf44d0ece6b0db33cea1f525402a601b25db220733f0ff69c0fff48d3c50ac2
 DIST x11vnc-0.9.16.tar.gz 1708009 BLAKE2B a8789f95ef421a78a83703748e1d80fd45539dff24f80493fd75e357bc22378213915853f9d114248c172cd83977880e1e4e8a3f8df0771017e9988d83b7307d SHA512 69f65ee312f8dede6051b401304987502a213c6c28c7f41e855734f11de1fae14d5d493dc9c28b2e4b7c0be55f8dbd3b35dd2610aae910183772c3e626736fec
-EBUILD x11vnc-0.9.16-r2.ebuild 1954 BLAKE2B 6fc7723a676f81cf9ce0cedb651e9c08d10ab9d1f79acb31bbce5404e3d8abb4a626ae68ee1d9502f9c67608045e4bf49acf58731ffd8b08c11eb604da31328e SHA512 98e99bc49f08d8302836290d308b5415ff9ed99ebfd4193c93c7f919bf8fa4594318cee11cc7e9d4e7423018e31258f951d2c903b398746262ce9232ab653574
-EBUILD x11vnc-0.9.16-r3.ebuild 1991 BLAKE2B ac681294caad34b791298219d76ffd0f60e39b3943fbdaee1c566c56d764978f4fe75e8759b5f48ba475ef0ddfd6b75ae6e3876196a7d6c785a650b7218f26aa SHA512 e1abca08c362bdcdd5087be05078990fad5d3d93fdbb180a0b0d81b39df26957eaab629f8f6ab4ef2eaa4d7dbf08cec3a5d469c005bf823d25f7eeeae86701d4
+EBUILD x11vnc-0.9.16-r2.ebuild 1944 BLAKE2B 3ca58abe014beca12f8730d584a8ef39f37d63b74fc9ea352cd660a02475f00fc8565439fb31762f99f15392254879a70ee071733691838d2f09ebbcc185ea6b SHA512 d57b8f88ee2006f3dac2e34b1a87abba349b36abf45ef01acae6fcc8986049ac17115d7ed514280039da2ae396c3b74022cd56e1a4a215d76eda6096d639ef2d
+EBUILD x11vnc-0.9.16-r3.ebuild 1981 BLAKE2B c191fda01a3cba54e271cbf54edbe97d9d90fc8815c38c1634561716c405697300a12c1976438f54c724cb9b35b279cf269c20d43e8e9a5be5a79880b31dbbe0 SHA512 f483e7675fa4809ae8682136e3a70f3be840528eb190782a0a5e7d5e44fe2c460ad37c490e21b22543404c89161174b96185f1e89e3565b63303596a6f42223c
 MISC metadata.xml 922 BLAKE2B 02740589fa0091f604e1fff99ace802d4b179a35afd2c40d4ae25d40d41af0425a6e16cdb5951b4968813478a5066c6a241d49beba811dc296f125ba2aaddd13 SHA512 b46e3d0b379cf9967ec878e57d0a21b677ca869921546224f6f663eca4da8f2d57a97d07dac9da90999454584f6ea1c80748adf12663ff03b286292603aef2c6
diff --git a/x11-misc/x11vnc/x11vnc-0.9.16-r2.ebuild b/x11-misc/x11vnc/x11vnc-0.9.16-r2.ebuild
index 7ddfb82395ea..9a8042ec4c5b 100644
--- a/x11-misc/x11vnc/x11vnc-0.9.16-r2.ebuild
+++ b/x11-misc/x11vnc/x11vnc-0.9.16-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/LibVNC/x11vnc/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~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="crypt fbcon libressl +xcomposite +xdamage +xfixes xinerama +xrandr zeroconf"
 
 COMMON_DEPEND="
diff --git a/x11-misc/x11vnc/x11vnc-0.9.16-r3.ebuild b/x11-misc/x11vnc/x11vnc-0.9.16-r3.ebuild
index 752f08e414d2..bc16d70cde2d 100644
--- a/x11-misc/x11vnc/x11vnc-0.9.16-r3.ebuild
+++ b/x11-misc/x11vnc/x11vnc-0.9.16-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/LibVNC/x11vnc/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+-with-openssl-exception"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~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="crypt fbcon libressl ssl +xcomposite +xdamage +xfixes xinerama +xrandr zeroconf"
 
 COMMON_DEPEND="
diff --git a/x11-misc/xbindkeys/Manifest b/x11-misc/xbindkeys/Manifest
index b45054f13409..4a5c136124d4 100644
--- a/x11-misc/xbindkeys/Manifest
+++ b/x11-misc/xbindkeys/Manifest
@@ -1,3 +1,3 @@
 DIST xbindkeys-1.8.6.tar.gz 151941 BLAKE2B f5eafb8f3655cbfa1ae7d7c5ed0bcdac97d4105df8df7a0aeecc267e08fbae8297713fc14c3e36871493e23959b624d5a88ba45cbef715a79df7de1f0927152f SHA512 3c77541eae9f87d2020c2272984c221094276dae2a8690c5cec9fe1b23c0139229b8f56876170da70684aeaa128642349b6835c375d473186cbf8123517173ba
-EBUILD xbindkeys-1.8.6.ebuild 637 BLAKE2B e067705ed0369f9c8ee72d7ba18d00616b52a8c5a094ddbd753b918ffd5be1ec49ac6c79f3fcbe6c7939ead8da050da0d37c96129047b306f19e1a7d84e08f3a SHA512 a73e7b558aa3a27fc432bbb48651cf1c9a63c55471476526fb6d672f40758debe7541a8c69bba511a12afaffe5f4f5a46ab6f8ec9939b65047740cd8bd70d617
+EBUILD xbindkeys-1.8.6.ebuild 627 BLAKE2B 1da223057085494638b9fd069f7a0d5ec3f7b9ed9a9e66448e90ef15461b87bcca668a83aed092762f9b8d922f76c886c55810004da4f491df1da4aeee8943c3 SHA512 7754808c9aaba270a8930c0cf3ba46d92153042bd7a215e8eaae2e31738a04002b47ec0e1502c4865ae172842c43bcb8acea3ee595131f7237791302c2bae984
 MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-misc/xbindkeys/xbindkeys-1.8.6.ebuild b/x11-misc/xbindkeys/xbindkeys-1.8.6.ebuild
index 4283d2e664b0..fe9f53d5bb50 100644
--- a/x11-misc/xbindkeys/xbindkeys-1.8.6.ebuild
+++ b/x11-misc/xbindkeys/xbindkeys-1.8.6.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.nongnu.org/xbindkeys/xbindkeys.html"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="amd64 ~arm ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 IUSE="guile tk"
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-misc/xbitmaps/Manifest b/x11-misc/xbitmaps/Manifest
index 8ea0df60bcbe..d98f184a3f30 100644
--- a/x11-misc/xbitmaps/Manifest
+++ b/x11-misc/xbitmaps/Manifest
@@ -1,3 +1,3 @@
 DIST xbitmaps-1.1.2.tar.bz2 129435 BLAKE2B eff2f1e2efbabf447cbe98db09f81db96dc1442d4cce01b570774fb4e3e7323a40385d7821685724a9d9c69219528da980b2ecf01b0d3b822be8879e4d7f3e9c SHA512 eed5e2fce9fc6c532984e6ed1262e440591e311ca6c61a7fe7a5c877df84bfc2d7aff388fb9c894fc098785b8e5352f0bd7c918252247a040cf123874847450d
-EBUILD xbitmaps-1.1.2-r1.ebuild 670 BLAKE2B c823212d8f2a7512856bd7db567d27293f89ae771eb8b44ba1b7a4d1529b5873ea6c48c1989f69ab4266f5e17c59ecf868ae1e49c4a9ecd98ae162c0e5417cb0 SHA512 35bbd4f3a4c7474a49433aba07c4db5b3852e67b3a727de1195a56d39b8b2b2bee5e8a8c456d61848941ade9031297611d031da7340fdf6f0dd7ac5c4b080e35
+EBUILD xbitmaps-1.1.2-r1.ebuild 672 BLAKE2B 007ce30b78de8b50ee1a3cc23a5a8c270d8d8c16a4e2700d83b6147c6dd4674aaa7fbfcd76447bcf9877fe277fd200e7abbb5afe7ab7b3a1b8a8d12f6d24d6d2 SHA512 b9e8bc95664038dc91c9f64c6b1416a6a8f79399e9ee7492bb98d3321773a15a10dbe45bb20d61841a0c9d0cfaeac7381ac0bcfa7fa7325461067d36320c1a4a
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-misc/xbitmaps/xbitmaps-1.1.2-r1.ebuild b/x11-misc/xbitmaps/xbitmaps-1.1.2-r1.ebuild
index 65304d80e889..146b4687763b 100644
--- a/x11-misc/xbitmaps/xbitmaps-1.1.2-r1.ebuild
+++ b/x11-misc/xbitmaps/xbitmaps-1.1.2-r1.ebuild
@@ -5,11 +5,11 @@ EAPI=7
 
 DESCRIPTION="X.Org bitmaps data"
 HOMEPAGE="https://www.x.org/wiki/"
-SRC_URI="mirror://xorg/data/${P}.tar.bz2"
+SRC_URI="https://www.x.org/releases/individual/data/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-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 ~x86-winnt"
+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 ~x86-winnt"
 IUSE=""
 
 RDEPEND=""
diff --git a/x11-misc/xcalendar/Manifest b/x11-misc/xcalendar/Manifest
index 0af57851a24a..d5c813dfd241 100644
--- a/x11-misc/xcalendar/Manifest
+++ b/x11-misc/xcalendar/Manifest
@@ -1,5 +1,5 @@
 AUX xcalendar-4.0-implicits.patch 381 BLAKE2B ea6ad6617227900cf7cfd67957109d28b5e820ae87c0796367808c2442865cc94dee718ac91550f392947b77a52bca1f952e9faac14178da4b0b90cf1ede6e63 SHA512 56c68560d2f2d75b5e7427e870189771f85994e934f7d813eaa89e34002d769b9aa1e24ab49a84a395d1535963802a249171e423e47c5d0e741e1a6e9a07fbc2
 AUX xcalendar-4.0-motif-gentoo.diff 1104 BLAKE2B 3176c538d92a776faef7fbaa02985964a64609eb5e3d79edd97d095309c2fec3e6cc0f621cadc97a09ed3e10fbeb35e627214c9f7ad758486125f1d61bef3fd1 SHA512 b6f15a68e2698a1d3f8dca2be8cc0751dae447268c6bca76aeccaa5a919dc31d3675fbb8d49d7d0d3293c50835b2628346f1ea5f7eb1da6152bb1ac73282ad59
 DIST xcalendar-4.0+i18n.tar.gz 48635 BLAKE2B 939880d749dc36973d69d6ed6f1d2c36dfeccea6d17a9ce77bde122af8c3a19bdf683b0c1838ba11a769ef4a8977a93cc1e67c40dacac4c87d2cb7a565e3ba60 SHA512 c9b3756bf857e4956360cb3efa1e185bdc09d6053e1b8db040822c73320589ef825330184fa3a8b949f94a89a6ef56438927886b3740922a4bca7dbab9285a4d
-EBUILD xcalendar-4.0-r2.ebuild 1272 BLAKE2B a867e1eadf886f85de761328d052dbbaed91f5c35394d8f7b1e29c59001de5af0c7685c3d5e465b8d962f1f5d975b9ac854bc6cbdcfec75b154e37eaac327bf5 SHA512 f1220124c644eb410c8852961696a9da1b053db4656d580dd4c52a56ea858063b45971da7279c92e2cb61b18744173523f5347bdcbdb2e0a7e1e8957536c5845
+EBUILD xcalendar-4.0-r2.ebuild 1262 BLAKE2B c25b5e5f3e5f213260abbdcd39e04b225627751bd05a6464bdd10f148565c0d9e82b8154b2b811ca4ad6e6ad45630982e3c4b4175d2e74661e6e5e7fdb6d91c6 SHA512 1e1d7a70b3feedc7824cfb5c0ba75d252fcdfd424feeef96325f3325b50b29118789fdcc46f5df7c40c626ec2b804518413c58190fa4394f5cfcd277bb7d1cdd
 MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-misc/xcalendar/xcalendar-4.0-r2.ebuild b/x11-misc/xcalendar/xcalendar-4.0-r2.ebuild
index cce03ac2a410..97f2790918e1 100644
--- a/x11-misc/xcalendar/xcalendar-4.0-r2.ebuild
+++ b/x11-misc/xcalendar/xcalendar-4.0-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="ftp://daemon.jp.FreeBSD.org/pub/FreeBSD-jp/ports-jp/LOCAL_PORTS/${P}+i1
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="alpha amd64 ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ppc ppc64 x86"
 IUSE="motif"
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-misc/xclip/Manifest b/x11-misc/xclip/Manifest
index 912419550864..a6ca83a82565 100644
--- a/x11-misc/xclip/Manifest
+++ b/x11-misc/xclip/Manifest
@@ -1,3 +1,3 @@
 DIST xclip-0.13.tar.gz 30461 BLAKE2B e5249c81aceca59f71eeee985ab4a4c9006b6afef98f3f6addd7adc590abea47d3e9df8110ccb6c0c065cf4356a2a2a0866e08604adbac75e3589bb97403aaa0 SHA512 191a86194a1503a47c6641a55855dc4aaa8c2c99d2e6f1d46e727feec85a6639041f37ec2265c05c178c0c7d791d3e88bde89223f879effa878812f078485ed2
-EBUILD xclip-0.13.ebuild 563 BLAKE2B 1ec5ee7372f1c1cc3bd33a52cfcdf801e406e7d776ca07d736a7e7dea5016baa2c7aa6d63c131b880e3eecbd125f412dda5da9ec07c2cf94e0f39044dba688bf SHA512 b6e93a8b4a2c3c9c97afb523386299da939e3520df1b0175390a7a8ed6f26a9dd4c18c780e4f82c96afd203bb962dbbcf2c73c26dc0d7f888f07719890155b54
+EBUILD xclip-0.13.ebuild 553 BLAKE2B 494e481b3a7775aa952314fb749c24c6c499736dc3a34a80f6e638f2f1267e9cfa27bc6cdbd65f4e23003dbf0bda80ecdf19bf14550e36fc26d211a942368b8f SHA512 e528678fc5f2ba4e2eaf4d5ed4eab0a318be59955df83db0131b645db9653df9b23ce264744a02e3fc6da88fc9d34593eb689d909a306f1692bb349ca3166de4
 MISC metadata.xml 364 BLAKE2B feee6d00129ab16e53f20b00c4a69d5def638b3231316079b63354b089817e3c84d300ec2da1966593a51339f941232ec466d6f99d5e0f365260306287121d2b SHA512 fb7dd60c82f3d739a58c1451434d15d14906249ef5bc350dcda11ee6d5366f04981d93a98a290e653b8271269c3f21978ed50894da0bf5da9fdaaa9b2def4cf1
diff --git a/x11-misc/xclip/xclip-0.13.ebuild b/x11-misc/xclip/xclip-0.13.ebuild
index 8faeb8b5ff9e..026629726c6e 100644
--- a/x11-misc/xclip/xclip-0.13.ebuild
+++ b/x11-misc/xclip/xclip-0.13.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/astrand/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	x11-libs/libX11
diff --git a/x11-misc/xdaliclock/Manifest b/x11-misc/xdaliclock/Manifest
index e64f06de4ad6..976b6a68ea34 100644
--- a/x11-misc/xdaliclock/Manifest
+++ b/x11-misc/xdaliclock/Manifest
@@ -1,5 +1,5 @@
 DIST xdaliclock-2.43.tar.gz 2300886 BLAKE2B 91b5f6ad0eff544ffde213d575c84a9b6c05b62c6bd26332eefb28b0d064ac8b5314a60e70fa82ebf6270e022b079ce4e86197ee5e8a713c34d84227c00dd94f SHA512 4906632148599254d9b29b032d846fcea1a568de8156cfe9556aa1603e063015d7e3422ba9ce4f47c2877f144837a660964456584a643f274b78422c12c0c923
 DIST xdaliclock-2.44.tar.gz 17727649 BLAKE2B 170f1a7f9e5c10799b62b2ae76b33ab64230e4ade8f0b79c2aff7481536009e3e4e0f19239dd806d7b16c69225744fa381f5aabbeec6e0e92d8b875bd8ca0aeb SHA512 82082a8e16a85c7115bdd0a44e7845aedfad93f94226a14cf606493564829c7ffe55eb4d17cb43c41bd0e6c97c090457d6aa2d184f60462cea3a89f47ef72e00
-EBUILD xdaliclock-2.43.ebuild 578 BLAKE2B a6de3c54051122c4d5ee0f7abed385250665718722d1914e09aed1c7a5beb1e9a7b34848ea5157d76b452573ffa8a5546adb71305a4700e63a9287cfd78aba45 SHA512 05e7757307de829ee80ca39296ee619a140ca92c0e01b9326eb9424c9a8f4a16a8bca30e128646bb05cd2a68139985a243b14ca9624a0437e9e1f24b561d59cf
-EBUILD xdaliclock-2.44.ebuild 559 BLAKE2B 5f151a3691763d98ffb83f896dd001dc08f4221a4c3a3dbbe234c9446a01ed815841022809236386ed635ff58f6159b6ad18579347543c06570ca6eade659bf8 SHA512 c3b4866a11e3700f2bc5570ac839f764798c46dfd0f77e3eeb18d8dfefbb823d9edf3633ac8c11580c9ea8c370a63845204c7c94aac95593388b82cf028acf3e
+EBUILD xdaliclock-2.43.ebuild 568 BLAKE2B 6e32d2fe4563dcb1d4167cf46952505d0bbd3895170a58e06157d8754584f08f2f5339788ee15a623b863456c6428a7f56177b907283e4ebc715b2a3b91ae479 SHA512 f903a5087a9d35a42fc7bc025ac5c08210e2d09a53dbe29a3a635a5779275ba1ac6c269252042779af6c5d2aa694d14c0ecfd4c275f28c2aacac2373ee13b6eb
+EBUILD xdaliclock-2.44.ebuild 549 BLAKE2B 238d328f097866e51bb3eaff594a0aa0ad27f433e3cafb499ffb307b46c4a6dbf1fa686325bb8544cb182e0d7b9ca99fb01614fe3cdd096ccab9995ff08024db SHA512 608fae0b75c212122542e41c9861581fdef596198e55f211e081885e84e9ee112138ef4826d8023d22c331a2488be617da173e84a8b7a6f228a66d16674655c4
 MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-misc/xdaliclock/xdaliclock-2.43.ebuild b/x11-misc/xdaliclock/xdaliclock-2.43.ebuild
index b10623d13aa6..abce1ab9418f 100644
--- a/x11-misc/xdaliclock/xdaliclock-2.43.ebuild
+++ b/x11-misc/xdaliclock/xdaliclock-2.43.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.jwz.org/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-misc/xdaliclock/xdaliclock-2.44.ebuild b/x11-misc/xdaliclock/xdaliclock-2.44.ebuild
index c7df038b41b2..921988dc2b9a 100644
--- a/x11-misc/xdaliclock/xdaliclock-2.44.ebuild
+++ b/x11-misc/xdaliclock/xdaliclock-2.44.ebuild
@@ -9,7 +9,7 @@ SRC_URI="${HOMEPAGE}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 
 RDEPEND="
 	x11-libs/libX11
diff --git a/x11-misc/xdg-user-dirs-gtk/Manifest b/x11-misc/xdg-user-dirs-gtk/Manifest
index 595d9ee456ed..e61b7a8d9ee1 100644
--- a/x11-misc/xdg-user-dirs-gtk/Manifest
+++ b/x11-misc/xdg-user-dirs-gtk/Manifest
@@ -1,3 +1,3 @@
 DIST xdg-user-dirs-gtk-0.10.tar.xz 116528 BLAKE2B f86237859636046ecc72bdd62ee5c6a3726ad701aabe04f14bff6541554d3e9de82265cb95b353714adba5d6c8742f94150df9b6f3e4043db9e6885e61e569c1 SHA512 c3ef070244cd1c87312c2c2602dbe7bc3dd26eed632b0d8d779580d7ee6259efdda453ab7bdf4415cc72fad7a74d9dd36476189fe446d5627e4db75d905302f5
-EBUILD xdg-user-dirs-gtk-0.10-r1.ebuild 1118 BLAKE2B 819113a800e5316c7e88e7a7eeeac5c2efa16413dc760d3ae018cb7a7178571bed551e54135b25a4b52b8179f0120e580328354f64e1cd4c3fcba10f0928d25d SHA512 36422980b21761ff740034a6675a0bc90278ed7be099830bc5f38af7f64b06ab2e6c7f5d86807f73e74939498195f3a97fc0e03e4e5907fc946f506dc0192c98
+EBUILD xdg-user-dirs-gtk-0.10-r1.ebuild 1108 BLAKE2B 4bace2999015ce067378841b06811c175b455712966b2597fda6476a60d485ccd9b6b89a13b38c04409cfe869f357b005cb314bfb1dc60e97427221b54367bdf SHA512 2e4155d5313c9b41273749bb00cbc0d7aab9cb42934520cfcb482aacd24fbf7dbdca336202453d1969c8a5464d0ed817e713eb02cd4c497e2481a6c3c768b0a6
 MISC metadata.xml 232 BLAKE2B b8ca675b002ba96d45a3afe7b6dd9f0e74d21db87eb002f72bae4e23fd49602115a18b372084596fdc09c3dccef80ae95ab540dad93fdf5dab0c9fb34f5d28db SHA512 21ba416ac701f1c9deb55d07f8afbf9da930fb04d274d84c5cf0df5e549554059959228ee6a4b8523d985fe0762af1a7c36aaefcb0e5b3c7baa5866e2841cfb4
diff --git a/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.10-r1.ebuild b/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.10-r1.ebuild
index fd618207d99d..0eaccb82918f 100644
--- a/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.10-r1.ebuild
+++ b/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.10-r1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/xdg-user-dirs"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-misc/xdg-user-dirs/Manifest b/x11-misc/xdg-user-dirs/Manifest
index 0dcda23d1430..32587fde370f 100644
--- a/x11-misc/xdg-user-dirs/Manifest
+++ b/x11-misc/xdg-user-dirs/Manifest
@@ -1,4 +1,4 @@
 AUX xdg-user-dirs-0.15-libiconv.patch 298 BLAKE2B 5028bfcafccc0310c192894cbeee12627b5b599cc5b612b6a38dcec45e36b9aa1f4ab2cdc31f29899b278088e61776bff51b5216adbf6c2497370c7966b17a50 SHA512 227b134d0782067f8c8688832036da8cb1afbcda247349db3502867e3f1b1eaa09885f2419762712ab9ce82655d4bb9a7ec17f63afdb9f00be5efcfd895ca7d4
 DIST xdg-user-dirs-0.17.tar.gz 257291 BLAKE2B 75b44a841b7961977824581dbbc760282fa3a5eed0a5496746ff6e09cabe4dec022d0f6fb129a877d8310c1fb214035f1e917c0e327dd5267bb83c47bbe00d5f SHA512 a02cc251f2d0a8bd0dad498901c8c6fbe8dae0e0e156abcaf27b1ded376a1ed369c2e59201d56ab4e38c9d521026fa39199177f3868c30e5c50cc03665dc335f
-EBUILD xdg-user-dirs-0.17.ebuild 954 BLAKE2B 0b04b398715fb0a950c22623bb3efdc4fbfca5c132adb19415ea80f96a5020168986fa9dc8d475b349d8c612a5e7b7831ece2132a4334d27e31dc3b305ea74dc SHA512 b36cae046bc1f906e62546fa1943d8d910c324b4879e59a614f0548bbed449d3c72bd8192aca7a610d3b2ed2baec660b071ffacda38ec16f0481d2cc2eecac91
+EBUILD xdg-user-dirs-0.17.ebuild 944 BLAKE2B 75518fa529ea2dc8c8bf089d6a93520864e7106d3d38974cabf7496271fc4ce5ceaaa152b3b704fc6ac9043c7705db0d4d171a23572f491a15cab50896a4e619 SHA512 c5fe0fc52fa4d0f5f252e0437d031f76f51656e1e81b2f057928b2f11b572ea6269fe5ca70936f4366f053c3d22667afe604ed51a4e5d1510419d1e65fff8576
 MISC metadata.xml 232 BLAKE2B b8ca675b002ba96d45a3afe7b6dd9f0e74d21db87eb002f72bae4e23fd49602115a18b372084596fdc09c3dccef80ae95ab540dad93fdf5dab0c9fb34f5d28db SHA512 21ba416ac701f1c9deb55d07f8afbf9da930fb04d274d84c5cf0df5e549554059959228ee6a4b8523d985fe0762af1a7c36aaefcb0e5b3c7baa5866e2841cfb4
diff --git a/x11-misc/xdg-user-dirs/xdg-user-dirs-0.17.ebuild b/x11-misc/xdg-user-dirs/xdg-user-dirs-0.17.ebuild
index 74943da43461..390f308666a4 100644
--- a/x11-misc/xdg-user-dirs/xdg-user-dirs-0.17.ebuild
+++ b/x11-misc/xdg-user-dirs/xdg-user-dirs-0.17.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://user-dirs.freedesktop.org/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="gtk"
 
 RDEPEND=""
diff --git a/x11-misc/xdg-utils/Manifest b/x11-misc/xdg-utils/Manifest
index c0425681b57d..53978f46cc28 100644
--- a/x11-misc/xdg-utils/Manifest
+++ b/x11-misc/xdg-utils/Manifest
@@ -2,6 +2,6 @@ AUX xdg-utils-1.1.1-ktraderclient5.patch 1542 BLAKE2B 4b6adf3d181f1a7869c14d475c
 AUX xdg-utils-1.1.3-xdg-open-pcmanfm.patch 702 BLAKE2B 1adcb274c1a5fcca4a99178bfe38d70e5b1d1f792c20ea4de166096137d0c393a38b4958e1044aa2a6afd4437b9e4eb40d1223ea6b7dd905e93e0499a88478a3 SHA512 fd30975e48a3a7607a812bcc87d5a9595875695693609d477acbe9826a52c53b14c66a4118888eb6d8fcb63630c5f614250f4c8640d1ea99710b26714920c019
 DIST xdg-utils-1.1.1.tar.gz 295213 BLAKE2B c52bf6bb4d5e2cd2848b17dc4f478debe1d9d399a02f014d0507ed26330ce47ac77c047919fabffff06c3cc773fab6bd4744bcdd9338e0726aca8e690bb76c0a SHA512 6641b17daea7eecfee0d395e621dc42481582e505bff90a6df5eb0299ed2dca7a76520f000d9545a8424f06d41590382156a2e50f3d68d5c1ab825c268e90edb
 DIST xdg-utils-1.1.3.tar.gz 297170 BLAKE2B bd281df73d8c966d11b502dd7ec88d96dbc9683503f54b043ae4842f146b6847bd3dd6902cf993771848d9fcb55d26d67f032af2b8aa0795a6d9855535e57d5b SHA512 d1f819a211eb4104a90dfdc6fedcb640fd46b15ccfc8762266f8f538c49d74cb00027b8c1af991fb2a200acb4379986ae375700e06a2aa08fb41a38f883acb3e
-EBUILD xdg-utils-1.1.1-r1.ebuild 2193 BLAKE2B 0807a3c8c674f9c6a26fc6bf78a9448c3d65c6c092394cebd35a29cc3fc824af7a42747593b4ec7c38183021335708b8c1d88a6d18eb5898ff665588be9d3fea SHA512 53f1736f62c34e4baeaaad6451ce3476a52cfb2ddc82ccf5b71fcd2e96c0b87ede082cd30bf6c0e42aefb66af2f297fb8be93eea90ce29f531c8336d3cf33684
-EBUILD xdg-utils-1.1.3-r1.ebuild 2149 BLAKE2B ea2adcac7e76d3d0e3af22cdf2b7729b0f3646bee19094b9062cc369b2db646e781e22f76508eb5963ccd48c9d2bd605124e53abe4660cc30e24d6c36ae50aab SHA512 62cb50a86432dab383e110c78e46bf9523360d9ae40e53df905fed7cc747fbe48174bd215aa9805146e4208ac3b3d2b4e71a1a4094b4f75e7763454664272704
+EBUILD xdg-utils-1.1.1-r1.ebuild 2171 BLAKE2B 7cfc35a2ac8a295244175603d699ae43ba2639adc26b875d9c733b2dec92588343ad5dbbc27fa7c034c363adbaf493827d304522155ee7ee5b117286e8fb6f9d SHA512 11a948c25c986dba7be2c46a2a6e55cd7bd1cc0a80d20e5340604d00426b10943f927f486d4b6c4f5f0148a565736498c5cac2607b265b87b6857da0f78da2fa
+EBUILD xdg-utils-1.1.3-r1.ebuild 2137 BLAKE2B 5bb2f64c50ddc0e142741b13fb5946b47da89c2812ce2cdc1840d1f7880fcf63140b8495b0fab1a77e5edbb174226c31bbaa1d0a090ae25558ee695746eac87a SHA512 27b4905740c6b3fde87355f1f75e79c2c5ae033df88c312f2609af672a0f9cd1e255f65af15d04d8329874821bfcaa48f68c6a61f8f87f2a42d3e2a26eae3548
 MISC metadata.xml 228 BLAKE2B 6b6559027915d8578c02e363cc855e812c338acf7716fe4108a8b85c09152a086cb578e7361f4613a44e8b550d7e205ff43aea39dd9488951fa18c6e15042278 SHA512 4f5e63f918a0f8790db49c5b12173c673f86935f00796a04acfed573f618379b73b05b1869941e11f881fe69d4958f5287ce815fd710eadb6ac9f2680894caae
diff --git a/x11-misc/xdg-utils/xdg-utils-1.1.1-r1.ebuild b/x11-misc/xdg-utils/xdg-utils-1.1.1-r1.ebuild
index 78ef40a63faa..ddf9215344fc 100644
--- a/x11-misc/xdg-utils/xdg-utils-1.1.1-r1.ebuild
+++ b/x11-misc/xdg-utils/xdg-utils-1.1.1-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://portland.freedesktop.org/download/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="doc +perl"
 
 RDEPEND="dev-util/desktop-file-utils
diff --git a/x11-misc/xdg-utils/xdg-utils-1.1.3-r1.ebuild b/x11-misc/xdg-utils/xdg-utils-1.1.3-r1.ebuild
index c34ecf7d6812..b4745c6017ae 100644
--- a/x11-misc/xdg-utils/xdg-utils-1.1.3-r1.ebuild
+++ b/x11-misc/xdg-utils/xdg-utils-1.1.3-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://portland.freedesktop.org/download/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
 IUSE="doc"
 
 RDEPEND="
diff --git a/x11-misc/xdiskusage/Manifest b/x11-misc/xdiskusage/Manifest
index b124c5ad19c4..b37a7af0bb95 100644
--- a/x11-misc/xdiskusage/Manifest
+++ b/x11-misc/xdiskusage/Manifest
@@ -1,3 +1,3 @@
 DIST xdiskusage-1.51.tgz 54248 BLAKE2B a1e41eef4e3d303c7bc02cb485ab2ca33bb03c57f9713459b68621a611751f5af35be9918bbef86294e70ddcc8e2fb678b5dfa9baa237954a46fd12120bbf96f SHA512 73335bbd5dc3e1f753efb84e7921fe7568f83daae7c4026c8b23fbacc4257b885de56f4dc8f682b03663a56f7def1227b8a4b6abf419aff8ecdd26ae51d4885a
-EBUILD xdiskusage-1.51.ebuild 576 BLAKE2B dceeb362edccbdab5af9b2f7d2907d840bbfdb8daed5c506a8ca79152609de98e06020b9784d694292705af3e8d77c023c95e03c64f0c28a6940652ea7f2ab60 SHA512 f322e5957ef4a9357ca2a28437b4ff66858eacc50e7eac75a9e638ad173c06fe60292aa23b1e0a69ec333a4d77216ecdba80cc1a95f2ee6e9f32ea6b938cd28e
+EBUILD xdiskusage-1.51.ebuild 566 BLAKE2B d5a7462228f3755b2b4ac8f8eeaa90e49e3f13d5e3a1e733545c75b3790e09f30ce900f71c26b8374e1a1cb3a0338c8663693843ffa88b31e5912224ae19bc4d SHA512 3f85c6d2d4f1e8a5ff0107498b166d95494935d6d3d69d3f0679b3e5f217b4e9bf0ce5ecfb60e4aa658fca726313990e2c80cb2583fa8e9546d6f75e259aa5ad
 MISC metadata.xml 366 BLAKE2B 740f17c401fabc3c0a47e332dbcda1c7d6501bf52140a32c3f552dbf05e278394df9c96da54dfd17d366633b091279e144b34199e1999a4c613b9a1d8c68edf6 SHA512 70a6112f01001d3b6d064a925c778eac80c45ff1e8f5fa5474b9c21f4f27062f3eb94cf244e3996a271ab1dd1e6d28f51a201db49cb23f38f579adff27f8aad7
diff --git a/x11-misc/xdiskusage/xdiskusage-1.51.ebuild b/x11-misc/xdiskusage/xdiskusage-1.51.ebuild
index 12e04ceab445..9cb3de113c7d 100644
--- a/x11-misc/xdiskusage/xdiskusage-1.51.ebuild
+++ b/x11-misc/xdiskusage/xdiskusage-1.51.ebuild
@@ -9,7 +9,7 @@ SRC_URI="${HOMEPAGE}${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc x86"
 
 RDEPEND="
 	>=x11-libs/fltk-1.3:1
diff --git a/x11-misc/xflux-gui/Manifest b/x11-misc/xflux-gui/Manifest
index df073d3389c8..bc42d996bdcb 100644
--- a/x11-misc/xflux-gui/Manifest
+++ b/x11-misc/xflux-gui/Manifest
@@ -1,6 +1,4 @@
 AUX xflux-gui-1.2.0-disable-gschemas-compiled.patch 1540 BLAKE2B c1071aecced986b9bf8662de558ce8cd3c822ebfcc7d3d6601eba9ec30438bfcbc763e26eb31113b00b75e07f463125872ed8897c490ddd32cf96b0798e72557 SHA512 bd03efe531f0b55df89bbf2b6e6dbdbf7c48c214b9969d3c458d093a13603011b956efc0cc6695401abc7abfea18ed29be6501784a66edcf63f8ebd6793b3c15
-DIST fluxgui-a3b55da976053fc978b29d191db52dfb8da2f8ee.tar.gz 30667 BLAKE2B bb9b3d3fa2f40acf3248e5cdd91a82c3f736937c03451aba41280b25fc541a3db23c6a57f2ef97ac1ce415d289c0442a387462415827009c68f169f91da589e2 SHA512 d4571f3a64c1f532642f86d4de50d5807afb856179debab77e4495dc48060c68a635d38990d174fbb67169317d7107356344507285271b0bb058f056c1e39a37
 DIST xflux-gui-1.2.0.tar.gz 31831 BLAKE2B ad6b29f75cf5c287efdb4c1eaa12610a6fd2d4515e7f77cb991f0140d9de1128981ae274a1503f7c5bb83ff84f8dc124ba64e5abdd2e97c1d7157c84df51bead SHA512 244c11efbf58112d3d84209142faafbbe46b33df1edf13e122945ff767fc6a394c147979c0086bd88cb41ee7c80b5bd87016b3e158f3a959f3aca8bda47707d2
-EBUILD xflux-gui-1.1.10_p20180910.ebuild 844 BLAKE2B f8231a19a24ade0d53346f97fb9fdb1e8608950428cdcf29ad3b93ef11a7519db043e42d469139242160819ffd756de36bb63d5cf0b468908929f092f340a436 SHA512 6d8ed009b5122d454bac9439cb1fe0ba6f9856d2572edf6509918e6a5939442e3648d85f00e22046b488f5cb19876ff2c9d8d32bb51e4b668765962e748f3352
-EBUILD xflux-gui-1.2.0-r1.ebuild 1041 BLAKE2B 78b1f82eeee02410f65563282d2762164342cae045bbc01051f3b23163f6f35d507ec2b18d1df1e719bc6b33437fbc2f75354ef8c86ae98d238652a470d03fb3 SHA512 29c014290b2acb163faee1b190c076dbfe3cb49e1d79a34f86000cfc2bac7781b3002feffc0762a31f70d785c15aad65a6317a6fee8d7838d5f94a965a14fef5
+EBUILD xflux-gui-1.2.0-r1.ebuild 1039 BLAKE2B eb128a1ee771ce8a69a687299e362073263e942e378a033a2757078de1e00c22c3c27288fd657dc7d5426991a9f389d3cc692fbecc679cfab7652aa357f358b8 SHA512 4b48755c2347c868e2b23e099d7a3035c057e3c3c1269d7f3b85ab2e8973326869c22b86a0ca06e84c958e9891b12845a9fa999720c18666fdbfa0a16a2f855c
 MISC metadata.xml 856 BLAKE2B a9b5a2682ebacdebcceccafbacc98785964a37d32067bb358d01957fd62b57d2ea897d63abd7d7ab091aab2ea5baa401423656a038478610ea7425f74a09da35 SHA512 584c1896675cab40d1e0dee33deabda4b1cf951fbc4ff8e6c98b05334492db575effb91e801da76db2599f3860871e7150135b0596400484d4e7ad00d7abb82e
diff --git a/x11-misc/xflux-gui/xflux-gui-1.1.10_p20180910.ebuild b/x11-misc/xflux-gui/xflux-gui-1.1.10_p20180910.ebuild
deleted file mode 100644
index cb52d99934d6..000000000000
--- a/x11-misc/xflux-gui/xflux-gui-1.1.10_p20180910.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-MY_PV="a3b55da976053fc978b29d191db52dfb8da2f8ee"
-MY_P="fluxgui-${MY_PV}"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 gnome2-utils
-
-DESCRIPTION="A GUI for f.lux"
-HOMEPAGE="https://justgetflux.com/"
-SRC_URI="https://github.com/xflux-gui/fluxgui/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-
-KEYWORDS="-* amd64 x86"
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="dev-libs/libappindicator:2[python,${PYTHON_USEDEP}]
-	dev-python/gconf-python[${PYTHON_USEDEP}]
-	dev-python/pexpect[${PYTHON_USEDEP}]
-	dev-python/pygtk[${PYTHON_USEDEP}]
-	dev-python/pyxdg[${PYTHON_USEDEP}]
-	gnome-base/libglade
-	x11-libs/libXxf86vm
-	x11-misc/xflux"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/x11-misc/xflux-gui/xflux-gui-1.2.0-r1.ebuild b/x11-misc/xflux-gui/xflux-gui-1.2.0-r1.ebuild
index 1eaaa8fe5745..9c62c28fe9a8 100644
--- a/x11-misc/xflux-gui/xflux-gui-1.2.0-r1.ebuild
+++ b/x11-misc/xflux-gui/xflux-gui-1.2.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/fluxgui/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 
 PATCHES=( "${FILESDIR}/${P}-disable-gschemas-compiled.patch" )
 
diff --git a/x11-misc/xflux/Manifest b/x11-misc/xflux/Manifest
index afa560311ed1..1215d5adc66c 100644
--- a/x11-misc/xflux/Manifest
+++ b/x11-misc/xflux/Manifest
@@ -2,5 +2,5 @@ DIST xflux-20130927.tar.gz 335911 BLAKE2B 56e683a6969f129c7dcdfd4b13a23523ca5ce3
 DIST xflux12-20170103.tar.gz 340461 BLAKE2B 81e8567cb7ce0980cb2fbee4a455d023fd76ee40d949b9616a8f2c4d15a361a286769dc91d67eb6d4391851eddb93dc2fa56b78d0f5c620fb56e69e82083d7cb SHA512 752da038c5b57042dd624acfdbf64926e73ab559f8f069358969ab91de158e6688b0c9f0d681f4400d0bc8f1b7434b55bff7725288ce9e7def49d31382770fd3
 DIST xflux64-20130927.tar.gz 339845 BLAKE2B 15751b75b7c0603044c4e7e98a9b23ceab7e245b12833ed1b6e8bc1d1734c5838777b7561d035bdf6d6d781105cc48dbda6c262895c310cf9710529a088b0a97 SHA512 6204558b8fa1063ee19fe444f740ab4ddfdbc412459b2f5cea94ddbf11818e0c9bff7e066a4958c1ab5c160b1aedcd18fa7fc4cd800a67c5d51ad1206f203e52
 EBUILD xflux-20130927-r1.ebuild 637 BLAKE2B 9e69e04e8cb2feab648340ae3b76aaca316d9fb2d57ee22174f4cf6c7b9ed322deae0dd14730e084d7f1df41e6420d5dfcbb2e7bfaa7fa0dcf03e0ddca661c93 SHA512 4d145d9811958436ea856b62bc9c466c97e065335feb823aafca9e2c47d23799375bb84bb660b00a7a9aed33d5dd38039f88b798c29a2380f68ccd47535b2fdd
-EBUILD xflux-20170103.ebuild 560 BLAKE2B d79cc80458d66259dab77b787ad76f22ec3eb27c0d128ecafc97d7b76dfdd73bcde96f9a2a77c9e9d5c00e431f4518a46513f6f4e46705a3d068c5d444e83658 SHA512 49735d7ec5f0a5e6689c50d82d0d3caa49a00132c34de1087b9b55a225426ffe6bfee808dea60d34860f94ed6615097baeb9820a33e40d8f2bb7d0fa2738fb65
+EBUILD xflux-20170103.ebuild 559 BLAKE2B b30a6fe9c52000f49ccdd19a3314b052716f231482b1e969bf9b180ddc6d8aa9cb0a2a6f0e0c72fa790be2f6e009e26c82f7c88d951d7482c3d639b9a114901d SHA512 527b047e6958a0052f5be7bbe02f3cc9b2208b1069bf6f7b17ea6f72193de735358adc36f8ebe9366614b1bc712e2f0b6c73dc8a080c24efc82a0ede7fffbcc5
 MISC metadata.xml 621 BLAKE2B d4a3d03b35bde34b0b6b1af8518d3b18486876766037a4bebcadeea32f247f2660c970d89638e91315dd7eff42ccf818bb868c92ea94e52db3793cc1285008e2 SHA512 9f2ae158aea2c8d2e0191c5df7825b0b6b802a564637ccfe8f431cd0dda9569a7af0c08925e804b2139de1ba1a8c346db0b305273b0f54fc1a4581bcdb959718
diff --git a/x11-misc/xflux/xflux-20170103.ebuild b/x11-misc/xflux/xflux-20170103.ebuild
index d5c90b003410..c5897e2e7152 100644
--- a/x11-misc/xflux/xflux-20170103.ebuild
+++ b/x11-misc/xflux/xflux-20170103.ebuild
@@ -7,7 +7,7 @@ DESCRIPTION="Makes the color of your computer's display adapt to the time of the
 HOMEPAGE="https://justgetflux.com/"
 SRC_URI="https://justgetflux.com/linux/${PN}12.tgz -> ${PN}12-${PV}.tar.gz"
 
-KEYWORDS="-* ~amd64"
+KEYWORDS="-* amd64"
 LICENSE="f.lux"
 SLOT="0"
 
diff --git a/x11-misc/xiccd/Manifest b/x11-misc/xiccd/Manifest
index c3c5f1e5bd15..47ee6a9bd7a9 100644
--- a/x11-misc/xiccd/Manifest
+++ b/x11-misc/xiccd/Manifest
@@ -1,5 +1,3 @@
-DIST xiccd-0.2.4.tar.gz 30981 BLAKE2B 079b743f88308b3fff5826bccef125c90636182cf1e6311166e91a337b24be824ac564696f1c65d112fccf737bfbff968ce3d96a2a31ba29cca1069377e16695 SHA512 40101467a38e9369b171b44d5d7fd4b07968dfcd74ace89e15f3dfad32131a3dc3b26249af2340e408908bd3df766785b46e885a3b68ff26b24ed2627a40cd2c
 DIST xiccd-0.3.0.tar.gz 31676 BLAKE2B a6ef614a5f34827011196474fdf73c0cebfdd6af25f0ee8925edadf4e3338dbb17a43c2da3cb1fee3531f4bbb3cbd760fe350e3860451e7188452cdfd595674e SHA512 d507d91ba1a6d702c0ca63d1583e0ba330210e8c143ec72b866fd042ed9b8987820fb793fa8100077d59f4c01bc068eff68b8377ed4156956ad44c07f448a45f
-EBUILD xiccd-0.2.4.ebuild 506 BLAKE2B db85d071ff8660d93c41c25c3c0fe250c971a172c0704a076310bf309f0694a70a250ebca714c0767fb2b0703e860a275d812631b2a99efd878c3602bc4d2bb1 SHA512 776fc5065dc15bb18fa735aec32d30bdff4c1d1c6f78ffea2774076fc05ada353ea5c9ef7db912f45f3ed7a9cb050c6b3405e23da0b5c3b41f3b66832841c6ec
 EBUILD xiccd-0.3.0.ebuild 503 BLAKE2B a066dd0112e9d6affabcd8d57913115adc1bec2dea1246673b046427e8e126e4e1889f33cd38153cd9e894ca0be35b0620efb61fecb63485a7db4b93071f21ad SHA512 58129d49c22a3f9f92974e38a67f31bb77457471c1112e416cfe3492c5a602fc4bc3869f76fece4f9149286f8675a54260aa49eafb624245f321340e0b177990
 MISC metadata.xml 764 BLAKE2B 386c639b7452560295dc0b25e0dfafe126c868d4749711125faf5aa57c027d45ac69ce658d09f775504eea2a8ee9d1ef89cb821ccf695d17506fe14639d847f8 SHA512 91b048281b6c4ca83e6ba61e870e5f04b90bae2668727edf18946c1ee703284b48a4caf4a1f259c80106fcdcaba91c10048c9f4569a2a5b45110a8acd2e1b2db
diff --git a/x11-misc/xiccd/xiccd-0.2.4.ebuild b/x11-misc/xiccd/xiccd-0.2.4.ebuild
deleted file mode 100644
index 64aec3d35d7a..000000000000
--- a/x11-misc/xiccd/xiccd-0.2.4.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="A desktop environment-independent bridge between colord and X"
-HOMEPAGE="https://github.com/agalakhov/xiccd"
-SRC_URI="https://github.com/agalakhov/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="dev-libs/glib:2
-	x11-apps/xrandr
-	x11-misc/colord"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	eautoreconf
-}
diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest
index c589c69648b5..c51f0c7004b1 100644
--- a/x11-misc/xkeyboard-config/Manifest
+++ b/x11-misc/xkeyboard-config/Manifest
@@ -1,4 +1,4 @@
 DIST xkeyboard-config-2.27.tar.bz2 1664454 BLAKE2B ac5e02903f46579a1df0423c01d2c07412642d00a5e73b05c0d112e4a65163c20c2df762438775afc52445eed47025c8e061fa0945140245679b693d740e904c SHA512 ae29177461f9d2c6ce1c56c0b8b147600e3f0ecd15e8754c9531811702d9a030a31f42679a88a9fb706bec458974c337ee2a0180f22573702caa7184eb94017e
-EBUILD xkeyboard-config-2.27.ebuild 1255 BLAKE2B acba6a3442b60470401db9b898927172f7f32d0f2e625c85701bc47fb9e4cc806f1f51031b5375eb5b195d4b2f3ff53fb5e7af88cf1511f123813d6e07bd75b9 SHA512 b7e457f396689ee4653fbabe3a34025621026b14d1cb11638c20cc373d0931d379747cca2466dfb3b732d92e6a446c45a2bfe98fde0709b0c838157a286a2deb
-EBUILD xkeyboard-config-9999.ebuild 1266 BLAKE2B 16798865be0a1659f706780c07c79caabb51f1cb9b2079e595122ec9afc49dcce769e784fd0e7ff0ea8f3581c7a03aff30fe773cbe7803a2a9f7ef627994efa4 SHA512 ec7096942471274e3ac0b78e5bfe8fe569259d3571ce83a4dd92cf5de2f52999b3d05e11a6aa8f31f8c9994d8c8dc77829ce3b65863ebf2c8d1e7bdc26d4cac5
+EBUILD xkeyboard-config-2.27.ebuild 1257 BLAKE2B 82ff338d351e3e91999ed7717d7dee92098d9306f6d6722c75fcd0dc4c047f01f48fe0c0685117ecaff9b13cf03efb878a05b1bb8df4039475d8739e960ae679 SHA512 c8fe092fe39b8889cb1fcde3e612d669f01dff3397e7c384a12c428170a7c1ea64f900f803db48d4012b5b918df9efe109a88ba1994524fe12effe37ba073a5a
+EBUILD xkeyboard-config-9999.ebuild 1268 BLAKE2B b3cf4dac632e36c230bb384c245785483b253e773e04b0bdb46aa6b2414ff465d854dda76a180c997b4b25fa04657424f1e322f7da1d5b7a2b38a42ee0cf4dcb SHA512 510a440ad821c65813f9ba1904d2cd0615a595c1c8ddb4b0f3a7812bfd7869eb81646aba3eb9233c4b8cd4ba48b81af2675fd818190d805f281b417fa631d87d
 MISC metadata.xml 337 BLAKE2B ab0893146e71b0d96879e7ec41c7c4e057cb92570227daef015b6fa1a24c55709cd3d19e16df5afe80f706995e12a44a9fc29826a552bd436b1e9381e44acde5 SHA512 6a43f86407638d3f156d4ae64caee882878dbd1ee7c23991c8f378d55cfb0afe016202866f95c328d8b4e59186efa6a7cb7335a1c86e3fbdda4c16a96e175cf0
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.27.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.27.ebuild
index 0f026fc57687..29052cada6c0 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.27.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.27.ebuild
@@ -12,8 +12,8 @@ if [[ ${PV} == 9999 ]]; then
 	# x11-misc/util-macros only required on live ebuilds
 	LIVE_DEPEND=">=x11-misc/util-macros-1.18"
 else
-	SRC_URI="mirror://xorg/data/${PN}/${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 ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+	SRC_URI="https://www.x.org/releases/individual/data/${PN}/${P}.tar.bz2"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
index 18bac7384839..d2d56f95cc31 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
@@ -12,8 +12,8 @@ if [[ ${PV} == 9999 ]]; then
 	# x11-misc/util-macros only required on live ebuilds
 	LIVE_DEPEND=">=x11-misc/util-macros-1.18"
 else
-	SRC_URI="mirror://xorg/data/${PN}/${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 ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+	SRC_URI="https://www.x.org/releases/individual/data/${PN}/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/x11-misc/xlockmore/Manifest b/x11-misc/xlockmore/Manifest
index ba9a070d8631..32853305d749 100644
--- a/x11-misc/xlockmore/Manifest
+++ b/x11-misc/xlockmore/Manifest
@@ -3,11 +3,9 @@ AUX xlockmore-5.47-CXX.patch 613 BLAKE2B ace9eb868bcdf4fa7fda07d5a0dfc316f992fd1
 AUX xlockmore-5.47-strip.patch 2048 BLAKE2B 0f0f00a38e1d3b5edebf40416698ad3b87323ce9167e7a3e0a44ca2fca853b16e9c1ff59ff74b0bf50b3484e25722a3ee840b312f2f249644614aef55095bfcc SHA512 2de24cbacab2a54e7a41f4604625096030763ad6212ec30b34be2c2fc4035b44f146bfb9d0a34df9c9ce4fa96a0eb1c9c7701b512a917fdf3eb56a5195c8585e
 DIST ax_pthread.m4.xz 6356 BLAKE2B 784bfa3fcae2499230acba588cea5591f62229d721cac357012c5d19b0a506c2d77201145eb90cdb15217190926cdad09cf5897e49dc3644be41ccac30e60ee2 SHA512 04dddd91a98a4f544d065de1b70340e6835657015385959d98c3c5eedea175f58657db73b60011af181a8cf2ff5d48d533cedfa6020943d8b41770bdc4aae329
 DIST xlockmore-5.50.tar.xz 1632968 BLAKE2B 2e692d16d70e3186ec1f31c192414b286f8815f2f428a6f7f43b3de0117c51c4ad2fbdfb91debe2ecb75c8683212b5d33bee62d81374552703d578b02d3af036 SHA512 627a905c4641d6083676a766931f23c06e2ac5af9b43447ccf03143d329d24b786aac6b248318929399b5fae98f1ec17e676466b5cbd09f180377c483694c569
-DIST xlockmore-5.57.tar.xz 1835880 BLAKE2B b26a9792286ded7647c816b907107b9c524ddbf46afab94c5b6b5dc5d5c918f5715c914ce4246497018bd56fd11329bcd1afe07608e44a70d24dd2c4c3d97e38 SHA512 2107efc7e1e9c811b6f86e9bb048dae3861a4e2f421b3d963856a77746834c08c5d349dc15cb3bc9b9aaf21abdc8f0e4af9463a90359b575604f3393c325400f
 DIST xlockmore-5.58.tar.xz 1878452 BLAKE2B 90b19c7c7c99188b056e69d80c0e89a0030faba46f942bd5e278403cde00ba66fe626f457dcf03e049280c0eff1af0dd3e598dda8e2d8d7eee194e38e97124b5 SHA512 470107a9f00c94db8f1ce20c33d04a3b0cbd3d5616aeffa42f98d3a75053cfd8a05a63e38349a88cfc3056fb7bdf3beeaa4277dc83121c35bcff071955ed9511
-DIST xlockmore-5.59ALPHA4.tar.xz 1884644 BLAKE2B eb3c7ba4467d75daf9cd7a12a256cc2c7e5a81aa8635d46b4190a03d1e6c509dabed717976d7bba6de9e58aca35530347da059bb48f6d71bc16d0d6766a05479 SHA512 ea4f47196432013c52078b0c5af4172e7db7ff064b37dacd6890886b815c2b18d439109cf871428b80eb0654132c318e3b0231176ad3c45f58bd72c003ca66f9
-EBUILD xlockmore-5.50.ebuild 2165 BLAKE2B feadf465ae112ad5d4b482a0a4fda8293eef90f2daf76076d37175182dfcd2491f7fde83af37298e35eedb65f7c27b3915e3f3ef60b4c3ec1ee6145dad125ee5 SHA512 982a26f33a14d5ccfee07f190cf4a4391c2f767b000e8ebdbe46a6f71650bb4beb9d1758fdf947f801b27bc3f331eac5c9e95d6cd779ebdb5d81e1cedf81c673
-EBUILD xlockmore-5.57.ebuild 2374 BLAKE2B 398a8458d84b479fde1a7b6b53fb232aec3a8b66a0430f62ea1896b9e69a9b34ae07acde840ee38b6aefe7a4405cdbd2b11f90d0576303bad76566e5f08607d6 SHA512 0a9e3410a71c8251439e15cb3c5695137de3149dab414e1b31b489c576021063240b21aac39e99e701546c8ca1404ae3d959d4d473b13bc7b7b09c51ec497eb9
-EBUILD xlockmore-5.58.ebuild 2374 BLAKE2B 398a8458d84b479fde1a7b6b53fb232aec3a8b66a0430f62ea1896b9e69a9b34ae07acde840ee38b6aefe7a4405cdbd2b11f90d0576303bad76566e5f08607d6 SHA512 0a9e3410a71c8251439e15cb3c5695137de3149dab414e1b31b489c576021063240b21aac39e99e701546c8ca1404ae3d959d4d473b13bc7b7b09c51ec497eb9
-EBUILD xlockmore-5.59_alpha4.ebuild 2374 BLAKE2B 398a8458d84b479fde1a7b6b53fb232aec3a8b66a0430f62ea1896b9e69a9b34ae07acde840ee38b6aefe7a4405cdbd2b11f90d0576303bad76566e5f08607d6 SHA512 0a9e3410a71c8251439e15cb3c5695137de3149dab414e1b31b489c576021063240b21aac39e99e701546c8ca1404ae3d959d4d473b13bc7b7b09c51ec497eb9
+DIST xlockmore-5.59.tar.xz 1935296 BLAKE2B 3a7027dad227179dfe3917108f8960a751cc16481fef541e80c656f99832de6d203cad1815f0f31f66aa2338d06035a99dce18664af2bc0b8e4610ef25339d20 SHA512 02758869ba597ef32ed1e594fa88141644264bbbc8edfe9ae8742a4508fa3e38d059c9ffbb9fa9bcc323b92e1763f96c8b6d054494849df465a08bc6be71bf33
+EBUILD xlockmore-5.50.ebuild 2163 BLAKE2B 52abfa6475f3fb306d1e12b67635e528adda29e090ae49f937183928210bd4e68ccdb06098de572f19e6c1e10215190ec8ec247fdd5dfb955e4cb8ab349d8435 SHA512 dfe920659978ed6e48f975e46433841c677375b01893be7b1495687869b863908c37b6316091fd08fdf9b7908e532a02999792fcf9ce27f38a8809df5a5d41a6
+EBUILD xlockmore-5.58.ebuild 2375 BLAKE2B 8a83968aa78a3a3055f5450f4c582ca2235efad89053c06af74e0f44e51e362e699665e8e6f47b33124a58e79fc053e11a909b4842fcf82b155db5e43998768b SHA512 a541a9e95dca77248761fb3b00277a42240da352ce2c9e2cce589f521f60648213d83ca6c2f6772a89907397a86581abad0e7bb1f165c6db38891bad9232b3d2
+EBUILD xlockmore-5.59.ebuild 2378 BLAKE2B e76f0fff986d24fc94a770104dfd46591afea04c0e0b3534bc031c3f5e8cc0123a10b8cd26731bfb428cc885f925476cc3b33b3627a0cb715f1767b01a003392 SHA512 52c181b813bfc1c8f0660c27c0319539ac12b7e5680e364febaed17ccaac139d062ff81b079135af06d6e06f48222c5851f6a78460a11170551b01be21ce33aa
 MISC metadata.xml 446 BLAKE2B d638ac6f12a203ae9ada10ae4c33e3a3d9901e350b6e6925c50078d66b29343cae42a67f84d5334182c1e816bddb05d062eb7b7e47c9125b273db118c4de573b SHA512 c8fafb010e63c39beeee5b53ad37354d19e98ac4cf33f29606b0af379811a0738c9c70d1fb7c31a5673d4a6365fb658a6a8bf49135b748bea9069a690ce543ed
diff --git a/x11-misc/xlockmore/xlockmore-5.50.ebuild b/x11-misc/xlockmore/xlockmore-5.50.ebuild
index 39ac85126845..b57f0c067952 100644
--- a/x11-misc/xlockmore/xlockmore-5.50.ebuild
+++ b/x11-misc/xlockmore/xlockmore-5.50.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
@@ -28,7 +28,7 @@ RDEPEND="
 		virtual/glu
 		truetype? ( >=media-libs/ftgl-2.1.3_rc5 )
 	)
-	pam? ( virtual/pam )
+	pam? ( sys-libs/pam )
 	truetype? ( media-libs/freetype:2 )
 	x11-libs/libX11
 	x11-libs/libXext
diff --git a/x11-misc/xlockmore/xlockmore-5.58.ebuild b/x11-misc/xlockmore/xlockmore-5.58.ebuild
index ddeb507159c2..bd9d33754767 100644
--- a/x11-misc/xlockmore/xlockmore-5.58.ebuild
+++ b/x11-misc/xlockmore/xlockmore-5.58.ebuild
@@ -31,7 +31,7 @@ RDEPEND="
 		virtual/glu
 		truetype? ( >=media-libs/ftgl-2.1.3_rc5 )
 	)
-	pam? ( virtual/pam )
+	pam? ( sys-libs/pam )
 	truetype? ( media-libs/freetype:2 )
 	x11-libs/libX11
 	x11-libs/libXext
diff --git a/x11-misc/xlockmore/xlockmore-5.57.ebuild b/x11-misc/xlockmore/xlockmore-5.59.ebuild
index ddeb507159c2..b6375c41cc74 100644
--- a/x11-misc/xlockmore/xlockmore-5.57.ebuild
+++ b/x11-misc/xlockmore/xlockmore-5.59.ebuild
@@ -31,7 +31,7 @@ RDEPEND="
 		virtual/glu
 		truetype? ( >=media-libs/ftgl-2.1.3_rc5 )
 	)
-	pam? ( virtual/pam )
+	pam? ( sys-libs/pam )
 	truetype? ( media-libs/freetype:2 )
 	x11-libs/libX11
 	x11-libs/libXext
@@ -68,7 +68,7 @@ src_configure() {
 
 	if use opengl && use truetype; then
 			myconf=( --with-ftgl )
-			append-flags -DFTGL213
+			append-cppflags -DFTGL213
 		else
 			myconf=( --without-ftgl )
 	fi
diff --git a/x11-misc/xlockmore/xlockmore-5.59_alpha4.ebuild b/x11-misc/xlockmore/xlockmore-5.59_alpha4.ebuild
deleted file mode 100644
index ddeb507159c2..000000000000
--- a/x11-misc/xlockmore/xlockmore-5.59_alpha4.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools flag-o-matic pam
-
-DESCRIPTION="Just another screensaver application for X"
-HOMEPAGE="http://www.sillycycle.com/xlockmore.html"
-SRC_URI="
-	http://www.sillycycle.com/xlock/${P/_alpha/ALPHA}.tar.xz
-	https://dev.gentoo.org/~jer/ax_pthread.m4.xz
-"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="crypt debug gtk imagemagick motif nas opengl pam truetype xinerama xlockrc vtlock"
-
-REQUIRED_USE="
-	|| ( crypt pam )
-	pam? ( !xlockrc )
-	xlockrc? ( !pam )
-"
-RDEPEND="
-	gtk? ( x11-libs/gtk+:2 )
-	imagemagick? ( media-gfx/imagemagick:= )
-	motif? ( >=x11-libs/motif-2.3:0 )
-	nas? ( media-libs/nas )
-	opengl? (
-		virtual/opengl
-		virtual/glu
-		truetype? ( >=media-libs/ftgl-2.1.3_rc5 )
-	)
-	pam? ( virtual/pam )
-	truetype? ( media-libs/freetype:2 )
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXmu
-	x11-libs/libXpm
-	x11-libs/libXt
-	xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.46-freetype261.patch
-	"${FILESDIR}"/${PN}-5.47-CXX.patch
-	"${FILESDIR}"/${PN}-5.47-strip.patch
-)
-S=${WORKDIR}/${P/_alpha/ALPHA}
-
-src_unpack() {
-	unpack ${P/_alpha/ALPHA}.tar.xz
-	xz -cd "${DISTDIR}"/ax_pthread.m4.xz > "${S}"/ax_pthread.m4 || die
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=()
-
-	if use opengl && use truetype; then
-			myconf=( --with-ftgl )
-			append-flags -DFTGL213
-		else
-			myconf=( --without-ftgl )
-	fi
-
-	myconf+=(
-		$(use_enable pam)
-		$(use_enable xlockrc)
-		$(use_enable vtlock)
-		$(use_with crypt)
-		$(use_with debug editres)
-		$(use_with gtk gtk2)
-		$(use_with imagemagick magick)
-		$(use_with motif)
-		$(use_with nas)
-		$(use_with opengl mesa)
-		$(use_with opengl)
-		$(use_with truetype freetype)
-		$(use_with truetype ttf)
-		$(use_with xinerama)
-		--disable-mb
-		--enable-appdefaultdir=/usr/share/X11/app-defaults
-		--enable-syslog
-		--enable-vtlock
-		--without-esound
-		--without-gtk
-	)
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	local DOCS=( README docs/{3d.howto,cell_automata,HACKERS.GUIDE,Purify,Revisions,TODO} )
-	default
-
-	pamd_mimic_system xlock auth
-
-	if use pam; then
-		fperms 755 /usr/bin/xlock
-	else
-		fperms 4755 /usr/bin/xlock
-	fi
-
-	docinto html
-	dodoc docs/xlock.html
-}
diff --git a/x11-misc/xmobar/Manifest b/x11-misc/xmobar/Manifest
index 14a53a990cb7..d020e7fcf9de 100644
--- a/x11-misc/xmobar/Manifest
+++ b/x11-misc/xmobar/Manifest
@@ -3,6 +3,6 @@ DIST xmobar-0.23.1.tar.gz 96169 BLAKE2B 5d16d3fc0a052614bc86cbc5ab515a5e2879d39d
 DIST xmobar-0.24.2.tar.gz 100179 BLAKE2B a5ca50d66bdb83274be62d1df83545d3527a3d05fc41708be44927ff75519f8686a2afc6671bede1142b881ebef37ede5116abff557b03276d509b031f5292d3 SHA512 c271e50d615d509c2c15ffa716b45df3211cfa143b128126c55a78a056475c9fbb6d7abc60a6a058e20a12aced5f33b94cecc35c73a76505e33e62ea1f1561f8
 DIST xmobar-0.24.3.tar.gz 100317 BLAKE2B 3ca7aeb977688b975674dc767f645d15aaf296ff906f51d79529ee58d827188437695b4ee0b960563f6c0ce1489baf1f5bdc4360807989277078a93dfafb3ed1 SHA512 aa16d55b16cf108005ee8ec6c3d1b348b3e70a5182cbb97eed2aeb67bed83bee4b23acff6d29d5bda5a30ce35dc87463a6ade6e0814b588f53b173a1c3b5a5b3
 EBUILD xmobar-0.23.1.ebuild 2879 BLAKE2B f8190f009a90e65399b18737c0cae75e1ea078166df656119021860d3844d6a0e90b19de5a98666961203c7d9ac82336b64b719befa80cfe18c5946fa766a6bc SHA512 0acad8ab127e2b401f6e8a1b901b196f7361ac3a3d68c890917d84dd395803e8bb4dae03f8583c7029b13fd2dc241d108044ae581bd8b56803dc8e95c9b4344f
-EBUILD xmobar-0.24.2.ebuild 3049 BLAKE2B 96369410b7c09cce372f41efdaab19c04d9d62bfff9ccf56ee27add0897c624686fa2d250fc25d53df98f777ca8e41292fa45f510086c3ccc7ef45c1011938a3 SHA512 b9ee096d5eac6e7b58bbb8fc54d5f4c07895c47cdcc384d5e40afa84afd9516237a6fcc406e5d31a64fddb9d5c397feedad082288038bed6641fba00b5c09e59
-EBUILD xmobar-0.24.3.ebuild 3068 BLAKE2B e240bdf3ce2bfbf4fc8c89a2bbbabf8c8fa546430eee652fd0bd8dcbf89752011bd171b731dfbb7632d7b4dbafbd3760afab11cb4f44cf4e770f4b62ef5ed594 SHA512 982bba19184c8fc31bee661c5fe36886eec3fc8f9cb57b9240512df995ec3b70246aefdad2e23b77a58368ca6525b70494d1b2e1c4e26be658ec8d1ddba8a0c8
-MISC metadata.xml 817 BLAKE2B 0b5a60495d92749fcdfac5208477dae79d6dfc2edc5766beb9f595c85bf0322c712a676009b2f470323589dc8695809a11a617cfeb86ef22c9ea9d00caf62dfd SHA512 f4c3fe7d5869d364cdba2756367488b8ae2b9ad2c72684d1725d57da44db1600c5ad37a93b1579316309e0ae12dd5cca986710ce5a6bd0a44ac3add03137fd3a
+EBUILD xmobar-0.24.2.ebuild 3021 BLAKE2B e2c16299ccda5ea212c6de84c5fc71561c9ef3cc0b4a9b2848054be7df9c8c759dc2b7e8ed7a99c2673b1c48f8f41c107c2763a2950adafd7602fac426408163 SHA512 6b8d275fa0fd6869c7f0fce9d42ef3ce2207f993e9a32e2d58bdbed8409273b74b8e4cacbb90c4d6578e08b5cd2c79220081737f75ad20fff6c0cbf046ccd042
+EBUILD xmobar-0.24.3.ebuild 3040 BLAKE2B 82cb03e63b26cebd5d2c46b2cb2d412dd0d2f459910bbdd2717fedbcd64dad3968434ee1ddc4dc6f73538a93d6cd829936d039e2c7a1b9be6cdd6f694b6fb5ac SHA512 c8316e8d92a8b16b62fdd5712667dde7a89b399db347942ba140a971d4c5e58b3cc16981ffa8dca7eb00a29c29688a90c2589fc16a866c399855839be11538fb
+MISC metadata.xml 807 BLAKE2B 3529fa66e04b28b6a55fd835e942c7bbe0e1e3888d16374eb62a7a57c5e88244a4bbd6fbc8370f3e27a586f3ed46b32f28afcd0d5f0254374230809c0338f9d7 SHA512 3753cd9088cf4c0d7858876d7606379c52b65ab5ed2314b69a480d3b21c522b8f3934b2572c61f72efb7be1da3b77665e055b6a76641c7f22d7c0de65e98ec44
diff --git a/x11-misc/xmobar/metadata.xml b/x11-misc/xmobar/metadata.xml
index 7cb1b0df7941..69dba3f2e452 100644
--- a/x11-misc/xmobar/metadata.xml
+++ b/x11-misc/xmobar/metadata.xml
@@ -9,8 +9,8 @@
 		<flag name="mpd">Support mpd plugin</flag>
 		<flag name="mpris">Enables MPRIS v1, v2  support</flag>
 		<flag name="timezone">Enables localized date support</flag>
-		<flag name="with_conduit">Use conduit to fetch weather data.</flag>
-		<flag name="with_uvmeter">Plugin to show UV data for Australia.</flag>
+		<flag name="conduit">Use conduit to fetch weather data.</flag>
+		<flag name="uvmeter">Plugin to show UV data for Australia.</flag>
 	</use>
 	<longdescription>
 		Xmobar is a minimalistic text based status bar.
diff --git a/x11-misc/xmobar/xmobar-0.24.2.ebuild b/x11-misc/xmobar/xmobar-0.24.2.ebuild
index 6444bb6aae47..e6856fed386e 100644
--- a/x11-misc/xmobar/xmobar-0.24.2.ebuild
+++ b/x11-misc/xmobar/xmobar-0.24.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 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://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="alsa dbus inotify mpd mpris timezone wifi with_conduit with_uvmeter xft xpm"
+IUSE="alsa dbus inotify mpd mpris timezone wifi conduit uvmeter xft xpm"
 
 RDEPEND=">=dev-haskell/http-4000.2.4:=
 	>=dev-haskell/mtl-2.1:= <dev-haskell/mtl-2.3:=
@@ -39,7 +39,7 @@ RDEPEND=">=dev-haskell/http-4000.2.4:=
 	timezone? ( >=dev-haskell/timezone-olson-0.1:= <dev-haskell/timezone-olson-0.2:=
 			>=dev-haskell/timezone-series-0.1:= <dev-haskell/timezone-series-0.2:= )
 	wifi? ( net-wireless/wireless-tools )
-	with_conduit? ( dev-haskell/http-conduit:=
+	conduit? ( dev-haskell/http-conduit:=
 			dev-haskell/http-types:= )
 	xft? ( >=dev-haskell/x11-xft-0.2:= <dev-haskell/x11-xft-0.4:= )
 	xpm? ( x11-libs/libXpm )
@@ -72,7 +72,7 @@ src_configure() {
 	haskell-cabal_src_configure \
 		--flag=-all_extensions \
 		$(cabal_flag alsa with_alsa) \
-		$(cabal_flag with_conduit with_conduit) \
+		$(cabal_flag conduit with_conduit) \
 		$(cabal_flag timezone with_datezone) \
 		$(cabal_flag dbus with_dbus) \
 		$(cabal_flag inotify with_inotify) \
@@ -81,7 +81,7 @@ src_configure() {
 		$(cabal_flag mpris with_mpris) \
 		--flag=with_threaded \
 		--flag=with_utf8 \
-		$(cabal_flag with_uvmeter with_uvmeter) \
+		$(cabal_flag uvmeter with_uvmeter) \
 		$(cabal_flag xft with_xft) \
 		$(cabal_flag xpm with_xpm)
 }
diff --git a/x11-misc/xmobar/xmobar-0.24.3.ebuild b/x11-misc/xmobar/xmobar-0.24.3.ebuild
index 99ba81604786..fbc0b390b6e6 100644
--- a/x11-misc/xmobar/xmobar-0.24.3.ebuild
+++ b/x11-misc/xmobar/xmobar-0.24.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 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://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="alsa dbus inotify mpd mpris timezone wifi with_conduit with_uvmeter xft xpm"
+IUSE="alsa dbus inotify mpd mpris timezone wifi conduit uvmeter xft xpm"
 
 RDEPEND=">=dev-haskell/http-4000.2.4:=
 	>=dev-haskell/mtl-2.1:= <dev-haskell/mtl-2.3:=
@@ -38,7 +38,7 @@ RDEPEND=">=dev-haskell/http-4000.2.4:=
 	timezone? ( >=dev-haskell/timezone-olson-0.1:= <dev-haskell/timezone-olson-0.2:=
 			>=dev-haskell/timezone-series-0.1:= <dev-haskell/timezone-series-0.2:= )
 	wifi? ( net-wireless/wireless-tools )
-	with_conduit? ( dev-haskell/http-conduit:=
+	conduit? ( dev-haskell/http-conduit:=
 			dev-haskell/http-types:= )
 	xft? ( >=dev-haskell/x11-xft-0.2:= <dev-haskell/x11-xft-0.4:= )
 	xpm? ( x11-libs/libXpm )
@@ -73,7 +73,7 @@ src_configure() {
 	haskell-cabal_src_configure \
 		--flag=-all_extensions \
 		$(cabal_flag alsa with_alsa) \
-		$(cabal_flag with_conduit with_conduit) \
+		$(cabal_flag conduit with_conduit) \
 		$(cabal_flag timezone with_datezone) \
 		$(cabal_flag dbus with_dbus) \
 		$(cabal_flag inotify with_inotify) \
@@ -82,7 +82,7 @@ src_configure() {
 		$(cabal_flag mpris with_mpris) \
 		--flag=with_threaded \
 		--flag=with_utf8 \
-		$(cabal_flag with_uvmeter with_uvmeter) \
+		$(cabal_flag uvmeter with_uvmeter) \
 		$(cabal_flag xft with_xft) \
 		$(cabal_flag xpm with_xpm)
 }
diff --git a/x11-misc/xmountains/Manifest b/x11-misc/xmountains/Manifest
index 8c91c2c7d262..cfdae3010630 100644
--- a/x11-misc/xmountains/Manifest
+++ b/x11-misc/xmountains/Manifest
@@ -1,3 +1,3 @@
 DIST xmountains_2.9.tar.gz 27951 BLAKE2B f540196fab487dd7e73c3b39dd5233807fdc0f9c9409e6f68c56cabb26e0cc9287865ab497b08dbdc56661a3bcc0f6df03eed87b80f8ded56b2b9e4bd5cc9287 SHA512 635fe9ae6a53996bcc5c537499d3c74d8fef9a6d2a422fa7469637a6a20fb52de9fb20e265becc0d2dae3a1d1793a7fa7f33c9d4de62837639142b37b431b898
-EBUILD xmountains-2.9-r1.ebuild 930 BLAKE2B 78006debc06463eb163bdcbd5547b70f569c7cdff589ecb9700ecaa848e5b3327d5158a2c6ea2b71e8a864008e34abc958210742213cb664998ecaccfa5956fb SHA512 b466a6ce4a23b1347cca19364689a038a2013f1d6b9ecf1c1c0e81c7979024df3b944f45a03d8c66442cf3149c0676d9ccd41e7c47a35f2ef7f353cdf3b45216
+EBUILD xmountains-2.9-r1.ebuild 920 BLAKE2B af4730cbe9db68d560a6470c9651e37e0b12c7ee956fc4f4c8b40f5187168f35a3e1bb2af09702ac16dbefdd30326bed9a4c2cd5f0be38dbf7ef8b652b6cd48e SHA512 411764768b7d1547df42288a4a0200d19180aae0fb5faf4a9ee0167bf68f5da6323c961922f04ad893b24c5d1f2fe43c086a9a5c51f9c1ebc6bde825e6a6f44e
 MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-misc/xmountains/xmountains-2.9-r1.ebuild b/x11-misc/xmountains/xmountains-2.9-r1.ebuild
index a77dfe86d278..712987fe73bd 100644
--- a/x11-misc/xmountains/xmountains-2.9-r1.ebuild
+++ b/x11-misc/xmountains/xmountains-2.9-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.epcc.ed.ac.uk/~spb/${PN}/${MY_P}.tar.gz"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-misc/xorg-cf-files/Manifest b/x11-misc/xorg-cf-files/Manifest
index 40445d03b8ae..eb2dc5da1478 100644
--- a/x11-misc/xorg-cf-files/Manifest
+++ b/x11-misc/xorg-cf-files/Manifest
@@ -1,4 +1,4 @@
 DIST xorg-cf-files-1.0.6-solaris-prefix.patch.bz2 4364 BLAKE2B 219911bf7fb6907762b70062c43842f116bb0c8ff033569d3a033918b004d89514eda43d1f478c7f0dc1b18adb17f5792990cc8d15cb9770b57e555c0b362f10 SHA512 159d55da274decdac934cded63f33164f5866dc81e853b1a205abdbe56fba4099ab4278e2fb5ff855c0b76784ba2b3fa89e6db2b4fdc9647111698e2c77da4a3
 DIST xorg-cf-files-1.0.6.tar.bz2 337859 BLAKE2B aab1495a699e6236095585c94151b3bc2edbff9e2b1f414fc916e09eca8d5dd4a5492ee9c69f8b21bf7d6c6ef1ab0639ba0d96be02b6736968b13b9d4d6f4a26 SHA512 1749a5fbcda2c15c300028abce79a3304cfb10f215bf98cf30558144eb64f9fa06a69203159f44405224ed567ac5bc0ff1222e3656367f69acc99f44871424fa
-EBUILD xorg-cf-files-1.0.6-r1.ebuild 2095 BLAKE2B d31e113685f713082a0f8d81beddf2a83b7ea0e1cb6db3be2c9bb82df99a0cdcd437a3fd03cae973bc4d95ae9d61e89d012866f9b60ce86b2e31387fa289277e SHA512 10b56434b61f10400ac91a248673bd385d36706a919360cf86e9d93cd32a15db10cfe97d58ed87e65b2806cc96329bc08db30db7547669cfe6151ce153298164
+EBUILD xorg-cf-files-1.0.6-r1.ebuild 2097 BLAKE2B 8cbad7ba6a2b5ffba4106e3b73ec2e9a2e14db51577e67e67f98afe5c25826254e0ce2b3796760b90d04682af15726ca32a8e9a3f8b39768d845970c6715b957 SHA512 a50ac56f487f2d5a6ac522957f97a62e63703719f817c5fcfbdf7f0cbaf46e1825764307b960327683b4045db41387992e4822694bf817595f98b7f8eb46fbe8
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild
index 8f1985d5f801..f9404180f913 100644
--- a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild
+++ b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild
@@ -5,12 +5,12 @@ EAPI=7
 
 DESCRIPTION="Old Imake-related build files"
 HOMEPAGE="https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/util/cf"
-SRC_URI="mirror://xorg/util/${P}.tar.bz2
+SRC_URI="https://www.x.org/releases/individual/util/${P}.tar.bz2
 	https://dev.gentoo.org/~mattst88/distfiles/${PN}-1.0.6-solaris-prefix.patch.bz2"
 
 LICENSE="MIT"
 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 ~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=""
 
 BDEPEND="
diff --git a/x11-misc/xpad/Manifest b/x11-misc/xpad/Manifest
index dc8cfba68a52..cb7f014b76c8 100644
--- a/x11-misc/xpad/Manifest
+++ b/x11-misc/xpad/Manifest
@@ -1,7 +1,7 @@
 DIST xpad-4.2.tar.bz2 244275 BLAKE2B e7552d4788c8182f696010faa1600c783999bd8b8d87e421f85ec9cc8e36a89b112e4f30d0d2205ba1f12915dc88d2aea98890aef8ab9ac0a6290b7d14837597 SHA512 4d619c9198198f4380d37b29243b76069c0e036fd30d7c6e2aa9105e8b7b1e0520c0c35fbf71f6cbd58be4a8799ddb04602694971cb46f70789b732eaa4d59b7
 DIST xpad-5.3.0.tar.bz2 158165 BLAKE2B d020a36b11d7e79af4375a89276d4763c5362b5bea5a1076fd0f6e6a726c10c78364f3ac05f948049fde956864f84d27c1b93606d5d473bdcd15f2a31527358d SHA512 a38f152192741c9c9d0742d1999ffa49e18a3e8652919ba6963101b776a51784b04beb90449abaf54ef35f964c3fbdc5b7ad0fe79cf795f39641776ef381e83d
 DIST xpad-5.4.0.tar.bz2 163394 BLAKE2B 478e96b6c09748f4643d287887f8432642f42e6786e6473832328f7d1202a1a23d96f2a06859e8da096b0e6c420df06269b6c2459e67cbceb29b9f569d565931 SHA512 a20b1d16d0d9e4cb0b88c969165eb9514b69a0eaef91eca8a3fb4da08ea8a2db32891de3c8a2a4a97db21bf78f515c7b6f798c59ba155f480f866334fca7986f
-EBUILD xpad-4.2.ebuild 574 BLAKE2B 16154fba76fb1d4db26feadc5cbaa0b1902e6bee8ee7d0cb23280bf574fdab4014905f89e70fa8c7d92df9485473905f23a82da79332f889be2382b366a2f3af SHA512 3c22e6a96effe2daa82ef879f9cbafd5ea1c37375e4c20b96f8ed333a980c53c9b568012f4afc4d69929ffba1001ce2a54aaaaf89c145266afb039134a1d126c
-EBUILD xpad-5.3.0.ebuild 735 BLAKE2B 795a03edb0efd9057d62fe2ce6fb9ea6a6c63fb48a1b856b785f8fed3e147b5ca87d503a15d9432125fa6073d5ff575a767959b49c69e20d6d530a1bbb661e2a SHA512 dc9093f8933db19bf9fba9375a5964cd0967e15b485d9634306b512c1856fbf21b7076a3a3c410eea21e0a7e5814dbda9109f273007481d4e777711f3ab725fa
-EBUILD xpad-5.4.0.ebuild 735 BLAKE2B 5a35bcda572709ffa72e770bc15f22ee4ee9dc82f9056b425f0d79c398a7dff3f3468630ebad7951d503c969e18a887b3ce90b93d745f5ebe5a28ddeced51603 SHA512 ac7aa607bca3cac63643ec4abe8c4c8422e4b59907f616032b8da68b3aaa9d19fc5461490d15791360855d550399c7b02c1c5ea8b017b5392471b482b7e4f7a2
+EBUILD xpad-4.2.ebuild 564 BLAKE2B 5243929361e082677d52083d2b98966c9d7b0bf2b07ad76cd31964da4f8a58be84fb3c1abc9a57e49b02361750aca7ec83349483d14f84ef865a1afbc1876a57 SHA512 2bf52010d2ce0db9bff21ce820d1a0baf92a36b0a93749130b9db7fb98a533fd558deeda38f33ce4e67d9b24d408ced7766171ce86d889eeb0a5e948288b25c6
+EBUILD xpad-5.3.0.ebuild 725 BLAKE2B 90a1f6d04b3381e6185c26cda85968659356e5dd5ccf9af5ff503c146c5fb29d90d52c3e40a472bb1a189e30750d810668e329e1fd57ff67e186ee904b9850fa SHA512 a3ec988b92c9b8c0f386ed41a6bfb47cadea2bf9433b4b9f07692cc87b441ff6442131e79b02e689faa76bdafc6d8be5a448af593c5b18b22d5da2a842113c83
+EBUILD xpad-5.4.0.ebuild 725 BLAKE2B 9b2bcf6b240fe74691316ac29aa37b3d5c65a9ef003cab1533f3f7d5d9acaff3dfeeb291b5c08ee4471e8f08833757d70454419b928c21cbea2abbfce3c53fe5 SHA512 338a23e390478af407abff3d6d3226ba8474398be847d0d01f3aca63616005431e9afc4c9f11544fdc692ccc13839d6760d45b345140f0fba3f0a95fef428f8c
 MISC metadata.xml 424 BLAKE2B fa08ddf7fe7b630108f7f6c67abb3bb80ee3530d24f20f92bf1d0232a445eaea1878d96731b076d29599ea329fd405e0afa56c284a98b76c60eaa9608f4e3cf5 SHA512 b9eab4ffef3b831a8c2fdaac0ffa5d4d32b7083d54746130c4cd0e38556238ae40574d9f759f411ba070ad967675944c090214ee66b9c300b9a459cca6927235
diff --git a/x11-misc/xpad/xpad-4.2.ebuild b/x11-misc/xpad/xpad-4.2.ebuild
index af7665499c64..3396c56dfc1c 100644
--- a/x11-misc/xpad/xpad-4.2.ebuild
+++ b/x11-misc/xpad/xpad-4.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ppc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-misc/xpad/xpad-5.3.0.ebuild b/x11-misc/xpad/xpad-5.3.0.ebuild
index 683c0124fb09..7bf9ed46b966 100644
--- a/x11-misc/xpad/xpad-5.3.0.ebuild
+++ b/x11-misc/xpad/xpad-5.3.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.56:2
diff --git a/x11-misc/xpad/xpad-5.4.0.ebuild b/x11-misc/xpad/xpad-5.4.0.ebuild
index d71f4db47e6c..8f36edf945ac 100644
--- a/x11-misc/xpad/xpad-5.4.0.ebuild
+++ b/x11-misc/xpad/xpad-5.4.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.56:2
diff --git a/x11-misc/xrestop/Manifest b/x11-misc/xrestop/Manifest
index ad0b96b3e232..61f370778ace 100644
--- a/x11-misc/xrestop/Manifest
+++ b/x11-misc/xrestop/Manifest
@@ -1,4 +1,4 @@
 AUX xrestop-0.4-tinfo.patch 291 BLAKE2B b96d892c87a8133987baa94e5cb4917bc5d743c24ec11a2ec67afafc7206654b88c17f54377f2d1bf0c9fb92df8de16c99e4d0f9a15ff80a9417da2de31bc6fa SHA512 21993ada033d4ec744b55faa71afd736a99423f12071a64e1445958de979631ce42a908e14ef194e819de98766c92a2c2470b2c88d172879ec5fc4c20212566f
 DIST xrestop-0.4.tar.gz 92308 BLAKE2B 5bfe6e9ccd49038e7884be8379e79f3de2bc960588dc21fbbe40d2acb89c6505efd78a9415e0ba8feb24986f11f066ce641b9c933f241776bbc1b3e59fd520f0 SHA512 eb7bf2f3ab7b73708c96d56fd466cb362d711242dd46992fa3e693af2d26995e9baa91075eb445ef227e1342deec5e0e22b37139e80399e4051c9f5cad8fd9b6
-EBUILD xrestop-0.4.ebuild 667 BLAKE2B 240129b1dd013052037d3d3c376f0f5e3b295a83d684a5f6577ef9fe5c3b19e43572e8043285e08622d7a03ab3c0bbd0e645537c6070203efcfcdb95d872475f SHA512 0f9ea41042f43e620d4938a15fbd461a8b2bea2ed50b61b0ab1481e9ae965f2774a8e29f7c5fdb7c69a01385f0408ca4c6acee1011b21b55bc773cbbcff28fc6
+EBUILD xrestop-0.4.ebuild 657 BLAKE2B e8b1ccac9d1a06c1555d819b5b89700a0649a4b10d7162ac54329ea0c520b9a18e205262c60c659c563dd5601fa30c886e806abbec13851adcbd4d5f22847df4 SHA512 d9ec647bf3f1f5f292ccaa42e7859b8e3ade11bd7e77e6493ecdab56458d5f6c29e0c1109e88cc91bb6c4b7fc64acea90a4cf4efac7c990ef6f83f464e340924
 MISC metadata.xml 318 BLAKE2B e2fde4c35c72439790ea9e4c0e403f1a0666a7ebc8e9f350b29138d01c171765fac8cd6adee54667bbc19921e6fc976a427c3429464769a02d9e8dc8c83a8925 SHA512 7d56445a5c7fffdc1104633cdd30eafa17588079b8a1f4cb226984b1aad4e41fe84320608681143dc01c5f1ac5f104cf0717e8183164031644220f9c61086a3b
diff --git a/x11-misc/xrestop/xrestop-0.4.ebuild b/x11-misc/xrestop/xrestop-0.4.ebuild
index 3cf2f929a6e2..3e4efec61250 100644
--- a/x11-misc/xrestop/xrestop-0.4.ebuild
+++ b/x11-misc/xrestop/xrestop-0.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://projects.o-hand.com/sources/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ~ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 hppa ppc ~ppc64 sparc x86"
 
 RDEPEND="
 	x11-libs/libX11
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index a3b0fb287531..968c6b9938bb 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -11,7 +11,7 @@ AUX xscreensaver-5.43-gentoo.patch 1340 BLAKE2B 177631b961b97d339149fd969d68ebba
 DIST xscreensaver-5.38.tar.gz 10712548 BLAKE2B 02630aa7daa3faf8aa7ff453218bed5e3db287b7c4d9b564a6d8822db8b2e1ae6be7843342d585f2d2900d2bd0e7fd2a12d49748d81bf10818fa5bc4254f6ef8 SHA512 9014571505afd3a116f541334ea37737659f63f4cbb267a56be451e2c353d9e57218119670a44297d36d140672ea423d0682433401b17749138ab6baf6507561
 DIST xscreensaver-5.42.tar.gz 26903469 BLAKE2B a82716a3f1f19f85eb1bc7a8ba1981221ac2ad47c1411687f1043da7e50edada73ab9c7465d655546f8a9015db69ab4f35ef8ff2a0b3d79f5a59d3e02aa2f819 SHA512 84cde9364c933de720acd51a0bf75eb4d0642d60f62b92de89d932233eb5abb51e1edb53cd413b2dc4801a02cb68652a28d7d1f83cdaa8d8cdd1fee7d651eefd
 DIST xscreensaver-5.43-r1.tar.gz 26973508 BLAKE2B 67b57214e8a41ba895df6e9efcac3e712f24be06ee7914b38d3a8e639d4945c927c4ac28469d2180bc4a3999a4b89d2a60e633799ac5204c42fa17ad76dd21fc SHA512 7ccaf30fb05ae2110f742f1a5c99f83cd4c8e6749124066b5a418cf3e0ba1b8ff09858eeec29c11b0c8ea428b95b2916481c50cee6a5d952ec941b3ad1b6adcd
-EBUILD xscreensaver-5.38.ebuild 3397 BLAKE2B 9848d30fdb05f6ddc95d11272832f4b79e7b775e4aa08119a7892e373db9e5698fd3034749a64faa3a99b1bc964481270926df750ce151a824508bc58d410853 SHA512 950d1b8b3646c14bee671f75aaf5ed25cb6b2443922f131eb1c6d024efb4e5a2c856b4fd9d59a1d5727f738a6ccf340b99e304f2af4a5986a859100d5e835077
-EBUILD xscreensaver-5.42.ebuild 3388 BLAKE2B d31c7b81e9bb04c7bd4f7d247bd59ecbdbb2e8e96564a7a156feab6a80c90bcc0b625d4a642b2a4235ddbce98fecff813e16c2b1f3cf1fd78246cfcb6987f4d2 SHA512 98b1a0900da9f16d7dd0120cfa426739f4236e11c46b33446e254fb5aa94a3221e164b25fbb7718e2f9404e042878fabb37b13625893500237e79ebad645dc2f
-EBUILD xscreensaver-5.43-r1.ebuild 3363 BLAKE2B b555c2faac9d448c53f5b401e0e6c0005b101b9f5a1dedfa539489dc3ba9a1568c5b88b837cd30515ba3bdc4975f1347cacf861ffc5233fca9d07eb1b15000e5 SHA512 f09005d3c2e59fa4d95539b4c1789a756e155ca15610b7ec9a7bf69d2de092671266431440e80b37834527ad24311c63052214583d8b6d014b3f26c1ca8580a3
+EBUILD xscreensaver-5.38.ebuild 3385 BLAKE2B e3de5033620cba11adac6b1c60ad110ced71228f6186e78632a871230bd5a1fa71ad89692bccee58836d10c1602bcd83aca1798a8565381920f65f94ff499100 SHA512 a51df05efd08870545ed04afa71e01608560a680958956d8a1a1e4c31e2c1aee0c7fba9e92b7e3d868845cf4769621338206fbf7bfcc4511223244f7d78d864d
+EBUILD xscreensaver-5.42.ebuild 3379 BLAKE2B d1c4caaa30884a7246c779a9395ac5b75edc83fca264bbe1878054d8e5843e8cc8973269ea4ba7dca1795f59be5a769b07e466d028648cfebac05cf9ffe6424c SHA512 31be7e3ff82e3d5427c8fbc2aca4cbfbf70ec448b6e856b5a78811116d3fd322c37d4669f3f65ecf30a5f343f7b731f09328b1356620bb94cab2a758f539667c
+EBUILD xscreensaver-5.43-r1.ebuild 3354 BLAKE2B 06eba2635de71983d774615b5f6e99d7bdf986b366d0960c782239272ce5e6581cf173b868e0c3107904f0a933bbce0223ac2375c1142e2a17efc2a4a8606bc7 SHA512 9b6d2474e5e06dac6cf07a4ce26491f713f8de979c4a2d28e480afed2cacaff9b064ea61ab80a74bb4624f02c3c334d3c5da7da9cce77c28f0874bffc7249da4
 MISC metadata.xml 660 BLAKE2B f720a7df804148568927cc909ec46013c8de0087f2ab5751bd3852cf310161c328d43f29db22105e46b4c142db3e84fa5a2c943bae63779156bfe569726bf12b SHA512 ecc2b0423bd77d7713db654875f5d112c90c278653248298c877a84104db40430fcdaffaac2cbb972bb6ae6ce970b498d4d086278ba85c519dedeb3586bcd41b
diff --git a/x11-misc/xscreensaver/xscreensaver-5.38.ebuild b/x11-misc/xscreensaver/xscreensaver-5.38.ebuild
index 6c9b0653377f..eada3a1f922f 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.38.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.38.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
@@ -12,7 +12,7 @@ SRC_URI="
 
 LICENSE="BSD"
 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="gdm jpeg new-login offensive opengl pam +perl selinux suid xinerama"
 
 COMMON_DEPEND="
@@ -41,7 +41,7 @@ COMMON_DEPEND="
 		virtual/glu
 		virtual/opengl
 	)
-	pam? ( virtual/pam )
+	pam? ( sys-libs/pam )
 	xinerama? ( x11-libs/libXinerama )
 "
 # For USE="perl" see output of `qlist xscreensaver | grep bin | xargs grep '::'`
diff --git a/x11-misc/xscreensaver/xscreensaver-5.42.ebuild b/x11-misc/xscreensaver/xscreensaver-5.42.ebuild
index 9a77361bdd1e..be48a4d7e724 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.42.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.42.ebuild
@@ -12,7 +12,7 @@ SRC_URI="
 
 LICENSE="BSD"
 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="gdm jpeg new-login offensive opengl pam +perl selinux suid xinerama"
 
 COMMON_DEPEND="
@@ -41,7 +41,7 @@ COMMON_DEPEND="
 		virtual/glu
 		virtual/opengl
 	)
-	pam? ( virtual/pam )
+	pam? ( sys-libs/pam )
 	xinerama? ( x11-libs/libXinerama )
 "
 # For USE="perl" see output of `qlist xscreensaver | grep bin | xargs grep '::'`
diff --git a/x11-misc/xscreensaver/xscreensaver-5.43-r1.ebuild b/x11-misc/xscreensaver/xscreensaver-5.43-r1.ebuild
index b28860a3b225..a3724193e8b7 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.43-r1.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.43-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="
 
 LICENSE="BSD"
 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="gdm jpeg new-login offensive opengl pam +perl selinux suid xinerama"
 
 COMMON_DEPEND="
@@ -41,7 +41,7 @@ COMMON_DEPEND="
 		virtual/glu
 		virtual/opengl
 	)
-	pam? ( virtual/pam )
+	pam? ( sys-libs/pam )
 	xinerama? ( x11-libs/libXinerama )
 "
 # For USE="perl" see output of `qlist xscreensaver | grep bin | xargs grep '::'`
diff --git a/x11-misc/xsnow/Manifest b/x11-misc/xsnow/Manifest
index 667d9430403f..2777c3a10402 100644
--- a/x11-misc/xsnow/Manifest
+++ b/x11-misc/xsnow/Manifest
@@ -1,3 +1,3 @@
 DIST xsnow-1.42.tar.gz 56752 BLAKE2B b6feefa4aabc464097b099a0e48d27b9bd5d1b82bc02ca187ffd8ab810f3562c1d11ad01f18f79994699e1fb1fa520269976a35634388fbab2838e2e2bb122bd SHA512 7833f3c1834d64944a578dc71bbf09966d47a1b4878fb826cf121606e76c69544d96d73665572b45c47e0e017dd0cb0bf49f76799aeb859c1dc72348da4ff257
-EBUILD xsnow-1.42-r2.ebuild 826 BLAKE2B 55e68c6336615a263a0b7f8421623433c36b41a475acbd8d3cdc5af5d3a4b11349814d82ceabc04aee3cc16fa0bb64a9514197e113bebc216d0cffa3de77be2a SHA512 5c49f28acf348efe87043d6cf9f865313771c73135254c98b521aa22890c45b6a1431fe907322a15811596946415ba3b7267db45814183fb37bb22d7d5e45eb0
+EBUILD xsnow-1.42-r2.ebuild 816 BLAKE2B 955873b2043aa44b2008a0967e1676639357cd3b06a89baaa64b4397d591cdcbc44d63b40fa2b665d4f745992dd9f08cd23c727ad8f7cb40b6957b6317e614f1 SHA512 df34b242879a4521fdfb59c6c719e93d38133b47152311dc7c4050d48efb1bb0247d3cce7ae6096444df4a954f70a360234e3125ead1fc4809620aa3b2fb6939
 MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-misc/xsnow/xsnow-1.42-r2.ebuild b/x11-misc/xsnow/xsnow-1.42-r2.ebuild
index e9d9084f1313..eb75c118fa4c 100644
--- a/x11-misc/xsnow/xsnow-1.42-r2.ebuild
+++ b/x11-misc/xsnow/xsnow-1.42-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="${HOMEPAGE}${P}.tar.gz"
 
 LICENSE="freedist"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 
 RDEPEND="
 	x11-libs/libX11
diff --git a/x11-misc/xsri/Manifest b/x11-misc/xsri/Manifest
index 9fe4ff0b4f22..646a7058c620 100644
--- a/x11-misc/xsri/Manifest
+++ b/x11-misc/xsri/Manifest
@@ -1,4 +1,4 @@
 AUX xsri-2.1.0-configure.patch 580 BLAKE2B 0f740d5c3ba8ab5ba004a75b6dc075a56413707bcbdebbc06d44b322add7b49e4b509e63695719623dd64c0c311447a8c10f3fa5bbc4ab85ec9a8652b31be8f8 SHA512 147d6b7eed2dc6805551603410c33acea38d1b0d7630d3aca0d783b880d19cf341f9a994b58fb6910f409e380163b2e12687f41e634cdbde4634f3a31eca5bb5
 DIST xsri-2.1.0-17.fc12.src.rpm 79266 BLAKE2B 56f269aae035961bb84637ed2fa282f91b3596f66b9e9aaee59ef1ef1b88da22f763a47815676e1e14c3812c410eadf145206f89facb4596db42a3948e7d6ebe SHA512 1e0948b4f03eef797fdef63732f592ebaa3aeff7010941c2df9ae0a3656a9c477adad48c72cf59531227f2427330cca13ae09c5c60739ec66411dcce10f44ee9
-EBUILD xsri-2.1.0-r3.ebuild 643 BLAKE2B beb801011cd77c24e8244eb601eb29f74992910c61061fe6f3072fbdb94a52ec80aeef85fb56996ab79249134248e840ee15912f04613319589b28b74aa55f18 SHA512 f664a4b314bfdda244ffab01ec14dfdc1153f7248d93ff6716db652c7c779adf1a1b4645854720d9a1ed57225699e76fe466de9a4abcfb67dc999cb39c3288fe
+EBUILD xsri-2.1.0-r3.ebuild 633 BLAKE2B 2d1173121c13b025a8fb014d0d2a89b4d0f6029e5a62f9b0208c98eaae2fbda89541204f0e6c62f57ee0496926ef46987c30f71ebbdbc96978a8567f68767e95 SHA512 bd7f0164b69907f6936c7ef4a612a3b08eebc9c230bdc74e57a4467d2574affb7640ba0860f3f8fbc124e791ee0fd72c8723abb405de7c6b5b7d8efea42b54a2
 MISC metadata.xml 272 BLAKE2B 4dbd2b5ae92564a97b2a06ab0ec6562e8dce2dd636aaf0788ee09f8688ca5d5b6483084a65366dfbe6d144d30170e5558bc5759adecb96abb405ea96a5147285 SHA512 ebe67da08587903b5b82fc194aa3c8f1ab65371f60d2c134928362e089550d9e9fd9531bffe8b676a345b5bf0ab209ce7f50d37d98201a88176f002e17582493
diff --git a/x11-misc/xsri/xsri-2.1.0-r3.ebuild b/x11-misc/xsri/xsri-2.1.0-r3.ebuild
index 679a28444897..d0b56abeec3b 100644
--- a/x11-misc/xsri/xsri-2.1.0-r3.ebuild
+++ b/x11-misc/xsri/xsri-2.1.0-r3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://download.fedoraproject.org/pub/fedora/linux/releases/15/Everythi
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc x86"
 
 RDEPEND="x11-libs/gtk+:2"
 DEPEND="${RDEPEND}
diff --git a/x11-misc/xwrits/Manifest b/x11-misc/xwrits/Manifest
index ca0014e7fdfd..357073d2936b 100644
--- a/x11-misc/xwrits/Manifest
+++ b/x11-misc/xwrits/Manifest
@@ -1,3 +1,3 @@
 DIST xwrits-2.26.tar.gz 196529 BLAKE2B 4aa3784733dbdcbcf692986a9e7549b96406a8b717082b079c82eaffad11c5c4fc10820c63729da8109850fc1d93ad63fe866092a94a6f62817414069ffe0141 SHA512 c8beeca957e41468d85819a7d6d4475c83a99735ff17d13d724658a421d1d3b9a15191ee8ab903104ab19b869a4832103dbe7d3ec2a9bf89ae95a7899e92f927
-EBUILD xwrits-2.26-r1.ebuild 508 BLAKE2B 3a091451c8ece153fe72ab4c58a0e82021940fe08552def6d1c4161dac7c37b250817d5c1a001e35d437cda34074e32837e7e01b18e26f80a477ff9b5bcf3688 SHA512 15d0d2b68bb2b05e031873142ed7fa5c5338487af4d6b9e040ce65135ddf0c6eed1362e4c038a8946d9fd93ec63bc2fc0b740710dce94534d53b92fb881d1221
+EBUILD xwrits-2.26-r1.ebuild 498 BLAKE2B 321e0dd7967a4a303c57f42dece92ff118edd273c2443b5f36fbb4bdad9b15dd1e8ca846eca559fbc20485923d85ab8c619228a950d7c8c6f9b8ddf5a6d9fbbc SHA512 bf33157418379227e58caa579b4c51894462b8dd5d10573ea336e275239244e4905b4298d0293e67914be0a6be0fe7cf5e5bab44e94c8f45841975d126686d35
 MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-misc/xwrits/xwrits-2.26-r1.ebuild b/x11-misc/xwrits/xwrits-2.26-r1.ebuild
index d25703bca7fd..5e94357dfc64 100644
--- a/x11-misc/xwrits/xwrits-2.26-r1.ebuild
+++ b/x11-misc/xwrits/xwrits-2.26-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.lcdf.org/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
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-misc
parent	30d6f67c98d149508509d5e86f176d558793acc0 (diff)