gentoo resync : 05.04.2019

38 files changed, 482 insertions, 419 deletions

diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 0a6fdeac1125..b490673c0970 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/acme/Manifest b/app-crypt/acme/Manifest
index ccf3380db140..453323b80b19 100644
--- a/app-crypt/acme/Manifest
+++ b/app-crypt/acme/Manifest
@@ -1,6 +1,8 @@
 DIST certbot-0.31.0.tar.gz 1267960 BLAKE2B 4097a3d278d86589e7273c3f5c4f809f0a5777319856a2aea27233ee99eadf2e7c075c5400970be6a2f11032e54457c9705ef45b85e9d158bc04c7761e59a23a SHA512 9202800649691e9b2d6b4c898b975d11ef3aba8f34903c93a11eafa5300f64c939547cfbbe34ac664de293d2540b143f14d3117969e4a6dfc55d624cfae44fea
 DIST certbot-0.32.0.tar.gz 1284873 BLAKE2B c3fa538de87b67680a7bc7465d77ab2947606aec4def3717b5d942c83254ff758d751e137bfe33cb6f9362a11a9bad7fba0337927b638f3af7ddf304d408c447 SHA512 fa61e975d2ce09efa3570118f220cd9f9d2fc8d5ab408feb4c4e50bfa795cb28be6c7a78497fb10bc91e577e908126988197ae5d016be4823c5c4ddb68cbf5a4
+DIST certbot-0.33.0.tar.gz 1303989 BLAKE2B 7417e72592e15fd7969aed4c60a799caaeedfe66af3b2e60f364677bbf7ba5dde6e597e89a07036b61e63975b402e3de81fb116ee4861061357160284fcc7821 SHA512 4a653e5e7b62d938a46421df509063a3aedf978b73cf3b44088408bf3c48b70c70fe595c449fe9df54e5724c2d5c03357be434b305f5378eaa8261f811678133
 EBUILD acme-0.31.0.ebuild 1267 BLAKE2B e078066c1470516142932c097afab73641b9c5e6cb7b8df411dbd40d898fd743a4cfe0032b793882c59ce3487f609eff0cf5fc588b5f09d36caeb63c2564be3c SHA512 6af21d683a48f864f1c12f4892152ea0c0f22dc44dc39cefa05cbb973ab39cb4f8f9ebde6e6ff0e6a77cca6aa1dcf5840e28e29b6812ea9e71116295a336a972
 EBUILD acme-0.32.0.ebuild 1269 BLAKE2B ef7aeb0f5927edfd7b83e225ece400a71739b08fdbcc84ccb39261b29a77cf598e54abac55016965d698c686ab5631769a6192f35dd073f98ab1e3436a4d436f SHA512 59920c0d93120f4d01b174d8a868b214d735d96e36bf90b704feaaa44b00dd882e8a86dfc27561bd80326f3e399fb5cba0dc9b411a297bda1d8fb602843a1788
+EBUILD acme-0.33.0.ebuild 1269 BLAKE2B ef7aeb0f5927edfd7b83e225ece400a71739b08fdbcc84ccb39261b29a77cf598e54abac55016965d698c686ab5631769a6192f35dd073f98ab1e3436a4d436f SHA512 59920c0d93120f4d01b174d8a868b214d735d96e36bf90b704feaaa44b00dd882e8a86dfc27561bd80326f3e399fb5cba0dc9b411a297bda1d8fb602843a1788
 EBUILD acme-9999.ebuild 1269 BLAKE2B ef7aeb0f5927edfd7b83e225ece400a71739b08fdbcc84ccb39261b29a77cf598e54abac55016965d698c686ab5631769a6192f35dd073f98ab1e3436a4d436f SHA512 59920c0d93120f4d01b174d8a868b214d735d96e36bf90b704feaaa44b00dd882e8a86dfc27561bd80326f3e399fb5cba0dc9b411a297bda1d8fb602843a1788
 MISC metadata.xml 342 BLAKE2B 770c32b421519cd6bdf7e09a71a1ee679a7fdf18e03587f75097a766c51dc878000184759e3c69f0c19afe060dd5578ff91e481644086e138dbb728619895130 SHA512 bb057838d2a4161b1b5d545d32fb798bf52571fccaf3dfe7e1811ee4090813341222f7c27e21f36ea9353e9f48b401a4cda0f1937640ef052445e6b0eac9defb
