gentoo resync : 11.07.2019

30 files changed, 230 insertions, 393 deletions

diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 61c6144e831d..7adbfc132f19 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/acme-tiny/Manifest b/app-crypt/acme-tiny/Manifest
index 5dc52faa60cf..c994fb6503ac 100644
--- a/app-crypt/acme-tiny/Manifest
+++ b/app-crypt/acme-tiny/Manifest
@@ -3,4 +3,4 @@ DIST acme-tiny-4.0.4.tar.gz 12667 BLAKE2B 6177d639a2d65080f84ca93400405c01ef18cb
 EBUILD acme-tiny-4.0.3.ebuild 1133 BLAKE2B 55cc688ae27fae88bf34852ec824350d749ca9c84ae25d796aa4557a9497c6e276f5fdad2d0c245572b279940416c54b8cfb7afce1a04a007c1a5425da452d8d SHA512 06696e621482759d87705c9f4dbc67d52358519fae9888f1071e9dd01318c9feaf9495d3ac46bf785975123e611e3975c5a88a8dbf5509cfad3b408b1ffd604f
 EBUILD acme-tiny-4.0.4.ebuild 1131 BLAKE2B e9a4666685882c6ce0fce651105dde93582bf1a8d81a1b4bcc4804bdd13d453f1662b4f3369c7439bd2c3cba88754c05e7083ec437bb0d413481370f7310b2e9 SHA512 15eaa831e05bbfa9fef167815ec2646917b5dc737424d07e68cd52cdc60a2cf79ff37a069dc69cdfdbb765da9c5bb696d34d071816a9e54c3408cce3383f4f14
 EBUILD acme-tiny-9999.ebuild 1127 BLAKE2B 87adcc8df8293ee8746e5b4e16355f1fbc77520ef1bd43d8880377c630ec7b5e85b69e8b0f7d5f948bd44a287ba61383c827523e4e8bb86c0e5a7e1f71b3cab2 SHA512 c91a264afc6f115d27830179fb10d322365a65afeed1970d3b377e55deb033a8fef72b3c1e3a3f2fdec535c84b0d09ae511cfca3c88d28461da4b93bb744ff98
-MISC metadata.xml 537 BLAKE2B 4a0d07d4bc178878c177385619bca1c65b90cd41ce91084f5a5d5652735e2d714b86404049aeec4a6b79358d565ff8d9b8ed7fef87c6713c7afe388c41bd1b9d SHA512 d223702ebf46114ad3b12e03f5bbb9b56741cf67f3c3f7c0421f5c7e8bd66f26aeb3dda7f93730f9166e11d29240b4c0471e83043290b8da15e1fe7e5204e4c1
+MISC metadata.xml 429 BLAKE2B 101ebd6c130b6955951254d1c7e759dbf7d5dc08d899c2bf1793e3e73ad2aec4761782d9bcbd708a42a0217cda22255fb645cc6f88792aa0a5445c6b2df79289 SHA512 7c0ff5126424ad18a75bd73fdab208397aedf79df6c6a3fc776efe1000ac9f41e3cd056e65da68fbba507940328c0308074ce9335c4be38a8197f7545728d9da
diff --git a/app-crypt/acme-tiny/metadata.xml b/app-crypt/acme-tiny/metadata.xml
index b009e2c6b3e2..1e492cbeec20 100644
--- a/app-crypt/acme-tiny/metadata.xml
+++ b/app-crypt/acme-tiny/metadata.xml
@@ -5,10 +5,6 @@
 		<email>NP-Hardass@gentoo.org</email>
 		<name>NP-Hardass</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>vdupras@gentoo.org</email>
-		<name>Virgil Dupras</name>
-	</maintainer>
 	<longdescription>
 		A tiny, auditable script for Let's Encrypt's ACME Protocol
 	</longdescription>
diff --git a/app-crypt/dehydrated/Manifest b/app-crypt/dehydrated/Manifest
index d895105d1984..49ee4bc796d3 100644
--- a/app-crypt/dehydrated/Manifest
+++ b/app-crypt/dehydrated/Manifest
@@ -1,12 +1,5 @@
 AUX 00_gentoo.sh 115 BLAKE2B f24fe757e45d9af58adb9417ef6dbd36c5db85bdc50af1403048a01625dac68e649fee2913ed2c9f199ec285666cb4b9100650b3b1b54929005260c2182adb49 SHA512 2092f8bffbc6b34fa806276194873fed42146d8c8a434bb68088e03ec9eb0a2e0c1862a9ade67d56a6bd553119cd00f8815353b71345e451039254708430e52b
 AUX cron 71 BLAKE2B 88ec5a0d8618bc9e058d4cb3fedb0f74a530828bf63dd58a267386bd3ed2c3b647a642bfca14f6b05161d13266983bf5672787c7fc5c44e55d953ebebf346259 SHA512 0a8ac29abf2ce84b7b429ec969a3fcbfbab3ba0ed854237efa9bc86eb62859138b027f8879e016d4bedabc788ead0bb5d55ea5b629687c0c980cb63b225852b6
-DIST dehydrated-0.4.0.tar.gz 74005 BLAKE2B ad55b7c53be0bc0c08ff372171638e9739a6213062b45c36e6ca5bce205b35d097bcffb6d1db6cd9c01f46a6ea31143cd2713bffb5e19f91041969e96a3cc337 SHA512 3c8c0f2fab57a432b69451f8372c02666dd953985679d12a2af9f6b917335b5b10a1196699106e317660039178ce1139a4d5455d4825a152b6911596fba16738
-DIST dehydrated-0.6.1.tar.gz 76693 BLAKE2B 5ecca2942aedc024e87e7b5aac05d836adbbc8bb1dfb38bfcd396a63e9d3e8637d625e279c4e5a47514c0b4f27006226dad7257a620da49c426c256e5267a33d SHA512 c3ef92da4e0e12100d267422eb2667607842f6fb0fe10cbc4d10aee9b5137d292db2348eca34b1f492e21c6c325dcbb595a9ab4de634e4d4a43346be1e2ce0ad
-DIST dehydrated-0.6.2.tar.gz 77819 BLAKE2B 5a1cc097b42d5c4d9513b5a13c86f0b101b3442fb6cfbe54563357095619764724a2158e050a8e8b13a60a9effe83a5339ec647ef5a93622c8d63f1fcdb72be8 SHA512 97cce8f4936482d6b3a7d4227d8735b1c91f3b6cb7c728669a4a5139605932a88171c7e5d715d269782f260454d06ee95a0f6cd2735521e22c4f69bdc3e38f86
 DIST dehydrated-0.6.5.tar.gz 82274 BLAKE2B 3c8138bafdaab9c60db1463860d6c16dd0fb8e686f368e55a4fa010d004f350d03cdd161dde38361411506959f896a25ef802b76432c0fcd89a69d75fe1be9c9 SHA512 da8ff3ecb7ddeb25356469fa272aef4e7c3705049caf88d09656dbc4baf29e0efa135e6f154c78cec82da17a27a78f2145ee3b7bd71521a080e10550d09b8a53
