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 /app-crypt
parent: 30d6f67c98d149508509d5e86f176d558793acc0 (diff)
102 files changed, 494 insertions, 1206 deletions
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index afd27b4453d6..6e57e43f489a 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/acme-sh/Manifest b/app-crypt/acme-sh/Manifest
index 74ce200142cf..ad03e4d9033a 100644
--- a/app-crypt/acme-sh/Manifest
+++ b/app-crypt/acme-sh/Manifest
@@ -1,8 +1,8 @@
 AUX 99acme-sh 62 BLAKE2B b9542b99b2e720e0930139f7dd56efc63e596156dca1649624f6f4c27a7d57555bb13deb3b5714aa06477e9ca79996b5f891c8a91ea808d853cc7e5d5655b0a0 SHA512 b7fc9402e3bea3ca846bdb82d6f21d1b7023bb2ace8d5ffd146959cd12e3270243fd22e3a7dde9b6cefae8f2cbca369b35d2da4ea9f1e60a2f61ae81612d8bc5
 AUX acme.sh 63 BLAKE2B 50c3284c0172ff0a0dc57fcfbaba57a6518d7c043b5d052f2710b28229b9b13313e7ca7c8b644ea273eb2f4991246631e70e6184fb5489005be12b77b8efa229 SHA512 7ec0764c86db5c68c42189a8af708e769189df201fdf017bd0d8d9e322ab71c2f422be382d170a1f4b876a1e5a6629eb55df0c564abfebab665e27e58660ff6e
-DIST acme.sh-2.7.9.tar.gz 110323 BLAKE2B 244afad17ddf17fa95a11d5af7943a153ed37e67ef304511787767a5d769f9cd22fb66875d637f2d536cce8942e4feee0c442af8349a32a91940b1fbbc2e879c SHA512 24374783ca52835b400b84316ffab5e9066805362f02082f8ef409e21ca590d837b3dd11401633947f9fcc98dc977b0e8b6076d5deecd02b38478f257500a052
 DIST acme.sh-2.8.0.tar.gz 127638 BLAKE2B b5ef10c40da4b77c7f1f3175b7cac0cc19bff135959416a97b3e8443cf13bb92d9e0b86837fd3834351412a19f25e92a4ffa146815c146f2e91cd94bcbc655a8 SHA512 99f86866f7bd1426e9a8b31dd09206685ad4aa01a3d723d366681aae4ea2087f9437496e0b3da947766931493c9d94305da1906eadc7005373327342ca94ce23
-EBUILD acme-sh-2.7.9.ebuild 1016 BLAKE2B ea5aaea6f1e4049aa316bd7c57c73adac4f0b77578c3fc9eff1b8efb39beea322f7122471c5efc436283939667f1d5c439802b0cae9dd00b3d9f55df36b31b9d SHA512 40804c6d3692b955247a9c4790a11680c2985418f58a1757feee4931a53db67dec873da4c12276eec421176260d69d76e2828a93feaea44c7d1a7fba801b017d
+DIST acme.sh-2.8.3.tar.gz 163573 BLAKE2B 7436932d79e732b8c419a588f4677ec0338c63d0dfc227e7410b151731e2fc4c028df81f459f7ad140dab857ebdebddab3173095e3efcfad0a971ff6762c8608 SHA512 15e147d0f07af91eab7274df50e274ae41a411c30ee7f6ebc8bcbcb601b66094fc1d8126bfb816caa27dbeb5222da20a25d1c79227bc70ddb6b5d0ce0dcb389e
 EBUILD acme-sh-2.8.0.ebuild 1041 BLAKE2B 64edc40dea7933044c8aa67932641089eafefe8bd595759fd0e357113631a738c0dde657198c73771307a189e1a2dbe731beb85901abbcc6548a681a99d76e62 SHA512 98a3f2221395ff77e9b8592ecf4361b71cf6807a4e789fd7f7dd4ef31944aef3db11e587c649201438d925df6c86c04b399e50e930d1a3c450f0bc4a9c277470
-EBUILD acme-sh-9999.ebuild 965 BLAKE2B bd273468f5c1689fdb2fa75743502f232a0d9080a712bb5f951dc30a14dddcc0fdadd2a59e71b2a664a59565620d3345acbb9fe48e4c0ae756bccde0a18ed80e SHA512 77c0ee3b1214fb29e93714b91d0b1f6533c7ea1094ed2a72cf4268b41f890d71e2d422c98b57ffcb5f2b8759edb6c085bcdb4edebe6c55737881eff3f54e12e6
+EBUILD acme-sh-2.8.3.ebuild 1098 BLAKE2B 79aa3b8955df9308a800da0dca7bb97fdf48190a06b205faf85d15ab6284c933187f2bc6ddd0e02fe4cc5c380de910ce15c341e86c7219e6e8ffddf043363331 SHA512 667605c0213706ecd3c8cc95ed98fc322231196ac676ee95f01ec4114e73fa8f226a14de870d8c67569daeb0b6bf78cb9edbe3228bdca36b7e0c10cc65660daf
+EBUILD acme-sh-9999.ebuild 1022 BLAKE2B 0e439fa8bfb6365f24aa4181acdad1af2ae1d0ab55abcb386348180d3ccf03e00bd9f395a96dceb252b56e29bd0a5711d027eedc7e3e23c67e9c491a9d75b66d SHA512 d370fa4197af017c61faf8b89b71e195920ebf6e970e51f86c773027fa95189491e75d94b1fe8901f02562ffc1ec9b736d82a0a21a64e31203bf6e841d2a4021
 MISC metadata.xml 597 BLAKE2B abf8574531170e1bf807d45682c5a394e3ef11880b23a297b3a440ab1b3eaf2c283d5afac51ef7fb8726203b6303f626e5883f4a258897794a3848e4ade5980d SHA512 f45386c5ef271f698ce540ae61b9dad4ae6d7c624d13310daa2adc353a6145f4abdf19f7a0fc5120ca661668673efa6536297e25a374b65ec06dd8b41a7ebbb6
diff --git a/app-crypt/acme-sh/acme-sh-2.7.9.ebuild b/app-crypt/acme-sh/acme-sh-2.8.3.ebuild
index c61c16f239a1..6aa2342cb37c 100644
--- a/app-crypt/acme-sh/acme-sh-2.7.9.ebuild
+++ b/app-crypt/acme-sh/acme-sh-2.8.3.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
@@ -17,8 +17,8 @@ IUSE=""
 
 RDEPEND="net-misc/curl
 	|| ( dev-libs/libressl dev-libs/openssl:0 )
-	net-analyzer/openbsd-netcat
-	|| ( net-misc/socat www-servers/apache:2 www-servers/nginx:0 )
+	|| ( net-analyzer/netcat net-analyzer/openbsd-netcat )
+	|| ( net-misc/socat www-servers/apache:2 www-servers/nginx )
 	virtual/cron"
 
 S="${WORKDIR}/${MY_P}"