diff --git a/app-crypt/acme/acme-0.33.0.ebuild b/app-crypt/acme/acme-0.33.0.ebuild
new file mode 100644
index 000000000000..8a9d37f4aec6
--- /dev/null
+++ b/app-crypt/acme/acme-0.33.0.ebuild
@@ -0,0 +1,48 @@
+# 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 -> certbot-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	S=${WORKDIR}/certbot-${PV}/acme
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="An implementation of the ACME protocol"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/cryptography-1.2.3[${PYTHON_USEDEP}]
+	>=dev-python/josepy-1.1.0[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.13.1[${PYTHON_USEDEP}]
+	dev-python/pyrfc3339[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.10[${PYTHON_USEDEP}]
+	>=dev-python/requests-toolbelt-0.3.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+	>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]
+"
+
+python_test() {
+	nosetests -w ${PN} || die
+}
diff --git a/app-crypt/ccid/Manifest b/app-crypt/ccid/Manifest
index cad4d6854a6e..8b301b3abebf 100644
--- a/app-crypt/ccid/Manifest
+++ b/app-crypt/ccid/Manifest
@@ -1,6 +1,4 @@
 AUX 92_pcscd_ccid-2.rules 2275 BLAKE2B a72b8d2bb8cf56f621a0762dac95500f93afa224228f403395c9590758c8fa986b3e8d0d1b12353ec7fed5a40f6af900fcd57eaaa7b339018fe42c2b509c0c5d SHA512 f327eee35ca6009069389f935ca89feea4e693e8f0c73f8f218d2639faee4ce35df85832a71e3fe98ce24aae31861aa8bd290833e59ada75c1e1a2df9ff0a477
-DIST ccid-1.4.29.tar.bz2 635761 BLAKE2B ff14bc6e181a6d44b8ef463a2255d0362842f6e1e7c79e0a01caaba0a88892f7b0f2bd9d2dadae7be8b0655d2502e5471cff29e582928d62235fa070f2eb1ba8 SHA512 9ff37acad086e959f660069b245fe06ecada140623025a19dfbff55edec71e1e72bce09ac4fc506ad985dd0831dafc6b12f5a5b109b38bf9ba7583856eb19418
 DIST ccid-1.4.30.tar.bz2 642342 BLAKE2B fd43aa2a4c8840abb0545760f6ceb31bb9d7dc22d7283888c9a142e0c3b34310ec4530d18986451b21c6b1a3975b1212ab653a4c8d58466b28713f0f72ce1cdb SHA512 1761a4053a99eb28184d0ffece951aec5d4b646080597b4ae36b18a31fb7a76c55fabfa57ee8e5d7f2db1a6e13d209f7fa995fe6ed067f44558bea34a26d46da
-EBUILD ccid-1.4.29.ebuild 1501 BLAKE2B 511ebcb55b36429cf1c30dda2aa00a936d3b5de284db08dac9df9f0436c8704e4a2e0a5410e356c4f0187047cbfdbe954b5fdafc15220b72b2e36e2c82bff28e SHA512 c77f20dc8ec1c2ac518237605de88318cb36f9dd09bb2fcfdafe827c47da7e8e7f6b33cf1fb19cfae83c57485ec7fda9c6b981ee4371a723335b24a829cd57a9
-EBUILD ccid-1.4.30.ebuild 1503 BLAKE2B 870a9f53f8c3d4ca1610b62167e1c6a2374bf8585fae78312f14fb278e0cbdb17ab10ef39ada95f3c246d1c81879faf289e7f4fc097901461e068bd71eb7b4ad SHA512 63cec050390e57f62d29afc20c0590bb55ffcaacd049464e2476283f6785fd6110f089c1e3d7aa1cb7dfe47a7dcab64f07cec4b18d49c62b1589ea192deb7136
+EBUILD ccid-1.4.30.ebuild 1498 BLAKE2B 1e75dbc1b0915b33eb6ac0d5e59f6ccfbf9764c40650019f733dbd22349e49c162ce122aa82899e6c5ece831a2244fb5cad69f5878d3a033a85a870a711c0a70 SHA512 cf9e017e901bb007a883f31fc509c32d8bd1a0d55d60d191840a1023c30bf92918f73982cc725538b67f973e0c296127c5ad783b28ad2435b4d02fdf29889bca
 MISC metadata.xml 397 BLAKE2B 0b62fc531114bb9221d17ee3524db0858f4ff373b71a1b7beda520035eaf5679a63a420381dc52e40942a519bf15f95fae97b531267df133cf68687c49dad565 SHA512 8e8643f46728232ffffe25fe9906948c6a8bb94733dbdeaf2700afd0cf4a7567a27698c1832edf858c2a433187cac9d847dc7ad709d6398133b40b639e37cb4b
diff --git a/app-crypt/ccid/ccid-1.4.29.ebuild b/app-crypt/ccid/ccid-1.4.29.ebuild
deleted file mode 100644
index 55071f600633..000000000000
--- a/app-crypt/ccid/ccid-1.4.29.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs udev
-
-DESCRIPTION="CCID free software driver"
-HOMEPAGE="https://ccid.apdu.fr/"
-SRC_URI="https://ccid.apdu.fr/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sparc x86"
-IUSE="twinserial kobil-midentity +usb"
-
-RDEPEND=">=sys-apps/pcsc-lite-1.8.3
-	usb? ( virtual/libusb:1 )"
-DEPEND="${RDEPEND}"
-BDEPEND="kernel_linux? ( virtual/pkgconfig )"
-
-DOCS=( README AUTHORS )
-
-src_configure() {
-	econf \
-		LEX=: \
-		$(use_enable twinserial) \
-		$(use_enable usb libusb)
-}
-
-src_compile() {
-	default
-	use kobil-midentity && emake -C contrib/Kobil_mIDentity_switch
-}
-
-src_install() {
-	default
-
-	if use kobil-midentity; then
-		dosbin contrib/Kobil_mIDentity_switch/Kobil_mIDentity_switch
-		doman contrib/Kobil_mIDentity_switch/Kobil_mIDentity_switch.8
-	fi
-
-	if use kernel_linux; then
-		# note: for eudev support, rules probably will always need to be
-		# installed to /usr
-
-		# ccid >=1.4.11 version changed the rules drastically in a minor
-		# release to no longer use the pcscd group. Using the old ones in
-		# the mean time.
-		udev_newrules "${FILESDIR}"/92_pcscd_ccid-2.rules 92-pcsc-ccid.rules
-
-		# disable Kobil_mIDentity_switch udev rule with USE=-kobil-midentity
-		if ! use kobil-midentity; then
-			sed \
-				-e '/Kobil_mIDentity_switch/s/^/#/' \
-				-i "${D}/$(get_udevdir)"/rules.d/92-pcsc-ccid.rules || die
-		fi
-
-	fi
-}
diff --git a/app-crypt/ccid/ccid-1.4.30.ebuild b/app-crypt/ccid/ccid-1.4.30.ebuild
index 7b28b5b26312..16f55069016c 100644
--- a/app-crypt/ccid/ccid-1.4.30.ebuild
+++ b/app-crypt/ccid/ccid-1.4.30.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
@@ -11,7 +11,7 @@ SRC_URI="https://ccid.apdu.fr/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sparc x86"
 IUSE="twinserial kobil-midentity +usb"
 
 RDEPEND=">=sys-apps/pcsc-lite-1.8.3
diff --git a/app-crypt/certbot-apache/Manifest b/app-crypt/certbot-apache/Manifest
index 9441b807a2fc..2541fd9c3418 100644
--- a/app-crypt/certbot-apache/Manifest
+++ b/app-crypt/certbot-apache/Manifest
@@ -1,6 +1,8 @@
 DIST certbot-0.31.0.tar.gz 1267960 BLAKE2B 4097a3d278d86589e7273c3f5c4f809f0a5777319856a2aea27233ee99eadf2e7c075c5400970be6a2f11032e54457c9705ef45b85e9d158bc04c7761e59a23a SHA512 9202800649691e9b2d6b4c898b975d11ef3aba8f34903c93a11eafa5300f64c939547cfbbe34ac664de293d2540b143f14d3117969e4a6dfc55d624cfae44fea
 DIST certbot-0.32.0.tar.gz 1284873 BLAKE2B c3fa538de87b67680a7bc7465d77ab2947606aec4def3717b5d942c83254ff758d751e137bfe33cb6f9362a11a9bad7fba0337927b638f3af7ddf304d408c447 SHA512 fa61e975d2ce09efa3570118f220cd9f9d2fc8d5ab408feb4c4e50bfa795cb28be6c7a78497fb10bc91e577e908126988197ae5d016be4823c5c4ddb68cbf5a4
+DIST certbot-0.33.0.tar.gz 1303989 BLAKE2B 7417e72592e15fd7969aed4c60a799caaeedfe66af3b2e60f364677bbf7ba5dde6e597e89a07036b61e63975b402e3de81fb116ee4861061357160284fcc7821 SHA512 4a653e5e7b62d938a46421df509063a3aedf978b73cf3b44088408bf3c48b70c70fe595c449fe9df54e5724c2d5c03357be434b305f5378eaa8261f811678133
 EBUILD certbot-apache-0.31.0.ebuild 1078 BLAKE2B 88db3076d6c2b3e9cb6a19c40ecfb4ed2f42e9f534040bfce18e785adeae93d963ffdf1f1a38ba2fe54e9bb749a8b8c1960af1e5319f884cb85a6e3ef19337d6 SHA512 d9bc1e40c1a77bc8f27725aea41fab71aa870cf4aef1e93f187ba2502bcb89304011e581052235838ad7282b03c6cff4f6f0d1264435d7f8ca53c9a3307ffa65
 EBUILD certbot-apache-0.32.0.ebuild 1080 BLAKE2B e7d4c037fae078bc6538768d507ac109af6c2d676187ed90aebc76ae1900532ae3fc7675ee3d4ba62d0dfefcc573eb3bc92bfdc33e0eede11fb7c0e066dace35 SHA512 672863267ac83c966c208c9ecf6fc83c704ea034092c30169064453fbe92cd3c73cfd2d6d6ace3f52c8d14d46f50e0b8e70b24ad282529f5f99acfe3b2f3bf94
+EBUILD certbot-apache-0.33.0.ebuild 1080 BLAKE2B e7d4c037fae078bc6538768d507ac109af6c2d676187ed90aebc76ae1900532ae3fc7675ee3d4ba62d0dfefcc573eb3bc92bfdc33e0eede11fb7c0e066dace35 SHA512 672863267ac83c966c208c9ecf6fc83c704ea034092c30169064453fbe92cd3c73cfd2d6d6ace3f52c8d14d46f50e0b8e70b24ad282529f5f99acfe3b2f3bf94
 EBUILD certbot-apache-9999.ebuild 1083 BLAKE2B 0e03488f0c19b669c4412fa608b32a3c7b77093163f73779268eb0b1e45fdce664a998b7e6bab882e41ea9cbee1ba8f1caf3f0589b84695f0002712b8976c774 SHA512 0b25f93cb6c50b80edc1b65302d97f70d16f73ef46ede9d25314970eb7f02a8a87e318ecfc30e42819e6be8264e3a772d640b991eafed261aee4f68800ae1460
 MISC metadata.xml 334 BLAKE2B 4adbd04c0edcc84925da47b32fee63d4652bf2a1bf5222a56e0e1c7cfe8aaa34275a2652c4416f8a80de11fd88217d8626d610fa857f0615f18bfd773a279e55 SHA512 e3d6dda6c44557523fd48b464b6d39fc45b90ba2ecbe03fb300a655973c1b2e654a24d8d381b769eba00d0d80fb5881e1dfec1694e223cd83047abba9f01a44f
diff --git a/app-crypt/certbot-apache/certbot-apache-0.33.0.ebuild b/app-crypt/certbot-apache/certbot-apache-0.33.0.ebuild
new file mode 100644
index 000000000000..b6c158fb2f52
--- /dev/null
+++ b/app-crypt/certbot-apache/certbot-apache-0.33.0.ebuild
@@ -0,0 +1,38 @@
+# 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/${PN%-apache}/${PN%-apache}/archive/v${PV}.tar.gz -> ${PN%-apache}-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+	S=${WORKDIR}/${PN%-apache}-${PV}/${PN}
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="Apache plugin for certbot (Let's Encrypt Client)"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+
+RDEPEND=">=app-crypt/certbot-0.26.0[${PYTHON_USEDEP}]
+	>=app-crypt/acme-0.25.0[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+	dev-python/python-augeas[${PYTHON_USEDEP}]
+	dev-python/zope-component[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]"
+DEPEND="test? ( ${RDEPEND}
+	dev-python/nose[${PYTHON_USEDEP}] )
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	nosetests || die
+}
diff --git a/app-crypt/certbot-nginx/Manifest b/app-crypt/certbot-nginx/Manifest
index 916684b403eb..7b3468c5a0b8 100644
--- a/app-crypt/certbot-nginx/Manifest
+++ b/app-crypt/certbot-nginx/Manifest
@@ -1,6 +1,8 @@
 DIST certbot-0.31.0.tar.gz 1267960 BLAKE2B 4097a3d278d86589e7273c3f5c4f809f0a5777319856a2aea27233ee99eadf2e7c075c5400970be6a2f11032e54457c9705ef45b85e9d158bc04c7761e59a23a SHA512 9202800649691e9b2d6b4c898b975d11ef3aba8f34903c93a11eafa5300f64c939547cfbbe34ac664de293d2540b143f14d3117969e4a6dfc55d624cfae44fea
 DIST certbot-0.32.0.tar.gz 1284873 BLAKE2B c3fa538de87b67680a7bc7465d77ab2947606aec4def3717b5d942c83254ff758d751e137bfe33cb6f9362a11a9bad7fba0337927b638f3af7ddf304d408c447 SHA512 fa61e975d2ce09efa3570118f220cd9f9d2fc8d5ab408feb4c4e50bfa795cb28be6c7a78497fb10bc91e577e908126988197ae5d016be4823c5c4ddb68cbf5a4
+DIST certbot-0.33.0.tar.gz 1303989 BLAKE2B 7417e72592e15fd7969aed4c60a799caaeedfe66af3b2e60f364677bbf7ba5dde6e597e89a07036b61e63975b402e3de81fb116ee4861061357160284fcc7821 SHA512 4a653e5e7b62d938a46421df509063a3aedf978b73cf3b44088408bf3c48b70c70fe595c449fe9df54e5724c2d5c03357be434b305f5378eaa8261f811678133
 EBUILD certbot-nginx-0.31.0.ebuild 1012 BLAKE2B e6611cbbb8f7eb76ee4d81f78389afc3a2698ef0909ff67d91d77bc3e92a68e728434b3a237c6791991ca82e014506bd83016e6a5da163792a32581d68967bbf SHA512 cd52ce383de026c14c54f24b30ad044074c16c26760ea8f22d8e56f5f4afae3e1f0368cad36cadb8839b3e062daa6bc2744393b6cf9b8402292c3c66bdeb7a71
 EBUILD certbot-nginx-0.32.0.ebuild 1014 BLAKE2B e49941f79f8c7b2e55480aa96f72c52d9f2e79e7e8d62055c35589a31022d60b40e10fa47b55058f17b92d74f23ae4245dcb1f08062c39e85a7b326529708307 SHA512 ae848d635d1479aa216d908724d478ff7cbaffe67724c287e7de5c0de81b96281b09acaf5d8267ea446ba31b3d36beb3c2c52d2675a95f4ed8255a153da49dca