-EBUILD dehydrated-0.4.0-r3.ebuild 1554 BLAKE2B 3fbd4b2d0eda6858f085d2644709897faefbfab26855e37682b7f45a4d262bf80c8a72f8d757df94179f72b7b9a94e7b163cdfcde7d8a72f5e5cf655e05b2e4d SHA512 619e37279c8f7070d2e74f15033d7b6d098479b1837d73cdc9789b6a810160643b2561f268a63acc712abad365ee645150c76bd8c6f5c35e75d734dd3ec280c4
-EBUILD dehydrated-0.6.1.ebuild 1569 BLAKE2B 543ed28a4ff57bc5306f939e4ce0131af9434a437b867fee4e28ca4b0fec39478a370d97d0e3eec02b169c72e405170ad9d89a8f733a7a6f7936d9a49ae7b4a9 SHA512 9d5f30868d67e3e8bc8968142e5f27cb39aa5ff71897c993c15af598d5caf33329ae85947befda40a956ad7c10f78853d3269cc54f908885466cea47680eabec
-EBUILD dehydrated-0.6.2-r1.ebuild 1636 BLAKE2B c7305b457f7d65393e788669acc21d6cce4a87122990e0207301af0bf4d22990c31bb5be8bba517a0b1b5b0601bf4a036107b542771578c0941d402e869ee6c8 SHA512 4f98b4832cf47b15edb2c650d13687ef5bbd20c59e3e433c3be097cd4541ff83237b71df3aec78c0ffdae588224362c17befc85ce08e02595091179aa13a53e4
-EBUILD dehydrated-0.6.2.ebuild 1569 BLAKE2B 543ed28a4ff57bc5306f939e4ce0131af9434a437b867fee4e28ca4b0fec39478a370d97d0e3eec02b169c72e405170ad9d89a8f733a7a6f7936d9a49ae7b4a9 SHA512 9d5f30868d67e3e8bc8968142e5f27cb39aa5ff71897c993c15af598d5caf33329ae85947befda40a956ad7c10f78853d3269cc54f908885466cea47680eabec
-EBUILD dehydrated-0.6.5.ebuild 1641 BLAKE2B 10b7e552846873b8052f89354f2d6ef2b5996dafbc03f254100f5b914cb25725ddc1f3788d57d0f912629a9fec00eea638b12fafab92f5fc8dc158972970c430 SHA512 a767ffd2b984393178caaa0449ed1da6fbb31217c74c7a8fe6c681208fb90a95766ba892b1945fdad35fd7b8d9e5584894f56a681e9ba52a36a62ba184a89fa5
+EBUILD dehydrated-0.6.5.ebuild 1670 BLAKE2B a56a2e470747449996491568e960a663b9b45d58d22e0ae242ecb91d4b3b03024c4b7ba74b632cffc945094a55b2f03c25ed2b281f973e27431c4ca343b942be SHA512 619518a0d6224ac0cac0d08e796ab34d456b500f39afe54fc226c191d26bcdf2f7acaa11e50f96b798ff8e6d0930193872613b04b8ffbaf9b83370e9f1342bac
 MISC metadata.xml 531 BLAKE2B dcd597fde3bafe2970275a99609546b1a2ef764729cd410a62389a29f8ce95e269f2155970503e041c937a28026c3d70763c86f492c4a8a3478026125eb5eecc SHA512 fe42f3b7b8ca0d2f18d389348599f468eaa80928a05fa7151bae23f5dd73d260fca6ebd3a701eed450b639438e44ca038aef420732e92ab9ddc672c0022bfbdd