@@ -39,6 +39,8 @@ src_install() {
 	doins -r dnsapi/*.sh
 	insinto /usr/share/acme.sh/deploy
 	doins -r deploy/*.sh
+	insinto /usr/share/acme.sh/notify
+	doins -r notify/*.sh
 
 	dosym ../share/acme.sh/acme.sh usr/bin/acme.sh
 }
diff --git a/app-crypt/acme-sh/acme-sh-9999.ebuild b/app-crypt/acme-sh/acme-sh-9999.ebuild
index aa72ab18cd53..7ff01d8cd7e6 100644
--- a/app-crypt/acme-sh/acme-sh-9999.ebuild
+++ b/app-crypt/acme-sh/acme-sh-9999.ebuild
@@ -38,6 +38,8 @@ src_install() {
 	doins -r dnsapi/*.sh
 	insinto /usr/share/acme.sh/deploy
 	doins -r deploy/*.sh
+	insinto /usr/share/acme.sh/notify
+	doins -r notify/*.sh
 
 	dosym ../share/acme.sh/acme.sh usr/bin/acme.sh
 }
diff --git a/app-crypt/acme/Manifest b/app-crypt/acme/Manifest
index c846c47da5be..f24caf0ef4cb 100644
--- a/app-crypt/acme/Manifest
+++ b/app-crypt/acme/Manifest
@@ -1,8 +1,8 @@
-DIST certbot-0.36.0.tar.gz 1322339 BLAKE2B 69fbf68b5dd95d6d3ac6c868d583da8c66dfcd01e3471c511d0d9d95de08ac096479733e9fca12ca99abf43484835fa7184dcccb1c11a41ee7948174364f2894 SHA512 f7fa8c6200a76b4fc4830865bf11fbba8bd73ea55e1236680181073952505c83b4650b43ccfc8e9b96caf47b85c43e47acf8db6d92134f7c279ebd954ab0ac92
 DIST certbot-0.37.0.tar.gz 1327246 BLAKE2B 917360ab6d9dedd6e5ea2c558822c228ff34617f97341b7d176e69f7589a3aa3012f1d9abdb33b72960c68a80b29987d1a7b1121eadd7d93adec5829b316f326 SHA512 3f2df5f591ba241719fe2e5e90c2b87e2d932d991d943eefbe00b9d76f7fb056d3b6026879511f591473c698b798e78645879f018a78e503b8a06280b036cb35
 DIST certbot-0.38.0.tar.gz 1328474 BLAKE2B 6ea7c6b5d1840ec9d42509859d0f36f3ac3c4e588149e54fd74f8799a414b43c4d182b47e051a96436c9cdac135999d7e2a25424be680a819d50de64bb85b198 SHA512 832ac36c5b13e9764c9aab40856af7b909b630f34b1fe1e42dbf847357b28b2a130df480f1cb543dad0db781a843a79a310eba7b1097370e267d01431c21ee29
-EBUILD acme-0.36.0.ebuild 1721 BLAKE2B 26118df6502f483bbeb7e0a213ebd5f4ba759712acbc3d99acb5d5452364707d14dbb443bcaed7f118cac84c2e3276b8cc8df5fa9b40fe06ed700ca11277d1db SHA512 4501fe5c2ce4a63b86e4a3898a8db9e5d488e1e00f32b58af36e79a86f35ba399001c630eb3113d764740c62cdc66e212ab8594dc961009c7d0e11bf675e44d3
+DIST certbot-0.39.0.tar.gz 1350312 BLAKE2B 5f21c45d25754cb1ed0ad92e8d03637928a274637de09903509c7e78c40fd197e95cfa1f3effecef938d6ab8369dc6811714ddb5a93a806048e0998d1032e4f9 SHA512 17ab17a5f74e3fba58b1a8b9afe0c3656c7b2a5ea3585edb05ad84e36250c6a8d4d28bd692bc97d033c95eb0bbeff4eb84981ae0006e36d55846cd38373b86a0
 EBUILD acme-0.37.0.ebuild 1721 BLAKE2B 26118df6502f483bbeb7e0a213ebd5f4ba759712acbc3d99acb5d5452364707d14dbb443bcaed7f118cac84c2e3276b8cc8df5fa9b40fe06ed700ca11277d1db SHA512 4501fe5c2ce4a63b86e4a3898a8db9e5d488e1e00f32b58af36e79a86f35ba399001c630eb3113d764740c62cdc66e212ab8594dc961009c7d0e11bf675e44d3
-EBUILD acme-0.38.0.ebuild 1723 BLAKE2B 2fe38f3a6255c3540a5e5527316cd27dcbd15abc265e3464bcced30b35189422b967713fbf3b5170af7ca27b415c703eae0510685e5bb4231beee8af2320cef2 SHA512 582412c0ff094447f58d1bd973d2c678e29fe64c2cf38496360080790c9c3c57c6142ed73079b98f08c324f7be8a446be3c2fd1e24d306db2ed838241f84ae4e
-EBUILD acme-9999.ebuild 1723 BLAKE2B a5abd27f54ec47307fa0ced1cc3ae85c9747195848709ca395ae4a64f962ea2c0787b82eabf39ca5598bbc67abf51a05e473d390c8ca367989e6f871498a1653 SHA512 9a2ab0cdcfbc81bf6fb9e32de5449264579257f5ac185f80e4f83607bbc99730996cb16d4276005fa5cfe3b31df2a0db310ebf3fa25b6c631675d408a040dcb2
+EBUILD acme-0.38.0.ebuild 1721 BLAKE2B 3b07ade5ac66c854fafa0f17fac36db968f4e39decc60be4bd2849de87d84c2e9bf0aa2fb5f7eb0d7b55d36b5c6f12b136a95e5601880f986fe430fe08c328ae SHA512 095dd2b679f056c77694c7b0e673b0aaeab779c7e012bc07ca0709a0043f9c4b1ee72ae94f3d9d2994c341803f6f603ebfdc5387ba73ecec8d2317c01a5cf1a5
+EBUILD acme-0.39.0.ebuild 1723 BLAKE2B 2fe38f3a6255c3540a5e5527316cd27dcbd15abc265e3464bcced30b35189422b967713fbf3b5170af7ca27b415c703eae0510685e5bb4231beee8af2320cef2 SHA512 582412c0ff094447f58d1bd973d2c678e29fe64c2cf38496360080790c9c3c57c6142ed73079b98f08c324f7be8a446be3c2fd1e24d306db2ed838241f84ae4e
+EBUILD acme-9999.ebuild 1723 BLAKE2B 2fe38f3a6255c3540a5e5527316cd27dcbd15abc265e3464bcced30b35189422b967713fbf3b5170af7ca27b415c703eae0510685e5bb4231beee8af2320cef2 SHA512 582412c0ff094447f58d1bd973d2c678e29fe64c2cf38496360080790c9c3c57c6142ed73079b98f08c324f7be8a446be3c2fd1e24d306db2ed838241f84ae4e
 MISC metadata.xml 384 BLAKE2B 55780995cb61c11ca859c9f1de17b1c22c9c92902f551ccd1ee6f030df9d513bb5519a2c62bf33bc6a5872790d033ba966e5ed137d84a4f66ab4ba7636a88887 SHA512 cf8393b25aa363bc1db4ebd23274affd1eaf999a4c2ab8d359730f421961dafd5c96fcf14c247f3f5419616116e2351d72fbf0e29301ea44ac522e865c7b0fa1
diff --git a/app-crypt/acme/acme-0.38.0.ebuild b/app-crypt/acme/acme-0.38.0.ebuild
index 3efe8a99669b..e5015f90babf 100644
--- a/app-crypt/acme/acme-0.38.0.ebuild
+++ b/app-crypt/acme/acme-0.38.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]]; then
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> certbot-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 	S=${WORKDIR}/certbot-${PV}/acme
 fi
 
diff --git a/app-crypt/acme/acme-0.36.0.ebuild b/app-crypt/acme/acme-0.39.0.ebuild
index 9a9b63c8fa3c..3efe8a99669b 100644
--- a/app-crypt/acme/acme-0.36.0.ebuild
+++ b/app-crypt/acme/acme-0.39.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 PYTHON_COMPAT=(python{2_7,3_5,3_6,3_7})
 
 if [[ ${PV} == 9999* ]]; then
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]]; then
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> certbot-${PV}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 	S=${WORKDIR}/certbot-${PV}/acme
 fi
 
diff --git a/app-crypt/acme/acme-9999.ebuild b/app-crypt/acme/acme-9999.ebuild
index 3acd37f75f8e..3efe8a99669b 100644
--- a/app-crypt/acme/acme-9999.ebuild
+++ b/app-crypt/acme/acme-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 PYTHON_COMPAT=(python{2_7,3_5,3_6,3_7})
 
 if [[ ${PV} == 9999* ]]; then
diff --git a/app-crypt/argon2/Manifest b/app-crypt/argon2/Manifest
index 9d58a533fd24..05dd91235063 100644
--- a/app-crypt/argon2/Manifest
+++ b/app-crypt/argon2/Manifest
@@ -1,4 +1,4 @@
 DIST argon2-20171227.tar.gz 1503745 BLAKE2B 70171ce1b446974e18e6f7077f436c6b78f29fd3eb075314014219280fd984e51b00137d901175da5fcb8a8472df0cbb16ff0333a2f2f098e52d3e0ea496e2cc SHA512 9c9e1a3905e61ac6913d1e073c104477e419ddd0506adc4487e88e98d19165ed8901fe8bb11246ed0cc71b3523c190da9692d5926642f86be09c3e67510afe4d
-EBUILD argon2-20171227-r1.ebuild 1199 BLAKE2B af897c86e6f85587d760f7d3e7493df361f1803a7e14b66870e3235e2463fff6319854e9a32bb40087f7d5fef859774796612f34ab2c32130db8786a31f0f113 SHA512 bd6a3a1d24bd77e6d75f466100bddc0d4703b7703baf6572ea62dc6086b8d53dd6f944a3dce736129a619bb20b48b9264785eebdbc6aaf492738812277e17f6e
-EBUILD argon2-20171227.ebuild 932 BLAKE2B d4d35467d79c15fe30fdd120261f0452ff20e2433cfb59734d98dfca35bd587114bd49cb7e6186100ba57dd14b12371703eb7465298a8ee585286838e207f8c6 SHA512 88b54c07cc75e2011ebeb5c43636deafbc248d013b52e97a876aad02a1019477087d9c2652dcf21d4939f871c84a2255e826e5126cae1be8e9111e6b3055c498
+EBUILD argon2-20171227-r1.ebuild 1187 BLAKE2B 32ac04d66e6d05e60f956db9d69448edfde245a908bb76576122949212cbb61808f14cb3ec29090d0660345bb80887b577b262b5c86ef12093b3a5dfd3b5ae84 SHA512 45076957bf043d9182dc8e7c36340461b5d8da9396aecfc51a724acd2fda956ffbfb3e5a772666fa33ecf52afb6b01c959adac665035cb82bc774783d29668ac
+EBUILD argon2-20171227.ebuild 920 BLAKE2B 9c4b2ea28975cb9f1338e9cc89606c4391a0ae407d75f6a4d14681602de2fae401d98006dd2257ca38cecb0b465afbeab21693cc2de77963faf59e4af68ed790 SHA512 eb226c4e7944ff088365edfda085327621d76c0f45e87cf975a1b05c2963204911368c0286500710d981046287fe3a4f9697f2f58e89db3657aa19669f5e0e72
 MISC metadata.xml 660 BLAKE2B 1843f019c2cf7e8438209df6d90a20a9bcc88f5346aa02c953a28d84d712983fe3880b39b4b1766819bb88c670245447c37dc0c1da3b02b3f800a3d9706c4287 SHA512 76c1048a35a75b60d9e5fd56da50ba4bfe9537457e2021c226671d72e0456d2533f05361cad607cc86b8e01fd00a137a4cbc26a6d70c122918fe4e0f2ae3bee5
diff --git a/app-crypt/argon2/argon2-20171227-r1.ebuild b/app-crypt/argon2/argon2-20171227-r1.ebuild
index 619565bd4c99..53602bc12911 100644
--- a/app-crypt/argon2/argon2-20171227-r1.ebuild
+++ b/app-crypt/argon2/argon2-20171227-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/P-H-C/phc-winner-argon2/archive/${PV}.tar.gz -> ${P}
 
 LICENSE="|| ( Apache-2.0 CC0-1.0 )"
 SLOT="0/1"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="static-libs"
 
 S="${WORKDIR}/phc-winner-${P}"
diff --git a/app-crypt/argon2/argon2-20171227.ebuild b/app-crypt/argon2/argon2-20171227.ebuild
index 5127fecce9e0..8ce2715a64d2 100644
--- a/app-crypt/argon2/argon2-20171227.ebuild
+++ b/app-crypt/argon2/argon2-20171227.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/P-H-C/phc-winner-argon2/archive/${PV}.tar.gz -> ${P}
 
 LICENSE="|| ( Apache-2.0 CC0-1.0 )"
 SLOT="0/1"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
 IUSE="static-libs"
 
 S="${WORKDIR}/phc-winner-${P}"
diff --git a/app-crypt/certbot-apache/Manifest b/app-crypt/certbot-apache/Manifest
index 7c1a7f602afe..3337e0d58a52 100644
--- a/app-crypt/certbot-apache/Manifest
+++ b/app-crypt/certbot-apache/Manifest
@@ -1,8 +1,8 @@
-DIST certbot-0.36.0.tar.gz 1322339 BLAKE2B 69fbf68b5dd95d6d3ac6c868d583da8c66dfcd01e3471c511d0d9d95de08ac096479733e9fca12ca99abf43484835fa7184dcccb1c11a41ee7948174364f2894 SHA512 f7fa8c6200a76b4fc4830865bf11fbba8bd73ea55e1236680181073952505c83b4650b43ccfc8e9b96caf47b85c43e47acf8db6d92134f7c279ebd954ab0ac92
 DIST certbot-0.37.2.tar.gz 1327361 BLAKE2B 2f36276f527ffc29e54cf58f25051952e9435972a94881e420712844401fc86b2a0220d651f56c07fbff69e12114fdb1d3c0650fc5fc6a4539ff1c279a0b4c24 SHA512 2e357dfcb6da669f1ab6e4f9aa3e8e3457ce0f794f40c9ac862a9f24208b4f4d773dbafffd97fd1f7e5b2a29e1ca99be787101469384a9e61b4ddb077b644211
 DIST certbot-0.38.0.tar.gz 1328474 BLAKE2B 6ea7c6b5d1840ec9d42509859d0f36f3ac3c4e588149e54fd74f8799a414b43c4d182b47e051a96436c9cdac135999d7e2a25424be680a819d50de64bb85b198 SHA512 832ac36c5b13e9764c9aab40856af7b909b630f34b1fe1e42dbf847357b28b2a130df480f1cb543dad0db781a843a79a310eba7b1097370e267d01431c21ee29
-EBUILD certbot-apache-0.36.0.ebuild 1078 BLAKE2B 343724712d023a476aadeec34ee957e3f9b0e4014731534fba8969c1f1994690d729f2546f52b94241974b74baa8bce4ae26a395f5ab3b32eb55d8dc942c5b63 SHA512 882e967cdf08915c31091b2cccbf2344c15050a95c3624e33d6e3cfd41baefa1c202c43e7e0e8c800cfc2eb298f3b7fa2bf06ee2d83f915ed88e5d578f096af6
+DIST certbot-0.39.0.tar.gz 1350312 BLAKE2B 5f21c45d25754cb1ed0ad92e8d03637928a274637de09903509c7e78c40fd197e95cfa1f3effecef938d6ab8369dc6811714ddb5a93a806048e0998d1032e4f9 SHA512 17ab17a5f74e3fba58b1a8b9afe0c3656c7b2a5ea3585edb05ad84e36250c6a8d4d28bd692bc97d033c95eb0bbeff4eb84981ae0006e36d55846cd38373b86a0
 EBUILD certbot-apache-0.37.2.ebuild 1078 BLAKE2B 343724712d023a476aadeec34ee957e3f9b0e4014731534fba8969c1f1994690d729f2546f52b94241974b74baa8bce4ae26a395f5ab3b32eb55d8dc942c5b63 SHA512 882e967cdf08915c31091b2cccbf2344c15050a95c3624e33d6e3cfd41baefa1c202c43e7e0e8c800cfc2eb298f3b7fa2bf06ee2d83f915ed88e5d578f096af6
-EBUILD certbot-apache-0.38.0.ebuild 1080 BLAKE2B d619b7b78385f52863109318365b53a5787e5c2c64bbd26cbbd735f81971b6703fd8c0367bae1d55d44f9f6782157ade26aa19d5643f078b1146d0c0f67576d7 SHA512 b158899197ccc0e9c145f90f92fa4f48ca71c2781fece4185ae1dbd01f943dd75ab3a05ef58f83558c3da7108364af094eed6d008945f9c011b80357d2d8b741
-EBUILD certbot-apache-9999.ebuild 1080 BLAKE2B d619b7b78385f52863109318365b53a5787e5c2c64bbd26cbbd735f81971b6703fd8c0367bae1d55d44f9f6782157ade26aa19d5643f078b1146d0c0f67576d7 SHA512 b158899197ccc0e9c145f90f92fa4f48ca71c2781fece4185ae1dbd01f943dd75ab3a05ef58f83558c3da7108364af094eed6d008945f9c011b80357d2d8b741
+EBUILD certbot-apache-0.38.0.ebuild 1078 BLAKE2B 343724712d023a476aadeec34ee957e3f9b0e4014731534fba8969c1f1994690d729f2546f52b94241974b74baa8bce4ae26a395f5ab3b32eb55d8dc942c5b63 SHA512 882e967cdf08915c31091b2cccbf2344c15050a95c3624e33d6e3cfd41baefa1c202c43e7e0e8c800cfc2eb298f3b7fa2bf06ee2d83f915ed88e5d578f096af6
+EBUILD certbot-apache-0.39.0.ebuild 1080 BLAKE2B 0c44f528c6481c0682f7bf3de0df8657b6cc00c2cdec83ab2d29ed8796f2adfa5353ab0b6191b61552bbf3a2c142e211b6ddac932e31b41ba39ac485877de00c SHA512 73a9dd1cedf2d150d37dd81797143ec9a96da411e6d15280779dbd7df4565e3d7623aa905b40e6779fd0a71aff7578357696dfa6184c108b74bcd1b48479aab2
+EBUILD certbot-apache-9999.ebuild 1080 BLAKE2B 0c44f528c6481c0682f7bf3de0df8657b6cc00c2cdec83ab2d29ed8796f2adfa5353ab0b6191b61552bbf3a2c142e211b6ddac932e31b41ba39ac485877de00c SHA512 73a9dd1cedf2d150d37dd81797143ec9a96da411e6d15280779dbd7df4565e3d7623aa905b40e6779fd0a71aff7578357696dfa6184c108b74bcd1b48479aab2
 MISC metadata.xml 334 BLAKE2B 4adbd04c0edcc84925da47b32fee63d4652bf2a1bf5222a56e0e1c7cfe8aaa34275a2652c4416f8a80de11fd88217d8626d610fa857f0615f18bfd773a279e55 SHA512 e3d6dda6c44557523fd48b464b6d39fc45b90ba2ecbe03fb300a655973c1b2e654a24d8d381b769eba00d0d80fb5881e1dfec1694e223cd83047abba9f01a44f
diff --git a/app-crypt/certbot-apache/certbot-apache-0.38.0.ebuild b/app-crypt/certbot-apache/certbot-apache-0.38.0.ebuild
index 5ac928afccf9..af3177274026 100644
--- a/app-crypt/certbot-apache/certbot-apache-0.38.0.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-0.38.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]]; then
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/${PN%-apache}/${PN%-apache}/archive/v${PV}.tar.gz -> ${PN%-apache}-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 	S=${WORKDIR}/${PN%-apache}-${PV}/${PN}
 fi
 
diff --git a/app-crypt/certbot-apache/certbot-apache-0.36.0.ebuild b/app-crypt/certbot-apache/certbot-apache-0.39.0.ebuild
index af3177274026..a90d0aa26db2 100644
--- a/app-crypt/certbot-apache/certbot-apache-0.36.0.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-0.39.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]]; then
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/${PN%-apache}/${PN%-apache}/archive/v${PV}.tar.gz -> ${PN%-apache}-${PV}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86"
+	KEYWORDS="~amd64 ~arm64 ~x86"
 	S=${WORKDIR}/${PN%-apache}-${PV}/${PN}
 fi
 
@@ -24,7 +24,7 @@ SLOT="0"
 IUSE="test"
 
 RDEPEND=">=app-crypt/acme-0.29.0[${PYTHON_USEDEP}]
-	>=app-crypt/certbot-0.36.0[${PYTHON_USEDEP}]
+	>=app-crypt/certbot-0.39.0[${PYTHON_USEDEP}]
 	dev-python/mock[${PYTHON_USEDEP}]
 	dev-python/python-augeas[${PYTHON_USEDEP}]
 	dev-python/zope-component[${PYTHON_USEDEP}]
diff --git a/app-crypt/certbot-apache/certbot-apache-9999.ebuild b/app-crypt/certbot-apache/certbot-apache-9999.ebuild
index 5ac928afccf9..a90d0aa26db2 100644
--- a/app-crypt/certbot-apache/certbot-apache-9999.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-9999.ebuild
@@ -24,7 +24,7 @@ SLOT="0"
 IUSE="test"
 
 RDEPEND=">=app-crypt/acme-0.29.0[${PYTHON_USEDEP}]
-	>=app-crypt/certbot-0.36.0[${PYTHON_USEDEP}]
+	>=app-crypt/certbot-0.39.0[${PYTHON_USEDEP}]
 	dev-python/mock[${PYTHON_USEDEP}]
 	dev-python/python-augeas[${PYTHON_USEDEP}]
 	dev-python/zope-component[${PYTHON_USEDEP}]
diff --git a/app-crypt/certbot-dns-nsone/Manifest b/app-crypt/certbot-dns-nsone/Manifest
new file mode 100644
index 000000000000..b6ea1b7793b1
--- /dev/null
+++ b/app-crypt/certbot-dns-nsone/Manifest
@@ -0,0 +1,3 @@
+DIST certbot-dns-nsone-0.39.0.tar.gz 1350312 BLAKE2B 5f21c45d25754cb1ed0ad92e8d03637928a274637de09903509c7e78c40fd197e95cfa1f3effecef938d6ab8369dc6811714ddb5a93a806048e0998d1032e4f9 SHA512 17ab17a5f74e3fba58b1a8b9afe0c3656c7b2a5ea3585edb05ad84e36250c6a8d4d28bd692bc97d033c95eb0bbeff4eb84981ae0006e36d55846cd38373b86a0
+EBUILD certbot-dns-nsone-0.39.0.ebuild 953 BLAKE2B 8b18e76a64e80647e5ec82307a6681cad3b476659b6dda4a82999472391cb2872437324dd5e72a45d01d686bbbd67165ee0b487af1e3f6c1b2dda35d7fd2d7a2 SHA512 190db40706f1363db8a91da68a69895c3f51f8b74c895e69071ba6d1b9e9cb03d72e27a60b6c51eb4799eabbc7d3047ae442cf0f05bd297219794946f7e74298
+MISC metadata.xml 253 BLAKE2B 7dac7f77dcc8de31f439cc6d7770a503f95be9c2f8ae57df9e725df941e2b31a90a43664a485a5fad9510b9ae060ba7aaaddba29324338dd9eb07d88a63c7dce SHA512 303268e1f46e337e32c64b544c0962ecbe8de1799c42736b3c3515b6f31954a655830c402317bd0534cac12059e17eeb5f360d010432dff795a136662a5c10f1
diff --git a/app-crypt/certbot-dns-nsone/certbot-dns-nsone-0.39.0.ebuild b/app-crypt/certbot-dns-nsone/certbot-dns-nsone-0.39.0.ebuild
new file mode 100644
index 000000000000..20526acadae5
--- /dev/null
+++ b/app-crypt/certbot-dns-nsone/certbot-dns-nsone-0.39.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+	inherit git-r3
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S=${WORKDIR}/certbot-${PV}/${PN}
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="NS1 DNS Authenticator plugin for Certbot (Let's Encrypt Client)"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+CDEPEND=">=dev-python/setuptools-1.0[${PYTHON_USEDEP}]"
+RDEPEND="${CDEPEND}
+	=app-crypt/certbot-${PV%.*}*[${PYTHON_USEDEP}]
+	=app-crypt/acme-${PV%.*}*[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]
+	dev-python/dns-lexicon[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}"
diff --git a/app-crypt/certbot-dns-nsone/metadata.xml b/app-crypt/certbot-dns-nsone/metadata.xml
new file mode 100644
index 000000000000..f3de5f693ed8
--- /dev/null
+++ b/app-crypt/certbot-dns-nsone/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>patrick@gentoo.org</email>
+    <name>Patrick Lauer</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-crypt/certbot-nginx/Manifest b/app-crypt/certbot-nginx/Manifest
index f80dd8f6f700..94f359b75841 100644
--- a/app-crypt/certbot-nginx/Manifest
+++ b/app-crypt/certbot-nginx/Manifest
@@ -1,8 +1,8 @@
-DIST certbot-0.36.0.tar.gz 1322339 BLAKE2B 69fbf68b5dd95d6d3ac6c868d583da8c66dfcd01e3471c511d0d9d95de08ac096479733e9fca12ca99abf43484835fa7184dcccb1c11a41ee7948174364f2894 SHA512 f7fa8c6200a76b4fc4830865bf11fbba8bd73ea55e1236680181073952505c83b4650b43ccfc8e9b96caf47b85c43e47acf8db6d92134f7c279ebd954ab0ac92
 DIST certbot-0.37.2.tar.gz 1327361 BLAKE2B 2f36276f527ffc29e54cf58f25051952e9435972a94881e420712844401fc86b2a0220d651f56c07fbff69e12114fdb1d3c0650fc5fc6a4539ff1c279a0b4c24 SHA512 2e357dfcb6da669f1ab6e4f9aa3e8e3457ce0f794f40c9ac862a9f24208b4f4d773dbafffd97fd1f7e5b2a29e1ca99be787101469384a9e61b4ddb077b644211
 DIST certbot-0.38.0.tar.gz 1328474 BLAKE2B 6ea7c6b5d1840ec9d42509859d0f36f3ac3c4e588149e54fd74f8799a414b43c4d182b47e051a96436c9cdac135999d7e2a25424be680a819d50de64bb85b198 SHA512 832ac36c5b13e9764c9aab40856af7b909b630f34b1fe1e42dbf847357b28b2a130df480f1cb543dad0db781a843a79a310eba7b1097370e267d01431c21ee29
-EBUILD certbot-nginx-0.36.0.ebuild 1012 BLAKE2B 8864a6365c3f686de1965966f66b96adf3b23cef9020f52e5b207e70b25c54e966cab2175904143a353788d1cddd875b9d4bdf53f2b0e599283a6dad1e4bfafa SHA512 44b9b9b2786e8d3aef042961130897d6d18b20d0975e65ae8f4e765ba52dbc3fe9045cf4c8dfe52a807e2932794862593e94c35e1e5c6e18b377bad3727c5756
+DIST certbot-0.39.0.tar.gz 1350312 BLAKE2B 5f21c45d25754cb1ed0ad92e8d03637928a274637de09903509c7e78c40fd197e95cfa1f3effecef938d6ab8369dc6811714ddb5a93a806048e0998d1032e4f9 SHA512 17ab17a5f74e3fba58b1a8b9afe0c3656c7b2a5ea3585edb05ad84e36250c6a8d4d28bd692bc97d033c95eb0bbeff4eb84981ae0006e36d55846cd38373b86a0
 EBUILD certbot-nginx-0.37.2.ebuild 1012 BLAKE2B 8864a6365c3f686de1965966f66b96adf3b23cef9020f52e5b207e70b25c54e966cab2175904143a353788d1cddd875b9d4bdf53f2b0e599283a6dad1e4bfafa SHA512 44b9b9b2786e8d3aef042961130897d6d18b20d0975e65ae8f4e765ba52dbc3fe9045cf4c8dfe52a807e2932794862593e94c35e1e5c6e18b377bad3727c5756
-EBUILD certbot-nginx-0.38.0.ebuild 1014 BLAKE2B c424ab9e7f11ad23e128e0a9876359ebdea32746a810380e17acd108bec3920b3ed8b48992446b0a1a4bf704f8dd07e20006fcdb7ca26338bdee85b0ac1676b2 SHA512 ebeb6165a82c28105a65032c47ef92999df3aae3aa75bb9374405f58918743f983802ac8b62945eb2c93b3183a7065f36bdebd1d50ebbb94ef4a7ebca9ea1e63
+EBUILD certbot-nginx-0.38.0.ebuild 1012 BLAKE2B 8864a6365c3f686de1965966f66b96adf3b23cef9020f52e5b207e70b25c54e966cab2175904143a353788d1cddd875b9d4bdf53f2b0e599283a6dad1e4bfafa SHA512 44b9b9b2786e8d3aef042961130897d6d18b20d0975e65ae8f4e765ba52dbc3fe9045cf4c8dfe52a807e2932794862593e94c35e1e5c6e18b377bad3727c5756
+EBUILD certbot-nginx-0.39.0.ebuild 1014 BLAKE2B c424ab9e7f11ad23e128e0a9876359ebdea32746a810380e17acd108bec3920b3ed8b48992446b0a1a4bf704f8dd07e20006fcdb7ca26338bdee85b0ac1676b2 SHA512 ebeb6165a82c28105a65032c47ef92999df3aae3aa75bb9374405f58918743f983802ac8b62945eb2c93b3183a7065f36bdebd1d50ebbb94ef4a7ebca9ea1e63
 EBUILD certbot-nginx-9999.ebuild 1014 BLAKE2B c424ab9e7f11ad23e128e0a9876359ebdea32746a810380e17acd108bec3920b3ed8b48992446b0a1a4bf704f8dd07e20006fcdb7ca26338bdee85b0ac1676b2 SHA512 ebeb6165a82c28105a65032c47ef92999df3aae3aa75bb9374405f58918743f983802ac8b62945eb2c93b3183a7065f36bdebd1d50ebbb94ef4a7ebca9ea1e63
 MISC metadata.xml 334 BLAKE2B 4adbd04c0edcc84925da47b32fee63d4652bf2a1bf5222a56e0e1c7cfe8aaa34275a2652c4416f8a80de11fd88217d8626d610fa857f0615f18bfd773a279e55 SHA512 e3d6dda6c44557523fd48b464b6d39fc45b90ba2ecbe03fb300a655973c1b2e654a24d8d381b769eba00d0d80fb5881e1dfec1694e223cd83047abba9f01a44f
diff --git a/app-crypt/certbot-nginx/certbot-nginx-0.38.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-0.38.0.ebuild
index c4f2df8684e9..73497ec2cbd3 100644
--- a/app-crypt/certbot-nginx/certbot-nginx-0.38.0.ebuild
+++ b/app-crypt/certbot-nginx/certbot-nginx-0.38.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]]; then
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/${PN%-nginx}/${PN%-nginx}/archive/v${PV}.tar.gz -> ${PN%-nginx}-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 	S=${WORKDIR}/${PN%-nginx}-${PV}/${PN}
 fi
 
diff --git a/app-crypt/certbot-nginx/certbot-nginx-0.36.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-0.39.0.ebuild
index 73497ec2cbd3..c4f2df8684e9 100644
--- a/app-crypt/certbot-nginx/certbot-nginx-0.36.0.ebuild
+++ b/app-crypt/certbot-nginx/certbot-nginx-0.39.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]]; then
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/${PN%-nginx}/${PN%-nginx}/archive/v${PV}.tar.gz -> ${PN%-nginx}-${PV}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 	S=${WORKDIR}/${PN%-nginx}-${PV}/${PN}
 fi
 
diff --git a/app-crypt/certbot/Manifest b/app-crypt/certbot/Manifest
index 32a57cd5299d..95d787ce6a3d 100644
--- a/app-crypt/certbot/Manifest
+++ b/app-crypt/certbot/Manifest
@@ -1,8 +1,8 @@
-DIST certbot-0.36.0.tar.gz 1322339 BLAKE2B 69fbf68b5dd95d6d3ac6c868d583da8c66dfcd01e3471c511d0d9d95de08ac096479733e9fca12ca99abf43484835fa7184dcccb1c11a41ee7948174364f2894 SHA512 f7fa8c6200a76b4fc4830865bf11fbba8bd73ea55e1236680181073952505c83b4650b43ccfc8e9b96caf47b85c43e47acf8db6d92134f7c279ebd954ab0ac92
 DIST certbot-0.37.0.tar.gz 1327246 BLAKE2B 917360ab6d9dedd6e5ea2c558822c228ff34617f97341b7d176e69f7589a3aa3012f1d9abdb33b72960c68a80b29987d1a7b1121eadd7d93adec5829b316f326 SHA512 3f2df5f591ba241719fe2e5e90c2b87e2d932d991d943eefbe00b9d76f7fb056d3b6026879511f591473c698b798e78645879f018a78e503b8a06280b036cb35
 DIST certbot-0.38.0.tar.gz 1328474 BLAKE2B 6ea7c6b5d1840ec9d42509859d0f36f3ac3c4e588149e54fd74f8799a414b43c4d182b47e051a96436c9cdac135999d7e2a25424be680a819d50de64bb85b198 SHA512 832ac36c5b13e9764c9aab40856af7b909b630f34b1fe1e42dbf847357b28b2a130df480f1cb543dad0db781a843a79a310eba7b1097370e267d01431c21ee29
-EBUILD certbot-0.36.0.ebuild 1364 BLAKE2B ab2063ceac5ae1024f2b8ac83c01825fa230f8f34aa1d75f56543e699493b8db8b6baad88c465530c649d80cafec64037333c97c18ebf5ef69012178ee33e1ff SHA512 2cf17f2e0506c4e34db9aa2174fd222d3d74f3bd40f35d2e3ee9c40f8e51e610f850d89535eaf1c24be07ad9619e1671fa46eaa3da88feb43273eaf97b814b16
+DIST certbot-0.39.0.tar.gz 1350312 BLAKE2B 5f21c45d25754cb1ed0ad92e8d03637928a274637de09903509c7e78c40fd197e95cfa1f3effecef938d6ab8369dc6811714ddb5a93a806048e0998d1032e4f9 SHA512 17ab17a5f74e3fba58b1a8b9afe0c3656c7b2a5ea3585edb05ad84e36250c6a8d4d28bd692bc97d033c95eb0bbeff4eb84981ae0006e36d55846cd38373b86a0
 EBUILD certbot-0.37.0.ebuild 1364 BLAKE2B ab2063ceac5ae1024f2b8ac83c01825fa230f8f34aa1d75f56543e699493b8db8b6baad88c465530c649d80cafec64037333c97c18ebf5ef69012178ee33e1ff SHA512 2cf17f2e0506c4e34db9aa2174fd222d3d74f3bd40f35d2e3ee9c40f8e51e610f850d89535eaf1c24be07ad9619e1671fa46eaa3da88feb43273eaf97b814b16
-EBUILD certbot-0.38.0.ebuild 1411 BLAKE2B 11eb25aedac65f87fa9de601afa3e6d74791ea657e5b766f6345f0d128555f3899b22cc5dcac09b1dbdf1bf4eb213139522bf16ea750eec6f157ff3725c15901 SHA512 60bf2b405388dcf6d1bbb752b02428da55350d32c2963ebf1002364e13877c4d7a529917b9b47a6cbc2f27ab528e45c96b797011d673032518a5e2c1a67e2530
+EBUILD certbot-0.38.0.ebuild 1409 BLAKE2B 898f091d39092bbc439535beb4ca5779b63ebe66a1e6490e941b5efb5a2185718d870c24f4365a76f91eab363ce9687028df95acfd2d2d5f0b3e4c7da456ff69 SHA512 9e8f33e0b9c8fc8ca32ce08a52e623aa6a9346eadf81b421a187d51235dd11f2b9d5e1564609371fe937020110c4c2a6ba82eda8cff287d39f99acf34012cc90
+EBUILD certbot-0.39.0.ebuild 1411 BLAKE2B 11eb25aedac65f87fa9de601afa3e6d74791ea657e5b766f6345f0d128555f3899b22cc5dcac09b1dbdf1bf4eb213139522bf16ea750eec6f157ff3725c15901 SHA512 60bf2b405388dcf6d1bbb752b02428da55350d32c2963ebf1002364e13877c4d7a529917b9b47a6cbc2f27ab528e45c96b797011d673032518a5e2c1a67e2530
 EBUILD certbot-9999.ebuild 1411 BLAKE2B 11eb25aedac65f87fa9de601afa3e6d74791ea657e5b766f6345f0d128555f3899b22cc5dcac09b1dbdf1bf4eb213139522bf16ea750eec6f157ff3725c15901 SHA512 60bf2b405388dcf6d1bbb752b02428da55350d32c2963ebf1002364e13877c4d7a529917b9b47a6cbc2f27ab528e45c96b797011d673032518a5e2c1a67e2530
 MISC metadata.xml 334 BLAKE2B e7b28e7d3e7c6fdce0c5120b29fbf5aa607408e2add6c0ad42e921fb1add9def38c6cb191129a5a6e1f0e3ea119caa6cdc74955b572e5d2c6f854d0b7c7c521a SHA512 a24ccf633fc9c2670dcd35801d95bd8ca0f4ea4d3d53b6651f2e8e3e280b95ec8a464d99f5423942c14b0777ae4551f46c1ff285caea460bc91cbc417a7a5b70
diff --git a/app-crypt/certbot/certbot-0.38.0.ebuild b/app-crypt/certbot/certbot-0.38.0.ebuild
index 0e7b7afdc975..fc61e30313d3 100644
--- a/app-crypt/certbot/certbot-0.38.0.ebuild
+++ b/app-crypt/certbot/certbot-0.38.0.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 fi
 
 inherit distutils-r1
diff --git a/app-crypt/certbot/certbot-0.36.0.ebuild b/app-crypt/certbot/certbot-0.39.0.ebuild
index 4ed99381a016..0e7b7afdc975 100644
--- a/app-crypt/certbot/certbot-0.36.0.ebuild
+++ b/app-crypt/certbot/certbot-0.39.0.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 fi
 
 inherit distutils-r1
@@ -28,6 +28,7 @@ RDEPEND="
 	>=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
 	dev-python/configobj[${PYTHON_USEDEP}]
 	>=dev-python/cryptography-1.2.3[${PYTHON_USEDEP}]
+	>=dev-python/distro-1.0.1[${PYTHON_USEDEP}]
 	>=dev-python/josepy-1.1.0[${PYTHON_USEDEP}]
 	dev-python/mock[${PYTHON_USEDEP}]
 	>=dev-python/parsedatetime-1.3[${PYTHON_USEDEP}]
diff --git a/app-crypt/eid-mw/Manifest b/app-crypt/eid-mw/Manifest
index d5342a938fb6..26f90c17b5c4 100644
--- a/app-crypt/eid-mw/Manifest
+++ b/app-crypt/eid-mw/Manifest
@@ -1,7 +1,9 @@
 AUX eid-sign-test-4.4.19.patch 8320 BLAKE2B c2295a64a5353f79ea44703b7256f667b5c6dc21eb74b0cfb6945572d0323d751ca8104ae981ae83759267081b6a16509cde3e8f5ad35b1a6613855461880c18 SHA512 01efa77441982a631e717a1bf720155bd38144cbe9e5b9cc192bdfa7ea3966b787e31a25a7e3c7d560fec30b19edeb662f6ab1db2d68b0a5b996af3c91342ec4
 DIST eid-mw-4.4.1.tar.gz 7708697 BLAKE2B 7bdbaa37af1cdd5a8abd1519939f663c7c871cea49850932d97c391465de362885b061c024285ab2690473a4bb1ba57a70fdc12a720246b2a610ac9525f6395e SHA512 9de54858ac052eeff101070dd11c5cf60ab1d29b8dc8d946680745acf9aa6ba1044ca5451eca6066b5b467fbc32a2a23bbe7e8551ca7559e6003a4097a304cfc
 DIST eid-mw-4.4.19.tar.gz 7941144 BLAKE2B c02f975081eacf7803839461ae91e3c6a24c3e2fc60064a981cc71f629925679b0df997e8acbe2da2f1e58dcc665b8633e3c9bf28b07be90ac8cdd0448e80848 SHA512 21530111461302123be662dd60f3fbd56ffd8a0537cac88c99d5a6bcd9163a27bc34e05beaf7502dd5ada247ca324d21590a866907b5a7a02ce3d8d78fcac634
+DIST eid-mw-4.4.23.tar.gz 7502185 BLAKE2B ab223c2d860f44806a6043a40891d89ab3418dd232bba1d60bd9b0b6871a77e6e24bc73c49afcffabc8ae7f16c235aabfb17efb8af7543b0e2bd3fe76ba655f7 SHA512 7c90d7ca08dcd2ba4d0c918b5ba6305da6107de457209acb9a0cc3243891c9b654b1c12fe4da53ec8bad65617198c0caffdb0482e343a8d807f00762e6672310
 EBUILD eid-mw-4.4.1.ebuild 2106 BLAKE2B 07d74477ca6ff373abf1168f520dd33179984691ab192fedff4d9370a68addc4990dc7172be8b1e6d8813da8089c534ed8c577daedd0aa7d2bfae6011f8e0f2d SHA512 a86805eed173ea10bb088d2374f134d9841257c2a51d5ffb51c0316811e62794243129965bb1ed46bc45419826e6ae1c4781cc8a9addf62e98f5411bf4cdde3e
 EBUILD eid-mw-4.4.19.ebuild 2433 BLAKE2B 07aa37e8d8d8abd22d8d46c1efbdd908e8cd76452b2d7fa50765d22326ddffcd140c02614db5469547fd81e8efe6f3fca4df681148a8d09a799f7ffb46db221d SHA512 b809f8d26a9357e848b5e59e10dd2aa9a07fdf2b410f1fc4ad4f4c8f232c996977c37ac68151434f44037bfe4230b67507dca8fae39ad219fb4f565d044cfd75
+EBUILD eid-mw-4.4.23.ebuild 2434 BLAKE2B f4fe30f8854caa026e9d7dbdc23c84d8f9868df3565843d33f254c7649f4a1a0398aed2064125df93923e651fc1beef1e9a7099d001ab101e6ceccf51f8b175a SHA512 0c93cab093e663d3eb3cdf65562bade29fd3e8a873243d0c81224afb11054469d7cce2be6814eff8eb29cccd4186fad9425921542c2abbe339b43da7b5d1ee8a
 EBUILD eid-mw-9999.ebuild 1832 BLAKE2B c6c9b0de69514b1d036e8e3566e8ecbcfdd6426bcc55bdbcfce15de389dca83d65a0cf50d3e9eb5b35fca7114e02e13cf3bfd3139e46298874ea5b872248b007 SHA512 1c4383bb1764fe4f8dbeabad9be447d682e2ee08e8174a7d7aa4a978c1243048cfcae54dc0d7b45e6acaa415b52cde1199aee6f94f5b9ef1f790f632dfbc28ee
 MISC metadata.xml 1445 BLAKE2B f402be7a768b67e34a736cdfaafc0df9f29301ba2d4b50f4ff27b9b08085826a67e452bb239893ef79d10eebb8981488cc71ca7f7015152783ad939e64df6d85 SHA512 b3934c2c2be9adc2f4d4d8ab654b8b21056bcbf29a67751ead9c8f1be4339a651a6d315c6ee1c182c3e8a32ad630c73f0990bd4fce4d34afa948055f0447ea98
diff --git a/app-crypt/eid-mw/eid-mw-4.4.23.ebuild b/app-crypt/eid-mw/eid-mw-4.4.23.ebuild
new file mode 100644
index 000000000000..95d518b2d3f6
--- /dev/null
+++ b/app-crypt/eid-mw/eid-mw-4.4.23.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools desktop gnome2-utils xdg-utils
+
+DESCRIPTION="Electronic Identity Card middleware supplied by the Belgian Federal Government"
+HOMEPAGE="https://eid.belgium.be"
+SRC_URI="https://codeload.github.com/fedict/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+dialogs +gtk +p11v220 p11-kit"
+
+RDEPEND=">=sys-apps/pcsc-lite-1.2.9
+	gtk? (
+		x11-libs/gdk-pixbuf[jpeg]
+		x11-libs/gtk+:*
+		dev-libs/libxml2
+		net-misc/curl[ssl]
+		net-libs/libproxy
+		!app-misc/eid-viewer-bin
+	)
+	p11-kit? ( app-crypt/p11-kit )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+REQUIRED_USE="dialogs? ( gtk )"
+
+src_prepare() {
+	default
+
+	sed -i -e 's:/beid/rsaref220:/rsaref220:' configure.ac || die
+	sed -i -e 's:/beid::' cardcomm/pkcs11/src/libbeidpkcs11.pc.in || die
+
+	# Buggy internal versioning when autoreconf a tarball release.
+	# Weird numbering is required otherwise we get a seg fault in
+	# about-eid-mw program.
+	echo "${PV}-v${PV}" > .version
+	sed -i \
+		-e '/^GITDESC/ d' \
+		-e '/^VERCLEAN/ d' \
+		scripts/build-aux/genver.sh
+
+	# legacy xpi module : we don't want it anymore
+	sed -i -e '/SUBDIRS/ s:plugins_tools/xpi ::' Makefile.am || die
+	sed -i -e '/plugins_tools\/xpi/ d' configure.ac || die
+
+	# hardcoded lsb_info
+	sed -i \
+		-e "s:get_lsb_info('i'):strdup(_(\"Gentoo\")):" \
+		-e "s:get_lsb_info('r'):strdup(_(\"n/a\")):" \
+		-e "s:get_lsb_info('c'):strdup(_(\"n/a\")):" \
+		plugins_tools/aboutmw/gtk/about-main.c || die
+
+	# Fix libdir for pkcs11_manifestdir
+	sed -i \
+		-e "/pkcs11_manifestdir/ s:prefix)/lib:libdir):" \
+		cardcomm/pkcs11/src/Makefile.am || die
+
+	# See bug #691308
+	eapply "${FILESDIR}/eid-sign-test-4.4.19.patch"
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable dialogs) \
+		$(use_enable p11v220) \
+		$(use_enable p11-kit p11kit) \
+		$(use_with gtk gtkvers 'detect') \
+		--with-gnu-ld \
+		--disable-static
+}
+
+src_install() {
+	default
+	rm -r "${ED}"/usr/$(get_libdir)/*.la || die
+	if use gtk; then
+		domenu plugins_tools/eid-viewer/eid-viewer.desktop
+		doicon plugins_tools/eid-viewer/gtk/eid-viewer.png
+	fi
+}
+
+pkg_postinst(){
+	if use gtk; then
+		gnome2_schemas_update
+		xdg_desktop_database_update
+		xdg_icon_cache_update
+	fi
+}
+
+pkg_postrm(){
+	if use gtk; then
+		gnome2_schemas_update
+		xdg_desktop_database_update
+		xdg_icon_cache_update
+	fi
+}
diff --git a/app-crypt/gcr/Manifest b/app-crypt/gcr/Manifest
index cdd2e9ab4f7a..9e17acad7093 100644
--- a/app-crypt/gcr/Manifest
+++ b/app-crypt/gcr/Manifest
@@ -1,7 +1,7 @@
 DIST gcr-3.20.0.tar.xz 1324216 BLAKE2B dca283d1bde4994ee60666b2d5fdc4f0861df453355dcf20cea22a87808da0b9284506460ecdfe779ab9ecdf4ce17e231bd1d9426d677511684c35e43da19550 SHA512 0acd0fb085a38507b1cc895ac773f91c6f4e14d2ea7e27b8e74c85ef78426597b6ea08ebee696452b0651939ec4a0d8a4a2523c41b3a8a0bd1b0d7b338b1d9c7
 DIST gcr-3.28.0.tar.xz 1329044 BLAKE2B b35bca9b62605c4e0c3d71604ea5e6b7cdd97bb3257aabb26b8834622abdeec29798429b84f88254a1f8b04894f5cac2ef63c2a0bfd47ad32761d8d73cd0b189 SHA512 8d5e650cb369fa889b0adfdc1dc1cb5f8b184881256e6c0a2ed456074a54ceb61d64c0929c093bec66c0d5a15c1718f6e3736a1b25b6d7076081df93b49419e0
 DIST gcr-3.28.1.tar.xz 1334896 BLAKE2B e7035dd0ac5ef9e9b0898e3e4512768ec7cb548cf0ec4ace5a4f0f9a63d3015f8a041bc6f0a0c990c1666eb92c047eab4c19338a8ccf2d8aa9b11830dbd9d5c5 SHA512 ae36c39584d6bc2ba9d86de8bc71eac21fb3251b966ab1eddf467d01ed5789ba6e6597c83ea2ed9403e632893e7c7cb6c17e04878d726b72528af9199bebb3da
-EBUILD gcr-3.20.0.ebuild 1851 BLAKE2B 532e60ee150d6886ea24abda75d29b90acc66f7e055e5941a8c53293dc5491e3850729bc68b8a9f7d5658e0a2b5dd97dc3c0e1a75418fdbf132e0c6b4dbbde29 SHA512 f0c952bff3d6f66c8d75a0671cd886ac0611bd60f7b8a3b29dc71798d545baee9f2e2842ac76a87e34acb05fb200a472fc3bf58d4c0201e5fbaf60bb96efcbbe
-EBUILD gcr-3.28.0.ebuild 1892 BLAKE2B 4dbe4a19c0da7470fe68daa6191e1469fbc192dfd122dc2581340ab54e795289fe8d8ace674d159c851dd0da00fe544587a189c64ad7d50345f4a4b0245b4597 SHA512 c9d40cbf32c1570a9b152a26db32dcf1888945713fdefb3c0bc46add3c5e04d0bf7f4ac62a38e673265380d04b8a7428f511560390c0f756bab44abfaf989fb6
-EBUILD gcr-3.28.1.ebuild 1894 BLAKE2B 5e0d5858ec93f87c09ba96f2b03722f7e0c9fa8de7e20cdae70ff4f75bb0d881669edef76e3e765d917297e1b08aead235dd9a59f52e502535053e2a27a13939 SHA512 1897363a57505094e306dfc726aa925edcbb082730000a5579218270bba1af0adf7139ce7abd4c4a992bc64cb1acdd39a3ac567c72c44013bfbf9c6982ca302a
+EBUILD gcr-3.20.0.ebuild 1829 BLAKE2B 4cdb4fb25af92ac581d523cb513f4e9f3ad0093e3a76f1aad302c2acf0ca504124844ff74e12cdd6e09033f773dbc73e9a6aac584372e7fc77f8539b191a947a SHA512 2600a29a8235220a14fbfaa97253d9aa879edfcb0551095e2b45aca4879d8ade80bdf7f3dbc6ec1d05fd41b5f287b885a01de88cd55104f01722dacc37db4a1c
+EBUILD gcr-3.28.0.ebuild 1870 BLAKE2B dc9b961d72d84d62909e0b5f6daeef8520dc988d809754e27d9fc647ad15df51201627251a8c5e8ad08084eef23e7491889c5c96d70a80679cc1cdb0496dfeaa SHA512 879eef0405ec069d112152c8a7c2b8c202e81a973869f6ea49589f0a7c51c9c058087b1c060575638485dd9361fdad2aebe5c7e5b71c05d82b39de5b673ca347
+EBUILD gcr-3.28.1.ebuild 1871 BLAKE2B 3e7aa573f3ae68dcb674a7c958b5c32ec1997f31e085e244e1c2ac884d1d4877ddbd652f9a9c961e559c82c7a4dc16e4d576bd20593bda9be08723e806e8a316 SHA512 a679c598da68adb6779040719baab11643acfb7b51b912a0bead6f75d1367c47e797903e502756952589fdef0b1a1361d80adce39dd7e6b2a35dbd0d658b2c0d
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-crypt/gcr/gcr-3.20.0.ebuild b/app-crypt/gcr/gcr-3.20.0.ebuild
index 1bf7ad512db0..c92d9cee4eb7 100644
--- a/app-crypt/gcr/gcr-3.20.0.ebuild
+++ b/app-crypt/gcr/gcr-3.20.0.ebuild
@@ -16,7 +16,7 @@ SLOT="0/1" # subslot = suffix of libgcr-3
 IUSE="debug gtk +introspection vala"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 
 COMMON_DEPEND="
 	>=app-crypt/p11-kit-0.19
diff --git a/app-crypt/gcr/gcr-3.28.0.ebuild b/app-crypt/gcr/gcr-3.28.0.ebuild
index 31ae7001059f..87349d2c1600 100644
--- a/app-crypt/gcr/gcr-3.28.0.ebuild
+++ b/app-crypt/gcr/gcr-3.28.0.ebuild
@@ -16,7 +16,7 @@ SLOT="0/1" # subslot = suffix of libgcr-3
 IUSE="debug gtk +introspection vala"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 
 COMMON_DEPEND="
 	>=app-crypt/p11-kit-0.19
diff --git a/app-crypt/gcr/gcr-3.28.1.ebuild b/app-crypt/gcr/gcr-3.28.1.ebuild
index 6350c06896f0..425748137ff2 100644
--- a/app-crypt/gcr/gcr-3.28.1.ebuild
+++ b/app-crypt/gcr/gcr-3.28.1.ebuild
@@ -16,7 +16,7 @@ SLOT="0/1" # subslot = suffix of libgcr-3
 IUSE="debug gtk +introspection +vala"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 
 COMMON_DEPEND="
 	>=app-crypt/p11-kit-0.19
diff --git a/app-crypt/gentoo-keys/Manifest b/app-crypt/gentoo-keys/Manifest
index f01155c45536..e0940182e5b5 100644
--- a/app-crypt/gentoo-keys/Manifest
+++ b/app-crypt/gentoo-keys/Manifest
@@ -1,3 +1,3 @@
 DIST gentoo-keys-201901130136.tar.xz 57124 BLAKE2B 93963930743ec3b6497b90de7080c5796af90601b311a0ad1d0049f945ae63e384526c3858bb1b209e2ddcf26a862f6ea3b474fc69ed4a22f1ec5c2be4ae952f SHA512 2c87a85d2c5e2c51af8f64183a0cc4d372dd84af9aa3d7e92ae0d9dc804c5109c0c7121419503213eba3fcb8f7fa81ccaf0550418991f8d6b4b43560e02f777b
-EBUILD gentoo-keys-201901130136.ebuild 567 BLAKE2B c90d1fd0d812cb133ab20346bbcb6d9a7a5d5d24771103d45679536194e10c90a086d00b2aec97f15cc551c8e601018194315b20aaae596c9acc7c57f1fb0669 SHA512 80a7dc3ccb6a574a9667946cc2cc18e5efebad1baff88e7df4a6005cc465d5a82c218a3fedf19f15f388bf8a0ce3e6e277a7a680c2cd1ba819fd977b49dd4731
+EBUILD gentoo-keys-201901130136.ebuild 547 BLAKE2B 7e28f281231bcb12608fdc6dde5f71e3a674177862e8a48c21b78351c6927a252d05bde35b83c1575d200f7221f4e8e1b74b4c44a26c49f3bec2e8fc03a1693b SHA512 a9d1b6eba08cac0c7037406ee1b7d0a3273157505f2317907f5b261987af5b91f67a1b364a58f58291d5ea821b651fc74db54ddc31399763c41874c0acfe0829
 MISC metadata.xml 257 BLAKE2B cf62bcaddae6a9a234fa866aa93f3f8435bc640ded3947993321f8a85e622a2cc0d3df0290bec76b227a4286544314e6a31dc37026482541b4922d6dc11d174a SHA512 62e56bca988936416042bb794e7c8dad9930a46c1f81f51c60a22f3f43e2d0babaacdbef430a6f8ecc8ea7d949effa6136b6d066dabb0a80fde55c36ea3c080c
diff --git a/app-crypt/gentoo-keys/gentoo-keys-201901130136.ebuild b/app-crypt/gentoo-keys/gentoo-keys-201901130136.ebuild
index 809236ea9287..2cf315439b75 100644
--- a/app-crypt/gentoo-keys/gentoo-keys-201901130136.ebuild
+++ b/app-crypt/gentoo-keys/gentoo-keys-201901130136.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dev.gentoo.org/~dolsen/releases/keyrings/${P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 x64-cygwin amd64-fbsd x86-fbsd amd64-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 x64-cygwin amd64-linux"
 
 S="${WORKDIR}"
 
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index 23706c339074..569b4f9e2fdb 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -1,5 +1,5 @@
 AUX gnupg-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch 1048 BLAKE2B 36f37b74da309100191f4d8f9c27d08a1b00d2d30fbaf169dbb74ebbe42293357a4fb62332e286fe5725dcfdc30645a602dc2a51c51924b06215b68fd5235658 SHA512 fd12827150e96cd7979ea9611d64ed4ab9e6c61cfecdd697b8fb4d162f20985b734c2bfc365a921809b9029e86a85a9b36c10ec472b3dd49c25ea18f5aef56ce
 AUX gnupg-2.2.14-quiet-sending.patch 1225 BLAKE2B 3165d5b8242a0bad7913881dfac66433bcea9f5d97a58f43999166ce682671060a934ea1618fd90c7b892b4f3565ae0c3e57ad2f8f7b200a52145452d56ad8bc SHA512 f61f029ac72626e0c7d3bf29d483fd313ba723ae47bd7659b4fa72252ec9b5f329510d37ae92c41dd7dd45a3b99e846ae3d83a7bb37825e95e6d10f29b131853
 DIST gnupg-2.2.17.tar.bz2 6717554 BLAKE2B ad052a0d1e970fe7748563a0ffa105d427e3d9299237f15ce93aa47b676cc1fbf0691cf2112dd5b55ba5fc9d2a6988f999415dd5026d44c5cb4bfef9f99189cd SHA512 a3cd094addac62b4b4ec1683005a2bec761ea2aacf6daf904316b1819f4f6a41f256a8d9452cf28cad71b3e68228465baa27ae0eb1fa734fa91542ef0f159c5d
-EBUILD gnupg-2.2.17.ebuild 4548 BLAKE2B 143d02639279e1d16c544e660aa17f1b28ae157d0ea8224e55002c89c1c7b607f4eb3dba2a81f479f985e2a4672436ae7dff77903474d2fb62c9232879ae277e SHA512 67352dd85c666ee2256ec9a324a9d385fdb4afa7d746e93002445c9cc199e2670077ca4244529bf97d70fa14d8b133f81cea3e569af07beb97fe6d1b97434e43
+EBUILD gnupg-2.2.17.ebuild 4526 BLAKE2B 5d8955d5d61bca911b9a98f68d2116837eebc647e95c43bccdc818a0a7cadaa1eed3ec8ced1088e6f58ff5395d0a5a848dbb1cdbacc939054e717db6618aa9bf SHA512 bb6fa0405728540c99d57b4e8287c6b7e8cb785536e348641ed146eacbe8c27600a8e37db9150e888f7ce9580445c1fbd731132f02545d60973b5c3d0a8c4c76
 MISC metadata.xml 1313 BLAKE2B 3e9b3fbc3decac1676bda2b09c822ddd723d4e08fd9d63196a7f0c46fe4275a06cd8b87815e1781fc999747ff0da9eb1823db81a0b5dada5482519e2f4c925fb SHA512 d03cfc1b7b44948a594bc2df9c5f79d250dd7601f4579f832f0ac3814b640e399b3f428737a16e7098772b4ae2dee157b6958b612aae2b59c21397e99a5d9aaa
diff --git a/app-crypt/gnupg/gnupg-2.2.17.ebuild b/app-crypt/gnupg/gnupg-2.2.17.ebuild
index f7806268df02..b55bb14f0e29 100644
--- a/app-crypt/gnupg/gnupg-2.2.17.ebuild
+++ b/app-crypt/gnupg/gnupg-2.2.17.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
 
 LICENSE="GPL-3"
 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 ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl tofu tools usb user-socket wks-server"
 
 # Existence of executables is checked during configuration.
diff --git a/app-crypt/gpgme/Manifest b/app-crypt/gpgme/Manifest
index 018da46e47a6..7dff6d360891 100644
--- a/app-crypt/gpgme/Manifest
+++ b/app-crypt/gpgme/Manifest
@@ -1,6 +1,6 @@
 DIST gpgme-1.13.0.tar.bz2 1820504 BLAKE2B 71fbb034e3c5939d1953554ccbe0e89e2089c53a4c79e90ee51bdf96500bf4be8a5e1633772ab8dadd44616dde7be551ad7d3af0a59d7e1df10a19cd9cf56baa SHA512 47a7a67dcc6d111cddd805d288d42e870948114a6dc09ce0675ad8b3d1580bbc2a683e1e70cb2f416919cf2129c72a9ff30e2e3b9527809d04e863cc1f87267b
 DIST gpgme-1.13.1.tar.bz2 1759616 BLAKE2B 17fff261ab76b72e096aa42cc847443bfd3bbf0eb6d04af1d38561ddce1d11cfe9a98b6ced268b28f33e2cb7d900a9e6b3dfc56f1c784a021dbefbf493522e70 SHA512 11de670c6cf512508103fe67af56d9fbb2a9dda6fc6fa3cd321371bbe337c7c2c81913ca557d07187adb2a63d37ea1a44da97ab22345bbe6022c405d0cb083b8
-EBUILD gpgme-1.13.0-r1.ebuild 2900 BLAKE2B 2ef871fcfb4427bbf2457f30274acb63e253ce549d0bb0114fdb6b1356885c1c1fdaf8ac37c4c679a35e9cc840e27493bf991569bf6f04164c9fd3513a745800 SHA512 ddc4595d6151f410729fca30b34ed72732b2462d7fe8b7980c3b90f65d2968b2d06eb7cfc69b6c6a0f15e01a9a338da9eff5c0388ac80ae47879a034b7aafd01
-EBUILD gpgme-1.13.0.ebuild 2890 BLAKE2B ee19906844689d57db5864655076f3448f49f267c3286312125669b48b23e4b443b2cbe62edf8f1d8997dc76289562cc1815e015bae1877cbe63a1fac20da368 SHA512 2ec197b2772b15450916073ac2e0e99ca090e472b66ed1cfae00e8ed3fae593b8090863d0a63c27340a8df84e83f97372a15d7774748a27619cb97c502c5cbd9
-EBUILD gpgme-1.13.1.ebuild 2900 BLAKE2B 2ef871fcfb4427bbf2457f30274acb63e253ce549d0bb0114fdb6b1356885c1c1fdaf8ac37c4c679a35e9cc840e27493bf991569bf6f04164c9fd3513a745800 SHA512 ddc4595d6151f410729fca30b34ed72732b2462d7fe8b7980c3b90f65d2968b2d06eb7cfc69b6c6a0f15e01a9a338da9eff5c0388ac80ae47879a034b7aafd01
+EBUILD gpgme-1.13.0-r1.ebuild 2887 BLAKE2B baf028bb23e240e99ebafcad25cb5761689774837e0a909bc8c145406bb667b73501af60ac40ac17b30e85b315aba239391a7d0262b7ac92ed9bd4621e906786 SHA512 d0d4a9b3766f92373641ae7c432c3ea69ff4bcae3f286bb57613748b01789bf9d7e12734fcebddc74ec3e674ac7508ca978d6ed34e8c711adbdf79489cdf2964
+EBUILD gpgme-1.13.0.ebuild 2880 BLAKE2B 1757af9addb2588bab4986aa25be384d39311a410847605271ad457baf5632588a27aab05a42f442bc7289eb7c0052e650279cc7ae05410866d76557f869c620 SHA512 3e27509a9f66dfbea7c4cd9ebccb93c3c69d815f9ef50853009bcef7b9378e2becfbd99b088e4cfa78e6d3e15ea45d02b44fc105bff7e5f9ca2e41092c8b8b89
+EBUILD gpgme-1.13.1.ebuild 2890 BLAKE2B b884b1d30050268c74aed3bebfd8776a2ae3c556348bbfd8ea320b42dfed31882599f84a2ce0259d228e18668568826adcba619d2611661ab805e49902d8505d SHA512 6b3094453a3bca6968e2b0c7a446de4e6ca8f13c87468fe362ab74226b1d19dfea865c773a2e36411cbb67d2072f96db3f32a2ff91b79590bf7392cf67c2f92c
 MISC metadata.xml 315 BLAKE2B 18ded955b84237e03c8d14dc65f6b869c12674d4a87906f8fbc7650d02b20418cc2d97e9be6ea32f1aa170a8763cad3b91f9ac9b821a825fea0583cc66bed728 SHA512 502b5daf04f1b706514aba7d18cd454e1e99f63462159d3f5baebd1617bfa4760c7ea6fae9b7624fae2bc5943f8950211c6f4b326b6b62c3cf7eba4fc1255334
diff --git a/app-crypt/gpgme/gpgme-1.13.0-r1.ebuild b/app-crypt/gpgme/gpgme-1.13.0-r1.ebuild
index 7c4ca43d823f..4395b9df1a05 100644
--- a/app-crypt/gpgme/gpgme-1.13.0-r1.ebuild
+++ b/app-crypt/gpgme/gpgme-1.13.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://gnupg/gpgme/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="1/11" # subslot = soname major version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-cygwin ~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 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="common-lisp static-libs cxx python qt5"
 
 COMMON_DEPEND=">=app-crypt/gnupg-2
diff --git a/app-crypt/gpgme/gpgme-1.13.0.ebuild b/app-crypt/gpgme/gpgme-1.13.0.ebuild
index 403d655d4942..550f71b387cf 100644
--- a/app-crypt/gpgme/gpgme-1.13.0.ebuild
+++ b/app-crypt/gpgme/gpgme-1.13.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://gnupg/gpgme/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="1/11" # subslot = soname major version
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv sparc x86 ~x64-cygwin ~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 ~riscv sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="common-lisp static-libs cxx python qt5"
 
 COMMON_DEPEND=">=app-crypt/gnupg-2
diff --git a/app-crypt/gpgme/gpgme-1.13.1.ebuild b/app-crypt/gpgme/gpgme-1.13.1.ebuild
index 7c4ca43d823f..79e06fd1e827 100644
--- a/app-crypt/gpgme/gpgme-1.13.1.ebuild
+++ b/app-crypt/gpgme/gpgme-1.13.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://gnupg/gpgme/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="1/11" # subslot = soname major version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-cygwin ~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 ~riscv ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="common-lisp static-libs cxx python qt5"
 
 COMMON_DEPEND=">=app-crypt/gnupg-2
diff --git a/app-crypt/heimdal/Manifest b/app-crypt/heimdal/Manifest
index 749cc3b6916d..39d246bbaaa8 100644
--- a/app-crypt/heimdal/Manifest
+++ b/app-crypt/heimdal/Manifest
@@ -15,7 +15,7 @@ AUX krb5.conf 424 BLAKE2B 49b8a0aab6e0dacb70b91e030bb5f2b8bdfe4253026f85e2c9d16b
 DIST heimdal-7.5.0.tar.gz 10071281 BLAKE2B 917f5855248c333e5ec35bf992973d8b5fb84581b9c3bc8d42c328e5f878ce24c5596c5a1e3fbca786a71be04984068efbb817f7336135056d1feae38895758f SHA512 6d1ad77e795df786680b5e68e2bfefee27bd0207eab507295d7af7053135de9c9ebb517d2c0235bc3a7d50945e18044515f0d76c0899b6b74aa839f1f3e5b131
 DIST heimdal-7.6.0.tar.gz 10186832 BLAKE2B 456b495a3d0a196cf02d6042c6db72c772327545fbc84f7bb758f55f3fca025432bf319fc33e9e0b5fe5ca78b83aea9dc47d77bf1f5b69ae88f1286a22c41263 SHA512 3f7ce090cf8da91f19675a1d9f6bd65c83b3a847337739481506f09d74001cb44283b103ba684dac8a5f11ec48605b5476240c534f6fc36442fb874b73680200
 DIST heimdal-7.7.0.tar.gz 10189293 BLAKE2B db9cdd1861dc9214a7f76b3d8b9656cfc0bad11cb6eadffa4fa29ea7f9aabd4c3d1b628c510644ec9abe1b3bf27a413ccf8cd590d602c4a4ac54ba3deb4cedc4 SHA512 6660939b5a36ce36310721a08a089fb671d1e3d2e8ac74ea4775bfa5f8f772d32de805551456200fe96cc486c092c44beb84f5dd877008bc305490ee971bbf99
-EBUILD heimdal-7.5.0.ebuild 4334 BLAKE2B 33303601d32d3b2c6f54a3681012f854b6addc55b09c65e6d0cea74e8ac91c12de09624e37f3d4f9933c54dbe8de3cf7f258bb99d33d26a25a0c280288777b44 SHA512 6d40e8a30e74b95c918e7ee5bf10b3d017178bd4775bba707ff2dfc02d208c121426b66ebdbb50df09a96f4caa5c55b35f2e8d53cad9eac4f8ebf46b0f6de266
-EBUILD heimdal-7.6.0.ebuild 4539 BLAKE2B cb888bddcf93c11fbb3dc7f4f1e79f281d6a8cb569cad25f175a9679501ef5a2160f73fca7d351594dd5c4cad64cf6bcfdac26862ffc32ad46d5f1d464fd5d92 SHA512 014f090fb241244736e7c5a29a2189e925b623325e95ac28f5b6385ed75c786ee066130a49d96a6f1701f683cf97121996536c47db55f82c78d228a2cf9f9393
-EBUILD heimdal-7.7.0-r1.ebuild 4532 BLAKE2B 9c622605356c00474f2897bb6305b6c5db17d348d3c940e7c9732e6c4c7b0b2530ef9c922c37b9c611d10386bdd897d81ef1e99e3638abd9f980ee68fba92081 SHA512 7a1f33ed8567a0ee7621c32071c48b29012183b75091558151c78afa3666d56e3f69d67e6ddbf0aa14b02c9b26d2695dd7322a0ef6846ab2d7b81f96f683bda4
+EBUILD heimdal-7.5.0.ebuild 4322 BLAKE2B 79ff4eba6678e07c8bbcc34c52508032451cde194214c85a7a57efa1676c658b72cef1454777fb54fd5a0ea77f9983391356be55918bb18589c93f07cbfdf6e8 SHA512 0bf75bbd506a616e2d849e352fad065903c2804b440a74e193cb81563d1a2c14231a9e5d096f8f684b56b4a93d20fea9cd31f9709044ea16fbd830953547e4f7
+EBUILD heimdal-7.6.0.ebuild 4527 BLAKE2B 306ef70c604a95d6e2cc602babef69f0f4f47c532857aad0d979b423526076840ed7f346d3910aabbd7e8b9cd0a9eaaa67ffb9fcbb464fd6b3d6a542f3976afc SHA512 e1086065104abc80db96c25f21487b9138992e312b881804be299e0ae2424326e61f8421b710eb9582f14526a23a7049c396ad00c566a171a840dd9f0ffef704
+EBUILD heimdal-7.7.0-r1.ebuild 4520 BLAKE2B bdff608fd7fd55587dc8914c323ef2383a89587621b37ca667c47dd45f0710957b0463d4d18123b5d43a35ea86e5c3e760170f1ac1e93ec9870fdcbbee8e9990 SHA512 bae9bd4daff3a6c8e54ce30cd46f4cdf7e9ddd029fc21e07a066e510119f10a334ee45473eaf118fcd45fce3347f5423d0c9497c12456e3e921d3e16f6777ab0
 MISC metadata.xml 722 BLAKE2B 9ec2bb074bf4932b0bb2f949eb3c33c8ed8b82305d6641a6954084120c658005cecc2cac57ad85a1df520f5bfd115deef57f80d874ba850d857a813b5a87c139 SHA512 5f3c28c222eb668e3c1d3b7fe24ae3622c82f94b6008a4c3458aa76afac9508d6e7f150de0f06e4845a5b0653ea04112fe0c2b421f199b5feb9ef771ab0b0b28
diff --git a/app-crypt/heimdal/heimdal-7.5.0.ebuild b/app-crypt/heimdal/heimdal-7.5.0.ebuild
index c9aeb159650f..69ed2cbc132e 100644
--- a/app-crypt/heimdal/heimdal-7.5.0.ebuild
+++ b/app-crypt/heimdal/heimdal-7.5.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 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="afs +berkdb caps hdb-ldap ipv6 libressl otp +pkinit selinux ssl static-libs test X"
 
 CDEPEND="
diff --git a/app-crypt/heimdal/heimdal-7.6.0.ebuild b/app-crypt/heimdal/heimdal-7.6.0.ebuild
index e3a1a5ad1bcc..3913a7b6e5f7 100644
--- a/app-crypt/heimdal/heimdal-7.6.0.ebuild
+++ b/app-crypt/heimdal/heimdal-7.6.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 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="afs +berkdb caps gdbm hdb-ldap ipv6 libressl +lmdb otp selinux ssl static-libs test X"
 
 CDEPEND="
diff --git a/app-crypt/heimdal/heimdal-7.7.0-r1.ebuild b/app-crypt/heimdal/heimdal-7.7.0-r1.ebuild
index 96697f3aa74b..86cc8ddc99fb 100644
--- a/app-crypt/heimdal/heimdal-7.7.0-r1.ebuild
+++ b/app-crypt/heimdal/heimdal-7.7.0-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 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="afs +berkdb caps gdbm hdb-ldap libressl +lmdb otp selinux ssl static-libs test X"
 
 CDEPEND="
diff --git a/app-crypt/johntheripper-jumbo/Manifest b/app-crypt/johntheripper-jumbo/Manifest
index 779e7f1e0100..1eff8f226cc2 100644
--- a/app-crypt/johntheripper-jumbo/Manifest
+++ b/app-crypt/johntheripper-jumbo/Manifest
@@ -1,7 +1,7 @@
 AUX 1.8.0-gcc5.patch 1793 BLAKE2B b25b356e68c5e210557373a3cf8e5543e8851f2d375fb72af82189bfb7c491826bc4fe092484e28031683d30a37863c20b6c36b19ca73ed133e77988dc4df188 SHA512 941a8fbe435d24287be158648d3083062806de639ce822645d949a171b2e662249bb13d9f5903017792cc979c7ff89615681adaed2afbf0d9c6ca5fe825e135a
 DIST JohnTheRipper-1.8.0-jumbo-1.tar.gz 32533148 BLAKE2B 15929fa25314438619899582b209bee6902b1e53dc2df39ed6a686820665fd4d8e56d26b3f0082d05dc6be2f54add3526570d936c0a929641e33e6dcfb7a13b5 SHA512 8b7fad7a6330b5ff1afc306218ba698aaa27776b566f82c2e76102d5ceb10aeafa69d71fa6fff67c81996ea2c6a04384bab4696ed192306c6d074873562e7089
 DIST john-1.9.0-jumbo-1.tar.xz 33638768 BLAKE2B 2fd6813e234308408d42581705ee8b25f9217a3dfb43f05483156f7bb67d0ce0d6de9c3ce8c2e4a17bb99bb377119dae2897bc08c800e7bc80bc6cf245400df6 SHA512 c5cb5dc739ee4c666f8479cdf10511fddc391b590c59f90c060d3ccd8449b794ac7b831a6d1f7553883892499e709a66578cfa4d62caef9b7e0a831eb827e808
-EBUILD johntheripper-jumbo-1.8.0.ebuild 2906 BLAKE2B 185b18965a00a4cc7eeedb6717a7140bef2dc34c42f0c570fb480ac03c64e15dba1cdafbb31114ad74998d7acc9d9bd351a2a5156b88a4f4d9de19ea3b8ce2f1 SHA512 cb7bd2f37e38a0ec6c5d5b472afd41734f446d45dd9796543f4bdfbf3f3fe11dd38cf4f87ebf73ed223a67c9bd40c348c5a21a11e79db70ff2811aa1b7c14ed8
-EBUILD johntheripper-jumbo-1.9.0.ebuild 2804 BLAKE2B 413c4384fa7f40a9f594b5f1430e71d668592b958c8afb52111a2f9cff11c901428ced115e1e3332da938cfcf277a61021d31604bebe5e6eb4af2e496741bf50 SHA512 25a6236275567739ee8ff9d4a4a785284e78e1214e07412d86f4fd8ce67a2a23614b8f61172c96ca5262dd93a93260bc2059ea874b504a9e7af44e638e62b73f
-EBUILD johntheripper-jumbo-9999.ebuild 2841 BLAKE2B 9d2a9cd73d689e85dfc2a8e62513750cd36bc727ab7e57c58d8562b7796d434412f10ac262ed89186b8bd7eee593bb20d693f0588de4bb7c8b29d3826b333669 SHA512 47ab66206c497c344ce26b01eb4c4484551f631749001a9de9db9cf4f00224026cec1410c9d7a87767336554fe90f930fd028958685ad66fbdf2f1a3db70ed93
+EBUILD johntheripper-jumbo-1.8.0.ebuild 2896 BLAKE2B 42aaf59ab405dc2f83ee5641fe028ef63934e5ca91a91b3f04d7c148b2ea47a5df8a6b9e54b3e0a19ca54e5cf2e9722d214e1c9dd8b0d1e7cc6f5304204eecd4 SHA512 1d7856a78537ae023d0a58d57337743053147d90d25df9c4bbc0ef0249b6d06385c89cc9e4f239c388f729d82828da5e3f3d88a64162ad0c5a687cfd8941025b
+EBUILD johntheripper-jumbo-1.9.0.ebuild 2794 BLAKE2B 3dda6a008d9d76a4fc3276adc685de7d95750c51c216121964b10f584e19e584213086d3b2a1ae583419c30858ca131b67f7f4b4e54bd7dd598aa0590db90b4e SHA512 4dfcd423c747377bd071c6c44ea366f3d9381828ed44bbfcdcc305ccfa6de0affc18da841a32d92c362c043a8a98be00f15cd333338e9f1a86ea001c9e1ccb36
+EBUILD johntheripper-jumbo-9999.ebuild 2831 BLAKE2B fbf02041abd851e037644a7dae6d419ed85785290be3eb929069091751b243630c241bd494516932a520d8f3a3f59510f4e2d4da97d47878aaeca11c7a50d2f9 SHA512 b3290798831d3fc9d8d0556a41108d1bc8d6e731cfb0125df47583314c9c2eefb15e96fa9ba75b007aaed515fe29d0c5685cfc5beeb80453a34a5e9a55a50732
 MISC metadata.xml 573 BLAKE2B bfe4625ed3871bcc6c083ce63f30b433c6904411db832f5833b753c02dda92d60086264b4167fc59c7b3130de2db73e4d8814c606f02372669c866c185d6477f SHA512 590ef9c3538bbda4e19f88acf78988510343771e4e764d68d0872add996bc041c28aa8f16efcb4b21232870ff7c3e768b3512f39f0da900fedeb99210c200fd6
diff --git a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.8.0.ebuild b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.8.0.ebuild
index a70e6a1c4cad..626712d2b08a 100644
--- a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.8.0.ebuild
+++ b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.8.0.ebuild
@@ -19,7 +19,7 @@ else
 	MY_PV="${PV}-${JUMBO}"
 	MY_P="${MY_PN}-${MY_PV}"
 	SRC_URI="https://github.com/magnumripper/${MY_PN}/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0.ebuild b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0.ebuild
index 40128aaaf434..c9790e0e5a01 100644
--- a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0.ebuild
+++ b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0.ebuild
@@ -19,7 +19,7 @@ else
 	MY_PV="${PV}-${JUMBO}"
 	MY_P="john-${MY_PV}"
 	SRC_URI="https://www.openwall.com/john/k/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-9999.ebuild b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-9999.ebuild
index a05e2f9da355..721d298e771e 100644
--- a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-9999.ebuild
+++ b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-9999.ebuild
@@ -19,7 +19,7 @@ else
 	MY_PV="${PV}-${JUMBO}"
 	MY_P="${MY_PN}-${MY_PV}"
 	SRC_URI="https://github.com/magnumripper/${MY_PN}/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/app-crypt/johntheripper/Manifest b/app-crypt/johntheripper/Manifest
index 23f3736dd41b..66a47fbcb0e5 100644
--- a/app-crypt/johntheripper/Manifest
+++ b/app-crypt/johntheripper/Manifest
@@ -1,3 +1,3 @@
 DIST john-1.8.0.tar.xz 4468704 BLAKE2B 90d6acc03dc8d22ef869320723e4799e64e15b621cde327ad420595889a43242b182079fd306bb7741b766ddc5e1239e3bdd4f4e396a4ab1e86d635cbebf8f60 SHA512 e2820ecabd7ea4c7404c3d40f064994d0f5746b093c859a58fbf2588492ebcef411d9f3088c8e8ee726284ead969e26fdae834cdae3eb2d32408fc79ed906543
-EBUILD johntheripper-1.8.0.ebuild 3215 BLAKE2B f9a9b61c415871fc60d49df4f6b14fca0b5253617a973c7c5a6b6b7a99b9569d1b56ee22768e013727775eea1569773ef319302a671d91d1f2bcbaffe459d44d SHA512 c53429f8cbba8ea6e06511f2f389acc1a29ec3b663dbf96b0162ddaf9327078cfd4066175ef41b639f269dfe4ac791c2d40738833defe19f7e00e85e805d1853
+EBUILD johntheripper-1.8.0.ebuild 3205 BLAKE2B 19020cb39d34709489ae53da2fb4d75bb802b36b387db610d31023cbde3f33baba49784c0198cff7ba17b30b6d18546045ce4a05f62e18ac2fe3382bba35aa1d SHA512 77ffdd4b3f049dd03e9ae91db19d7cbc5af4c673f329228d0d9f637356bb1cece0330fa35baf223b1deb68bb792d48dadca955e499bd526b74de2121089bfa36
 MISC metadata.xml 515 BLAKE2B 498289b766df94a5c7e5f770804658821c5c2a3428725c53141c784a5ecf2e9229277175f941c46923009c43df6a16ac8ba27bb8b7e16b852409a558548b6c47 SHA512 f5893e1cb42c3f71c07968a099b2ce67f27aac202fec65860b8f67ae006691821efba255108436c8a5e752674cb76c7d43c8bbbf97b864b1067dfd8d66c5a474
diff --git a/app-crypt/johntheripper/johntheripper-1.8.0.ebuild b/app-crypt/johntheripper/johntheripper-1.8.0.ebuild
index 78b619fda5a9..6e2c26e4a594 100644
--- a/app-crypt/johntheripper/johntheripper-1.8.0.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.8.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.openwall.com/john/j/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 arm hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 CPU_FLAGS="cpu_flags_x86_mmx cpu_flags_x86_sse2 cpu_flags_x86_avx cpu_flags_x86_xop"
 IUSE="custom-cflags openmp ${CPU_FLAGS}"
 
diff --git a/app-crypt/kbfs/Manifest b/app-crypt/kbfs/Manifest
index d01a3e90a4ff..6ce6890c0638 100644
--- a/app-crypt/kbfs/Manifest
+++ b/app-crypt/kbfs/Manifest
@@ -3,8 +3,8 @@ DIST kbfs-2.11.0.tar.gz 4520872 BLAKE2B 4472360205f42f59bc18f64634b4e10f38f532db
 DIST kbfs-2.6.0.tar.gz 5836566 BLAKE2B 14ca1fa35d01330ad51c5ca735bea059dc4f5be10298f36d2a7bd10ab5cfe2a399104dbade2da58ea3e0e77ef1e24f0644b751e7f06b91e9f4360514aaa7f6df SHA512 f636f6d01fa12e63930be7fa2d0cd919c37e68820bd602af6a54703a64759e475c5e19e29bf60b94d02dd9db188709c9ecd4da7abd05af7880fdf5e94a8d3590
 DIST kbfs-2.8.0.tar.gz 4459997 BLAKE2B b361ae343ab5fada7f9edac8c5083173dca103362b6e0688df069fbc0bf7dbb0eab6779259bd5c1038c542d7f51b68259404aa24c797da5c3aee6fab9fc4dab1 SHA512 892b7c51f52ca129145f10932e23c22f0f7003ea8662d26939d4f9e72cd8296fc5a66516dc7a3135fdc1cb96b1d02160c0f1dd32a4a6fe13ddcd4750eac9b8fc
 EBUILD kbfs-2.10.1.ebuild 1256 BLAKE2B 87285240aaf1f9685a6ea12ebe8db704d294cc923f23b760873fba48ab22795a915bebca9913c6a369fc10c67f6aee4fa6354902889dd8c0fb414212eb61d1be SHA512 5759fea9cacb3a60a1e9eb4934cd35beba52c08f7d6889bb8cacd4075bb977c7d8694292158a9a58493c88173aae498d8579188ed72020a7d3f64f7e61b8a226
-EBUILD kbfs-2.11.0.ebuild 1256 BLAKE2B 87285240aaf1f9685a6ea12ebe8db704d294cc923f23b760873fba48ab22795a915bebca9913c6a369fc10c67f6aee4fa6354902889dd8c0fb414212eb61d1be SHA512 5759fea9cacb3a60a1e9eb4934cd35beba52c08f7d6889bb8cacd4075bb977c7d8694292158a9a58493c88173aae498d8579188ed72020a7d3f64f7e61b8a226
+EBUILD kbfs-2.11.0-r1.ebuild 1259 BLAKE2B b51c8b0bf6ef148d8febd80b4ecf6c8b786ba4af1026871872de53a49e0b3a59919873b80185721a379f959fba9e066a675dc0ef2da945c81d142cde7210b5ea SHA512 5caa35185d689b962ebd6a029da141358680ecb4c3a5892ec1163f9c2c1903f79ec9ef9c8ba568a23cfea6f517490f6f0f416e9947be97fb4a1f86ef31adcd32
 EBUILD kbfs-2.6.0.ebuild 1259 BLAKE2B 2245307f05dfceab185249d48b8ff5db84c5f1f052bf9068336677f1803ebf312ccfdf5ee3be92696e492b4338ef7a3522a47e5c5077908c6665428db1863c19 SHA512 9f028136347e29dfa3d87406fc7d352a2e4c051536c741063cc83650fc23f643288b5b671891377cf9923ac9f30c927979127a27a83fe9c6340515072621741c
 EBUILD kbfs-2.8.0.ebuild 1256 BLAKE2B 87285240aaf1f9685a6ea12ebe8db704d294cc923f23b760873fba48ab22795a915bebca9913c6a369fc10c67f6aee4fa6354902889dd8c0fb414212eb61d1be SHA512 5759fea9cacb3a60a1e9eb4934cd35beba52c08f7d6889bb8cacd4075bb977c7d8694292158a9a58493c88173aae498d8579188ed72020a7d3f64f7e61b8a226
-EBUILD kbfs-9999.ebuild 1228 BLAKE2B 940cab18094f74e24dbfe63c77f2a21456b02d0f83ff8922b8c9120a0baf873cfa31686827406bdd8ea53183378fe19e5d8725350b8722fe6ad4c90b94e4f5c4 SHA512 47ccfab006114011ff461d0b305f9a1fe88bd4720cc3f26a4a80c8462b519fab96f7e271637c0fa2aeb3f37ff268cdeb458435e041947998191bc4665218480d
+EBUILD kbfs-9999.ebuild 1228 BLAKE2B 71eae998751b73148cc81afec289822651148c90f41f2089516cf46745d505c59a1baf1881444536b9d18a5fdae2320f248334f82d0ce6092088e0e4684c2d85 SHA512 f24901898bb35d84978463922b441b1c85628b170d8b646d576470d7bc1bbac5cc5086af31a7e3c4c020a205c87c3e29fb62e44959fdd50145f8640795cc1624
 MISC metadata.xml 482 BLAKE2B ea0f5fe2ae3d3c5cd10020f178e0233fe55a38174c10ccd54c50fcd2104c4a0dbe737b371cc49624fefbc2107b5697ee4c826466a5f14d7c952542edd1134414 SHA512 74eb8d2fb7b19f269dcf5dbc67a5f63cac1589343a069011dfe8492a0bc1d82b526a175b2fad91a00f7fd60e4a77bbf2b7f7dea4537d6ae9221a9e93ca2bdd60
diff --git a/app-crypt/kbfs/kbfs-2.11.0.ebuild b/app-crypt/kbfs/kbfs-2.11.0-r1.ebuild
index f6dfded5dc62..c25fb747b76d 100644
--- a/app-crypt/kbfs/kbfs-2.11.0.ebuild
+++ b/app-crypt/kbfs/kbfs-2.11.0-r1.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
@@ -17,7 +17,7 @@ IUSE=""
 DEPEND=""
 RDEPEND="
 	app-crypt/gnupg
-	sys-fs/fuse
+	sys-fs/fuse:0=
 	"
 
 src_unpack() {
diff --git a/app-crypt/kbfs/kbfs-9999.ebuild b/app-crypt/kbfs/kbfs-9999.ebuild
index c90799ed3f94..d6752264b28c 100644
--- a/app-crypt/kbfs/kbfs-9999.ebuild
+++ b/app-crypt/kbfs/kbfs-9999.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="git"
 DEPEND=""
 RDEPEND="
 	app-crypt/gnupg
-	sys-fs/fuse
+	sys-fs/fuse:0=
 	"
 
 src_unpack() {
diff --git a/app-crypt/libb2/Manifest b/app-crypt/libb2/Manifest
index 60c326314419..f1eec11229a7 100644
--- a/app-crypt/libb2/Manifest
+++ b/app-crypt/libb2/Manifest
@@ -1,9 +1,5 @@
 DIST libb2-0.98.1.tar.gz 280826 BLAKE2B aa8c3dee3032f457410479be12d00c79a6ca6a7c0376a5c70265d30ff25b50663171f7096141834d4faa4dd5027f38b23b774e59be63475a3ecba855337fb1aa SHA512 a666fdbd1efa9cfff3028e953c62f21ba092c6733ccd12d4d04f1f836fc9747fc90053bc9166510d251d332b91e133853d2cc9b61c279517bd65b05e8483250b
 DIST libb2-0.98.tar.gz 275076 BLAKE2B 7c0aa473a58a5ceb6e913487cc6f0078e6cab661bd26cb1f5611473b430213521a23adbde227da6d7561b4d581369e268308ae6b2a10da5399c0d2d6ab288b26 SHA512 be400d16ab00b3006ec7412dcbf580427600f4997cee19c0448d849ff8bbbb58bbb7be3d49e4052cb1b6791b6bed9c9cc48b51da3ec77b2fdf3d197ccf0c8073
-<<<<<<< HEAD
-EBUILD libb2-0.98.1-r1.ebuild 1732 BLAKE2B 935c36d9cf85cb24511646e81c817627553897270d7d889f8ed00e5e7e19ba72630385aa18980094749d82507bbf1246c0fb56d9f4db6cf895deaa55d97526b2 SHA512 a470032f923e0ec8f2f6a8b8bc5a8f33e1df005c94bd302af221990d07daf36950d68e57ab05333c72393ebe0d1e8975327a338d6155035cd573143a3f487edb
-=======
 EBUILD libb2-0.98.1-r1.ebuild 1744 BLAKE2B b2256260ca7312c87184a92e9b495fb7a7f4fed6353756f3c995c108f71b1abcb9dc304174760a8b624a743c3c39d9e4b275dc50c1daf3bfddfd18d100b0f2cc SHA512 73a90667e0786c443cccc566d43964ad78bfd10cd019f8d3544d2a3842721a58c225d509fedde0b34888da7031e04aabaac5f6311fe3f67ffa6034db646c4f01
->>>>>>> next
 EBUILD libb2-0.98.ebuild 1015 BLAKE2B 8f6fc70a953aea90fa5dbecd894dd5b1335fe9bf737547f8c2c42ab46cc8b718f0bf1ad941b54820b36ce62829a3d2d4d0de1d6e8c34c90c839d4019781a0765 SHA512 7d1a55ff33988e20ab4588f17dc0a1d982c02ea785e1d9535ff740b923129c5491282191e77d6a8dddcb500bce22626face82b40354fcb4da207a2bdcbbdab2b
 MISC metadata.xml 688 BLAKE2B dafb52bda4cb5c27bbbb4cba85c178ce11e9511f0dedfed4ff3afe40789a28e4a8c9c275a1be7e86568419c29011c1a4ae5c67f7b778ece3c750d8a919d5d930 SHA512 a98e96312724a3af5d104e4adbb9f60cac16124c9beac2622045985c1b0c2276ff1d56561d59cfb5a24b57d29577312c7e73bdfe73bbe735c1c320b699065b11
diff --git a/app-crypt/libb2/libb2-0.98.1-r1.ebuild b/app-crypt/libb2/libb2-0.98.1-r1.ebuild
index b8eb0f5d9883..0cd884df7321 100644
--- a/app-crypt/libb2/libb2-0.98.1-r1.ebuild
+++ b/app-crypt/libb2/libb2-0.98.1-r1.ebuild
@@ -12,11 +12,7 @@ SRC_URI="https://github.com/BLAKE2/libb2/archive/${GITHASH}.tar.gz -> ${P}.tar.g
 
 LICENSE="CC0-1.0"
 SLOT="0"
-<<<<<<< HEAD
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-=======
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
->>>>>>> next
 IUSE="static-libs native-cflags openmp"
 
 DEPEND="
diff --git a/app-crypt/libsecret/Manifest b/app-crypt/libsecret/Manifest
index 3d1f0c2768cf..35dbcc218ed4 100644
--- a/app-crypt/libsecret/Manifest
+++ b/app-crypt/libsecret/Manifest
@@ -1,5 +1,5 @@
 DIST libsecret-0.18.6.tar.xz 487836 BLAKE2B d38a41743142d33e634d77bbf55ccab044def9658b3f50bd3f8cec9be6372ad1a56dcc4de58126cba1246c16da2863c003bf14ea6c8a90d8667658cf492f4b9a SHA512 4997519762f1470cfc0a4b3a791362d030af3c9b6ce6f58f8f8073b3a8adeea9b8caacedc884163997081dc39f395f9172330dbb41fed45d6c43ac5809de48e3
 DIST libsecret-0.18.8.tar.xz 509432 BLAKE2B 3e3995d2c44367e31f3914087494764acfe82fb597b524c4982b4fca4e16612509c675f545191ee3cdae59698614395bef54ad82ae88a7e4e19898ba0be7828f SHA512 9e2ec8d458af6ed078bf3c6d956599f73f2cc7720332c424e9aede1f77f3d969c5122cf7b70899bc07ad96a3a628bf79bc5fffa88274d1ef2bcaaca6719f90d4
-EBUILD libsecret-0.18.6-r1.ebuild 2658 BLAKE2B c413830dc2598673d5a0f70c83bc3709c6f2749b2ee7da24da880b52b1c69af977632a45c3c654523a9f0c3271b4d5b0bae7c6c9a776e4e7a6bbe603d5acaf40 SHA512 056cfe38971719b9bc6c97ccf330fb0dd98abbb9637a3e6fd362aa89bd348ed024d415a41ac954fddd5dcf98a81284a48c78f428fab2f7fb56cae7fac3c1b7d9
-EBUILD libsecret-0.18.8.ebuild 2641 BLAKE2B 789217298995f5538fdf48382c11083ea84f7e218236df33382c8c69596d9752557f4ceb5ca0078e2846a7666a97bab8e6fcc71c0e1360f54a67d1462fcb8075 SHA512 0e9fcb2215ad9eb3ce9b17cf510070a69645e3c85382b6bf8371137e6f3ccd8ca3a7d356b892a94bc39fd7f82afebf07c0cfe0ea51df57ee1f7edcbf25b86c0d
+EBUILD libsecret-0.18.6-r1.ebuild 2646 BLAKE2B d9ebf0afb6c6ad575bb714917e0b13fd82cb61340deb426e093f02a1d26dbcfc31bc426404809975f2c420ebf6cb21d53551d4282fb2fe915b2d5f974466ddfe SHA512 dd4e7a4c5bec6d21500e07637d11eca184a052eafd81a4b49be760c21a94c3a8f2af277a02da6b5eac74276345b1ccf776410ff226027740021f231d8e74fe04
+EBUILD libsecret-0.18.8.ebuild 2628 BLAKE2B b50869bd3374ad2a7f051c40e3ee238f16230fa5643ccd77a13c8459d591fed085407b209c8166acba3c5a781590284fe0dcafc6d3f577248424700130c575db SHA512 51bcb8a3c63cd68c7577ec1b99b3a3a53ed3776e9df3bacf0997555c76e9386000724f949ce32721fc82268dd34cee665ea3cf618ea4a0803903c54f03bad47f
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/app-crypt/libsecret/libsecret-0.18.6-r1.ebuild b/app-crypt/libsecret/libsecret-0.18.6-r1.ebuild
index d54507f4b6b2..dd16f40b9cc5 100644
--- a/app-crypt/libsecret/libsecret-0.18.6-r1.ebuild
+++ b/app-crypt/libsecret/libsecret-0.18.6-r1.ebuild
@@ -18,7 +18,7 @@ IUSE="+crypt +introspection test vala"
 REQUIRED_USE="test? ( introspection )
 	vala? ( introspection )"
 
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.38:2[${MULTILIB_USEDEP}]
diff --git a/app-crypt/libsecret/libsecret-0.18.8.ebuild b/app-crypt/libsecret/libsecret-0.18.8.ebuild
index d79ee33d4c96..5f16a860860c 100644
--- a/app-crypt/libsecret/libsecret-0.18.8.ebuild
+++ b/app-crypt/libsecret/libsecret-0.18.8.ebuild
@@ -18,7 +18,7 @@ IUSE="+crypt +introspection test +vala"
 REQUIRED_USE="test? ( introspection )
 	vala? ( introspection )"
 
-KEYWORDS="alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.44:2[${MULTILIB_USEDEP}]
diff --git a/app-crypt/loop-aes-losetup/Manifest b/app-crypt/loop-aes-losetup/Manifest
index eec041e8b860..b2cc8595a369 100644
--- a/app-crypt/loop-aes-losetup/Manifest
+++ b/app-crypt/loop-aes-losetup/Manifest
@@ -1,4 +1,4 @@
 DIST loop-AES-v3.7j.tar.bz2 326818 BLAKE2B ca2db3162298e2e28dcc6feb5e6ba885a08097acafb9937a69898e6944c62cbb1c0ef601e13c0547550721430bf770f187ee71bc5e642d6107c982fae9d03462 SHA512 e1b59680680e2b40bb42cad9f1e89a344c7bfd0ee01fdc26151e9edea64b5111744588bc05c672de16c76ae0a3e4d6a8d4c4c9c09709a9f93bfc62a2f64ba7c7
 DIST util-linux-2.28.2.tar.xz 4149700 BLAKE2B da38a047b4a7dc867ba72aea149d515665375089d880d43c40f6d19a09ee33023d64b95c15073d6a83a36ee58ff6d47ef08671ab841b533bb747a337c5da6c02 SHA512 ac1c2d4c92bbc4eabed464cb0334c1d9b21e58df0f07f0b26e7adcfa188879de8632d195b65a4358c5e11e14ac6e09a1c6206265bbf1fab4ce122414bee7e940
-EBUILD loop-aes-losetup-2.28.2.ebuild 2382 BLAKE2B 7c3c3e0873c5a5064522cb25e4d4815af0286ece9e09da364ea94400f449a069000fbac58d7238991da6750211de68c72765641ecc1b1fa56c92cb1876ccbb18 SHA512 9709dab39d556ee58aa8b65a9a34c47b98481907d22cfa4ebbb0602f4401956b20fe81ac7578750ed2520dcb8f6586a539ea162be7005312ac96b402dd8ecaf9
+EBUILD loop-aes-losetup-2.28.2.ebuild 2393 BLAKE2B cb7536c3d6c5114fe346c1e37e1164595e31e8b3e6eeff751214d9739b21ed196e68838a7b82acc71ae50a1571cb249be00508f99ba631f4c641c40889fdcc41 SHA512 0fcf7848050017c32d1d570463187522f20b84a5f9fe6f534a72144e0e1039ac3ed4cbe0255637b3f2ffc2a12f9ce164b5777ff60b236cad492771178d797224
 MISC metadata.xml 318 BLAKE2B 645d30bddca8c141085ee99caba70b409c1318c175f6f25c0a16b81d2286f1c1b74ab694d2100fd20b1bf16bf5f4134c4642370b99bdedd8d2cc015a822ec768 SHA512 93c67a250f19a2a17bde884a0f493b5b675ae2e0b4dd89164dc8a052e7adb9b2b5ebd07a43fb5432a8198216134ed3a0eca4b14bc98b9be71e9d947f51b77439
diff --git a/app-crypt/loop-aes-losetup/loop-aes-losetup-2.28.2.ebuild b/app-crypt/loop-aes-losetup/loop-aes-losetup-2.28.2.ebuild
index 51ab7bc27529..ec4a4773b0bc 100644
--- a/app-crypt/loop-aes-losetup/loop-aes-losetup-2.28.2.ebuild
+++ b/app-crypt/loop-aes-losetup/loop-aes-losetup-2.28.2.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${MY_P}"
 
 DESCRIPTION="Loop-AES losetup utility"
 HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/"
-SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz
+SRC_URI="https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz
 	http://loop-aes.sourceforge.net/loop-AES/${LOOPAES_P}.tar.bz2"
 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~sparc ~x86"
 
diff --git a/app-crypt/mhash/Manifest b/app-crypt/mhash/Manifest
index 1d3568a93831..272db11d5fc0 100644
--- a/app-crypt/mhash/Manifest
+++ b/app-crypt/mhash/Manifest
@@ -7,5 +7,5 @@ AUX mhash-0.9.9.9-alignment.patch 579 BLAKE2B 2865e4d035a145f84de68730fb86929e33
 AUX mhash-0.9.9.9-force64bit-tiger.patch 537 BLAKE2B b37015b12eb213cd91207163b6eb922e3c9956081505066a01ac64a3cceb8d5eaf802a125168f2f6c5d7c3d2a0e18cb6913a33a66d66edfe1e1336edf3bca173 SHA512 7ca2118569ad28107672f081fa4d06758bc78da48612ba31d6655e91ebf4928055b1643a012d60538b915b05d906adf23a8aeb3d7b9f5d8c12eaf1058b9f5454
 AUX mhash-0.9.9.9-remove_premature_free.patch 464 BLAKE2B 89569b1addc287dc6ccce15142ca2d7f228b78ff0fa3412482dbe1aa98e3dd20c1e6e360934018cdf605330b9c0480989bf898ff110d9a9236fbe3ae63e4e226 SHA512 f8f9814c39890f14e760c6600998b628db27ca52efd864be123b646425be1edd106179840d8720c36948cfe509d2b320fd98c2aee0b3fcc7ae1fac8ccdba792e
 DIST mhash-0.9.9.9.tar.gz 931437 BLAKE2B 2daed92b731148c388d4340e67d99959f71783e68617614c9be797dae655ba1aeb087d4f604015edb752dedc2d69add305510996a06633ef26fd997ab7601bed SHA512 82ad8b8e9b0463c5a14f5c0e572badc42c4697bac5505443b144287b3f8510b1410721b4277f092a0d6045c4342e997831011cdfcbfa8f1dae6edd5d9e3cefee
-EBUILD mhash-0.9.9.9-r2.ebuild 1443 BLAKE2B 4a832e4b55c884b577efef9068829dd33b220b1044d973eebf7a2d3ad57441c438e5b82005e0a1c645b200473f8800676f17cd0f3a33b9741f7c6abece0cdaa1 SHA512 1c1d9375f3eb730eaa6d70030bbe0f35060d13875b752df4d21135be131ee902b6154e790f1cfd6c1e7a992d8f80367cb3a75016f36bcc65aaec81fd842a160c
+EBUILD mhash-0.9.9.9-r2.ebuild 1421 BLAKE2B 05f05e36dca4c2691c8d8da27913ef4cdd67d354ad4276035fa426df6842ea8dbfa415bdfb7881679655f066194a30e53e85ed2664e98425b19c760e82d15312 SHA512 b3057bde9f80e0eead4e705b0d681d1382433b02e4a6c4679cbbffca3635905b0f670efb94345cc9a9079c489d428283ed88dc0a1f8e77fd0f675ca9278244ae
 MISC metadata.xml 325 BLAKE2B 07d8e2f3ec1adec0b16be91a853079e875a3d318fb47ec60e43a6ea87fbbdbbf5f22ec364af47ae311070081235752cebac0fbca30785731cc4b924a9a14edba SHA512 32c365b53e7c9d2a3c6dcef43cc33163a690a0e2f3401e275d3511faa388149ade4b9f5c583307f5b94e6df005796b4ec935ecf35c6cda8d236e46ed0ab7336c
diff --git a/app-crypt/mhash/mhash-0.9.9.9-r2.ebuild b/app-crypt/mhash/mhash-0.9.9.9-r2.ebuild
index a9e836ee93c0..39732f87d787 100644
--- a/app-crypt/mhash/mhash-0.9.9.9-r2.ebuild
+++ b/app-crypt/mhash/mhash-0.9.9.9-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/mhash/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 BDEPEND="dev-lang/perl" # pod2html
diff --git a/app-crypt/mit-krb5/Manifest b/app-crypt/mit-krb5/Manifest
index 0565e98cb651..72fab5f848dd 100644
--- a/app-crypt/mit-krb5/Manifest
+++ b/app-crypt/mit-krb5/Manifest
@@ -1,11 +1,7 @@
-AUX CVE-2018-5729-5730.patch 11896 BLAKE2B 324bbd80acf4a2520909fc26f90f67cec06148ee0effecc43fbadd6c6445b57ee17eae57864c92a5ce0cdc3dbfb0540758910133195fd2078d334bc6e209a452 SHA512 b59ba6cb5d40cca6c8f539c028ba24c2fa6bd1750133545e912f519b91043d426cecf782209c373598fd895c6294e44fc2bc27af34c033ff367bdfb2cb4f91c4
 AUX kpropd.xinetd 194 BLAKE2B cfc40af2e75b0ce5a71e0dfdcfe076d13d996b25d2cb50d4282bc88d7b33b317a202d57df0bb4a2b47113f0d38cb508614e122e4a3bb7dfd2397e2daa3178396 SHA512 c9bbd13f2fadfd2a925bfae834ba61f227cd4386b4c4466b5227d93c792f4549778ef4d6e08353372df99804459277c71f61b41ec71f3afcc600d73c5705f72f
 AUX mit-krb5-1.12_warn_cflags.patch 448 BLAKE2B cd9793866173b394bab3497d19653ca3296924cc49aaf540499b149254265af1d995b4d7493b76185ce35d123e70827cb5fcb221efc6499b86a346cfad7478ab SHA512 42364d9cd8c0a6fd28ae661eeac4d0dd3f2001fe290bf9731ee99c2c786a6488805fc93057d59e201e2cef1e5280af4c170187aa5603f4cf542906abc0fccc2b
 AUX mit-krb5-1.16.3-libressl-r1.patch 3815 BLAKE2B b3ad56fee5fd5ace5e5ef0b1002c2f69c14383ca156182c65f4b1d2a5b8010d30677aabab271726c0fa9cbccf4734a3dda54cc492c9b1e5e1bdc7e8757292a73 SHA512 1298cadf15e5f1512af66c6584cff99b1d8f7c9764cb91e1e606fd331da1747b5fd7080c928a373369ab3817acadfa214121fee694a0ac515c0f4d6a623fb834
-AUX mit-krb5-1.16.3-libressl.patch 3831 BLAKE2B 1f386529069a08e100154640387354644e6e2e64475980af7c1a5be67c8880160f8532cdf4c4d677199a67b7131c495a02370edff08b5ac291d3f0a5adc369ab SHA512 655ce5f28688d06e57bf808f5363ae1bf3276a9c4aad7c08629a459f24efe07b462e8b56f9aaafe3e9cbe54e1846e3d97bd7857e420a7e7268f3a7c89d212383
 AUX mit-krb5-config_LDFLAGS-r1.patch 458 BLAKE2B adf95690d6bb698dbdb6bf9c4220f3498a332186b059986c5a699aeec81b3342931ca664244fbcb76a61f9a5177972f0e47535035dbf88c949691d5d80d58084 SHA512 4c7ff3f63c9615dae1dbbf03795fede34d54d043acfd91f77f7fef7534253ea308a59657fa93d09f99d1d5ff5d21b58eb6b86bfbe6d65aa82ca1fa187b65d1dc
-AUX mit-krb5-config_LDFLAGS.patch 466 BLAKE2B 2dd4f1cfc20bea229d08201d66e3de71472dccfa45dee9b260c51578187e706b864c0b4ff81c0c5a09fd29401c2abdbe334441ca075208299b02d5e1d49aff94 SHA512 9a1ca9b33e7708346eda78d199fdc51f0d7bd08d3d65ea15a19955a6155ab71b8ee0c8989859d6dff293a141f197ea19394a91b3b641181140a289b743e0f0e7
-AUX mit-krb5-libressl-version-check.patch 1123 BLAKE2B ca8bad504949c8dcbffe5f9906a38287a2483ffef8b0326cf361f7a07c44787aa0972a24a832aa4da9a1450fa41035bf216c55e1aafb8a890cc8d88f1e210e88 SHA512 cec03ab3577fd8f96f34e51e9380622b09ac5964687b2e8e45e066d16846a9add71c3fd44f6de305ee5c5be5a27a07e4758b6752afdd8a70149b3f191be609f8
 AUX mit-krb5kadmind.confd 76 BLAKE2B ca69357a77ddaf67e2f9c104b17d49af5da9891b13bd855f8b04d54bfb6ccf07ae8c5cb694f65a47646675c844c8f8c7224e8487081df678c73c554498259516 SHA512 dbf968800959f0463899031e823f003e9ece90132f452ebf03df08caf0e6a6e6ca2cfdee91491d269cfa24bef19e72dd33c7d818a4bb13ef85edfb6f0e8299f3
 AUX mit-krb5kadmind.initd-r2 612 BLAKE2B ba2a70a7c123d63b9c58f4ec31c3c2366949e6971ff4f203cb38e1efb5a69991533291e118066e680d880c5221168c8eb5b047ec70dac857888330978d1e5a9b SHA512 3791af603380277a9d2632a01a86f96f68c9eb38a2c9574cca462fe9a01bef60f24785051d0215a8d71dd5022f1404e281929278e2bfd31603a0415dd9df6a98
 AUX mit-krb5kadmind.service 137 BLAKE2B fcbb450a9bd39407801c93d7ffe050eadb27adbfe3165f27fe9a6ad1b18464153109bdab61a85a6a908dbb8e57b14d577165d9144a6f311d90167d01a92de748 SHA512 65a507b84e8280a9e417e32f8667941f52802f1afe9de513718db5a414ba84569b95a5c4d84eb9d39c232901c4ae1f674e6c95ea2c6895dc0c495b78ec04a026
@@ -17,14 +13,6 @@ AUX mit-krb5kpropd.initd-r2 608 BLAKE2B 9737f5ff711b8e30444c14ca871e01f2c45e9aec
 AUX mit-krb5kpropd.service 128 BLAKE2B 31d002c16987bd6fc42e22e64dd9bd1f9db36655dd5170a4f9f16c6a889a4303a4dc276aca09b3a213a1de3e6ab759c66790141708ec95c4393bbbe79e8fb16f SHA512 b7419d1c728eda86fbab2fbf83794ae754e3cdaec7dcdc12c2105e3a75f9903c25fe8fee48f57acf6f0a8c62d27f7934fae81c0cbd67b997541aef7060a4de46
 AUX mit-krb5kpropd.socket 122 BLAKE2B 2ce51e67b909c6955d9796f80f7985c9209af398ad2a60beebe83bd766d42261bd44c712df14608a1e5e922715780a6c4aa8ad294c34ba4e8fc336a24d038fd3 SHA512 4e7ae175425e0787a1d5ff959471a88bf5af4cd6e213dc6d4048902fab7547c1186a082370b523f9549f5096acfab1fb03b4839e42bd80dc539130ae4bb3ea55
 AUX mit-krb5kpropd_at.service 162 BLAKE2B ccd1dea2419656a95ea1e5068457ea45a765a831f36e7abe3e27cdd9b42f2b703cd6ddad1ac60d75feff4d74bf31dbf146ee2cbfdd34ac38c11908d44162e77a SHA512 4b7121da07b11fa65db4edc185c57197ebb25ed5c49797e36bc31b8b7bbb22a6f512f4a986c8430dfc31b1b8fcfba66dcfe154cd6eeb8b4bb445d5006fff3802
-DIST krb5-1.16.1.tar.gz 9477480 BLAKE2B 16bdd7d6d03ddbd4b070663c3a7a3d2331d54e8590b24f1dc162be2531bfbbbd65878d426a160c65ffc1ba4751f16bbbd177a8a91c01002fde0e886cc1bd91b9 SHA512 fa4ec14a4ffe690861e2dd7ea39d7698af2058ce181bb733ea891f80279f4dde4bb891adec5ccb0eaddf737306e6ceb1fe3744a2946e6189a7d7d2dd3bc5ba84
-DIST krb5-1.16.2.tar.gz 9652415 BLAKE2B 21c4d56e43476a9b87a4ca9a8b7d0dd5739d3d70731fb4727de5ae248d8638e2016581cd2462f5e2ec7950d9e216aa165199505e581fa10db81ce26062fc097e SHA512 738c071a90e0f38680bb17bdcf950310bc4549f3cb851e1d34de11239ae88178e6ee1a5e5d48c6d3efef544339b07d22dba5347dd763a4266d8d4df7cf47afc9
-DIST krb5-1.16.3.tar.gz 9656985 BLAKE2B 92e6d2b5f27e80f495d7bb3fb64acfb03530156fb8e1a07dbc8d045616fd2ac4be8047d844580e3aa01d5e8b733ceea9024290dcc53b691696201f02a31e3034 SHA512 77da5f8bb19108e158c3df5a17b9141b7cbbae7d01f9f0dca5c504dc4b468953d67a1f4566bed5a062d8ff8e0d80796094dea12d2e45bdda810a1633bb08318d
-DIST krb5-1.16.tar.gz 9474479 BLAKE2B 0c5caa0a0d2308a447d47ab94d7b8dc92a67ad78b3bac1678c3f3ece3905f27feda5a23d28b3c13ebd64d1760726888c759fb19da82ad960c6f84a433b753873 SHA512 7e162467b95dad2b6aaa11686d08a00f1cc4eb08247fca8f0e5a8bcaa5f9f7b42cdf00db69c5c6111bdf9eb8063d53cef3bb207ce5d6a287615ca10b710153f9
 DIST krb5-1.17.tar.gz 8761763 BLAKE2B 76f636836c67e9eefca91c9417118efdcf4437c1220691f43f3d246daf3eabd53b40a30956f0e57703c3fde5d7193b1d86b68becf3ae1c0c803d2462e79d3014 SHA512 7462a578b936bd17f155a362dbb5d388e157a80a096549028be6c55400b11361c7f8a28e424fd5674801873651df4e694d536cae66728b7ae5e840e532358c52
-EBUILD mit-krb5-1.16-r2.ebuild 4212 BLAKE2B eac567c47b44a75e06ea412da95ecfb5e65278132cca0757cc83804b71a61a55c6e6c226c2033eac323d237bcb804f674b033403c95caadd7fc35a8d6b5a57a7 SHA512 8c0d1dfb71cd9d5c08bbad176b1ed1b232f31da0e6dc09c1f239f6c90f55879774ef0b9b41b9a4ad5ab67896d1dbb2138bb13087152cb348bd52ea639de78a98
-EBUILD mit-krb5-1.16.1.ebuild 4172 BLAKE2B 4b120ec5bb2d750c6d76c1f6fda2cd21aedbfe771eb234e4d7b392868b6e9d9bcef4b6897df456d8ae30b9cc96a8b83636028d854cb2646172c4f0c27ecc0087 SHA512 af0736e57376a42e44e4a2d97587386590c5a3c5de56485b6db2016494b2bc392ba4bf573462576de5a909fd963da8095d349eaa5866f3ec3ffd427224650eb3
-EBUILD mit-krb5-1.16.2.ebuild 4294 BLAKE2B 4e36bfd702bf28bf73d81265a4d410ce53631c012b9090b6296f1ccb0b923b598ba7bf378451a3490d7018b0681fc9a882805707feb165975ef9ee072536cc89 SHA512 f026e3e3f59e6d4747a3bc3e71292092668f388b61a6d53db437b6fc79311f11c95f6d70e21c36911733900556015a4ebbfa01fc7bcca073561359ce72e9659f
-EBUILD mit-krb5-1.16.3.ebuild 4287 BLAKE2B adfa76bf62c6c9ebd4d854307e77ded4dc6a061e54249332f3ea0ea16863063a18bb142ee02a4fc253ad6a0dc199242796b8b085b324800a12712a98753fc6c4 SHA512 0858f94f587c452c23952f533418ff134723c76061dd244e7ed800ca5d7d16bda1ab3c24494e989c1c6c2f11176c4dda3715d48b54862b643080d05d8d4481cb
 EBUILD mit-krb5-1.17-r1.ebuild 4316 BLAKE2B adf1993cf5479ac7230d02c9652b9f482a772cc2a86dd6bf6fc0b76e84fc4252b19b401772980c8885f5c33cfe2856e098defde2f840c3f24328bc3f275223c3 SHA512 fdd3ac833ec1c0bf9ace7f35b4f2946eb9afaad9c580005a46f866f272178954a5d076591ed21451b3da986c53687823cd50a3a5373dfcd0401cb21c3497bad4
 MISC metadata.xml 903 BLAKE2B 57a48ed1fb3f046b8a4a6a80ae6223bc923f30ddf350b8ee0f5769c78b28c0bd14c35539d9552bfca02901e054332a4dc22f88c48d4eb4db4d143a7f0b938d74 SHA512 44909c99698b78ad01f72cd1d74ad6807f12154c8675b7fe31f4bd95744d8e7dca53446875c57408a294e5f87fc5aa038e6f869d3ff957cab870cd75f8e45464
diff --git a/app-crypt/mit-krb5/files/CVE-2018-5729-5730.patch b/app-crypt/mit-krb5/files/CVE-2018-5729-5730.patch
deleted file mode 100644
index 114cfe688e73..000000000000
--- a/app-crypt/mit-krb5/files/CVE-2018-5729-5730.patch
+++ /dev/null
@@ -1,297 +0,0 @@
-diff --git a/src/lib/kadm5/srv/svr_principal.c b/src/lib/kadm5/srv/svr_principal.c
-index 2420f2c2be..a59a65e8f6 100644
---- a/src/lib/kadm5/srv/svr_principal.c
-+++ b/src/lib/kadm5/srv/svr_principal.c
-@@ -330,6 +330,13 @@ kadm5_create_principal_3(void *server_handle,
-         return KADM5_BAD_MASK;
-     if((mask & ~ALL_PRINC_MASK))
-         return KADM5_BAD_MASK;
-+    if (mask & KADM5_TL_DATA) {
-+        for (tl_data_tail = entry->tl_data; tl_data_tail != NULL;
-+             tl_data_tail = tl_data_tail->tl_data_next) {
-+            if (tl_data_tail->tl_data_type < 256)
-+                return KADM5_BAD_TL_TYPE;
-+        }
-+    }
- 
-     /*
-      * Check to see if the principal exists
-diff --git a/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.h b/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.h
-index 535a1f309e..8b8420faa9 100644
---- a/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.h
-+++ b/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.h
-@@ -141,7 +141,7 @@ extern int set_ldap_error (krb5_context ctx, int st, int op);
- #define UNSTORE16_INT(ptr, val) (val = load_16_be(ptr))
- #define UNSTORE32_INT(ptr, val) (val = load_32_be(ptr))
- 
--#define  KDB_TL_USER_INFO      0x7ffe
-+#define  KDB_TL_USER_INFO      0xff
- 
- #define KDB_TL_PRINCTYPE          0x01
- #define KDB_TL_PRINCCOUNT         0x02
-diff --git a/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c b/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c
-index 88a1704950..b7c9212cb2 100644
---- a/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c
-+++ b/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c
-@@ -651,6 +651,107 @@ update_ldap_mod_auth_ind(krb5_context context, krb5_db_entry *entry,
-     return ret;
- }
- 
-+static krb5_error_code
-+check_dn_in_container(krb5_context context, const char *dn,
-+                      char *const *subtrees, unsigned int ntrees)
-+{
-+    unsigned int i;
-+    size_t dnlen = strlen(dn), stlen;
-+
-+    for (i = 0; i < ntrees; i++) {
-+        if (subtrees[i] == NULL || *subtrees[i] == '\0')
-+            return 0;
-+        stlen = strlen(subtrees[i]);
-+        if (dnlen >= stlen &&
-+            strcasecmp(dn + dnlen - stlen, subtrees[i]) == 0 &&
-+            (dnlen == stlen || dn[dnlen - stlen - 1] == ','))
-+            return 0;
-+    }
-+
-+    k5_setmsg(context, EINVAL, _("DN is out of the realm subtree"));
-+    return EINVAL;
-+}
-+
-+static krb5_error_code
-+check_dn_exists(krb5_context context,
-+                krb5_ldap_server_handle *ldap_server_handle,
-+                const char *dn, krb5_boolean nonkrb_only)
-+{
-+    krb5_error_code st = 0, tempst;
-+    krb5_ldap_context *ldap_context = context->dal_handle->db_context;
-+    LDAP *ld = ldap_server_handle->ldap_handle;
-+    LDAPMessage *result = NULL, *ent;
-+    char *attrs[] = { "krbticketpolicyreference", "krbprincipalname", NULL };
-+    char **values;
-+
-+    LDAP_SEARCH_1(dn, LDAP_SCOPE_BASE, 0, attrs, IGNORE_STATUS);
-+    if (st != LDAP_SUCCESS)
-+        return set_ldap_error(context, st, OP_SEARCH);
-+
-+    ent = ldap_first_entry(ld, result);
-+    CHECK_NULL(ent);
-+
-+    values = ldap_get_values(ld, ent, "krbticketpolicyreference");
-+    if (values != NULL)
-+        ldap_value_free(values);
-+
-+    values = ldap_get_values(ld, ent, "krbprincipalname");
-+    if (values != NULL) {
-+        ldap_value_free(values);
-+        if (nonkrb_only) {
-+            st = EINVAL;
-+            k5_setmsg(context, st, _("ldap object is already kerberized"));
-+            goto cleanup;
-+        }
-+    }
-+
-+cleanup:
-+    ldap_msgfree(result);
-+    return st;
-+}
-+
-+static krb5_error_code
-+validate_xargs(krb5_context context,
-+               krb5_ldap_server_handle *ldap_server_handle,
-+               const xargs_t *xargs, const char *standalone_dn,
-+               char *const *subtrees, unsigned int ntrees)
-+{
-+    krb5_error_code st;
-+
-+    if (xargs->dn != NULL) {
-+        /* The supplied dn must be within a realm container. */
-+        st = check_dn_in_container(context, xargs->dn, subtrees, ntrees);
-+        if (st)
-+            return st;
-+        /* The supplied dn must exist without Kerberos attributes. */
-+        st = check_dn_exists(context, ldap_server_handle, xargs->dn, TRUE);
-+        if (st)
-+            return st;
-+    }
-+
-+    if (xargs->linkdn != NULL) {
-+        /* The supplied linkdn must be within a realm container. */
-+        st = check_dn_in_container(context, xargs->linkdn, subtrees, ntrees);
-+        if (st)
-+            return st;
-+        /* The supplied linkdn must exist. */
-+        st = check_dn_exists(context, ldap_server_handle, xargs->linkdn,
-+                             FALSE);
-+        if (st)
-+            return st;
-+    }
-+
-+    if (xargs->containerdn != NULL && standalone_dn != NULL) {
-+        /* standalone_dn (likely composed using containerdn) must be within a
-+         * container. */
-+        st = check_dn_in_container(context, standalone_dn, subtrees, ntrees);
-+        if (st)
-+            return st;
-+    }
-+
-+    return 0;
-+}
-+
- krb5_error_code
- krb5_ldap_put_principal(krb5_context context, krb5_db_entry *entry,
-                         char **db_args)
-@@ -662,12 +763,12 @@ krb5_ldap_put_principal(krb5_context context, krb5_db_entry *entry,
-     LDAPMessage                 *result=NULL, *ent=NULL;
-     char                        **subtreelist = NULL;
-     char                        *user=NULL, *subtree=NULL, *principal_dn=NULL;
--    char                        **values=NULL, *strval[10]={NULL}, errbuf[1024];
-+    char                        *strval[10]={NULL}, errbuf[1024];
-     char                        *filtuser=NULL;
-     struct berval               **bersecretkey=NULL;
-     LDAPMod                     **mods=NULL;
-     krb5_boolean                create_standalone=FALSE;
--    krb5_boolean                krb_identity_exists=FALSE, establish_links=FALSE;
-+    krb5_boolean                establish_links=FALSE;
-     char                        *standalone_principal_dn=NULL;
-     krb5_tl_data                *tl_data=NULL;
-     krb5_key_data               **keys=NULL;
-@@ -860,24 +961,6 @@ krb5_ldap_put_principal(krb5_context context, krb5_db_entry *entry,
-      * any of the subtrees
-      */
-     if (xargs.dn_from_kbd == TRUE) {
--        /* make sure the DN falls in the subtree */
--        int              dnlen=0, subtreelen=0;
--        char             *dn=NULL;
--        krb5_boolean     outofsubtree=TRUE;
--
--        if (xargs.dn != NULL) {
--            dn = xargs.dn;
--        } else if (xargs.linkdn != NULL) {
--            dn = xargs.linkdn;
--        } else if (standalone_principal_dn != NULL) {
--            /*
--             * Even though the standalone_principal_dn is constructed
--             * within this function, there is the containerdn input
--             * from the user that can become part of the it.
--             */
--            dn = standalone_principal_dn;
--        }
--
-         /* Get the current subtree list if we haven't already done so. */
-         if (subtreelist == NULL) {
-             st = krb5_get_subtree_info(ldap_context, &subtreelist, &ntrees);
-@@ -885,81 +968,10 @@ krb5_ldap_put_principal(krb5_context context, krb5_db_entry *entry,
-                 goto cleanup;
-         }
- 
--        for (tre=0; tre<ntrees; ++tre) {
--            if (subtreelist[tre] == NULL || strlen(subtreelist[tre]) == 0) {
--                outofsubtree = FALSE;
--                break;
--            } else {
--                dnlen = strlen (dn);
--                subtreelen = strlen(subtreelist[tre]);
--                if ((dnlen >= subtreelen) && (strcasecmp((dn + dnlen - subtreelen), subtreelist[tre]) == 0)) {
--                    outofsubtree = FALSE;
--                    break;
--                }
--            }
--        }
--
--        if (outofsubtree == TRUE) {
--            st = EINVAL;
--            k5_setmsg(context, st, _("DN is out of the realm subtree"));
-+        st = validate_xargs(context, ldap_server_handle, &xargs,
-+                            standalone_principal_dn, subtreelist, ntrees);
-+        if (st)
-             goto cleanup;
--        }
--
--        /*
--         * dn value will be set either by dn, linkdn or the standalone_principal_dn
--         * In the first 2 cases, the dn should be existing and in the last case we
--         * are supposed to create the ldap object. so the below should not be
--         * executed for the last case.
--         */
--
--        if (standalone_principal_dn == NULL) {
--            /*
--             * If the ldap object is missing, this results in an error.
--             */
--
--            /*
--             * Search for krbprincipalname attribute here.
--             * This is to find if a kerberos identity is already present
--             * on the ldap object, in which case adding a kerberos identity
--             * on the ldap object should result in an error.
--             */
--            char  *attributes[]={"krbticketpolicyreference", "krbprincipalname", NULL};
--
--            ldap_msgfree(result);
--            result = NULL;
--            LDAP_SEARCH_1(dn, LDAP_SCOPE_BASE, 0, attributes, IGNORE_STATUS);
--            if (st == LDAP_SUCCESS) {
--                ent = ldap_first_entry(ld, result);
--                if (ent != NULL) {
--                    if ((values=ldap_get_values(ld, ent, "krbticketpolicyreference")) != NULL) {
--                        ldap_value_free(values);
--                    }
--
--                    if ((values=ldap_get_values(ld, ent, "krbprincipalname")) != NULL) {
--                        krb_identity_exists = TRUE;
--                        ldap_value_free(values);
--                    }
--                }
--            } else {
--                st = set_ldap_error(context, st, OP_SEARCH);
--                goto cleanup;
--            }
--        }
--    }
--
--    /*
--     * If xargs.dn is set then the request is to add a
--     * kerberos principal on a ldap object, but if
--     * there is one already on the ldap object this
--     * should result in an error.
--     */
--
--    if (xargs.dn != NULL && krb_identity_exists == TRUE) {
--        st = EINVAL;
--        snprintf(errbuf, sizeof(errbuf),
--                 _("ldap object is already kerberized"));
--        k5_setmsg(context, st, "%s", errbuf);
--        goto cleanup;
-     }
- 
-     if (xargs.linkdn != NULL) {
-diff --git a/src/tests/t_kdb.py b/src/tests/t_kdb.py
-index 217f2cdc3b..6e563b1032 100755
---- a/src/tests/t_kdb.py
-+++ b/src/tests/t_kdb.py
-@@ -203,6 +203,12 @@ def ldap_add(dn, objectclass, attrs=[]):
- # in the test LDAP server.
- realm.run([kadminl, 'ank', '-randkey', '-x', 'dn=cn=krb5', 'princ1'],
-           expected_code=1, expected_msg='DN is out of the realm subtree')
-+# Check that the DN container check is a hierarchy test, not a simple
-+# suffix match (CVE-2018-5730).  We expect this operation to fail
-+# either way (because "xcn" isn't a valid DN tag) but the container
-+# check should happen before the DN is parsed.
-+realm.run([kadminl, 'ank', '-randkey', '-x', 'dn=xcn=t1,cn=krb5', 'princ1'],
-+          expected_code=1, expected_msg='DN is out of the realm subtree')
- realm.run([kadminl, 'ank', '-randkey', '-x', 'dn=cn=t2,cn=krb5', 'princ1'])
- realm.run([kadminl, 'getprinc', 'princ1'], expected_msg='Principal: princ1')
- realm.run([kadminl, 'ank', '-randkey', '-x', 'dn=cn=t2,cn=krb5', 'again'],
-@@ -226,6 +232,11 @@ def ldap_add(dn, objectclass, attrs=[]):
-            'princ3'])
- realm.run([kadminl, 'modprinc', '-x', 'containerdn=cn=t2,cn=krb5', 'princ3'],
-           expected_code=1, expected_msg='containerdn option not supported')
-+# Verify that containerdn is checked when linkdn is also supplied
-+# (CVE-2018-5730).
-+realm.run([kadminl, 'ank', '-randkey', '-x', 'containerdn=cn=krb5',
-+           '-x', 'linkdn=cn=t2,cn=krb5', 'princ4'], expected_code=1,
-+          expected_msg='DN is out of the realm subtree')
- 
- # Create and modify a ticket policy.
- kldaputil(['create_policy', '-maxtktlife', '3hour', '-maxrenewlife', '6hour',
diff --git a/app-crypt/mit-krb5/files/mit-krb5-1.16.3-libressl.patch b/app-crypt/mit-krb5/files/mit-krb5-1.16.3-libressl.patch
deleted file mode 100644
index 7a655fb9a1d8..000000000000
--- a/app-crypt/mit-krb5/files/mit-krb5-1.16.3-libressl.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From 58263cbf3106f4c9c9a2252794093014a2f9c01f Mon Sep 17 00:00:00 2001
-From: Stefan Strogin <stefan.strogin@gmail.com>
-Date: Thu, 25 Apr 2019 03:48:10 +0300
-Subject: [PATCH] Fix build for LibreSSL 2.9.x
-
-asn1_mac.h is removed from LibreSSL 2.9.0, but static_ASN1_*() methods
-are not defined. Define them.
-
-Upstream-Status: Pending
-[Needs to be amended if
-https://github.com/libressl-portable/openbsd/pull/109 is accepted]
-Signed-off-by: Stefan Strogin <stefan.strogin@gmail.com>
----
- .../preauth/pkinit/pkinit_crypto_openssl.c    | 13 ++++++++----
- .../preauth/pkinit/pkinit_crypto_openssl.h    | 20 ++++++++++++++++++-
- 2 files changed, 28 insertions(+), 5 deletions(-)
-
-diff --git a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
-index 2064eb7bd..81d5d3cf2 100644
---- a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
-+++ b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
-@@ -188,14 +188,16 @@ pkinit_pkcs11_code_to_text(int err);
-     (*_x509_pp) = PKCS7_cert_from_signer_info(_p7,_si)
- #endif
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- 
--/* 1.1 standardizes constructor and destructor names, renaming
-- * EVP_MD_CTX_{create,destroy} and deprecating ASN1_STRING_data. */
-+/* 1.1 (and LibreSSL 2.7) standardizes constructor and destructor names,
-+ * renaming EVP_MD_CTX_{create,destroy} and deprecating ASN1_STRING_data. */
- 
-+#if !defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER < 0x2070000fL
- #define EVP_MD_CTX_new EVP_MD_CTX_create
- #define EVP_MD_CTX_free EVP_MD_CTX_destroy
- #define ASN1_STRING_get0_data ASN1_STRING_data
-+#endif
- 
- /* 1.1 makes many handle types opaque and adds accessors.  Add compatibility
-  * versions of the new accessors we use for pre-1.1. */
-@@ -203,6 +205,7 @@ pkinit_pkcs11_code_to_text(int err);
- #define OBJ_get0_data(o) ((o)->data)
- #define OBJ_length(o) ((o)->length)
- 
-+#if !defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER < 0x2070000fL
- #define DH_set0_pqg compat_dh_set0_pqg
- static int compat_dh_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g)
- {
-@@ -235,6 +238,7 @@ static void compat_dh_get0_key(const DH *dh, const BIGNUM **pub,
-     if (priv != NULL)
-         *priv = dh->priv_key;
- }
-+#endif /* LIBRESSL_VERSION_NUMBER */
- 
- /* Return true if the cert c includes a key usage which doesn't include u.
-  * Define using direct member access for pre-1.1. */
-@@ -3040,7 +3044,8 @@ cleanup:
-     return retval;
- }
- 
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)) || \
-+  LIBRESSL_VERSION_NUMBER >= 0x2090000fL
- 
- /*
-  * We need to decode DomainParameters from RFC 3279 section 2.3.3.  We would
-diff --git a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.h b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.h
-index 7411348fa..ac91408c4 100644
---- a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.h
-+++ b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.h
-@@ -46,7 +46,25 @@
- #include <openssl/asn1.h>
- #include <openssl/pem.h>
- 
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)) || \
-+  LIBRESSL_VERSION_NUMBER >= 0x2090000fL
-+
-+#ifndef static_ASN1_SEQUENCE_END_name
-+#define static_ASN1_ITEM_start(itname) \
-+	static const ASN1_ITEM itname##_it = {
-+#define static_ASN1_SEQUENCE_END_name(stname, tname) \
-+	;\
-+	static_ASN1_ITEM_start(tname) \
-+		ASN1_ITYPE_SEQUENCE,\
-+		V_ASN1_SEQUENCE,\
-+		tname##_seq_tt,\
-+		sizeof(tname##_seq_tt) / sizeof(ASN1_TEMPLATE),\
-+		NULL,\
-+		sizeof(stname),\
-+		#stname \
-+	ASN1_ITEM_end(tname)
-+#endif /* !defined(static_ASN1_SEQUENCE_END_name) */
-+
- #include <openssl/asn1t.h>
- #else
- #include <openssl/asn1_mac.h>
--- 
-2.21.0
-
diff --git a/app-crypt/mit-krb5/files/mit-krb5-config_LDFLAGS.patch b/app-crypt/mit-krb5/files/mit-krb5-config_LDFLAGS.patch
deleted file mode 100644
index 8490e629a377..000000000000
--- a/app-crypt/mit-krb5/files/mit-krb5-config_LDFLAGS.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Bug #448778
---- a/src/build-tools/krb5-config.in	2012-12-18 02:47:04.000000000 +0000
-+++ b/src/build-tools/krb5-config.in	2012-12-28 07:13:16.582693363 +0000
-@@ -217,7 +217,7 @@
- 	    -e 's#\$(PROG_RPATH)#'$libdir'#' \
- 	    -e 's#\$(PROG_LIBPATH)#'$libdirarg'#' \
- 	    -e 's#\$(RPATH_FLAG)#'"$RPATH_FLAG"'#' \
--	    -e 's#\$(LDFLAGS)#'"$LDFLAGS"'#' \
-+	    -e 's#\$(LDFLAGS)##' \
- 	    -e 's#\$(PTHREAD_CFLAGS)#'"$PTHREAD_CFLAGS"'#' \
- 	    -e 's#\$(CFLAGS)##'`
- 
diff --git a/app-crypt/mit-krb5/files/mit-krb5-libressl-version-check.patch b/app-crypt/mit-krb5/files/mit-krb5-libressl-version-check.patch
deleted file mode 100644
index 5c979cfd1ef7..000000000000
--- a/app-crypt/mit-krb5/files/mit-krb5-libressl-version-check.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
-+++ src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
-@@ -191,7 +191,7 @@ pkinit_pkcs11_code_to_text(int err);
-     (*_x509_pp) = PKCS7_cert_from_signer_info(_p7,_si)
- #endif
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- 
- /* 1.1 standardizes constructor and destructor names, renaming
-  * EVP_MD_CTX_{create,destroy} and deprecating ASN1_STRING_data. */
-@@ -3059,7 +3059,7 @@ cleanup:
-     return retval;
- }
- 
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
- 
- /*
-  * We need to decode DomainParameters from RFC 3279 section 2.3.3.  We would
---- src/plugins/preauth/pkinit/pkinit_crypto_openssl.h
-+++ src/plugins/preauth/pkinit/pkinit_crypto_openssl.h
-@@ -46,7 +46,7 @@
- #include <openssl/asn1.h>
- #include <openssl/pem.h>
- 
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
- #include <openssl/asn1t.h>
- #else
- #include <openssl/asn1_mac.h>
diff --git a/app-crypt/mit-krb5/mit-krb5-1.16-r2.ebuild b/app-crypt/mit-krb5/mit-krb5-1.16-r2.ebuild
deleted file mode 100644
index 1953c395599b..000000000000
--- a/app-crypt/mit-krb5/mit-krb5-1.16-r2.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit autotools flag-o-matic multilib-minimal python-any-r1 systemd versionator
-
-MY_P="${P/mit-}"
-P_DIR=$(get_version_component_range 1-2)
-DESCRIPTION="MIT Kerberos V"
-HOMEPAGE="https://web.mit.edu/kerberos/www/"
-SRC_URI="https://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}.tar.gz"
-
-LICENSE="openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
-IUSE="doc +keyutils libressl nls openldap +pkinit selinux +threads test xinetd"
-
-# Test suite require network access
-RESTRICT="test"
-
-CDEPEND="
-	!!app-crypt/heimdal
-	>=sys-libs/e2fsprogs-libs-1.42.9[${MULTILIB_USEDEP}]
-	|| (
-		>=dev-libs/libverto-0.2.5[libev,${MULTILIB_USEDEP}]
-		>=dev-libs/libverto-0.2.5[libevent,${MULTILIB_USEDEP}]
-		>=dev-libs/libverto-0.2.5[tevent,${MULTILIB_USEDEP}]
-	)
-	keyutils? ( >=sys-apps/keyutils-1.5.8[${MULTILIB_USEDEP}] )
-	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
-	openldap? ( >=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}] )
-	pkinit? (
-		!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
-		libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
-	)
-	xinetd? ( sys-apps/xinetd )"
-DEPEND="${CDEPEND}
-	${PYTHON_DEPS}
-	virtual/yacc
-	doc? ( virtual/latex-base )
-	test? (
-		${PYTHON_DEPS}
-		dev-lang/tcl:0
-		dev-util/dejagnu
-	)"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-kerberos )"
-
-S=${WORKDIR}/${MY_P}/src
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/krb5-config
-)
-
-src_prepare() {
-	eapply -p2 "${FILESDIR}/CVE-2018-5729-5730.patch"
-	eapply "${FILESDIR}/${PN}-1.12_warn_cflags.patch"
-	eapply -p2 "${FILESDIR}/${PN}-config_LDFLAGS.patch"
-	eapply "${FILESDIR}/${PN}-libressl-version-check.patch"
-
-	# Make sure we always use the system copies.
-	rm -rf util/{et,ss,verto}
-	sed -i 's:^[[:space:]]*util/verto$::' configure.in || die
-
-	eapply_user
-	eautoreconf
-}
-
-src_configure() {
-	# QA
-	append-flags -fno-strict-aliasing
-	append-flags -fno-strict-overflow
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	use keyutils || export ac_cv_header_keyutils_h=no
-	ECONF_SOURCE=${S} \
-	WARN_CFLAGS="set" \
-	econf \
-		$(use_with openldap ldap) \
-		"$(multilib_native_use_with test tcl "${EPREFIX}/usr")" \
-		$(use_enable nls) \
-		$(use_enable pkinit) \
-		$(use_enable threads thread-support) \
-		--without-hesiod \
-		--enable-shared \
-		--with-system-et \
-		--with-system-ss \
-		--enable-dns-for-realm \
-		--enable-kdc-lookaside-cache \
-		--with-system-verto \
-		--disable-rpath
-}
-
-multilib_src_compile() {
-	emake -j1
-}
-
-multilib_src_test() {
-	multilib_is_native_abi && emake -j1 check
-}
-
-multilib_src_install() {
-	emake \
-		DESTDIR="${D}" \
-		EXAMPLEDIR="${EPREFIX}/usr/share/doc/${PF}/examples" \
-		install
-}
-
-multilib_src_install_all() {
-	# default database dir
-	keepdir /var/lib/krb5kdc
-
-	cd ..
-	dodoc README
-
-	if use doc; then
-		dodoc -r doc/html
-		docinto pdf
-		dodoc doc/pdf/*.pdf
-	fi
-
-	newinitd "${FILESDIR}"/mit-krb5kadmind.initd-r2 mit-krb5kadmind
-	newinitd "${FILESDIR}"/mit-krb5kdc.initd-r2 mit-krb5kdc
-	newinitd "${FILESDIR}"/mit-krb5kpropd.initd-r2 mit-krb5kpropd
-	newconfd "${FILESDIR}"/mit-krb5kadmind.confd mit-krb5kadmind
-	newconfd "${FILESDIR}"/mit-krb5kdc.confd mit-krb5kdc
-	newconfd "${FILESDIR}"/mit-krb5kpropd.confd mit-krb5kpropd
-
-	systemd_newunit "${FILESDIR}"/mit-krb5kadmind.service mit-krb5kadmind.service
-	systemd_newunit "${FILESDIR}"/mit-krb5kdc.service mit-krb5kdc.service
-	systemd_newunit "${FILESDIR}"/mit-krb5kpropd.service mit-krb5kpropd.service
-	systemd_newunit "${FILESDIR}"/mit-krb5kpropd_at.service "mit-krb5kpropd@.service"
-	systemd_newunit "${FILESDIR}"/mit-krb5kpropd.socket mit-krb5kpropd.socket
-
-	insinto /etc
-	newins "${ED}/usr/share/doc/${PF}/examples/krb5.conf" krb5.conf.example
-	insinto /var/lib/krb5kdc
-	newins "${ED}/usr/share/doc/${PF}/examples/kdc.conf" kdc.conf.example
-
-	if use openldap ; then
-		insinto /etc/openldap/schema
-		doins "${S}/plugins/kdb/ldap/libkdb_ldap/kerberos.schema"
-	fi
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}/kpropd.xinetd" kpropd
-	fi
-}
diff --git a/app-crypt/mit-krb5/mit-krb5-1.16.1.ebuild b/app-crypt/mit-krb5/mit-krb5-1.16.1.ebuild
deleted file mode 100644
index 6e6edde5000f..000000000000
--- a/app-crypt/mit-krb5/mit-krb5-1.16.1.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit autotools flag-o-matic multilib-minimal python-any-r1 systemd versionator
-
-MY_P="${P/mit-}"
-P_DIR=$(get_version_component_range 1-2)
-DESCRIPTION="MIT Kerberos V"
-HOMEPAGE="https://web.mit.edu/kerberos/www/"
-SRC_URI="https://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}.tar.gz"
-
-LICENSE="openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="doc +keyutils libressl nls openldap +pkinit selinux +threads test xinetd"
-
-# Test suite require network access
-RESTRICT="test"
-
-CDEPEND="
-	!!app-crypt/heimdal
-	>=sys-libs/e2fsprogs-libs-1.42.9[${MULTILIB_USEDEP}]
-	|| (
-		>=dev-libs/libverto-0.2.5[libev,${MULTILIB_USEDEP}]
-		>=dev-libs/libverto-0.2.5[libevent,${MULTILIB_USEDEP}]
-		>=dev-libs/libverto-0.2.5[tevent,${MULTILIB_USEDEP}]
-	)
-	keyutils? ( >=sys-apps/keyutils-1.5.8[${MULTILIB_USEDEP}] )
-	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
-	openldap? ( >=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}] )
-	pkinit? (
-		!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
-		libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
-	)
-	xinetd? ( sys-apps/xinetd )"
-DEPEND="${CDEPEND}
-	${PYTHON_DEPS}
-	virtual/yacc
-	doc? ( virtual/latex-base )
-	test? (
-		${PYTHON_DEPS}
-		dev-lang/tcl:0
-		dev-util/dejagnu
-	)"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-kerberos )"
-
-S=${WORKDIR}/${MY_P}/src
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/krb5-config
-)
-
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-1.12_warn_cflags.patch"
-	eapply -p2 "${FILESDIR}/${PN}-config_LDFLAGS.patch"
-	eapply "${FILESDIR}/${PN}-libressl-version-check.patch"
-
-	# Make sure we always use the system copies.
-	rm -rf util/{et,ss,verto}
-	sed -i 's:^[[:space:]]*util/verto$::' configure.in || die
-
-	eapply_user
-	eautoreconf
-}
-
-src_configure() {
-	# QA
-	append-flags -fno-strict-aliasing
-	append-flags -fno-strict-overflow
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	use keyutils || export ac_cv_header_keyutils_h=no
-	ECONF_SOURCE=${S} \
-	WARN_CFLAGS="set" \
-	econf \
-		$(use_with openldap ldap) \
-		"$(multilib_native_use_with test tcl "${EPREFIX}/usr")" \
-		$(use_enable nls) \
-		$(use_enable pkinit) \
-		$(use_enable threads thread-support) \
-		--without-hesiod \
-		--enable-shared \
-		--with-system-et \
-		--with-system-ss \
-		--enable-dns-for-realm \
-		--enable-kdc-lookaside-cache \
-		--with-system-verto \
-		--disable-rpath
-}
-
-multilib_src_compile() {
-	emake -j1
-}
-
-multilib_src_test() {
-	multilib_is_native_abi && emake -j1 check
-}
-
-multilib_src_install() {
-	emake \
-		DESTDIR="${D}" \
-		EXAMPLEDIR="${EPREFIX}/usr/share/doc/${PF}/examples" \
-		install
-}
-
-multilib_src_install_all() {
-	# default database dir
-	keepdir /var/lib/krb5kdc
-
-	cd ..
-	dodoc README
-
-	if use doc; then
-		dodoc -r doc/html
-		docinto pdf
-		dodoc doc/pdf/*.pdf
-	fi
-
-	newinitd "${FILESDIR}"/mit-krb5kadmind.initd-r2 mit-krb5kadmind
-	newinitd "${FILESDIR}"/mit-krb5kdc.initd-r2 mit-krb5kdc
-	newinitd "${FILESDIR}"/mit-krb5kpropd.initd-r2 mit-krb5kpropd
-	newconfd "${FILESDIR}"/mit-krb5kadmind.confd mit-krb5kadmind
-	newconfd "${FILESDIR}"/mit-krb5kdc.confd mit-krb5kdc
-	newconfd "${FILESDIR}"/mit-krb5kpropd.confd mit-krb5kpropd
-
-	systemd_newunit "${FILESDIR}"/mit-krb5kadmind.service mit-krb5kadmind.service
-	systemd_newunit "${FILESDIR}"/mit-krb5kdc.service mit-krb5kdc.service
-	systemd_newunit "${FILESDIR}"/mit-krb5kpropd.service mit-krb5kpropd.service
-	systemd_newunit "${FILESDIR}"/mit-krb5kpropd_at.service "mit-krb5kpropd@.service"
-	systemd_newunit "${FILESDIR}"/mit-krb5kpropd.socket mit-krb5kpropd.socket
-
-	insinto /etc
-	newins "${ED}/usr/share/doc/${PF}/examples/krb5.conf" krb5.conf.example
-	insinto /var/lib/krb5kdc
-	newins "${ED}/usr/share/doc/${PF}/examples/kdc.conf" kdc.conf.example
-
-	if use openldap ; then
-		insinto /etc/openldap/schema
-		doins "${S}/plugins/kdb/ldap/libkdb_ldap/kerberos.schema"
-	fi
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}/kpropd.xinetd" kpropd
-	fi
-}
diff --git a/app-crypt/mit-krb5/mit-krb5-1.16.2.ebuild b/app-crypt/mit-krb5/mit-krb5-1.16.2.ebuild
deleted file mode 100644
index 75bb0cdbf0b0..000000000000
--- a/app-crypt/mit-krb5/mit-krb5-1.16.2.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-inherit autotools flag-o-matic multilib-minimal python-any-r1 systemd
-
-MY_P="${P/mit-}"
-P_DIR=$(ver_cut 1-2)
-DESCRIPTION="MIT Kerberos V"
-HOMEPAGE="https://web.mit.edu/kerberos/www/"
-SRC_URI="https://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}.tar.gz"
-
-LICENSE="openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="cpu_flags_x86_aes doc +keyutils libressl nls openldap +pkinit selinux +threads test xinetd"
-
-# Test suite require network access
-RESTRICT="test"
-
-CDEPEND="
-	!!app-crypt/heimdal
-	>=sys-libs/e2fsprogs-libs-1.42.9[${MULTILIB_USEDEP}]
-	|| (
-		>=dev-libs/libverto-0.2.5[libev,${MULTILIB_USEDEP}]
-		>=dev-libs/libverto-0.2.5[libevent,${MULTILIB_USEDEP}]
-		>=dev-libs/libverto-0.2.5[tevent,${MULTILIB_USEDEP}]
-	)
-	keyutils? ( >=sys-apps/keyutils-1.5.8[${MULTILIB_USEDEP}] )
-	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
-	openldap? ( >=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}] )
-	pkinit? (
-		!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
-		libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
-	)
-	xinetd? ( sys-apps/xinetd )
-	"
-DEPEND="${CDEPEND}
-	${PYTHON_DEPS}
-	virtual/yacc
-	cpu_flags_x86_aes? (
-		amd64? ( dev-lang/yasm )
-		x86? ( dev-lang/yasm )
-	)
-	doc? ( virtual/latex-base )
-	test? (
-		${PYTHON_DEPS}
-		dev-lang/tcl:0
-		dev-util/dejagnu
-		dev-util/cmocka
-	)"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-kerberos )"
-
-S=${WORKDIR}/${MY_P}/src
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/krb5-config
-)
-
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-1.12_warn_cflags.patch"
-	eapply -p2 "${FILESDIR}/${PN}-config_LDFLAGS.patch"
-	eapply "${FILESDIR}/${PN}-libressl-version-check.patch"
-
-	# Make sure we always use the system copies.
-	rm -rf util/{et,ss,verto}
-	sed -i 's:^[[:space:]]*util/verto$::' configure.in || die
-
-	eapply_user
-	eautoreconf
-}
-
-src_configure() {
-	# QA
-	append-flags -fno-strict-aliasing
-	append-flags -fno-strict-overflow
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	use keyutils || export ac_cv_header_keyutils_h=no
-	ECONF_SOURCE=${S} \
-	WARN_CFLAGS="set" \
-	econf \
-		$(use_with openldap ldap) \
-		"$(multilib_native_use_with test tcl "${EPREFIX}/usr")" \
-		$(use_enable nls) \
-		$(use_enable pkinit) \
-		$(use_enable threads thread-support) \
-		--without-hesiod \
-		--enable-shared \
-		--with-system-et \
-		--with-system-ss \
-		--enable-dns-for-realm \
-		--enable-kdc-lookaside-cache \
-		--with-system-verto \
-		--disable-rpath
-}
-
-multilib_src_compile() {
-	emake -j1
-}
-
-multilib_src_test() {
-	multilib_is_native_abi && emake -j1 check
-}
-
-multilib_src_install() {
-	emake \
-		DESTDIR="${D}" \
-		EXAMPLEDIR="${EPREFIX}/usr/share/doc/${PF}/examples" \
-		install
-}
-
-multilib_src_install_all() {
-	# default database dir
-	keepdir /var/lib/krb5kdc
-
-	rmdir "${ED}"/var/lib/{run/krb5kdc,run}
-
-	cd ..
-	dodoc README
-
-	if use doc; then
-		dodoc -r doc/html
-		docinto pdf
-		dodoc doc/pdf/*.pdf
-	fi
-
-	newinitd "${FILESDIR}"/mit-krb5kadmind.initd-r2 mit-krb5kadmind
-	newinitd "${FILESDIR}"/mit-krb5kdc.initd-r2 mit-krb5kdc
-	newinitd "${FILESDIR}"/mit-krb5kpropd.initd-r2 mit-krb5kpropd
-	newconfd "${FILESDIR}"/mit-krb5kadmind.confd mit-krb5kadmind
-	newconfd "${FILESDIR}"/mit-krb5kdc.confd mit-krb5kdc
-	newconfd "${FILESDIR}"/mit-krb5kpropd.confd mit-krb5kpropd
-
-	systemd_newunit "${FILESDIR}"/mit-krb5kadmind.service mit-krb5kadmind.service
-	systemd_newunit "${FILESDIR}"/mit-krb5kdc.service mit-krb5kdc.service
-	systemd_newunit "${FILESDIR}"/mit-krb5kpropd.service mit-krb5kpropd.service
-	systemd_newunit "${FILESDIR}"/mit-krb5kpropd_at.service "mit-krb5kpropd@.service"
-	systemd_newunit "${FILESDIR}"/mit-krb5kpropd.socket mit-krb5kpropd.socket
-
-	insinto /etc
-	newins "${ED}/usr/share/doc/${PF}/examples/krb5.conf" krb5.conf.example
-	insinto /var/lib/krb5kdc
-	newins "${ED}/usr/share/doc/${PF}/examples/kdc.conf" kdc.conf.example
-
-	if use openldap ; then
-		insinto /etc/openldap/schema
-		doins "${S}/plugins/kdb/ldap/libkdb_ldap/kerberos.schema"
-	fi
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}/kpropd.xinetd" kpropd
-	fi
-}
diff --git a/app-crypt/mit-krb5/mit-krb5-1.16.3.ebuild b/app-crypt/mit-krb5/mit-krb5-1.16.3.ebuild
deleted file mode 100644
index 9d8b99116396..000000000000
--- a/app-crypt/mit-krb5/mit-krb5-1.16.3.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-inherit autotools flag-o-matic multilib-minimal python-any-r1 systemd
-
-MY_P="${P/mit-}"
-P_DIR=$(ver_cut 1-2)
-DESCRIPTION="MIT Kerberos V"
-HOMEPAGE="https://web.mit.edu/kerberos/www/"
-SRC_URI="https://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}.tar.gz"
-
-LICENSE="openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="cpu_flags_x86_aes doc +keyutils libressl nls openldap +pkinit selinux +threads test xinetd"
-
-# Test suite require network access
-#RESTRICT="test"
-
-CDEPEND="
-	!!app-crypt/heimdal
-	>=sys-libs/e2fsprogs-libs-1.42.9[${MULTILIB_USEDEP}]
-	|| (
-		>=dev-libs/libverto-0.2.5[libev,${MULTILIB_USEDEP}]
-		>=dev-libs/libverto-0.2.5[libevent,${MULTILIB_USEDEP}]
-		>=dev-libs/libverto-0.2.5[tevent,${MULTILIB_USEDEP}]
-	)
-	keyutils? ( >=sys-apps/keyutils-1.5.8[${MULTILIB_USEDEP}] )
-	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
-	openldap? ( >=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}] )
-	pkinit? (
-		!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
-		libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
-	)
-	xinetd? ( sys-apps/xinetd )
-	"
-DEPEND="${CDEPEND}
-	${PYTHON_DEPS}
-	virtual/yacc
-	cpu_flags_x86_aes? (
-		amd64? ( dev-lang/yasm )
-		x86? ( dev-lang/yasm )
-	)
-	doc? ( virtual/latex-base )
-	test? (
-		${PYTHON_DEPS}
-		dev-lang/tcl:0
-		dev-util/dejagnu
-		dev-util/cmocka
-	)"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-kerberos )"
-
-S=${WORKDIR}/${MY_P}/src
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/krb5-config
-)
-
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-1.12_warn_cflags.patch"
-	eapply -p2 "${FILESDIR}/${PN}-config_LDFLAGS.patch"
-	eapply -p2 "${FILESDIR}/${P}-libressl.patch"
-
-	# Make sure we always use the system copies.
-	rm -rf util/{et,ss,verto}
-	sed -i 's:^[[:space:]]*util/verto$::' configure.in || die
-
-	eapply_user
-	eautoreconf
-}
-
-src_configure() {
-	# QA
-	append-flags -fno-strict-aliasing
-	append-flags -fno-strict-overflow
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	use keyutils || export ac_cv_header_keyutils_h=no
-	ECONF_SOURCE=${S} \
-	WARN_CFLAGS="set" \
-	econf \
-		$(use_with openldap ldap) \
-		"$(multilib_native_use_with test tcl "${EPREFIX}/usr")" \
-		$(use_enable nls) \
-		$(use_enable pkinit) \
-		$(use_enable threads thread-support) \
-		--without-hesiod \
-		--enable-shared \
-		--with-system-et \
-		--with-system-ss \
-		--enable-dns-for-realm \
-		--enable-kdc-lookaside-cache \
-		--with-system-verto \
-		--disable-rpath
-}
-
-multilib_src_compile() {
-	emake -j1
-}
-
-multilib_src_test() {
-	multilib_is_native_abi && emake -j1 check
-}
-
-multilib_src_install() {
-	emake \
-		DESTDIR="${D}" \
-		EXAMPLEDIR="${EPREFIX}/usr/share/doc/${PF}/examples" \
-		install
-}
-
-multilib_src_install_all() {
-	# default database dir
-	keepdir /var/lib/krb5kdc
-
-	rmdir "${ED}"/var/lib/{run/krb5kdc,run}
-
-	cd ..
-	dodoc README
-
-	if use doc; then
-		dodoc -r doc/html
-		docinto pdf
-		dodoc doc/pdf/*.pdf
-	fi
-
-	newinitd "${FILESDIR}"/mit-krb5kadmind.initd-r2 mit-krb5kadmind
-	newinitd "${FILESDIR}"/mit-krb5kdc.initd-r2 mit-krb5kdc
-	newinitd "${FILESDIR}"/mit-krb5kpropd.initd-r2 mit-krb5kpropd
-	newconfd "${FILESDIR}"/mit-krb5kadmind.confd mit-krb5kadmind
-	newconfd "${FILESDIR}"/mit-krb5kdc.confd mit-krb5kdc
-	newconfd "${FILESDIR}"/mit-krb5kpropd.confd mit-krb5kpropd
-
-	systemd_newunit "${FILESDIR}"/mit-krb5kadmind.service mit-krb5kadmind.service
-	systemd_newunit "${FILESDIR}"/mit-krb5kdc.service mit-krb5kdc.service
-	systemd_newunit "${FILESDIR}"/mit-krb5kpropd.service mit-krb5kpropd.service
-	systemd_newunit "${FILESDIR}"/mit-krb5kpropd_at.service "mit-krb5kpropd@.service"
-	systemd_newunit "${FILESDIR}"/mit-krb5kpropd.socket mit-krb5kpropd.socket
-
-	insinto /etc
-	newins "${ED}/usr/share/doc/${PF}/examples/krb5.conf" krb5.conf.example
-	insinto /var/lib/krb5kdc
-	newins "${ED}/usr/share/doc/${PF}/examples/kdc.conf" kdc.conf.example
-
-	if use openldap ; then
-		insinto /etc/openldap/schema
-		doins "${S}/plugins/kdb/ldap/libkdb_ldap/kerberos.schema"
-	fi
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}/kpropd.xinetd" kpropd
-	fi
-}
diff --git a/app-crypt/openpgp-keys-gentoo-release/Manifest b/app-crypt/openpgp-keys-gentoo-release/Manifest
index 30b3d94d8f6a..c1eb83f7b996 100644
--- a/app-crypt/openpgp-keys-gentoo-release/Manifest
+++ b/app-crypt/openpgp-keys-gentoo-release/Manifest
@@ -1,4 +1,4 @@
 DIST gentoo-release-test-sigs-20190224.tar.gz 3235 BLAKE2B 924c69a62d5321716f536144f0607bd3ec4a65d76be492adc729864fd9bef82df0086541ae13034a83152ea0c8dc3cbd168be6cff111a3484128a22cbc8ef1d4 SHA512 f8cc2e84bedbdf14ace6abe4aacf8f0c9810c77ff6ae0fac301829d9d4d5cf0c128a76516c773ac993879215bcdb0aab097e1e7e747d8e1a7c4cfc815bd4d3e6
 DIST gentoo-release.asc.20190427.gz 59649 BLAKE2B 138c6bad0ec688c515888433256c95cea7d8ec1e76587e0e89d3c11078eb1b85931ba9f6630f60dc8bc168b8303204ebe05b9bad7abe946a74730123b1c36d89 SHA512 1491fb2bcf9c6a29adf8ff08cbf8cd40517ee3de7adc048be29a2300f460e78594548c3e47bd18da68585248c560d868815ded5584ed18929e4072c4933484f0
-EBUILD openpgp-keys-gentoo-release-20190427.ebuild 1152 BLAKE2B 119042b4fa94ca2da40e44d1ee3ce1c0b261671244962a50a94224a1bd38372d1c5f0eb31fd672431e69933d75ce27851cc77384cc81ff1bf29d19c437fe613c SHA512 d3a7c13f79f968b963821dea5648333cbc061878864dd6c551f16a37b8d74b2edb3e0a332a1a9988b9dde92ddf2092ea6e328088b6a24095a5ba075377719bc5
+EBUILD openpgp-keys-gentoo-release-20190427.ebuild 1130 BLAKE2B 141020be0ce06ed2b2a5125247bac8a6e9d193258b688e20272046c881aa8f5c068e312bf5c5d3a79c2c5f4bb250219ec64ee27bc608343aeb4c2f94d1920956 SHA512 bd60232f414d0f4db9a84990cf959c0b106675e46f03f6911b08c0b9d3643a0b6c819219ca7cac21c429c224074c7ab0a70a6294a58da78a638e5b4c864a6588
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20190427.ebuild b/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20190427.ebuild
index c96fd1f353ef..37b6a890725b 100644
--- a/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20190427.ebuild
+++ b/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20190427.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dev.gentoo.org/~mgorny/dist/openpgp-keys/gentoo-release.asc.${P
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
 IUSE="test"
 
 DEPEND="test? ( app-crypt/gnupg )"
diff --git a/app-crypt/openssl-blacklist/Manifest b/app-crypt/openssl-blacklist/Manifest
index f45a53adac4f..a82546a71ecf 100644
--- a/app-crypt/openssl-blacklist/Manifest
+++ b/app-crypt/openssl-blacklist/Manifest
@@ -1,4 +1,4 @@
 DIST openssl-blacklist_0.5-3.diff.gz 20228 BLAKE2B d09a6288ceb15e186855f52aef9c76fdeb94907555b8d6c8fa07963d629f0adade2f433bbf6a390a065e5ec0b336c2d2d57ecfd347fbf96d3497404eab16d1b5 SHA512 5e5b7fdc97248ccc44f3ffa306a23f9d3ed9585cee15f1ad55dffcf4e70a50463c05382b393bc07e4bd18ea530eea7d36a508f40c1e03b0932eb3cde43f886bd
 DIST openssl-blacklist_0.5.orig.tar.gz 32908393 BLAKE2B 75cbc1bb5780ded04ba84cd8cb7ea93fe271d0075a854e94dea81ff49b54e48a8207290f5e06426a090c0e913bad95b0f0d6992a1cdacfa1ea044521786ac8f1 SHA512 b0ecab15f4357b56508b048a0648263f118aa8eeda8ad6a15caab8c38b2270a5daf897026daf376a561b292c64c2651269182732e0ae3e4bbac455cc1d3985ab
-EBUILD openssl-blacklist-0.5.3.ebuild 1342 BLAKE2B 641b9f34737391fa4280b964a38ba9272792b4be5cc07b03c1c8157d1bc78e32d3ad8895428846e8d58099ea633515a6dbe854f0d9f596f406e8745cde6a88ab SHA512 e869dda8a3c77397990e1ca72e17cb27586c990e14a26098419986eb36bbcf0365767104794ddedc7fdba4c3449d2f4ee6b9d94a556b7719d336d0560645baad
+EBUILD openssl-blacklist-0.5.3.ebuild 1332 BLAKE2B b2c72c60b458f92452ff9f19bcbb7eaf82d0b19f9ba65d9c85a3e7ccd3ac45cc7b0a0fcb2e39d75246ff29ea0feb6342022cb06ea24b4dcc382ab1ce84b19a53 SHA512 d3f0efaec72dbb5c942077a15d72cb1e698edd85008285b16d9faf81127412c7c75541d3ac1c02c01cf07a20447a5726f3638bd11d12ac5f667bde2d1f2c30a4
 MISC metadata.xml 316 BLAKE2B 02c6930f6b5ce5c6683712cc74bfce02d87d0a9d67af18c37b4d3751df364508901e2c5b537b7d84e3778c7044f206fac9994eaf0e5cab64bf24b2ee33758b9b SHA512 7879fcc74e3f52d1d04e273a89707e2f59d38675ddfceb30aaa59226372624f6ed11c08bd68271781a6a70ebca69c848042b95070d3a19dd55738b18af48be99
diff --git a/app-crypt/openssl-blacklist/openssl-blacklist-0.5.3.ebuild b/app-crypt/openssl-blacklist/openssl-blacklist-0.5.3.ebuild
index 29b6d9c9fcf6..5cad464a8784 100644
--- a/app-crypt/openssl-blacklist/openssl-blacklist-0.5.3.ebuild
+++ b/app-crypt/openssl-blacklist/openssl-blacklist-0.5.3.ebuild
@@ -19,7 +19,7 @@ SRC_URI="mirror://debian/pool/main/o/${PN}/${DEB_P}.orig.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 hppa x86 ~x86-fbsd"
+KEYWORDS="amd64 hppa x86"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/app-crypt/p11-kit/Manifest b/app-crypt/p11-kit/Manifest
index 9e927fd3f61b..8e1d6c70d1e1 100644
--- a/app-crypt/p11-kit/Manifest
+++ b/app-crypt/p11-kit/Manifest
@@ -1,6 +1,6 @@
 AUX p11-kit-0.23.12-mktime.patch 683 BLAKE2B 16d25f2634dea248659ee9790555afaf0e3af14a05d7f186a23f321044f319f9302ef893d5f196855de7e4c04283bceb482c6e4986bd8ac10c0ec43c56bdf748 SHA512 d4f381e27271583a8a4fbf44e4b10eb9a5a3a700e8b1c820182c87dbc5bbfe963e4bd2ff0389b58e765a8810018bae5f18dfa2ed3b967dc5275087609a95e366
 DIST p11-kit-0.23.12.tar.gz 1257028 BLAKE2B 8add003ad298b7c4548c40f863835e9aae4234a66a4b216149be7c473f2b3b7ffb633b95883d58e5b039c974dd8571e56e23f6dcc77e484672605e6178d75ad2 SHA512 ae43b1f6ba5400cf5ae7b64b8c93aa47e5c7ee927196828600fd88beb6fdf6bcb6a63bc822d356757255638f9fbf10896e0604e32a1332a9a833836fa0468726
 DIST p11-kit-0.23.16.1.tar.gz 1292783 BLAKE2B 60be56656156c86d6f0f3285bd691ed85ec1a992e8a789f0f21f9ada172a8cab0581cc42f89c3079a1bd7b3493f0d38cd952711fda50c2e80bf96e94fcd9ff87 SHA512 7d0bbd793b43dba081054b4d022a8dbd1d477a3bd6aced72a641087023cf020f1d898899a08e737880e6c810f924814c62497c5ecb19f8322cde42667426a9a7
-EBUILD p11-kit-0.23.12-r1.ebuild 2012 BLAKE2B 0258f68c207b1eb2811588a98692dd570767cefcae1fd7f3efde037673fe49d5e5ec6834a9fe9203f72e87c7e567a96cf2199609e2b1aa64869a737368902f6a SHA512 8b6b470fba6a4d54161a662bcba9b837fd4d01c1f51d24eba2dd65bbcf6711082717724ea316044d42ae6c1cef3078d8e149140953d9eb4e69c3e1a21e71162c
-EBUILD p11-kit-0.23.16.1-r1.ebuild 2032 BLAKE2B a7320d19797d4cf244a03c2f7f2c95aeeb0c85f595c2dea46c585b701deb5af95f25712a26600b7b0ad59f974d0906d6481bc18c4fea36dd46dc676ae27f542d SHA512 601380d8134a1218d93dd24e1a2279dc92be447b8d593e247d46f9e00b6f58741f86fc04a4b17759b4404ac6e8578c33f6e2643d9bbd05ca9078acb0dbd4cc14
+EBUILD p11-kit-0.23.12-r1.ebuild 1990 BLAKE2B dfdc292cd95b2d304d5dca5c151ad0db84e3b619523d864017809b729da4c62055aa921dc2a33ffedf2e91dacb53ca786f2ccdeb8e29aa9feec0db8fcb9f11a6 SHA512 5bfcbbd8d47494d8e27321181604972fff4e15f0124ff71e3a747e0e32594a05fe6638d1c76a5a332115f83ca37bd7e8f32aeb0c1a1d02f8fb7fea06a0cd2b5f
+EBUILD p11-kit-0.23.16.1-r1.ebuild 2010 BLAKE2B bd2f0d0bffe1b804c4db57e20eb58ea010b03b300ec98d98a8b2a6a49e5e0cfe5b397ce7dc5a14a47176a07384b7562ba603bad532c9db414531e6baef1fd992 SHA512 35607daf3a38f4432df4792e24b6b26fa54977ff00962c6367821ddcb75f1f4527930395fe92b1658ad39d948fb2530fd009b8fcc1cb343e198e43d902b8a5fe
 MISC metadata.xml 454 BLAKE2B 82db424896936d17b167806a47d54674d1d6eebe192ad1f8b4e985b00f74f10aa5f18ea587b866906571a91dcfda83626f6b25ebdbd6a6e02da65b34511b2b0e SHA512 24042c945cc3ab622b74c30eaa08819ebce4af9320b083ceb1f3f4db110fba6539121b4dbf0d245afdc395a9854bec022575861f7ae4e9418018d6bddbd4a888
diff --git a/app-crypt/p11-kit/p11-kit-0.23.12-r1.ebuild b/app-crypt/p11-kit/p11-kit-0.23.12-r1.ebuild
index acd2250428b5..2e92e56dfa8d 100644
--- a/app-crypt/p11-kit/p11-kit-0.23.12-r1.ebuild
+++ b/app-crypt/p11-kit/p11-kit-0.23.12-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/p11-glue/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+asn1 debug +libffi +trust"
 REQUIRED_USE="trust? ( asn1 )"
 
diff --git a/app-crypt/p11-kit/p11-kit-0.23.16.1-r1.ebuild b/app-crypt/p11-kit/p11-kit-0.23.16.1-r1.ebuild
index 6b1c88e6912b..a2e85c735e73 100644
--- a/app-crypt/p11-kit/p11-kit-0.23.16.1-r1.ebuild
+++ b/app-crypt/p11-kit/p11-kit-0.23.16.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/p11-glue/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+asn1 debug +libffi +trust"
 REQUIRED_USE="trust? ( asn1 )"
 
diff --git a/app-crypt/pinentry/Manifest b/app-crypt/pinentry/Manifest
index c4d68cd1b6d7..01d79c456c94 100644
--- a/app-crypt/pinentry/Manifest
+++ b/app-crypt/pinentry/Manifest
@@ -5,9 +5,9 @@ AUX pinentry-1.0.0-gtk2-Fix-a-problem-with-fvwm.patch 1900 BLAKE2B b9e7aa8f87615
 AUX pinentry-1.0.0-make-icon-work-under-Plasma-Wayland.patch 1606 BLAKE2B bebea23f44a0512dad873f693a8343a47684c983ca37faba908bee62a7f87d1eaf2a097672df45fcfabb28911b55bc3b02177f910137f50d9c97a6939a1f7047 SHA512 15e6b86015bbf9f199bfa9e68f2a1b9f3fc14105313e1dbfb303d76b1949092ec2671b8d2a90fa8b05e0196da81e9f20875656dc11fdd96b48a14d79e4becdf7
 DIST pinentry-1.0.0.tar.bz2 436930 BLAKE2B 949be8de8504a42cd5bd6ffebe331a825db7ff3c2ccc5fc554155b7621fddf9df957aa92063eb1a06c6964826a296bf60a4cc46cf2886552e37703a62042f35a SHA512 f109236707c51871b5020ef807a551366461fafcfbe09bf8cda19d4b163a42cf622562b905ceb41429f1d648b3f3d27807538709da6a135b67f9888709eccd62
 DIST pinentry-1.1.0.tar.bz2 467702 BLAKE2B cf43555848ab0dc60756fca123aba7599ebb1bfe0458b973ed9d84479f8de9ee69ef309b518b40aa340434d64d37793cf97c94f78f99820bc5c71ecd2aac7a49 SHA512 5012672925bcb5f683358c259e55e4b87c67cf063ad52c759308933733025c33f7ce08e5b8019ffc101cbf7ef30499040ef2fd34a7611698e65e1593f80948cd
-EBUILD pinentry-1.0.0-r2.ebuild 2874 BLAKE2B 8d2d5d2804270af7e717dd8bab0a025251da59ff4e82f3044420f437f0d89c7bb3efa88a7d725deb54635b5006d83b8496c4b29ee0a440bd70e08d8d80390b83 SHA512 944d73b638e782c52faf3596f38d3ebff7e7f4caa3d459cc41d6c4b37a31738782fe3414742d25f61c8749983030c26acd905f0b930db3fec42027ea3be114f4
-EBUILD pinentry-1.0.0-r3.ebuild 2947 BLAKE2B e60fcc295f85e56b52e3c06de406084aaee202398e03a596bcb68918c388074c02687c8bb28b1829ac118df5e98973eebee810a531d55eeae7f0241bb07dcbd7 SHA512 4e4c5c407d4acdcce021564852d24b5c9b7343f9059747a0b5efe4a700315ab2470dd2f15f9242189489338e5a9af47a33c55858d6145b3832a262e638a61580
-EBUILD pinentry-1.1.0-r1.ebuild 2798 BLAKE2B ddbaa44c716dfd7e3289c116f0205df9e5ae522884b37b822e0218d377f9d4b236a4a40969619a491989510a08e4e29405d2df8f1ffe7d040a389c274e6fe03d SHA512 6bff540b8ebac1269a5f79c68fdf7de8cb3f79ca00ada5746ddf7daed5b27f05e7f54caf768fb43b9c7e9ec6ecf43edb1471848170af59f62d38329934f98d08
-EBUILD pinentry-1.1.0-r2.ebuild 2851 BLAKE2B 68c8fd00ffa3176677370c4325e86d165fe43b6659dd96416a757694071f5bf137d4f1bf1e4795d7d536ffa055133d4fb5b5ff8a76f84f92ca91237546225a1c SHA512 135422b9b4f83de6ff37d1cd1849bbd0ffbdfc49444e2beee965e3163af550b45fa73b3c9e412b4342afd357bb94f41cff7f262451ffc33edc7f1098a8507f8c
-EBUILD pinentry-1.1.0-r3.ebuild 3118 BLAKE2B 3666f8b8859f12555aa63373560ad462271a7e2b95ecbbe74b02d3da9450fa43f21d8263bd9a78e7846085273889a8d208e8f61b8925bb5ca911fb9b1b77df95 SHA512 13c9ba63d8b203167bc83d43b241bdee36761108e5d21ceed08f8fe42f09ff13bb57a033f58b220179ac014960a75e4f7f7f69eda4d88e23afa9aae7b9a0a740
+EBUILD pinentry-1.0.0-r2.ebuild 2852 BLAKE2B 2e876149648a603da035b69c948137fe419d70d83c791209dc82b082aa061c0fdaf2495197c8a0187db151f4aab2c948c62aa5011b0de40e5028e0b4e5bd6d44 SHA512 c8a0f21147f9ffaa6c6576d90f66808ad1b850bb2bca5507e39f641f27d8e1fb184679036f5ea6cfe4cc61f7fadd8ff61a884aa7fcddeff3f96f338675b985cc
+EBUILD pinentry-1.0.0-r3.ebuild 2925 BLAKE2B 6395fd2629b3756dd29cd2cb73d8465481f09cd4a46f123bc5fdd447a0d107f4a594e173ea816ae5a38d0048cbc394cf15f713ecce9932ba4627db8f2e0fd209 SHA512 dbe1b6ea9fc43c622bc821bba895b4a42c3777c351a237b4280711ccf0e7ab71e7a49c61cb6ce70f3c7ea1ffd9c2c0d6e71152c0ab2d85dec4a11f6e49c88d65
+EBUILD pinentry-1.1.0-r1.ebuild 2776 BLAKE2B 8c2a58060317dbc497e396598c9abdaba565c8b94bd35db14e85663c25db88335cdc3a31b5619673fc309ee8aa38811e79e0ebb5408a4b5eb53bc25711530874 SHA512 903a3f232db86c47cef9b3bab8efcbd9a9fa636e6f59af02c6c31ce84d263c445188d470acc47e43709e39492128a20182b496c3f863521291d887495ad26890
+EBUILD pinentry-1.1.0-r2.ebuild 2829 BLAKE2B 5dfc9d3f3d0d8aee4f5b617d2dc0fdd460efcf9a2370f39986ca58578180ac8efaa29e830c2ef68f6b9bf4d4a0591b91f562c7a872a5c542632853efd65f172b SHA512 57fd3f4568770db7bbbfbbd8fb1fa6f9ff25c5ae69516736c83611f16c1c5f04add265a6947e7df280cc4a2950e159d041eda901627c643b18fafa05293b3b1c
+EBUILD pinentry-1.1.0-r3.ebuild 3096 BLAKE2B afaad64b37b29a769630c65db7fe84c402cdeae104282634452426a884a8be84a64c9c3515ba4b12280edf58d6708627ff2958eaf0e4d78f75ba30f544a74caf SHA512 e2fd6f68e03f566a4ad9ef35f9893b92fb3191cb669d8175df27cab7a0d068223270907db623727dce9c4e821418dff900bbb9589e014c9bcd84f2148d201b1a
 MISC metadata.xml 352 BLAKE2B 75bb4d471f7b82b6cfe614d5c2ed226df087792ed84803ce4b011c5ad0a5a1548a87c6ab4c17ffeef53eb64bdea262fda4f89d27c38950ff1ced736b38d7df59 SHA512 3817eb6ad931ab0ee363ed7f8612b08a44c0d02e7abb9d0734452c289350c9909ca4208acad01c54a3f1b260417c400f4692e37b34113c6d618680d41796e2d0
diff --git a/app-crypt/pinentry/pinentry-1.0.0-r2.ebuild b/app-crypt/pinentry/pinentry-1.0.0-r2.ebuild
index fc85a7562c71..9301a981d1df 100644
--- a/app-crypt/pinentry/pinentry-1.0.0-r2.ebuild
+++ b/app-crypt/pinentry/pinentry-1.0.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 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="caps emacs gnome-keyring gtk ncurses qt5 static"
 
 CDEPEND="
diff --git a/app-crypt/pinentry/pinentry-1.0.0-r3.ebuild b/app-crypt/pinentry/pinentry-1.0.0-r3.ebuild
index 7af8ff46e364..75bff6862ba9 100644
--- a/app-crypt/pinentry/pinentry-1.0.0-r3.ebuild
+++ b/app-crypt/pinentry/pinentry-1.0.0-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 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="caps emacs gnome-keyring gtk ncurses qt5 static"
 
 CDEPEND="
diff --git a/app-crypt/pinentry/pinentry-1.1.0-r1.ebuild b/app-crypt/pinentry/pinentry-1.1.0-r1.ebuild
index ae2cca734c02..5fa2b33a5633 100644
--- a/app-crypt/pinentry/pinentry-1.1.0-r1.ebuild
+++ b/app-crypt/pinentry/pinentry-1.1.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 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="caps emacs gnome-keyring gtk ncurses qt5 static"
 
 CDEPEND="
diff --git a/app-crypt/pinentry/pinentry-1.1.0-r2.ebuild b/app-crypt/pinentry/pinentry-1.1.0-r2.ebuild
index 06af197fd4ca..363006f73c91 100644
--- a/app-crypt/pinentry/pinentry-1.1.0-r2.ebuild
+++ b/app-crypt/pinentry/pinentry-1.1.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 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="caps emacs gnome-keyring fltk gtk ncurses qt5 static"
 
 CDEPEND="
diff --git a/app-crypt/pinentry/pinentry-1.1.0-r3.ebuild b/app-crypt/pinentry/pinentry-1.1.0-r3.ebuild
index a49177eda194..de077b82ca11 100644
--- a/app-crypt/pinentry/pinentry-1.1.0-r3.ebuild
+++ b/app-crypt/pinentry/pinentry-1.1.0-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~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="caps emacs gnome-keyring fltk gtk ncurses qt5 static"
 
 DEPEND="
diff --git a/app-crypt/qca/Manifest b/app-crypt/qca/Manifest
index 2f93b6b1044a..ef00eacce11c 100644
--- a/app-crypt/qca/Manifest
+++ b/app-crypt/qca/Manifest
@@ -1,6 +1,6 @@
 AUX qca-disable-pgp-test.patch 446 BLAKE2B a98d5951d7b89c65787d7d586a5504949c51271ebe09c5e19b90a2e24f24fb6d03d6c1f76d7ad4234354bc2507cf7031c716b3b2bf8243b8c1d85065079dded4 SHA512 30bb6d31b9392166d6bbae39da2eeb1788ac9cccffb801b074468a3606a6e1a56d6a41ee276d3b8b8d39112bf6aea7025f07f4810bb835102bd00521ee9eb104
 DIST qca-2.2.0.tar.xz 691264 BLAKE2B 3b9196372c8a8f2e50a86a8a581a549d52a324cbfa919945683222d605747f7127af469a1de0310e24e823243ab4cd884a763b7baac94048e739f49d2a31dcbf SHA512 2a3f73bbd73ae8f74b2b4ec143bc010b7efaba267fc3349fc681623f29a288f69e5c457597f4964f88172a98e0a7eba6d2555675704d5d7026df794b8f772e69
 DIST qca-2.2.1.tar.xz 691676 BLAKE2B d5bcc0d6e791811e1efcdbf2e09916fe40ad682b0e59b2993c73a5bd79e09fc28facdec81259a982bee05223c8dfce78b9a6b729ca4e566c0901a13b91575379 SHA512 3a0e8aa7cf3ea9a7244facaf1d521ebca2753af37636e7bf5f21c57ae880ac9682ae7d6d9fa5ce41b73568ff9538214956b89cd41228c2cb828d9068c2031a9c
-EBUILD qca-2.2.0.ebuild 1964 BLAKE2B ef9a051a8b339344646e78a52a517c988d14e36a1cca62d5d797417e8fcb17bdaea256bc7f6344ff146c05d5e429a4b5fbd50bd7cc1d039597fea206b9f402e5 SHA512 7cd82c7168ea8f43ae92dc5dc3843a4a4035417c067a1bdafea18d2ee3ee43070b6cbe95a793a8f3711d4c7929f252c646ba1f8324431d663cf5b9fd2cf36d19
-EBUILD qca-2.2.1.ebuild 1967 BLAKE2B a41078f18a95acc876566fda3d9a3018b5f1d8befc9cff5c6e1054f42a653cfd39f079430afb11e119d672c51048de2bb981b758585aeb78dbec21cd9122775b SHA512 ad17644227fb282cbcebb15510a070d283e5eb7e783f3bd7acf2611a7d7006ab7925d0e25017872f442259f22d97f5b0792cac28d818a83035a2732ba6dbdd37
+EBUILD qca-2.2.0.ebuild 1942 BLAKE2B ea6e809c9b88758a43af827c434a7887782a27efaa4aef9c4ba374e132166b5b082b790ec357997b2fe56ea2369ba9f59db41028167b3dd3c884551bc09cb817 SHA512 d25b39e1aec98a08d095d69144463c3d030850a9213342f78ba70669d02559893b34a0e5f635364e5434e18cc1985a6b6d135d4cfd7bbde3a87da67ae69a383f
+EBUILD qca-2.2.1.ebuild 1945 BLAKE2B f3becbf061387025ee2917a98b03bba388ebd4075f33e0201924d691c9836719ded5844945007ebd042791cd9f490ae6cb2bf6847527e33be47310d0ab4fa9bd SHA512 ba93ca93dc1e2fc46f4a5b8cdfd68d0250f0055fac17a885ebded1a5db2dbf5efce957af0dd693b08959fe7e2df1ce466fc2b2056f573767f67ef039d7bac7fa
 MISC metadata.xml 842 BLAKE2B 1732f7a0efeba7de6c54bfb817a69f9be88eab8bb37a75f5ee685ba7893ad9be13a10ea8b2a404954846e1ea73dc617d0a89ac3b1f69a83928275b9e8d5fc7ab SHA512 900de0e8b914d1970b3e4fcfbdbeea48c1e56ab596e6c959e4dce29a0fd0cb0b6969ab6899784a80b6c233a656f3a4501513d8af6b4acc8519a5ecf1c9a1a622
diff --git a/app-crypt/qca/qca-2.2.0.ebuild b/app-crypt/qca/qca-2.2.0.ebuild
index 6052b0094ada..f895b8ca47c8 100644
--- a/app-crypt/qca/qca-2.2.0.ebuild
+++ b/app-crypt/qca/qca-2.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="2"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 
 IUSE="botan debug doc examples gcrypt gpg libressl logger nss pkcs11 sasl softstore +ssl test"
 
diff --git a/app-crypt/qca/qca-2.2.1.ebuild b/app-crypt/qca/qca-2.2.1.ebuild
index d42db14e774d..40f66d614dec 100644
--- a/app-crypt/qca/qca-2.2.1.ebuild
+++ b/app-crypt/qca/qca-2.2.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 
 IUSE="botan debug doc examples gcrypt gpg libressl logger nss pkcs11 sasl softstore +ssl test"
 
diff --git a/app-crypt/rhash/Manifest b/app-crypt/rhash/Manifest
index 0ffb3ce17b2c..5c2fc6edb899 100644
--- a/app-crypt/rhash/Manifest
+++ b/app-crypt/rhash/Manifest
@@ -4,6 +4,6 @@ AUX rhash-1.3.6-no_echon.patch 1224 BLAKE2B 949b6aa839667a6fef3c3a668b6cadc45198
 AUX unquote-cc.patch 791 BLAKE2B a872b7a8e8d2e04f5cf3dda0b4f4aa5e0177878942f9836f8a431d950392dafb46be646048a0ab4dc4a31ac20b6676fa8627b39bbb30a990861cf8d3cfc742f8 SHA512 7a4c2bf019cbcde021bb79572abdbc9b42f995ada5bb9798fed127d79c44ed9d4b9544c1413952604b1dd45ed307acdacba6675419f6331d75ecf34c15b8f5ca
 DIST rhash-1.3.6-src.tar.gz 328097 BLAKE2B c74993d183f0f2e479f0bd5831a9f653b9bd17bbed4d1ba896f6e33db98b7141175cd3c688dc41dfd8ec4b98acb51255ae5b795435cbc9dfb5ab77573cb25543 SHA512 54f7f238ed1fdc01c29cc1338fa86be90b69beff0df8f20d24ce9cb3c48c7f4668b84a3fe0d4d8b04b54bc8145485d493435edf3219de3a637af0f9c007c85c6
 DIST rhash-1.3.8-src.tar.gz 393544 BLAKE2B c326b3fa6dbc5ea2cce40105dc319456fdcc58140a05e8002bf1d92be921d8bbd27bf670370ba7cf2ff2001ff70ddbeb8efc9712869a7b215c5f51a5e493b5c9 SHA512 9dba4fa4dd49d323f2e440c5b93eac1ef62eb4046ec4ef611f0978c12c1739002f1ac1f1ec5e61bd359dc89e9ed612db71be91a795184ac5d5433280d27fa4c1
-EBUILD rhash-1.3.6-r1.ebuild 1926 BLAKE2B 5a9a9fa8e24519374328f25a5e15b3836ed4d57ec606ac80bde3172f2bb5a72c19911ed9c8bc97c967f3f336f7d9a2088da6c8fec3b64c1a388b291ae3e7fa26 SHA512 40ce7b82258b0326ce6cc23e655df1b80e45f07864e6f9dae645558e138b34c9d8dd58249862b4b9319f7b7af4db7c176deb8fe131cc3afd4e0d6f2e95da90bf
-EBUILD rhash-1.3.8.ebuild 2083 BLAKE2B 82f3841373fa0b705ff6c2441db0fc7ad489f8ba7ef8c9673e56577f6bd447e84dfa0647705e007892165b10e684ca0efb7a3251ed85281dc8e027b050eeb7a2 SHA512 1113891609320030be0a1437d8beb22b9628abeddd3499147efca30840d9db4b8f84417abc961056a6ea27a698cba196cfa3aa020a8666eda933b3220ca9819f
+EBUILD rhash-1.3.6-r1.ebuild 1904 BLAKE2B 0e9ba826c6931509a9ee7364d3f3e26b8b0ba633557c4ef3514315fec36942565189ac714c01376803c46de20a5d27b4182c66e65c8ce3b0d327f9f4f5819c2a SHA512 ce0b57549dfeb09cb3608e167fcc7cb8c07c9cbfc2f69a69bb5d0678a78cf94ca1bb66302f60818aa28f5892397e7ba92a3293944c5f73cffd4d803f18ddd31f
+EBUILD rhash-1.3.8.ebuild 2061 BLAKE2B f793d773cda3f0ae8274fd5864786a97c5aa2c9e8428d87b9d74e5015b5bcfcb2a548549320c7925cae7766de369f756e065d6fb5395dd9f1a92042235697bcd SHA512 be49c11d4201b92b33ee9c386bedac0378ef5298fc4d0165f30ac3cd088949171bfcfdf09bb28bee6807010896f012f54c0f674b1785df560f373f06d8eedc19
 MISC metadata.xml 753 BLAKE2B 09d65c4222a77b9cdab0e82e8b3a38a63762c9e691285f712e09e99ecf28937d70436ac0dc56a890ea1f6ca9981c7f02383ce92a0da6a0c5ca11af2b3598e77e SHA512 d9a8480839af7651eb09b1210b2b0f736d01018cd1863eb17f24f0f51024c234f6f5036745f2034e89bcbd85f396b194184fc987adba43d9d0bebfa0b65d635a
diff --git a/app-crypt/rhash/rhash-1.3.6-r1.ebuild b/app-crypt/rhash/rhash-1.3.6-r1.ebuild
index 688fbb852228..8b2b12e1ae59 100644
--- a/app-crypt/rhash/rhash-1.3.6-r1.ebuild
+++ b/app-crypt/rhash/rhash-1.3.6-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="debug nls libressl ssl static-libs"
 
 RDEPEND="
diff --git a/app-crypt/rhash/rhash-1.3.8.ebuild b/app-crypt/rhash/rhash-1.3.8.ebuild
index 37f7ea0d0ddb..60e1a4eade8c 100644
--- a/app-crypt/rhash/rhash-1.3.8.ebuild
+++ b/app-crypt/rhash/rhash-1.3.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="debug nls libressl ssl static-libs"
 
 RDEPEND="
diff --git a/app-crypt/seahorse/Manifest b/app-crypt/seahorse/Manifest
index 4727258ecb4a..b30fefc92692 100644
--- a/app-crypt/seahorse/Manifest
+++ b/app-crypt/seahorse/Manifest
@@ -1,5 +1,5 @@
 DIST seahorse-3.30.1.1.tar.xz 1428904 BLAKE2B 54760362fc452b2ff3f7a0d72b25540568703cb91cd46321fb8cd60c9b51f84c3f48575ae9f6c72080cbe0b29e8a38f5e6afdb6c3120b2783a8a04688bd219c9 SHA512 971b8bea484f456d2942f1d1b407ca5b11c1d431f2ee524e58348a421a235dd9d2fa463e73487c6137bde116b34a5d1c0291b479d8562d4ce03766081e0dc469
 DIST seahorse-3.32.2.tar.xz 1278668 BLAKE2B cd3fe6794ca02b1b0fd4b833a7128b8180137441a788f1f3ec5bb4186517ebb9e7422fabab2d19f60420b36e6b1ecab8b8326c99122aad185b8e45927232708f SHA512 e372f79907fbc5d60a41ea0db3a91575b0b304c1727c6091f94eec28445cd836faa32754582c59fd1eb8ce784986e63b4c8cabbd46d5e4cacec1150d9ca08481
-EBUILD seahorse-3.30.1.1.ebuild 1556 BLAKE2B b68b91d7025e98b46110a853b2c8613b659d22136b5989e3b95a993101b30a0101db5dd7c4446d8240f09d055d1c2abe7f7308ca91798782a81af6f755d26c08 SHA512 0f4b204779ad6ca17466eaf26856299cad7718354437df72145cd5c7a3ac07da713ec87be17d878df0937def9078dbbc2e4c9820e8d7ba478cdf80df35ef0b2f
-EBUILD seahorse-3.32.2.ebuild 1469 BLAKE2B 5b183d9b19a8e91bbcf9f69fa271e1c1d043970aa0598f2bce32a025c8de9bfb3f9ec44138b21b27158854fc0d856caa379e5624550c84e241de727b325c1f30 SHA512 5d824390a2d4a75e0fdad8e03d8712bae1e22724e35893c10588663bcb95685618573d0de179dff9e9b54cb96d00a800f173b68b08b8c4cbe88802d23fb997f8
+EBUILD seahorse-3.30.1.1.ebuild 1546 BLAKE2B 4f5dc38fd39950355a8f4ed720eb747e200eaecb1cd117ae32968dcb19eb722af84da6ff1d7212d69fb1fce6ca3f236282d5e8f16a83a4d675c30467bf2216c4 SHA512 9a8e0d9ceb1d281b976eb6d198db40fc00b58efc38dfc8ad8c267d31019eefc2a93e2dbf9c6eca5ef05bf839366df1efffc5926ffb01bfd3ce1afecfbd956fc7
+EBUILD seahorse-3.32.2.ebuild 1459 BLAKE2B f083861d1904a55cc4aaadda7b7b98b7fcade9bdd275f9120be3117b3530247f339fc7ad2ab39f355e83ddc5795751629b1f67a5b1babc39e4d6fa4551c85aa4 SHA512 a07dcf16d4d43addd01e2aceae972746a42c1e9ba0386099ef013a0f82698457311d800c169b94a71af2f1c48c326a003f3ef9dde884d3d3f188fe04169bbde5
 MISC metadata.xml 742 BLAKE2B 11cc6cebe3f395ccd9f2570a419e812951287d7a9af2bd88720a66c7349305c108c451b67a33f9a6da0c82d7b0731ca74980dd7515db3d167993008633973a6f SHA512 cf7cceeaedb1fdb503def974d945a7a5d38a95105dda77f7e917abcec8ce823b461bf3cd1ab5f1a458de859e48a4d58abde71a5a4599685772936eb3525ae3af
diff --git a/app-crypt/seahorse/seahorse-3.30.1.1.ebuild b/app-crypt/seahorse/seahorse-3.30.1.1.ebuild
index 0ab9589d6042..d882152db482 100644
--- a/app-crypt/seahorse/seahorse-3.30.1.1.ebuild
+++ b/app-crypt/seahorse/seahorse-3.30.1.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Seahorse"
 LICENSE="GPL-2+ FDL-1.1+"
 SLOT="0"
 IUSE="ldap zeroconf"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.44:2
diff --git a/app-crypt/seahorse/seahorse-3.32.2.ebuild b/app-crypt/seahorse/seahorse-3.32.2.ebuild
index 5b9a65df7628..ff2d19dfe21b 100644
--- a/app-crypt/seahorse/seahorse-3.32.2.ebuild
+++ b/app-crypt/seahorse/seahorse-3.32.2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Seahorse"
 LICENSE="GPL-2+ FDL-1.1+"
 SLOT="0"
 IUSE="ldap zeroconf"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.44:2
diff --git a/app-crypt/shash/Manifest b/app-crypt/shash/Manifest
index 86c3ec4371ce..74891958c30e 100644
--- a/app-crypt/shash/Manifest
+++ b/app-crypt/shash/Manifest
@@ -3,6 +3,6 @@ AUX shash-0.2.6-binary-files.patch 898 BLAKE2B 892a6bed771a8906b5b00a47b1b13df37
 AUX shash-0.2.6-format-security.patch 413 BLAKE2B 4bcb4a803b8a69c7568d89dfbb900687627f1f51ddefd60b814aa1195daeb6c8026ad1dd55f17fa78ef54fc592b94e9704440f66a47a1c7a70fea0172167e0d7 SHA512 295e5d147c6b66814fb5b863ceab39bec87cdca0d3f1ff3e9d10e59b090a171d96efba080447f1520358ccc4daf8e926c3403e69f966cabdb33722d030ba1b04
 AUX shash.bash-completion 856 BLAKE2B 259204c4579326baa2b68d32e87bb8d6bcb4bd25646d851a68efe28927dc4c61e409092581036a777cddcf4941c12ff51e53f97c30b361cde05f4e89b65abda8 SHA512 1d6f57c5d1d75a576bb2536dc9a7518263e2c34da127f0450e1c7900038a8c9e4a379533ff34ddccf0c62cb53284f0fdab41510f71a05a337e39bcab578ed2b8
 DIST shash-0.2.6.tar.gz 105641 BLAKE2B f7421aa9ed7b242e14a585461e96f44e35f1acf38cba358807ec06e6678c82f7f3b070a218de71cccde9f18a1e7e13f8dd4cf66b48e9d6626f16b2e1fc33757d SHA512 340a59bd16b3e5069a076b56f8fe24d2306a6ddd5e6ad564c5e17a992d8e279a7109ba39bd5caa8438a0e85b4f94cb0878228f7aefe38221ff6efa80df64086b
-EBUILD shash-0.2.6-r2.ebuild 895 BLAKE2B c1cc57e9531b91cfe7da1d1d8f3bfab28ca536de1bf6d67e8c158bb21a34344bb1c69c799f858097827107868222af854f97a6c6a4008b859b665db5904ef3cb SHA512 ad6aeeda95e2c205af81816ca05593a163966bc0fff9ffd42aec90237d70d3331645fc711829b49685a219e2f383d36550e56b146c77ac7972308585a955588e
-EBUILD shash-0.2.6-r3.ebuild 961 BLAKE2B a309f141d78d36298df7872948a8a23b4fb9ae739a18fbf6316bbae69d08cc150cef6b3ca054f165ece2431fd47601ed73248bf3aaeb43843aab4adaf4577e20 SHA512 480bbe35c0838adc1bec91958f1f72261469c803d549afab7d877f4fb7b4b5a145f5bd765a4493ad3579c359bec70f7b8f611c83a5ff6c22114acc58ef974ed6
+EBUILD shash-0.2.6-r2.ebuild 873 BLAKE2B 37254681e1b9df38407b1c3eadb30e0bc338272d3d086142f8b365790386461874a5de93e34d7483f99c1b064a92ce5236047cce90eb63f68725cc02c7f98e72 SHA512 b26f43698cc8950fe25a121fc7cafabd17486a2e9dff99b28c3fc917d11bd0455c53d81132bdb9cb8d282e66f831568d5cbdaa8d38736a91aa85d6fd282c24b5
+EBUILD shash-0.2.6-r3.ebuild 939 BLAKE2B 0663a2820c9f47387c9910abc7e27ee0404e754b72982a27f12058744c7a1d826bb4389c8019f08361fc4f1285a81ef24a6758966ed1bda2b31b1746fcbb08e6 SHA512 c679753ea30abe10d2a99f8fe620fb5583d2669f5848067419a779143502686e5bfaf3442411f8d2766d26355989f26bd392875f1cc7cea81753e2e0390d256b
 MISC metadata.xml 389 BLAKE2B 0f19c78e6c95b99b0de3da4896ded3dbfcd482650294efb1a7b0961a6ea884e30241bfe431fe9c85ced61c45cc0e123f52847953b4e4a2bd86e4a14894190d2e SHA512 dfecd29a48ac51dfbb2d4ab6bc71d4538da61541b7ca3beb34edc4d321a97d881044e4f5815d8cb1a4715dc18dc5a9b58520e3d8697b8cbf35a6f795c13c87d6
diff --git a/app-crypt/shash/shash-0.2.6-r2.ebuild b/app-crypt/shash/shash-0.2.6-r2.ebuild
index 2c8f45a03e6e..160b453433fb 100644
--- a/app-crypt/shash/shash-0.2.6-r2.ebuild
+++ b/app-crypt/shash/shash-0.2.6-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://mcrypt.hellug.gr/pub/mcrypt/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="static"
 
 DEPEND=">=app-crypt/mhash-0.8.18-r1"
diff --git a/app-crypt/shash/shash-0.2.6-r3.ebuild b/app-crypt/shash/shash-0.2.6-r3.ebuild
index e603c09cbdce..269cc956ceeb 100644
--- a/app-crypt/shash/shash-0.2.6-r3.ebuild
+++ b/app-crypt/shash/shash-0.2.6-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://mcrypt.hellug.gr/pub/mcrypt/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="static"
 
 DEPEND=">=app-crypt/mhash-0.8.18-r1
diff --git a/app-crypt/trousers/Manifest b/app-crypt/trousers/Manifest
index 8f87e3ec9448..917f5c721b8f 100644
--- a/app-crypt/trousers/Manifest
+++ b/app-crypt/trousers/Manifest
@@ -5,5 +5,5 @@ AUX tcsd.service 131 BLAKE2B db7995ca078c6008daba2bee50b892d5ae0fceb184c966f6757
 AUX trousers-0.3.13-nouseradd.patch 606 BLAKE2B 7e4a479fe1bdc75f743263c1321f2d99cfe99d04d8196b57a158bd2ce75335526b2001c2af8aa0f8b17ddfefa304685e237385be0bc4113d5ca366dd464fa85d SHA512 a6c9074e535429f09ce5e850d943378348b54bed479b7fef0fff7bb18ab2547421407900aa35533749a764275a241ddbd083c4e2f3d6a9ad6f9b1d40d090f783
 AUX trousers-0.3.14-libressl.patch 877 BLAKE2B 6416ecf1cf99678299e4ac39756920de61e598ec9b9c91c17cf8eddfa10af145b813756e2fae3b39fef8682eeb2ee722b3979d52570f41b99708fb4ba2cebe2d SHA512 3aba9ec7554d4fdb941063f771b40c5700efefdbb6e5df186824e93a6b2c61801acb4be60cdbe71dcee9360c0f59229e5d17f1a18aa981132807b5e74efc2d59
 DIST trousers-0.3.14.tar.gz 1378438 BLAKE2B 3dc2824fa2ca1b1f1181f98d59e85276e7d38af4bfc07ee8246431d9ccb300a8e0820b318643d4cf5d757d2a49492c8686e2fe9de03484263d2189d4bbaa32d0 SHA512 bf87f00329cf1d76a12cf6b6181fa22f90e76af3c5786e6e2db98438d2d3f0c0e05364374664173f45e3a2f6c0e2364948d0b958a7845cb23fcb340150cd9b21
-EBUILD trousers-0.3.14-r1.ebuild 3010 BLAKE2B e04f2965f1fee4164392ec51ca339caade85520be9f75aeaeb8dfdd91bb80e4f8212fcd23c8b7fd7da8afc57388e8861c17271b89a2ca316697563560044c805 SHA512 42abf70b65abddacd79b688eafa2aaf80aaed609425ee5fedb2cc88959b3c04a5ac77073b080a2793eca5a9263292e77b521b5421b4e87dc2f1fb654a2f12901
+EBUILD trousers-0.3.14-r1.ebuild 3009 BLAKE2B c0cf45bdd4222448ea82cf8c539908317da6ca42d3ab3efdaf0dc4ebcc10cf57c8ca8ee1962d31be21cadea2cd78de8525ea9b3980f650bc507fae4050e4e8e3 SHA512 14edff453cc4839ab014e4c22006c897f4873eb1949ae69155ec5693a4050590f5fca1be75c7773391f7f86102620d0cf11a76a073dd38c5b29cde66d201817c
 MISC metadata.xml 389 BLAKE2B ba31172c2d03711712dec442f87ef9af448357d14ea90f973284b7d142a052f83798e0ac48d76f35d94a2efce6f050b456b0401562a7fb9d05f055e2defa923e SHA512 82ef49bce01041185282168653e951f7fc2b68e6e00a2e604765640b7a5ab3f3f73244ee6837004415612358d89c7347cc7c19df333539b534d04308d8f1b4dd
diff --git a/app-crypt/trousers/trousers-0.3.14-r1.ebuild b/app-crypt/trousers/trousers-0.3.14-r1.ebuild
index f876fe6973fe..aecbc459d2a8 100644
--- a/app-crypt/trousers/trousers-0.3.14-r1.ebuild
+++ b/app-crypt/trousers/trousers-0.3.14-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/trousers/${PN}/${P}.tar.gz"
 
 LICENSE="CPL-1.0 GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~m68k ~ppc ~ppc64 ~s390 ~sh x86"
+KEYWORDS="amd64 arm arm64 ~m68k ~ppc ppc64 ~s390 ~sh x86"
 IUSE="doc libressl selinux" # gtk
 
 # gtk support presently does NOT compile.
diff --git a/app-crypt/veracrypt/Manifest b/app-crypt/veracrypt/Manifest
index dde5100f8181..fa84285c7157 100644
--- a/app-crypt/veracrypt/Manifest
+++ b/app-crypt/veracrypt/Manifest
@@ -7,8 +7,10 @@ DIST VeraCrypt_1.19.tar.gz 23235780 BLAKE2B 0d02b3c6783d233f7cc64956eef58077e8a1
 DIST VeraCrypt_1.21.tar.gz 24106162 BLAKE2B 5afe48830bde81d91d16f0bdf16010bdbdb885df84b9cd3e48191e468be51a485dfb3fc4f95da71d6d973a2f22dfbb92ee2b912dcf019921b37e1d4479c8c8d8 SHA512 5186d339f8fb0d88acfc35b1e7a916f797e30be93e8f252cca542b6d5c1cd916110111ef7b859d66b1790ce05d7d02bc72def26857eb003ea114a911fcec6c41
 DIST VeraCrypt_1.22.tar.gz 24820384 BLAKE2B 52fb822d07af96a9f47c17f8aacf13a949fb5a7c5d064a720e003e6d1bfbb5f221a5823720527e1f2c82f08547d77349cc90bc839336a622efcf1836dd97bb88 SHA512 83cdaf673bc9cdeadeb70b2beeabf87a2a9a65d3b0b0cc7fdf9c87671714af1e207ddd1db716302919e2d14414f5d4dd9d8f5203847d72834f53544a04c1a62a
 DIST VeraCrypt_1.23.tar.gz 24941166 BLAKE2B f9760342678f771192434f88a9b6c3bcc348ef312197232346731f51e972c230a4627f92fd655f7a3c7582b1f728274b7f170f885cceadce6ad53c9b404cd8d6 SHA512 433e717403560fc4f9081f528168f346ed7f14f9621b78a176c6801f14caba3d57e3228b940fb746637de29893f278ade650cf5eca63490bc236987a9db4d48d
+DIST VeraCrypt_1.24.tar.gz 25046467 BLAKE2B e8535f981d898efd797ff736a03e4a65b75bd40ed62d75e3f159932e93d9684e8601da277839b40efcd9bdda801427468386f37e9c57cd81dbc470f23693cd12 SHA512 b4a3155ec8455c51044c2aabcc785a6974d9ee740e0c77bae934a017976e715d45701811405dadfbbd9ceb2a957acbefbe15a717003c86ea38d52735de4f2e56
 EBUILD veracrypt-1.19.ebuild 1988 BLAKE2B 20e3a4725dc5b8d319a11cb44d5865afcdcc6f956ff8c3390ed225f605e01b01537db1af5aa1c82deb7c236b27eea69cbc0c29b2f2f4b770fae4514360c45a2d SHA512 b9829bad13c5ba781d9ec2e8353ed72f30a23459d3e9eaa7384a5718be051f1eeff70c3c097225c8f557c57634d7b14b5db83bb189671630c673568667e67da0
 EBUILD veracrypt-1.21.ebuild 1921 BLAKE2B 1adf1a612afa33dc2cdbed7f0bc971e84e3ec45236ee6d7d7bf317c00a6b03a57eda5b30c85f8aeb4684abbd9879b9dab40b9dc2ceb6cffe36946a74ba1544dd SHA512 1766b6db76015cc6fb6f147a8ba1f75795b7038d402c38129c60cbdb09831dd0aed2241d4ec9d403cffa8dfe38f3481085c64ae653a49362be39c08f462de1dc
 EBUILD veracrypt-1.22.ebuild 2065 BLAKE2B 98dcdbe443fae6ad4a4fa0e6086fe4c171ada85fc69f3fc9bb79d61cb512dc5f8ed6339cff5b2705a35ed7d74449bebf04dba626e63d26fb7530dbf4a9566aeb SHA512 169f927f0745dc1e6d0d6c2c6f9c25f93240b09301cb6f318a28decb4f367b35e035f5eff57d2e9902e4e8bd9a496246e580b3c2d5d57380d1aada9cc1c24ada
 EBUILD veracrypt-1.23.ebuild 2190 BLAKE2B a0130f46bda8cb06bab364f9f15214d77270c0b8e7806a81768c29dd511b9473c1783220024ff09007f3831aabb1127181f0815d1f02973e744e67da30870040 SHA512 199b1a0a34a4dc06aa27e77809d74bab09e7eaeeb63cb924504437f96c496b45678bd7c6b5133302ac55a244a3bd586ffc2f88c037db850a62d49bae1891c74b
+EBUILD veracrypt-1.24.ebuild 2471 BLAKE2B 66f9e985f34ddc76cfbc859348630f44b758ef9284c4052b3de80e60ae106b29edda99b0b2479730242d02136ead1c71847589f9a42836c8bdd7a6485bd52d57 SHA512 e1e715570d2d2f08d64877b4f7e9a912e6b21814215fbfe6953328b05d95693e3ba08cf5f43a3bc4e0cc1f0d84ac932f51c52e0e48a68da4527030a3bfe9fd3c
 MISC metadata.xml 516 BLAKE2B 280399666a147f475b2a8558bb3cb47c69ea4f4ba9894ae7d61757e26262f9f618007d9a07ce41eff5e9de17559b56b173a04f6f0c81618f932249bf2794fd62 SHA512 093ddf9483158c1756586e918dcc171e3bd7ef078ef28613517e4b04017c3cff8d3ad2ca7fa44027395602ad8427314356c742c23d03083240d6446b704d87d7
diff --git a/app-crypt/veracrypt/veracrypt-1.24.ebuild b/app-crypt/veracrypt/veracrypt-1.24.ebuild
new file mode 100644
index 000000000000..3ada8aa22b60
--- /dev/null
+++ b/app-crypt/veracrypt/veracrypt-1.24.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils linux-info pax-utils toolchain-funcs wxwidgets
+
+DESCRIPTION="Disk encryption with strong security based on TrueCrypt"
+HOMEPAGE="https://www.veracrypt.fr/en/Home.html"
+SRC_URI="https://github.com/${PN}/VeraCrypt/archive/VeraCrypt_${PV}.tar.gz"
+
+# The modules not linked against in Linux include (but not limited to):
+#   libzip, chacha-xmm, chacha256, chachaRng, jitterentropy, rdrand, t1ha2
+# Tested by actually removing the source files and performing a build
+# For this reason, We don't have to worry about their licenses
+LICENSE="Apache-2.0 truecrypt-3.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+asm cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_ssse3 doc X"
+RESTRICT="bindist mirror"
+
+WX_GTK_VER="3.0"
+
+RDEPEND="
+	sys-fs/lvm2
+	sys-fs/fuse:0
+	x11-libs/wxGTK:${WX_GTK_VER}[X?]
+	app-admin/sudo
+	dev-libs/pkcs11-helper
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	asm? ( dev-lang/yasm )
+"
+
+S="${WORKDIR}/VeraCrypt-VeraCrypt_${PV}/src"
+
+pkg_setup() {
+	local CONFIG_CHECK="~BLK_DEV_DM ~CRYPTO ~CRYPTO_XTS ~DM_CRYPT ~FUSE_FS"
+	linux-info_pkg_setup
+
+	setup-wxwidgets
+}
+
+src_compile() {
+	local myemakeargs=(
+		NOSTRIP=1
+		NOTEST=1
+		VERBOSE=1
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+		AR="$(tc-getAR)"
+		RANLIB="$(tc-getRANLIB)"
+		TC_EXTRA_CFLAGS="${CFLAGS}"
+		TC_EXTRA_CXXFLAGS="${CXXFLAGS}"
+		TC_EXTRA_LFLAGS="${LDFLAGS}"
+		WX_CONFIG="${WX_CONFIG}"
+		$(usex X "" "NOGUI=1")
+		$(usex asm "" "NOASM=1")
+		$(usex cpu_flags_x86_sse2 "" "NOSSE2=1")
+		$(usex cpu_flags_x86_sse4_1 "SSE41=1" "")
+		$(usex cpu_flags_x86_ssse3 "SSSE3=1" "")
+	)
+
+	emake "${myemakeargs[@]}"
+}
+
+src_test() {
+	"${S}/Main/veracrypt" --text --test || die "tests failed"
+}
+
+src_install() {
+	local DOCS=( Readme.txt )
+	local HTML_DOCS=( )
+
+	dobin Main/veracrypt
+	if use doc; then
+		DOCS+=( "${S}"/../doc/EFI-DCS )
+		docompress -x "/usr/share/doc/${PF}/EFI-DCS"
+		HTML_DOCS+=( "${S}"/../doc/html/. )
+	fi
+	einstalldocs
+
+	newinitd "${FILESDIR}/${PN}.init" ${PN}
+
+	if use X; then
+		local s
+		for s in 16 48 128 256; do
+			newicon -s ${s} Resources/Icons/VeraCrypt-${s}x${s}.xpm veracrypt.xpm
+		done
+		make_desktop_entry ${PN} "VeraCrypt" ${PN} "Utility;Security"
+	fi
+
+	pax-mark -m "${D%/}/usr/bin/veracrypt"
+}
+
+pkg_postinst() {
+	ewarn "VeraCrypt has a very restrictive license. Please be explicitly aware"
+	ewarn "of the limitations on redistribution of binaries or modified source."
+}
diff --git a/app-crypt/yubikey-manager-qt/Manifest b/app-crypt/yubikey-manager-qt/Manifest
index 9324a071d00c..f0ab0b40c85e 100644
--- a/app-crypt/yubikey-manager-qt/Manifest
+++ b/app-crypt/yubikey-manager-qt/Manifest
@@ -1,5 +1,7 @@
 DIST yubikey-manager-qt-1.1.1.tar.gz 10893572 BLAKE2B 22c37332601986495da8c70d9867dc04ad565ea06b38e219ed465586d741ddcb177ada9d5f74c04b46ddd2a5b7c445f05c3055ba1fd61e0696226541dbfb2bce SHA512 e1460abf024f045bffff2cf17a1b8fde2eb508b99957198d8de251315684c9fd591a93b3ad8063da2509ab7f054dce40a4267c1cc97c9dcc734ee18215070fe8
 DIST yubikey-manager-qt-1.1.2.tar.gz 11175714 BLAKE2B ee30d8d44a8fdec60cd462db7d67689d4206afa778904cbfe3df97b4bca25342cbb9cea5570211842d7feb8194043fcc9507f9c3d47ca7b588ba3d6250344536 SHA512 0e0bc304689170ba73ea41373c3a6a534678b04b638316480d48b7e7a7d415f8a97e2130983a5ff6e696cf271486953c8155589a6eb9ecf5bd33bb0c98fe70a6
+DIST yubikey-manager-qt-1.1.3.tar.gz 13316325 BLAKE2B 765634b05fff9efdd5ec5e91e0a5de7f04144476b83f7b3ba8a0c8a1bc95ca7132f25e193afca2bec17fe377c683063a14657efc24fb047a64a8f4498c7abaed SHA512 84bcca3f74967ba8aa470b8dd6c8699ff6a93a85ce942934a1d0cd674a4c507ba297d9a5ebb40bae3476ea713965a7bb3816dad1110a045c338f070eb249f02b
 EBUILD yubikey-manager-qt-1.1.1-r1.ebuild 1417 BLAKE2B 2e34d6d0166b06dff567cd097ec2392fa99823f839dc4c1abd6dccf69db2ab13abb4e1d110b64e8c76d04fa22cecfe61e308737e66f97a74f707589aa88064e8 SHA512 68b6d44285d4d72b47a000ce078a76a3ba02113e2cd99aa29dfd9d405368df38458250900000d7900f5c122c62e843a9d62e2223652e358e9f111604aca97aca
 EBUILD yubikey-manager-qt-1.1.2.ebuild 1417 BLAKE2B 34b9370be866b7fd7dfb2f9247ffb37146486c5071c8e598666a09ef3a8d0493303bf755998962b0c47734bad921cc1597bc63efef89a9765a0742418860852a SHA512 d18a91af7b9367def839eb2cb4227539c7680965af576a2472c2237b2a91835240ca41b5372a91cddb2468f81fb7dd1258b696c11464bc5206b9cf32ae50af1e
+EBUILD yubikey-manager-qt-1.1.3.ebuild 1417 BLAKE2B 34b9370be866b7fd7dfb2f9247ffb37146486c5071c8e598666a09ef3a8d0493303bf755998962b0c47734bad921cc1597bc63efef89a9765a0742418860852a SHA512 d18a91af7b9367def839eb2cb4227539c7680965af576a2472c2237b2a91835240ca41b5372a91cddb2468f81fb7dd1258b696c11464bc5206b9cf32ae50af1e
 MISC metadata.xml 371 BLAKE2B 1081e69aeb641c9d7de472bed98dfb336bc37e5374becbec4603316176419dcdb337f29b355b3395b778d250a99e32b181b84b42d4b7c10dedce7c47a6a187f6 SHA512 ed480648e967bfa3d95f71a5131963290e4265c487a345b69e34ad23c4ab18d82b08cd1e4a12f389533cc9690163fed90c05d471375fadd074c99a235105e837
diff --git a/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.1.3.ebuild b/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.1.3.ebuild
new file mode 100644
index 000000000000..8efcc2e7e4ec
--- /dev/null
+++ b/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.1.3.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{5,6} )
+
+inherit eutils qmake-utils python-single-r1
+
+DESCRIPTION="Cross-platform application for configuring any YubiKey over all USB transports"
+HOMEPAGE="https://developers.yubico.com/yubikey-manager-qt https://github.com/Yubico/yubikey-manager-qt"
+SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+DEPEND="${PYTHON_DEPS}
+	>=app-crypt/yubikey-manager-1.0.0[${PYTHON_USEDEP}]
+	<app-crypt/yubikey-manager-4.0.0[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/pyotherside[${PYTHON_USEDEP}]
+	dev-qt/qtcore:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgraphicaleffects:5
+	dev-qt/qtgui:5
+	dev-qt/qtquickcontrols:5[widgets]
+	dev-qt/qtquickcontrols2:5[widgets]
+	dev-qt/qtsingleapplication[qt5(+),X]
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+	default
+
+	sed -i -e "s/ykman-cli//" ${PN}.pro || die
+	sed -e "/CONFIG += c++11/a CONFIG += qtsingleapplication" \
+		-i ykman-gui/ykman-gui.pro || die
+}
+
+src_configure() {
+	eqmake5
+}
+
+src_install() {
+	emake install INSTALL_ROOT="${D}"
+
+	domenu resources/ykman-gui.desktop
+	doicon -s 128 resources/icons/ykman.png
+	doicon -s scalable resources/icons/ykman.svg
+
+	einstalldocs
+}
diff --git a/app-crypt/yubikey-manager/Manifest b/app-crypt/yubikey-manager/Manifest
index f56a256617f6..04af54a3b67d 100644
--- a/app-crypt/yubikey-manager/Manifest
+++ b/app-crypt/yubikey-manager/Manifest
@@ -1,7 +1,9 @@
 DIST yubikey-manager-2.0.0.tar.gz 102078 BLAKE2B a2b8f90dabefb1014881cbe709222bf5cb48c9f409b415a8a2b27d7101c2da6189d0ebfe21a2701d10798c48c44e546659f9424ba6bf9257f7311abb0fc90b9b SHA512 42bebb88ba78bcce00a228109d0b4c815b3242ddbe43fd26c1209ba8666eb033ab77d5acd39a157e8310ce327de8d38bf88cfa0ffaed6273236b220c39e72e3b
 DIST yubikey-manager-2.1.1.tar.gz 101672 BLAKE2B baafce3850c0cbed842508c93ec4ad71e0eebbd0dcc61833b245b6c62f74b7215519cb8b1ec82df3be8c7677ec24447193a0121e0a63e67615453c2c6032fc0a SHA512 2c5990d9421acf93113347e9b9d33af893765ae9c5d9e6c9c4f2db1274b84cd839c15ae74327bdcbe9ec32ebdbcbed95b172b8b13ac00bbeb17eb06b6dd71ccd
 DIST yubikey-manager-3.0.0.tar.gz 138225 BLAKE2B 8506f7cc4d6579c1905d565d5d32a7e745389000ff67786e5b5e6bc54793230321e5f0f4840c625cae0a4d9d2893b75910bebb3207cfc75189d3a4876838a712 SHA512 47ae785356c256f31e118f2df483d3a0d7fb7b5b380fd7cd207334daaa47319855bde41931099f9acb6b310d4ba824540ab5d3008384fd4d6a373da7355b18eb
+DIST yubikey-manager-3.1.0.tar.gz 115010 BLAKE2B 1b27b9af7f3adac87a1bca58929bffef2ae397b359f70580a07193d2bd2f8cd4d2d867053f6494f1e262668443388d79dfe3775f2c3d0a5528840df8826cdf91 SHA512 518eedb52cfcf725c13114c433f848b97f711e94fa9c71685916fb8cb20e5bfc431f648b0ec710ef9ebed2bc8ddd8722ca1c9865d7a1b29537b719e167ed5f60
 EBUILD yubikey-manager-2.0.0.ebuild 1678 BLAKE2B 519239065e438c2a3f0e97a716ee495cbf770d73b12dda8bfd90df1d943236e1c5b0a20c767ced6e5a0c7c771af829e1dc849a0b57bf86a74f79e1e6613ca89f SHA512 61582c69457763de6fe944e901cc9c9d97324b626f69dae985ac623c6d1e7ea7f7d9034f482748c4ad363745daa29d52d7639067ce4409ee8ff0c0a0a596e589
 EBUILD yubikey-manager-2.1.1.ebuild 1533 BLAKE2B 93c2a2dcb1e14699c11a36c771914b0915e4f41e887d2acbaa9c7372a762e0940528da47014a261e938acd2475f599c49841b0efd4e77b0327f6bd6cfb54b69e SHA512 d3233a47e12e149b97184538cb3797db980100378bf2eb2d23a852660c47f3757d6cc36deab88f82fad991df0b076d4e6f6c1800adf98810d8f8f7c90cbbb57f
 EBUILD yubikey-manager-3.0.0.ebuild 1541 BLAKE2B a8bec0a494151e58e745a7668eaec3f12568789f5dda1c5c70508e289fc1d3549dd5b64fdd370c315f16e97ff235c9237c6bf1bda884cccc621e067940076a66 SHA512 7f12544ea492310409574aa7b4c4429d72c9e8eecec3291923813d515ac744488361d518c712536e12263150a771917e7ce7051e6ba4e29c686e2003f194aa46
+EBUILD yubikey-manager-3.1.0.ebuild 1541 BLAKE2B a8bec0a494151e58e745a7668eaec3f12568789f5dda1c5c70508e289fc1d3549dd5b64fdd370c315f16e97ff235c9237c6bf1bda884cccc621e067940076a66 SHA512 7f12544ea492310409574aa7b4c4429d72c9e8eecec3291923813d515ac744488361d518c712536e12263150a771917e7ce7051e6ba4e29c686e2003f194aa46
 MISC metadata.xml 466 BLAKE2B 258688bf55e0d7d5d13a45996c2177d2154626a75ffd0c5b39cbc5c3f83979a00ec1d9a993870c00785d0e1d02cdeb1dadfa38f39d91b5992c5b495f644c6253 SHA512 6355c94235c5a7a9dbe37fb954d7de5807bbd48d62921f819da7ac1c56f0214820cbf74b2f91311573f8a1726b05960d944b536fbf0e0f27fe49a5aa0a827e1b
diff --git a/app-crypt/yubikey-manager/yubikey-manager-3.1.0.ebuild b/app-crypt/yubikey-manager/yubikey-manager-3.1.0.ebuild
new file mode 100644
index 000000000000..cf74d5ba3a68
--- /dev/null
+++ b/app-crypt/yubikey-manager/yubikey-manager-3.1.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+inherit readme.gentoo-r1 distutils-r1
+
+DESCRIPTION="Python library and command line tool for configuring a YubiKey"
+HOMEPAGE="https://developers.yubico.com/yubikey-manager/"
+# Per https://github.com/Yubico/yubikey-manager/issues/217, Yubico is
+# the official source for tarballs, not Github
+SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-python/click[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7)
+	>=dev-python/fido2-0.7.0[${PYTHON_USEDEP}]
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	dev-python/pyscard[${PYTHON_USEDEP}]
+	dev-python/pyusb[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	>=sys-auth/ykpers-1.19.0
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' 'python2_7')
+	)
+"
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	local DOC_CONTENTS
+
+	distutils-r1_python_install_all
+
+	DOC_CONTENTS="
+		The 'openpgp' command may require the package 'app-crypt/ccid'
+		to be installed on the system. Furthermore, make sure that pcscd
+		daemon is running and has correct access permissions to USB
+		devices.
+	"
+	readme.gentoo_create_doc
+
+	doman "${S}"/man/ykman.1
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
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 /app-crypt
parent	30d6f67c98d149508509d5e86f176d558793acc0 (diff)