-EBUILD certbot-nginx-9999.ebuild 1014 BLAKE2B 4b719b8703b3639e58ee36c5c0d03d6e5890a5b5c9848b1dc13eae93fb2bd542f8de9f3ddc1bb683d88481f851ee2594987868d519cc59fc8a4cfb8022aed212 SHA512 5beee8a666a3dd36a13b83e65616b6a0f3b11dd90d98a360447807e5b7e02b4a0029f4221dd0eee842a9106255c1d61958373b0c2a50a1d72cf707cd2ccd0e1d
+EBUILD certbot-nginx-0.33.0.ebuild 1014 BLAKE2B 812615de77db1a7164166ae12e825619037de165fbd8f31d0e5d6d2ce7cbbde4602184dd1eef4bb9415477e66392642739ce29812d4af969c34df59f3c8bd9a7 SHA512 f6ce76bb957f1f73838c0f313de3580d7f36ec4889c50de9c13797a7c1f7b637c6111dc911c12f663e79999a1c80e8d1a84c260dd4e6455017727ff89521d72f
+EBUILD certbot-nginx-9999.ebuild 1014 BLAKE2B 812615de77db1a7164166ae12e825619037de165fbd8f31d0e5d6d2ce7cbbde4602184dd1eef4bb9415477e66392642739ce29812d4af969c34df59f3c8bd9a7 SHA512 f6ce76bb957f1f73838c0f313de3580d7f36ec4889c50de9c13797a7c1f7b637c6111dc911c12f663e79999a1c80e8d1a84c260dd4e6455017727ff89521d72f
 MISC metadata.xml 334 BLAKE2B 4adbd04c0edcc84925da47b32fee63d4652bf2a1bf5222a56e0e1c7cfe8aaa34275a2652c4416f8a80de11fd88217d8626d610fa857f0615f18bfd773a279e55 SHA512 e3d6dda6c44557523fd48b464b6d39fc45b90ba2ecbe03fb300a655973c1b2e654a24d8d381b769eba00d0d80fb5881e1dfec1694e223cd83047abba9f01a44f