diff --git a/app-crypt/dehydrated/dehydrated-0.4.0-r3.ebuild b/app-crypt/dehydrated/dehydrated-0.4.0-r3.ebuild
deleted file mode 100644
index 04a980e238ad..000000000000
--- a/app-crypt/dehydrated/dehydrated-0.4.0-r3.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit user
-
-DESCRIPTION="a client for signing certificates with an ACME-server"
-HOMEPAGE="https://github.com/lukas2511/dehydrated"
-SRC_URI="https://github.com/lukas2511/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="virtual/cron"
-RDEPEND="
-	${DEPEND}
-	app-shells/bash
-"
-
-src_configure() {
-	default
-	sed -i  's,^#CONFIG_D=.*,CONFIG_D="/etc/dehydrated/config.d",' docs/examples/config || die "could not set config (CONFIG_D)"
-}
-
-src_install() {
-	dobin "${PN}"
-	insinto "/etc/${PN}"
-	doins docs/examples/{config,domains.txt,hook.sh}
-	dodoc docs/*.md
-
-	insinto /etc/"${PN}"/config.d
-	doins "${FILESDIR}"/00_gentoo.sh
-
-	insinto "/etc/cron.d"
-	newins "${FILESDIR}"/cron "${PN}"
-
-	dodir /etc/"${PN}"/config.d
-	keepdir /etc/"${PN}"/config.d
-
-	default
-}
-
-pkg_preinst() {
-	enewgroup "${PN}"
-	enewuser "${PN}" -1 -1 /var/lib/"${PN}" "${PN}"
-}
-
-pkg_postinst() {
-	if [[ "${REPLACING_VERSIONS}" =~ (0\.3\.1|0\.4\.0) ]]; then
-		ewarn ""
-		ewarn "The new default BASEDIR is now '/var/lib/dehydrated'"
-		ewarn "Please consider migrating your data with a command like"
-		ewarn ""
-		ewarn "  'mv -v /etc/dehydrated/{accounts,archive,certs,lock} /var/lib/dehydrated'"
-		ewarn ""
-		ewarn "and make sure BASEDIR is set to '/var/lib/dehydrated'"
-		ewarn ""
-	fi
-	einfo "See /etc/dehydrated/config for configuration."
-	einfo "After finishing setup you should enable the cronjob in /etc/cron.d/dehydrated."
-}
diff --git a/app-crypt/dehydrated/dehydrated-0.6.1.ebuild b/app-crypt/dehydrated/dehydrated-0.6.1.ebuild
deleted file mode 100644
index a04c83040fd4..000000000000
--- a/app-crypt/dehydrated/dehydrated-0.6.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit user
-
-DESCRIPTION="a client for signing certificates with an ACME-server"
-HOMEPAGE="https://github.com/lukas2511/dehydrated"
-SRC_URI="https://github.com/lukas2511/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="virtual/cron"
-RDEPEND="
-	${DEPEND}
-	app-shells/bash
-	net-misc/curl
-"
-
-src_configure() {
-	default
-	sed -i  's,^#CONFIG_D=.*,CONFIG_D="/etc/dehydrated/config.d",' docs/examples/config || die "could not set config (CONFIG_D)"
-}
-
-src_install() {
-	dobin "${PN}"
-	insinto "/etc/${PN}"
-	doins docs/examples/{config,domains.txt,hook.sh}
-	dodoc docs/*.md
-
-	insinto /etc/"${PN}"/config.d
-	doins "${FILESDIR}"/00_gentoo.sh
-
-	insinto "/etc/cron.d"
-	newins "${FILESDIR}"/cron "${PN}"
-
-	dodir /etc/"${PN}"/config.d
-	keepdir /etc/"${PN}"/config.d
-
-	default
-}
-
-pkg_preinst() {
-	enewgroup "${PN}"
-	enewuser "${PN}" -1 -1 /var/lib/"${PN}" "${PN}"
-}
-
-pkg_postinst() {
-	if [[ "${REPLACING_VERSIONS}" =~ (0\.3\.1|0\.4\.0) ]]; then
-		ewarn ""
-		ewarn "The new default BASEDIR is now '/var/lib/dehydrated'"
-		ewarn "Please consider migrating your data with a command like"
-		ewarn ""
-		ewarn "  'mv -v /etc/dehydrated/{accounts,archive,certs,lock} /var/lib/dehydrated'"
-		ewarn ""
-		ewarn "and make sure BASEDIR is set to '/var/lib/dehydrated'"
-		ewarn ""
-	fi
-	einfo "See /etc/dehydrated/config for configuration."
-	einfo "After finishing setup you should enable the cronjob in /etc/cron.d/dehydrated."
-}
diff --git a/app-crypt/dehydrated/dehydrated-0.6.2-r1.ebuild b/app-crypt/dehydrated/dehydrated-0.6.2-r1.ebuild
deleted file mode 100644
index 694bacc6a0fe..000000000000
--- a/app-crypt/dehydrated/dehydrated-0.6.2-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit user
-
-DESCRIPTION="a client for signing certificates with an ACME-server"
-HOMEPAGE="https://github.com/lukas2511/dehydrated"
-SRC_URI="https://github.com/lukas2511/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
-IUSE="+cron"
-
-DEPEND="cron? ( virtual/cron )"
-RDEPEND="
-	${DEPEND}
-	app-shells/bash
-	net-misc/curl
-"
-
-src_configure() {
-	default
-	sed -i  's,^#CONFIG_D=.*,CONFIG_D="/etc/dehydrated/config.d",' docs/examples/config || die "could not set config (CONFIG_D)"
-}
-
-src_install() {
-	dobin "${PN}"
-	insinto "/etc/${PN}"
-	doins docs/examples/{config,domains.txt,hook.sh}
-	dodoc docs/*.md
-
-	insinto /etc/"${PN}"/config.d
-	doins "${FILESDIR}"/00_gentoo.sh
-
-	if use cron ; then
-		insinto "/etc/cron.d"
-		newins "${FILESDIR}"/cron "${PN}"
-	fi
-
-	dodir /etc/"${PN}"/config.d
-	keepdir /etc/"${PN}"/config.d
-
-	default
-}
-
-pkg_preinst() {
-	enewgroup "${PN}"
-	enewuser "${PN}" -1 -1 /var/lib/"${PN}" "${PN}"
-}
-
-pkg_postinst() {
-	if [[ "${REPLACING_VERSIONS}" =~ (0\.3\.1|0\.4\.0) ]]; then
-		ewarn ""
-		ewarn "The new default BASEDIR is now '/var/lib/dehydrated'"
-		ewarn "Please consider migrating your data with a command like"
-		ewarn ""
-		ewarn "  'mv -v /etc/dehydrated/{accounts,archive,certs,lock} /var/lib/dehydrated'"
-		ewarn ""
-		ewarn "and make sure BASEDIR is set to '/var/lib/dehydrated'"
-		ewarn ""
-	fi
-	einfo "See /etc/dehydrated/config for configuration."
-	use cron && einfo "After finishing setup you should enable the cronjob in /etc/cron.d/dehydrated."
-}
diff --git a/app-crypt/dehydrated/dehydrated-0.6.2.ebuild b/app-crypt/dehydrated/dehydrated-0.6.2.ebuild
deleted file mode 100644
index a04c83040fd4..000000000000
--- a/app-crypt/dehydrated/dehydrated-0.6.2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit user
-
-DESCRIPTION="a client for signing certificates with an ACME-server"
-HOMEPAGE="https://github.com/lukas2511/dehydrated"
-SRC_URI="https://github.com/lukas2511/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="virtual/cron"
-RDEPEND="
-	${DEPEND}
-	app-shells/bash
-	net-misc/curl
-"
-
-src_configure() {
-	default
-	sed -i  's,^#CONFIG_D=.*,CONFIG_D="/etc/dehydrated/config.d",' docs/examples/config || die "could not set config (CONFIG_D)"
-}
-
-src_install() {
-	dobin "${PN}"
-	insinto "/etc/${PN}"
-	doins docs/examples/{config,domains.txt,hook.sh}
-	dodoc docs/*.md
-
-	insinto /etc/"${PN}"/config.d
-	doins "${FILESDIR}"/00_gentoo.sh
-
-	insinto "/etc/cron.d"
-	newins "${FILESDIR}"/cron "${PN}"
-
-	dodir /etc/"${PN}"/config.d
-	keepdir /etc/"${PN}"/config.d
-
-	default
-}
-
-pkg_preinst() {
-	enewgroup "${PN}"
-	enewuser "${PN}" -1 -1 /var/lib/"${PN}" "${PN}"
-}
-
-pkg_postinst() {
-	if [[ "${REPLACING_VERSIONS}" =~ (0\.3\.1|0\.4\.0) ]]; then
-		ewarn ""
-		ewarn "The new default BASEDIR is now '/var/lib/dehydrated'"
-		ewarn "Please consider migrating your data with a command like"
-		ewarn ""
-		ewarn "  'mv -v /etc/dehydrated/{accounts,archive,certs,lock} /var/lib/dehydrated'"
-		ewarn ""
-		ewarn "and make sure BASEDIR is set to '/var/lib/dehydrated'"
-		ewarn ""
-	fi
-	einfo "See /etc/dehydrated/config for configuration."
-	einfo "After finishing setup you should enable the cronjob in /etc/cron.d/dehydrated."
-}
diff --git a/app-crypt/dehydrated/dehydrated-0.6.5.ebuild b/app-crypt/dehydrated/dehydrated-0.6.5.ebuild
index 0e0ffeaaf3b4..fab5c7c8615d 100644
--- a/app-crypt/dehydrated/dehydrated-0.6.5.ebuild
+++ b/app-crypt/dehydrated/dehydrated-0.6.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/lukas2511/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 arm arm64 x86"
 IUSE="+cron"
 
 DEPEND="cron? ( virtual/cron )"
@@ -30,6 +30,7 @@ src_install() {
 	dobin "${PN}"
 	insinto "/etc/${PN}"
 	doins docs/examples/{config,domains.txt,hook.sh}
+	fperms u+x "/etc/${PN}/hook.sh"
 	dodoc docs/*.md
 
 	insinto /etc/"${PN}"/config.d
diff --git a/app-crypt/gcr/Manifest b/app-crypt/gcr/Manifest
index b77a52b58720..cdd2e9ab4f7a 100644
--- a/app-crypt/gcr/Manifest
+++ b/app-crypt/gcr/Manifest
@@ -3,5 +3,5 @@ DIST gcr-3.28.0.tar.xz 1329044 BLAKE2B b35bca9b62605c4e0c3d71604ea5e6b7cdd97bb32
 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 1895 BLAKE2B 5874bd9a9a434f2d5917eef7c8c99517d6faf64c5e6a05f461f40074f643ef1db7aa138f19e0cb1571b59e673e06103310910de5e2acda8741e8191550198a0e SHA512 72811890019eeced2d3902b6472e944499aa29a666fad9cfd48f80f67f14cdc34921470faf28e1db2eb8aaee50f82a30cdeb7c60d3532375e702727a07bd9309
+EBUILD gcr-3.28.1.ebuild 1894 BLAKE2B 5e0d5858ec93f87c09ba96f2b03722f7e0c9fa8de7e20cdae70ff4f75bb0d881669edef76e3e765d917297e1b08aead235dd9a59f52e502535053e2a27a13939 SHA512 1897363a57505094e306dfc726aa925edcbb082730000a5579218270bba1af0adf7139ce7abd4c4a992bc64cb1acdd39a3ac567c72c44013bfbf9c6982ca302a
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-crypt/gcr/gcr-3.28.1.ebuild b/app-crypt/gcr/gcr-3.28.1.ebuild
index 1d728a8b4e97..6350c06896f0 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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 
 COMMON_DEPEND="
 	>=app-crypt/p11-kit-0.19
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index 59eb5f5e71c8..7e50d7c34036 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -6,6 +6,7 @@ DIST gnupg-2.2.12.tar.bz2 6682303 BLAKE2B 8470ab8bf386d3524ce57ef1a1f6ac74d8cf2d
 DIST gnupg-2.2.14.tar.bz2 6707735 BLAKE2B feedb1c776e8d43e43905e8a8c1487bd88e8effc59e94baf308cb29a5feea5d9c666c78b50147d65a259dc89af241c2a2bf07a72c417617e5238e0fdbbc2b17f SHA512 9d5216dee085efe6de300579d8fb773a5a55df639d5a435708611a974df522dd60dc995fbfcaad98065475dbeb731bbba19ecc3273e78b9b45fccff640dde69b
 DIST gnupg-2.2.15.tar.bz2 6705912 BLAKE2B 145bd174cb74c6a1180de76a6d46b40d2434ced61bb9aa3eaddeb0079cd05634529c9b062e475d3ca9d35b3af3b62b39a79ef0efbb476cb9ebb9e2099ad13ae0 SHA512 7c6f0092d384fd71fc7a1c905ce23ae98df42ce131ee09fc190c275f9c8d0912be344b0782244cccb5b3938322ef3cfff8ed1ec7e949e761478b8c5110dde36a
 DIST gnupg-2.2.16.tar.bz2 6699113 BLAKE2B 7738c5d9d5789dc56b4429e2b62403859365b53c834b0c53a6387fb77f1242ec4b0195205394f01e64fac6c7ce1235738421ea04bc6fb843c3fea1c10a243217 SHA512 0e0040905cc4d1d9d29e184cfeda520b43990e4ec459212537c0ce6092de987157e05b1d1a3022398d9b3cbaeea0f58a7e686745f96933e5ac26be4229162247
+DIST gnupg-2.2.17.tar.bz2 6717554 BLAKE2B ad052a0d1e970fe7748563a0ffa105d427e3d9299237f15ce93aa47b676cc1fbf0691cf2112dd5b55ba5fc9d2a6988f999415dd5026d44c5cb4bfef9f99189cd SHA512 a3cd094addac62b4b4ec1683005a2bec761ea2aacf6daf904316b1819f4f6a41f256a8d9452cf28cad71b3e68228465baa27ae0eb1fa734fa91542ef0f159c5d
 EBUILD gnupg-1.4.21.ebuild 3345 BLAKE2B 611a2e3c8d3a47337a17891ce9df00d0aca121f827169ea1aec9cb8c44b3f38858e1c8d39d08985f71790127bbbe64b16f0293b368d8dc627700fc1cc31983d7 SHA512 14a708c00e98c76fa6ef1f2d878f84f63d8e110f85b35b9c40b6da80525af685df09ea83eb1dd1fce1fe3016b9e12a46c02c91f11ea78496c12301acbf04d257
 EBUILD gnupg-2.2.10.ebuild 3320 BLAKE2B 1309b03e28bd2d5af1f2caeedb145a0f3c0c87db1b78ee014d3938d1bafdf3d469885df8d3bd622f9cebc81ef706925d0a77e68a265bbaee93902cb0ea094f51 SHA512 26211aacc1393429fe7459b58e1aa735e4cc1c278d7fcc774547fd9ada7adeaf35d297c65ca51ca927f6d304ffe8c78d874762c8649fc01e9dd259b2b2f52cda
 EBUILD gnupg-2.2.12.ebuild 3663 BLAKE2B ebc41be08f922215079e5f6975972a75355d068099edcb885a0b04ce0cd72010502ced08cab2890b3f65b71820d9b45e76695a865079add2bab15090bffa03bc SHA512 7294ee0c840da055910a7f3430ad164a9f93d8ade7624ecbeb3ff88b9818e422eee6259d58b9d201601b834b654b3eeaa169dc3d8e16113af1e9b4a9a3f46092
@@ -14,4 +15,5 @@ EBUILD gnupg-2.2.15-r1.ebuild 4510 BLAKE2B ace05abf02aa56cbceb46fd205398ca110b78
 EBUILD gnupg-2.2.15.ebuild 3701 BLAKE2B 0ee776c3eaff7d3583159ec4714ccdb8fb3484fb20d8e61c4fcfe95486fc892c57ac080d1680b05f9fd3fd97c334f50a6026e8a74d80ba0f7c3bec6c13810da2 SHA512 3bffcd8049007bee7d89a506df583f9228c12ef037edd1211c3fcfb629a6557c793959f44d8d33e16350309020cb29af4204accb88e4f80bd2a59573c7eb82de
 EBUILD gnupg-2.2.16-r1.ebuild 4559 BLAKE2B 0296c31e7c20dc25a49de6f6cb23c393cccfa1dab610eead32fca98b09e37c1ab84d9bd00ca2c613b1444649f949cc725e4d9c99f83b809257bcd38f882df9dd SHA512 6b5b67d717a6a6c23bb2cf6dad7c746aa7d4a20bad767a3e7916fb2bda76710e3c3ebf33d6eb4e4dad8bcb58b054d6c3c7bcc0b586a180243f1a288af0f08f80
 EBUILD gnupg-2.2.16.ebuild 4510 BLAKE2B ace05abf02aa56cbceb46fd205398ca110b785c38889fea575a32dc4e21bff0933112ccf6c59acd5bc1cb700e33349d67ab2af900cd7098f6874e2bef5b9c4da SHA512 8289b2921ed18514a81d80b7c685e691de2c1c0aff6159a354f2e0e86a0d5b788099b98ed7b8770a5fe5372207cd9779b42d638a25e954f629a537f8a6f4e2c6
+EBUILD gnupg-2.2.17.ebuild 4559 BLAKE2B 0296c31e7c20dc25a49de6f6cb23c393cccfa1dab610eead32fca98b09e37c1ab84d9bd00ca2c613b1444649f949cc725e4d9c99f83b809257bcd38f882df9dd SHA512 6b5b67d717a6a6c23bb2cf6dad7c746aa7d4a20bad767a3e7916fb2bda76710e3c3ebf33d6eb4e4dad8bcb58b054d6c3c7bcc0b586a180243f1a288af0f08f80
 MISC metadata.xml 1313 BLAKE2B 2bf26407bdea8af215d09d28640b961ee98c86c297595736fbe477c8b9cfaf0f8970982ce22038dabf0d8529e39032a3fec9da0c17a5acca0cf3cb197f31f1c0 SHA512 0500f03936eba67706cea87c1f5b16db280b159fc31780b93e696e8ab20e3dece90f0bd80af5aa9582cab557cc337c65e8e101daa935ba6ca31b7f126328c0ac
diff --git a/app-crypt/gnupg/gnupg-2.2.17.ebuild b/app-crypt/gnupg/gnupg-2.2.17.ebuild
new file mode 100644
index 000000000000..f559e78030f9
--- /dev/null
+++ b/app-crypt/gnupg/gnupg-2.2.17.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic systemd toolchain-funcs
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation"
+HOMEPAGE="http://www.gnupg.org/"
+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"
+IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl tofu tools usb user-socket wks-server"
+
+# Existence of executables is checked during configuration.
+DEPEND="!app-crypt/dirmngr
+	>=dev-libs/libassuan-2.5.0
+	>=dev-libs/libgcrypt-1.7.3
+	>=dev-libs/libgpg-error-1.28
+	>=dev-libs/libksba-1.3.4
+	>=dev-libs/npth-1.2
+	>=net-misc/curl-7.10
+	bzip2? ( app-arch/bzip2 )
+	ldap? ( net-nds/openldap )
+	readline? ( sys-libs/readline:0= )
+	smartcard? ( usb? ( virtual/libusb:1 ) )
+	ssl? ( >=net-libs/gnutls-3.0:0= )
+	sys-libs/zlib
+	tofu? ( >=dev-db/sqlite-3.7 )"
+
+RDEPEND="${DEPEND}
+	app-crypt/pinentry
+	nls? ( virtual/libintl )
+	selinux? ( sec-policy/selinux-gpg )
+	wks-server? ( virtual/mta )"
+
+BDEPEND="virtual/pkgconfig
+	doc? ( sys-apps/texinfo )
+	nls? ( sys-devel/gettext )"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=(
+	ChangeLog NEWS README THANKS TODO VERSION
+	doc/FAQ doc/DETAILS doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER
+)
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch"
+	"${FILESDIR}/${PN}-2.2.14-quiet-sending.patch"
+)
+
+src_configure() {
+	local myconf=()
+
+	if use prefix && use usb; then
+		# bug #649598
+		append-cppflags -I"${EPREFIX}/usr/include/libusb-1.0"
+	fi
+
+	if use elibc_SunOS || use elibc_AIX; then
+		myconf+=( --disable-symcryptrun )
+	else
+		myconf+=( --enable-symcryptrun )
+	fi
+
+	#bug 663142
+	if use user-socket; then
+		myconf+=( --enable-run-gnupg-user-socket )
+	fi
+
+	# glib fails and picks up clang's internal stdint.h causing weird errors
+	[[ ${CC} == *clang ]] && \
+		export gl_cv_absolute_stdint_h=/usr/include/stdint.h
+
+	# Hardcode mailprog to /usr/libexec/sendmail even if it does not exist.
+	# As of GnuPG 2.3, the mailprog substitution is used for the binary called
+	# by wks-client & wks-server; and if it's autodetected but not not exist at
+	# build time, then then 'gpg-wks-client --send' functionality will not
+	# work. This has an unwanted side-effect in stage3 builds: there was a
+	# [R]DEPEND on virtual/mta, which also brought in virtual/logger, bloating
+	# the build where the install guide previously make the user chose the
+	# logger & mta early in the install.
+
+	econf \
+		"${myconf[@]}" \
+		$(use_enable bzip2) \
+		$(use_enable nls) \
+		$(use_enable smartcard scdaemon) \
+		$(use_enable ssl gnutls) \
+		$(use_enable tofu) \
+		$(use smartcard && use_enable usb ccid-driver || echo '--disable-ccid-driver') \
+		$(use_enable wks-server wks-tools) \
+		$(use_with ldap) \
+		$(use_with readline) \
+		--with-mailprog=/usr/libexec/sendmail \
+		--disable-ntbtls \
+		--enable-all-tests \
+		--enable-gpg \
+		--enable-gpgsm \
+		--enable-large-secmem \
+		CC_FOR_BUILD="$(tc-getBUILD_CC)" \
+		GPG_ERROR_CONFIG="${EROOT}/usr/bin/${CHOST}-gpg-error-config" \
+		KSBA_CONFIG="${EROOT}/usr/bin/ksba-config" \
+		LIBASSUAN_CONFIG="${EROOT}/usr/bin/libassuan-config" \
+		LIBGCRYPT_CONFIG="${EROOT}/usr/bin/${CHOST}-libgcrypt-config" \
+		NPTH_CONFIG="${EROOT}/usr/bin/npth-config" \
+		$("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g')
+}
+
+src_compile() {
+	default
+
+	use doc && emake -C doc html
+}
+
+src_test() {
+	#Bug: 638574
+	use tofu && export TESTFLAGS=--parallel
+	default
+}
+
+src_install() {
+	default
+
+	use tools &&
+		dobin \
+			tools/{convert-from-106,gpg-check-pattern} \
+			tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys} \
+			tools/make-dns-cert
+
+	dosym gpg /usr/bin/gpg2
+	dosym gpgv /usr/bin/gpgv2
+	echo ".so man1/gpg.1" > "${ED}"/usr/share/man/man1/gpg2.1 || die
+	echo ".so man1/gpgv.1" > "${ED}"/usr/share/man/man1/gpgv2.1 || die
+
+	dodir /etc/env.d
+	echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg || die
+
+	use doc && dodoc doc/gnupg.html/* doc/*.png
+
+	systemd_douserunit doc/examples/systemd-user/*.{service,socket}
+}
+
+pkg_postinst() {
+	elog "See https://wiki.gentoo.org/wiki/GnuPG for documentation on gnupg"
+	elog
+	elog "If you wish to use 'gpg-wks-client --send', you must install an MTA!"
+}
diff --git a/app-crypt/libnitrokey/Manifest b/app-crypt/libnitrokey/Manifest
index 3297af5f11c4..e9c173c9b918 100644
--- a/app-crypt/libnitrokey/Manifest
+++ b/app-crypt/libnitrokey/Manifest
@@ -1,4 +1,4 @@
-DIST libnitrokey-3.3.tar.gz 76581 BLAKE2B 1a662fb94184355dc5cae2f8e3109fc82a96aed06c726e04c4fcfef3aef0423150ac1f4647e4bf3585de7805e70cd67534d72f1255c9f80b57afa2aec36fc9d3 SHA512 fe3b6c7bdeb78f736fe7aa7475880a293c516119ac049ff47ddbaba626f2d70addee4d0cd3a38ea706b94717f51c4fb56f687d5a9bb9f10895836c5adc98b11b
-EBUILD libnitrokey-3.3.ebuild 1144 BLAKE2B 93f37c6add38858d6c19d978f0c407cb84dad8440d28f25a320e0f74ee005ba73a10079c4312bf8b3660741987332f681f0d727d96a974edb2ee50a3ac737d1c SHA512 9ab98b973a550402b3189e4af1cba6018cbfe5019980d4eaa494fc4b00e33755182114af3763b821b91d8a2cb3bab53f2e927dcab08f88cd311c53004e99aad0
-EBUILD libnitrokey-9999.ebuild 1144 BLAKE2B 93f37c6add38858d6c19d978f0c407cb84dad8440d28f25a320e0f74ee005ba73a10079c4312bf8b3660741987332f681f0d727d96a974edb2ee50a3ac737d1c SHA512 9ab98b973a550402b3189e4af1cba6018cbfe5019980d4eaa494fc4b00e33755182114af3763b821b91d8a2cb3bab53f2e927dcab08f88cd311c53004e99aad0
+DIST libnitrokey-3.5.tar.gz 94356 BLAKE2B 9e53213f309e903d26e0e8e01ab213d6bc42c5b8d720e4b19f27adb607f20ad0c6e1707bf7b55c525efbd6a4fbf7b9c87983decf6b05dab7d03701ae0ea8277f SHA512 d2a95071e92d839c8cde4ac1435158bb469c25662f2988a4e824dbc0dfe83af841e6d04589293deddd77746dbec17b30c50fab69af58cc727ed5e0f2dbd0b5e7
+EBUILD libnitrokey-3.5.ebuild 1048 BLAKE2B 4a94192b8ca59009b7f06224e332acbcec2d40238c1cdbc0b8ea6c3e3dbfd3dcfdd0d5eaf7004ec1c5faac66392aa1c256a8c798625aa6b152ea39a97b687d49 SHA512 ad2ba4576a581cc5b59bdbb4f36147ed6adee78e3f72aabd8963d89247f8ad30b939247d42ec89614fd308b0413b93df4c2a8e4082a6e7ff31b986d2cd2d1838
+EBUILD libnitrokey-9999.ebuild 1048 BLAKE2B 4a94192b8ca59009b7f06224e332acbcec2d40238c1cdbc0b8ea6c3e3dbfd3dcfdd0d5eaf7004ec1c5faac66392aa1c256a8c798625aa6b152ea39a97b687d49 SHA512 ad2ba4576a581cc5b59bdbb4f36147ed6adee78e3f72aabd8963d89247f8ad30b939247d42ec89614fd308b0413b93df4c2a8e4082a6e7ff31b986d2cd2d1838
 MISC metadata.xml 397 BLAKE2B ec7996ade24566ed79175f047e18c18a7c51e3946c65c4b3cd986d3fe6372ed2a79ca13b6e2d0a21b5e907a2f8e27e7061ad9ce893ffbd93ead06c8814f4d00c SHA512 457d69deef3f3bcca1ac0b0a15d20ca03bf012523a03c311c5be065ad50a43ef5d7e0d7fb949a6a63f3198c35313d83e0e7a8ef882c1095234f93a2dd8be416e
diff --git a/app-crypt/libnitrokey/libnitrokey-3.3.ebuild b/app-crypt/libnitrokey/libnitrokey-3.5.ebuild
index a9e23e365158..d3474ddf0dc0 100644
--- a/app-crypt/libnitrokey/libnitrokey-3.3.ebuild
+++ b/app-crypt/libnitrokey/libnitrokey-3.5.ebuild
@@ -1,9 +1,8 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
 inherit cmake-utils udev
 
 DESCRIPTION="Support library for the Nitrokey"
@@ -30,14 +29,12 @@ RDEPEND="
 	virtual/udev"
 DEPEND="
 	${RDEPEND}
-	virtual/pkgconfig
-	test? ( >=dev-cpp/catch-2.2.0:0 )"
+	test? ( >=dev-cpp/catch-2.5.0:0 )"
+BDEPEND="virtual/pkgconfig"
 
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_INSTALL_UDEVRULESDIR="$(get_udevdir)"/rules.d
-		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
-		-DBUILD_SHARED_LIBS=ON
 
 		# actual hardware tests
 		#   1. require a connected Nitrokey
diff --git a/app-crypt/libnitrokey/libnitrokey-9999.ebuild b/app-crypt/libnitrokey/libnitrokey-9999.ebuild
index a9e23e365158..d3474ddf0dc0 100644
--- a/app-crypt/libnitrokey/libnitrokey-9999.ebuild
+++ b/app-crypt/libnitrokey/libnitrokey-9999.ebuild
@@ -1,9 +1,8 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
 inherit cmake-utils udev
 
 DESCRIPTION="Support library for the Nitrokey"
@@ -30,14 +29,12 @@ RDEPEND="
 	virtual/udev"
 DEPEND="
 	${RDEPEND}
-	virtual/pkgconfig
-	test? ( >=dev-cpp/catch-2.2.0:0 )"
+	test? ( >=dev-cpp/catch-2.5.0:0 )"
+BDEPEND="virtual/pkgconfig"
 
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_INSTALL_UDEVRULESDIR="$(get_udevdir)"/rules.d
-		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
-		-DBUILD_SHARED_LIBS=ON
 
 		# actual hardware tests
 		#   1. require a connected Nitrokey
diff --git a/app-crypt/libsecret/Manifest b/app-crypt/libsecret/Manifest
index bd21150932ab..fb25c7d9aefa 100644
--- a/app-crypt/libsecret/Manifest
+++ b/app-crypt/libsecret/Manifest
@@ -3,5 +3,5 @@ DIST libsecret-0.18.7.tar.xz 508392 BLAKE2B 9774df97c2abb362940c3b373e381afb82ee
 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.7.ebuild 2647 BLAKE2B d64cfb08b81738a7f0161c3b3204c5a9371bf4f5493760d06dcce5ba087d0d9cd7274475fff43d9cb265706c1721d0ba6a26456faecfe56ae4662dc9b3082675 SHA512 be27d948abff0e425af426600d95c4dbb484e542d0df9e453efcf81e738b3cd492c0c8aa4dfaa9bb2e46357c884598a770a7c8b81440b985086cf052ff68c615
-EBUILD libsecret-0.18.8.ebuild 2642 BLAKE2B ebec8550c92f762cc589136212a94cd719d6275499133b049ad306a6b88fd51ee2e4f4666d13e7a5825c625f3997b6f1e966ede3e46404184d4d8662a213398c SHA512 b73cc3f72230bd3a71ca8270cfe8b4f33408512efc6d310bfdc287119ed02860a5df7358d2e56871b993905008cba5438856fd61216e8f622392ed45ceb66558
+EBUILD libsecret-0.18.8.ebuild 2641 BLAKE2B 789217298995f5538fdf48382c11083ea84f7e218236df33382c8c69596d9752557f4ceb5ca0078e2846a7666a97bab8e6fcc71c0e1360f54a67d1462fcb8075 SHA512 0e9fcb2215ad9eb3ce9b17cf510070a69645e3c85382b6bf8371137e6f3ccd8ca3a7d356b892a94bc39fd7f82afebf07c0cfe0ea51df57ee1f7edcbf25b86c0d
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/app-crypt/libsecret/libsecret-0.18.8.ebuild b/app-crypt/libsecret/libsecret-0.18.8.ebuild
index 47c9215a9a69..d79ee33d4c96 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 ~amd64-fbsd"
 
 RDEPEND="
 	>=dev-libs/glib-2.44:2[${MULTILIB_USEDEP}]
diff --git a/app-crypt/nitrokey-app/Manifest b/app-crypt/nitrokey-app/Manifest
index a2e3e1bae745..3a4a4ac7acb2 100644
--- a/app-crypt/nitrokey-app/Manifest
+++ b/app-crypt/nitrokey-app/Manifest
@@ -1,6 +1,4 @@
-DIST nitrokey-app-1.3.1.tar.gz 1167832 BLAKE2B 803f2fd4476e17b55a2223e45f5db520b4590ed14745627de4f365661fa63c84855423acee927a952956167ebe21bcfe0fe8a46f4a69457006b36e8343a6d0d7 SHA512 d964e02fb3feadb130a6261921d87f8c4758723fab76b05c1ed45a5d0f46b5ec865b52b514dfc9aa4a87ce7b774c004fae951749e2322e3c3fff8f150196cd34
-DIST nitrokey-app-1.3.tar.gz 1132479 BLAKE2B 96a20ed4156137e13c0b0eb3f69edd537cf2a236781ba55d295b797a2a273ef3a412f27c2302c035569756146acb006752dd91d9176377f142e2a8c8108ef4a1 SHA512 b78830dee0957601b2e2de97ef267154e9b3444e9ef49e307f7aad5810e4184f1b5d5a278711431cac098e51217eda30d27425cd6a83040fb16bc27d6b1aec5b
-EBUILD nitrokey-app-1.3.1.ebuild 914 BLAKE2B 88dee3884a2974d8985e344bc3d23f9198108acd50cae3c8a91c72054e4012cb7260d2184351e007bfd424ce13a5091b8d82871306673d5ecf5eb5cb27695a6a SHA512 5930fc79a9c1962bb2277c8a8305ae3ad219db553214801b45773d3c62ae6621910292b474bd00183d4c43eabdc70d1dff9a96bb7b75475f06f01989fb105a48
-EBUILD nitrokey-app-1.3.ebuild 1012 BLAKE2B c7c13573c023e7b98f4f79b9e0333855171ef2bc5c38d734c2722cae2c41fcf87399c07bcd48436676bc63d7a84ef0b7059094ce6b7465f35e4b3cd584f75069 SHA512 66f7f0610ada624a2c5f687a145033d321b31c20a579eac74cc192969f212ece0ee8f2e491de099e93d22f3d551881a9f5f9383577a27fce6b8dab728a36c464
-EBUILD nitrokey-app-9999.ebuild 914 BLAKE2B 88dee3884a2974d8985e344bc3d23f9198108acd50cae3c8a91c72054e4012cb7260d2184351e007bfd424ce13a5091b8d82871306673d5ecf5eb5cb27695a6a SHA512 5930fc79a9c1962bb2277c8a8305ae3ad219db553214801b45773d3c62ae6621910292b474bd00183d4c43eabdc70d1dff9a96bb7b75475f06f01989fb105a48
+DIST nitrokey-app-1.4.tar.gz 1205541 BLAKE2B 3e2e3ed85aff85168f9669cd16df026cc2108c601998222f6f6411b19bc4f027541e2c9368f50d383c21bdf2f38d19c69559616d89f5736d4634973d686f2310 SHA512 e0a29bd312b5f8bd1a5bd09ac118b9191a9261341e31f59d355e119fce488c23978af804113f96a93d1b5301ad17e53c2cfaefc9f5ec3b37fdd1ba304325f8a9
+EBUILD nitrokey-app-1.4.ebuild 882 BLAKE2B 5ff121ed98b96662913b726f400b20e888a8fae24b3519a46d48061baed9d0d4199aef2cdcec8c590dc8ddd901df7958173d0712b95dae834b4963116edc7aa6 SHA512 a27c004d08d0e352af55943bf21bc182fbb3239ff381df5b7a4246e9d699fbf8a34cef154d2708b166637fc77222b5aab37db78f715a2f362459b4acdcea5e17
+EBUILD nitrokey-app-9999.ebuild 882 BLAKE2B 5ff121ed98b96662913b726f400b20e888a8fae24b3519a46d48061baed9d0d4199aef2cdcec8c590dc8ddd901df7958173d0712b95dae834b4963116edc7aa6 SHA512 a27c004d08d0e352af55943bf21bc182fbb3239ff381df5b7a4246e9d699fbf8a34cef154d2708b166637fc77222b5aab37db78f715a2f362459b4acdcea5e17
 MISC metadata.xml 399 BLAKE2B 622fa027d3ed6c95ea87e6c533289af1b66229f76bc163b490a8c5a819373c85d21ab22505c9a159a7598fdc17b1bfc7d01ff6217d3d8f8e64ef38f2d68d710e SHA512 fa204891e67b5c6f1ac7082fe49f52ae287f6aed77dd1fd8972770c7a5ddb7f2af71f543a3888c9f572dfb04197f98486a75ecba5960506274c634782af110ab
diff --git a/app-crypt/nitrokey-app/nitrokey-app-1.3.ebuild b/app-crypt/nitrokey-app/nitrokey-app-1.3.ebuild
deleted file mode 100644
index 1bd4aaad0693..000000000000
--- a/app-crypt/nitrokey-app/nitrokey-app-1.3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-inherit cmake-utils gnome2-utils
-
-DESCRIPTION="Cross platform personalization tool for the Nitrokey"
-HOMEPAGE="https://github.com/Nitrokey/nitrokey-app"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/Nitrokey/nitrokey-app"
-
-	# Disable pulling in bundled dependencies
-	EGIT_SUBMODULES=()
-else
-	SRC_URI="https://github.com/Nitrokey/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-
-RDEPEND="
-	app-crypt/libnitrokey:=
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5"
-DEPEND="
-	${RDEPEND}
-	dev-libs/cppcodec
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig"
-
-src_prepare() {
-	cmake-utils_src_prepare
-	sed -i '/^qt5_add_resources/d' CMakeLists.txt || die
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/app-crypt/nitrokey-app/nitrokey-app-1.3.1.ebuild b/app-crypt/nitrokey-app/nitrokey-app-1.4.ebuild
index f1ed0d3dfac3..69510a7dc8f1 100644
--- a/app-crypt/nitrokey-app/nitrokey-app-1.3.1.ebuild
+++ b/app-crypt/nitrokey-app/nitrokey-app-1.4.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-inherit cmake-utils gnome2-utils
+inherit cmake-utils xdg-utils
 
 DESCRIPTION="Cross platform personalization tool for the Nitrokey"
 HOMEPAGE="https://github.com/Nitrokey/nitrokey-app"
@@ -24,7 +23,7 @@ LICENSE="GPL-3"
 SLOT="0"
 
 RDEPEND="
-	app-crypt/libnitrokey:=
+	>=app-crypt/libnitrokey-3.5:=
 	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
@@ -32,14 +31,15 @@ RDEPEND="
 	dev-qt/qtwidgets:5"
 DEPEND="
 	${RDEPEND}
-	dev-libs/cppcodec
+	dev-libs/cppcodec"
+BDEPEND="
 	dev-qt/linguist-tools:5
 	virtual/pkgconfig"
 
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
diff --git a/app-crypt/nitrokey-app/nitrokey-app-9999.ebuild b/app-crypt/nitrokey-app/nitrokey-app-9999.ebuild
index f1ed0d3dfac3..69510a7dc8f1 100644
--- a/app-crypt/nitrokey-app/nitrokey-app-9999.ebuild
+++ b/app-crypt/nitrokey-app/nitrokey-app-9999.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-inherit cmake-utils gnome2-utils
+inherit cmake-utils xdg-utils
 
 DESCRIPTION="Cross platform personalization tool for the Nitrokey"
 HOMEPAGE="https://github.com/Nitrokey/nitrokey-app"
@@ -24,7 +23,7 @@ LICENSE="GPL-3"
 SLOT="0"
 
 RDEPEND="
-	app-crypt/libnitrokey:=
+	>=app-crypt/libnitrokey-3.5:=
 	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
@@ -32,14 +31,15 @@ RDEPEND="
 	dev-qt/qtwidgets:5"
 DEPEND="
 	${RDEPEND}
-	dev-libs/cppcodec
+	dev-libs/cppcodec"
+BDEPEND="
 	dev-qt/linguist-tools:5
 	virtual/pkgconfig"
 
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
diff --git a/app-crypt/nwipe/Manifest b/app-crypt/nwipe/Manifest
index a1c268c52bd1..0f7c56386f1f 100644
--- a/app-crypt/nwipe/Manifest
+++ b/app-crypt/nwipe/Manifest
@@ -1,5 +1,3 @@
-DIST nwipe-0.21.tar.gz 49298 BLAKE2B cec43ed196a215b4181446206d96cac4e72cb92a58e22588648bc28370de5d294944fbbcb94b96f42ebcef77b0fbc13356b94fb20e76963ac04903bc234c9b0a SHA512 0d083ac903889602ea5bd889b97f3dd3f1ac8c3737612394a68e9cc1fe44d387819be2aca563005b13e61d3406f080bfb279adbeffb106d3b489ac4748189aa2
 DIST nwipe-0.25.tar.gz 49608 BLAKE2B 3506093c3e93b4aa982dffdd2f922f525404b397d7b3469f9ccdbf6708f824e9d3a2e34590a34cb4e0411bb3a8a4555a1f5940b826d39d39c10c75b668a10d1d SHA512 1051f2565ad7acaac7c289e2db91aa4dee40c3bb9a9dda97b2dec047e94cd91e7d59fd61603806628cabeb009932f011e734638fc9191c22bb812d7b4b661b46
-EBUILD nwipe-0.21.ebuild 566 BLAKE2B 78491686da7a8db43ada46b8255921ecdea0704389876d0c3c303b4382161da24497d0466f2a0f4c7e2d69e8a9cc0bf1cf9ef73a968a3fb36273de1d301f39aa SHA512 16e0a2f56d4adc17af56f463a1a77bd34f7a0b751fda6e33f6859d6881af25f5fd981f43309affe1a43f7a63a7a73f9e710b9a8aa63ca2de1bfd5ef95e157929
 EBUILD nwipe-0.25.ebuild 563 BLAKE2B 86d067eaeb60a4b3d1629d8fbc4a1b87b3a1af0bbdaee1becda2a465b3eef784fb8b00f2d9a5f518155ad82db3e8a45bf75d2bb663ddcb3e8c6aaaa3e41dce43 SHA512 de5d1c66977fdecfb5b0a196c3504c5f61b1c26fc4957d490d012e87ec5a9af31d7655c62330cff3f3ce6f369193103f4337dec997457a55bd06251e3553558a
 MISC metadata.xml 325 BLAKE2B 7f200272a1bbd3a794cedae13459c0d339946dfcb07004474258144e65a82ff623fb8b132343f8e1a8ce9d4a30cf81e86724745aa9bd2a452d37201b658ac87f SHA512 7e34fed2902e5b4c88a73b8976a9d7e903e5149233d1bd8625485dd54a21f012fabf7585c5713bcba837ba15ae03656ad3fb1b51a110bc5c42e4a9ccb0728822
diff --git a/app-crypt/nwipe/nwipe-0.21.ebuild b/app-crypt/nwipe/nwipe-0.21.ebuild
deleted file mode 100644
index 2a2860c392f2..000000000000
--- a/app-crypt/nwipe/nwipe-0.21.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Securely erase disks using a variety of recognized methods"
-HOMEPAGE="https://github.com/martijnvanbrummelen/nwipe/"
-SRC_URI="https://github.com/martijnvanbrummelen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=sys-block/parted-2.3
-	>=sys-libs/ncurses-5.7-r7:="
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-	eautoreconf
-}
diff --git a/app-crypt/p11-kit/Manifest b/app-crypt/p11-kit/Manifest
index 6a7aa00f315a..9e927fd3f61b 100644
--- a/app-crypt/p11-kit/Manifest
+++ b/app-crypt/p11-kit/Manifest
@@ -1,5 +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.ebuild 1966 BLAKE2B 1206c4507d07eda081785b681500ff330f63a08b58bae8ec18a62b6cf7e6484f5f9647cc8b5cd5c9f08506b68191880e69f531dfa7105777b570861e28f4a264 SHA512 20436bddb6b3e615515dd263fca36fc0be2485b24cd455331fbc1647af9c39b9efc4158751de6580cc5e77d87df6aec760d4ac8410253d0806cdfc85e2999c27
-EBUILD p11-kit-0.23.16.1.ebuild 1977 BLAKE2B a937d8c5e932bea68cbc92a9293b7d5a68ec624d69d9769d1cc1d886391ac4653b3e94c2fa72d86016537bc9c0b4a09f00ba6fc8bff72f6cbf82ea67397fef92 SHA512 92499d081ea6adb01678301510123a2563222b6082ff7857a2e151ff8142f739894b747d79caa7ced9ea7699061c1ac65adc9953e165e528bc5798a87fa03c37
+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
 MISC metadata.xml 454 BLAKE2B 82db424896936d17b167806a47d54674d1d6eebe192ad1f8b4e985b00f74f10aa5f18ea587b866906571a91dcfda83626f6b25ebdbd6a6e02da65b34511b2b0e SHA512 24042c945cc3ab622b74c30eaa08819ebce4af9320b083ceb1f3f4db110fba6539121b4dbf0d245afdc395a9854bec022575861f7ae4e9418018d6bddbd4a888
diff --git a/app-crypt/p11-kit/files/p11-kit-0.23.12-mktime.patch b/app-crypt/p11-kit/files/p11-kit-0.23.12-mktime.patch
new file mode 100644
index 000000000000..7cc0baada973
--- /dev/null
+++ b/app-crypt/p11-kit/files/p11-kit-0.23.12-mktime.patch
@@ -0,0 +1,26 @@
+From 3d009fda4cb39157d6876e7d16cbc57f7b59bc86 Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Mon, 1 Jul 2019 13:38:25 +0300
+Subject: [PATCH] trust: do not allow daylight to invalidate date validation
+
+Issue: 235
+Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
+---
+ trust/builder.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/trust/builder.c b/trust/builder.c
+index d819dc8..2fc0c40 100644
+--- a/trust/builder.c
++++ b/trust/builder.c
+@@ -261,6 +261,7 @@ type_date (p11_builder *builder,
+ 		return false;
+ 
+ 	memcpy (&two, &tm, sizeof (tm));
++	two.tm_isdst = -1;	// do not perform tz fixup
+ 	if (mktime (&two) < 0)
+ 		return false;
+ 
+-- 
+2.21.0
+
diff --git a/app-crypt/p11-kit/p11-kit-0.23.12.ebuild b/app-crypt/p11-kit/p11-kit-0.23.12-r1.ebuild
index 1e38188fa1ae..acd2250428b5 100644
--- a/app-crypt/p11-kit/p11-kit-0.23.12.ebuild
+++ b/app-crypt/p11-kit/p11-kit-0.23.12-r1.ebuild
@@ -21,6 +21,10 @@ RDEPEND="asn1? ( >=dev-libs/libtasn1-3.4:=[${MULTILIB_USEDEP}] )
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
+PATCHES=(
+	"${FILESDIR}/${P}-mktime.patch"
+)
+
 pkg_setup() {
 	# disable unsafe tests, bug#502088
 	export FAKED_MODE=1
diff --git a/app-crypt/p11-kit/p11-kit-0.23.16.1.ebuild b/app-crypt/p11-kit/p11-kit-0.23.16.1-r1.ebuild
index ec7c6c32971e..6b1c88e6912b 100644
--- a/app-crypt/p11-kit/p11-kit-0.23.16.1.ebuild
+++ b/app-crypt/p11-kit/p11-kit-0.23.16.1-r1.ebuild
@@ -21,6 +21,10 @@ RDEPEND="asn1? ( >=dev-libs/libtasn1-3.4:=[${MULTILIB_USEDEP}] )
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-0.23.12-mktime.patch"
+)
+
 pkg_setup() {
 	# disable unsafe tests, bug#502088
 	export FAKED_MODE=1
diff --git a/app-crypt/sbsigntools/Manifest b/app-crypt/sbsigntools/Manifest
index e1f91f1ce45e..6148c59edc62 100644
--- a/app-crypt/sbsigntools/Manifest
+++ b/app-crypt/sbsigntools/Manifest
@@ -7,5 +7,5 @@ DIST sbsigntools-0.9.1.tar.gz 56497 BLAKE2B 22791bd4b490f36963a19e82da3ce7b93a56
 DIST sbsigntools-0.9.2.tar.gz 56525 BLAKE2B 0bce1f534aa960672eab6a415e287b79ff9f18eb947e2217ad4533081f8b854e160b57828afbb56423b2dcab723d3a8aacb2e6affeb2057d17ce3c1761d96b11 SHA512 060753ed9c8db794e4755cc66c1940a2ccc89f4ddf0e825da1f1e6eaa75fc67c21060ee4b5dfb0c757b69e6f5959bfa68156d9f95a945cf63c6a20f1414a2c27
 EBUILD sbsigntools-0.6-r2.ebuild 1116 BLAKE2B 1e571c2018b72de8a454a380042897678f2308e8afab91b5e90c99eff266950e7374fc099b28d0d22b1a560bf6784eb6c77345c2b92e302f9ed98c80d4f3c45a SHA512 c11a43f77549f884c3a7c55333a62970239142340bc7ee6b85d029e3a07ee47a0b71265878ad99778bc7e48d7b0cee68c0e358bc8d914a0590796490e98aaba0
 EBUILD sbsigntools-0.9.1-r1.ebuild 1299 BLAKE2B 4622f49b8ad458e0dceb55cb363f1838b5fd12e906d017f45135734855d07edf2573ee8c68033aed6b7529f60b4a5be63c436ad8d93db774e37e07bbeb8efcea SHA512 d21a3252f993779b1698e8f5ea5b39afd8415c6f87860c28ba31a5350a41580ef6b6d72f9f0b6f441a4d5f0b4f8db4407a81a68621c67781163f72cf3fd0b20f
-EBUILD sbsigntools-0.9.2.ebuild 1240 BLAKE2B 12f0a9fbb5311f1914e25704b92e666ceb48d9091d6d6a8dbaf1cd3fb1dc9937fd794073c3bf3192a7ac53103dfe47fe0b54157443528b1384d5a42519e225cc SHA512 b39d0d220f0b9e35ee68e1dceb5fb461552105f4502748adaee571d719812c62cc5bfad89100351f8e60fddcfaebb383767163473b8a5efde208d238ed1c0923
+EBUILD sbsigntools-0.9.2.ebuild 1238 BLAKE2B e49fda8ea0189edc485c0fdd119712185739d0f2368fd7c9a46ba528af720ca138a07c1988543aebf5e0e97ac9651f8d8d0a7bd115728dcb67c39b86f1a19a5a SHA512 5a513990b75fcc403059680f6986788a1ba96d263ca15a232b0a33e5aa29cb63758f3768812c5d608f65fd27951901392f8bfec8ecf4243f2dd63b33f1331971
 MISC metadata.xml 291 BLAKE2B 0aeb75750176d719f10db508a8924d0bf2fe75e8544b275a7c7e11c44320ce4f7819febb093dd3083a33a998a225f2a3b882407a8ffc03d1a57d03cbfc0a7ff2 SHA512 f7a520fc9a216ff983bd3d361c6ddb3b635eb5dcd94ed042e7c5d0beb0b4e10cdb231e2b4ace599ebb93d4bb46e071a744f1a780ec83f451bb2ee6bad4c2d8cc
diff --git a/app-crypt/sbsigntools/sbsigntools-0.9.2.ebuild b/app-crypt/sbsigntools/sbsigntools-0.9.2.ebuild
index f00fc00b3b90..ccb45d15616a 100644
--- a/app-crypt/sbsigntools/sbsigntools-0.9.2.ebuild
+++ b/app-crypt/sbsigntools/sbsigntools-0.9.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/jejb/${PN}.git/snapshot
 
 LICENSE="GPL-3 LGPL-3 LGPL-2.1 CC0-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 RDEPEND="