diff --git a/app-crypt/certbot-nginx/certbot-nginx-0.33.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-0.33.0.ebuild
new file mode 100644
index 000000000000..9adf3132423f
--- /dev/null
+++ b/app-crypt/certbot-nginx/certbot-nginx-0.33.0.ebuild
@@ -0,0 +1,34 @@
+# 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/${PN%-nginx}/${PN%-nginx}/archive/v${PV}.tar.gz -> ${PN%-nginx}-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	S=${WORKDIR}/${PN%-nginx}-${PV}/${PN}
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="Nginx 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[${PYTHON_USEDEP}]"
+RDEPEND="${CDEPEND}
+	>=app-crypt/acme-0.29.0[${PYTHON_USEDEP}]
+	>=app-crypt/certbot-0.33.0[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-1.5.5[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}"
diff --git a/app-crypt/certbot-nginx/certbot-nginx-9999.ebuild b/app-crypt/certbot-nginx/certbot-nginx-9999.ebuild
index b3315cd42643..9adf3132423f 100644
--- a/app-crypt/certbot-nginx/certbot-nginx-9999.ebuild
+++ b/app-crypt/certbot-nginx/certbot-nginx-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -25,8 +25,8 @@ IUSE=""
 
 CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="${CDEPEND}
-	>=app-crypt/certbot-0.22.0[${PYTHON_USEDEP}]
-	>=app-crypt/acme-0.26.0[${PYTHON_USEDEP}]
+	>=app-crypt/acme-0.29.0[${PYTHON_USEDEP}]
+	>=app-crypt/certbot-0.33.0[${PYTHON_USEDEP}]
 	dev-python/mock[${PYTHON_USEDEP}]
 	dev-python/pyopenssl[${PYTHON_USEDEP}]
 	>=dev-python/pyparsing-1.5.5[${PYTHON_USEDEP}]
diff --git a/app-crypt/certbot/Manifest b/app-crypt/certbot/Manifest
index 5f9e5eaf44d3..7e76f61ac9c3 100644
--- a/app-crypt/certbot/Manifest
+++ b/app-crypt/certbot/Manifest
@@ -1,6 +1,8 @@
 DIST certbot-0.31.0.tar.gz 1267960 BLAKE2B 4097a3d278d86589e7273c3f5c4f809f0a5777319856a2aea27233ee99eadf2e7c075c5400970be6a2f11032e54457c9705ef45b85e9d158bc04c7761e59a23a SHA512 9202800649691e9b2d6b4c898b975d11ef3aba8f34903c93a11eafa5300f64c939547cfbbe34ac664de293d2540b143f14d3117969e4a6dfc55d624cfae44fea
 DIST certbot-0.32.0.tar.gz 1284873 BLAKE2B c3fa538de87b67680a7bc7465d77ab2947606aec4def3717b5d942c83254ff758d751e137bfe33cb6f9362a11a9bad7fba0337927b638f3af7ddf304d408c447 SHA512 fa61e975d2ce09efa3570118f220cd9f9d2fc8d5ab408feb4c4e50bfa795cb28be6c7a78497fb10bc91e577e908126988197ae5d016be4823c5c4ddb68cbf5a4
+DIST certbot-0.33.0.tar.gz 1303989 BLAKE2B 7417e72592e15fd7969aed4c60a799caaeedfe66af3b2e60f364677bbf7ba5dde6e597e89a07036b61e63975b402e3de81fb116ee4861061357160284fcc7821 SHA512 4a653e5e7b62d938a46421df509063a3aedf978b73cf3b44088408bf3c48b70c70fe595c449fe9df54e5724c2d5c03357be434b305f5378eaa8261f811678133
 EBUILD certbot-0.31.0.ebuild 1264 BLAKE2B 68db0d81c00ee276a4d3ae4d0e2b3405a19bda044b054356a18cd356f36faa0bf9f536e9bdbdd7f02e0ef0408c732b691e0ce4defa6b9768ba262e53fbe5d919 SHA512 0a3d80a71e0fe990caf0d836dad9f2eeb55f61dd0e491e412555ace2de9b697f8721cca77da6e4cddc9e1fb8e45f516d7b1df550043e39cb092c3dd4750fe1d7
 EBUILD certbot-0.32.0.ebuild 1272 BLAKE2B 00bea629a7a28ee6f810fbca1412538b15d8c02732a348082d7b6d68b883dd913cf03a9e1ae2c25c9a7e99f0a7a8cdada547616b28fad5c38d87beda534c869c SHA512 ef2b4ea47566c43f3e32d016e2c6aa84fd4617e7843ff633c308fec01f7e67521f048bdaa2116b6afd6ef009a2b6904f8b361b9b0ce85ee688692ac871966d7c
-EBUILD certbot-9999.ebuild 1272 BLAKE2B 00bea629a7a28ee6f810fbca1412538b15d8c02732a348082d7b6d68b883dd913cf03a9e1ae2c25c9a7e99f0a7a8cdada547616b28fad5c38d87beda534c869c SHA512 ef2b4ea47566c43f3e32d016e2c6aa84fd4617e7843ff633c308fec01f7e67521f048bdaa2116b6afd6ef009a2b6904f8b361b9b0ce85ee688692ac871966d7c
+EBUILD certbot-0.33.0.ebuild 1364 BLAKE2B e8192526ac6ec0ed89bf066bd19bf77b747230fac923f8795d911dfaf66d0d7eec44b9022715d679e866cf46168e871c02a29ea1d3eac149cb92269545e7bdd9 SHA512 caec4a56c13da61ca7c1e3612bc5d0d0f145efcaae0b5fc9844ec84666864ae6b9a770789c2eecb0d350b59c28df53ff6a8418a91bf26850775580b93d780448
+EBUILD certbot-9999.ebuild 1364 BLAKE2B e8192526ac6ec0ed89bf066bd19bf77b747230fac923f8795d911dfaf66d0d7eec44b9022715d679e866cf46168e871c02a29ea1d3eac149cb92269545e7bdd9 SHA512 caec4a56c13da61ca7c1e3612bc5d0d0f145efcaae0b5fc9844ec84666864ae6b9a770789c2eecb0d350b59c28df53ff6a8418a91bf26850775580b93d780448
 MISC metadata.xml 334 BLAKE2B e7b28e7d3e7c6fdce0c5120b29fbf5aa607408e2add6c0ad42e921fb1add9def38c6cb191129a5a6e1f0e3ea119caa6cdc74955b572e5d2c6f854d0b7c7c521a SHA512 a24ccf633fc9c2670dcd35801d95bd8ca0f4ea4d3d53b6651f2e8e3e280b95ec8a464d99f5423942c14b0777ae4551f46c1ff285caea460bc91cbc417a7a5b70
diff --git a/app-crypt/certbot/certbot-0.33.0.ebuild b/app-crypt/certbot/certbot-0.33.0.ebuild
new file mode 100644
index 000000000000..48d3f1039d4c
--- /dev/null
+++ b/app-crypt/certbot/certbot-0.33.0.ebuild
@@ -0,0 +1,48 @@
+# 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
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="Let's encrypt client to automate deployment of X.509 certificates"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+
+CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="
+	${CDEPEND}
+	>=app-crypt/acme-0.29.0[${PYTHON_USEDEP}]
+	>=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
+	dev-python/configobj[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-1.2[${PYTHON_USEDEP}]
+	>=dev-python/josepy-1.1.0[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+	>=dev-python/parsedatetime-1.3[${PYTHON_USEDEP}]
+	dev-python/pyrfc3339[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/zope-component[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]"
+DEPEND="
+	${CDEPEND}
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	# acme is not installed, removing it here is fine, the dir just confuses tests
+	rm -R acme
+	pytest -vv ${PN} || die
+}
diff --git a/app-crypt/certbot/certbot-9999.ebuild b/app-crypt/certbot/certbot-9999.ebuild
index 1c019d37388a..48d3f1039d4c 100644
--- a/app-crypt/certbot/certbot-9999.ebuild
+++ b/app-crypt/certbot/certbot-9999.ebuild
@@ -42,5 +42,7 @@ DEPEND="
 	)"
 
 python_test() {
+	# acme is not installed, removing it here is fine, the dir just confuses tests
+	rm -R acme
 	pytest -vv ${PN} || die
 }
diff --git a/app-crypt/gcr/Manifest b/app-crypt/gcr/Manifest
index fef01caaedcb..83d1d5776afe 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 1900 BLAKE2B f5e119e17247567b57eb2e9b3bb0bf0fb9a0124f4225aa436ed31002a312a89660617ccd5599ee11de19ff30d24a3411e69f10c3b6811461983b95435d5c65f6 SHA512 ea0175fb3452ed095125cecabcb77c2645365ae21a6abcefae74575b970af7fa977616327fa0e9e6fb579a64ce9a703e135d84d3c4ccb55766a8c86962959f2b
+EBUILD gcr-3.28.1.ebuild 1901 BLAKE2B 635931670d41e19328bec1a51c2149903317da498ab7026f03258ae3e11bf3775c36687d7e5dadf1fcdc0ddaf581f08ac4d9350717cc6ef454a2a87f3ebc73dd SHA512 f6b599ab6b372865017cbcb710c9a0208492b78c34cb6772be973e2ebfbf954eed638e988a31e79f9fd0e81ccdd8749b656e2f9af60c6b59bb6f033307fa6f65
 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 74a0d4fdb650..1dd1ec804c67 100644
--- a/app-crypt/gcr/gcr-3.28.1.ebuild
+++ b/app-crypt/gcr/gcr-3.28.1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gcr"
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0/1" # subslot = suffix of libgcr-3
 
-IUSE="debug gtk +introspection vala"
+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"
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index bc05613dd1c2..f4583a8e2212 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -2,7 +2,9 @@ AUX gnupg-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch 1048
 DIST gnupg-1.4.21.tar.bz2 3689305 BLAKE2B 0c26c9c3aeae2bf2eafa858bc3bd15cc2702bce12a8a90938565322c34e2eeb8e5432932f5c9344a76aa4528b66051141536c062d9923a79d12a0767421bb017 SHA512 619e0fbc10310c7e55d129027e2945791fe91a0884b1d6f53acb4b2e380d1c6e71d1a516a59876182c5c70a4227d44a74ceda018c343b5291fa9a5d6de77c984
 DIST gnupg-2.2.10.tar.bz2 6659484 BLAKE2B d0270ca40bd70fe113fa4283c307d7d04370beec77ffba0abb7862defdab2d5a82b1508284961e30e7d0aab82bffdf09fe796741603e843a062073f179f0bfc2 SHA512 a4477828f268fa69125cf1822f8a721e67f8f4008bd9817b701989393bd93689aac8fee1f4d34d918911d53afabdcbb1c84d40e8a4489d7a29b5a769d330fddd
 DIST gnupg-2.2.12.tar.bz2 6682303 BLAKE2B 8470ab8bf386d3524ce57ef1a1f6ac74d8cf2d7c35062b95c668b37586603c8e0817e410f4a0a807256e42896c11116897b7118b29e471184b2fa871ad4ba048 SHA512 30de9757bb60a5cb6bf0dc2c8da5f4742c54affec3fcd0bcbf66f28f2812149afec5db70dcb6ba592101de4bdc479d1ba0b47c53c8b8d4765ddff32fa51c26c8
+DIST gnupg-2.2.14.tar.bz2 6707735 BLAKE2B feedb1c776e8d43e43905e8a8c1487bd88e8effc59e94baf308cb29a5feea5d9c666c78b50147d65a259dc89af241c2a2bf07a72c417617e5238e0fdbbc2b17f SHA512 9d5216dee085efe6de300579d8fb773a5a55df639d5a435708611a974df522dd60dc995fbfcaad98065475dbeb731bbba19ecc3273e78b9b45fccff640dde69b
 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
+EBUILD gnupg-2.2.14.ebuild 3663 BLAKE2B 58a51005ce97906d7a8c051d88ecd0ec3ecdc627e146c424c446bba93a7b37ad93b6248be631d97c750c5b4e03f675d8f2c7355d306fcf219a03d19b71886bb5 SHA512 73ffb70a72e2936233596ef8dee2429abff9d97fb128b3c5e94fef862948ca65e964a95538e0722b7773fb0f08c7f27ad9eaabbc6ad7c140c826e9d16ba657ac
 MISC metadata.xml 1313 BLAKE2B 2bf26407bdea8af215d09d28640b961ee98c86c297595736fbe477c8b9cfaf0f8970982ce22038dabf0d8529e39032a3fec9da0c17a5acca0cf3cb197f31f1c0 SHA512 0500f03936eba67706cea87c1f5b16db280b159fc31780b93e696e8ab20e3dece90f0bd80af5aa9582cab557cc337c65e8e101daa935ba6ca31b7f126328c0ac
diff --git a/app-crypt/gnupg/gnupg-2.2.14.ebuild b/app-crypt/gnupg/gnupg-2.2.14.ebuild
new file mode 100644
index 000000000000..fa2bd5fd28ae
--- /dev/null
+++ b/app-crypt/gnupg/gnupg-2.2.14.ebuild
@@ -0,0 +1,136 @@
+# 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 ~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 )
+	virtual/mta"
+
+RDEPEND="${DEPEND}
+	app-crypt/pinentry
+	nls? ( virtual/libintl )
+	selinux? ( sec-policy/selinux-gpg )"
+
+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"
+)
+
+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
+
+	econf \
+		"${myconf[@]}" \
+		$(use_enable bzip2) \
+		$(use_enable nls) \
+		$(use_enable smartcard scdaemon) \
+		$(use_enable ssl gnutls) \
+		$(use_enable tofu) \
+		$(use_enable usb ccid-driver) \
+		$(use_enable wks-server wks-tools) \
+		$(use_with ldap) \
+		$(use_with readline) \
+		--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}
+}
diff --git a/app-crypt/gpgme/Manifest b/app-crypt/gpgme/Manifest
index c0476dfa088b..4c2e8e1ebef1 100644
--- a/app-crypt/gpgme/Manifest
+++ b/app-crypt/gpgme/Manifest
@@ -1,5 +1,7 @@
 DIST gpgme-1.11.1.tar.bz2 1419232 BLAKE2B 93980c24e6d692f35105db23a02db891ef022addd583d5bda8e55ec3552dfebb87c9feebb74fdd59fa353a3b08571e51537f8dcaf63af018beff467a848e97e9 SHA512 42fa6f5d6217aaad9b44b969de9603167d179af9a1573342187718ff123cd88c686211c3dc5f2d9cacc20226ab5b8fef85cb66a19ada71d267c397d8ba52cf1a
 DIST gpgme-1.12.0.tar.bz2 1658803 BLAKE2B 630646af597074c06a99c1170c4f8170ad0fe4ba643a27a87a61dd8df681ca14f023b07817657bb049eaeaef01df3975bd1fe1b75a026634a62f832c6c311b56 SHA512 c228b3df28377df882be536ada56dc9c73150048a58e591aa4495f89c854af95820152cd60139840f994c249e9c7df50d8b89eb9d6dc4ce02aa80bbfebcdd014
+DIST gpgme-1.13.0.tar.bz2 1820504 BLAKE2B 71fbb034e3c5939d1953554ccbe0e89e2089c53a4c79e90ee51bdf96500bf4be8a5e1633772ab8dadd44616dde7be551ad7d3af0a59d7e1df10a19cd9cf56baa SHA512 47a7a67dcc6d111cddd805d288d42e870948114a6dc09ce0675ad8b3d1580bbc2a683e1e70cb2f416919cf2129c72a9ff30e2e3b9527809d04e863cc1f87267b
 EBUILD gpgme-1.11.1.ebuild 2872 BLAKE2B cb6c595f8424e43cd318f65b213ed768a7d055554b7b4b7af65d7dc84af4d1216f5f777ad3d53541838fefd99e2db38151ede5d79dbfd3becb588599c33f657e SHA512 c7218db05ea51baa786bb7e800eb95ad367c21470505f9ea14bcffe38e61c13ce6c46bbfd80e3a9b70fde757bdf761fc9a01b43fa5c34ff8c69c714df1c961d7
 EBUILD gpgme-1.12.0.ebuild 2883 BLAKE2B 0791a9a3446c3f27f33c15551119bde323f1847af34fc0a66e35fe4781ad00f83b37ababb40ff049d44d15354b4261d61274f7953651cf21ae00c2118bdde39c SHA512 0d56644e2bbc117864a5bfea61c54c0617e92bdb012330d6fa3a5e8d2e9b918aa73264b2c69b193b024a31527723f2ed9a2a2d0399661de11d2b2a2c0b8d55e6
+EBUILD gpgme-1.13.0.ebuild 2883 BLAKE2B d11a5a99a4cb511c235020430aded121a099c34227c500d61a4cb436f4db66c2cb2128a515ea7919378a965aa36d2017e3e788c2c55a88fb27413cf2a2f2cbe0 SHA512 62c7e5ae667cd67e8de0086007299cd5294139ac6272e989b88e6034efc6390aa9b52274e8a7639056725d627c1ae7c5cf92ad18f5972d09dc4b03cc58ebad21
 MISC metadata.xml 315 BLAKE2B 18ded955b84237e03c8d14dc65f6b869c12674d4a87906f8fbc7650d02b20418cc2d97e9be6ea32f1aa170a8763cad3b91f9ac9b821a825fea0583cc66bed728 SHA512 502b5daf04f1b706514aba7d18cd454e1e99f63462159d3f5baebd1617bfa4760c7ea6fae9b7624fae2bc5943f8950211c6f4b326b6b62c3cf7eba4fc1255334
diff --git a/app-crypt/gpgme/gpgme-1.13.0.ebuild b/app-crypt/gpgme/gpgme-1.13.0.ebuild
new file mode 100644
index 000000000000..cf832f721a89
--- /dev/null
+++ b/app-crypt/gpgme/gpgme-1.13.0.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+DISTUTILS_OPTIONAL=1
+
+inherit distutils-r1 flag-o-matic libtool qmake-utils toolchain-funcs
+
+DESCRIPTION="GnuPG Made Easy is a library for making GnuPG easier to use"
+HOMEPAGE="http://www.gnupg.org/related_software/gpgme"
+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 ~sparc ~x86 ~x86-fbsd ~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
+	>=dev-libs/libassuan-2.0.2:=
+	>=dev-libs/libgpg-error-1.29:=
+	python? ( ${PYTHON_DEPS} )
+	qt5? ( dev-qt/qtcore:5 )"
+	#doc? ( app-doc/doxygen[dot] )
+DEPEND="${COMMON_DEPEND}
+	qt5? ( dev-qt/qttest:5 )"
+RDEPEND="${COMMON_DEPEND}
+	cxx? (
+		!<kde-apps/gpgmepp-4.14.11_pre20160611:4
+		!kde-apps/gpgmepp:5
+		!<kde-apps/kdepimlibs-4.14.10_p20160611:4
+		!=kde-apps/kdepimlibs-4.14.11_pre20160211*:4
+	)"
+BDEPEND="python? ( dev-lang/swig )"
+
+REQUIRED_USE="qt5? ( cxx ) python? ( ${PYTHON_REQUIRED_USE} )"
+
+do_python() {
+	if use python; then
+		pushd "lang/python" > /dev/null || die
+		top_builddir="../.." srcdir="." CPP=$(tc-getCPP) distutils-r1_src_${EBUILD_PHASE}
+		popd > /dev/null
+	fi
+}
+
+pkg_setup() {
+	addpredict /run/user/$(id -u)/gnupg
+
+	local MAX_WORKDIR=66
+	if [[ "${#WORKDIR}" -gt "${MAX_WORKDIR}" ]]; then
+		ewarn "Disabling tests as WORKDIR '${WORKDIR}' is longer than ${MAX_WORKDIR} which will fail tests"
+		SKIP_TESTS=1
+	fi
+}
+
+src_prepare() {
+	default
+	elibtoolize
+
+	# Make best effort to allow longer PORTAGE_TMPDIR
+	# as usock limitation fails build/tests
+	ln -s "${P}" "${WORKDIR}/b"
+	S="${WORKDIR}/b"
+}
+
+src_configure() {
+	local languages=()
+	use common-lisp && languages+=( "cl" )
+	use cxx && languages+=( "cpp" )
+	if use qt5; then
+		languages+=( "qt" )
+		#use doc ||
+		export DOXYGEN=true
+		export MOC="$(qt5_get_bindir)/moc"
+	fi
+
+	econf \
+		$([[ -n "${SKIP_TESTS}" ]] && echo "--disable-gpg-test --disable-gpgsm-test") \
+		--enable-languages="${languages[*]}" \
+		$(use_enable static-libs static)
+
+	use python && make -C lang/python prepare
+
+	do_python
+}
+
+src_compile() {
+	default
+	do_python
+}
+
+src_test() {
+	[[ -z "${SKIP_TESTS}" ]] || return
+
+	default
+	if use python; then
+		test_python() {
+			emake -C lang/python/tests check \
+				PYTHON=${EPYTHON} \
+				PYTHONS=${EPYTHON} \
+				TESTFLAGS="--python-libdir=${BUILD_DIR}/lib"
+		}
+		python_foreach_impl test_python
+	fi
+}
+
+src_install() {
+	default
+	do_python
+	find "${D}" -name '*.la' -delete || die
+
+	# backward compatibility for gentoo
+	# in the past we had slots
+	dodir /usr/include/gpgme
+	dosym ../gpgme.h /usr/include/gpgme/gpgme.h
+}
diff --git a/app-crypt/ima-evm-utils/Manifest b/app-crypt/ima-evm-utils/Manifest
index 184e6c179375..a15cbd517424 100644
--- a/app-crypt/ima-evm-utils/Manifest
+++ b/app-crypt/ima-evm-utils/Manifest
@@ -2,4 +2,4 @@ AUX ima-evm-utils-1.1-configure-use-sys-xattr-bug-649790.patch 1332 BLAKE2B 1787
 DIST ima-evm-utils-1.1.tar.gz 37825 BLAKE2B 469f5bbc194f3fcc8996f252d01745c0d8d4d4f63476174622ea4569c97978db478bd522ae4672819c5ef995f2bb524eb857e5bf5c303131959f2f5cb9c2ebcc SHA512 fc7efc890812233db888eef210dc4357bee838b56fd95efd9a9e141d684b0b354670a3c053dd93a94a1402dd826074d4a83a4637c8e6c1d90ead3132354a5776
 EBUILD ima-evm-utils-1.1.ebuild 836 BLAKE2B 94236b3ebb2ec2d6e55b80f75bf54fa7a791b029c6654e05b3dc35640674d970eab5c7787d5bb498530177e56f6fbaa35dc4db9b62b2f28c799addddf075e049 SHA512 ad8a26e72fe4c6fc397ee3759e3e871c3ebc205039eede0a35b30864bed13c40b18c0f757ea34ee21b39900de67c258e1b4449cbe3be0c41aa22b5d94bd69f89
 EBUILD ima-evm-utils-9999.ebuild 752 BLAKE2B 18d7254fcca0e871b94aaaacb81ac853dcf8057d1e8a7bb3bbdf93eab20778bc070ad63505db8c54eb86fb82c586498acd2c9c2e87402d39e1696196831e8f7a SHA512 a12c00b393809e0a0c9b76dbfe83c83a62f98743c67afe4a82fa3350f5df0b4d036982a1d503a81ee22660622945ec5070c01a1903e3f948e833266bb705704b
-MISC metadata.xml 519 BLAKE2B a421147d697524cfafe22995d14069d21eec1e0b134aee40ac014d9be716608800c6096c50d20ad9c77da00a10123b8900ae7eeb50997ab4cc9f136d4217d719 SHA512 d207f51e8723c1c36f4b6bdbf514977004da3af6e0ba1e1425b9cf3155562beaca233153549fb6e9007c6608bea180215a6918c484438ea31522a15aa00dd258
+MISC metadata.xml 412 BLAKE2B 0b1378ada8fb579cf25ca51932da155bcbe85aeee4dd580af1638fb42a5b80b22c36f778af8499a9b511b712a8aa0dd5c35e6ed9d026d6f7829c785f4717ed0a SHA512 493a8ccc2e86e0e84fbb18d3e97fdadc3f9be6f855e9a661240cf02bf7817a3b488fd5bec52484d703f724829237e302a2b69aa013087f8b8ba506e3405241e1
diff --git a/app-crypt/ima-evm-utils/metadata.xml b/app-crypt/ima-evm-utils/metadata.xml
index b45a890a4174..37c8aa55a837 100644
--- a/app-crypt/ima-evm-utils/metadata.xml
+++ b/app-crypt/ima-evm-utils/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>swift@gentoo.org</email>
-		<name>Sven Vermeulen</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>hardened@gentoo.org</email>
 		<name>Gentoo Hardened</name>
diff --git a/app-crypt/nwipe/Manifest b/app-crypt/nwipe/Manifest
index 006d63efa883..a1c268c52bd1 100644
--- a/app-crypt/nwipe/Manifest
+++ b/app-crypt/nwipe/Manifest
@@ -1,3 +1,5 @@
 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.25.ebuild b/app-crypt/nwipe/nwipe-0.25.ebuild
new file mode 100644
index 000000000000..20ca201ff847
--- /dev/null
+++ b/app-crypt/nwipe/nwipe-0.25.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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/paperkey/Manifest b/app-crypt/paperkey/Manifest
index 89e5772a6a4c..110c7c572105 100644
--- a/app-crypt/paperkey/Manifest
+++ b/app-crypt/paperkey/Manifest
@@ -1,5 +1,5 @@
 DIST paperkey-1.5.tar.gz 266722 BLAKE2B 8b838b70690a080ca3e579780af890021f218e86dc73099e2adc457c169d2268795e34779d839b63cfe4fec549f44df058d49a853f9c02a878c2163a5e03b393 SHA512 3abe6be913748c08dd2a8fad1e0624dd77a14972abdc76722507ec454aa31cd24fe9ae9f85e256300e568fbc84da6369fbf07f93ae8520f71c46edae4f0f6fe6
 DIST paperkey-1.6.tar.gz 271424 BLAKE2B 625a26bbae93122acf553036e902421ec630f6f92507b1f6dd231e970fc8d94a9d7017018bb783f934a37577de3e0c4f1fa68ca359c3de06f1a87590c188d266 SHA512 a07fc22bf56cd9524ecba61d1bf00102e6e97842e219682771187a2a2327c9daa885d457417bb2ea960f5ebd66bd711fa1d86687fda159647ff47980dee21b01
 EBUILD paperkey-1.5.ebuild 350 BLAKE2B 8476d7e01275eb1beb1ff2833c9d497ab229256e62e6778df478ad29eba3a54110257d22aac315b0f4bdbc3bfb4fa20f5384ef00a4898a7705775c1d110a4809 SHA512 215a9f17c548b6254d37a6f9d9faaa335916d37bd13ec262dcac2d663e66b4de8730b34c70bd1eb6108149afde67ded43571fe2e8e9c5b8950b4ba2c342b03a8
-EBUILD paperkey-1.6.ebuild 335 BLAKE2B 55e7cae78820a5f9f1024b0edf769f0576df6652c89307a945b6878532d487ecd0ea519f1750b63d0687a1c6b9ca07a4b544d208fde60379b63886b23e804361 SHA512 57dc7335f4241c0ffeb79195470773abb513427f26f849baca581ef5f2f7b65ecaa85a5183c04d6b03efeb49b7ec974a6975b0837f622c02c6c44abfb3fb3b49
+EBUILD paperkey-1.6.ebuild 342 BLAKE2B 433d27fadc9ab867e10304cd5249b9bc754212a9182d521b9cbc98dc877c6201a687194e98f11d0a027a858adf7fbd7e5fe76a4362e537c8e6fe885f3a7c00f3 SHA512 8f4a95c230e961ed56e2bda6e2d61edf4f05c59fdc3f2f05d30926e18f43588f0882df4113aaf938bd466192857cef8272fd5d077e9469c91b48bed4624d8701
 MISC metadata.xml 247 BLAKE2B 94608f4bda5b60a090b18717a5d81d90defbb5e482043059dcb7a41d39a21b9192e6f58a1ebdb83cc8cfaa9fe85ced13c40e6e43c110e0e21b2cb6a36f6dc852 SHA512 1196d40f8c6a3b2e5d0c0590c2f56b53ead40ec8d9eb2c125094eb961b092558c51baa89f237fda24cf1050e85c78dd7419e1d217c2feceb32c6296990ac54c3
diff --git a/app-crypt/paperkey/paperkey-1.6.ebuild b/app-crypt/paperkey/paperkey-1.6.ebuild
index 1c81dd96bc4e..c5eb3c6a14da 100644
--- a/app-crypt/paperkey/paperkey-1.6.ebuild
+++ b/app-crypt/paperkey/paperkey-1.6.ebuild
@@ -9,5 +9,5 @@ SRC_URI="http://www.jabberwocky.com/software/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86 ~x64-macos"
+KEYWORDS="amd64 ~arm64 x86 ~x64-macos"
 IUSE=""
diff --git a/app-crypt/rainbowcrack/Manifest b/app-crypt/rainbowcrack/Manifest
index 490a376a58e3..b5edac91f6cc 100644
--- a/app-crypt/rainbowcrack/Manifest
+++ b/app-crypt/rainbowcrack/Manifest
@@ -1,6 +1,3 @@
-DIST rainbowcrack-1.6.1-linux32.zip 138833 BLAKE2B 1c4143aa4dcbe644c4d6f436d6624cd9b4b714c2efd95387fe3657251d05c214f2126a7f6f396ddd83eeb8ea83fdf8e758513609b082abee308d94aea5bfbf82 SHA512 0fc163c4a8a875149b479d74fbabbfbb5247b9e621e5362a27a8fb6d5dd64263ce89213b5f5a578ce09018cb2c93f2af51eae954e19fd448c490bcd0524612dd
-DIST rainbowcrack-1.6.1-linux64.zip 134268 BLAKE2B 3c3e8d1a385a3c973839d19a19ce8f16a12540ba2d461197e8363b2feb3380d931728761b3404de9e80b5c6a9df9e51d5463476088cffdc1fbccd5888bb85231 SHA512 6fd5a0356b76ed5e8062888aeb26755588d11aa5dab7fbb54ea92dbeac02e606b082e00b93a44203c158ee620d61c0f9051ecf62b60d8a83c4fca852af22144d
 DIST rainbowcrack-1.7-linux64.zip 208726 BLAKE2B 842e0a3ee74a8576a5331cc86259178b382e82f465f3093e7d1fa1b44907c1c30a73f53c2f7f527e052bc6266ceffd350c42b9b80b1298072a02c0cbd25e660d SHA512 068fe9d31004e08c0fcbe5a11500bd6248eca2f204a8d99a7343824ebc1dd847a01eb459f28d77fdd84eae98b05169a69e10b8893b9b5dd027381965c19b7bdb
-EBUILD rainbowcrack-1.6.1.ebuild 992 BLAKE2B 9c9c096bc1dfc0a35ba1d952598ebfc557601006aa6c88c947ede17841bb1e890649bb97452ea561c0be7c2b262a95bd8bfbc11003efbc69cf9c2bde465f5105 SHA512 610aeb389d8ae04c09e3f1b4d27bd8ed508d4c3a262fc3e404a23b15cda112fabc9a84fa441212eaee7f0d4d72e6b01874d1e5ecea22f65f0bce576548917816
 EBUILD rainbowcrack-1.7.ebuild 955 BLAKE2B ec3864d6ea73fbc86459d16d93ab254c71a26dddd9aef2696eeda0f609fc0968eb7e07d7e93970d730abd8525d73604f55efc2e22a0d57023afb3e0afc6e2a4f SHA512 f269c621d2b06d0c967364a410459be648a997f3d5be4cd572fe5b4452901104ca2cf3aed0b4e4d7de04991b8e7d5717446053c44384da971e2dfa7d4801e92e
 MISC metadata.xml 982 BLAKE2B fbc05af924e12a9682024c9e24cb1c35f84874ad36b11c705a5810cab63f83e3c2abd89e828f231fb82fcf7e672ebaa9511b80fe749274d2b5e4e2ee1add26b8 SHA512 c76947d085f4c322baa8f15112f2e7a64887a025c5871f95f934f52778d0d714061fddbd2a8ed66b31e5cde92045cba77817c708533ba83fab89c9e46d6c8a0c
diff --git a/app-crypt/rainbowcrack/rainbowcrack-1.6.1.ebuild b/app-crypt/rainbowcrack/rainbowcrack-1.6.1.ebuild
deleted file mode 100644
index ec95cda05ca4..000000000000
--- a/app-crypt/rainbowcrack/rainbowcrack-1.6.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eutils
-
-DESCRIPTION="Hash cracker that precomputes plaintext - ciphertext pairs in advance"
-HOMEPAGE="http://project-rainbowcrack.com/"
-SRC_URI="amd64? ( http://project-${PN}.com/${P}-linux64.zip )
-	x86? ( http://project-${PN}.com/${P}-linux32.zip )"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-
-RESTRICT="bindist mirror" #444426
-
-RAINBOW_DESTDIR="opt/${PN}"
-
-QA_FLAGS_IGNORED="${RAINBOW_DESTDIR}/.*"
-QA_PRESTRIPPED="${RAINBOW_DESTDIR}/.*"
-
-DEPEND="app-arch/unzip"
-
-DOCS=(
-	readme.txt
-)
-
-src_unpack() {
-	default
-	mv ${P}-linux* "${S}"
-}
-
-src_install() {
-	einstalldocs
-
-	local bin bins="rcrack rt2rtc rtc2rt rtgen rtsort"
-
-	exeinto "/${RAINBOW_DESTDIR}"
-	doexe alglib0.so ${bins}
-
-	for bin in ${bins}; do
-		make_wrapper ${bin} ./${bin} "/${RAINBOW_DESTDIR}" "/${RAINBOW_DESTDIR}"
-	done
-
-	insinto "/${RAINBOW_DESTDIR}"
-	doins charset.txt
-}
diff --git a/app-crypt/tpm-emulator/Manifest b/app-crypt/tpm-emulator/Manifest
index ca6abaec814a..2f903578c00c 100644
--- a/app-crypt/tpm-emulator/Manifest
+++ b/app-crypt/tpm-emulator/Manifest
@@ -3,5 +3,4 @@ AUX tpm-emulator.confd 20 BLAKE2B 13dd9f09a0a4efb9a039bfeababb5f00b8b2c3c1777e60
 AUX tpm-emulator.initd 776 BLAKE2B 0daa0247396d1b5f1c9542b28f825899a5cc45bd748b6b7e2328440fd466fd6b461e32487a955816a79827bf350cfb33bd71a6b197a8e67dbf5509750098cb59 SHA512 22d7b163dc6f567c1900a275ae545c4421b2d459ba535a24f48d7ad2609f5df36533849aa781d4dd704961db102eea08c99b79c01d0e3981fb46d2eb4e39d6fe
 DIST tpm-emulator-0.7.5.tar.gz 222341 BLAKE2B c6dc7494800f4c6d1f5e622c6a47fdd5487e0f2cbc34173d9039d6eb5fd7541dd2c1f514efbf220c605424059844e18650b31ee9934eda6626427b915fd6bc53 SHA512 24c16ec36ca92c484d6e8dfa53c8ca00dbc5b58d78d7166041db1e9ae277d763f0fc0a6b0cbd7e62fcf4671f6ad2d8df1213256be0a4200b79b6ee61ab73b2ef
 EBUILD tpm-emulator-0.7.5-r1.ebuild 1714 BLAKE2B 9859186e9745a64ccb8cc65d4a3aec3c6cc16a4481e453cfa2e6611687892734be5d878a62039c3f99d00b515c7391e40bb86c5ed285d6063bb9c1d360cb19f7 SHA512 79d8f027b36b54433aad52c3fe8dbd8bfa3c2a2e16b811b9d3f78571c13e51a769816dcab6f44e75254da5f964e81ede9bc04f3915bfbc7bc72e6ba4402f0561
-EBUILD tpm-emulator-0.7.5.ebuild 1858 BLAKE2B 9f11f93bc01efaaeeca6f200b0705b9093c3b109e4af46502f187f079993ce735a1653d101561ca66b12444a63f67363198a9f890e7af954d2d6fdc47725f64e SHA512 2150882b2cfcd440ba40688683c045c25337c570059d11cc37be4fc88723ae5f617cf2de452355f79fb964e1cc66445271e8cc0bd9e10df8c25a212a5352854a
 MISC metadata.xml 395 BLAKE2B 053fec93e12819e95abadca4f2e9f871589c21ce8a7369092cfb04cb593a4fa687956458dfc2c7249b6951bb3b7c45f6c38fac1448d9e5d250ed8256f92df327 SHA512 dd69f6a31ebaa3971c316d967bd643654d11465bb0de20059ea82a4851691b605c42deb4846614627ae9c8b2b30075e6c44e53f9810999839ceaf2e9ee9aada8
diff --git a/app-crypt/tpm-emulator/tpm-emulator-0.7.5.ebuild b/app-crypt/tpm-emulator/tpm-emulator-0.7.5.ebuild
deleted file mode 100644
index 97b70a4785f0..000000000000
--- a/app-crypt/tpm-emulator/tpm-emulator-0.7.5.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-MODULES_OPTIONAL_USE="modules"
-inherit user linux-mod cmake-utils udev
-
-MY_P=${P/-/_}
-DESCRIPTION="Emulator driver for tpm"
-HOMEPAGE="https://github.com/PeterHuewe/tpm-emulator"
-SRC_URI="https://github.com/PeterHuewe/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="libressl mtm-emulator ssl"
-RDEPEND="ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)"
-DEPEND="${RDEPEND}
-	!ssl? ( dev-libs/gmp )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-build.patch"
-)
-
-pkg_setup() {
-	enewgroup tss
-	enewuser tss -1 -1 /var/lib/tpm tss
-	if use modules; then
-		CONFIG_CHECK="MODULES"
-		MODULE_NAMES="tpmd_dev(extra:tpmd_dev/linux:)"
-		BUILD_TARGETS="all tpmd_dev.rules"
-		BUILD_PARAMS="KERNEL_BUILD=${KERNEL_DIR}"
-		linux-mod_pkg_setup
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_OPENSSL=$(usex ssl ON OFF)
-		-DMTM_EMULATOR=$(usex mtm-emulator ON OFF)
-		-DBUILD_DEV=OFF
-	)
-	cmake-utils_src_configure
-
-	use modules && ln -s "${BUILD_DIR}/config.h" tpmd_dev/linux
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	use modules && linux-mod_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-	if use modules; then
-		linux-mod_src_install
-		udev_newrules "tpmd_dev/linux/tpmd_dev.rules" 60-tpmd_dev.rules
-	fi
-
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-
-	keepdir /var/log/tpm
-	fowners tss:tss /var/log/tpm
-}
-
-pkg_postinst() {
-	if use modules; then
-		linux-mod_pkg_postinst
-
-		ewarn ""
-		ewarn "The new init.d script does not load the tpmd_dev any more as it is optional."
-		ewarn "If you use the tpmd_dev, please load it explicitly in /etc/conf.d/modules"
-		ewarn ""
-	fi
-
-	einfo "tpmd socket is located at /var/run/tpm/tpmd_socket:0"
-}
diff --git a/app-crypt/xca/Manifest b/app-crypt/xca/Manifest
index d4cf171dd774..4bcc73a86290 100644
--- a/app-crypt/xca/Manifest
+++ b/app-crypt/xca/Manifest
@@ -1,10 +1,4 @@
 AUX xca-1.0.0-desktop.patch 391 BLAKE2B 1cbec5681df8da9230b783c8ea048a199bd31a38fce6781dcd86b926e03b245de05b148d8df9034f5c7470dcf5823bd4a080cbb011a1a32fc0b96d8a8a5d950d SHA512 5dd62d8d2f4485b6155e466bb9a012f44104ff36c97bae61e8155880b937fc1271e94fb5b83627bd828e3cde0ab421a150458d050cb512d633d1c5c97f80f163
-DIST xca-1.4.1.tar.gz 959107 BLAKE2B 7437cdbaa5277998de200e9a5ad3a7d44aed9ae8af8fd926d7ed1917d49bec79562455ca2e82557149d748840f299ffd66edfc7f265be7d5bdcd6e4fe8dbaf9b SHA512 8294669c4887ba7a9060c3c2c06014b8a1807898569842ed61c066e8a864de014fba51a2ff867b579048083fdd4934cc7f97c92268de4944bf4aafea9c2e7b42
-DIST xca-2.1.0.tar.gz 1055745 BLAKE2B c3ea2953be7cacb8c4c6fb6911f2e51806d40f294d8c9daef1d47da4f3e6ffa4933d199b8b92cab828286ececab2ea7195d5a46455e4d4703f0a67d0d7861db9 SHA512 ad46b290067b0a22bb6baeb0d065879bea74cd2c853f67c2be3d0c2bdaa5ca4ebef606c0f08bd0b130df4ec13418d470062b708ab479800eab7c18dffa46af03
-DIST xca-2.1.1.tar.gz 1055613 BLAKE2B bb6d6b4742c7a799bf1a65e1ed2f8ab8b4d695e717e630600bc22f0e0d4a9ae95d5d98d3e85ccfbdd07eb08cf7dba6b94c702790e21fe4899fce8fc33e4f7154 SHA512 e7c3fdb515bb7a719a775b97efcabe71dc1ccc31a7ddd7cb1a9543fb16d131bce180917418091927334a4dd169daef919a4d9476a29ab4355688c961e3340dd3
 DIST xca-2.1.2.tar.gz 1086563 BLAKE2B d48727fffad16d840633af6e0ee38a279978a5b865eb6f391a3d852a0105817254ea0a4780875f2956e1f7e9931e6930c6ffbe82b117dbf8ad0058ec9d6f5c88 SHA512 1f104a22b83b802576b4820b7139971da50f9b3dd70aca8e1199e996bad4379b8681bb31b197b84a3dfa49cef4ae093f6622d15fac9667547ff47af43c1e5f07
-EBUILD xca-1.4.1.ebuild 1206 BLAKE2B efe75fe96b26d9179bcb51365e5dd67be4e952629c9961e93522a576d4c233dfba2d1aafb6bc86eb5832efa16e7c869e1bda274847028756bf0ea939caa88b49 SHA512 692b76cd35fe8928890017bedfbebcb99d692bf1efc07f39230561240cf2e70acf021418c634f13f985e35a17b54727a58e537f309a3ddf0fd885267cbd80d74
-EBUILD xca-2.1.0.ebuild 1453 BLAKE2B b892c63cf6df72362d5a0fcef1a6b4f3679116ea3cfdcbffdf6a9b738fc9a0c3fee77f0095754d6bc2662949bf988b9a34506e44788c898909602fd0295a8bef SHA512 0f082f78fa1defafe7b3125226908115c9672b170d26cd2b6d91e98d0e2e0a8c7b4212a6344978a53f5ad7db77fef9ac10b023152a91d10142237c886daea712
-EBUILD xca-2.1.1.ebuild 1453 BLAKE2B 0dc3fe49d50d9a668918e5fc02517f41323dd3c63afea9581dc7807d4f5d535ce2b35158e3bd33561eeb8d481f9454a669c44a5816f59f91e9d8bbe7d856e653 SHA512 e66d97e9b0280d00f88ab9d7afadd6d322e1b6027763c5942d1eaba8b6bd964e959bd8b748bd8e78500374bd3cea9e9641c01744bbe29508bd21ad88d7c7c6b6
-EBUILD xca-2.1.2.ebuild 1458 BLAKE2B ba654a2cb98212ff30064a2805e18710276decf9b4701a4fe101478e20d0716eb9bda52d034daa3e879e976d3d1cb5c9c7019c51e918ffd42aeebe569aa134da SHA512 cfd31b71ae28fc923a0eb37c4bc482acdad766b0efdc0587fcebfc096583bf1e8e2647effc70fa82c16fa9b0bf3c0a55123dfb2cbb73a875495c23cd186324e9
+EBUILD xca-2.1.2.ebuild 1455 BLAKE2B 1aea6cd367a144b64aba3439204e81d2afdbac0e506596eeb02731b439c4b4812a6e3b572f2b974a881a3765832edda9a87301eb593d7c1f569543425d55ffc9 SHA512 d3156e68bd839e5d332190389605759db233c00cb70485b2f8238b4c684473836e817f0af8da44c87d9ff6b736ac6464479b2216572594a5eb7a53881ceab5a2
 MISC metadata.xml 313 BLAKE2B 6e1376d870ee5ab083ed80dcc19c1acd60d487e285e9bdba7b92c13e97cb05a3a6fa8bc4c6107d5d54470e6ca93889fca15c1a2f7e690a169ca7aff64bd2499e SHA512 ebc38746afd94878384ef0e4d7933e2a7433216716b1854cfc0227c3f0abf0847d784d36de4b04a778743e442298abd3769329deecdc771003681ecd3dbf3fa1
diff --git a/app-crypt/xca/xca-1.4.1.ebuild b/app-crypt/xca/xca-1.4.1.ebuild
deleted file mode 100644
index 27a4d7c8af8b..000000000000
--- a/app-crypt/xca/xca-1.4.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit xdg-utils
-
-DESCRIPTION="A GUI to OpenSSL, RSA public keys, certificates, signing requests etc"
-HOMEPAGE="https://hohnstaedt.de/xca/"
-SRC_URI="https://github.com/chris2511/${PN}/releases/download/RELEASE.${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="bindist doc libressl"
-
-RDEPEND="
-	dev-libs/libltdl:0=
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	!libressl? ( dev-libs/openssl:0=[bindist=] )
-	libressl? ( dev-libs/libressl:0= )
-	doc? ( app-text/linuxdoc-tools )"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.0.0-desktop.patch"
-)
-
-src_configure() {
-	econf \
-		--with-qt-version=5 \
-		$(use_enable doc) \
-		STRIP=true
-}
-
-src_compile() {
-	# enforce all to avoid the automatic silent rules
-	emake all
-}
-
-src_install() {
-	# non standard destdir
-	emake install destdir="${ED}"
-	einstalldocs
-
-	insinto /etc/xca
-	doins misc/*.txt
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/app-crypt/xca/xca-2.1.0.ebuild b/app-crypt/xca/xca-2.1.0.ebuild
deleted file mode 100644
index 083396d5b9ed..000000000000
--- a/app-crypt/xca/xca-2.1.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit xdg-utils
-
-DESCRIPTION="A GUI to OpenSSL, RSA public keys, certificates, signing requests etc"
-HOMEPAGE="https://hohnstaedt.de/xca/"
-SRC_URI="https://github.com/chris2511/${PN}/releases/download/RELEASE.${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="bindist doc libressl"
-
-RDEPEND="
-	dev-libs/libltdl:0=
-	dev-qt/qtgui:5
-	dev-qt/qtsql:5[sqlite]
-	dev-qt/qtwidgets:5
-	!libressl? ( dev-libs/openssl:0=[bindist=] )
-	libressl? ( dev-libs/libressl:0= )
-	doc? ( app-text/linuxdoc-tools )"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.0.0-desktop.patch"
-)
-
-src_configure() {
-	econf \
-		--with-qt-version=5 \
-		$(use_enable doc) \
-		STRIP=true
-}
-
-src_compile() {
-	# enforce all to avoid the automatic silent rules
-	emake all
-}
-
-src_install() {
-	# non standard destdir
-	emake install destdir="${ED}"
-	einstalldocs
-
-	insinto /etc/xca
-	doins misc/*.txt
-
-	ewarn "Make a backup copy of your database!"
-	ewarn "This version completely changes the database format to SQL(ite)"
-	ewarn "Don't try to open it with older versions of XCA (< 1.4.0). They will corrupt the database."
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/app-crypt/xca/xca-2.1.1.ebuild b/app-crypt/xca/xca-2.1.1.ebuild
deleted file mode 100644
index 34566357ce3d..000000000000
--- a/app-crypt/xca/xca-2.1.1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit xdg-utils
-
-DESCRIPTION="A GUI to OpenSSL, RSA public keys, certificates, signing requests etc"
-HOMEPAGE="https://hohnstaedt.de/xca/"
-SRC_URI="https://github.com/chris2511/${PN}/releases/download/RELEASE.${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="bindist doc libressl"
-
-RDEPEND="
-	dev-libs/libltdl:0=
-	dev-qt/qtgui:5
-	dev-qt/qtsql:5[sqlite]
-	dev-qt/qtwidgets:5
-	!libressl? ( dev-libs/openssl:0=[bindist=] )
-	libressl? ( dev-libs/libressl:0= )
-	doc? ( app-text/linuxdoc-tools )"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.0.0-desktop.patch"
-)
-
-src_configure() {
-	econf \
-		--with-qt-version=5 \
-		$(use_enable doc) \
-		STRIP=true
-}
-
-src_compile() {
-	# enforce all to avoid the automatic silent rules
-	emake all
-}
-
-src_install() {
-	# non standard destdir
-	emake install destdir="${ED}"
-	einstalldocs
-
-	insinto /etc/xca
-	doins misc/*.txt
-
-	ewarn "Make a backup copy of your database!"
-	ewarn "This version completely changes the database format to SQL(ite)"
-	ewarn "Don't try to open it with older versions of XCA (< 1.4.0). They will corrupt the database."
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/app-crypt/xca/xca-2.1.2.ebuild b/app-crypt/xca/xca-2.1.2.ebuild
index 9e097029604e..ed4c28eb1c00 100644
--- a/app-crypt/xca/xca-2.1.2.ebuild
+++ b/app-crypt/xca/xca-2.1.2.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"
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/chris2511/${PN}/releases/download/RELEASE.${PV}/${P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="bindist doc libressl"
 
 RDEPEND="
diff --git a/app-crypt/yubikey-manager/Manifest b/app-crypt/yubikey-manager/Manifest
index b07420faa158..eeea081a5e6b 100644
--- a/app-crypt/yubikey-manager/Manifest
+++ b/app-crypt/yubikey-manager/Manifest
@@ -6,6 +6,6 @@ DIST yubikey-manager-2.0.0.tar.gz 102078 BLAKE2B a2b8f90dabefb1014881cbe709222bf
 DIST yubikey-manager-2.1.0.tar.gz 132797 BLAKE2B 39a170901dd10443f7cd639d1f525b12074ed042f606c083fe5b1bf04f463f608c4968c1e7f06dd057ff519a2a4bf712d36643e7db164ef92a3152ea5fb7ae15 SHA512 05cc1a106ffd2b40bc0a1286fa2f9c19f022bc7db04b85c9aaab3c67cad92a0c8ee4ba70f9b62ffa7f02ce67525a7d5f03bf9160b9bbe38909232cf75eb39373
 EBUILD yubikey-manager-0.7.1.ebuild 1579 BLAKE2B 65991c1ec1c6acc26baac225043924eb7dd5fdcad0e99d8ba26931ef9da0318dd47ca9a5f602c75c3fb35eedfc0a275695231b5a03e191c9c30a323ef89bf95a SHA512 d24bd03dc385339b96e36fc8056e4044233b784ad73a9464ae2eb797d5ac48bef907e3c27a63125c34c41b8578f8a98c03f9b3cc18db263c3ad656724f532ba3
 EBUILD yubikey-manager-1.0.0-r1.ebuild 1529 BLAKE2B c6e82a3279aa4ea3a179df00c95f53d41626ff825b9c0e43da9670fd724ac8e3156ef54056b2b70c951dd73e0d8b4bc5594cedea16270e034a6cbd92233cfc8c SHA512 ccae1748ac051677ff46517a88e18affaadda2508dd05c261a0a0377d7f75cbdaaa5b114c70a74e5195ce8c9624cdb820c3f883dcd1be74f8046472614ba453c
-EBUILD yubikey-manager-2.0.0.ebuild 1676 BLAKE2B 3737a80f7f6bfe9f712dc4abce6d6ca3ee196ddeeb4e60b0080226958580455f1d57cdf2a3d1d0f8de5456ffd2f2361ff27017ad64c820a0a913149547a2383c SHA512 70e17d694ae9a2ef45f09d28988daa91ccd4afabb5cd3bd4f7d21fe7e85a013507668bebd5242ae23a0153945a21db30abfce6abd34e9fea3c7f4a654ac35e3e
-EBUILD yubikey-manager-2.1.0.ebuild 1530 BLAKE2B 299579dc9d3e3e56a502ae3140226bb80b8cfc7cd0d7a41b82877fd86ced9c382c419e276615e07f84552504b83f93a4d1cd266244930bc74ce177f916794324 SHA512 d5da375e7eb7166db9de436eb1978d6b2b89e882fdea62d1872be22495ed09f6f2cb150753087423c57da71fad4c49ac85ecbd650d838e6bd92ce0b1401b40a8
+EBUILD yubikey-manager-2.0.0.ebuild 1680 BLAKE2B b5611488508853e8e52055270968136d6ec06e533cb9999da0648d0c65fe78a82ea26bf3705ac24b0d1d57d700d0d28794b1538fed0ebbf4436be4c2da9038ba SHA512 582b5c234bb9e801ec1f10d819c2897b3edb11b708d211d367ad1218e76e882c7170bfec9e6099bf1401bebcc6c8cc86e3b3e15135790dee9e89071707b89038
+EBUILD yubikey-manager-2.1.0.ebuild 1535 BLAKE2B 40f154c5ce3e87b7c21febf1f2bd12842695b97466f027cb53468cada65b3160db48e6f9760d920d07024ce3fab86b5088f113fd78754b02537b4040670fbec7 SHA512 9405cd372bb47d080bc152532ef6e7b5f9acd5e87287c1cfdb201a292920b648691acf1ddf712d1e948df7a2a138f09f263484d573574ab3a4e083d05914c034
 MISC metadata.xml 466 BLAKE2B 258688bf55e0d7d5d13a45996c2177d2154626a75ffd0c5b39cbc5c3f83979a00ec1d9a993870c00785d0e1d02cdeb1dadfa38f39d91b5992c5b495f644c6253 SHA512 6355c94235c5a7a9dbe37fb954d7de5807bbd48d62921f819da7ac1c56f0214820cbf74b2f91311573f8a1726b05960d944b536fbf0e0f27fe49a5aa0a827e1b
diff --git a/app-crypt/yubikey-manager/yubikey-manager-2.0.0.ebuild b/app-crypt/yubikey-manager/yubikey-manager-2.0.0.ebuild
index 0172b68ddf9d..48998431ea98 100644
--- a/app-crypt/yubikey-manager/yubikey-manager-2.0.0.ebuild
+++ b/app-crypt/yubikey-manager/yubikey-manager-2.0.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${P}" # <- need this only for github-based SRC_URI
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/app-crypt/yubikey-manager/yubikey-manager-2.1.0.ebuild b/app-crypt/yubikey-manager/yubikey-manager-2.1.0.ebuild
index 30b06435964d..30b5eadeab70 100644
--- a/app-crypt/yubikey-manager/yubikey-manager-2.1.0.ebuild
+++ b/app-crypt/yubikey-manager/yubikey-manager-2.1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="test"
 
 RDEPEND="