gentoo resync : 25.11.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-11-25 22:39:15 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-11-25 22:39:15 +0000
commit: d934827bf44b7cfcf6711964418148fa60877668 (patch)
tree: 0625f358789b5e015e49db139cc1dbc9be00428f /app-crypt
parent: 2e34d110f164bf74d55fced27fe0000201b3eec5 (diff)
149 files changed, 2165 insertions, 1117 deletions
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 82888678ef4d..84add7a6e4fc 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 43aec4e24ee5..5148aa627926 100644
--- a/app-crypt/acme-tiny/Manifest
+++ b/app-crypt/acme-tiny/Manifest
@@ -1,4 +1,6 @@
 DIST acme-tiny-4.0.4.tar.gz 12667 BLAKE2B 6177d639a2d65080f84ca93400405c01ef18cb3c8d18ef5e7e57af1eede9d6f1e105ca7f6f89014e79c5cb1d865d3c81f590abdb37e8caa6b9699ea20064f698 SHA512 e66befe8262b3396e5e55ea01fc47c668c527868832d2ccdc2786156ec52e698fd20cb6fa4fe861d97947d64f4b6c751be9c79bf546eaac34978c53b9e6f85e4
+DIST acme-tiny-4.1.0.tar.gz 12776 BLAKE2B 7efd9d1399ec3bbd98180511c9f36fbf6f9a96a0d4e0e72b9d4c85d16246118eaaad25bc26ba42f746fd4b60b498ceca5307e279d788157237ac6ad153848501 SHA512 31d69a5031c019acbc23b3f06041eae8e261766396d4a7420fd70a71cfa16de953bea4c0c2ad0c6a6e793ed61ab5331f40145352ffce69f4f062f35dd0db7519
 EBUILD acme-tiny-4.0.4.ebuild 1123 BLAKE2B b2eeaab3c586da0a554d7707a82d426573e91c876231d9234c8de20b1635360ac0ad57a0a025efc4bbfabc61853e1f4be6965421312ebe96f997ea5a90370864 SHA512 0aca96327d05bcacb6e960d69bb6972a234cb7d1316eb89021f42f06f756ed454033879e58dc9dc726043221a94c990635b54f9a26b08264e5aabf88e7e480a6
-EBUILD acme-tiny-9999.ebuild 1119 BLAKE2B da97a138852c81eb93e58ed071350e3a718291da3a59abe2d6df0941a3b1cef8af434527d5179699b052f3a94ef29e0926188fb0e59ba9007cd70351cc0fc1ff SHA512 077a62a16009f100e1d5945572734b5acb5fecd5c56efed161b4ded75d072e5544f6f850ae42e045a47275660e642a50fe39df4987272a87abf5389d26bc4d54
+EBUILD acme-tiny-4.1.0.ebuild 1114 BLAKE2B f89edfc1bbbe6d7775a19672d269a0e52aebb6e0d5ad3e9af8db495cd4d6c4f6ab21db97d7baea00ee289d67e5bf9e22191bc154bfba2cd67ed2b2dd80373cf0 SHA512 9701da44e3c150c0a27204ac933e21060e62f86dc16ba66fa10406a6c9e8525521f30bbf2a32acc80fa21ebc7e33c6b229065b10304c4f66740c80106554b301
+EBUILD acme-tiny-9999.ebuild 1114 BLAKE2B 82fb2e53832a806c908e634e1c6af5523050feff73ca126541f088e5f9d6d4782b45767e5b6a34ad27483e24dbf48f71039924f685e965cf2dc74887272e4f0a SHA512 960b6ef1e9ac8e7d076da62ef0b7035a88a90e95f8a7f22f6d79789a341e67ee82db5b8877a9972fdc0df7f1280fe409d1351b8ad8ad695fd9e6fd8493135d35
 MISC metadata.xml 329 BLAKE2B ced7f9ec6d26b74b6c0ee133935595f1d7d4dcb7d0e134f072b66725151980d013fcc5a7ef30708dca402c6a8449e119bbf3084b85afa301965aee3465e1b034 SHA512 3c6601f8249de10c7cf8b14bd128d5d564671ebb5eb6554eaebf7b6e01b0469f2a26ae658aa05f6391ce28029c5a5d422e2ed12115f2a5451d17ceca4258684b
diff --git a/app-crypt/acme-tiny/acme-tiny-4.1.0.ebuild b/app-crypt/acme-tiny/acme-tiny-4.1.0.ebuild
new file mode 100644
index 000000000000..a1911edadfdc
--- /dev/null
+++ b/app-crypt/acme-tiny/acme-tiny-4.1.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8,3_9} )
+inherit distutils-r1
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/diafygi/${PN}.git"
+else
+	SRC_URI="https://github.com/diafygi/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="A tiny, auditable script for Let's Encrypt's ACME Protocol"
+HOMEPAGE="https://github.com/diafygi/acme-tiny"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+RDEPEND="dev-libs/openssl:0"
+
+pkg_setup() {
+	if [[ ${PV} != 9999 ]]; then
+		export SETUPTOOLS_SCM_PRETEND_VERSION="${PV}"
+	fi
+}
+
+src_prepare() {
+	sed -i 's|#!/usr/bin/sh|#!/bin/sh|g' README.md || die
+
+	distutils-r1_src_prepare
+}
+
+pkg_postinst() {
+	for v in ${REPLACING_VERSIONS}; do
+		if ver_test "$v" "-lt" "4.0.3" || ver_test "$v" "-ge" "9999"; then
+			einfo "The --account-email flag has been changed to --contact and"
+			einfo "has different syntax."
+			einfo "Please update your scripts accordingly"
+		fi
+	done
+}
diff --git a/app-crypt/acme-tiny/acme-tiny-9999.ebuild b/app-crypt/acme-tiny/acme-tiny-9999.ebuild
index 4d15c1d8601b..8521a3767ad0 100644
--- a/app-crypt/acme-tiny/acme-tiny-9999.ebuild
+++ b/app-crypt/acme-tiny/acme-tiny-9999.ebuild
@@ -3,13 +3,12 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8,3_8} )
 inherit distutils-r1
 
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/diafygi/${PN}.git"
-	KEYWORDS=""
 else
 	SRC_URI="https://github.com/diafygi/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
diff --git a/app-crypt/acme/Manifest b/app-crypt/acme/Manifest
index f59bd641bedb..27430e8896d7 100644
--- a/app-crypt/acme/Manifest
+++ b/app-crypt/acme/Manifest
@@ -1,6 +1,4 @@
-DIST certbot-1.7.0.tar.gz 1416764 BLAKE2B de678a222e8c8e3e7834470f87763763671bfae37a5c8320a4c1a2552ec979b5391094713e7e13526f73fdf8cd32f70f8c4350f422505892c4fdd0ae77742c80 SHA512 f81242e68b7e261bbb6294ffe92e47bc1687128344816d71a495a94a2646e209e46c147bc76eedce0c477cc140dc6ae0fba76d2d5d01b828fce78875f5a2886a
-DIST certbot-1.8.0.tar.gz 1425620 BLAKE2B 9cc0443fd067bf594f02a79c99defa250e656dbee00cd2717a4a747abfe80511ffcb800b6ac63e484a918192dad9465dc45335f358267fa998af16e966b8e2a6 SHA512 c6559fe1e5db6269942bda3738c00b1b550ec448288eaf911ba9c3967c7e949b34bdd8b77742398f0a512ce07929fa2f227c1202e40900151762f1db6ff9de56
-EBUILD acme-1.7.0.ebuild 1721 BLAKE2B b6f1bf82f1a856659e423bf64da1e1db084e6ce9a3583cbdad5de574441b2b2a1216f23961352decd9323f8c6c115502d426312070891e1411d8632054a871ef SHA512 a017fea91a2c3b3ef8596e8a80b3bc9576e7fe80f4cea844b0be5a56c12578854a27b46c2921d0b5f32add2f4b64154a54b1183442c051366ae3764910cec668
-EBUILD acme-1.8.0.ebuild 1723 BLAKE2B 1f9dcf588af71aa02df863c8d2704b261586fb72b088161cf4fd0643a941e7cf55f9d450c3a6c39bc9075092b63d62f7a16f2f5b295870de41c3bf409ab4e191 SHA512 cf5d3780b7dc9faf510b00ecd4342b52b6133f5852c7afe732ca50e52825cc6f8d55e3400928d3e99793e2457b86e8c0c1d199820fe3e2a086c596b4586970f0
+DIST certbot-1.9.0.tar.gz 1425703 BLAKE2B 9bf78824649870b3e1fc3175aae551cbfaa675a8930a89f35ba2330647d86798e4fc43011c617be2d278ab20c43dd05b02e8e61956dd7f9d10d444181874346e SHA512 098d8c077f5760c1f40f7d673820488ad7643c8b9c12561a58921cd95f60ae76515cefc19f822747f3385a68eba6f49fe5484b20142994ef67a26b0b16293ce8
+EBUILD acme-1.9.0.ebuild 1721 BLAKE2B b6f1bf82f1a856659e423bf64da1e1db084e6ce9a3583cbdad5de574441b2b2a1216f23961352decd9323f8c6c115502d426312070891e1411d8632054a871ef SHA512 a017fea91a2c3b3ef8596e8a80b3bc9576e7fe80f4cea844b0be5a56c12578854a27b46c2921d0b5f32add2f4b64154a54b1183442c051366ae3764910cec668
 EBUILD acme-9999.ebuild 1723 BLAKE2B 1f9dcf588af71aa02df863c8d2704b261586fb72b088161cf4fd0643a941e7cf55f9d450c3a6c39bc9075092b63d62f7a16f2f5b295870de41c3bf409ab4e191 SHA512 cf5d3780b7dc9faf510b00ecd4342b52b6133f5852c7afe732ca50e52825cc6f8d55e3400928d3e99793e2457b86e8c0c1d199820fe3e2a086c596b4586970f0
 MISC metadata.xml 384 BLAKE2B 55780995cb61c11ca859c9f1de17b1c22c9c92902f551ccd1ee6f030df9d513bb5519a2c62bf33bc6a5872790d033ba966e5ed137d84a4f66ab4ba7636a88887 SHA512 cf8393b25aa363bc1db4ebd23274affd1eaf999a4c2ab8d359730f421961dafd5c96fcf14c247f3f5419616116e2351d72fbf0e29301ea44ac522e865c7b0fa1
diff --git a/app-crypt/acme/acme-1.8.0.ebuild b/app-crypt/acme/acme-1.8.0.ebuild
deleted file mode 100644
index 9c58fbb71ad7..000000000000
--- a/app-crypt/acme/acme-1.8.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=(python{3_6,3_7,3_8})
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-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="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/cryptography-1.3.4[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/josepy-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.15.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="
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	)
-	test? (
-		${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-src_compile() {
-	python_foreach_impl run_in_build_dir default
-	distutils-r1_src_compile
-	if use doc ; then
-		cd docs || die
-		sphinx-build -b html -d _build/doctrees   . _build/html
-	fi
-}
-
-python_test() {
-	nosetests -w ${PN} || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/app-crypt/acme/acme-1.7.0.ebuild b/app-crypt/acme/acme-1.9.0.ebuild
index da638d5ba966..da638d5ba966 100644
--- a/app-crypt/acme/acme-1.7.0.ebuild
+++ b/app-crypt/acme/acme-1.9.0.ebuild
diff --git a/app-crypt/acmebot/Manifest b/app-crypt/acmebot/Manifest
deleted file mode 100644
index f227dfa50f96..000000000000
--- a/app-crypt/acmebot/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST acmebot-2.3.0.tar.gz 64841 BLAKE2B 92bfb9a58722b9955fe908e2fcb1a3ee593bf87e3fdf3dc9564bcbe291b13c553ad426673c337a59344287da64c4ee5cffc734f8dfb60447f96d6234814f0167 SHA512 3951cc7138eb0b83bd802a2e0a221fa985209ba276028606d887b7d2eff84c35db034f4a3d8a6836b3ac149c6dbfa27b1ea47e864f549f8d88b758b40407c4f4
-DIST acmebot-2.7.0.tar.gz 76385 BLAKE2B 28b0fd81735e2dbff493dbcfe0194d62dea8d233866dcb235bb0efac562d2f3884f53226f979e8cd6050078f59b0b1e6d20d2eeea6d762363526686ef8c5ead1 SHA512 1b8fa21c2dc60a940e2fa13d5d599025088644862c985749d72f4f16ebd4ad48970b7fcf656fb34cf63d3c2ff2cbb157d7446c17a7f9da3cffd8611e499c400e
-EBUILD acmebot-2.3.0-r1.ebuild 1204 BLAKE2B 3e8c2819fbfcf03532e9d3a4e27bab49d1c71b731ed57e1b9670feeb2976e87b9ba996d4d86f44b5e64d83ec6150cdf86ad4797365558875fec738eeb3e85150 SHA512 f55d679599a23d555e295b4ff5d6618c0b6ba8412da22d139bf9502a78509984fda7654eed2c69781e37c02e13482be723469468297697820df68ad221d1467f
-EBUILD acmebot-2.7.0.ebuild 1439 BLAKE2B 0a2d1e8fcd954aeb170d93d89aabdf694fa912bbffeb87e99a554fee0d4d929df906c0de785b8bad53fbc183cf4fa02c703ea5529afe2c29ef08584345bfce1b SHA512 46324c58e46f480cb1b9b7cff47f220df96a40c4c8714769a517e5e8be52d7ccba9c058bcf2944962e1cfcf357ac5b1c06e3b5031abebf2008c59501d57d41b3
-EBUILD acmebot-9999.ebuild 1204 BLAKE2B 3e8c2819fbfcf03532e9d3a4e27bab49d1c71b731ed57e1b9670feeb2976e87b9ba996d4d86f44b5e64d83ec6150cdf86ad4797365558875fec738eeb3e85150 SHA512 f55d679599a23d555e295b4ff5d6618c0b6ba8412da22d139bf9502a78509984fda7654eed2c69781e37c02e13482be723469468297697820df68ad221d1467f
-MISC metadata.xml 216 BLAKE2B 20531789dc11e43feee7ec315a0c1c7249fdf73764e29cb7d6db439826e9ff72f24a5cdb8eb7f1ab99bbb41fb6e4226874a1d1fa4185de52598602bb3b0479a3 SHA512 e881b59fe49746eb25ad66c258b41aba501e4eb563129093a3898ea970a20506e7898f7c355cfcf99605234962bf2c77c1309c258b9a2b84ee4302ccb71c9dbd
diff --git a/app-crypt/acmebot/acmebot-2.3.0-r1.ebuild b/app-crypt/acmebot/acmebot-2.3.0-r1.ebuild
deleted file mode 100644
index d200063e3eb7..000000000000
--- a/app-crypt/acmebot/acmebot-2.3.0-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=(python3_6)
-EGIT_REPO_URI="https://github.com/plinss/${PN}.git"
-[[ $PV == 9999 ]] && _scm=git-r3
-
-inherit ${_scm} python-r1
-
-DESCRIPTION="Certificate manager bot using ACME protocol"
-HOMEPAGE="https://github.com/plinss/acmebot"
-if [[ $PV != 9999 ]]; then
-	SRC_URI="https://github.com/plinss/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-[[ $PV != 9999 ]] && KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-CDEPEND="${PYTHON_DEPS}
-	>=dev-python/appdirs-1.4.3[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/packaging-16.8[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-17.5.0[${PYTHON_USEDEP}]
-	>=dev-python/pydns-3.1.0:3[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.1.4[${PYTHON_USEDEP}]
-	>=dev-python/asn1crypto-0.24.0[${PYTHON_USEDEP}]
-	>=app-crypt/acme-0.25.1[${PYTHON_USEDEP}]
-	"
-RDEPEND="${CDEPEND}"
-DEPEND=""
-
-src_install() {
-	python_foreach_impl python_doscript acmebot
-	insinto /etc/logrotate.d
-	doins logrotate.d/acmebot
-	insinto /etc/acmebot
-	doins acmebot.example.json
-	dodoc README.rst
-}
diff --git a/app-crypt/acmebot/acmebot-2.7.0.ebuild b/app-crypt/acmebot/acmebot-2.7.0.ebuild
deleted file mode 100644
index e6b7da902b1b..000000000000
--- a/app-crypt/acmebot/acmebot-2.7.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=(python3_{7,8})
-EGIT_REPO_URI="https://github.com/plinss/${PN}.git"
-[[ $PV == 9999 ]] && _scm=git-r3
-
-inherit ${_scm} python-single-r1
-
-DESCRIPTION="Certificate manager bot using ACME protocol"
-HOMEPAGE="https://github.com/plinss/acmebot"
-if [[ $PV != 9999 ]]; then
-	SRC_URI="https://github.com/plinss/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-[[ $PV != 9999 ]] && KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND=""
-RDEPEND="${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-	>=dev-python/appdirs-1.4.3[${PYTHON_MULTI_USEDEP}]
-	>=dev-python/pyparsing-2.2.0[${PYTHON_MULTI_USEDEP}]
-	>=dev-python/packaging-16.8[${PYTHON_MULTI_USEDEP}]
-	>=dev-python/pyopenssl-17.5.0[${PYTHON_MULTI_USEDEP}]
-	>=dev-python/pydns-3.1.0:3[${PYTHON_MULTI_USEDEP}]
-	>=dev-python/cryptography-2.1.4[${PYTHON_MULTI_USEDEP}]
-	>=dev-python/asn1crypto-0.24.0[${PYTHON_MULTI_USEDEP}]
-	>=app-crypt/acme-0.25.1[${PYTHON_MULTI_USEDEP}]
-	>=dev-python/pyyaml-3.1[${PYTHON_MULTI_USEDEP}]
-	')
-	"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-src_prepare() {
-	default
-	python_fix_shebang .
-}
-
-src_configure() {
-	:
-}
-src_compile() {
-	:
-}
-
-src_install() {
-	python_doscript acmebot
-	insinto /etc/logrotate.d
-	doins logrotate.d/acmebot
-	insinto /etc/acmebot
-	doins acmebot.example.json
-	dodoc README.rst
-}
diff --git a/app-crypt/acmebot/acmebot-9999.ebuild b/app-crypt/acmebot/acmebot-9999.ebuild
deleted file mode 100644
index d200063e3eb7..000000000000
--- a/app-crypt/acmebot/acmebot-9999.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=(python3_6)
-EGIT_REPO_URI="https://github.com/plinss/${PN}.git"
-[[ $PV == 9999 ]] && _scm=git-r3
-
-inherit ${_scm} python-r1
-
-DESCRIPTION="Certificate manager bot using ACME protocol"
-HOMEPAGE="https://github.com/plinss/acmebot"
-if [[ $PV != 9999 ]]; then
-	SRC_URI="https://github.com/plinss/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-[[ $PV != 9999 ]] && KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-CDEPEND="${PYTHON_DEPS}
-	>=dev-python/appdirs-1.4.3[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/packaging-16.8[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-17.5.0[${PYTHON_USEDEP}]
-	>=dev-python/pydns-3.1.0:3[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.1.4[${PYTHON_USEDEP}]
-	>=dev-python/asn1crypto-0.24.0[${PYTHON_USEDEP}]
-	>=app-crypt/acme-0.25.1[${PYTHON_USEDEP}]
-	"
-RDEPEND="${CDEPEND}"
-DEPEND=""
-
-src_install() {
-	python_foreach_impl python_doscript acmebot
-	insinto /etc/logrotate.d
-	doins logrotate.d/acmebot
-	insinto /etc/acmebot
-	doins acmebot.example.json
-	dodoc README.rst
-}
diff --git a/app-crypt/cardpeek/Manifest b/app-crypt/cardpeek/Manifest
index 69e37d79c9e6..1be554126806 100644
--- a/app-crypt/cardpeek/Manifest
+++ b/app-crypt/cardpeek/Manifest
@@ -1,5 +1,5 @@
 DIST cardpeek-0.7.2.tar.gz 1130295 BLAKE2B c2aec139c8834947dd2e04fe384719bccdbce9b75b24f791136d5afb5873e6e0afb8306ebb2ddf6fa4e8b4cb46078667fae8eb962b425278351172292df6faaf SHA512 9fd1790794b8d092859670bb36a0cdd235e7d098d563032ccdb8143eac00bb77532f1ab918897c4b753afd184079975de34a6f645e31eadb28b6c5a81d344ecd
 DIST cardpeek-0.8.4.tar.gz 1520613 BLAKE2B f31a0298ab8423b384b0ad62abb0599da75fd968385e9e6c9a5982e6fbaf7bec8a6098e3e7a5c30ce6634c65e05db084772f4a33c7ef5d6fdcdee0022cc56b86 SHA512 f6eebc7a17f270dd56529ee36815fee72b2f9d62b24d6cc90060f20c7604b9b99ab76858d9c04c60aaec838b02b8db76476a91ee22a4e10f01f852cd1f536efb
-EBUILD cardpeek-0.7.2.ebuild 518 BLAKE2B 39ba3d1835492494fb2644ad91f950ab330f179682e50d1cc3f949460cabef53cddfb2761794fb1b8a476a60ad76dbb3229cb93ca86a5485b5f4bfc92f23131a SHA512 0d688d4251c0f7b12b070431a952d9186e6481b8cc2bd8a5d7a7a1bdc83207b6e86337b322496e20e37e97d59363cdb081f27c731e129d7b67c82e32e7fb70b2
-EBUILD cardpeek-0.8.4.ebuild 526 BLAKE2B fb59f54fadab35ee57c5f38870506d289ea04995b4dc8df9a641c178f45ca6aa9c4339c3634382473856248636c736e16796c0471e0280c3078676cdc8cc6e20 SHA512 6e7758473939e558ea1983434244fbdb0817eae243b714305eeef6e77b4a8c6ecf8d369b7e38865dbe97dfb82809e4ef16ea2942097d200e381f6bb82247b0b4
+EBUILD cardpeek-0.7.2.ebuild 528 BLAKE2B 510a780b8ea3528c6d97f099609e50b439858c8eaf71a7f87d3d00b5d95cbdddd38c1ce2dd66c023e8fe1fa48daf48347c5a121a4d62aeb5f6b189ce0d0ad087 SHA512 61930483a3ec7833ecb52775c8bb412ccf566624d433b267a19ca501c23885f9e73df7b50b9336704628cb1630a84b264de48b7897dfd6c27195988ee5175a04
+EBUILD cardpeek-0.8.4.ebuild 601 BLAKE2B 6e7b42b8eda51b962b234ab48c40321a89f29c5023310f67ff96cc8a3c04c730d1996256a2bf3a8a877d35d6a77e7b7cade9a95bd7c30b4a6de3690ea3500bb9 SHA512 f59a786e5fad8598d3ded1c7a7ce0e504395f5a638e1025dafdebe54ba23569e0871c5e6f5e1579cddb4478e497be5e4806d9ca02e1c0bf9e9cf050ecea99195
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-crypt/cardpeek/cardpeek-0.7.2.ebuild b/app-crypt/cardpeek/cardpeek-0.7.2.ebuild
index 9148963c4c4a..92e53c5466c4 100644
--- a/app-crypt/cardpeek/cardpeek-0.7.2.ebuild
+++ b/app-crypt/cardpeek/cardpeek-0.7.2.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
+inherit xdg
+
 DESCRIPTION="Tool to read the contents of smartcards"
 HOMEPAGE="http://pannetrat.com/Cardpeek"
 SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz"
diff --git a/app-crypt/cardpeek/cardpeek-0.8.4.ebuild b/app-crypt/cardpeek/cardpeek-0.8.4.ebuild
index ad134c9f6598..7845cde99bb1 100644
--- a/app-crypt/cardpeek/cardpeek-0.8.4.ebuild
+++ b/app-crypt/cardpeek/cardpeek-0.8.4.ebuild
@@ -1,8 +1,12 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
+LUA_COMPAT=( lua5-2 )
+
+inherit lua-single xdg
+
 DESCRIPTION="Tool to read the contents of smartcards"
 HOMEPAGE="http://pannetrat.com/Cardpeek"
 SRC_URI="http://downloads.pannetrat.com/install/${P}.tar.gz"
@@ -12,8 +16,10 @@ SLOT="0"
 KEYWORDS=""
 IUSE="libressl"
 
-RDEPEND="sys-apps/pcsc-lite
-	dev-lang/lua:5.2
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+RDEPEND="${LUA_DEPS}
+	sys-apps/pcsc-lite
 	x11-libs/gtk+:3
 	net-misc/curl
 	!libressl? ( dev-libs/openssl:0= )
diff --git a/app-crypt/certbot-apache/Manifest b/app-crypt/certbot-apache/Manifest
index 13bd9736d15b..2cafe9adffbe 100644
--- a/app-crypt/certbot-apache/Manifest
+++ b/app-crypt/certbot-apache/Manifest
@@ -1,6 +1,4 @@
-DIST certbot-1.7.0.tar.gz 1416764 BLAKE2B de678a222e8c8e3e7834470f87763763671bfae37a5c8320a4c1a2552ec979b5391094713e7e13526f73fdf8cd32f70f8c4350f422505892c4fdd0ae77742c80 SHA512 f81242e68b7e261bbb6294ffe92e47bc1687128344816d71a495a94a2646e209e46c147bc76eedce0c477cc140dc6ae0fba76d2d5d01b828fce78875f5a2886a
-DIST certbot-1.8.0.tar.gz 1425620 BLAKE2B 9cc0443fd067bf594f02a79c99defa250e656dbee00cd2717a4a747abfe80511ffcb800b6ac63e484a918192dad9465dc45335f358267fa998af16e966b8e2a6 SHA512 c6559fe1e5db6269942bda3738c00b1b550ec448288eaf911ba9c3967c7e949b34bdd8b77742398f0a512ce07929fa2f227c1202e40900151762f1db6ff9de56
-EBUILD certbot-apache-1.7.0.ebuild 1064 BLAKE2B 3fe58950165fc3d0cb010051a38ee278c111d2d5f4e1880321614c555b8bb79150e1ec41288749c3c3b6c143b1fbbce95b62d3821a98f355a7727c01960a126a SHA512 9ad5d5d19d19ebd9c10e512ed756813425bd950a48abcb67b3a4e90115b1df4704675728a2f50baa0691c0dd72cbeacee541adb048cbb9793f96628aaaa0da72
-EBUILD certbot-apache-1.8.0.ebuild 1066 BLAKE2B 85b4a24a049dad829b34adcb3099692f9d3a921cbfbb043300b2f24456e30f2156d6e4b73a6b9b1c278732d369b0a50396cbc04f68a9178c08360fdd2c8114a5 SHA512 02c617f14fa3d437b9a17aeaa52f90e9bff5a86bf66ceefc89020e162657a6583991478bb107cca638ff3618eb37d49f0884f2aa1f60f1b75c61dfab7c3d908f
-EBUILD certbot-apache-9999.ebuild 1066 BLAKE2B 85b4a24a049dad829b34adcb3099692f9d3a921cbfbb043300b2f24456e30f2156d6e4b73a6b9b1c278732d369b0a50396cbc04f68a9178c08360fdd2c8114a5 SHA512 02c617f14fa3d437b9a17aeaa52f90e9bff5a86bf66ceefc89020e162657a6583991478bb107cca638ff3618eb37d49f0884f2aa1f60f1b75c61dfab7c3d908f
+DIST certbot-1.9.0.tar.gz 1425703 BLAKE2B 9bf78824649870b3e1fc3175aae551cbfaa675a8930a89f35ba2330647d86798e4fc43011c617be2d278ab20c43dd05b02e8e61956dd7f9d10d444181874346e SHA512 098d8c077f5760c1f40f7d673820488ad7643c8b9c12561a58921cd95f60ae76515cefc19f822747f3385a68eba6f49fe5484b20142994ef67a26b0b16293ce8
+EBUILD certbot-apache-1.9.0.ebuild 916 BLAKE2B 366995d48952ab5d4b3b1b9afa68561097b9238c2c56a505a49854c0e0c6126d5092d81b1178d4b45ff690194ec3b8de695f4d6b88455559ea3162dcaf2a09e9 SHA512 13ddca2809910b3c044bf725b58d0d728531314b0a02e7dea7836f047469b3e79d9bf38a729c045dc3f096689c10e9f829d44a14bd647e6687021fe9bf24ec1b
+EBUILD certbot-apache-9999.ebuild 918 BLAKE2B fb5b5acbb7373042f8960130f44e384494cfba7786e4964381631da44651c1e0b88f68c331cb1d7aa614e4aeabdc11bfa38bfa15d96af7cc3ad7cf38fd44ac41 SHA512 5b9d2895c2ced803d962aaf2dfffe8e934131b7d1d6bf09169b1df997baac9e992043804e7d7370ea92440d0c40ee5c2946b80a4e4fb3b4ba26c50146986b4ea
 MISC metadata.xml 334 BLAKE2B 4adbd04c0edcc84925da47b32fee63d4652bf2a1bf5222a56e0e1c7cfe8aaa34275a2652c4416f8a80de11fd88217d8626d610fa857f0615f18bfd773a279e55 SHA512 e3d6dda6c44557523fd48b464b6d39fc45b90ba2ecbe03fb300a655973c1b2e654a24d8d381b769eba00d0d80fb5881e1dfec1694e223cd83047abba9f01a44f
diff --git a/app-crypt/certbot-apache/certbot-apache-1.8.0.ebuild b/app-crypt/certbot-apache/certbot-apache-1.8.0.ebuild
deleted file mode 100644
index 3a367b955f0a..000000000000
--- a/app-crypt/certbot-apache/certbot-apache-1.8.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=(python{3_6,3_7,3_8})
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-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"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=app-crypt/acme-0.29.0[${PYTHON_USEDEP}]
-	>=app-crypt/certbot-1.6.0[${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/pytest[${PYTHON_USEDEP}] )"
-
-python_test() {
-	esetup.py test || die
-}
diff --git a/app-crypt/certbot-apache/certbot-apache-1.7.0.ebuild b/app-crypt/certbot-apache/certbot-apache-1.9.0.ebuild
index 2977a0aff13d..2360a626298c 100644
--- a/app-crypt/certbot-apache/certbot-apache-1.7.0.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-1.9.0.ebuild
@@ -22,17 +22,9 @@ HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND=">=app-crypt/acme-0.29.0[${PYTHON_USEDEP}]
 	>=app-crypt/certbot-1.6.0[${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/pytest[${PYTHON_USEDEP}] )"
-
-python_test() {
-	esetup.py test || die
-}
diff --git a/app-crypt/certbot-apache/certbot-apache-9999.ebuild b/app-crypt/certbot-apache/certbot-apache-9999.ebuild
index 3a367b955f0a..e52584b7e0c7 100644
--- a/app-crypt/certbot-apache/certbot-apache-9999.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-9999.ebuild
@@ -22,17 +22,9 @@ HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND=">=app-crypt/acme-0.29.0[${PYTHON_USEDEP}]
 	>=app-crypt/certbot-1.6.0[${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/pytest[${PYTHON_USEDEP}] )"
-
-python_test() {
-	esetup.py test || die
-}
diff --git a/app-crypt/certbot-nginx/Manifest b/app-crypt/certbot-nginx/Manifest
index 14331e069550..1f87401d3671 100644
--- a/app-crypt/certbot-nginx/Manifest
+++ b/app-crypt/certbot-nginx/Manifest
@@ -1,6 +1,4 @@
-DIST certbot-1.7.0.tar.gz 1416764 BLAKE2B de678a222e8c8e3e7834470f87763763671bfae37a5c8320a4c1a2552ec979b5391094713e7e13526f73fdf8cd32f70f8c4350f422505892c4fdd0ae77742c80 SHA512 f81242e68b7e261bbb6294ffe92e47bc1687128344816d71a495a94a2646e209e46c147bc76eedce0c477cc140dc6ae0fba76d2d5d01b828fce78875f5a2886a
-DIST certbot-1.8.0.tar.gz 1425620 BLAKE2B 9cc0443fd067bf594f02a79c99defa250e656dbee00cd2717a4a747abfe80511ffcb800b6ac63e484a918192dad9465dc45335f358267fa998af16e966b8e2a6 SHA512 c6559fe1e5db6269942bda3738c00b1b550ec448288eaf911ba9c3967c7e949b34bdd8b77742398f0a512ce07929fa2f227c1202e40900151762f1db6ff9de56
-EBUILD certbot-nginx-1.7.0.ebuild 924 BLAKE2B d71d8e3d72d3a0f81a12474bcf4a67721b7f02fc4b8209e190cef58da3bcb3010e8b6b3384750aa2359d97950ad0169c8b016629b04b7d66f7668d48fe0d81a2 SHA512 87d6e7a796aa1ef9134fa2e35c63fd95147da73b36f0bdf4f7cb6870a9f42c7721557581aea518e5b39e8b6770f0d8e680b550b93311699b7459ddbf57ed2266
-EBUILD certbot-nginx-1.8.0.ebuild 926 BLAKE2B c42649f6ceaeb670919b8660deb06e3380b4e971e0eedcd44db6c56a9ea88f9698e5c943b989fabcf067e8f716bc648474a5f2ad4a0f987d3e8edebbfe88f63a SHA512 0b959a25ebd24879649357928bbcf24d6de501c068a782b3ca073ba46312502480dc10ae540bd478fd4ed1979abe17dc8ca2461b5fc73686539eeb14b5dc2307
+DIST certbot-1.9.0.tar.gz 1425703 BLAKE2B 9bf78824649870b3e1fc3175aae551cbfaa675a8930a89f35ba2330647d86798e4fc43011c617be2d278ab20c43dd05b02e8e61956dd7f9d10d444181874346e SHA512 098d8c077f5760c1f40f7d673820488ad7643c8b9c12561a58921cd95f60ae76515cefc19f822747f3385a68eba6f49fe5484b20142994ef67a26b0b16293ce8
+EBUILD certbot-nginx-1.9.0.ebuild 924 BLAKE2B d71d8e3d72d3a0f81a12474bcf4a67721b7f02fc4b8209e190cef58da3bcb3010e8b6b3384750aa2359d97950ad0169c8b016629b04b7d66f7668d48fe0d81a2 SHA512 87d6e7a796aa1ef9134fa2e35c63fd95147da73b36f0bdf4f7cb6870a9f42c7721557581aea518e5b39e8b6770f0d8e680b550b93311699b7459ddbf57ed2266
 EBUILD certbot-nginx-9999.ebuild 926 BLAKE2B c42649f6ceaeb670919b8660deb06e3380b4e971e0eedcd44db6c56a9ea88f9698e5c943b989fabcf067e8f716bc648474a5f2ad4a0f987d3e8edebbfe88f63a SHA512 0b959a25ebd24879649357928bbcf24d6de501c068a782b3ca073ba46312502480dc10ae540bd478fd4ed1979abe17dc8ca2461b5fc73686539eeb14b5dc2307
 MISC metadata.xml 334 BLAKE2B 4adbd04c0edcc84925da47b32fee63d4652bf2a1bf5222a56e0e1c7cfe8aaa34275a2652c4416f8a80de11fd88217d8626d610fa857f0615f18bfd773a279e55 SHA512 e3d6dda6c44557523fd48b464b6d39fc45b90ba2ecbe03fb300a655973c1b2e654a24d8d381b769eba00d0d80fb5881e1dfec1694e223cd83047abba9f01a44f
diff --git a/app-crypt/certbot-nginx/certbot-nginx-1.8.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-1.8.0.ebuild
deleted file mode 100644
index 383e16073c64..000000000000
--- a/app-crypt/certbot-nginx/certbot-nginx-1.8.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=(python{3_6,3_7,3_8})
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-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=""
-
-RDEPEND="
-	>=app-crypt/acme-1.4.0[${PYTHON_USEDEP}]
-	>=app-crypt/certbot-1.6.0[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-1.5.5[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
diff --git a/app-crypt/certbot-nginx/certbot-nginx-1.7.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-1.9.0.ebuild
index 51368c8f499e..51368c8f499e 100644
--- a/app-crypt/certbot-nginx/certbot-nginx-1.7.0.ebuild
+++ b/app-crypt/certbot-nginx/certbot-nginx-1.9.0.ebuild
diff --git a/app-crypt/certbot/Manifest b/app-crypt/certbot/Manifest
index eb2fb7e3d82b..c6870f189d89 100644
--- a/app-crypt/certbot/Manifest
+++ b/app-crypt/certbot/Manifest
@@ -1,6 +1,4 @@
-DIST certbot-1.7.0.tar.gz 1416764 BLAKE2B de678a222e8c8e3e7834470f87763763671bfae37a5c8320a4c1a2552ec979b5391094713e7e13526f73fdf8cd32f70f8c4350f422505892c4fdd0ae77742c80 SHA512 f81242e68b7e261bbb6294ffe92e47bc1687128344816d71a495a94a2646e209e46c147bc76eedce0c477cc140dc6ae0fba76d2d5d01b828fce78875f5a2886a
-DIST certbot-1.8.0.tar.gz 1425620 BLAKE2B 9cc0443fd067bf594f02a79c99defa250e656dbee00cd2717a4a747abfe80511ffcb800b6ac63e484a918192dad9465dc45335f358267fa998af16e966b8e2a6 SHA512 c6559fe1e5db6269942bda3738c00b1b550ec448288eaf911ba9c3967c7e949b34bdd8b77742398f0a512ce07929fa2f227c1202e40900151762f1db6ff9de56
-EBUILD certbot-1.7.0.ebuild 1397 BLAKE2B 9d540bc199f74274ba8610e0f6f18b7cf6f89b4fababcc03dcc91564038ee01a802cbf761e9f2357cb2d6b36081fffe0469dd60bf22bc11e86354000901d7e93 SHA512 b0db4c0fb00763060dae8a2d3dc5c1e77ad7e9b57dea6495a98ea8d978c6e02de66a8003f2f8aaad0e9a4aadade8f2ae8dd1e05f1bea35cb06629b9ce8e1b9e4
-EBUILD certbot-1.8.0.ebuild 1399 BLAKE2B 485176a1476bcf681b5b186f39261172264620c1971b3c4a07a1b892b5701b2bb272eb45a7a6a75e35526c9e96b0f313d8b7a35f5a27a77d89e28ec4fda6ea48 SHA512 24b0ff72d8adadff94b13ea32aefe31fe7feb576feba6c23c7df6fe6f097b1be9f4badf48446162bfb29f2354cbca85d6987b3b73b70a08cb1d9a8ac1a58def2
-EBUILD certbot-9999.ebuild 1399 BLAKE2B 485176a1476bcf681b5b186f39261172264620c1971b3c4a07a1b892b5701b2bb272eb45a7a6a75e35526c9e96b0f313d8b7a35f5a27a77d89e28ec4fda6ea48 SHA512 24b0ff72d8adadff94b13ea32aefe31fe7feb576feba6c23c7df6fe6f097b1be9f4badf48446162bfb29f2354cbca85d6987b3b73b70a08cb1d9a8ac1a58def2
+DIST certbot-1.9.0.tar.gz 1425703 BLAKE2B 9bf78824649870b3e1fc3175aae551cbfaa675a8930a89f35ba2330647d86798e4fc43011c617be2d278ab20c43dd05b02e8e61956dd7f9d10d444181874346e SHA512 098d8c077f5760c1f40f7d673820488ad7643c8b9c12561a58921cd95f60ae76515cefc19f822747f3385a68eba6f49fe5484b20142994ef67a26b0b16293ce8
+EBUILD certbot-1.9.0.ebuild 1142 BLAKE2B 1f0f1256a7b81bda66c46a80129489f7f78cd30f53df771ed6fa70182f201baeb2917455fd6d9c7623d9f2b152c838d60a117fd3628436fda24bf69d75be44f4 SHA512 e12effe51a0c174441915ffd4f55dff83e22865fadf92ae6cc045b0fc05fca143dc4ad8ac0a17ccf7c71a18af850dddd60773bce0376e5ac0498b4c598e85f00
+EBUILD certbot-9999.ebuild 1144 BLAKE2B a5fc182ad4c58b23d018d63162641b27381e710d2bd2276ba9f0cdf8dc1a8fb5d222a8f0d6f248c06d70b1687e202e2a938b3176ae152ce22feceb342c7ef9a2 SHA512 6a35d2ce7faed403fb33bd345439371f277ffb2528b37b59f9130a234d4bf0bd166fde6c5e5349903b2cecc991b2deda3f054fb7c011e44094665c3e2901fab9
 MISC metadata.xml 334 BLAKE2B e7b28e7d3e7c6fdce0c5120b29fbf5aa607408e2add6c0ad42e921fb1add9def38c6cb191129a5a6e1f0e3ea119caa6cdc74955b572e5d2c6f854d0b7c7c521a SHA512 a24ccf633fc9c2670dcd35801d95bd8ca0f4ea4d3d53b6651f2e8e3e280b95ec8a464d99f5423942c14b0777ae4551f46c1ff285caea460bc91cbc417a7a5b70
diff --git a/app-crypt/certbot/certbot-1.8.0.ebuild b/app-crypt/certbot/certbot-1.8.0.ebuild
deleted file mode 100644
index 8496941da96c..000000000000
--- a/app-crypt/certbot/certbot-1.8.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=(python{3_6,3_7,3_8})
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-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
-S=${WORKDIR}/${P}/${PN}
-
-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"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=app-crypt/acme-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
-	dev-python/configobj[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.8[${PYTHON_USEDEP}]
-	>=dev-python/distro-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/josepy-1.1.0[${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}]"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# required as deps of deps can trigger this too...
-	echo '    ignore:.*collections\.abc:DeprecationWarning' >> ../pytest.ini
-	distutils-r1_python_prepare_all
-}
diff --git a/app-crypt/certbot/certbot-1.7.0.ebuild b/app-crypt/certbot/certbot-1.9.0.ebuild
index 6f5c706cae23..a2a86aad3888 100644
--- a/app-crypt/certbot/certbot-1.7.0.ebuild
+++ b/app-crypt/certbot/certbot-1.9.0.ebuild
@@ -21,11 +21,9 @@ HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="
-	>=app-crypt/acme-1.6.0[${PYTHON_USEDEP}]
+	>=app-crypt/acme-1.8.0[${PYTHON_USEDEP}]
 	>=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
 	dev-python/configobj[${PYTHON_USEDEP}]
 	>=dev-python/cryptography-2.8[${PYTHON_USEDEP}]
@@ -36,11 +34,3 @@ RDEPEND="
 	dev-python/pytz[${PYTHON_USEDEP}]
 	dev-python/zope-component[${PYTHON_USEDEP}]
 	dev-python/zope-interface[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# required as deps of deps can trigger this too...
-	echo '    ignore:.*collections\.abc:DeprecationWarning' >> ../pytest.ini
-	distutils-r1_python_prepare_all
-}
diff --git a/app-crypt/certbot/certbot-9999.ebuild b/app-crypt/certbot/certbot-9999.ebuild
index 8496941da96c..e54440941505 100644
--- a/app-crypt/certbot/certbot-9999.ebuild
+++ b/app-crypt/certbot/certbot-9999.ebuild
@@ -21,11 +21,9 @@ HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="
-	>=app-crypt/acme-1.6.0[${PYTHON_USEDEP}]
+	>=app-crypt/acme-1.8.0[${PYTHON_USEDEP}]
 	>=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
 	dev-python/configobj[${PYTHON_USEDEP}]
 	>=dev-python/cryptography-2.8[${PYTHON_USEDEP}]
@@ -36,11 +34,3 @@ RDEPEND="
 	dev-python/pytz[${PYTHON_USEDEP}]
 	dev-python/zope-component[${PYTHON_USEDEP}]
 	dev-python/zope-interface[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# required as deps of deps can trigger this too...
-	echo '    ignore:.*collections\.abc:DeprecationWarning' >> ../pytest.ini
-	distutils-r1_python_prepare_all
-}
diff --git a/app-crypt/dieharder/Manifest b/app-crypt/dieharder/Manifest
index 6730fce1ba00..623a4b791b4a 100644
--- a/app-crypt/dieharder/Manifest
+++ b/app-crypt/dieharder/Manifest
@@ -1,5 +1,5 @@
 AUX dieharder-3.31.1-build.patch 4920 BLAKE2B 8d297ff8519d0e0b197c1975dc84b7f8d04b9af78bbe957836d7e486f1876cd17dd7cc0f2d84b43d946a3ad9e6a4a9bf86e088f2d0e81cb47395ce519360806f SHA512 4a10cfb295e2a79ca76e7812d92e55db8c07ebba5061fb61d512afcd5c6f0548810b0c7ac859d0a89c88a83775b74e192b2682ebe19ca1e1412d93ff3830dc05
 AUX dieharder-3.31.1-urandom-64bit.patch 2689 BLAKE2B 9c7d27bdfdf53b5884d9fcb32331231ce034bd4342e73822e8f6b224de6b44fb2b49fd7a0e86d5f5334d61bf231ca0a6f8cd2254fd28a74db5dd580e495c81e2 SHA512 2c99ab9df82fca20123ec3950032b9c6b6e8cd919ef06e0a7ac72818474b5147d68e195db5334fd9689580cc1d669b9893f3784ad645a69598b707537ae63851
 DIST dieharder-3.31.1.tgz 1149780 BLAKE2B 12937b54e713ce87d6cb815b9b1e00989085b7661538316649caea4a514518528039441d0d42f377c363c62db179f362feb9d64612a75f724ac363744f884a47 SHA512 e01ed4266b4fe5d5fadde3c92c30e430d0ca5f7fedd26b26ed2ab98b7602aa9c35bb5c8fd9314ef2f5235b5087645ab13e5e6550156e26643baa5aeb77088dc5
-EBUILD dieharder-3.31.1-r3.ebuild 1047 BLAKE2B fb32577dca845314ae9acf62f2b71a2e3ea02979f7065803a7bc6fad634655500b42339af49b5ea26d60e9bc06cd83ef7ff46335d8fda45beb9c1ccc94e48e0d SHA512 8abf176b8dbfd1e883a247fc26851f09159817f96f740c54df34061959e8a1270da5f41c43729e758feca5edee0a7ae45583f93ea7792990916fea540d6fd6ec
+EBUILD dieharder-3.31.1-r3.ebuild 1135 BLAKE2B 4fc3d75c362ad65b14b0485defc18f7d6378ef8ea9479e621e1287cc2789269c080c58711198d5206f9c29b67ff46067800ccab5c916565742d4103b6e51af67 SHA512 c09c9af6b8cd1b75ceb1449f70f8d14e8b21acacc6495028271112c8405aded49fc490e2f501a45e61356a48697e1e433b7e74f2966c37b0db9b1c5904a97e0c
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-crypt/dieharder/dieharder-3.31.1-r3.ebuild b/app-crypt/dieharder/dieharder-3.31.1-r3.ebuild
index 8fd1209bd490..269cb352cf1f 100644
--- a/app-crypt/dieharder/dieharder-3.31.1-r3.ebuild
+++ b/app-crypt/dieharder/dieharder-3.31.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -37,6 +37,10 @@ pkg_setup() {
 	)
 }
 
+src_configure() {
+	econf --disable-static
+}
+
 src_compile() {
 	emake -j1
 	use doc && emake -C manual
@@ -53,4 +57,6 @@ src_install() {
 	dodoc dieharder/README dieharder/NOTES
 	docinto "libdieharder"
 	dodoc libdieharder/README libdieharder/NOTES
+
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/app-crypt/easy-rsa/Manifest b/app-crypt/easy-rsa/Manifest
index 8d13019a529f..eab0ec5198c7 100644
--- a/app-crypt/easy-rsa/Manifest
+++ b/app-crypt/easy-rsa/Manifest
@@ -3,8 +3,10 @@ DIST EasyRSA-3.0.4.tgz 37721 BLAKE2B 84d81eb86dfee42f6de935cbd308262d36626170880
 DIST easy-rsa-3.0.5.tar.gz 638366 BLAKE2B 990ef0cc7effd80d06d15dbb2dc3ef9a0a282a4adb501475fbd43c1b50bead374ba78ee9652e9c0f8d2e54354be4da6a0ae302e4ef2d576bd7fd981d59566d64 SHA512 9231ca7fda489a230d8418679d8824503ae680e2de6682d5f2d2fa716597f7df5980b7b88a3f6eb4fa0b7d9bbead59a1e2e4b8f4a5a36bda7f78ffa8f3c23d34
 DIST easy-rsa-3.0.6.tar.gz 663190 BLAKE2B 2c7f526c3ddddf13b4c6193bcd52bc992b9e81db28dec8cd9b5f44aba231eed18b6f25c64a42072a6409a5dd23db21fa8ccefc210ce924c68ad3a79475d2eaa1 SHA512 ce553b483ed2facab71d9bc212c4a454c6ed4a6489a0b963c4fc190916c71d048955e1e24d3e58a39438a51a83a02bf696bb2b9292c6ff665113043509062eb1
 DIST easy-rsa-3.0.7.tar.gz 3863830 BLAKE2B e76db344912296d4659ae61e094595a0ebb30258e2819908f80028a771bf49b5ee02293ba4bd46c19926828724f27b149d2727a2f898fa7fbe48abdb16dbee86 SHA512 4e7dadafd9e3f8381029cf4a20f0a6fe58c6bee0571e0f8ff9711e1dae386bbfd81b5d8bbec58f415e367d613b90465a4635e8f924668ad73de555fe8bb8c82c
+DIST easy-rsa-3.0.8.tar.gz 3864366 BLAKE2B 8bbb16a8885a2141c59f590882002f5e4fa5c52c77130ac56b7ee5b1817a6c3acdecac2d8db4f4f4bce39f62b469afaf60b5d56f46c1ea9472afe36a5fb7a818 SHA512 db23262ba2cd1b7fec17340ebe11504741baff23098ea9b4b1118077abf8ff3091b1299f9624a6dd788b2e1c169d9820ba41d11b091949f3f6c96ee8e0509231
 EBUILD easy-rsa-3.0.4.ebuild 818 BLAKE2B 842533554129c0442ae6c872e279ad762d381d1805ec3d61d91cfd0f957f4db49f5a066e4e9cab35101e88f00be3901911f247282e129417ec6c880b6674c489 SHA512 599e7a6088cf2d3e7daaa528aac0fcae6b3a797a9076caff7795848198c046470f13c1c31dd3f5a5f5d7e91e52781a28fcb4bc92c6426c0899b55d1b567a7f5d
 EBUILD easy-rsa-3.0.5.ebuild 792 BLAKE2B c1afdd8045bc6cfe7a467ca042d9475928451218114c379ac8b2518c2e1e0646ffb7187faaf0c9b4de66b4fbd7f6986762f43861ed2c36397882c6058529c524 SHA512 7a79c86e97c0ca33e23527fccbf307af79ce60f36b535ef8edd252f4b817f05307a5856ee7632c73281bdffb3a077b4feaeb3217f4f93c245000ad973cfa900f
-EBUILD easy-rsa-3.0.6.ebuild 799 BLAKE2B 66ffdfb46e299d5c192e83ad39bbf80c0370a225bb853bedbb494151a976efa1e3482ce527777cd63b391eb07521c659ab25f5892ed655a60b1bb0a3256bbced SHA512 1e1ff3516be3c69011ec66e7a1a27f067a78636a4a292f40b828568db96db8e550ec1b2ca58fec2e26d2bff77130969557886046fae87edd169080f30ea4b0a3
-EBUILD easy-rsa-3.0.7.ebuild 799 BLAKE2B 66ffdfb46e299d5c192e83ad39bbf80c0370a225bb853bedbb494151a976efa1e3482ce527777cd63b391eb07521c659ab25f5892ed655a60b1bb0a3256bbced SHA512 1e1ff3516be3c69011ec66e7a1a27f067a78636a4a292f40b828568db96db8e550ec1b2ca58fec2e26d2bff77130969557886046fae87edd169080f30ea4b0a3
+EBUILD easy-rsa-3.0.6.ebuild 791 BLAKE2B d68b6a13c50c4361cf91388dfb7bc2afaad68299d685deb092375b0dd56e9b0d5b6a722e752c66dc3fd50efbcba4fe2c0f2280ad5ee27b86dd71ac3f495ac7c4 SHA512 5910378725f1f1c9a89093497a30de627cfbbc15f78a7de339c8c57f15f44f8b3123839182b3d4877fbb28fd0ea97eec7532ea12751b909b8ee6de8d1484cd8b
+EBUILD easy-rsa-3.0.7.ebuild 791 BLAKE2B d68b6a13c50c4361cf91388dfb7bc2afaad68299d685deb092375b0dd56e9b0d5b6a722e752c66dc3fd50efbcba4fe2c0f2280ad5ee27b86dd71ac3f495ac7c4 SHA512 5910378725f1f1c9a89093497a30de627cfbbc15f78a7de339c8c57f15f44f8b3123839182b3d4877fbb28fd0ea97eec7532ea12751b909b8ee6de8d1484cd8b
+EBUILD easy-rsa-3.0.8.ebuild 799 BLAKE2B 66ffdfb46e299d5c192e83ad39bbf80c0370a225bb853bedbb494151a976efa1e3482ce527777cd63b391eb07521c659ab25f5892ed655a60b1bb0a3256bbced SHA512 1e1ff3516be3c69011ec66e7a1a27f067a78636a4a292f40b828568db96db8e550ec1b2ca58fec2e26d2bff77130969557886046fae87edd169080f30ea4b0a3
 MISC metadata.xml 321 BLAKE2B 453742eb4f4eebfc23e6d9889fe78d2894c3f49bde81f56827c271dbf8281a2b6016205843a0aabd5ea574776785327a83b017389bcf41aeb5f5402c04e7a97b SHA512 e643d4681855376cdc17865fc1b4106a56861f7bc080ccf808a485594e3ca35fcfa72fcd2ad49af69275d569468c1684ebe784cb16e47cc528187bdeaba6a051
diff --git a/app-crypt/easy-rsa/easy-rsa-3.0.6.ebuild b/app-crypt/easy-rsa/easy-rsa-3.0.6.ebuild
index e6a124b4fe80..c506a0e1a230 100644
--- a/app-crypt/easy-rsa/easy-rsa-3.0.6.ebuild
+++ b/app-crypt/easy-rsa/easy-rsa-3.0.6.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/OpenVPN/easy-rsa/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="libressl"
 
 DEPEND="!libressl? ( >=dev-libs/openssl-0.9.6:0= )
diff --git a/app-crypt/easy-rsa/easy-rsa-3.0.7.ebuild b/app-crypt/easy-rsa/easy-rsa-3.0.7.ebuild
index e6a124b4fe80..c506a0e1a230 100644
--- a/app-crypt/easy-rsa/easy-rsa-3.0.7.ebuild
+++ b/app-crypt/easy-rsa/easy-rsa-3.0.7.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/OpenVPN/easy-rsa/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="libressl"
 
 DEPEND="!libressl? ( >=dev-libs/openssl-0.9.6:0= )
diff --git a/app-crypt/easy-rsa/easy-rsa-3.0.8.ebuild b/app-crypt/easy-rsa/easy-rsa-3.0.8.ebuild
new file mode 100644
index 000000000000..e6a124b4fe80
--- /dev/null
+++ b/app-crypt/easy-rsa/easy-rsa-3.0.8.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Small RSA key management package, based on OpenSSL"
+HOMEPAGE="https://openvpn.net/"
+SRC_URI="https://github.com/OpenVPN/easy-rsa/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="libressl"
+
+DEPEND="!libressl? ( >=dev-libs/openssl-0.9.6:0= )
+	libressl? ( dev-libs/libressl:0= )"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	exeinto /usr/share/easy-rsa
+	doexe easyrsa3/easyrsa
+	insinto /usr/share/easy-rsa
+	doins -r easyrsa3/{vars.example,openssl-easyrsa.cnf,x509-types}
+	dodoc README.quickstart.md ChangeLog
+	dodoc -r doc
+	doenvd "${FILESDIR}/65easy-rsa" # config-protect easy-rsa
+}
diff --git a/app-crypt/eid-mw/Manifest b/app-crypt/eid-mw/Manifest
index 86e0f6710010..b635821864a2 100644
--- a/app-crypt/eid-mw/Manifest
+++ b/app-crypt/eid-mw/Manifest
@@ -1,5 +1,7 @@
 AUX eid-sign-test-4.4.19.patch 8320 BLAKE2B c2295a64a5353f79ea44703b7256f667b5c6dc21eb74b0cfb6945572d0323d751ca8104ae981ae83759267081b6a16509cde3e8f5ad35b1a6613855461880c18 SHA512 01efa77441982a631e717a1bf720155bd38144cbe9e5b9cc192bdfa7ea3966b787e31a25a7e3c7d560fec30b19edeb662f6ab1db2d68b0a5b996af3c91342ec4
 DIST eid-mw-4.4.27.tar.gz 7481892 BLAKE2B 5d1268946a62436eec74a7ed83e8391c1ceb0274ef8798b95bee2087e4e439d46ea5f88b8237cff1e925d31d1762fe979a959ce35efd4d6210dda580827bab3b SHA512 c4e9917907bb351b9dd427eb48c2124e55de0d8a73cfd142b9cb5e81c84f91e62a39a90bb1fbd109fb59aeb089898ffcd18ef5ccf2ab72c883b41ec4d9b9edf1
+DIST eid-mw-5.0.8.tar.gz 8782476 BLAKE2B ece43bff5de108f4d92534aeda3d88c1109fbf54f99c4de0442c02958a9b0edef3e34d94015b9f3a865317d88c2bd21d1adbbf15010cd1fbd99787985190dee5 SHA512 dc9eaaec419082bc6e1f6cd11063c79c5aac0e7910027d9cbb34dbe8ede9d600c93b7b38a7e4491c5eb9a0068e537d78854b3fc3b2581d464dd4939185469e46
 EBUILD eid-mw-4.4.27.ebuild 2531 BLAKE2B 405338910850fab6119b7deb09c0b494dc294a661538173307976cc556e906d64bbd2f7a058545ef35ae22b461334d8df03cb0e21443629b2653a955cfeee97e SHA512 71e909609ed65bb8160a32030a6fb3c550a09f3a1db06015cf224c7a5ca41a76de30cdbe1fe016c3839508503ab711e0c8926a147cf8de4569b221d8138e35f3
-EBUILD eid-mw-9999.ebuild 2002 BLAKE2B 344e1c3d8b55cb5b0c7395bc3e32cd210e47dc61042ecd3a91cb083d279ed812a706b0074e91e89b5832b472d1a5371894370991832dd7ccaca932f380395032 SHA512 f2ec99a3a7e493c9fc439051a27847991cd430ec9ad956162cc5840b027cd885d57b3d08d41f410c270aac3e5be0eba21282ea013bb8ddcfd3787d3a9e5fc464
+EBUILD eid-mw-5.0.8.ebuild 2621 BLAKE2B a14afec442a1d7ef34fdd6130f1ace9c729eb56a659fbf0c83b35fc334f588e09d9a04d6339a1b6bf542842bf0ad72532ecdf8c5f27a6ed2fcc6fdfe5435d7ed SHA512 4543c397a68122bb7b00a3cc84a3584e584df5064614c2bde18312ac80e8d160bc84e3506bfc1cff5cdb24e361473b3d05a44aec5879efabf11ec2dd55ac6190
+EBUILD eid-mw-9999.ebuild 2387 BLAKE2B 28af0cd0bd38b5448fa8523d6a599be574e88939ccf7ed20264864cbe21047859904f523e7b81e86cf3d828a021cdfa506170d7575c0da16c64a92dc4369d209 SHA512 8722191feed75b231229e50b483565f13f2472056d496716b8daf9b9db95b24f2faf02dede76c496804fa021deb5608e9fb95e2e267e2f9b41f707d9114996ac
 MISC metadata.xml 1445 BLAKE2B f402be7a768b67e34a736cdfaafc0df9f29301ba2d4b50f4ff27b9b08085826a67e452bb239893ef79d10eebb8981488cc71ca7f7015152783ad939e64df6d85 SHA512 b3934c2c2be9adc2f4d4d8ab654b8b21056bcbf29a67751ead9c8f1be4339a651a6d315c6ee1c182c3e8a32ad630c73f0990bd4fce4d34afa948055f0447ea98
diff --git a/app-crypt/eid-mw/eid-mw-5.0.8.ebuild b/app-crypt/eid-mw/eid-mw-5.0.8.ebuild
new file mode 100644
index 000000000000..064bbcfb9d4a
--- /dev/null
+++ b/app-crypt/eid-mw/eid-mw-5.0.8.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools desktop gnome2-utils xdg-utils
+
+DESCRIPTION="Electronic Identity Card middleware supplied by the Belgian Federal Government"
+HOMEPAGE="https://eid.belgium.be"
+SRC_URI="https://codeload.github.com/fedict/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+dialogs +gtk +p11v220 p11-kit"
+
+RDEPEND=">=sys-apps/pcsc-lite-1.2.9
+	gtk? (
+		x11-libs/gdk-pixbuf[jpeg]
+		x11-libs/gtk+:3
+		dev-libs/libxml2
+		net-misc/curl[ssl]
+		net-libs/libproxy
+		app-crypt/pinentry[gtk]
+	)
+	p11-kit? ( app-crypt/p11-kit )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+REQUIRED_USE="dialogs? ( gtk )"
+
+src_prepare() {
+	default
+
+	# Buggy internal versioning when autoreconf a tarball release.
+	# Weird numbering is required otherwise we get a seg fault in
+	# about-eid-mw program.
+	echo "${PV}-v${PV}" > .version
+
+	# xpi module : we don't want it anymore
+	sed -i -e '/SUBDIRS/ s:plugins_tools/xpi ::' Makefile.am || die
+	sed -i -e '/plugins_tools\/xpi/ d' configure.ac || die
+
+	# hardcoded lsb_info
+	sed -i \
+		-e "s:get_lsb_info('i'):strdup(_(\"Gentoo\")):" \
+		-e "s:get_lsb_info('r'):strdup(_(\"n/a\")):" \
+		-e "s:get_lsb_info('c'):strdup(_(\"n/a\")):" \
+		plugins_tools/aboutmw/gtk/about-main.c || die
+
+	# Fix libdir for pkcs11_manifestdir
+	sed -i \
+		-e "/pkcs11_manifestdir/ s:prefix)/lib:libdir):" \
+		cardcomm/pkcs11/src/Makefile.am || die
+
+	# See bug #732994
+	sed -i \
+		-e '/LDFLAGS="/ s:$CPPFLAGS:$LDFLAGS:' \
+		configure.ac || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable dialogs) \
+		$(use_enable p11v220) \
+		$(use_enable p11-kit p11kit) \
+		$(use_with gtk gtkvers 'detect') \
+		--with-gnu-ld \
+		--disable-static
+}
+
+src_install() {
+	default
+	rm -r "${ED}"/usr/$(get_libdir)/*.la || die
+	if use gtk; then
+		domenu plugins_tools/eid-viewer/eid-viewer.desktop
+		doicon plugins_tools/eid-viewer/gtk/eid-viewer.png
+	fi
+}
+
+pkg_postinst() {
+	if use gtk; then
+		gnome2_schemas_update
+		xdg_desktop_database_update
+		xdg_icon_cache_update
+
+		local peimpl=$(eselect --brief --colour=no pinentry show)
+		case "${peimpl}" in
+		*gtk*) ;;
+		*)	ewarn "The pinentry front-end currently selected is not supported by eid-mw."
+			ewarn "You may be prompted for your pin code in an inaccessible shell!!"
+			ewarn "Please select pinentry-gtk-2 as default pinentry provider:"
+			ewarn " # eselect pinentry set pinentry-gtk-2"
+		;;
+		esac
+	fi
+}
+
+pkg_postrm() {
+	if use gtk; then
+		gnome2_schemas_update
+		xdg_desktop_database_update
+		xdg_icon_cache_update
+	fi
+}
diff --git a/app-crypt/eid-mw/eid-mw-9999.ebuild b/app-crypt/eid-mw/eid-mw-9999.ebuild
index c7f49603d0a1..19055f55bc53 100644
--- a/app-crypt/eid-mw/eid-mw-9999.ebuild
+++ b/app-crypt/eid-mw/eid-mw-9999.ebuild
@@ -20,7 +20,7 @@ RDEPEND=">=sys-apps/pcsc-lite-1.2.9
 		dev-libs/libxml2
 		net-misc/curl[ssl]
 		net-libs/libproxy
-		!app-misc/eid-viewer-bin
+		app-crypt/pinentry[gtk]
 	)
 	p11-kit? ( app-crypt/p11-kit )"
 
@@ -80,6 +80,16 @@ pkg_postinst() {
 		gnome2_schemas_update
 		xdg_desktop_database_update
 		xdg_icon_cache_update
+
+		local peimpl=$(eselect --brief --colour=no pinentry show)
+		case "${peimpl}" in
+		*gtk*) ;;
+		*)	ewarn "The pinentry front-end currently selected is not supported by eid-mw."
+			ewarn "You may be prompted for your pin code in an inaccessible shell!!"
+			ewarn "Please select pinentry-gtk-2 as default pinentry provider:"
+			ewarn " # eselect pinentry set pinentry-gtk-2"
+		;;
+		esac
 	fi
 }
 
diff --git a/app-crypt/ekeyd/Manifest b/app-crypt/ekeyd/Manifest
index 28e6f0628e50..b2ef3171ca57 100644
--- a/app-crypt/ekeyd/Manifest
+++ b/app-crypt/ekeyd/Manifest
@@ -3,6 +3,7 @@ AUX ekey-egd-linux.conf.2 266 BLAKE2B 387aa2985ddd362f2c0d9eedbfcd23b24a52b210d8
 AUX ekey-egd-linux.init.2 456 BLAKE2B d4e7900bc0e2a089744cc1bf49084cf83c2d8f8ade84bbdea39d6c21f7896bc22e8ef7b650a2efb198b19bea5abb983b20dbafde019d8fc1ec3d57171f491a9f SHA512 55e7be6464b685aa5b290bd310020f4a01926d07a9cb071fc117081bc751a902ebbb9db51a81a5168a34cebc2ecc02360b4917356e25a2e205f57491739ff190
 AUX ekeyd-1.1.5-const_char_usage.patch 1094 BLAKE2B e19d837be0652844c95cf87af8381a09f1913471609616ded55e6e3d7e0876f8996d31909e72c0ec759b324e54cc785bbde77c4eaf4f87e81935521d71427176 SHA512 92198522e3dd90d2274d9c5171c216c3a3db9d334b2b14363781456f167a65df5370a7dcf430246d944e1e14e5278bf130e068063e600589f74026ca39e319a5
 AUX ekeyd-1.1.5-enoent.patch 863 BLAKE2B ec953667eaa23dcf91b15b01689c4be6315641dadaf9021240d67039ed88f651a3fe131581b60e71da8a4d9776952bed9db144c1340c98cf119e5746b53a16c9 SHA512 ace451e7aafc61e21422a81e50d3954189f80fec50160002c579db27865b46c95dc6db557533a9aa6ef3ca744394542754ba46f96de90a026e19a14477522e50
+AUX ekeyd-1.1.5-makefile-lua-libs.patch 355 BLAKE2B 89c73bb607a3a31d783027a3dff7feb2ad72e20041b76e54c656523323e017e7be12d29a628d808cc09208faed213ab2ea9b5982f138c24bc02ca3d95b3ac4e7 SHA512 a6c4a72760ec7b52db32d55d58e72e87e6d16a34a8a54bed410f17099249db044dcddf50c70b374fa71767184922bfb0bfc29d5603cb13177b652a9459aa7d9d
 AUX ekeyd-1.1.5-misc.patch 1245 BLAKE2B 555c6406461226ec8867f226e88bb9ca4f39d0a726c241c1638dd3339434b9f1d34620319de42c62e034da12cabebb739c92cc5df96ec9d3c79b339be839d6a2 SHA512 5a1a523fab7146e97f8396ef82d6755e1b209df728ee83dae87619a0a6d84b0b44e41b9e67f287b7f3d54a2ef80a19320650662cca0f1dfe0053eba75d113f04
 AUX ekeyd-1.1.5-path-fixes.patch 1918 BLAKE2B cf29e1f7fbaef728d0c4db2b71b1ac611ba5905c16b20b511f282a649359a0e458d44e0ca9b46db9b9abbd1da8935caa5605312314fb6027589ba03aa23f9759 SHA512 aba7b1cba96e678725fc8b47b56d815d59ce015ff6a4f72eaaf5fe8b7a99ddedf05ef3534a51772330209fb3cef235d76207103ee1e7a1f3315f4a52d2c0c2be
 AUX ekeyd-1.1.5-remove-werror.patch 1205 BLAKE2B c10ae2dc785a3bcb98a47af002d3f96b7908046dddc091f8342a7a61d4a38278f05b677445bdf60ad3260af6d723c1a06b3bd0a279b1ba4ffb07e3a5ae2f3c5b SHA512 2ea01bbe642bd52351e8ab9b7b62147c5bec7918305dc2c5be9291e3ae98fdd90f0e6e36c450e4db6220076a45a22cf870c81b3e23beed9170f262c857acecfd
@@ -10,5 +11,6 @@ AUX ekeyd-1.1.5-udev-rule.patch 2325 BLAKE2B 5617dd160c6f3617bb93dc97755f22c535e
 AUX ekeyd.init.2 699 BLAKE2B 4ce17a42ffc60b49232cc0bb5a19d36fecc55071df699a7ad7da6a49de352a599b8f0f11fc05fa4159d8975245e7b6181e96303182870519a7f57070a6b54da4 SHA512 3c1fe923e6f08d83d02b9559fa5b817e9abdbc97a50815ab01c7c17e3e953f54701eb1110340dc164bb67ef67905041054cd4fc98c11ea5932a539f4330c8b71
 AUX ekeyd.service 157 BLAKE2B d7976301d7eb0d9be05de574f3b25c13ed3767629dff7024e7621a2d29686045cfd7664e2127a87b92d32e719b470a2795159e45c310bfdcfffa75897341213f SHA512 1082a1dc58b820882015c4f09d5154691d9d8810bfe953049a6853ea5025ec7cff2377ee931ec8ceef295241083c162e582a75fd0b134f7e8789f6d470285445
 DIST ekeyd_1.1.5.orig.tar.gz 101366 BLAKE2B 7edd6d291f7553864c9aa96ee3d9533e33b6c94989b2c6b1a56eda42f61afe1633af5e7c3c8f5f57920ac0577f8567d1b09238eae35138ab2023600f01096466 SHA512 c30620d5e54a49929be72ed04448a4f08eb9658dbf7534586c49a3b43bdd5fc95a0659e09cc04b012c339ca20a1e914fa5a4b4d970171c46b64235f284516b9a
-EBUILD ekeyd-1.1.5-r1.ebuild 4873 BLAKE2B dc8d7e9f7c66df2d5c9deeb86199cf7bb033de50ac8616f53351d9601eff49d6fa8b4eebcbfb22de9bf17119e3bce9da55bcea19d141f64b47b93abb144c9e16 SHA512 6fa70427d545a093f7316f06d61b7e7ebfb7a5b3e7c0735dfb59ef85a7bd2635f9a5065b244a40ba053419aa4baa4afbc9a0b99411a181b480321118edc6cb5e
+EBUILD ekeyd-1.1.5-r1.ebuild 4787 BLAKE2B a7c0dca3f0eb471b061884e3898f254bf7f186d5cc0c70f93a1421248616ebbddeabaec1d802291ee64a4edbcb8a056fabc9775de839890e36e5a111f28269aa SHA512 99b54a375305242dd898cd62bcf1684f93ed3b9b3fb23504155dbb0c941df4c7eb309ccadb030a9fd7a52c4db74bd3c34bc0a245bf4144bdf23da86776a3501c
+EBUILD ekeyd-1.1.5-r100.ebuild 4907 BLAKE2B aee773b503a180067973c06da3248f6ac315acdae9e6b53b07f76dd30fe08ff3f26c150fa490411abc5f63135487fd51b8186897a0a8494bd0e757d3cfdbc0a9 SHA512 00b228d5c04b5db68f49489d45150126c8582f63d9f1dddc1690f3f1b70b4e3565a8a147ae44efd820e78d173fe58327c46f2f227ceea7d0d9fbdab010a7f626
 MISC metadata.xml 775 BLAKE2B f20c01d6a705492bfeeb4788f3f2950ac5f3a012abaaacb4e526ff7b5685475515c229f8c14ca7961ad946497a3636d02e6a9e4ee4e6bedf5cbeee39af6c4a27 SHA512 7a202bbf5b18e938f16ecb0773fdb80ec72d00d3d88f396632e552cfa3c7e7c4104362e34aec356833800833b7b531d9694906dd1174ee76f06ad8ef09758b03
diff --git a/app-crypt/ekeyd/ekeyd-1.1.5-r1.ebuild b/app-crypt/ekeyd/ekeyd-1.1.5-r1.ebuild
index 4cdadc140840..7816044711fd 100644
--- a/app-crypt/ekeyd/ekeyd-1.1.5-r1.ebuild
+++ b/app-crypt/ekeyd/ekeyd-1.1.5-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit eutils multilib linux-info toolchain-funcs udev systemd
+inherit multilib linux-info toolchain-funcs udev systemd
 
 DESCRIPTION="Entropy Key userspace daemon"
 HOMEPAGE="http://www.entropykey.co.uk/"
@@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="kernel_linux munin minimal usb"
 REQUIRED_USE="minimal? ( !munin )"
 
-EKEYD_RDEPEND="dev-lang/lua"
+EKEYD_RDEPEND="dev-lang/lua:0"
 EKEYD_DEPEND="${EKEYD_RDEPEND}"
 EKEYD_RDEPEND="${EKEYD_RDEPEND}
 	dev-lua/luasocket
@@ -23,7 +23,6 @@ EKEYD_RDEPEND="${EKEYD_RDEPEND}
 	munin? ( net-analyzer/munin )"
 
 RDEPEND="!minimal? ( ${EKEYD_RDEPEND} )
-	!app-crypt/ekey-egd-linux
 	virtual/service-manager"
 DEPEND="!minimal? ( ${EKEYD_DEPEND} )"
 
@@ -35,14 +34,14 @@ pkg_setup() {
 	fi
 }
 
-src_prepare() {
-	epatch "${FILESDIR}/${P}-const_char_usage.patch";
-	epatch "${FILESDIR}/${P}-enoent.patch";
-	epatch "${FILESDIR}/${P}-path-fixes.patch";
-	epatch "${FILESDIR}/${P}-udev-rule.patch";
-	epatch "${FILESDIR}/${P}-remove-werror.patch";
-	epatch "${FILESDIR}/${P}-misc.patch";
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-const_char_usage.patch
+	"${FILESDIR}"/${P}-enoent.patch
+	"${FILESDIR}"/${P}-path-fixes.patch
+	"${FILESDIR}"/${P}-udev-rule.patch
+	"${FILESDIR}"/${P}-remove-werror.patch
+	"${FILESDIR}"/${P}-misc.patch
+)
 
 src_compile() {
 	local osname
diff --git a/app-crypt/ekeyd/ekeyd-1.1.5-r100.ebuild b/app-crypt/ekeyd/ekeyd-1.1.5-r100.ebuild
new file mode 100644
index 000000000000..7bec76200631
--- /dev/null
+++ b/app-crypt/ekeyd/ekeyd-1.1.5-r100.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-1 )
+
+inherit multilib linux-info lua-single toolchain-funcs udev systemd
+
+DESCRIPTION="Entropy Key userspace daemon"
+HOMEPAGE="http://www.entropykey.co.uk/"
+SRC_URI="mirror://ubuntu/pool/universe/e/ekeyd/ekeyd_${PV}.orig.tar.gz"
+
+LICENSE="MIT GPL-2" # GPL-2 (only) for init script
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="kernel_linux munin minimal usb"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}
+	minimal? ( !munin )"
+
+EKEYD_RDEPEND="${LUA_DEPS}"
+EKEYD_DEPEND="${EKEYD_RDEPEND}"
+EKEYD_RDEPEND="${EKEYD_RDEPEND}
+	$(lua_gen_cond_dep '
+		dev-lua/luasocket[${LUA_USEDEP}]
+	')
+	kernel_linux? ( virtual/udev )
+	munin? ( net-analyzer/munin )"
+
+RDEPEND="!minimal? ( ${EKEYD_RDEPEND} )
+	virtual/service-manager"
+DEPEND="!minimal? ( ${EKEYD_DEPEND} )"
+
+CONFIG_CHECK="~USB_ACM"
+
+pkg_setup() {
+	if ! use minimal && use kernel_linux && ! use usb && linux_config_exists; then
+		check_extra_config
+	fi
+	lua-single_pkg_setup
+}
+
+PATCHES=(
+	"${FILESDIR}"/${P}-const_char_usage.patch
+	"${FILESDIR}"/${P}-enoent.patch
+	"${FILESDIR}"/${P}-path-fixes.patch
+	"${FILESDIR}"/${P}-udev-rule.patch
+	"${FILESDIR}"/${P}-remove-werror.patch
+	"${FILESDIR}"/${P}-misc.patch
+	"${FILESDIR}"/${P}-makefile-lua-libs.patch
+)
+
+src_compile() {
+	local osname
+
+	# Override automatic detection: upstream provides this with uname,
+	# we don't like using uname.
+	case ${CHOST} in
+		*-linux-*)
+			osname=linux;;
+		*-freebsd*)
+			osname=freebsd;;
+		*-kfrebsd-gnu)
+			osname=gnukfreebsd;;
+		*-openbsd*)
+			osname=openbsd;;
+		*)
+			die "Unsupported operating system!"
+			;;
+	esac
+
+	emake -C host \
+		CC="$(tc-getCC)" \
+		LUA_V=${ELUA#lua} \
+		LUA_INC="-I$(lua_get_include_dir)" \
+		OSNAME=${osname} \
+		OPT="${CFLAGS}" \
+		BUILD_ULUSBD=no \
+		$(use minimal && echo egd-linux)
+}
+
+src_install() {
+	exeinto /usr/libexec
+	newexe host/egd-linux   ekey-egd-linux
+	newman host/egd-linux.8 ekey-egd-linux.8
+
+	newconfd "${FILESDIR}"/ekey-egd-linux.conf.2 ekey-egd-linux
+	newinitd "${FILESDIR}"/ekey-egd-linux.init.2 ekey-egd-linux
+
+	dodoc doc/* AUTHORS ChangeLog THANKS
+
+	use minimal && return
+	# from here on, install everything that is not part of the minimal
+	# support.
+
+	emake -C host \
+		DESTDIR="${D}" \
+		MANZCMD=cat MANZEXT= \
+		install-ekeyd
+
+	# We move the daemons around to avoid polluting the available
+	# commands.
+	dodir /usr/libexec
+	mv "${D}"/usr/sbin/ekey*d "${D}"/usr/libexec
+
+	systemd_dounit "${FILESDIR}/ekeyd.service"
+
+	newinitd "${FILESDIR}"/${PN}.init.2 ${PN}
+
+	if use kernel_linux; then
+		local rules="${FILESDIR}/90-ekeyd.rules"
+		udev_newrules ${rules} 90-${PN}.rules
+	fi
+
+	if use munin; then
+		exeinto /usr/libexec/munin/plugins
+		doexe munin/ekeyd_stat_
+
+		insinto /etc/munin/plugin-conf.d
+		newins munin/plugin-conf.d_ekeyd ekeyd
+	fi
+}
+
+pkg_postinst() {
+	elog "${CATEGORY}/${PN} now install also the EGD client service ekey-egd-linux."
+	elog "To use this service, you need enable EGDTCPSocket for the ekeyd service"
+	elog "managing the key(s)."
+	elog ""
+	elog "The daemon will send more entropy to the kernel once the available pool"
+	elog "falls below the value set in the kernel.random.write_wakeup_threshold"
+	elog "sysctl entry."
+	elog ""
+	ewarn "Since version 1.1.4-r1, ekey-egd-linux will *not* set the watermark for"
+	ewarn "you, instead you'll have to configure the sysctl in /etc/sysctl.conf"
+
+	use minimal && return
+	# from here on, document everything that is not part of the minimal
+	# support.
+
+	elog ""
+	elog "To make use of your EntropyKey, make sure to execute ekey-rekey"
+	elog "the first time, and then start the ekeyd service."
+	elog ""
+	elog "By default ekeyd will feed the entropy directly to the kernel's pool;"
+	elog "if your system has jumps in load average, you might prefer using the"
+	elog "EGD compatibility mode, by enabling EGDTCPSocket for ekeyd and then"
+	elog "starting the ekey-egd-linux service."
+	elog ""
+	elog "The same applies if you intend to provide entropy for multiple hosts"
+	elog "over the network. If you want to have the ekey-egd-linux service on"
+	elog "other hosts, you can enable the 'minimal' USE flag."
+	elog ""
+	elog "The service supports multiplexing if you wish to use multiple"
+	elog "keys, just symlink /etc/init.d/ekeyd -> /etc/init.d/ekeyd.identifier"
+	elog "and it'll be looking for /etc/entropykey/identifier.conf"
+	elog ""
+
+		if use kernel_linux; then
+			elog "Some versions of Linux have a faulty CDC ACM driver that stops"
+			elog "EntropyKey from working properly; please check the compatibility"
+			elog "table at http://www.entropykey.co.uk/download/"
+		else
+			elog "Make sure your operating system supports the CDC ACM driver"
+			elog "or otherwise you won't be able to use the EntropyKey."
+		fi
+		elog ""
+		elog "If you're unsure about the working state of the CDC ACM driver"
+		elog "enable the usb USE flag and use the userland USB daemon"
+}
diff --git a/app-crypt/ekeyd/files/ekeyd-1.1.5-makefile-lua-libs.patch b/app-crypt/ekeyd/files/ekeyd-1.1.5-makefile-lua-libs.patch
new file mode 100644
index 000000000000..7a929bdb64c0
--- /dev/null
+++ b/app-crypt/ekeyd/files/ekeyd-1.1.5-makefile-lua-libs.patch
@@ -0,0 +1,15 @@
+If LUA_V is passed directly to LIBS it ends up being expanded to an empty
+string at link time.
+
+--- a/host/Makefile
++++ b/host/Makefile
+@@ -111,7 +111,8 @@
+ CFLAGS += '-DEKEYD_VERSION_S=""$(EKEYD_VERSION_S)""'
+ CFLAGS += $(EXTRA_CFLAGS)
+ 
+-LIBS += -llua -lm $(LIBDL)
++LUA_LIBS += -llua$(LUA_V) -lm
++LIBS += $(LUA_LIBS) $(LIBDL)
+ LDFLAGS += $(LIBDIRS)
+ 
+ 
diff --git a/app-crypt/gcr/Manifest b/app-crypt/gcr/Manifest
index afa546f1f5bb..8d6b4a147a9a 100644
--- a/app-crypt/gcr/Manifest
+++ b/app-crypt/gcr/Manifest
@@ -1,12 +1,9 @@
-AUX 3.34.0-fix-desktop-files.patch 2102 BLAKE2B a733e4c0c62d8d80229663efe81d5d563404c3dc428838ed5a1515fada5a1e4da92eee38f37918d80ffd3121603e4ce1e4dab82ebe433d838bf0949794a88fa2 SHA512 9967470ccaeea405ad55fc16f699ac5048bf803eb9043258c2f532ff36fbf252d683b45b6f0fd1a19d9f48f5f0ace60fff50881dd8ab1e13c5c1a9170d5eff6a
 AUX 3.36.0-avoid-gnupg-circular-dep.patch 1994 BLAKE2B 371e3124e2fb53c5a8a2b66920d65741a3e9238783a64c9d055a8efc5132958b41ab8576885dc08e92aab3454d2f65ff3e8f8b28779b65b8b92c1547ee02d52e SHA512 6702a7318f3be324f3938b1f838a4d4cc1908502162bcedc96b965934aaf87f6540b91b8a5f9b6bdddadf6d1043ac7788669cb06142af78a81e6774148f8b528
 AUX 3.36.0-fix-gck-slot-test.patch 1337 BLAKE2B 7a6a6f62df7967c15cd413da75262c072165aef1923553e2d214743a837b7b166178c400a1f753d945f7c0904de840a748d4c2057ed9ddb9b2530d66ba544d52 SHA512 f76a7bd687281ac299310fddef4fc0a1b1d3955a097a56dd52d57ed42e9a25c1b865959d5ea4c8bed0d472f30fb8dd4660d60e50f4d3352c119e13562ba0a361
 AUX 3.36.0-meson-enum-race.patch 870 BLAKE2B 66913d68fd8d5c6af776b90077070d126e91313571519e187dc9a551e63b5ba9869549f567c8b68e9bdf34cda4e6a11904676315cd8bc80eaf409afdc9aee00c SHA512 026371b5710a5544f107563963361abaa2fedfde617eed09c1651c745dbd8f1adcac78578644ef0e8b95331b8836758990d4bb84ee90493789a16f701f40a93e
 AUX 3.36.0-meson-fix-gtk-doc-without-ui.patch 654 BLAKE2B b929e5112ec488bc70dd50c63d8e35bbfdb311833d2f896d8a79520e0e4334c6ea84f543f14ce7d03b0a1c86840274f2485cd4a1924eaf6ba67a82e5173b0083 SHA512 afea6074440a4763d54b5662adb2e934595d5e289a6d2e0f6d6e8440283abcf6b5ddf8ce0a6246fbfc75ffb3a66efd7d53b727b9b2c849cc72eea4f31405bdd3
 AUX 3.36.0-meson-vapi-deps.patch 1658 BLAKE2B 98796051a8b2983dfa82ed6d56c033e70676988462cf3d8fdce255e729ffc6f7def12207e64079895b99af941655804fd1f06d861c950e0cccac3cfcffa585aa SHA512 6bda1adef741699271f55ac33644f5762f8a5ba6c9f15a12870c78a9cafd2e61f350e4732335b51e0f4969a7fc2aaea7f93fda32fe5fbfe2be7ec62f3deddb5f
 AUX 3.36.0-optional-vapi.patch 2278 BLAKE2B 3492fc70397ee07b04dc156070b153bacc50c9f4a641fba430a27b5b84d788b5f9e2528697bb36f0145607184f233d37676411558b5fc252e7284f46785b2f89 SHA512 f9dd41ee5b7e876f347c2d9130816d5203b64615400b331fd4b5abf95eba6c8bdb3ae59a0b2dacb34ceb7ae778ef7b32c08964f8a1bef1734fbb6522830ff480
-DIST gcr-3.34.0.tar.xz 1454244 BLAKE2B fc84e5eaa3b2822d1c04fff3b8b343de2655cce34317327a3594b506172c703a9d4b1d5562ed213bc1ae7df5d31ac1c5ab3c5733cfe8e5edf85e334ce7ff85f4 SHA512 9314b531ed46a42b2c8c1531c7d95003db04f2c8065e46f4e6a84ec26400ce6302ea71c4db42a8c7b98884a0b84d75a0ca65d988aa0fe6de6d897d772b070093
 DIST gcr-3.36.0.tar.xz 1025760 BLAKE2B 03f0d0ed40b600ed80e894111fedff3efcbbaaf6f261d6a44a3649a1acb50c4f35f3dc9a7ddb60f56cab241f68fef83aa5a02a94036e70a6556b35300f2c8fb5 SHA512 0431e7971b73accc62869c9497fcff7c111c453aa6a8ff25b42f19ceae1be0aec52e0e4eb504676f967c6e4f179198c15c521278690822e3457dbc5fe512fd5e
-EBUILD gcr-3.34.0-r1.ebuild 1892 BLAKE2B 99121cf56e5e2c42105e70e0211c5e0df823bad896b28e786ef79f771f4a5a56f23648cc520044e8f8340ef9ce583efdefde7736c1be09ab4ed3920e59fd7b7e SHA512 31f67170d9129e9133607b6b0f3d16c5bb6e1eda2cbfe9571a40b0b02b97a93d03155ec04ff3bbb825c6efb3fa087a4d0286bbaa259ea0063c16049f486d93fa
-EBUILD gcr-3.36.0.ebuild 1965 BLAKE2B 9b3067377661b71db99e9dc148a204ca8f75c3eece1c6de699c8185875a06bebb7306a2b00e7755d2218d3ff694d662bd683cc3996b8fef7622ee9a574efa3a3 SHA512 20a102057d6339a9dc42f9b064e89c95b43657b20eb894c6d6507b7c2308155f2e81c330eb57d2f46d3895ade77241a72db934f5f4a367890edd7bf3850d172b
+EBUILD gcr-3.36.0.ebuild 1962 BLAKE2B 7fdb1e2ddf27c1815bd7946850c71c2822831115eee4e5302c3f40d4e6b2a1851af4bc8c6d9cba3750c974c0e8642165c94fc9b0a3a372cb603877ac8a687263 SHA512 bfea4b3a7d52ab80678c5d5d066e858f74a1e31e51e6e6ff4790226da4f1c3cac89cb79b50f28c424d675208bb2634ae152558a51d7fa188637776dfaa4960ee
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-crypt/gcr/files/3.34.0-fix-desktop-files.patch b/app-crypt/gcr/files/3.34.0-fix-desktop-files.patch
deleted file mode 100644
index 0678937fcc0e..000000000000
--- a/app-crypt/gcr/files/3.34.0-fix-desktop-files.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From a69dc44e11270ce092babfa57fe3aab31da9619c Mon Sep 17 00:00:00 2001
-From: Daiki Ueno <dueno@src.gnome.org>
-Date: Mon, 21 Oct 2019 12:02:05 +0200
-Subject: [PATCH] build: Use sed for .desktop variables substitution
-
-We can't do that with configure, as it leaves ${exec_prefix}.
----
- configure.ac   | 2 --
- ui/Makefile.am | 6 ++++++
- 2 files changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 1ba43d6..6286f16 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -423,8 +423,6 @@ gcr/gcr-version.h
- po/Makefile.in
- ui/gcr.pc
- ui/gcr-ui.pc
--ui/gcr-prompter.desktop.in
--ui/gcr-viewer.desktop.in
- ui/icons/16x16/Makefile
- ui/icons/22x22/Makefile
- ui/icons/24x24/Makefile
-diff --git a/ui/Makefile.am b/ui/Makefile.am
-index 29c33e7..7594621 100644
---- a/ui/Makefile.am
-+++ b/ui/Makefile.am
-@@ -209,6 +209,8 @@ gcr_viewer_LDADD = \
- viewer_desktop_in_in = ui/gcr-viewer.desktop.in.in
- viewer_desktop_in = $(viewer_desktop_in_in:.desktop.in.in=.desktop.in)
- viewer_desktop = $(viewer_desktop_in:.desktop.in=.desktop)
-+$(viewer_desktop_in): $(viewer_desktop_in_in)
-+	$(AM_V_GEN) sed 's|@bindir[@]|$(bindir)|g' $< > $@
- $(viewer_desktop): $(viewer_desktop_in)
- 	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
- 
-@@ -231,9 +233,12 @@ gcr_prompter_LDADD = \
- prompter_desktop_in_in = ui/gcr-prompter.desktop.in.in
- prompter_desktop_in = $(prompter_desktop_in_in:.desktop.in.in=.desktop.in)
- prompter_desktop = $(prompter_desktop_in:.desktop.in=.desktop)
-+$(prompter_desktop_in): $(prompter_desktop_in_in)
-+	$(AM_V_GEN) sed 's|@libexecdir[@]|$(libexecdir)|g' $< > $@
- $(prompter_desktop): $(prompter_desktop_in)
- 	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
- 
-+desktop_in_in_files = $(viewer_desktop_in_in) $(prompter_desktop_in_in)
- desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in)
- desktopdir = $(datadir)/applications
- desktop_DATA = \
-@@ -247,6 +252,7 @@ EXTRA_DIST += \
- 	ui/gcr.gresource.xml \
- 	$(ui_RESOURCES) \
- 	$(mime_DATA) \
-+	$(desktop_in_in_files) \
- 	ui/fixtures
- 
- CLEANFILES += \
--- 
-2.24.1
-
diff --git a/app-crypt/gcr/gcr-3.34.0-r1.ebuild b/app-crypt/gcr/gcr-3.34.0-r1.ebuild
deleted file mode 100644
index 5bc0674f0a90..000000000000
--- a/app-crypt/gcr/gcr-3.34.0-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_USE_DEPEND="vapigen"
-PYTHON_COMPAT=( python3_{6,7,8} )
-GNOME2_EAUTORECONF="yes"
-
-inherit gnome2 python-any-r1 vala virtualx
-
-DESCRIPTION="Libraries for cryptographic UIs and accessing PKCS#11 modules"
-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"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="vala? ( introspection )"
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-
-COMMON_DEPEND="
-	>=app-crypt/p11-kit-0.19
-	>=dev-libs/glib-2.38:2
-	>=dev-libs/libgcrypt-1.2.2:0=
-	>=dev-libs/libtasn1-1:=
-	>=sys-apps/dbus-1
-	gtk? ( >=x11-libs/gtk+-3.12:3[X,introspection?] )
-	introspection? ( >=dev-libs/gobject-introspection-1.34:= )
-"
-RDEPEND="${COMMON_DEPEND}"
-DEPEND="${COMMON_DEPEND}
-	${PYTHON_DEPS}
-	dev-libs/gobject-introspection-common
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	dev-libs/vala-common
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.9
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-# eautoreconf needs:
-#	dev-libs/gobject-introspection-common
-#	dev-libs/vala-common
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-fix-desktop-files.patch
-)
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# Disable stupid flag changes
-	sed -e 's/CFLAGS="$CFLAGS -g"//' \
-		-e 's/CFLAGS="$CFLAGS -O0"//' \
-		-i configure.ac configure || die
-
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_with gtk) \
-		$(use_enable introspection) \
-		$(use_enable vala) \
-		$(usex debug --enable-debug=yes --enable-debug=default) \
-		--disable-update-icon-cache \
-		--disable-update-mime
-}
-
-src_test() {
-	virtx emake check
-}
diff --git a/app-crypt/gcr/gcr-3.36.0.ebuild b/app-crypt/gcr/gcr-3.36.0.ebuild
index 083725870e4d..bf87187f6fc5 100644
--- a/app-crypt/gcr/gcr-3.36.0.ebuild
+++ b/app-crypt/gcr/gcr-3.36.0.ebuild
@@ -16,7 +16,7 @@ SLOT="0/1" # subslot = suffix of libgcr-base-3 and co
 IUSE="gtk gtk-doc +introspection +vala"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 
 DEPEND="
 	>=dev-libs/glib-2.44.0:2
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index 93a423f2f74c..d151ba32e54e 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -1,7 +1,10 @@
 AUX gnupg-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch 1048 BLAKE2B 36f37b74da309100191f4d8f9c27d08a1b00d2d30fbaf169dbb74ebbe42293357a4fb62332e286fe5725dcfdc30645a602dc2a51c51924b06215b68fd5235658 SHA512 fd12827150e96cd7979ea9611d64ed4ab9e6c61cfecdd697b8fb4d162f20985b734c2bfc365a921809b9029e86a85a9b36c10ec472b3dd49c25ea18f5aef56ce
 AUX gnupg-2.2.20-fix-dirmngr-for-non-ipv6-enabled-hosts.patch 1239 BLAKE2B 8c5fb605998b9f321fea10d06e559a7022b598ace2c48b19a3ca662c313a513928277ba3936baac777bb64dae5ad28f6a4c7c29cac91cb5c3fd2d3e7f0c038af SHA512 cd325cf33f45f0ce6edbca5cb9b0c06fad8bf77f691030cd1a0bd2cfec046622fe0086dc8f7030309c5ccb328906dface3dd3ac2fb0f8ae7d85088854556dda3
+DIST gnupg-2.2.16-scdaemon_shared-access.patch 2586 BLAKE2B 42fd5482c4e86751ce62836125997c2295c44bc5db0671a06460fd306b2ed93f290fb898fc1b1e463a863eddf9ab5f99ea3c90a55499ef45ca1ed6edf2854663 SHA512 38abaa4200114ae6b6f220fabc0a84a056761949c97bd0564557f4411a299b9a1939893555c27e26da2d8e8da4bc97a298fa7e68f1e80fe99c3f88cc329eaa84
 DIST gnupg-2.2.20.tar.bz2 6786913 BLAKE2B 43cf9402a26e67d6c7c2444eb2faaee3f06ea0bf6c07708a50834c5d7424db2f9c38e1f0046dd3a35082abc08d401b2951655e7e068f0873db297560b87d2667 SHA512 3e69f102366ec3415f439ab81aae2458182fa1a18dfb86565b1d9dc638f3fc4c179a5947f0042b7c5a813345676285a662793664a1803ea9ad8328f0548e0edc
-DIST gnupg-2.2.23.tar.bz2 7099806 BLAKE2B 0b9c1f5c8931399cfd9d95f107f91869733c4a986476ea43631b4265b1a5c26cfb8c9bb24ef6a295af7aa803749caaedde26365f6f50a7c946c1f86c867d855d SHA512 736b39628f7e4adc650b3f9937c81f27e9ad41e77f5345dc54262c91c1cf7004243fa7f932313bcde955e0e9b3f1afc639bac18023ae878b1d26e3c5a3cabb90
-EBUILD gnupg-2.2.20-r1.ebuild 4988 BLAKE2B 791988968add46faed86319ad761da979d130b835e209641bd0f199c53aa2e1449113a94bb34a05d7643bed5d5085844fb90c49f60dfe22c01c5abe17aa36947 SHA512 50b3883a73ea1bed462c5a17730c47035ceb1cc11857f7cfd6c6e8d407c077f5258743d344882d22e4bc814475ea451c20db9879f49812b972de097aad94fca8
-EBUILD gnupg-2.2.23.ebuild 4847 BLAKE2B f870f102bd5f9d30cc8ec386e05aaceb415b9017a655e892574a4a7d02c2b2d1efcd4ba44a281eb6b0021abcbde4a45c7665fccc053f72e21a8525e31eb85cc5 SHA512 4f3a696e6188bffc6499dceb9fd365384861e032a5f1c50526e8b3e8b8a28a6d534363aca97f2ff0c6a93b5e1032b2c03ab22c84b9c47ae9e0c32d58ce0323b3
-MISC metadata.xml 1188 BLAKE2B f64030d5c3b93a594a1d9aabf9cf711a63460b3ad205529e7242de0b8c6c406bd8b353a4909c1242ff71eedf07c2b0f65b6c00ca35a10972a9bcb14faf736f90 SHA512 58d5cb64a04847f0f8f500bf0de7b245d03341c92260f06db657dfebdcb0b69879b8dfeac6027a6695d5adbeb067f4674686a9be64482fa7769e0083a716a696
+DIST gnupg-2.2.24.tar.bz2 7196489 BLAKE2B 0e6fd3df2a12910d43e290f86839f2ea56dddc2598e3687c356522727b082e3b266c00b7e5184aecac3103c9638e776463adc7b807b6b294180f227877861b1d SHA512 b72fb12da95c1c62f013e1ffdbf2983b4185f0de59edba6061209904e5f63525e23a406529fafcd1b0b50ccbad45980c1db293601e8db84d5cbf65a7228834fb
+DIST gnupg-2.2.25.tar.bz2 7195857 BLAKE2B c930edf9259a0e1c508af8d76a86f979860adfe2c525020b37d3741679200f96483f0ad8bc1f72e2dbf7fe77696cd04d4272a2ee23e4c4abe1ed6ba88b95f365 SHA512 ab1d7cc9d8be3e7189bc4bea431b9d5db313cbd1739823950f32fbb611b2f4374889f444efbf43ce1fbf498b9865d7e6e953cd4c86d58fd688f63923c434ea2c
+EBUILD gnupg-2.2.20-r2.ebuild 5003 BLAKE2B 31faf0cf6a54040f50e08d0cce7d731af5dfc51f172b8db43157f226a9c8aab4e0397f446495aa5c7f603f92749c6f5ce0631047818b777a7a3dae2945a1586f SHA512 66cc2620e242ce5541ec8251b486f1c4bc4496474e19fe23867be64a3f38d333c882bccb134a99dd0e893b318d93bbf908277f8cd9e64e51ac7ca12f2c858247
+EBUILD gnupg-2.2.24.ebuild 5321 BLAKE2B df6dddadc18c0db45bb1e1870b826797e6464dd900d12aa38863bba2c72ba0df3384817e1d55f6f3bbc1c48fb09d6523c5be085cb6a0ba68762af3d82416de49 SHA512 98d0de26ef5ea20d0e7c6c0ee385e3130da8ab8ddf1db82e2ed513c299fc3bed3e7ec7230760744ff79e852d1f8197cc3575ce10b1f1d91fb271903719944937
+EBUILD gnupg-2.2.25.ebuild 5321 BLAKE2B df6dddadc18c0db45bb1e1870b826797e6464dd900d12aa38863bba2c72ba0df3384817e1d55f6f3bbc1c48fb09d6523c5be085cb6a0ba68762af3d82416de49 SHA512 98d0de26ef5ea20d0e7c6c0ee385e3130da8ab8ddf1db82e2ed513c299fc3bed3e7ec7230760744ff79e852d1f8197cc3575ce10b1f1d91fb271903719944937
+MISC metadata.xml 1379 BLAKE2B e51735e46f2b9ade13d8aa53c1354b1285904933c260efef8e0d6d66e7b8a36199f33ab48cc98006e75e566a21422883dc3694d91e1dcbf1e7c413ba7dab557f SHA512 cd71918f048d081e7a223b9b09b0089b3e015aef674ef233c2aff43e1325ac61a3bd2bfa828071dd157fea0f5ec76ee719ccd339cf94539e3702d48ba6ecd5d4
diff --git a/app-crypt/gnupg/gnupg-2.2.20-r1.ebuild b/app-crypt/gnupg/gnupg-2.2.20-r2.ebuild
index a043aa8cc780..8fdea955e0be 100644
--- a/app-crypt/gnupg/gnupg-2.2.20-r1.ebuild
+++ b/app-crypt/gnupg/gnupg-2.2.20-r2.ebuild
@@ -116,11 +116,11 @@ src_configure() {
 		--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" \
+		GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config" \
+		KSBA_CONFIG="${ESYSROOT}/usr/bin/ksba-config" \
+		LIBASSUAN_CONFIG="${ESYSROOT}/usr/bin/libassuan-config" \
+		LIBGCRYPT_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-libgcrypt-config" \
+		NPTH_CONFIG="${ESYSROOT}/usr/bin/npth-config" \
 		$("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g')
 }
 
diff --git a/app-crypt/gnupg/gnupg-2.2.23.ebuild b/app-crypt/gnupg/gnupg-2.2.24.ebuild
index f92302d2fa9f..919565475201 100644
--- a/app-crypt/gnupg/gnupg-2.2.23.ebuild
+++ b/app-crypt/gnupg/gnupg-2.2.24.ebuild
@@ -9,16 +9,17 @@ MY_P="${P/_/-}"
 
 DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation"
 HOMEPAGE="https://gnupg.org/"
-SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
+SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2
+	scd-shared-access? ( https://raw.githubusercontent.com/GPGTools/MacGPG2/5ca182f54b7b6cd635d1c0a4713953834489fdd9/patches/gnupg/scdaemon_shared-access.patch -> ${PN}-2.2.16-scdaemon_shared-access.patch )"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl tofu tools usb user-socket wks-server"
+IUSE="bzip2 doc ldap nls readline scd-shared-access selinux +smartcard ssl tofu tools usb user-socket wks-server"
 
 # Existence of executables is checked during configuration.
 DEPEND=">=dev-libs/libassuan-2.5.0
-	>=dev-libs/libgcrypt-1.7.3
+	>=dev-libs/libgcrypt-1.8.0
 	>=dev-libs/libgpg-error-1.29
 	>=dev-libs/libksba-1.3.4
 	>=dev-libs/npth-1.2
@@ -55,6 +56,13 @@ PATCHES=(
 src_prepare() {
 	default
 
+	# Made optional because it's a non-official patch
+	if use scd-shared-access ; then
+		# Patch taken from
+		# https://github.com/GPGTools/MacGPG2/tree/dev/patches/gnupg
+		eapply "${DISTDIR}/${PN}-2.2.16-scdaemon_shared-access.patch"
+	fi
+
 	# Inject SSH_AUTH_SOCK into user's sessions after enabling gpg-agent-ssh.socket in systemctl --user mode,
 	# idea borrowed from libdbus, see
 	#   https://gitlab.freedesktop.org/dbus/dbus/-/blob/master/bus/systemd-user/dbus.socket.in#L6
@@ -83,11 +91,11 @@ src_configure() {
 		--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"
+		GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config"
+		KSBA_CONFIG="${ESYSROOT}/usr/bin/ksba-config"
+		LIBASSUAN_CONFIG="${ESYSROOT}/usr/bin/libassuan-config"
+		LIBGCRYPT_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-libgcrypt-config"
+		NPTH_CONFIG="${ESYSROOT}/usr/bin/npth-config"
 		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
 	)
 
diff --git a/app-crypt/gnupg/gnupg-2.2.25.ebuild b/app-crypt/gnupg/gnupg-2.2.25.ebuild
new file mode 100644
index 000000000000..919565475201
--- /dev/null
+++ b/app-crypt/gnupg/gnupg-2.2.25.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2020 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="https://gnupg.org/"
+SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2
+	scd-shared-access? ( https://raw.githubusercontent.com/GPGTools/MacGPG2/5ca182f54b7b6cd635d1c0a4713953834489fdd9/patches/gnupg/scdaemon_shared-access.patch -> ${PN}-2.2.16-scdaemon_shared-access.patch )"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="bzip2 doc ldap nls readline scd-shared-access selinux +smartcard ssl tofu tools usb user-socket wks-server"
+
+# Existence of executables is checked during configuration.
+DEPEND=">=dev-libs/libassuan-2.5.0
+	>=dev-libs/libgcrypt-1.8.0
+	>=dev-libs/libgpg-error-1.29
+	>=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"
+)
+
+src_prepare() {
+	default
+
+	# Made optional because it's a non-official patch
+	if use scd-shared-access ; then
+		# Patch taken from
+		# https://github.com/GPGTools/MacGPG2/tree/dev/patches/gnupg
+		eapply "${DISTDIR}/${PN}-2.2.16-scdaemon_shared-access.patch"
+	fi
+
+	# Inject SSH_AUTH_SOCK into user's sessions after enabling gpg-agent-ssh.socket in systemctl --user mode,
+	# idea borrowed from libdbus, see
+	#   https://gitlab.freedesktop.org/dbus/dbus/-/blob/master/bus/systemd-user/dbus.socket.in#L6
+	#
+	# This cannot be upstreamed, as it requires determining the exact prefix of 'systemctl',
+	# which in turn requires discovery in Autoconf, something that upstream deeply resents.
+	sed -e "/DirectoryMode=/a ExecStartPost=-${EPREFIX}/bin/systemctl --user set-environment SSH_AUTH_SOCK=%t/gnupg/S.gpg-agent.ssh" \
+		-i doc/examples/systemd-user/gpg-agent-ssh.socket || die
+}
+
+src_configure() {
+	local 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="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config"
+		KSBA_CONFIG="${ESYSROOT}/usr/bin/ksba-config"
+		LIBASSUAN_CONFIG="${ESYSROOT}/usr/bin/libassuan-config"
+		LIBGCRYPT_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-libgcrypt-config"
+		NPTH_CONFIG="${ESYSROOT}/usr/bin/npth-config"
+		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
+	)
+
+	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[@]}"
+}
+
+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/gnupg/metadata.xml b/app-crypt/gnupg/metadata.xml
index 2852eaacdcd2..c6692d9cdbf4 100644
--- a/app-crypt/gnupg/metadata.xml
+++ b/app-crypt/gnupg/metadata.xml
@@ -10,6 +10,11 @@
 		<name>Lars Wendler</name>
 	</maintainer>
 	<use>
+		<flag name="scd-shared-access">
+		Allow concurrent access to scdaemon by multiple apps from same
+		user. Useful if you want to use scdaemon with gnupg and for
+		example NitroKey.
+		</flag>
 		<flag name="smartcard">
 		Build scdaemon software. Enables usage of OpenPGP cards. For
 		other type of smartcards, try <pkg>app-crypt/gnupg-pkcs11-scd</pkg>.
diff --git a/app-crypt/gpgme/Manifest b/app-crypt/gpgme/Manifest
index b6f0e2583181..c26df0c5d30d 100644
--- a/app-crypt/gpgme/Manifest
+++ b/app-crypt/gpgme/Manifest
@@ -1,8 +1,10 @@
 DIST gpgme-1.13.0.tar.bz2 1820504 BLAKE2B 71fbb034e3c5939d1953554ccbe0e89e2089c53a4c79e90ee51bdf96500bf4be8a5e1633772ab8dadd44616dde7be551ad7d3af0a59d7e1df10a19cd9cf56baa SHA512 47a7a67dcc6d111cddd805d288d42e870948114a6dc09ce0675ad8b3d1580bbc2a683e1e70cb2f416919cf2129c72a9ff30e2e3b9527809d04e863cc1f87267b
 DIST gpgme-1.13.1.tar.bz2 1759616 BLAKE2B 17fff261ab76b72e096aa42cc847443bfd3bbf0eb6d04af1d38561ddce1d11cfe9a98b6ced268b28f33e2cb7d900a9e6b3dfc56f1c784a021dbefbf493522e70 SHA512 11de670c6cf512508103fe67af56d9fbb2a9dda6fc6fa3cd321371bbe337c7c2c81913ca557d07187adb2a63d37ea1a44da97ab22345bbe6022c405d0cb083b8
 DIST gpgme-1.14.0.tar.bz2 1678910 BLAKE2B 75051166b1f3777d630236c5afbd1786df238272b7ccfd053c5a4b2a207ba146550f6be46c1211f3bacbe19fee2f67adbc5be558d69175c19230a1a02e32d9f2 SHA512 b7ffa30a046c75215e1c73e2f34e5e65532e4dcf6bea55796adc6f82fd38dafe264bcd4332b2001155d6f9476d6fd82a77112dad31c1bb29db9ddefc532ae668
+DIST gpgme-1.15.0.tar.bz2 1692019 BLAKE2B 4c66f24034a88e7da8a06cef3d0ac9d1d6b5eccb6d4277d36a2399d6e78f5d5f42cf0c13188c1dba72fe11d73da76a71867d3c3b13052695b868dc4a680fa85b SHA512 ab979aea6ccc6d4faf02b3b1a773ce95cb754b4d687ce7adc2ed98e218f21a284a2283d8e2429016e78fcf5a94ea863011573fd1457a71cc0ae3aadd368a98a1
 EBUILD gpgme-1.13.0-r1.ebuild 2673 BLAKE2B ff54cdd1d4b54b3c63d7beca5a05487fabb712f319c47608ac5d7d083d0e924c994cba1b895bab2b6114127415a534564d04e0906ee54b8e0e33bee9b18e9402 SHA512 5b6bda8a932698ed5995acc705c5a565bd9414cf0f04bfe17abac3833f3aa85036ca762dd85dd209610d4f100c42dd47f552569a0a438d8507cce4e6dde51ac3
 EBUILD gpgme-1.13.0.ebuild 2667 BLAKE2B 2a6a8ecc4e3dfa56a2f8fbc7a57b9ffa122eef195aa282a1d39acf604c5919e0cf8799eb428f541e549e567b07407bd06f3edfab6b6c0281a514da9124e39c5e SHA512 46cd9d29817cf74edc9e4b55696851cc3723ae8b718edeae012515e7be42c1cd91bc711a7b7255a792c1f4369931b5f3b5c52240fe5af2eaf86d5f2c32574b0f
 EBUILD gpgme-1.13.1.ebuild 2675 BLAKE2B 01bdd7bda6982fa4c4ad37f5a18c5b6c36fd8abc66e2905557abeb85dd3cd4d48368e8632789bbd0969a9831e6bebcff679674353e0d045ce9d1693958467e5d SHA512 212e51b8c18150a14ad83a547fa98153d7368da321e28d2b2b6e97a1f49437bda6072d9919d8c01b593fdcd44a0a813b6a5314cf92736a34a98c1e28cc4ef473
-EBUILD gpgme-1.14.0.ebuild 2677 BLAKE2B f195dfb00a0a0d67e8aefbced6b994c1541cb0b2c2bdab3f885cb8d888fb952af187f5959432c80d69830ba657019220d8e4c125fa343cfd675d4376ff2190c8 SHA512 178f96a7f9125586455f67f62322ae4c860627f1b7bd1a49b143c33e2f6fc423582900659d661f0d53158cf7cee079b9e74972b4e01a43ec27f0f20c336100bc
+EBUILD gpgme-1.14.0.ebuild 2678 BLAKE2B 5e104080342a978e227d62de4bd52495676a7d47131cf52e45ebe0648f786b9e5522cd1c919238693755896a5988d519d969bc6b0d94bc46311df2e98350a042 SHA512 0d9f2e3e411ba8851ff433246712e6822340bd44794b815eb9399f22188a514293377605f592dac2e720d3dd25539867fbeb933d98d308cc68c333362dfd981a
+EBUILD gpgme-1.15.0.ebuild 2686 BLAKE2B f7e77ca589bff5e3d943d55d9bd9f4cfb055be99356d54be0a51d42d126cdaa44f70e1b1a4e7712a2191335b1ee0704e1b4cef04634b2327f2c2ec41503f4b49 SHA512 3af6b06788bd82b2a88666a2da5a283201a5b574070233191294e144354b1f16777b0ad78c7cfd982cac71388e64c9b7279bbeb345f02167a315e832731bb182
 MISC metadata.xml 326 BLAKE2B 982fe6e2ae0b6ce81980b477a39341c363c867202d646ff4acc9fb361785026919cc0de914e0deee67b79441115cea8a8b36f095d4719442f527f1a0d3ba06b8 SHA512 1223f3cdd325623e524c5bf46bea592b6930bdcc2ba40f9ebf27e568c6a527f59c8315194e4ffd70c29b778d25a2e2b8f57282d5e788814d3fbbcb1de4cf6334
diff --git a/app-crypt/gpgme/gpgme-1.14.0.ebuild b/app-crypt/gpgme/gpgme-1.14.0.ebuild
index 10f78fb427e2..af8ddedf98f4 100644
--- a/app-crypt/gpgme/gpgme-1.14.0.ebuild
+++ b/app-crypt/gpgme/gpgme-1.14.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 DISTUTILS_OPTIONAL=1
 
 inherit distutils-r1 flag-o-matic libtool qmake-utils toolchain-funcs
@@ -14,7 +14,7 @@ SRC_URI="mirror://gnupg/gpgme/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="1/11" # subslot = soname major version
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="common-lisp static-libs +cxx python qt5"
 
 RDEPEND=">=app-crypt/gnupg-2
diff --git a/app-crypt/gpgme/gpgme-1.15.0.ebuild b/app-crypt/gpgme/gpgme-1.15.0.ebuild
new file mode 100644
index 000000000000..9dc577ff560f
--- /dev/null
+++ b/app-crypt/gpgme/gpgme-1.15.0.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+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 ~riscv ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="common-lisp static-libs +cxx python qt5"
+
+RDEPEND=">=app-crypt/gnupg-2
+	>=dev-libs/libassuan-2.5.3:=
+	>=dev-libs/libgpg-error-1.36:=
+	python? ( ${PYTHON_DEPS} )
+	qt5? ( dev-qt/qtcore:5 )"
+	#doc? ( app-doc/doxygen[dot] )
+DEPEND="${RDEPEND}
+	qt5? ( dev-qt/qttest:5 )"
+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 "${ED}" -type f -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/heimdal/Manifest b/app-crypt/heimdal/Manifest
index 4a20ce4f40d2..6eee7d6a8882 100644
--- a/app-crypt/heimdal/Manifest
+++ b/app-crypt/heimdal/Manifest
@@ -15,5 +15,5 @@ AUX krb5.conf 424 BLAKE2B 49b8a0aab6e0dacb70b91e030bb5f2b8bdfe4253026f85e2c9d16b
 DIST heimdal-7.6.0.tar.gz 10186832 BLAKE2B 456b495a3d0a196cf02d6042c6db72c772327545fbc84f7bb758f55f3fca025432bf319fc33e9e0b5fe5ca78b83aea9dc47d77bf1f5b69ae88f1286a22c41263 SHA512 3f7ce090cf8da91f19675a1d9f6bd65c83b3a847337739481506f09d74001cb44283b103ba684dac8a5f11ec48605b5476240c534f6fc36442fb874b73680200
 DIST heimdal-7.7.0.tar.gz 10189293 BLAKE2B db9cdd1861dc9214a7f76b3d8b9656cfc0bad11cb6eadffa4fa29ea7f9aabd4c3d1b628c510644ec9abe1b3bf27a413ccf8cd590d602c4a4ac54ba3deb4cedc4 SHA512 6660939b5a36ce36310721a08a089fb671d1e3d2e8ac74ea4775bfa5f8f772d32de805551456200fe96cc486c092c44beb84f5dd877008bc305490ee971bbf99
 EBUILD heimdal-7.6.0.ebuild 4515 BLAKE2B 2e703f6d2c54621ac5f630759ed7d58a2f37f2a27a0398bbdde4b18004c9036ff439a0c590324269577f0b62f171b5a11d4ccdab28990b8cabb39a178960725a SHA512 762ae8f768791a57a4896d60ab568a89ca27d7ea48e78ad8a2ff04f289cb1c9f283e735ca4c975db64037bc481e2aebbe8093a24fe000b3f8388ded882017b2c
-EBUILD heimdal-7.7.0-r1.ebuild 4514 BLAKE2B d68abb7b643f9fd4542b64f926d9ead25c451acd26787ae14aa3045226fec8995417bb9bd1a1a27e4da5e047e86c613b5673856e9110c545384612d48c8e794d SHA512 9ecb0137d1ac9e33448719f48a630c6b48499a02c5de1f8014d8e31ae7540f46ff3c15579b0126ae4583364a7caa2a2bd853ffc2c77e4b407aa2d04d12adc055
+EBUILD heimdal-7.7.0-r1.ebuild 4516 BLAKE2B f4ea159e8a1fe01aa1a759e0f3744d6f5694c5f02bc8fb31374ace7f8772d1468725fa02a855d66482fb82e72210494ba7e135c9752a4de2130f87224af388ef SHA512 484fc65e63c1d6698e46beaf02fb8e5a102491523930385b3d113a216c5bf44912f76e99081dff3b00baa7aec6857beca5d3b25116ec2c88a13277d47ab9e580
 MISC metadata.xml 570 BLAKE2B 827b4e549ff73259b932cc8587625fd9dcd73553d7bee3726baae0d1de8d8e8f8d67fdd649d605099301f426b88fc654341005976a3373d61482c81dec67db5b SHA512 069fa36a8f551ae0fdfd3a6f3dfd6cbfb3bf56c2ceba6ecd5184c4686d885ce5aa83622090f7fa1df44924a7ac3bf63fed4b9b19e70254d2a6d883d483500ad8
diff --git a/app-crypt/heimdal/heimdal-7.7.0-r1.ebuild b/app-crypt/heimdal/heimdal-7.7.0-r1.ebuild
index 1f5dcf3141cf..ad0fc3116a22 100644
--- a/app-crypt/heimdal/heimdal-7.7.0-r1.ebuild
+++ b/app-crypt/heimdal/heimdal-7.7.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 VIRTUALX_REQUIRED="manual"
 
 inherit autotools db-use multilib multilib-minimal python-any-r1 virtualx flag-o-matic
diff --git a/app-crypt/ima-evm-utils/Manifest b/app-crypt/ima-evm-utils/Manifest
index a5de5f31e61c..c0c5b5d9a4d2 100644
--- a/app-crypt/ima-evm-utils/Manifest
+++ b/app-crypt/ima-evm-utils/Manifest
@@ -1,5 +1,5 @@
 AUX ima-evm-utils-1.1-configure-use-sys-xattr-bug-649790.patch 1332 BLAKE2B 1787a1f7154843123c1b4879f2e159ffef5ed8edb64a34ba84c5cbc71b1bdf34db63686e26f44554da67731ed857ca399219a1e7b36ca1630bac0705be56d2de SHA512 02642544797076d3c1568b11cc8edb303d844a2b9d9088af80f3bf7135da25635cbf7ce67387d9c51365466fc60942254773854fb9eff5562e2c7fff88d5a42f
 DIST ima-evm-utils-1.1.tar.gz 37825 BLAKE2B 469f5bbc194f3fcc8996f252d01745c0d8d4d4f63476174622ea4569c97978db478bd522ae4672819c5ef995f2bb524eb857e5bf5c303131959f2f5cb9c2ebcc SHA512 fc7efc890812233db888eef210dc4357bee838b56fd95efd9a9e141d684b0b354670a3c053dd93a94a1402dd826074d4a83a4637c8e6c1d90ead3132354a5776
-EBUILD ima-evm-utils-1.1-r1.ebuild 835 BLAKE2B 3f70358501220b0ac2c0346aa84292f2549c6feae050eb28db3a89a37fbf785ab8220ea66266d669756a3de6486c569590f11646d3d392cd99ce2aca12823c42 SHA512 c26bd36654a5c1e996bc8cde7488c96f646874a31e089adeec24bb7f4b04e886506309220391e4acaeeb9624fc8c82632cbd545572f113fe72a9988d9f9ecd04
-EBUILD ima-evm-utils-9999.ebuild 751 BLAKE2B aa830a77e1cc7f851ea31d5862499e86357fd7cf54aa7d5e721ee0197a29fc46a1eccf468ed4990e3fcfd03f072754f0088686d1157aaf49b8421b748806c7fb SHA512 827926be56dc95111e0e72ba0f09f72f3fc1f0edf273c07aa50eab8904559cd2fa0e4f9d8d9a029dc60aa32f22255697d5066429f547f64c3c8b65143f777e1d
+EBUILD ima-evm-utils-1.1-r1.ebuild 930 BLAKE2B e781a98fbaa64eddde0e5da3e83078d081b38fd5793233774d704e78f1cb0fccbf6c4967cf3b54c4fe9b7441ea65368744d5dbc5bf19742bcf4cf2636ac10419 SHA512 d0ce0baafa523571fe772d277c86cf56cc9f540e13dd8a0e6b90332f61abb9c4ee9417adb2452f6e56b8b482ffb240d42025e24fb95794b0598c2d8fc27bb746
+EBUILD ima-evm-utils-9999.ebuild 846 BLAKE2B 4597d73c6834177822a8ec9067a2b80a048bad69b51d0592fcf9a254050c08f62d9f9115b6ceb1e5bbb24b16682922690015cc12e9ca16deb126100f07749b6d SHA512 69a422bf56c8dfcfb7ed190d134b461311be05498b7f9b090d6c0152f14d840657a69a5481222b3a22662aa7e80f489ae49095c5a1057edcdbf8fc5ca0c12561
 MISC metadata.xml 330 BLAKE2B e6aa5198d2d600b288247b7ae453f13da878478c88f85fc7b14723ed3aa7cb3c6109c8171353e5fe8179fc4fe0bcb01a2beac42775ff9a52e6e5241f08024a41 SHA512 13ab3a27ab1bb8a5f782dabca2f900025b5e609f9a352dda1df3104fb97c97223c22449b6ffd587d6524f69cb77bfb219e72d57185d90ce2b17f9160f2cad4d3
diff --git a/app-crypt/ima-evm-utils/ima-evm-utils-1.1-r1.ebuild b/app-crypt/ima-evm-utils/ima-evm-utils-1.1-r1.ebuild
index 93152d948962..4d2555451e10 100644
--- a/app-crypt/ima-evm-utils/ima-evm-utils-1.1-r1.ebuild
+++ b/app-crypt/ima-evm-utils/ima-evm-utils-1.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -35,5 +35,12 @@ src_prepare() {
 }
 
 src_configure() {
-	econf $(use_enable debug)
+	econf \
+		$(use_enable debug) \
+		--disable-static
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/app-crypt/ima-evm-utils/ima-evm-utils-9999.ebuild b/app-crypt/ima-evm-utils/ima-evm-utils-9999.ebuild
index 1a92d1287ad1..d967038aff71 100644
--- a/app-crypt/ima-evm-utils/ima-evm-utils-9999.ebuild
+++ b/app-crypt/ima-evm-utils/ima-evm-utils-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -30,5 +30,12 @@ src_prepare() {
 }
 
 src_configure() {
-	econf $(use_enable debug)
+	econf \
+		$(use_enable debug) \
+		--disable-static
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/app-crypt/jitterentropy/Manifest b/app-crypt/jitterentropy/Manifest
index 32a07c34990b..5190a1b59f06 100644
--- a/app-crypt/jitterentropy/Manifest
+++ b/app-crypt/jitterentropy/Manifest
@@ -1,5 +1,5 @@
 DIST jitterentropy-2.1.2.tar.gz 24112 BLAKE2B 9328fcc6ac09b79765d53248e4d6d01be47348c6f22f660175de888a884ea9e65253cc2e6fd3620a96f69dd0051b97ea3c46462a24c8e0c94d2bba19afab059e SHA512 b1ba2fe22c6b7d5bca64bb1611f2da3f53f1979e515a16141ccf330e3ca27a6944f0e45f0db57f4e3963a30ea4b34920ce9173f9c4f3ea82b820dc739cbd95f4
 DIST jitterentropy-2.2.0.tar.gz 25556 BLAKE2B d0a8faa9131e9fd5712fad4179725ac29ba813e0d77e5ae9dc905841b92f67fc51e79c407142b2e8c3473f92a59a5b03f03d2013bd7e5d1ae07110da52461255 SHA512 4701a7e0a82ee583cbde5edfdacb737a5f588b42c61b16434b5a11bdfb1a108e7b9df8b8b38d9e92290e702b33f2ae8774580d6a71e6e8ac3af295ffc8ff5ff9
 EBUILD jitterentropy-2.1.2.ebuild 1009 BLAKE2B c8eeade1025e141eb03b5038822a66a688cf00cfa7fcb939744b2b1c569673d409f90100697c492a19b5838e81a12f292ee8bc739567a1716eac8b8a1c3940ea SHA512 c56b8da555882df70493402572fbbed3a3ca5b2ef5f63d1f653dbc54f92554cad428d315b872a899c1f33e90e25d3254c1af40844e4eb3559d03a7ba10d990e9
-EBUILD jitterentropy-2.2.0.ebuild 925 BLAKE2B 6106ec1161b49e575b1549f67ae98fbc1c1a225928d39b155b04e33a2e6eb4a98672d344c23ba66a9509e0198c75fb78bea25a7640d38d3f7e98b657e3af79ff SHA512 71bce4e2efd58e54cba5407912a8807b98d9651f557a4896b7007015a18325a1ae1f3f9c169ca159e08f395192f1f7a174e4f382754412031a9b3551eea7da7c
+EBUILD jitterentropy-2.2.0.ebuild 923 BLAKE2B 2cdcfbc5e413a0049b0743aeba0f905c7eb274de0fe2b775d65f8b5fd6c576595b796745b5ed55a4c006774412a2948e8fc75720b3fef9e233719b1dd48c2dfa SHA512 1aa071401c70f21315e819adc18b139af5c294f19bed9a6f2481b24c102654571cbc2dbfde46ef74927b2c1680cd615bf989d880d9e857d951e0f13b46c81d92
 MISC metadata.xml 666 BLAKE2B 88598964271ee05c8427e8547d25dd50eb50bec1dafcaef064328dbca5140b9221b1d1823a1dc54289b73501556579fb39a85c49a6c25d6447a677e8db0f6252 SHA512 d6baaef1aa2e0958492872e7b0ba2c6c86dfa7e281268b6cb230c2cc2c8132df04e664e0449d24885357a1a791bb354253778e0e5f2436fa612b6e0c509729e0
diff --git a/app-crypt/jitterentropy/jitterentropy-2.2.0.ebuild b/app-crypt/jitterentropy/jitterentropy-2.2.0.ebuild
index 41cf317760f6..5871f3580a1c 100644
--- a/app-crypt/jitterentropy/jitterentropy-2.2.0.ebuild
+++ b/app-crypt/jitterentropy/jitterentropy-2.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/smuellerDD/jitterentropy-library/archive/v${PV}.tar.
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ~mips ppc ppc64 ~riscv x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv x86"
 IUSE="static-libs"
 
 S="${WORKDIR}/${PN}-library-${PV}"
diff --git a/app-crypt/libmd/Manifest b/app-crypt/libmd/Manifest
index 97960e598d30..1a4c935c4222 100644
--- a/app-crypt/libmd/Manifest
+++ b/app-crypt/libmd/Manifest
@@ -4,4 +4,4 @@ EBUILD libmd-1.0.0-r1.ebuild 614 BLAKE2B 9d33178bd6faa47c60573c9f1b067cb4243074b
 EBUILD libmd-1.0.0.ebuild 386 BLAKE2B 03798470d2403edab2cb52c6dd7f36abf86ae1590642b7a46c5166adac60e272fae28f72f0384a2bf80763f2d814211b0aa4d562a43829a9236b1a47f4637107 SHA512 6a7cdfc8a8a1a271e328d03f60634b94e3901684af86659996b082a3ecdc858c7b8345d66edfcd0667863bb964f61d116ceb5e9850599409d362906692762b74
 EBUILD libmd-1.0.1.ebuild 658 BLAKE2B 8ebd5931106e0ebc15c965a0b65433856ce4cccc1f9d00598ae7251e45940728423f48a07c264e105ea94b4e755d940ce1a94fe30c126a384f313e726ea79c24 SHA512 01b56857bc7118e94ec6bf321420b6eff57563b589b4f193601808009173251bc44d4958ea1db2523eca06c0d61c5f5d1e3a2655c4474072413275a6b9236adb
 EBUILD libmd-99999.ebuild 568 BLAKE2B f3e942f902160f0fbf840e0c082a3dd07f57c2fe1a9d785a5d7b26c429f2baf6be48e4420b65d3c6b9b15684d6043576e989b15d188a167b016f8d404669d59f SHA512 d8479e0df2f68c33deece78037021a2dd26d75ed623b3fc486837b6bb53bd33fb49d4401e9dc5f938f161a296adeb2e7da8ca6294aaed56b8f9e8adf2fb2f759
-MISC metadata.xml 217 BLAKE2B db2fea1f008893d22d3d43f938c7b7fc7c035cfe58b04e1652b74e3c6a6f35754cfee5351ab5cfbfe286f03ff558b83167764305186d6a15ff10dfa29639011e SHA512 d1543d516a9e55d1985a460e7b21735cb30b977ba2ee097a43bd220c1bdab573baba004968a2d027d99f1222d3fc06931154e70e47b60a61869da05137af20ce
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-crypt/libmd/metadata.xml b/app-crypt/libmd/metadata.xml
index 8dc9c113fc65..6f49eba8f496 100644
--- a/app-crypt/libmd/metadata.xml
+++ b/app-crypt/libmd/metadata.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type='project'>
-<email>deb-tools@gentoo.org</email>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/app-crypt/libsecret/Manifest b/app-crypt/libsecret/Manifest
index f53ac9a1f233..af0bfd93d35c 100644
--- a/app-crypt/libsecret/Manifest
+++ b/app-crypt/libsecret/Manifest
@@ -1,5 +1,5 @@
 DIST libsecret-0.20.2.tar.xz 526224 BLAKE2B cae93962480f65d2c91b1c26a23321d19c256692754ef37c658e346a6cb6b91cdebe134516c3c8652c5ee502b8f7a070a8d519ed878b2f6dfc124ea7b032613f SHA512 89143c8ccc8f6fa0cda2c98baef92e8cbf9b319a984826a09c527125e14712023ee65cada42a2c9232524528da8c1c3d2235ecbcb93e2f06e94121a601c22857
 DIST libsecret-0.20.3.tar.xz 526388 BLAKE2B ae2e64af61c269eb109fa7840cc7ff2362ac69eab4b452074c2cb3a80b26cc88e8d341a7649e0f16fa73541943d968dfbd6f3cc802d99a37f3a7d91e8b20cfe3 SHA512 020e1954e0965f33ee15f35e1f439b6c1650322a9112078f7a3e265cee83ad99d217ae3b363fbadc06c5cb0941f7e544d91da72e5be1c6b96992c071e6170c22
 EBUILD libsecret-0.20.2.ebuild 2636 BLAKE2B 6083e45d12586eb27132f69e3c196bee711d50738e2367a4b2e87eac0b8279d919c38ffab902e608d1bb074c59ce2817caf295cfc1c53f031403b15cfb83869d SHA512 501a7d8853cb3698e558b5cb3307a40d2dbf00820ee8da2163d73de5900c6d5a84c3a1e2aacc0e0f66cff4633a9c6499e3d5707dda0c1a8d2d2769e1899e9f58
-EBUILD libsecret-0.20.3.ebuild 2637 BLAKE2B 5059338cfd2085bc32343b2614965335b0cd222eb502080afb555080e1f82b36767c4ab5cc85eebd55485233fa6a8aa45d3cf8d2d59ebf8d186b5c4c6f6ded8f SHA512 362a1e6ad2e3100ae432af0297159e3328eaef9fc1e074258b526c97dfbff26e4361b79ea21583215147c4c366528930438e1b36f6f13e01f906fe73a033d408
+EBUILD libsecret-0.20.3.ebuild 2636 BLAKE2B 6083e45d12586eb27132f69e3c196bee711d50738e2367a4b2e87eac0b8279d919c38ffab902e608d1bb074c59ce2817caf295cfc1c53f031403b15cfb83869d SHA512 501a7d8853cb3698e558b5cb3307a40d2dbf00820ee8da2163d73de5900c6d5a84c3a1e2aacc0e0f66cff4633a9c6499e3d5707dda0c1a8d2d2769e1899e9f58
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/app-crypt/libsecret/libsecret-0.20.3.ebuild b/app-crypt/libsecret/libsecret-0.20.3.ebuild
index e5125875d2b1..be5c5bb142f5 100644
--- a/app-crypt/libsecret/libsecret-0.20.3.ebuild
+++ b/app-crypt/libsecret/libsecret-0.20.3.ebuild
@@ -19,7 +19,7 @@ RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( introspection )
 	vala? ( introspection )"
 
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.44:2[${MULTILIB_USEDEP}]
diff --git a/app-crypt/libu2f-host/Manifest b/app-crypt/libu2f-host/Manifest
index a0c39aceb143..14994858ddea 100644
--- a/app-crypt/libu2f-host/Manifest
+++ b/app-crypt/libu2f-host/Manifest
@@ -1,4 +1,4 @@
 AUX libu2f-host-1.1.10-json-boolean.patch 1101 BLAKE2B c603290ae3f34ac9c6eccbee080ac83d7fcea2dfad69f1088de39cc35165fe7333acafee0aac53c9d973fd0b266bb822a1a68f48e64a492dbb5440976c2ecaf3 SHA512 e8b516d797bbb136fe51c367248be6d1035de409156a35ce55c9e871b236178c610e36f5859121e7fddae28e17c44db9bfa21ce4584acb3c45c6f68fbaba46e2
 DIST libu2f-host-1.1.10.tar.xz 471676 BLAKE2B 5066eaaaeda3b8c015afa8946f0af3b1b90a34488d4c71811c0d8f57a3ed2e4c8cb3d82d2df147dcf13ac3c384522d22f25894ac3a2d994a75b288891a67640a SHA512 91c5bf3994f1d3c9bd144f54b14b0404d839c15bef3c318619decdf1bd37214bcff33927af78a9826ff7d0bc9907c912a0e31104ae68d3a727a8436f2a1dbf7a
-EBUILD libu2f-host-1.1.10.ebuild 1016 BLAKE2B bbcaa944397cacbb294b213199de2242b1b0288cfa1dd1b3d2527893fc6d7101f8250a11173d5d7abad061d070ef9e5886bf623bf269baeff5008ad6084bd520 SHA512 1cff390fd989f9d960108b79a66eb9b196ef355122f759ab6d4ae9ce4a8a424afb66a7bc4702d6dbbdf7a31508cdcccbe2e05cd504f203be6bb1f07b15756319
+EBUILD libu2f-host-1.1.10.ebuild 1057 BLAKE2B 984a72cfb299cf71b434ade3270fed5cba566a59e367e81cc231f6d92016f094c07b61e6da957a7883011162ca7bebaebc0ddd3aee30cdf23aea22e2e23c4236 SHA512 32bf2ad39377ef93b04848b0fa01dee85b33e68517189309ef2c1a7317ef47f9e1bf10f882ce45fb72678caa1be8994f5cfb233c3b67d37c76f05c4e8d10a39c
 MISC metadata.xml 561 BLAKE2B 5c5f06eedf51575a587ed9c191dcc6f0e84793ef095ae14741ac9fff4fcebe759cd12fe71456d120004f40037e3827a500852ff0eb1383dc860251df59c9cb8f SHA512 a3da7b20b8c880100dfb6518f58fe372ef64b095b4ae22072d1546a43713be5b5ab84f469abf1cad8d507ab85c37be33178983ab58e2973f2ad607e3c021c1e2
diff --git a/app-crypt/libu2f-host/libu2f-host-1.1.10.ebuild b/app-crypt/libu2f-host/libu2f-host-1.1.10.ebuild
index 3355f7bcc195..dc653e48ba0b 100644
--- a/app-crypt/libu2f-host/libu2f-host-1.1.10.ebuild
+++ b/app-crypt/libu2f-host/libu2f-host-1.1.10.ebuild
@@ -11,8 +11,8 @@ SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.xz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
-IUSE="kernel_linux static-libs systemd"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+IUSE="kernel_linux systemd"
 
 DEPEND="dev-libs/hidapi
 	dev-libs/json-c:="
@@ -27,13 +27,17 @@ CONFIG_CHECK="~HIDRAW"
 
 PATCHES=( "${FILESDIR}/${P}-json-boolean.patch" )
 
+src_configure() {
+	econf --disable-static
+}
+
 src_install() {
 	default
 	if use kernel_linux; then
 		udev_dorules 70-u2f.rules
 	fi
 
-	find "${D}" -name '*.la' -delete || die
+	find "${ED}" -name '*.la' -delete || die
 }
 
 pkg_postinst() {
diff --git a/app-crypt/mit-krb5/Manifest b/app-crypt/mit-krb5/Manifest
index 7e8e05e5e2f5..bb31c3c611ee 100644
--- a/app-crypt/mit-krb5/Manifest
+++ b/app-crypt/mit-krb5/Manifest
@@ -1,3 +1,4 @@
+AUX CVE-2020-28196.patch 3128 BLAKE2B 52674cb21a589b1f72b2ba110657952cd2946d08df58417eb86f75663e5ded48a49bb4e6bed87598b74209ae03ff3dca2f80fe9305f7e44070806f02c8ecafcc SHA512 98fa20ad32610dfa9fd6b9e1657e8c6d7e8905d266ef8953e4d6fdb344f0005ee356a9cca7d5aaa1c5333073b7e464c26201302138e0bf8f1f696c818024ba9d
 AUX kpropd.xinetd 194 BLAKE2B cfc40af2e75b0ce5a71e0dfdcfe076d13d996b25d2cb50d4282bc88d7b33b317a202d57df0bb4a2b47113f0d38cb508614e122e4a3bb7dfd2397e2daa3178396 SHA512 c9bbd13f2fadfd2a925bfae834ba61f227cd4386b4c4466b5227d93c792f4549778ef4d6e08353372df99804459277c71f61b41ec71f3afcc600d73c5705f72f
 AUX mit-krb5-1.12_warn_cflags.patch 448 BLAKE2B cd9793866173b394bab3497d19653ca3296924cc49aaf540499b149254265af1d995b4d7493b76185ce35d123e70827cb5fcb221efc6499b86a346cfad7478ab SHA512 42364d9cd8c0a6fd28ae661eeac4d0dd3f2001fe290bf9731ee99c2c786a6488805fc93057d59e201e2cef1e5280af4c170187aa5603f4cf542906abc0fccc2b
 AUX mit-krb5-1.16.3-libressl-r1.patch 3815 BLAKE2B b3ad56fee5fd5ace5e5ef0b1002c2f69c14383ca156182c65f4b1d2a5b8010d30677aabab271726c0fa9cbccf4734a3dda54cc492c9b1e5e1bdc7e8757292a73 SHA512 1298cadf15e5f1512af66c6584cff99b1d8f7c9764cb91e1e606fd331da1747b5fd7080c928a373369ab3817acadfa214121fee694a0ac515c0f4d6a623fb834
@@ -16,5 +17,7 @@ AUX mit-krb5kpropd.service 128 BLAKE2B 31d002c16987bd6fc42e22e64dd9bd1f9db36655d
 AUX mit-krb5kpropd.socket 122 BLAKE2B 2ce51e67b909c6955d9796f80f7985c9209af398ad2a60beebe83bd766d42261bd44c712df14608a1e5e922715780a6c4aa8ad294c34ba4e8fc336a24d038fd3 SHA512 4e7ae175425e0787a1d5ff959471a88bf5af4cd6e213dc6d4048902fab7547c1186a082370b523f9549f5096acfab1fb03b4839e42bd80dc539130ae4bb3ea55
 AUX mit-krb5kpropd_at.service 162 BLAKE2B ccd1dea2419656a95ea1e5068457ea45a765a831f36e7abe3e27cdd9b42f2b703cd6ddad1ac60d75feff4d74bf31dbf146ee2cbfdd34ac38c11908d44162e77a SHA512 4b7121da07b11fa65db4edc185c57197ebb25ed5c49797e36bc31b8b7bbb22a6f512f4a986c8430dfc31b1b8fcfba66dcfe154cd6eeb8b4bb445d5006fff3802
 DIST krb5-1.18.2.tar.gz 8713927 BLAKE2B f0eb34e67adcb86f347c59ec6ef74970a57530cc56336a84909f852cd6135079ea89828e77c906a272f54e0faf6a4a0497f2b648446eb9d048d1c51e4ec513af SHA512 7cbb1b28e677fea3e0794e93951f3caaa2c49bb1175dd187951e72a466cc69d96c3b833d838000fe911c1a437d96a558e550f27c53a8b332fb9dfc7cbb7ec44c
-EBUILD mit-krb5-1.18.2-r1.ebuild 4369 BLAKE2B 6b367c9fb266c2c6b4b217ea8cb812f9ede386e22ca24d6df5425242d2acefec0e927acb512657044c61632ff7e121917460e1cb9038567df2732ca73be99552 SHA512 89107dcadce9925627443b99cfde007c66ae5d3f1117864d2dcce65d4dd68f96711349d6ca76f91add8fe92c95a6e37e57e3b248ce0b153e62faf9e74045f2cd
+DIST krb5-1.18.3.tar.gz 8715312 BLAKE2B 4f6ad4a529e7578e83d82b43c2cada33bce1dca5081ec826ee06a713f82520b783f72ec56d2ce289e10d1ddcfaa079491e43f21c035b214d244bb80e6b2a1c9f SHA512 cf0bf6cf8f622fa085954e6da998d952cf64dc7ccc319972ed81ea0542089cabf2d0e8243df84da01ad6f40584768ca2f02d108630c6741fa7b3d7d98c887c01
+EBUILD mit-krb5-1.18.2-r2.ebuild 4407 BLAKE2B 11eb4671f85a6685e8017c49d3a55cb315e26a55430c900c9191249468a15ede542deaddaa30c395f62f97747bb6307944bda497792a03b7358f3ffb9d34304c SHA512 3daa206ed5a5c8b79366282bc809ff7eea00097038977788a1d3dd36f90372481bd1cb489846a0830165066308dad4391d6a2edddeb87ed2936e8dbaa6cf48e6
+EBUILD mit-krb5-1.18.3.ebuild 4379 BLAKE2B e0cd5aefed3c0be6cfe3169a529451ef57205d767d56c8f5733ab74ef651c68bc33d837f9f81f4eada854502ea0e3b735f8d5c80bc09bb35fb72faeafe7744d4 SHA512 e800dc2d76190c7705c121e4ad87487c943272281b74e3c3888406a6c8dbf9f5fb7acfb3044f2bbdb43190a436b371072c64ace80d31f5c8738019762c6f1bbe
 MISC metadata.xml 823 BLAKE2B b1e312e7d7d1dde62a6260572d68c5c9df90a00c9ca7d43939df0ce7c6e528ac8dfcf839827938f783c241c19255660e1e7806210aaf407a6e86cbaeef24295a SHA512 844715444284f5c7f1a73ed15c0ebe0b5dd8c96c3aa7e6450f465e2a2086509c04d637f139ede5e427972d4b1bb298255388f50978b41de875b47ee40251451e
diff --git a/app-crypt/mit-krb5/files/CVE-2020-28196.patch b/app-crypt/mit-krb5/files/CVE-2020-28196.patch
new file mode 100644
index 000000000000..486078437e89
--- /dev/null
+++ b/app-crypt/mit-krb5/files/CVE-2020-28196.patch
@@ -0,0 +1,71 @@
+diff --git a/src/lib/krb5/asn.1/asn1_encode.c b/src/lib/krb5/asn.1/asn1_encode.c
+index a160cf4fe8..cd6b879f77 100644
+--- a/lib/krb5/asn.1/asn1_encode.c
++++ b/lib/krb5/asn.1/asn1_encode.c
+@@ -356,7 +356,7 @@ make_tag(asn1buf *buf, const taginfo *t, size_t len)
+ static krb5_error_code
+ get_tag(const uint8_t *asn1, size_t len, taginfo *tag_out,
+         const uint8_t **contents_out, size_t *clen_out,
+-        const uint8_t **remainder_out, size_t *rlen_out)
++        const uint8_t **remainder_out, size_t *rlen_out, int recursion)
+ {
+     krb5_error_code ret;
+     uint8_t o;
+@@ -394,9 +394,11 @@ get_tag(const uint8_t *asn1, size_t len, taginfo *tag_out,
+         /* Indefinite form (should not be present in DER, but we accept it). */
+         if (tag_out->construction != CONSTRUCTED)
+             return ASN1_MISMATCH_INDEF;
++        if (recursion >= 32)
++            return ASN1_OVERFLOW;
+         p = asn1;
+         while (!(len >= 2 && p[0] == 0 && p[1] == 0)) {
+-            ret = get_tag(p, len, &t, &c, &clen, &p, &len);
++            ret = get_tag(p, len, &t, &c, &clen, &p, &len, recursion + 1);
+             if (ret)
+                 return ret;
+         }
+@@ -613,7 +615,7 @@ split_der(asn1buf *buf, uint8_t *const *der, size_t len, taginfo *tag_out)
+     const uint8_t *contents, *remainder;
+     size_t clen, rlen;
+ 
+-    ret = get_tag(*der, len, tag_out, &contents, &clen, &remainder, &rlen);
++    ret = get_tag(*der, len, tag_out, &contents, &clen, &remainder, &rlen, 0);
+     if (ret)
+         return ret;
+     if (rlen != 0)
+@@ -1199,7 +1201,7 @@ decode_atype(const taginfo *t, const uint8_t *asn1, size_t len,
+         const uint8_t *rem;
+         size_t rlen;
+         if (!tag->implicit) {
+-            ret = get_tag(asn1, len, &inner_tag, &asn1, &len, &rem, &rlen);
++            ret = get_tag(asn1, len, &inner_tag, &asn1, &len, &rem, &rlen, 0);
+             if (ret)
+                 return ret;
+             /* Note: we don't check rlen (it should be 0). */
+@@ -1420,7 +1422,7 @@ decode_sequence(const uint8_t *asn1, size_t len, const struct seq_info *seq,
+     for (i = 0; i < seq->n_fields; i++) {
+         if (len == 0)
+             break;
+-        ret = get_tag(asn1, len, &t, &contents, &clen, &asn1, &len);
++        ret = get_tag(asn1, len, &t, &contents, &clen, &asn1, &len, 0);
+         if (ret)
+             goto error;
+         /*
+@@ -1478,7 +1480,7 @@ decode_sequence_of(const uint8_t *asn1, size_t len,
+     *seq_out = NULL;
+     *count_out = 0;
+     while (len > 0) {
+-        ret = get_tag(asn1, len, &t, &contents, &clen, &asn1, &len);
++        ret = get_tag(asn1, len, &t, &contents, &clen, &asn1, &len, 0);
+         if (ret)
+             goto error;
+         if (!check_atype_tag(elemtype, &t)) {
+@@ -1584,7 +1586,7 @@ k5_asn1_full_decode(const krb5_data *code, const struct atype_info *a,
+ 
+     *retrep = NULL;
+     ret = get_tag((uint8_t *)code->data, code->length, &t, &contents,
+-                  &clen, &remainder, &rlen);
++                  &clen, &remainder, &rlen, 0);
+     if (ret)
+         return ret;
+     /* rlen should be 0, but we don't check it (and due to padding in
diff --git a/app-crypt/mit-krb5/mit-krb5-1.18.2-r1.ebuild b/app-crypt/mit-krb5/mit-krb5-1.18.2-r2.ebuild
index 626da606a476..1edf1c1527f4 100644
--- a/app-crypt/mit-krb5/mit-krb5-1.18.2-r1.ebuild
+++ b/app-crypt/mit-krb5/mit-krb5-1.18.2-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 inherit autotools flag-o-matic multilib-minimal python-any-r1 systemd toolchain-funcs
 
 MY_P="${P/mit-}"
@@ -63,6 +63,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-1.16.3-libressl-r1.patch"
 	"${FILESDIR}/${PN}_dont_create_run.patch"
 	"${FILESDIR}/${PN}-1.18-libressl.patch"
+	"${FILESDIR}/CVE-2020-28196.patch"
 )
 
 MULTILIB_CHOST_TOOLS=(
diff --git a/app-crypt/mit-krb5/mit-krb5-1.18.3.ebuild b/app-crypt/mit-krb5/mit-krb5-1.18.3.ebuild
new file mode 100644
index 000000000000..61ce1944b46e
--- /dev/null
+++ b/app-crypt/mit-krb5/mit-krb5-1.18.3.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+inherit autotools flag-o-matic multilib-minimal python-any-r1 systemd toolchain-funcs
+
+MY_P="${P/mit-}"
+P_DIR=$(ver_cut 1-2)
+DESCRIPTION="MIT Kerberos V"
+HOMEPAGE="https://web.mit.edu/kerberos/www/"
+SRC_URI="https://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}.tar.gz"
+
+LICENSE="openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="cpu_flags_x86_aes doc +keyutils libressl lmdb nls openldap +pkinit selinux +threads test xinetd"
+
+# Test suite requires network access
+RESTRICT="test"
+
+DEPEND="
+	!!app-crypt/heimdal
+	>=sys-libs/e2fsprogs-libs-1.42.9[${MULTILIB_USEDEP}]
+	|| (
+		>=dev-libs/libverto-0.2.5[libev,${MULTILIB_USEDEP}]
+		>=dev-libs/libverto-0.2.5[libevent,${MULTILIB_USEDEP}]
+		>=dev-libs/libverto-0.2.5[tevent,${MULTILIB_USEDEP}]
+	)
+	keyutils? ( >=sys-apps/keyutils-1.5.8:=[${MULTILIB_USEDEP}] )
+	lmdb? ( dev-db/lmdb )
+	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
+	openldap? ( >=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}] )
+	pkinit? (
+		!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
+		libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+	)
+	xinetd? ( sys-apps/xinetd )
+	"
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/yacc
+	cpu_flags_x86_aes? (
+		amd64? ( dev-lang/yasm )
+		x86? ( dev-lang/yasm )
+	)
+	doc? ( virtual/latex-base )
+	test? (
+		${PYTHON_DEPS}
+		dev-lang/tcl:0
+		dev-util/dejagnu
+		dev-util/cmocka
+	)"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-kerberos )"
+
+S=${WORKDIR}/${MY_P}/src
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.12_warn_cflags.patch"
+	"${FILESDIR}/${PN}-config_LDFLAGS-r1.patch"
+	"${FILESDIR}/${PN}-1.16.3-libressl-r1.patch"
+	"${FILESDIR}/${PN}_dont_create_run.patch"
+	"${FILESDIR}/${PN}-1.18-libressl.patch"
+)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/krb5-config
+)
+
+src_prepare() {
+	default
+	# Make sure we always use the system copies.
+	rm -rf util/{et,ss,verto}
+	sed -i 's:^[[:space:]]*util/verto$::' configure.ac || die
+
+	eautoreconf
+}
+
+src_configure() {
+	# QA
+	append-flags -fno-strict-aliasing
+	append-flags -fno-strict-overflow
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} \
+	WARN_CFLAGS="set" \
+	econf \
+		$(use_with openldap ldap) \
+		"$(multilib_native_use_with test tcl "${EPREFIX}/usr")" \
+		$(use_enable nls) \
+		$(use_enable pkinit) \
+		$(use_enable threads thread-support) \
+		$(use_with lmdb) \
+		$(use_with keyutils) \
+		--without-hesiod \
+		--enable-shared \
+		--with-system-et \
+		--with-system-ss \
+		--enable-dns-for-realm \
+		--enable-kdc-lookaside-cache \
+		--with-system-verto \
+		--disable-rpath \
+		\
+		AR="$(tc-getAR)"
+}
+
+multilib_src_compile() {
+	emake -j1
+}
+
+multilib_src_test() {
+	multilib_is_native_abi && emake -j1 check
+}
+
+multilib_src_install() {
+	emake \
+		DESTDIR="${D}" \
+		EXAMPLEDIR="${EPREFIX}/usr/share/doc/${PF}/examples" \
+		install
+}
+
+multilib_src_install_all() {
+	# default database dir
+	keepdir /var/lib/krb5kdc
+
+	cd ..
+	dodoc README
+
+	if use doc; then
+		dodoc -r doc/html
+		docinto pdf
+		dodoc doc/pdf/*.pdf
+	fi
+
+	newinitd "${FILESDIR}"/mit-krb5kadmind.initd-r2 mit-krb5kadmind
+	newinitd "${FILESDIR}"/mit-krb5kdc.initd-r2 mit-krb5kdc
+	newinitd "${FILESDIR}"/mit-krb5kpropd.initd-r2 mit-krb5kpropd
+	newconfd "${FILESDIR}"/mit-krb5kadmind.confd mit-krb5kadmind
+	newconfd "${FILESDIR}"/mit-krb5kdc.confd mit-krb5kdc
+	newconfd "${FILESDIR}"/mit-krb5kpropd.confd mit-krb5kpropd
+
+	systemd_newunit "${FILESDIR}"/mit-krb5kadmind.service mit-krb5kadmind.service
+	systemd_newunit "${FILESDIR}"/mit-krb5kdc.service mit-krb5kdc.service
+	systemd_newunit "${FILESDIR}"/mit-krb5kpropd.service mit-krb5kpropd.service
+	systemd_newunit "${FILESDIR}"/mit-krb5kpropd_at.service "mit-krb5kpropd@.service"
+	systemd_newunit "${FILESDIR}"/mit-krb5kpropd.socket mit-krb5kpropd.socket
+
+	insinto /etc
+	newins "${ED}/usr/share/doc/${PF}/examples/krb5.conf" krb5.conf.example
+	insinto /var/lib/krb5kdc
+	newins "${ED}/usr/share/doc/${PF}/examples/kdc.conf" kdc.conf.example
+
+	if use openldap ; then
+		insinto /etc/openldap/schema
+		doins "${S}/plugins/kdb/ldap/libkdb_ldap/kerberos.schema"
+	fi
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}/kpropd.xinetd" kpropd
+	fi
+}
diff --git a/app-crypt/nwipe/Manifest b/app-crypt/nwipe/Manifest
index 35042d3120cf..9d987c985593 100644
--- a/app-crypt/nwipe/Manifest
+++ b/app-crypt/nwipe/Manifest
@@ -1,3 +1,3 @@
-DIST nwipe-0.25.tar.gz 49608 BLAKE2B 3506093c3e93b4aa982dffdd2f922f525404b397d7b3469f9ccdbf6708f824e9d3a2e34590a34cb4e0411bb3a8a4555a1f5940b826d39d39c10c75b668a10d1d SHA512 1051f2565ad7acaac7c289e2db91aa4dee40c3bb9a9dda97b2dec047e94cd91e7d59fd61603806628cabeb009932f011e734638fc9191c22bb812d7b4b661b46
-EBUILD nwipe-0.25.ebuild 563 BLAKE2B 86d067eaeb60a4b3d1629d8fbc4a1b87b3a1af0bbdaee1becda2a465b3eef784fb8b00f2d9a5f518155ad82db3e8a45bf75d2bb663ddcb3e8c6aaaa3e41dce43 SHA512 de5d1c66977fdecfb5b0a196c3504c5f61b1c26fc4957d490d012e87ec5a9af31d7655c62330cff3f3ce6f369193103f4337dec997457a55bd06251e3553558a
-MISC metadata.xml 247 BLAKE2B 056bdc9d5d640f487cb60a4ba64eea37b35e10f99db421540331f78e98cc4eeb55396a0aabbe73b5dc1a90fc2c14298544e21bdef3a43ffec09212133981c395 SHA512 b45f44f0dc651a7ae0a74a287b9f6736f16e4451d820c06d649fe1eccb6a92db440a640f623ab76b67b01485d6fc697c78c17a192056b7903f6d72ffdfac0357
+DIST nwipe-0.28.tar.gz 849147 BLAKE2B de81c526edc9ce106d48297796e1d42689bafae20be8ac20f6a8eb6474c8202dffdfbad2f91c8282bf5f747921b90402a3a84e411d8a8b2adb0c2e785bfaf315 SHA512 2b6cb6dbcbb51960f726d8ec6c1629fb4675af4b3f7b39ee1fc91244fc9391f4ea23bae5c8794cc92a675ce202be60df900658b6d9a95b5bb399c0e6f009ce69
+EBUILD nwipe-0.28.ebuild 555 BLAKE2B 67a7107da39bb4a079ec50dcc278056bd0c9f39d9e6ea6a5aee585603137ecb593652595547dd11264459f069fd5336f13c067df6d085af2ce6b9cc2b5bca7f8 SHA512 1d70f17660ece4b2e85cf73a2a94eeb431f40922dd2049d49ae1430d7ad4b4f5d532aa454c7085f61f3eac13f72a510e52779c9f10d64751952f974eb43df933
+MISC metadata.xml 458 BLAKE2B a42de1e61e183e78050015563f293f8cae433af086d3afde066624dd56b024a35b590590dc728cc181e5ab0912ab94e48af4a3db9117498084423e7134a9743b SHA512 63e500333fff449b1e2e91fed9492ee3c5b33aea0116009cceca1b50d744b87cbe7a86c01a5cf19979425f56ccf746e487b8ec03c55f988f377b326c95a1dfb8
diff --git a/app-crypt/nwipe/metadata.xml b/app-crypt/nwipe/metadata.xml
index c2ed1ed608a0..0675dc705da7 100644
--- a/app-crypt/nwipe/metadata.xml
+++ b/app-crypt/nwipe/metadata.xml
@@ -1,8 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="sourceforge">nwipe</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>jakov.smolic@sartura.hr</email>
+		<name>Jakov Smolic</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">martijnvanbrummelen/nwipe</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-crypt/nwipe/nwipe-0.25.ebuild b/app-crypt/nwipe/nwipe-0.28.ebuild
index 20ca201ff847..3c580a709883 100644
--- a/app-crypt/nwipe/nwipe-0.25.ebuild
+++ b/app-crypt/nwipe/nwipe-0.28.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,12 +7,11 @@ 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"
+SRC_URI="https://github.com/martijnvanbrummelen/nwipe/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:="
diff --git a/app-crypt/openpgp-keys-django/Manifest b/app-crypt/openpgp-keys-django/Manifest
new file mode 100644
index 000000000000..6e4c1170a095
--- /dev/null
+++ b/app-crypt/openpgp-keys-django/Manifest
@@ -0,0 +1,3 @@
+DIST FE5FB63876A1D718A8C67556E17DF5C82B4F9D00.asc 5710 BLAKE2B 92cc184b779e7279f5e11d579ea12d604f955f4b422c6d7a58436567130cacfe138765cf76217ff6790fcf2a27dfd70d25a7b38911630a9c7d74c0e7d079bfe4 SHA512 8edfe3db0dd77feb52ee8683db103f3c0b2c87adac52047dd66f17e956227a9a2378a182351cf2d761645e3e755795528896f4e82f1c85aa77331a1f1a38de6e
+EBUILD openpgp-keys-django-20201105.ebuild 640 BLAKE2B 42d9e498b9e1f629046a2f213ee9a8e144c09d790bf60dce9129a85a5511072f878d8c5f512b65db223a391056fa10086978b58fcfbc23877b69e368239fa84b SHA512 4394f34ea3be333e533f1ca0a0e2a04cb18a8f7e088328597153ec9d3bba270c9b7daf6bb2a694b381521c411487942684a6dd21e8e4b41ae9ea03635b5391f3
+MISC metadata.xml 247 BLAKE2B b1be080032e657afc879ab3aaa222f493f548e83f31b4d760ed187eb47a7063e725e4d4c38ec73891d530e6ac8480aa69a659039bc9bb259981d2c7af3a7decb SHA512 5a4c7eac292be21b8ade871e7e31f73bd55c1f39220b457ee5ab021e85a3063bc913f33b4c36f4da97a038c786ce63ab43ccf4dccc9ae4da7596ae1c5bc8e709
diff --git a/app-crypt/acmebot/metadata.xml b/app-crypt/openpgp-keys-django/metadata.xml
index 79d462e85571..bd7d87876616 100644
--- a/app-crypt/acmebot/metadata.xml
+++ b/app-crypt/openpgp-keys-django/metadata.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-  <email>robbat2@gentoo.org</email>
-</maintainer>
+	<maintainer type="project">
+		<email>dist-kernel@gentoo.org</email>
+	</maintainer>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/app-crypt/openpgp-keys-django/openpgp-keys-django-20201105.ebuild b/app-crypt/openpgp-keys-django/openpgp-keys-django-20201105.ebuild
new file mode 100644
index 000000000000..04c0ae97f09f
--- /dev/null
+++ b/app-crypt/openpgp-keys-django/openpgp-keys-django-20201105.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="OpenPGP keys used to sign Django releases"
+HOMEPAGE="https://www.djangoproject.com/download/"
+SRC_URI="
+	https://keys.openpgp.org/vks/v1/by-fingerprint/FE5FB63876A1D718A8C67556E17DF5C82B4F9D00
+		-> FE5FB63876A1D718A8C67556E17DF5C82B4F9D00.asc
+"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+
+S=${WORKDIR}
+
+src_install() {
+	local files=( ${A} )
+	insinto /usr/share/openpgp-keys
+	newins - django.asc < <(cat "${files[@]/#/${DISTDIR}/}")
+}
diff --git a/app-crypt/openpgp-keys-kernel/Manifest b/app-crypt/openpgp-keys-kernel/Manifest
new file mode 100644
index 000000000000..bd1a7f90bcb9
--- /dev/null
+++ b/app-crypt/openpgp-keys-kernel/Manifest
@@ -0,0 +1,4 @@
+DIST gregkh@kernel.org.key 3527 BLAKE2B 7ace705a7cf4727f4ee659774025867ddebf3c6706a23e6bba99adc681101f0a935870f1bdf505735f4842009816ce19d83e05e399a6dc65866ea3588c3b73f1 SHA512 6adc7c22cdf1902a537b6af3f4d006f1f56d0a246d595dd615be14b5121898ed5091dff30043b824a307c0294bb16424103bf697cfe6f7ecee6666f2199cdcd0
+DIST torvalds@kernel.org.key 1572 BLAKE2B 4f6ca50c692f6b2b89097cebe54d20b90160039cf7a396f91dff11259668d4a9a0da08293eafe63ad843a128f8e869c7c59f4a27501fe2cd04e11f16f6fa8ae8 SHA512 039ee4d7a304703020b386672fac66b8304c71ad1dfea60820f9ba13c42fddc01c0bacc26ea792dd6ee4dc10008149d21102c261df61452e6a87abeb9f2fcfd5
+EBUILD openpgp-keys-kernel-20201103.ebuild 736 BLAKE2B c52cfce5d7b2aa31d42de59471a43c0403f8167595600fef4564d8763995cfcc462f16287f77ae5b0a8b55b75920ae1e2938d624dc280f5e83c73217e9bb0138 SHA512 d643b1e371e42f65efdb4179a969188221984f42c87b1b304d3af4907e12932c78f3e9a127e29c9180d52a133f3975e51703a0d318101f341650964593366a58
+MISC metadata.xml 247 BLAKE2B b1be080032e657afc879ab3aaa222f493f548e83f31b4d760ed187eb47a7063e725e4d4c38ec73891d530e6ac8480aa69a659039bc9bb259981d2c7af3a7decb SHA512 5a4c7eac292be21b8ade871e7e31f73bd55c1f39220b457ee5ab021e85a3063bc913f33b4c36f4da97a038c786ce63ab43ccf4dccc9ae4da7596ae1c5bc8e709
diff --git a/app-crypt/openpgp-keys-kernel/metadata.xml b/app-crypt/openpgp-keys-kernel/metadata.xml
new file mode 100644
index 000000000000..bd7d87876616
--- /dev/null
+++ b/app-crypt/openpgp-keys-kernel/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>dist-kernel@gentoo.org</email>
+	</maintainer>
+	<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-crypt/openpgp-keys-kernel/openpgp-keys-kernel-20201103.ebuild b/app-crypt/openpgp-keys-kernel/openpgp-keys-kernel-20201103.ebuild
new file mode 100644
index 000000000000..92a4141ecf78
--- /dev/null
+++ b/app-crypt/openpgp-keys-kernel/openpgp-keys-kernel-20201103.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="OpenPGP keys used to sign Linux kernel releases"
+HOMEPAGE="http://miniupnp.free.fr/files/"
+SRC_URI="
+	https://kernel.org/.well-known/openpgpkey/hu/e3n9xnm94c5apezqnj1pmrfuaoyfm8cf?l=gregkh
+		-> gregkh@kernel.org.key
+	https://kernel.org/.well-known/openpgpkey/hu/pf113mfnx1f3eb1yiwhsipa91xfc7o4x?l=torvalds
+		-> torvalds@kernel.org.key
+"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+
+S=${WORKDIR}
+
+src_install() {
+	local files=( ${A} )
+	insinto /usr/share/openpgp-keys
+	newins - kernel.org.asc < <(cat "${files[@]/#/${DISTDIR}/}")
+}
diff --git a/app-crypt/openpgp-keys-linuxcontainers/Manifest b/app-crypt/openpgp-keys-linuxcontainers/Manifest
new file mode 100644
index 000000000000..f74c0e742825
--- /dev/null
+++ b/app-crypt/openpgp-keys-linuxcontainers/Manifest
@@ -0,0 +1,4 @@
+DIST 64792D67.asc 91149 BLAKE2B 06c03b71dfd6242d8b33c4a2eeac02099a0a5139aa9fc7d82e2fae0dc78473b683bd5aa89ac4289576bb05d45dbb183007d7b488bf1c4cfaff4e307f75198af8 SHA512 838d18d84f3dd1199c5f811beedd083d2b704a99c5647dee543386f9c8cb05eadac3f987247aa11db240e5cd285dc2ef5c6f708a16f36abab41debf2a442b73b
+DIST FEA93624.asc 62695 BLAKE2B 93aee7b0a6a0eedc5c0695c5389122b4daed62a5c1c875815a798d844c89f82485362ff157a82c29a6b252956734ba88b55482376fe19a9ef8875cdd964fcdde SHA512 1b7f48fd145243773a0523e7b6d3f834377c299c06a2675da308d1b78b36c48a09277ec438b92bb55ca579dfb923f01f08df7471a7155532cbd60415f4db0430
+EBUILD openpgp-keys-linuxcontainers-20201014.ebuild 724 BLAKE2B 2495f462670599133879c09dabb68ed5aa3af8e57fdd4d4a030abd2837ef23120f4475da30b8fd370c8d004f345f5e1790d872abf04f093745dbf5d9a1febf18 SHA512 844cbe3db94495c4016d6e3d49357762ee38ad22b5fa81509ab658fcaeaa1a5d46da0091c4b6e1fc385889b0cb8133b4a75513c18cf2b2e819f577c6745faeb2
+MISC metadata.xml 254 BLAKE2B 938f68b7b21ad386a35540a09e4bb956e241dfc963d4823c3c0cd46d3449ff4fb5a1cead67ad7c35a460503d30bdbde35822535f1c2d46f2939ee190f328b846 SHA512 26047ebb40fc49bfb4393121c5c5af69caee617a1d75676be84b0f5af75564828aeeef4503c7681eaaf7e48f6c662574874336296c18e002dca8e925162a1d4c
diff --git a/app-crypt/openpgp-keys-linuxcontainers/metadata.xml b/app-crypt/openpgp-keys-linuxcontainers/metadata.xml
new file mode 100644
index 000000000000..6b0a0fb3a729
--- /dev/null
+++ b/app-crypt/openpgp-keys-linuxcontainers/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>juippis@gentoo.org</email>
+    <name>Joonas Niilola</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-crypt/openpgp-keys-linuxcontainers/openpgp-keys-linuxcontainers-20201014.ebuild b/app-crypt/openpgp-keys-linuxcontainers/openpgp-keys-linuxcontainers-20201014.ebuild
new file mode 100644
index 000000000000..f34777f8ad63
--- /dev/null
+++ b/app-crypt/openpgp-keys-linuxcontainers/openpgp-keys-linuxcontainers-20201014.ebuild
@@ -0,0 +1,21 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="OpenPGP keys used to sign LXC-related packages"
+HOMEPAGE="https://linuxcontainers.org/"
+SRC_URI="https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x4880b8c9bd0e5106fc070f4f7b3c391efea93624 -> FEA93624.asc
+	https://keyserver.ubuntu.com/pks/lookup?op=hget&search=32873a3b691d14a1b2b2e09a7fb6ee0d -> 64792D67.asc"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+
+S="${WORKDIR}"
+
+src_install() {
+	local files=( ${A} )
+	insinto /usr/share/openpgp-keys
+	newins - linuxcontainers.asc < <(cat "${files[@]/#/${DISTDIR}/}" || die)
+}
diff --git a/app-crypt/openpgp-keys-miniupnp/Manifest b/app-crypt/openpgp-keys-miniupnp/Manifest
new file mode 100644
index 000000000000..acd5476d102e
--- /dev/null
+++ b/app-crypt/openpgp-keys-miniupnp/Manifest
@@ -0,0 +1,4 @@
+DIST A31ACAAF.asc 3139 BLAKE2B 4574c3f37965fafa4e2d703276a585d1f17b0da862042620681bac591062b3b70c52cbe5481da543d3c3193a640c06e9d86c3cef1568ae3a3f62901a6ad200ab SHA512 ecad52850fdcc7c21bab81917b3cea85c48b751534427d3db5750c43cbce73916ec4879e4f5535d4b87b7eca927ad249e384c5597702a0052afa89c23c5719b9
+DIST A5C0863C.asc 3098 BLAKE2B fdbc8629fd462b9cc72c568b0af5607951055abc03a1e344e4c1b411fb87bfa285c2e29d2781f9e9b02ec0bc63eacf55e5dc19198056a417ba3358dba445cc0c SHA512 adebff655374dbc8a045f9ab148f9fc343b043e80cb7e4e14c66aa56bfb2f0f5521e294c7600ca708893efc84679f788116d82ef5818370f1425f03dea0a77b9
+EBUILD openpgp-keys-miniupnp-20201006.ebuild 573 BLAKE2B 6f4cc75f4781def1e922bb970c337eccc7335165d7d5bccbd67d26b4a2fd2a6d3771f3088c2b651a0e531aca3fb6303d451657c1332b019666530efee7b36b43 SHA512 1c18c481a8736141dd0b77df9375a5caf36b8d0829fc840e94c5e3a148dc7b69175967e63c89d633cd77f0d86239435b7b21a0172cf2c29b6ffe28d2832f3dbd
+MISC metadata.xml 271 BLAKE2B 21ff27fce9fb36fa286e0cb5324edaf0721e2315d14456c837330d40dabd66369da85b94fc33169ae0caf233d634dd6fd2c29c37c0a78e38307e4adc134381ae SHA512 fa6aa60030292b6236a4b68b26095c3eea1b8dc1decc2be6b36ebb33979c52c39915e6169bfb54ad6f3a8380b1decc23d62f079b134484d97587ab64aa2e1663
diff --git a/app-crypt/openpgp-keys-miniupnp/metadata.xml b/app-crypt/openpgp-keys-miniupnp/metadata.xml
new file mode 100644
index 000000000000..5a5a3aaf4299
--- /dev/null
+++ b/app-crypt/openpgp-keys-miniupnp/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+	<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-crypt/openpgp-keys-miniupnp/openpgp-keys-miniupnp-20201006.ebuild b/app-crypt/openpgp-keys-miniupnp/openpgp-keys-miniupnp-20201006.ebuild
new file mode 100644
index 000000000000..4b07eeca6024
--- /dev/null
+++ b/app-crypt/openpgp-keys-miniupnp/openpgp-keys-miniupnp-20201006.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="OpenPGP keys used to sign miniupnp* packages"
+HOMEPAGE="http://miniupnp.free.fr/files/"
+SRC_URI="
+	http://miniupnp.free.fr/A31ACAAF.asc
+	http://miniupnp.free.fr/A5C0863C.asc
+"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+
+S=${WORKDIR}
+
+src_install() {
+	local files=( ${A} )
+	insinto /usr/share/openpgp-keys
+	newins - miniupnp.asc < <(cat "${files[@]/#/${DISTDIR}/}")
+}
diff --git a/app-crypt/openpgp-keys-voikko/Manifest b/app-crypt/openpgp-keys-voikko/Manifest
new file mode 100644
index 000000000000..f3d691476c70
--- /dev/null
+++ b/app-crypt/openpgp-keys-voikko/Manifest
@@ -0,0 +1,3 @@
+DIST 4AE3942E.asc.html 5476 BLAKE2B 22b3acf6d4360b1686890596e7c8de2a3a38e739aa0ea4ae7fa7e09295127c7196f5af5750bd30d5260365206e08397e3bda970a4b7cdfb2d0827f80f2810758 SHA512 025bafbfe98e2437a3919f4651e7583a5fccd60ff110904189969ce5fe1770ed4222c60a530065b7720a0e233d1a138b55cd7df4c8f28337b9e953547434429c
+EBUILD openpgp-keys-voikko-20201013.ebuild 636 BLAKE2B 75730a6ad9788b46c73ab33a406d09f148be98b3d80cffd89e0ddfadedbe5ccd1e7e02083351ce4fcf6c10f41aed2f911ad8dcac890b3f0a5df372e456240538 SHA512 1586c99910475426dc12a022e0499272d11dfed50c5ba81ebc82fac2ce55e7070ae685c4f719394a50d34e4f9605644795782afa0199af02ab91f8c5d9eb6475
+MISC metadata.xml 254 BLAKE2B 938f68b7b21ad386a35540a09e4bb956e241dfc963d4823c3c0cd46d3449ff4fb5a1cead67ad7c35a460503d30bdbde35822535f1c2d46f2939ee190f328b846 SHA512 26047ebb40fc49bfb4393121c5c5af69caee617a1d75676be84b0f5af75564828aeeef4503c7681eaaf7e48f6c662574874336296c18e002dca8e925162a1d4c
diff --git a/app-crypt/openpgp-keys-voikko/metadata.xml b/app-crypt/openpgp-keys-voikko/metadata.xml
new file mode 100644
index 000000000000..6b0a0fb3a729
--- /dev/null
+++ b/app-crypt/openpgp-keys-voikko/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>juippis@gentoo.org</email>
+    <name>Joonas Niilola</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-crypt/openpgp-keys-voikko/openpgp-keys-voikko-20201013.ebuild b/app-crypt/openpgp-keys-voikko/openpgp-keys-voikko-20201013.ebuild
new file mode 100644
index 000000000000..3b026f706808
--- /dev/null
+++ b/app-crypt/openpgp-keys-voikko/openpgp-keys-voikko-20201013.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="OpenPGP keys used to sign voikko* packages"
+HOMEPAGE="https://voikko.puimula.org/"
+SRC_URI="http://keys.gnupg.net/pks/lookup?op=get&search=0x3D309B604AE3942E -> 4AE3942E.asc.html"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+
+S="${WORKDIR}"
+
+src_install() {
+	insinto /usr/share/openpgp-keys
+	newins - voikko.asc < <(awk '/-----BEGIN PGP PUBLIC KEY BLOCK-----/,/-----END PGP PUBLIC KEY BLOCK-----/' ${DISTDIR}/4AE3942E.asc.html || die)
+}
diff --git a/app-crypt/ophcrack/Manifest b/app-crypt/ophcrack/Manifest
index c22f3c860e41..fa7a9ff24e89 100644
--- a/app-crypt/ophcrack/Manifest
+++ b/app-crypt/ophcrack/Manifest
@@ -1,4 +1,4 @@
 AUX ophcrack-ar.patch 242 BLAKE2B f268c2a0c0900c3ea6a3e4fc1c99530a090e413fbba9e4ff7c339ae6b5db49ad546eb58cd42a64f81d669c38ed9a4de25cfcfb29ee17af1c88b4372aee4fda51 SHA512 bb4f8154abe676ccec48536b50513b45253828334db040f28fe71e5b9d3d7abb6b34693ec234f10ce8c26592d07ccdd678a68b96b6a80ca9137c18a9e0598bfc
 DIST ophcrack-3.8.0.tar.bz2 293033 BLAKE2B f20bf79d5cafffaab0667b073e8d9dbcfbae0a16f4139b6304c3f6fc80a24f6ca673db9cd53e28ff277ec35821539f3960265aa28467795e25c45049acca3f31 SHA512 c66276b72299744d3e0c9fc14220c7f568e383bd324c1ede228bda5d51da78db817388421c9f5f8cd2f18687e7e53cfb0c65bcc0354b3d55ac16324c61f62dbd
-EBUILD ophcrack-3.8.0.ebuild 939 BLAKE2B 437e2f298f7855b67748e9f0ecd82f901ad9eead6423f561ae83953b83065ba1b51bd13da7c994510295ce39aaf193bf3a51f1848cfd03278768bbd3eb281b22 SHA512 e91c9d5589133065b764d41d7701f4ba7b962071ba2da7dc81dc6f3e62b6c75bb61413f1f60e65d7ffc39065950cecef6b0319619cfd8203be9b52e34195f323
+EBUILD ophcrack-3.8.0.ebuild 882 BLAKE2B 98a0bf51f95e19d284ebc9a3a56fed37b9db7f9d04951498610d606896bae03ae5da9e0f4c18bdaeb26664e585f4e9eeec656433b45dd3d71fe9d00aa3c79809 SHA512 19321484299030303e4e64433d3609d3155f823f4055b760f9668c3a5f3d14cfd48e50c028d20f361d1b1d1ff55add6ae7c5e134255d938449fe3e195d7b25b7
 MISC metadata.xml 474 BLAKE2B 06c67b21ed59a24074d06b4003873ef05bc4ef8632d4602e3ac5f0956698c40e8a7662b6aeddb7bea28055ed03e27900a3fe4f692d765cb25ba5d9c3ca62722e SHA512 3381c3cb01e39377a085137392802e0666cd4dd421cdcda2db6af2cae01d7b0a7319886699d99553b9a4aed732b402d923c51a0b053cfa564d2228de605991e3
diff --git a/app-crypt/ophcrack/ophcrack-3.8.0.ebuild b/app-crypt/ophcrack/ophcrack-3.8.0.ebuild
index c35c0f3c154c..02782e377781 100644
--- a/app-crypt/ophcrack/ophcrack-3.8.0.ebuild
+++ b/app-crypt/ophcrack/ophcrack-3.8.0.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
-inherit eutils
+EAPI=7
+
+inherit desktop toolchain-funcs
 
 DESCRIPTION="A time-memory-trade-off-cracker"
 HOMEPAGE="http://ophcrack.sourceforge.net/"
@@ -13,32 +14,34 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug libressl qt5 +tables"
 
-CDEPEND="!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-		net-libs/netwib
-		qt5? ( dev-qt/qtcharts:5
-		dev-qt/qtgui:5 )"
-DEPEND="app-arch/unzip
-		virtual/pkgconfig
-		${CDEPEND}"
-RDEPEND="tables? ( app-crypt/ophcrack-tables )
-		${CDEPEND}"
-PATCHES=("${FILESDIR}/ophcrack-ar.patch")
+DEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	net-libs/netwib
+	qt5? (
+		dev-qt/qtcharts:5
+		dev-qt/qtgui:5
+	)"
+RDEPEND="
+	${DEPEND}
+	tables? ( app-crypt/ophcrack-tables )"
+BDEPEND="
+	app-arch/unzip
+	virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/ophcrack-ar.patch )
 
 src_configure() {
+	tc-export AR
 
-	local myconf
-
-	myconf="$(use_enable debug)"
-	myconf="${myconf} $(use_enable qt5 gui)"
-
-	econf ${myconf}
+	econf \
+		$(use_enable debug) \
+		$(use_enable qt5 gui)
 }
 
 src_install() {
-	emake install DESTDIR="${D}"
+	default
 
-	cd "${S}"
 	newicon src/gui/pixmaps/os.xpm ophcrack.xpm
 	make_desktop_entry "${PN}" OphCrack ophcrack
 }
diff --git a/app-crypt/pius/Manifest b/app-crypt/pius/Manifest
index 89c0e55ada19..485167bed922 100644
--- a/app-crypt/pius/Manifest
+++ b/app-crypt/pius/Manifest
@@ -1,3 +1,7 @@
+AUX pius-3.0.0-Fix-typo-in-readme-135.patch 710 BLAKE2B 951a06c334e55d738fbb966d8f503879bad65c998db53ea28fb125f2b493ae36fb079bb575ffe8e67107c661c6fc0b39454d488b38d194e473cf1629189017ac SHA512 94f7683eb6834931f2aff1c6f2a7b7f19355c41709b5e408731f87e43af82f07d36fab1c5d0bb5b999496189d852c9c793ce75d2b0bef18bd88ce237f8824ef4
+AUX pius-3.0.0-Fix-typos-132.patch 1277 BLAKE2B 8c35c09224472a7a1b1c4deabe0df91681e932ca43a321a221ea2d9c68c233b198061ca2749c97419d6a7da92a732d26bc91fd547cf64e11821c6c741aebd276 SHA512 8fee32a40f2211892c9f2e642aceb98aeeffae3f323cb98c155192fa81c99ca43402636eb14eb5b07afe5ec0c6bf23b0f13d53699281d4b1283f69f992b9ca39
+AUX pius-3.0.0-Minor-fixes-for-pius-report-137.patch 2744 BLAKE2B bf738bdf20e33d547ba149f25eaeef01c24471c4f5472dbece4ad5e72446ede919cac5351096f8796f3d67f13a0258dab45b4648e2bdba2a0e33dac1a844078d SHA512 4978309350025e818e8950dde21509b3a2feba5dd650720ca83b00e23cff93926c3f35eab028a15ef69750c619fcb23d62ef910e89e57a4f8072923316d4146f
+AUX pius-3.0.0-pius-keyring-mgr-Fix-constants-134.patch 1909 BLAKE2B 60440079520ff12664c89fa42a0ee4cdf9fa5f9a69fa6293f5eaf3fd9a438a669aa50b84ac78701f6ae91c67486588c5403ac89bc08b32697c1550b513ebfe08 SHA512 faf77cf23cb1e2e7b214e70dc955e8683f08195175228e299955bcf4eae07c5fd147959a0f526be42960df2607deed9ac3f15e4abac0484d415fe2acaf4b3ef7
 DIST pius-3.0.0.tar.bz2 46643 BLAKE2B 18abe6a93bd719adf50fa4bcbf5128845d732b598d611e716a536f78f4930e6e63e7f60d7444775fbc32072935c13b1828377a9e843114255a4101f4e3199f98 SHA512 0c906574ac703f45e3318ae3e7994fe6580fd172849b2956d9084033d6fbfd69fec942b95bc2edadadc223fa0685ff0b9799ad03570b712b9cdb09d69491cc91
-EBUILD pius-3.0.0.ebuild 655 BLAKE2B 5b122560970340facc2c025cd8fc591d3c3def90aacec82d3eaa392e2af4e0891be3eb17389f00d9368e0e8ac5f9f0f2d1cddf0c3df19c056230dbdb7f9afcac SHA512 b709be3e97e9cf34062199d6d741e6d78b9831f4957f30687acfadd6a0ee1513883a9d943b40ca193051123da797809984c368eb7540ab50196fa231ea323ad7
+EBUILD pius-3.0.0-r1.ebuild 881 BLAKE2B 49da67451d2eecccb913bbffe6d400e6b574d7e16837a17e2e776d0edca819afdca3a183253f6b7bac81ec335596f6aca0b00b4ceae0810e871ae9618ae24d0a SHA512 13582927c814841cda11292df244aef949344a1d200d1293fb796aa590a186c5b9c0047ccac3d5b33f9005ded41cd0a9106f094aa5ed8d01260c1e8d3a4a9612
 MISC metadata.xml 822 BLAKE2B 5dc5796afbb5b5e3f070db3884adc17d0e6e73c568bd747d1ae5585416219305a48d3a7d53bd3f30761262b232e737e1f6633c7ba1dc0834cd95b3fe50b903cc SHA512 49833d454ceb01c9af3010643ba78da1c49152e2502a522fadcc13ce83e9e26f2bf24cc6b06c88cee42f1ee15ab5a18e8d3bf50b3e18b0bde7d1d64fa2211fcc
diff --git a/app-crypt/pius/files/pius-3.0.0-Fix-typo-in-readme-135.patch b/app-crypt/pius/files/pius-3.0.0-Fix-typo-in-readme-135.patch
new file mode 100644
index 000000000000..bc67e97950b2
--- /dev/null
+++ b/app-crypt/pius/files/pius-3.0.0-Fix-typo-in-readme-135.patch
@@ -0,0 +1,25 @@
+From 5f24833c50ac6d831c03309e9bbb6b62224ac0ac Mon Sep 17 00:00:00 2001
+From: Ross Smith II <ross@smithii.com>
+Date: Mon, 9 Mar 2020 16:45:29 -0700
+Subject: [PATCH] Fix typo in readme (#135)
+
+---
+ README.md | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/README.md b/README.md
+index 3ead858..4cb98ce 100644
+--- a/README.md
++++ b/README.md
+@@ -91,7 +91,7 @@ docs](https://support.google.com/accounts/answer/185833?hl=en).
+ ## Other Platforms
+ 
+ On non-UNIX platforms such as MacOS and Windows, the default gpg path will
+-likley be incorrect, so you'll want to use `-b` to specify the path.
++likely be incorrect, so you'll want to use `-b` to specify the path.
+ 
+ 
+ ## Config File
+-- 
+2.29.2
+
diff --git a/app-crypt/pius/files/pius-3.0.0-Fix-typos-132.patch b/app-crypt/pius/files/pius-3.0.0-Fix-typos-132.patch
new file mode 100644
index 000000000000..ed03995d34c2
--- /dev/null
+++ b/app-crypt/pius/files/pius-3.0.0-Fix-typos-132.patch
@@ -0,0 +1,43 @@
+From 6a92664fe0cfacffb03e6f3312c1c5fb4d785297 Mon Sep 17 00:00:00 2001
+From: Maxim Baz <github@maximbaz.com>
+Date: Sat, 5 Oct 2019 23:52:17 +0200
+Subject: [PATCH] Fix typos (#132)
+
+---
+ pius | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/pius b/pius
+index 7cf09b5..cc2333b 100755
+--- a/pius
++++ b/pius
+@@ -25,7 +25,7 @@ from optparse import OptionParser
+ 
+ from libpius import mailer as pmailer
+ from libpius import signer as psigner
+-from libpius.util import PiusUtil, MyOption
++from libpius.util import PiusUtil, MyOption, check_email
+ from libpius.constants import (
+     DEFAULT_GPG_PATH,
+     DEFAULT_KEYRING,
+@@ -61,7 +61,7 @@ def check_options(parser, options, args):
+ 
+     if options.debug == True:
+         print("Setting debug")
+-        util.DEBUG_ON = True
++        PiusUtil.DEBUG_ON = True
+ 
+     if not os.path.exists(options.gpg_path):
+         parser.error("GnuPG binary not found at %s." % options.gpg_path)
+@@ -288,7 +288,7 @@ def main():
+         )
+         if ans in ("y", "Y", "yes", "YES", "Yes"):
+             ans = input("What email address should we send from? ")
+-            util.check_email(parser, "-m", ans)
++            check_email(parser, "-m", ans)
+             options.mail = ans
+             print()
+ 
+-- 
+2.29.2
+
diff --git a/app-crypt/pius/files/pius-3.0.0-Minor-fixes-for-pius-report-137.patch b/app-crypt/pius/files/pius-3.0.0-Minor-fixes-for-pius-report-137.patch
new file mode 100644
index 000000000000..c77f26649ce6
--- /dev/null
+++ b/app-crypt/pius/files/pius-3.0.0-Minor-fixes-for-pius-report-137.patch
@@ -0,0 +1,78 @@
+From 19b61c3b0dc31ee60341b3ca708f8e459e44ce3f Mon Sep 17 00:00:00 2001
+From: Phil Dibowitz <phil@ipom.com>
+Date: Mon, 23 Mar 2020 08:57:09 -0700
+Subject: [PATCH] Minor fixes for pius-report (#137)
+
+Signed-off-by: Phil Dibowitz <phil@ipom.com>
+---
+ libpius/mailer.py | 2 +-
+ pius-keyring-mgr  | 4 +++-
+ pius-report       | 5 +++--
+ 3 files changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/libpius/mailer.py b/libpius/mailer.py
+index ba6b50a..f5b097f 100644
+--- a/libpius/mailer.py
++++ b/libpius/mailer.py
+@@ -403,7 +403,7 @@ class PiusMailer:
+                 # BCC the user...
+                 env_to = [msg["To"], self.mail]
+ 
+-            smtp.sendmail(self.mail, env_to, msg.as_string())
++            smtp.sendmail(self.mail, env_to, msg.as_string().encode('utf-8'))
+             smtp.quit()
+         except smtplib.SMTPException as emsg:
+             raise MailSendError(emsg)
+diff --git a/pius-keyring-mgr b/pius-keyring-mgr
+index fb0b46a..ec3528a 100755
+--- a/pius-keyring-mgr
++++ b/pius-keyring-mgr
+@@ -1,4 +1,5 @@
+ #!/usr/bin/env python3
++
+ """A utility to create and manage party keyrings."""
+ 
+ # vim:tw=80:ai:tabstop=4:expandtab:shiftwidth=4
+@@ -446,7 +447,7 @@ class KeyringBuilder:
+     # stolen from pius
+     def get_all_keyids(self, sort_keyring):
+         """Given a keyring, get all the KeyIDs from it."""
+-        util.debug("extracting all keyids from keyring")
++        util.debug("extracting all keyids from keyring, sort: %s" % sort_keyring)
+         extra_opts = GPG_QUIET_OPTS + self.AUTO_OPTS + ["--fixed-list-mode"]
+         cmd = self.basecmd + extra_opts + ["--fingerprint"]
+         util.logcmd(cmd)
+@@ -776,6 +777,7 @@ before distributing they keyring.
+     prune.add_option(
+         "--no-sort-keyring",
+         dest="sort_keyring",
++        default=True,
+         action="store_false",
+         help="Do not sort the keyring by name.",
+     )
+diff --git a/pius-report b/pius-report
+index 47f57b5..744da35 100755
+--- a/pius-report
++++ b/pius-report
+@@ -15,7 +15,8 @@ from optparse import OptionParser
+ from libpius import mailer as pmailer
+ from libpius import signer as psigner
+ from libpius.util import PiusUtil, MyOption
+-from libpius.constants import DEFAULT_GPG_PATH, UID_RE, GPG_MIN_OPTS
++from libpius.constants import DEFAULT_GPG_PATH, UID_RE, GPG_MIN_OPTS, \
++    GPG_BASE_OPTS
+ from libpius.exceptions import MailSendError
+ from libpius.state import SignState
+ 
+@@ -401,7 +402,7 @@ Generated by PIUS Report BETA (http://www.phildev.net/pius/).
+ 
+ def refresh_keys(gpg, keys):
+     cmd = [gpg] + GPG_MIN_OPTS + ["--refresh-keys"] + keys
+-    PiusPiusUtil.logcmd(cmd)
++    PiusUtil.logcmd(cmd)
+     gpg = subprocess.Popen(cmd, stdout=subprocess.PIPE, close_fds=True)
+     gpg.wait()
+ 
+-- 
+2.29.2
+
diff --git a/app-crypt/pius/files/pius-3.0.0-pius-keyring-mgr-Fix-constants-134.patch b/app-crypt/pius/files/pius-3.0.0-pius-keyring-mgr-Fix-constants-134.patch
new file mode 100644
index 000000000000..20c43fcbdca4
--- /dev/null
+++ b/app-crypt/pius/files/pius-3.0.0-pius-keyring-mgr-Fix-constants-134.patch
@@ -0,0 +1,58 @@
+From f54adce7ba47ad8882441aec3b0583ee788ea8e1 Mon Sep 17 00:00:00 2001
+From: Phil Dibowitz <phil@ipom.com>
+Date: Tue, 4 Feb 2020 09:33:40 -0800
+Subject: [PATCH] [pius-keyring-mgr] Fix constants (#134)
+
+The refactor of the code meant these constants are now in the
+constants module, not in self.
+
+Fixes #133
+
+Signed-off-by: Phil Dibowitz <phil@ipom.com>
+---
+ pius-keyring-mgr | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/pius-keyring-mgr b/pius-keyring-mgr
+index 1daddeb..fb0b46a 100755
+--- a/pius-keyring-mgr
++++ b/pius-keyring-mgr
+@@ -28,6 +28,8 @@ from libpius.constants import (
+     GPG_BASE_OPTS,
+     GPG_QUIET_OPTS,
+     GPG_FD_OPTS,
++    FP_RE,
++    FIXFP_RE,
+ )
+ 
+ BADKEYS_RE = re.compile(r"00000000|12345678|no pgp key")
+@@ -143,10 +145,10 @@ class PiusParser:
+     def parse_flatfile(self, filename):
+         with open(filename, "r") as fd:
+             contents = fd.read()
+-        matches = self.FP_RE.findall(contents)
++        matches = FP_RE.findall(contents)
+         keys = []
+         for match in matches:
+-            flatfp = self.FIXFP_RE.sub("", match)
++            flatfp = FIXFP_RE.sub("", match)
+             keyid = flatfp[-8:]
+             keys.append(
+                 {
+@@ -199,11 +201,11 @@ class PiusParser:
+                         tmp["key"] = match
+                         keys.append(tmp)
+                     continue
+-                matches = self.FP_RE.findall(decoded)
++                matches = FP_RE.findall(decoded)
+                 if matches:
+                     for match in matches:
+                         num_fps = num_fps + 1
+-                        fp = self.FIXFP_RE.sub("", match)
++                        fp = FIXFP_RE.sub("", match)
+                         keyid = keyid_from_fp(fp)
+                         tmp = data.copy()
+                         tmp.update({"fingerprint": fp, "keyid": keyid})
+-- 
+2.29.2
+
diff --git a/app-crypt/pius/pius-3.0.0.ebuild b/app-crypt/pius/pius-3.0.0-r1.ebuild
index f7f3745afd4d..b370b3651829 100644
--- a/app-crypt/pius/pius-3.0.0.ebuild
+++ b/app-crypt/pius/pius-3.0.0-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit distutils-r1
 
@@ -22,6 +22,13 @@ DEPEND=">=app-crypt/gnupg-2.0.0"
 RDEPEND="${DEPEND}
 	dev-lang/perl"
 
+PATCHES=(
+  "${FILESDIR}/${P}-Fix-typos-132.patch"
+  "${FILESDIR}/${P}-pius-keyring-mgr-Fix-constants-134.patch"
+  "${FILESDIR}/${P}-Fix-typo-in-readme-135.patch"
+  "${FILESDIR}/${P}-Minor-fixes-for-pius-report-137.patch"
+)
+
 python_test() {
 	${EPYTHON} -m unittest discover -s test/* -v || die
 }
diff --git a/app-crypt/rainbowcrack/Manifest b/app-crypt/rainbowcrack/Manifest
index e8adcc138c32..c9180c615de2 100644
--- a/app-crypt/rainbowcrack/Manifest
+++ b/app-crypt/rainbowcrack/Manifest
@@ -1,3 +1,5 @@
 DIST rainbowcrack-1.7-linux64.zip 208726 BLAKE2B 842e0a3ee74a8576a5331cc86259178b382e82f465f3093e7d1fa1b44907c1c30a73f53c2f7f527e052bc6266ceffd350c42b9b80b1298072a02c0cbd25e660d SHA512 068fe9d31004e08c0fcbe5a11500bd6248eca2f204a8d99a7343824ebc1dd847a01eb459f28d77fdd84eae98b05169a69e10b8893b9b5dd027381965c19b7bdb
+DIST rainbowcrack-1.8-linux64.zip 220109 BLAKE2B 164894ccb07490756a0c9b297b1497d6305fade66b31fd712914261219dd957632cd285ab2e7ad7a683dd3c0a425eb1969676ea23136abf7d688fcde9e445e74 SHA512 84dbf3431605fb5dcc8e7cd305a43e9b239ebd6e5ef120edd951a3180c38498fe3a26157e3b55d114c6630f8ac1382a610d8e6230779c5b12cbc42c04e9aff57
 EBUILD rainbowcrack-1.7.ebuild 956 BLAKE2B da85a6de2ef97fc102845d75dd9050bf637377e0595d84f740421af4eb2ea62a78026c7800daf8ae90d8a3afbdc39d1531b42a23e51bf589ba7297cc810fc5c3 SHA512 c376de0e154c1c619e06004a4711c6039ce3b40b88b594d281111875bcf20690452c73bee8c8bf3c246df354e870ea31ce4827b3e70b43c073b38b187c0c36ff
+EBUILD rainbowcrack-1.8.ebuild 1447 BLAKE2B 136fb973a83d3b650ffacf3b6146a3ebb8fac7c7e827b5251dc2c976138a6d2e5412217de34c2febf35956143abb3e19dbdad591cb2ef9e1fd20b913a431656d SHA512 d6d354c4660bc52ad1e3d2a8d3843b58590a61edc81c890485106c8a7d333286b8f99c5da4302f0802859d26111eb320e5e03480186f0dbccecf12a4c91a681c
 MISC metadata.xml 987 BLAKE2B 7976cc9d563bcec84a2f9e6ebc2865be112d9d6fbe3cd55cea9a5864adfc0548c77b9637085bc08f29ea70bb684a31925e659be1f48c6f6d160bb630c42ea945 SHA512 1b809cb5ae08e6309dd50d3925eaedfe7a72549dd75a2656d46afee1130bef798e290906fdc4228c4da87f4db61e3e8cd7da8939a63bdcbf1d1dad7b537a824c
diff --git a/app-crypt/rainbowcrack/rainbowcrack-1.8.ebuild b/app-crypt/rainbowcrack/rainbowcrack-1.8.ebuild
new file mode 100644
index 000000000000..7a4aba0ea140
--- /dev/null
+++ b/app-crypt/rainbowcrack/rainbowcrack-1.8.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit wrapper
+
+DESCRIPTION="Hash cracker that precomputes plaintext - ciphertext pairs in advance"
+HOMEPAGE="https://project-rainbowcrack.com/"
+SRC_URI="https://project-${PN}.com/${P}-linux64.zip"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+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
+)
+
+S="${WORKDIR}"/${P}-linux64
+
+# rainbowcrack-1.8 zipfiles, including the ones for Linux, use backslashes as path separators.
+# unzip handles it just fine but produces a warning, the side effect of which is that it exits
+# with code 1 rather than 0.
+# Don't bother with iterating over A, we already assume the file to be a .zip so we might as well
+# assume there is only one.
+src_unpack() {
+	unzip -qo "${DISTDIR}/${A}"
+	local unzip_retval="${?}"
+	case "${unzip_retval}" in
+		0|1)
+			;;
+		*)
+			die "Failed to unpack the source archive"
+			;;
+	esac
+}
+
+src_install() {
+	einstalldocs
+
+	local bin bins="
+		rcrack
+		rt2rtc
+		rtc2rt
+		rtgen
+		rtmerge
+		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/rotix/Manifest b/app-crypt/rotix/Manifest
index 73829a825603..6aa1bed9e8d8 100644
--- a/app-crypt/rotix/Manifest
+++ b/app-crypt/rotix/Manifest
@@ -1,6 +1,5 @@
 AUX 0.83-respect-CFLAGS-and-dont-strip.patch 623 BLAKE2B 62cff4d1566fbb9263142404e495de64c8fa5cca8c1a1b4319a7d677ed930c02a6147e71f90f9a9ff0be4e80049c8540148191df170d7124be62f43c1d2c5515 SHA512 1b1fab8bdcfac682d0927075a0614ae888a1b23382ce8484b2ab9eac316f46a907bbd872615553201c5ccbf1d8f677491612956075bffacced0d408defad9e07
 AUX rotix-0.83-interix.patch 252 BLAKE2B 319f34ee0d874d5a608259d4fd3f018ec085ec28f96b8a620b4b1606b844acec7d3b665e62b5c032bbe2d928f924d1dcbc519628a8ccde9e0ac259be2f485871 SHA512 4c3862c22fb6c39f8f9653d7415414f28c31f91eeac284fa277c2527abe0a4d549f1eda141a5409b9ba171bbab3c4a2b9c66ecf438413e542682a85b2c549b8c
-AUX rotix-0.83-locale.diff 256 BLAKE2B a7564979a38ff517bbe0592ba12e2aab92c44fc828180c2587ec4b5db3acf4ffbf71feba959625faf93b9fd997d39c9330e4255e8c875bbc1653b66fe140e1c9 SHA512 7b8c82bac78c48f5d43c0246c41e7a7910f0119cc7b56500789d722d87f00e9d2356150063e07ae281435d5af60f9e15956c5bc0b236ea5f225435886117c4b0
 AUX rotix-0.83-locale.patch 206 BLAKE2B 98f179037eaebee3ca2c1f41d543dba29fc61209518b3abec238473a38da0d3140aed50ed5a33ed1d0656336df2f3a236cd0f8ced9f0795d807710f1978f881f SHA512 caa6430c0bf96fccae2547524c7eb81170e27ef2adb054671db0f1d8f88ed6a4960b827d1781af4adbf5216c00e007a48071b1b4237f5a691bd46e45bbd599a0
 DIST rotix-0.83.tar.gz 15412 BLAKE2B 4a0db309fa23af3e15a63263e40a2b27e2ebf1e0cf162f2776ebd5237621207eee3a41374170c2e0441104704bde4aff8f929fc5ad8994dfcf4fd1cb5a461696 SHA512 bffe527714f35a99f3322e87d1e2fcbafd38f3a7677e2ca816988df2ce1567ce064f0ab7a543fab3dc2d73f148675fe069c398a5d9c7bb285cb6b1658c3fbffb
 EBUILD rotix-0.83-r1.ebuild 825 BLAKE2B 9da93ce9ab9307d21a9e91529fdf5b87a0b7307b3f0b682f4c714f12e631d57aac40adaf1e5e7311608a848aa41bd4fa5f49a704dc5902cde844ce82a728a6d7 SHA512 0733a1481af75bbd68d0d7da07f2f779397a0ab764699ff577d8d74ae87d62950b39ee765ab818b40c249d321ea58aa5d9c60d02691b9e372d771a7b77f80e9d
diff --git a/app-crypt/rotix/files/rotix-0.83-locale.diff b/app-crypt/rotix/files/rotix-0.83-locale.diff
deleted file mode 100644
index 844a452b8af1..000000000000
--- a/app-crypt/rotix/files/rotix-0.83-locale.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- rotix.c	2002-04-02 14:48:42.000000000 -0500
-+++ rotix.c.mine	2010-07-15 14:54:45.000000000 -0400
-@@ -38,6 +38,7 @@
- /* I18N */
- #ifdef I18N
- #include <libintl.h>
-+#include <locale.h>
- #define _(String) gettext (String)
- #else
- #define _(String) String
diff --git a/app-crypt/sbsigntools/Manifest b/app-crypt/sbsigntools/Manifest
index a0db801b8460..b1e8d2368669 100644
--- a/app-crypt/sbsigntools/Manifest
+++ b/app-crypt/sbsigntools/Manifest
@@ -1,5 +1,3 @@
-AUX 0002-image.c-clear-image-variable.patch 822 BLAKE2B acb775f625ecd081d9b3d7e497b066218e82d2dc13f80c473c25361dc85098ee15e5f14530334e47c33fe7cc9b2349ffb1aaba7abe4fdd33bfdde05ed9191c39 SHA512 004ba118cbe8fe5cc291888966e5994373c0b9d8149bc5c652a72971138fab5e64d721061c69e8b864d6ca5cdb4ffa193520156941b6bd9c998b256f8d72697b
-AUX 0003-Fix-for-multi-sign.patch 1452 BLAKE2B eaa6e39c18d13f3819d5852eda27eb5a8d589241224965392f1b1e067b5cb9ff0ece7fa83697e5fb6f5f8dd0acec15b7bbe57fcd5f761fcb2e8e1fc51193641f SHA512 2aba55a116536e7f41e4aac2fd33eeb92cf89b14bcdd8b93b6e9dc9bdaf2f0162134e56f7d365640445bf801ad8590f6d49f14cdf80b791324647067d52ae435
 AUX sbsigntools-0.9.1-openssl-1.1.0-compat.patch 4727 BLAKE2B 3b47c8086220cf12778bf5cd6018627a30ea349677eeb2cfcd1eaa1b83a25d39499ab21a1a123181a51f4138624c17e574050216f59c480e38d9774936f8b6f0 SHA512 6946e1d67161345088aee3ab54129b6e904b6008f2b275ab4eb55ed24fb2b866029f7d7ca856c5dfe76c395580f04709ad1be974369a1b4954b9e87cf812fd4b
 DIST sbsigntool-0.8-ccan.tar.gz 113537 BLAKE2B 8fbf27463d30c1895930628a145be2d521ae4f6adb7af3299bf2f5f4319fd643df0a07347ef6851bd41d233af4c3fc5f77002771af1c43aa0f20665aef2390b8 SHA512 6857096879f116f1802eb6b44789cbea7bb24440bc0f16503aeadf5f276fa45943f322f844dbb9abee717655205d82b830143be3a7f4424fd4146b9360674a09
 DIST sbsigntools-0.9.1.tar.gz 56497 BLAKE2B 22791bd4b490f36963a19e82da3ce7b93a56d948bf44d1ffdb62fa3291a3f815b2c19d68f9180b607c2b1438f656367ec1f9002f0b1225734d16a9aadc6d20ec SHA512 ae16232327c098bbc60a9701185d856d851cb7fa8f62be64d3c8f75c8b274b8521fcc4212226189def05db980690878ee6ac9a9b418166c92442aaf35e790d29
diff --git a/app-crypt/sbsigntools/files/0002-image.c-clear-image-variable.patch b/app-crypt/sbsigntools/files/0002-image.c-clear-image-variable.patch
deleted file mode 100644
index dfe183e66cd2..000000000000
--- a/app-crypt/sbsigntools/files/0002-image.c-clear-image-variable.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 21e984fa9d93a760cc03f5d9d13d023809227df2 Mon Sep 17 00:00:00 2001
-From: James Bottomley <JBottomley@Parallels.com>
-Date: Thu, 11 Apr 2013 21:12:17 -0700
-Subject: image.c: clear image variable
-
-Not zeroing the image after talloc occasionally leads to a segfault because
-the programme thinks it has a signature when in reality it just has a junk
-pointer and segfaults.
-
-Signed-off-by: James Bottomley <JBottomley@Parallels.com>
----
- src/image.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/image.c b/src/image.c
-index cc55791..10eba0e 100644
---- a/src/image.c
-+++ b/src/image.c
-@@ -401,6 +401,7 @@ struct image *image_load(const char *filename)
- 		return NULL;
- 	}
- 
-+	memset(image, 0, sizeof(*image));
- 	rc = fileio_read_file(image, filename, &image->buf, &image->size);
- 	if (rc)
- 		goto err;
--- 
-1.8.2.1
-
diff --git a/app-crypt/sbsigntools/files/0003-Fix-for-multi-sign.patch b/app-crypt/sbsigntools/files/0003-Fix-for-multi-sign.patch
deleted file mode 100644
index f42c69616d13..000000000000
--- a/app-crypt/sbsigntools/files/0003-Fix-for-multi-sign.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From e58a528ef57e53008222f238cce7c326a14572e2 Mon Sep 17 00:00:00 2001
-From: James Bottomley <JBottomley@Parallels.com>
-Date: Mon, 30 Sep 2013 19:25:37 -0700
-Subject: [PATCH 4/4] Fix for multi-sign
-
-The new Tianocore multi-sign code fails now for images signed with
-sbsigntools.  The reason is that we don't actually align the signature table,
-we just slap it straight after the binary data.  Unfortunately, the new
-multi-signature code checks that our alignment offsets are correct and fails
-the signature for this reason.  Fix by adding junk to the end of the image to
-align the signature section.
-
-Signed-off-by: James Bottomley <JBottomley@Parallels.com>
----
- src/image.c | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/src/image.c b/src/image.c
-index 10eba0e..519e288 100644
---- a/src/image.c
-+++ b/src/image.c
-@@ -385,7 +385,13 @@ static int image_find_regions(struct image *image)
- 
- 	/* record the size of non-signature data */
- 	r = &image->checksum_regions[image->n_checksum_regions - 1];
--	image->data_size = (r->data - (void *)image->buf) + r->size;
-+	/*
-+	 * The new Tianocore multisign does a stricter check of the signatures
-+	 * in particular, the signature table must start at an aligned offset
-+	 * fix this by adding bytes to the end of the text section (which must
-+	 * be included in the hash)
-+	 */
-+	image->data_size = align_up((r->data - (void *)image->buf) + r->size, 8);
- 
- 	return 0;
- }
--- 
-1.8.4
-
diff --git a/app-crypt/scrypt/Manifest b/app-crypt/scrypt/Manifest
index c9fbbaacf219..64508e19443a 100644
--- a/app-crypt/scrypt/Manifest
+++ b/app-crypt/scrypt/Manifest
@@ -1,5 +1,3 @@
-DIST scrypt-1.3.0.tgz 380332 BLAKE2B 4bb2c5b911cd25e80444e7dd6381692a3ddd3dcd3a5f4bcda14c8cc4169f332f2c617175bfd222f03d8e48a3eefd9d01b2d7c3fd6b712b3266b2cc75bee8396b SHA512 199f58adb5231f1ad585dbe8f64d6c54920cee201bd7703bcfc7e64917bf8647f9e35b3835b78c41210fd9af5223a79938f2495e4b48e6a62bfe8721d82492c2
 DIST scrypt-1.3.1.tgz 394516 BLAKE2B 91faa22dc317927b92abe26c5e15cd52c409722716076c7cc502a0c6e4e84ceaaf60222b3ef141c6a209f36084df2d7f45d8f19482aa035c3e2442513c4283d9 SHA512 c76c29463d2a4db6b62283daca80bc4124a6272f37f983d472d44251b98da702f1edb16ad15058a8d0ea320c23bc1486892ab25d367d37ec77c38a55ad7e69fe
-EBUILD scrypt-1.3.0.ebuild 365 BLAKE2B aee5437ba9e2c13c9f4f12413b0eabd8f6e546aef97a2d1dc71003ec972561e70d3bd7a63450c80682c36f4fb326165acf9d970b5d6c0425f21401191a694ea4 SHA512 d4bfe2fccf9dfecdc5b2fdb9eb845645e58ceb4833a85f5a3a8ca696b6deaead5bc66f9e1954f260a517fefd93294d262e83f9686e742be7bf9a1fde029d6d8b
-EBUILD scrypt-1.3.1.ebuild 453 BLAKE2B bd3356b596c7a690785da352e49b6727a81b50c117b53ed95a6fe7b2e4ae73407701150a07e8ea8494f46a6f14fe9349ff99cd779c3d486425a627bf7b73ccf1 SHA512 de2bf3a94eb0a20696b401505d42027ee9200f41e65c9246862bed5cee01e0157244ba88cb651f48ff831e01f89d5607b453de0cbadd9f3df10a1e133a21ed9a
+EBUILD scrypt-1.3.1.ebuild 451 BLAKE2B 85576d7a479c5b1381d947e13cd0b923861799aeaa734c5f0b850befbdb35285dea06ffa359d020da3b4129a48a5b87f0d1a34ecd5f91c1e616b1f86ea023540 SHA512 e3beb1513d2bd91f8e9718682b30567c3f2719e67187ce547fb1a9a9c3c3e1537cdf0354f3f549614db674f2968511693af5e03c155e9c6e825b5a0678f00460
 MISC metadata.xml 368 BLAKE2B 66dc904d7524c2f61313445e7dfe583df69a6bfbbdd1ec8b4203206ec47bb178bb2c5bdacb618cfe47409fb0328ab32e6a6bff123725ed1088e9f2422b4c9e26 SHA512 1a6a98313e5a0e60c51174622e8b96d1b25b0a9b6060a55b1ec18690bf8def973f70c6597077663ab518f4d8135bf7ea114052be801b324e91f80d2580fa7914
diff --git a/app-crypt/scrypt/scrypt-1.3.0.ebuild b/app-crypt/scrypt/scrypt-1.3.0.ebuild
deleted file mode 100644
index a1b903c23e52..000000000000
--- a/app-crypt/scrypt/scrypt-1.3.0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A simple password-based encryption utility using scrypt key derivation function"
-HOMEPAGE="http://www.tarsnap.com/scrypt.html"
-SRC_URI="http://www.tarsnap.com/${PN}/${P}.tgz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DOCS=( FORMAT )
diff --git a/app-crypt/scrypt/scrypt-1.3.1.ebuild b/app-crypt/scrypt/scrypt-1.3.1.ebuild
index 4631e15dceb7..fd30ce906416 100644
--- a/app-crypt/scrypt/scrypt-1.3.1.ebuild
+++ b/app-crypt/scrypt/scrypt-1.3.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.tarsnap.com/scrypt/${P}.tgz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DOCS=( FORMAT )
 
diff --git a/app-crypt/scute/Manifest b/app-crypt/scute/Manifest
index c6aa1e3451fd..8dff716d5d4f 100644
--- a/app-crypt/scute/Manifest
+++ b/app-crypt/scute/Manifest
@@ -1,6 +1,4 @@
-DIST scute-1.5.0.tar.bz2 991598 BLAKE2B 3a5fdcb5c7d1ae50ce5aa508388e768c6f59c366d81d91312a60ff319b3ad7e01b3bfe5986ee880980b0f5371402c21bd8da963977459d3b90fbd607e64ea2ae SHA512 ad1dbdba5681a92696c851eca7e2bfb61f7bf84f5e02728efc1f72cd25c4ee2dc18fe975e2903d1a85c635d16be1e2085ff2305827b48d80e18c9354e555b39a
 DIST scute-1.6.0-manual-eps-images.tar.xz 236968 BLAKE2B 27b834f95dbd7a00193b55a8ff55c34e9bc65b31d9de09199b6bad62d2718d247717a461b58ccd55acb0331f6d980ac01cd62de7729ddafd368ebf08cbe2edde SHA512 dc7d622207f1979e5b527e3213f191f14322af9745462bf0803563711f0cb4b4c03f920742ca425987e1c8f632a05772dd5cc2f1d5afec2616ca93de74402deb
 DIST scute-1.6.0.tar.bz2 1008407 BLAKE2B 3ef4e1870c52007fc7f838f31c4102aeee23e6e59fe13ad1990ed9c7eb4eda948a698bea475daa2d965d1c23f65940aae9b4ded518cb9268af4ec442414932db SHA512 dd9f9d9da7979a8f4766af34b0d6d6fea63d43feb4d7e5e82cca25c792d5ec87f6d9604e7eafa822ddddfaa8541bff616c0c19c73cf3f12b21ffa1c3128bcb4c
-EBUILD scute-1.5.0.ebuild 923 BLAKE2B bf4d0516c065713b065309c3b7fff0108d9caa99e22e5e9d5aae855fff8beda3297aa64f8b9a6ed6cbf4ccdfb5fac15e458ba29e53d35a2985e39bf6b3f058c7 SHA512 b5773c2352cb7d01acbd4e4bdd3d98ffa215707ff1d6d93614062b67d916ef6abdbce425b62bbd1ff859bf18b2b065f175974090ebd64dadcfb6afd7454e13e8
 EBUILD scute-1.6.0.ebuild 1339 BLAKE2B e8c100d0b8fbc78e945676a3928b5c2b0229b5682154ccb99f46b4eb6f7c929a9c38bdcc3e544b2e5e230beebf7e976ddd193de7c408e496ac9d01753e350331 SHA512 7043cf69f48fda7398ace90282f4551911d4037728d380212b311a6f88a067637cf0de2b9dab9f70dd4a51a7d692ba66ea102fba181ccef98da95ee966fff4fe
 MISC metadata.xml 757 BLAKE2B bc297f21ac2f337328a17748b0c874b6290465c49391bf44bd6e8e192f657d4335284b50786a0574801d19f0a3debb3f917bd4821bbb07ce9214d4b8ebf7d234 SHA512 26940589b3a8436c7bf4dfb0b3de4d6834c8d6e617671967d0cf639870545fd44682e1a1ce12d0a0358f9cecf640f256a9278c58597ef41240a341de94f09382
diff --git a/app-crypt/scute/scute-1.5.0.ebuild b/app-crypt/scute/scute-1.5.0.ebuild
deleted file mode 100644
index 9403b7ae9644..000000000000
--- a/app-crypt/scute/scute-1.5.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A PKCS #11 module for OpenPGP smartcards"
-HOMEPAGE="http://www.scute.org/"
-SRC_URI="mirror://gnupg/scute/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-# configure script try to check the version of gpgsm and gpg-agent when
-# non-crosscompiling so we need to have them as build-time dependency as
-# well as runtime.  Require a version of gnupg that is patched to have
-# gpgsm-gencert.sh working (as that's what the documentation describe).
-BDEPEND=">=app-crypt/pinentry-0.7.0
-	>=app-crypt/gnupg-2.0.17-r1[smartcard]"
-DEPEND=">=dev-libs/libgpg-error-1.4
-	>=dev-libs/libassuan-2.0.0"
-RDEPEND="${DEPEND}
-	${BDEPEND}"
-
-src_configure() {
-	econf \
-		--libdir=/usr/$(get_libdir)/pkcs11 \
-		--with-gpgsm=/usr/bin/gpgsm
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/app-crypt/signify/Manifest b/app-crypt/signify/Manifest
index 2d0f6c485fcb..8216e037ca9c 100644
--- a/app-crypt/signify/Manifest
+++ b/app-crypt/signify/Manifest
@@ -1,7 +1,10 @@
+AUX signify-30-man_compress.patch 576 BLAKE2B b6c82f0737dcfd569bc781d84eaecad2c0130ce3397b12adc043cd65f8ff709b2a9021e2f0ed962d6a92e24e59fd04376fd55d38376e5bfa8caefd329fe23ee3 SHA512 23f01a3509912aa8a3ec8e77ec85cfa9f78df2ef11f15b9422fc1e8a93f13da800e333005e4e053ad8e586606eb151efd71983aca50834e89181a7b7b2862c07
 DIST signify-23.tar.gz 95335 BLAKE2B 4cdbee5dae7f217644a5df41d4253938c5cb8fb1f621f945addfceb64090234199e8dd81d7ef42c41aae13e9e5158541f40062296ca07562977473e39f68cd0b SHA512 f0330994f3d308e9ad7c7bf4b6d6f8e8bef914d6d10d83507002ad97f853b4e0a829997a0225373e2c34829a611b70980d7d3674247d4b5b447204ad7f039608
 DIST signify-24.tar.gz 92038 BLAKE2B 4d9413a423534fb4f9adfb50494802b737e6099b47933eed9686ba751f7ffb6999b084c5a5431652a33baab11d7384e762c4709bab52bb0de4694a885c8eb570 SHA512 d612aca617f44ea7bf32a31d65da7e265dfdbe67f7983fc095b1f2d5c83cfa27f4c857279d98f6928199d15193c706cf3c77022fec70529a7b5d38b16ce64df5
 DIST signify-29.tar.gz 94553 BLAKE2B eba286618c5ea9fb9515c44330297276504009078a09d7b36c208225e4fd33e014623829dd582ededc2f35f207058ad2c93412ad006852966c37466ed87e7b9a SHA512 a0fc07c176f3e0e6ea32d059fb6cc27849159dcc3975c47b2b0a54f7047cb1f1dc0e032f2c55eaf84096b0a84288193afec0777e669851a7c7f97a880fb0f0ab
+DIST signify-30.tar.gz 94593 BLAKE2B 2d432cef9990a8ce23d0f05449ef02dcf7a00f4328a25dcab98cd25c2c74875fd8ea7ed7a67b7e4ac6c9f432a91564edcc1fc9260627c37352c19cc17581aea3 SHA512 4a1ebcdbf7aa74865b97cadbf5380460702306b6d0a77306e6c943bb0c3419ca929ecd3455522da4448d780a56c8eddeb26fb4d7fb006fc3bf23f69693c39e87
 EBUILD signify-23.ebuild 543 BLAKE2B 4af7771a8feba476774c635481a7458ff74066d60dc1d51d034892e574ffec1349791d51e028e3b7d4bcccc58c7f067eeaa0a238822a9d7c727618826ee928bd SHA512 081dc53f0b48bd58f4b59101e59ec9f64fe641824142f056820e61107937c39283a5e33f2ce32d711fc46c802557f142f627f754d5b6823f2d0e16fd4ba1c5e2
 EBUILD signify-24.ebuild 540 BLAKE2B c9ad33a60f4d8e2d5ef7a3f8945e722eb06d1c29f9947d24a93433ad54249860ff8a1f960eef2e31c618c1af9d6f7dd92ea6bf8099694ccc7c92aafa097ca46b SHA512 3792038e4d522c6ef7d30d3c6569f57902524f04e5c8cfa5f3868f491eff6094d163294f0fccbc5338acf1e398dabac3140f6ebd68395f142ff172a649a9eca6
 EBUILD signify-29.ebuild 551 BLAKE2B b91d56242ee6a5f33993e236bc405dd1ca92cf3cef64367aa4fe6d15de963c5dd6a71f6155777d0f1b7a50d2d243f46e54d876decfae931d51514d3e020e22b0 SHA512 f446097bcfd19cfb28450c98aa46b850d036e9ef68518912193f0cdedd08e0c5647232740f464c4f51bb13c712ea1814bddf393575712cbddb905cb079188825
+EBUILD signify-30.ebuild 611 BLAKE2B 2c42ca588c3dc61c633d8aa790af8fa7e16cdefc383ef97ce200e5f31e0f9b890d3fc83f8c80df126c78f0a9a88f768f083cc4026f4cf466e2d3e7f567c0b8be SHA512 da4b922eab992f4d9425ad40e08364a8334786a40c8cbb3ef11f48c4d35200c834700a3a1277ba0e3b138be1ab0691e48eb25fb8cc7c6dddcc8b9b990b12b6ff
 MISC metadata.xml 328 BLAKE2B 48c8809b13673350e0ed718437f90815703eb6977ad40b8ca9a2f17b3b51e4d412450a31e58369f49c14e3a3d20a704840ec3efd6e03b9b377c8378598150dcf SHA512 4958752eab2ed703ddab429c46274a605a4954a4da92131979fd988ece5a5a68d944feb60cd4a21e2b6cfdd320fcc00ea631c8befe4cf620cb6b4794e6107560
diff --git a/app-crypt/signify/files/signify-30-man_compress.patch b/app-crypt/signify/files/signify-30-man_compress.patch
new file mode 100644
index 000000000000..f33a6c9d44b5
--- /dev/null
+++ b/app-crypt/signify/files/signify-30-man_compress.patch
@@ -0,0 +1,18 @@
+diff --git a/Makefile b/Makefile
+index f908451..1537eb6 100644
+--- a/Makefile
++++ b/Makefile
+@@ -224,11 +224,11 @@ sha512_256hl.c:	helper.c
+ 	    -e 's/HASH/SHA512_256/g' \
+ 	    -e 's/SHA512_256_CTX/SHA2_CTX/g' $< > $@
+ 
+-install: signify signify.1.gz
++install: signify
+ 	install -m 755 -d $(DESTDIR)$(PREFIX)/bin
+ 	install -m 755 -t $(DESTDIR)$(PREFIX)/bin signify
+ 	install -m 755 -d $(DESTDIR)$(PREFIX)/share/man/man1
+-	install -m 644 -t $(DESTDIR)$(PREFIX)/share/man/man1 signify.1.gz
++	install -m 644 -t $(DESTDIR)$(PREFIX)/share/man/man1 signify.1
+ 
+ .PHONY: install
+ 
diff --git a/app-crypt/signify/signify-30.ebuild b/app-crypt/signify/signify-30.ebuild
new file mode 100644
index 000000000000..474220e8fa16
--- /dev/null
+++ b/app-crypt/signify/signify-30.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Cryptographically sign and verify files"
+HOMEPAGE="http://www.openbsd.org/ https://github.com/aperezdc/signify"
+SRC_URI="https://github.com/aperezdc/signify/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-1"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND=">=dev-libs/libbsd-0.7"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${PN}-30-man_compress.patch )
+
+src_configure() {
+	tc-export CC
+}
+
+src_install() {
+	emake DESTDIR="${ED}" PREFIX="/usr" install
+	einstalldocs
+}
diff --git a/app-crypt/simple-tpm-pk11/Manifest b/app-crypt/simple-tpm-pk11/Manifest
index ad5fe8187b03..db3e858a9b60 100644
--- a/app-crypt/simple-tpm-pk11/Manifest
+++ b/app-crypt/simple-tpm-pk11/Manifest
@@ -1,3 +1,3 @@
 DIST simple-tpm-pk11-0.06.tar.gz 28993 BLAKE2B b592acf3d9fe334993ed1e72152ee2c0a25ea3be777035c2d113323522f7d99e6c564bd7c4de0725b0f04f5b6dad90c5a35ede815d28f40a3fb53a6cc9e2bee6 SHA512 72df0637cefdb0d81f741480cdfe24ac0d6a05a93d729f5e2180adf49b5d7ddb0b60d8c6f7d5e79a67bf4cea202067390c8d4532c906273408f7de4fcc5e66e8
-EBUILD simple-tpm-pk11-0.06.ebuild 848 BLAKE2B 55327268ec66292471dd4e3bd6dbd3b3b832eef815f69708b3c144e1683b837c55f9136242be15f64cb4657d7f52d7a8018e628f5f0c26abcf28a2effca96f57 SHA512 4dbdb971fbb5932ec8d13ef67323174dce7b637d00277d680cfb1901e10b24c4b94b6bd1fcafb56e228b7ebd0752eeb8244951d7aae7c11db2689d430c89ea30
+EBUILD simple-tpm-pk11-0.06.ebuild 960 BLAKE2B 326861d7679dda4f611c9759e07acc067e4c2e615b306e83736cb3852bde219b951f6cf13923afb1d63183cac95ff4eb34de7e1c5bf662038ee2d774e5104788 SHA512 27552220ba9884c3d3e7f4d8f918ea781ab50093d2ea3134569ac544b7521d39e856d007ffcb9ce4150ec509c19db7cc0f53cd4a3a3b1b7433ba8f85b382ca8a
 MISC metadata.xml 321 BLAKE2B 9c1c93503ca5eb24ab6d0e3dd069579d7cf822370225650d20e24b6138b6528dcb7e5529edd13a0608f0eb0b2214a951b1e4ce4c5cddd5600193bc708e28c4ad SHA512 63c4d2aa10132a2aca7da87d702c32e37f2205dc99ff6c743662a0fba6026602d5865e1a27a8f51e68976c7543829512f21f4cf29bbee61bed7d0d6c3c00a8f0
diff --git a/app-crypt/simple-tpm-pk11/simple-tpm-pk11-0.06.ebuild b/app-crypt/simple-tpm-pk11/simple-tpm-pk11-0.06.ebuild
index 1c0e8dc2f60f..bc22e3b9faea 100644
--- a/app-crypt/simple-tpm-pk11/simple-tpm-pk11-0.06.ebuild
+++ b/app-crypt/simple-tpm-pk11/simple-tpm-pk11-0.06.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -34,3 +34,12 @@ src_prepare() {
 	eapply_user
 	eautoreconf
 }
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/app-crypt/ssss/Manifest b/app-crypt/ssss/Manifest
index 05714d7c5075..49e54af6e6d9 100644
--- a/app-crypt/ssss/Manifest
+++ b/app-crypt/ssss/Manifest
@@ -1,3 +1,5 @@
+DIST ssss-0.5.6.tar.gz 20128 BLAKE2B d42fff5878e2ebcc62cd86b86f0f8a3e522c089cbb5e8fb2585cf375ff133da7d9ccf00e62cc6888e00abe5d64f87ac19ddbb3f6e6a0d86913e6a6aa5a8a1d4c SHA512 964af01610a7a269d19ae1fa1712ef12ca1afab02636ba83dd84ec5aeb185210a1247d932ee39d2869aa76e54ffb051d802800d295d17355d6fe2a8010edd509
 DIST ssss-0.5.tar.gz 17435 BLAKE2B 76aae463ce11341f8b0336526f7d19c9921025cabc05bc9e00005b0bdeb676ed5e069226962232f277de2fecb1cd71bafbd4b2fa0c03ef4faf0f66daa24599d1 SHA512 be8df1666ac61d4097b5fd54f2cee3640db8f85ec21411f1b208a35b671c5699bc692079525d8d313d1cf2500da31bfb03771829a9fdccc0bb6d806749526ec9
 EBUILD ssss-0.5-r1.ebuild 774 BLAKE2B 08fa8b0d2c88ba22cb3a74bd728a32c2e54ff9cd92b88c8345e407b035bc2916f547ed18ab90d76efb401e6cd7aa015f0262bdb9b9629039091aef5c19725dd6 SHA512 364456d49bf4625c632e42dfee4013b84cb4dee6df747b113dcc11362c4bbb9cbbc2c5b460411986c751c4fd0a4c34a288464b383601bc2eb6c331ad295224f8
-MISC metadata.xml 496 BLAKE2B 0e998a8a5587315750394702193fa739a61bcc5101f38eca3b25f13af0661b54f76ad214fc0e378cc55a7a99192e3c7f75166eedda18ab61c1d9911830f40b6c SHA512 84249ac824f19a308cc20bde7610c829030c363c13c6111bfe30d7d5a219461728a8f6010bb006821be5ede4a2cf02c3e11eee67d782126ef0e1453207298c66
+EBUILD ssss-0.5.6.ebuild 810 BLAKE2B 353efe544e4d85bf4cb3d7c400fbb9c9d351efd30aa50a276838db169add2c5c2ff01dbe742722c96dd65cef569314111305a65874422b803efda80f55274b29 SHA512 f1133c11c1c54777ab0ece70c2dabcec82cd599ba95c063648255aad6aeb2d55d6876bbace45d3aa754b08b4c1a8795bba443538aeaea7c56e86724422765efe
+MISC metadata.xml 571 BLAKE2B 8e5b2a9efdbac1e9cf15c2e7c60e6c6a9c41300a6ec65df5751043ac85536ba31ace97f033aac89e47f9792b8003c134e1b8a8c3af6513e3406e38027d413e42 SHA512 daebb2e758087ee3cb49c5c89c0bafe3bdf57e2f7c3b64e1053e465b765ad8e95594065a7e236cf8072a406f7d92702a84807393820fcaec26ff29bee73ceff6
diff --git a/app-crypt/ssss/metadata.xml b/app-crypt/ssss/metadata.xml
index 51c92c834b21..caba2e85d1bb 100644
--- a/app-crypt/ssss/metadata.xml
+++ b/app-crypt/ssss/metadata.xml
@@ -10,4 +10,7 @@
 		The program suite does both: the generation of shares for a known secret,
 		and the reconstruction of a secret using user-pro‐vided shares.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">MrJoy/ssss</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-crypt/ssss/ssss-0.5.6.ebuild b/app-crypt/ssss/ssss-0.5.6.ebuild
new file mode 100644
index 000000000000..724f2c160f99
--- /dev/null
+++ b/app-crypt/ssss/ssss-0.5.6.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Shamir's Secret Sharing Scheme"
+HOMEPAGE="https://github.com/MrJoy/ssss"
+SRC_URI="https://github.com/MrJoy/${PN}/archive/releases/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-releases-v${PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-libs/gmp:0="
+DEPEND="${RDEPEND}"
+BDEPEND="app-doc/xmltoman"
+
+HTML_DOCS=( "doc.html" "ssss.1.html" )
+
+src_prepare() {
+	default
+
+	tc-export CC
+
+	# Respect users [CL]FLAGS and don't strip, as portage does this part
+	sed -e 's/-O2/$(CFLAGS) -lgmp $(LDFLAGS)/g' -e '/strip/d' -i Makefile || die
+}
+
+src_install() {
+	dobin ssss-split
+	dosym ssss-split /usr/bin/ssss-combine
+
+	doman ssss.1
+
+	einstalldocs
+}
diff --git a/app-crypt/swtpm/Manifest b/app-crypt/swtpm/Manifest
index 8c194d61c3e0..560847f925ce 100644
--- a/app-crypt/swtpm/Manifest
+++ b/app-crypt/swtpm/Manifest
@@ -1,7 +1,6 @@
-AUX swtpm-build-sys-Explicitly-link-libswtpm_libtpms-with-lcry.patch 1680 BLAKE2B ef4b57c14ee6124fea5643cc868bbf1f5426990f58dd892309a223b828deedc62f100c13b2065a850f9053682bb58e61d877e62c05fe05abba905c9f98c74d2b SHA512 a59b45a2d7c99e439de64b042549f07fd2e12cc1330e68df72f2a77a55579b851ee321a3d95fc2595bb68090b63062cd82ccb161201a78031c96e473bcebc3f8
-AUX swtpm-build-sys-Use-AC_COMPILE_IFELSE-to-check-for-unused-.patch 1793 BLAKE2B ab67a59a2f40a31f72b25f1ea0fc27bfd908a25929b7e40224c91bc08949c31abb7fbcd1092f1f12c774dfa0bda8ce8f04bbca7785124dadd2839a971526b835 SHA512 068c83a69a13bfffbade03bfd45e032ecda014fee9bfe2462abed55c500f6f4fb98391a525350580c06e5d59bb560c6f96a945429624f30d2b0e593de54c86df
-AUX swtpm-disable-test-dependencies.patch 774 BLAKE2B 8089885d5b21cea09fb5ec59d69640754671ba27763d57bdb45345768722166d4cd5fa0d890542aa79a90c2b8e609f611ac4ccd58be71ec13128d81daccb50bd SHA512 d803222c8fb04a7909f8a60563dfd23327c842f12138309f3b901309651857d6c545ca8e46c68c9b60b97f0e03ab79575784e242409d41b3d69e6ad8516428e5
-AUX swtpm-fix-localca-path.patch 1197 BLAKE2B fb94a734303e1c71158ffda2958275a377d9c75b98262061b06bb22d2dce6efd3b5d126758b65cbab8141a78549c4ab99d3aa2c241c4870de67f871706840b5d SHA512 c9a0e6ee27f0b38b65f2cad65a48622c3b9e9e8913bba002f0c82168f22162dbc62ed2b104942ed8141889625f225f29516ecbd20ba6ffb5091eb2201df0f107
-DIST swtpm-0.3.2.tar.gz 308843 BLAKE2B 501c600e36a437fc99f662f1c217169cab15b0d4ec4a4551a29dd83541c9718e182c7eb13a43e541da453fc28c48232354b617525e32d9721e697744eaa5a17a SHA512 5da668cd8091f0db70bec52cd8d26bacf7b18e4c27c83c1cba25e59c69bb2ba7a1d011d9bf4bafa44e1a49065538445eb56683806be6f1875cba383f8edb6a4f
-EBUILD swtpm-0.3.2.ebuild 1641 BLAKE2B 08e229f1e6cdd4a17f9d92d02bbe4897f44bd0a5c0a4c38677cc4a7f84c513ced4d84c22d04ae496f92245b5907a02ff1eab9da7f5d598bffb5b4260e08a5602 SHA512 fcf43e868cd834c201b5bea591bae646e114fcbdcb77ebdb6f3477c71a48859bd11b2919937f73ba604b2d909440614744c0214325044e0c83cabf52dcc9ba1c
+AUX swtpm-0.5.0-build-sys-Remove-WError.patch 431 BLAKE2B 8b0d63dcab783a322c72aab6b8f7cd3de53509716d48fd2f30d136279bb2a52a6a942f43a2c87e6f66db9f3470f0486255db8056da8c49b2b788048af62aa3ba SHA512 981a1fe5bf25c7a820dc5913b0384bc48b0bc50cd84e04921f0f64a4be6dd6b2a815d4cba39370b2e62c4473f2edbdc6bba7b09ce74b9e441f1b8df3166eb959
+AUX swtpm-0.5.0-disable-test-dependencies.patch 696 BLAKE2B 7cbfb36e82b88d125dabaab8508803cde8b4fe414b1bf0e193421a7632597baa3142dcefa1bd53c7ebe6fea529ad827fc65bfd42bd617c415043b795d5c36c15 SHA512 32931311e8a4c57ae167379db5ff3decc5c1b3b891f180e6ee4991a9cf366ac26049c2e3eabc434eef3890635317f2f2cb1a80cf827a4c3e44fe76943665e85c
+AUX swtpm-0.5.0-fix-localca-path.patch 1318 BLAKE2B 1d8c7367cdc92232d13b4169e387afcd7247ffbdc785cad0d4e40ca9ee7710036f4a7debc1c6112afe255b19422a32b76f72efba04840136f28a72d241aa091e SHA512 e327b581dd1cf9bf92d400fc2574a585ea8708ba6b7e2c89fe368cfc990e464773900488736944b0f97cfd6e65b6aebf39e55ef22428fcc2510c8205ef77d738
+DIST swtpm-0.5.1.tar.gz 309464 BLAKE2B 630a9add9a17e016f0158666bd3f4eafa773b7a2645820346d5f2847023310f8df4c2491184c5f5d02a83aa2bb53f8c266e5f2a6b07ab92502f08c7f1fa697ea SHA512 8a034b1da916797b9869a4ff478a4c7093b1343ce2556054d2228214520f0e2a63a1d69709bf2cc62fe45710dd9a41c0eee488af9396e8baf8099e697593638c
+EBUILD swtpm-0.5.1-r1.ebuild 1778 BLAKE2B 28621e58fbb497bff343104090a2a4d88c9eebd43ef71f36f6cc027b83f89ba4e611c2e99ab8b108592b5f2edb73194564340bc1937aa25f6f673ade75043d3a SHA512 e94b8db862f039a80077b3e40e46c97a013b958bc76435aa212cf0e433fe8973b957a932a1ba9730b26defb5b6c5a9911fe775008dc89cf736bfa3b52fad2995
 MISC metadata.xml 457 BLAKE2B defc06c2642823aa760cafc22e90f891f9337358bfaa446778e1f4107f6e295ec21b5987f49bdcee3fd7b68084be1b864d7569e74bd729345e4886b08c617a06 SHA512 c80e24dc4ec41e5aae1e7fe67208c945e62c02f469164d0a76445269e3e0204674cd593956f99fa1539505e1a70a15bbf6c02afcf6b38592f04f3c4d3f275e08
diff --git a/app-crypt/swtpm/files/swtpm-0.5.0-build-sys-Remove-WError.patch b/app-crypt/swtpm/files/swtpm-0.5.0-build-sys-Remove-WError.patch
new file mode 100644
index 000000000000..4afd5408d9c6
--- /dev/null
+++ b/app-crypt/swtpm/files/swtpm-0.5.0-build-sys-Remove-WError.patch
@@ -0,0 +1,13 @@
+diff --git a/configure.ac b/configure.ac
+index d035653..1db5c5c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -461,7 +461,7 @@ AC_SUBST([TSS_USER])
+ AC_SUBST([TSS_GROUP])
+ 
+ CFLAGS="$CFLAGS -Wreturn-type -Wsign-compare -Wswitch-enum"
+-CFLAGS="$CFLAGS -Wmissing-prototypes -Wall -Werror"
++CFLAGS="$CFLAGS -Wmissing-prototypes -Wall"
+ CFLAGS="$CFLAGS -Wformat -Wformat-security"
+ CFLAGS="$CFLAGS $GNUTLS_CFLAGS $COVERAGE_CFLAGS"
+ 
diff --git a/app-crypt/swtpm/files/swtpm-0.5.0-disable-test-dependencies.patch b/app-crypt/swtpm/files/swtpm-0.5.0-disable-test-dependencies.patch
new file mode 100644
index 000000000000..3880385256e3
--- /dev/null
+++ b/app-crypt/swtpm/files/swtpm-0.5.0-disable-test-dependencies.patch
@@ -0,0 +1,26 @@
+diff --git a/configure.ac b/configure.ac
+index d035653..0728a2e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -325,21 +325,11 @@ fi
+ AM_CONDITIONAL([WITH_GNUTLS], [test "x$with_gnutls" = "xyes"])
+ AC_SUBST([GNUTLS_LIBS])
+ 
+-AC_PATH_PROG([EXPECT], expect)
+-if test "x$EXPECT" = "x"; then
+-	AC_MSG_ERROR([expect is required: expect package])
+-fi
+-
+ AC_PATH_PROG([GAWK], gawk)
+ if test "x$GAWK" = "x"; then
+ 	AC_MSG_ERROR([gawk is required: gawk package])
+ fi
+ 
+-AC_PATH_PROG([SOCAT], socat)
+-if test "x$SOCAT" = "x"; then
+-	AC_MSG_ERROR([socat is required: socat package])
+-fi
+-
+ AC_PATH_PROG([BASE64], base64)
+ if test "x$BASE64" = "x"; then
+ 	AC_MSG_ERROR([base64 is required: base64 package])
diff --git a/app-crypt/swtpm/files/swtpm-fix-localca-path.patch b/app-crypt/swtpm/files/swtpm-0.5.0-fix-localca-path.patch
index c83758da5636..27d29fc55aed 100644
--- a/app-crypt/swtpm/files/swtpm-fix-localca-path.patch
+++ b/app-crypt/swtpm/files/swtpm-0.5.0-fix-localca-path.patch
@@ -1,19 +1,21 @@
 diff --git a/samples/Makefile.am b/samples/Makefile.am
-index 4558d66..6fc6d77 100644
+index 7d69bf8..9fb8338 100644
 --- a/samples/Makefile.am
 +++ b/samples/Makefile.am
-@@ -16,9 +16,9 @@ samplessysconf_DATA = \
- 	swtpm-localca.options
+@@ -56,10 +56,10 @@ endif
+ 
  
  install-data-local:
 -	$(MKDIR_P) $(DESTDIR)$(localstatedir)/lib/swtpm-localca
 +	$(MKDIR_P) $(DESTDIR)$(localstatedir)/swtpm-localca
  	if test -z $(DESTDIR); then \
--		chown @TSS_USER@:@TSS_GROUP@ $(DESTDIR)$(localstatedir)/lib/swtpm-localca || true; \
-+		chown @TSS_USER@:@TSS_GROUP@ $(DESTDIR)$(localstatedir)/swtpm-localca || true; \
+-		chown -R @TSS_USER@:root $(DESTDIR)$(localstatedir)/lib/swtpm-localca || true; \
+-		chmod 0750 $(DESTDIR)$(localstatedir)/lib/swtpm-localca || true; \
++		chown -R @TSS_USER@:root $(DESTDIR)$(localstatedir)/swtpm-localca || true; \
++		chmod 0750 $(DESTDIR)$(localstatedir)/swtpm-localca || true; \
  	fi
  
- EXTRA_DIST= \
+ # for out-of-tree builds we need to clean up
 diff --git a/samples/swtpm-localca.conf.in b/samples/swtpm-localca.conf.in
 index 1f0b48d..63f1fed 100644
 --- a/samples/swtpm-localca.conf.in
diff --git a/app-crypt/swtpm/files/swtpm-build-sys-Explicitly-link-libswtpm_libtpms-with-lcry.patch b/app-crypt/swtpm/files/swtpm-build-sys-Explicitly-link-libswtpm_libtpms-with-lcry.patch
deleted file mode 100644
index d4ad9cda0c2d..000000000000
--- a/app-crypt/swtpm/files/swtpm-build-sys-Explicitly-link-libswtpm_libtpms-with-lcry.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From d9bc718871810d18c70ba9d4e9ee23071bd6db36 Mon Sep 17 00:00:00 2001
-From: Stefan Berger <stefanb@linux.vnet.ibm.com>
-Date: Tue, 21 Jul 2020 18:39:07 -0400
-Subject: [PATCH 2/2] build-sys: Explicitly link libswtpm_libtpms with -lcrypto
- (Gentoo)
-
-This patch fixes the following linker issue reported for Gentoo in
-issue #280.
-
-ld.lld: error: /var/tmp/portage/app-crypt/swtpm-0.3.1-r1/work/swtpm-0.3.1/src/swtpm/.libs/libswtpm_libtpms.so: undefined reference to EVP_sha512
-ld.lld: error: /var/tmp/portage/app-crypt/swtpm-0.3.1-r1/work/swtpm-0.3.1/src/swtpm/.libs/libswtpm_libtpms.so: undefined reference to PKCS5_PBKDF2_HMAC
-ld.lld: error: /var/tmp/portage/app-crypt/swtpm-0.3.1-r1/work/swtpm-0.3.1/src/swtpm/.libs/libswtpm_libtpms.so: undefined reference to SHA512
-
-Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
----
- configure.ac          | 2 ++
- src/swtpm/Makefile.am | 3 ++-
- 2 files changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 56d3f09..7aaa201 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -150,6 +150,8 @@ openssl)
- 	AC_CHECK_HEADERS([openssl/aes.h],[],
- 			 AC_MSG_ERROR(Is openssl-devel/libssl-dev installed?))
- 	AC_MSG_RESULT([Building with openssl crypto library])
-+	LIBCRYPTO_LIBS=$(pkg-config --libs libcrypto)
-+	AC_SUBST([LIBCRYPTO_LIBS])
- 	;;
- esac
- 
-diff --git a/src/swtpm/Makefile.am b/src/swtpm/Makefile.am
-index dd2a63a..b5f15e3 100644
---- a/src/swtpm/Makefile.am
-+++ b/src/swtpm/Makefile.am
-@@ -69,7 +69,8 @@ libswtpm_libtpms_la_LIBADD = \
- 	$(LIBTPMS_LIBS) \
- 	$(GLIB_LIBS) \
- 	$(LIBRT_LIBS) \
--	$(LIBSECCOMP_LIBS)
-+	$(LIBSECCOMP_LIBS) \
-+	$(LIBCRYPTO_LIBS)
- 
- bin_PROGRAMS = swtpm
- if WITH_CUSE
--- 
-2.26.2
-
diff --git a/app-crypt/swtpm/files/swtpm-build-sys-Use-AC_COMPILE_IFELSE-to-check-for-unused-.patch b/app-crypt/swtpm/files/swtpm-build-sys-Use-AC_COMPILE_IFELSE-to-check-for-unused-.patch
deleted file mode 100644
index 582199708057..000000000000
--- a/app-crypt/swtpm/files/swtpm-build-sys-Use-AC_COMPILE_IFELSE-to-check-for-unused-.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From b6d16129a525f572ef37d20ba1cd70d59ca4f079 Mon Sep 17 00:00:00 2001
-From: Stefan Berger <stefanb@linux.vnet.ibm.com>
-Date: Tue, 21 Jul 2020 17:38:10 -0400
-Subject: [PATCH 1/2] build-sys: Use AC_COMPILE_IFELSE to check for unused
- linker flags (clang)
-
-This patch fixes a clang issue report in issue #280.
-
-clang does not use ld, so we cannot grep for support of certain linker
-flags but have to test-compile.
-
-Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
----
- configure.ac | 26 +++++++++++++++++++-------
- 1 file changed, 19 insertions(+), 7 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index b4d4258..56d3f09 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -357,13 +357,25 @@ if test "x$enable_hardening" != "xno"; then
- 	if test -z "$TMP1" && test -n "$TPM2"; then
- 		HARDENING_CFLAGS="$HARDENING_CFLAGS -D_FORTIFY_SOURCE=2 "
- 	fi
--	dnl Check ld for 'relro' and 'now'
--	if $LD --help 2>&1 | $GREP '\-z relro ' > /dev/null; then
--		HARDENING_CFLAGS="$HARDENING_CFLAGS -Wl,-z,relro "
--	fi
--	if $LD --help 2>&1 | $GREP '\-z now ' > /dev/null; then
--		HARDENING_CFLAGS="$HARDENING_CFLAGS -Wl,-z,now "
--	fi
-+	dnl Check linker for 'relro' and 'now'
-+	save_CFLAGS="$CFLAGS"
-+	CFLAGS="-Wl,-z,relro -Werror"
-+	AC_MSG_CHECKING([whether linker supports -Wl,-z,relro])
-+	AC_COMPILE_IFELSE(
-+		[AC_LANG_SOURCE([[int main() { return 0; }]])],
-+		[HARDENING_CFLAGS="$HARDENING_CFLAGS -Wl,-z,relro"
-+		 AC_MSG_RESULT(yes)],
-+		[AC_MSG_RESULT(no)]
-+	)
-+	CFLAGS="-Wl,-z,now -Werror"
-+	AC_MSG_CHECKING([whether linker supports -Wl,-z,now])
-+	AC_COMPILE_IFELSE(
-+		[AC_LANG_SOURCE([[int main() { return 0; }]])],
-+		[HARDENING_CFLAGS="$HARDENING_CFLAGS -Wl,-z,now"
-+		 AC_MSG_RESULT(yes)],
-+		[AC_MSG_RESULT(no)]
-+	)
-+	CFLAGS="$save_CFLAGS"
- 	AC_SUBST([HARDENING_CFLAGS])
- fi
- 
--- 
-2.26.2
-
diff --git a/app-crypt/swtpm/files/swtpm-disable-test-dependencies.patch b/app-crypt/swtpm/files/swtpm-disable-test-dependencies.patch
deleted file mode 100644
index ff2536676637..000000000000
--- a/app-crypt/swtpm/files/swtpm-disable-test-dependencies.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 47b091a..61192bf 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -9,9 +9,7 @@ SUBDIRS   = \
- 	include \
- 	man \
- 	samples \
--	src \
--	tests
--
-+	src
- ACLOCAL_AMFLAGS = -I m4
- 
- EXTRA_DIST = \
-diff --git a/configure.ac b/configure.ac
-index c7b4e98..8e6445b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -330,16 +330,6 @@ if test "x$GAWK" = "x"; then
- 	AC_MSG_ERROR([gawk is required: gawk package])
- fi
- 
--AC_PATH_PROG([SOCAT], socat)
--if test "x$SOCAT" = "x"; then
--	AC_MSG_ERROR([socat is required: socat package])
--fi
--
--AC_PATH_PROG([PYTHON], python3)
--if test "x$PYTHON" = "x"; then
--	AC_MSG_ERROR([python3 is required])
--fi
--
- AC_ARG_ENABLE([hardening],
-   AS_HELP_STRING([--disable-hardening], [Disable hardening flags]))
- 
diff --git a/app-crypt/swtpm/swtpm-0.3.2.ebuild b/app-crypt/swtpm/swtpm-0.3.2.ebuild
deleted file mode 100644
index 00ff234d61a6..000000000000
--- a/app-crypt/swtpm/swtpm-0.3.2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit autotools python-any-r1
-
-DESCRIPTION="Libtpms-based TPM emulator"
-HOMEPAGE="https://github.com/stefanberger/swtpm"
-SRC_URI="https://github.com/stefanberger/swtpm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="fuse gnutls libressl seccomp test"
-
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	fuse? (
-		dev-libs/glib:2
-		sys-fs/fuse:0
-	      )
-	gnutls? (
-		   dev-libs/libtasn1:=
-		   >=net-libs/gnutls-3.1.0[tools]
-		)
-	!libressl? (
-		 dev-libs/openssl:0=
-		 dev-libs/libtpms[-libressl]
-		   )
-	libressl? (
-		    dev-libs/libressl:0=
-		    dev-libs/libtpms[libressl]
-		  )
-	seccomp? ( sys-libs/libseccomp )
-"
-
-DEPEND="${COMMON_DEPEND}
-	test? (
-		net-misc/socat
-		${PYTHON_DEPS}
-	      )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	acct-group/tss
-	acct-user/tss
-	app-crypt/tpm-tools
-	app-crypt/trousers
-	dev-tcltk/expect"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-fix-localca-path.patch"
-	"${FILESDIR}/${PN}-build-sys-Explicitly-link-libswtpm_libtpms-with-lcry.patch"
-	"${FILESDIR}/${PN}-build-sys-Use-AC_COMPILE_IFELSE-to-check-for-unused-.patch"
-	)
-
-src_prepare() {
-	use test || eapply "${FILESDIR}/${PN}-disable-test-dependencies.patch"
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-	  --disable-static \
-	  --with-openssl \
-	  --without-selinux \
-	  $(use_with fuse cuse) \
-	  $(use_with gnutls) \
-	  $(use_with seccomp)
-}
-
-src_install() {
-	default
-	fowners tss:tss /var/lib/swtpm-localca
-	keepdir /var/lib/swtpm-localca
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/app-crypt/swtpm/swtpm-0.5.1-r1.ebuild b/app-crypt/swtpm/swtpm-0.5.1-r1.ebuild
new file mode 100644
index 000000000000..1e26f7a19575
--- /dev/null
+++ b/app-crypt/swtpm/swtpm-0.5.1-r1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit autotools distutils-r1
+
+DESCRIPTION="Libtpms-based TPM emulator"
+HOMEPAGE="https://github.com/stefanberger/swtpm"
+SRC_URI="https://github.com/stefanberger/swtpm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="fuse gnutls libressl seccomp test"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	fuse? (
+		dev-libs/glib:2
+		sys-fs/fuse:0
+	)
+	gnutls? (
+		dev-libs/libtasn1:=
+		>=net-libs/gnutls-3.1.0[tools]
+	)
+	!libressl? (
+		dev-libs/openssl:0=
+		dev-libs/libtpms[-libressl]
+	)
+	libressl? (
+		dev-libs/libressl:0=
+		dev-libs/libtpms[libressl]
+	)
+	seccomp? ( sys-libs/libseccomp )
+"
+
+DEPEND="${COMMON_DEPEND}
+	test? (
+		net-misc/socat
+		dev-tcltk/expect
+	)
+"
+
+RDEPEND="${COMMON_DEPEND}
+	acct-group/tss
+	acct-user/tss
+	dev-python/cryptography[${PYTHON_USEDEP}]
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.5.0-fix-localca-path.patch"
+	"${FILESDIR}/${PN}-0.5.0-build-sys-Remove-WError.patch"
+)
+
+src_prepare() {
+	use test || eapply "${FILESDIR}/${PN}-0.5.0-disable-test-dependencies.patch"
+	python_setup
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-static \
+		--with-openssl \
+		--without-selinux \
+		$(use_with fuse cuse) \
+		$(use_with gnutls) \
+		$(use_with seccomp)
+}
+
+src_compile() {
+	# We want the default src_compile, not the version distutils-r1 exports
+	default
+}
+
+src_install() {
+	default
+	python_foreach_impl python_optimize
+	fowners -R tss:root /var/lib/swtpm-localca
+	fperms 750 /var/lib/swtpm-localca
+	keepdir /var/lib/swtpm-localca
+	find "${D}" -name '*.la' -delete || die
+}
+
+src_test() {
+	# We want the default src_test, not the version distutils-r1 exports
+	default
+}
diff --git a/app-crypt/tpm-tools/Manifest b/app-crypt/tpm-tools/Manifest
index 52fd51eaa26a..7e17186639c2 100644
--- a/app-crypt/tpm-tools/Manifest
+++ b/app-crypt/tpm-tools/Manifest
@@ -1,4 +1,6 @@
 AUX tpm-tools-1.3.9.1-openssl-1.1.patch 6028 BLAKE2B bd7a7b3dc748618004cbbfb7dc51a6f4e3f1c53654193b227c4b3eccd75fbb6d22ed46241a3e201399daa418d58cdd5b124cc2a467f8f59b4b33f54394035602 SHA512 caf3f9a3f82073d71618305132b883ab51ba3220d30ce5c160b9785bcb2e7268cf47621381530d39e1641e0b27bfeb30dcbfd62ae235d82d07942824f533cc7a
 DIST tpm-tools-1.3.9.1.tar.gz 482859 BLAKE2B ee915679e23bead04672bf719ce59bb6f20b550be39855b5304caeff554bf54d3cfe9104d464af7762388995e51d2bed0f9bedad83e42146cb7457382d09f4b2 SHA512 63a9c0e761cd890cc0a218de79a9c0169e151aba7824c19bf6b7ec894cf41c4950de1f63bd849aa93a4bdff36cf0fe557bc17113912b6d77f57f2bf1190b6a08
+DIST tpm-tools-1.3.9.2.tar.gz 431930 BLAKE2B bbea3848765d9907c6faa1b5f4a60002e94243040985ce503f392bc8d7392bea41b54317b15fd227b5d73d589cf2c330729532448751d4375484375725310dfa SHA512 b684716c71702140591d89eb03d3724ed5b448e7ba2881bc44de9d44ffc23a9f7dfcf4351eec24e5438cc883f49a7dafee82bb19f90800610cf764ce74e60ccb
 EBUILD tpm-tools-1.3.9.1-r1.ebuild 1014 BLAKE2B 709a67933038725f0d5f13c01f022784036980b4fefce6c6409b5dfbf1e688cda1602a44ca38ce6db09a1cb56a84e15366e0f70c241cf6aee2bd6ac9f47595f4 SHA512 96f5e4867454ed666a95fb843a1540514d6114bb40e7df7b6b11f5781851bbae7cf473e7ae0fc5ee361d72d620f57382cde33ee8d777bcbd5e9ffccf68e39d61
+EBUILD tpm-tools-1.3.9.2.ebuild 1157 BLAKE2B 5814481a8573971f5d89f795b02fb09a7c559772f55302a2004d4e45d3e65128448d0e454497f0696e319d632ea972500e29f865dbedc7c530b27b349a71f788 SHA512 4a34636c6382cdee294d9ff29f127a6d44df6d6e8041fd1b4d4952b641256ca03f8557193463ce4d10c6383322b8fb2d91692fb9fe4104c68252e58d0cf087c1
 MISC metadata.xml 620 BLAKE2B 476e96fcb039ddb412218d88dcdd4cf2fff9fab8c1f84d4c8e8388963c3150facf9b23e661c5f3552928fe6695105e8ee713895e88bdcd87b648eec6d2adc59b SHA512 38c4cfaa0c8d3b3f606247d76a52e82e3dab7c487e73780180a197763a695c3d023ac54706c87238f75f2ef8ba6b1913bcfd7769c36506690830fd98b6cb7d6e
diff --git a/app-crypt/tpm-tools/tpm-tools-1.3.9.2.ebuild b/app-crypt/tpm-tools/tpm-tools-1.3.9.2.ebuild
new file mode 100644
index 000000000000..27bfb41b11f5
--- /dev/null
+++ b/app-crypt/tpm-tools/tpm-tools-1.3.9.2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic
+
+DESCRIPTION="TrouSerS' support tools for the Trusted Platform Modules"
+HOMEPAGE="http://trousers.sourceforge.net"
+SRC_URI="mirror://sourceforge/trousers/${PN}/${P}.tar.gz"
+
+LICENSE="CPL-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~s390 ~x86"
+IUSE="libressl nls pkcs11 debug"
+
+DEPEND=">=app-crypt/trousers-0.3.0
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	pkcs11? ( dev-libs/opencryptoki )"
+RDEPEND="${DEPEND}"
+BDEPEND="nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	default
+
+# upstream didn't generate the tarball correctly so we must bootstrap
+# ouselves
+	mkdir -p po || die
+	mkdir -p m4 || die
+	cp -R po_/* po/ || die
+	touch po/Makefile.in.in || die
+	touch m4/Makefile.am || die
+
+	sed -i -r \
+		-e '/CFLAGS/s/ -m64//' \
+		configure.ac || die
+
+	eautoreconf
+}
+
+src_configure() {
+	append-cppflags $(usex debug -DDEBUG -DNDEBUG)
+
+	econf \
+		$(use_enable nls) \
+		$(use pkcs11 || echo --disable-pkcs11-support)
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-crypt/tpm2-pkcs11/Manifest b/app-crypt/tpm2-pkcs11/Manifest
index 82a623ea012f..74dbe887b3d9 100644
--- a/app-crypt/tpm2-pkcs11/Manifest
+++ b/app-crypt/tpm2-pkcs11/Manifest
@@ -1,5 +1,4 @@
-DIST tpm2-pkcs11-1.3.2.tar.gz 1260000 BLAKE2B 219af608db4c72b9bd6c471af9499a4e78a4c9ba6afff72681830cd2f6ce174bc684b9b33c16d263bd6069f0f17f3c92afc56b03779aea38236f36232cd0e5ce SHA512 cca15ace5e6c576591c3432eabb0de98f276a334785b021aa28601c9a77686737c23702fd0ac384feeaf71c8966eccc0006ba428b400de58f811848538ffa978
-DIST tpm2-pkcs11-1.4.0.tar.gz 1334539 BLAKE2B 7f165fab37577903da98c5d3c134fe22e0f630e9494061fe8ced3293b96e2c830650090d8aa349c8ce57fea74c07774415279ef5fbde8db628c8607f2b3203cf SHA512 b271500c7aab256edf4b9e070e700bbc8162db070cd8dfe49289db60d8c4527b8e54c794beb8c97fda0d989e095ac6cb790898912993db1906b7139942c87ffb
-EBUILD tpm2-pkcs11-1.3.2.ebuild 1250 BLAKE2B 7216c963db4964e27323eb3c6eb88b186b7edf8bb72900ba91bc28e1753094c730dba75db09cc56478fa97e85f6ca04070865e59ca3a3c53b227347a9ea134d8 SHA512 c728ba486857889aef98f635f74420573689f04f7a8589127fda247110de7f224f750d363b3d95ca1b294d035a1dbdfb995cc4b21e3aed6e40004f05ee90232b
-EBUILD tpm2-pkcs11-1.4.0.ebuild 1346 BLAKE2B a2439527a123b86c3fec733224e3988ecebceca10ec1bf55dda86a63a7116dfef0716e6705457d2f98116972287d64ca2c2a14108d658b9774bb5f2c9cc5c66c SHA512 c579cb36906cdacd8bdc922564855ac6daf4182a0e00f4b3958c261400f232ec6863134b2d4078fdd833d58fdd76f539238add7f8739ad41b27798262393aeed
+AUX tpm2-pkcs11-1.3.2-Remove-WError.patch 356 BLAKE2B d3c124abbad2e3f8a818091293156840e22fca3aa59b59ff8af4f5e3ddd351e56e1619c647b89fd84df7e804bfccd608a1c9ea89d586ca84eb0326d3563ebf79 SHA512 4cd405ff046fd209bcc543c55514e5750007f76e2ed014bcf50975d62493feee0173c0649a06632d2aff2bcd39375be4ec5d341ba75558a257edf7a4ae03a63c
+DIST tpm2-pkcs11-1.5.0.tar.gz 1355121 BLAKE2B 9c00deb62bf30e22ef346bcdf951252913709f6c953f45e68df35cea434e55f79a960fea16aaa46794650c0cceaf979f4250af8cc835e48f34aca5b2306f2685 SHA512 999adf3ea031dfbb0eadefbd6b2c5457bff738bad231efa70218032f851fe5ba466e37bdf47b5bce380c378b97e88b2a76c9b59a264db5c5f380a9ba3cce58a0
+EBUILD tpm2-pkcs11-1.5.0.ebuild 1556 BLAKE2B f8c03e4058c93fe7866f24cbfe10c41e8cce5f1c7547f5db6877a008b8a5bce8d51f86cdc4f6ab855256af395befece75fdac581285b385ce6acd03b6f08ac89 SHA512 2fec1928477aeacaa54e1760b3669aec86213768ab5001cd2f88df1dc6d0e086b624bb2b9beee04086c978bfaf5a64429010c5883887b4588ba7560b172defa9
 MISC metadata.xml 439 BLAKE2B 6f2f3a6188973cfdc23515761b9ac0a1a67d644374de859c8f493874c79b8802a8cfdab9635ff6af3eb03cf925fc22214da23a26738b51d5dd3c0d5c9e78af72 SHA512 0d819fb83133364a6ff8fa22a868e4a88101ca1d72d2552e007e25be1f4ea7da9066556123879035962f36910dd5eaf2f5b5dc613c8e7807ab383084185bef41
diff --git a/app-crypt/tpm2-pkcs11/files/tpm2-pkcs11-1.3.2-Remove-WError.patch b/app-crypt/tpm2-pkcs11/files/tpm2-pkcs11-1.3.2-Remove-WError.patch
new file mode 100644
index 000000000000..7aae19c7c71f
--- /dev/null
+++ b/app-crypt/tpm2-pkcs11/files/tpm2-pkcs11-1.3.2-Remove-WError.patch
@@ -0,0 +1,12 @@
+diff --git a/configure.ac b/configure.ac
+index 3088817..d789ce9 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -460,7 +460,6 @@ AS_IF([test x"$enable_hardening" != xno], [
+ 
+   add_hardened_c_flag([-Wall])
+   add_hardened_c_flag([-Wextra])
+-  add_hardened_c_flag([-Werror])
+ 
+   add_hardened_c_flag([-Wformat])
+   add_hardened_c_flag([-Wformat-security])
diff --git a/app-crypt/tpm2-pkcs11/tpm2-pkcs11-1.3.2.ebuild b/app-crypt/tpm2-pkcs11/tpm2-pkcs11-1.3.2.ebuild
deleted file mode 100644
index eacca8899f54..000000000000
--- a/app-crypt/tpm2-pkcs11/tpm2-pkcs11-1.3.2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1
-
-DESCRIPTION="A PKCS#11 interface for TPM2 hardware"
-HOMEPAGE="https://tpm2-software.github.io/"
-SRC_URI="https://github.com/tpm2-software/tpm2-pkcs11/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-# Test requires the IBM TPM simulator that's not in portage
-RESTRICT="test"
-
-RDEPEND="app-crypt/p11-kit
-	app-crypt/tpm2-abrmd
-	app-crypt/tpm2-tools
-	app-crypt/tpm2-tss
-	dev-db/sqlite:3
-	dev-libs/openssl
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/pyasn1[${PYTHON_USEDEP}]
-	dev-python/pyasn1-modules[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]"
-
-DEPEND="${RDEPEND}"
-BDEPEND="sys-devel/autoconf-archive
-	virtual/pkgconfig"
-
-src_configure() {
-	default
-}
-
-src_compile() {
-	default
-	cd "${S}/tools" || die
-	BUILD_DIR="${S}/tools" python_foreach_impl distutils-r1_python_compile
-}
-
-src_install() {
-	default
-	cd "${S}/tools" || die
-	BUILD_DIR="${S}/tools" python_foreach_impl distutils-r1_python_install
-	dobin "${S}/tools/tpm2_ptool"
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/app-crypt/tpm2-pkcs11/tpm2-pkcs11-1.4.0.ebuild b/app-crypt/tpm2-pkcs11/tpm2-pkcs11-1.5.0.ebuild
index be28c64da7ec..37841aeebeb0 100644
--- a/app-crypt/tpm2-pkcs11/tpm2-pkcs11-1.4.0.ebuild
+++ b/app-crypt/tpm2-pkcs11/tpm2-pkcs11-1.5.0.ebuild
@@ -3,11 +3,11 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_REQ_USE="sqlite"
 
-inherit distutils-r1
+inherit autotools distutils-r1
 
 DESCRIPTION="A PKCS#11 interface for TPM2 hardware"
 HOMEPAGE="https://tpm2-software.github.io/"
@@ -19,25 +19,35 @@ KEYWORDS="~amd64"
 
 IUSE="fapi"
 
-# Test requires the IBM TPM simulator that's not in portage
+# python-pkcs11 is required but not in Portage. python-pkcs11 in turn requires
+# aenum which is ALSO not in portage. Futhermore, aenum has a dead homepage.
 RESTRICT="test"
 
 RDEPEND="app-crypt/p11-kit
 	app-crypt/tpm2-abrmd
 	app-crypt/tpm2-tools[fapi?]
 	!fapi? ( app-crypt/tpm2-tss )
-	fapi? ( >=app-crypt/tpm2-tss-3.0.0[fapi] )
+	fapi? ( >=app-crypt/tpm2-tss-3.0.1[fapi] )
 	dev-db/sqlite:3
-	dev-libs/openssl
+	dev-libs/openssl:=
 	dev-python/cryptography[${PYTHON_USEDEP}]
 	dev-python/pyasn1[${PYTHON_USEDEP}]
 	dev-python/pyasn1-modules[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]"
+	dev-python/pyyaml[${PYTHON_USEDEP}] "
 
 DEPEND="${RDEPEND}"
 BDEPEND="sys-devel/autoconf-archive
 	virtual/pkgconfig"
 
+PATCHES=(
+	"$FILESDIR/${PN}-1.3.2-Remove-WError.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
 src_configure() {
 	econf \
 		$(use_enable fapi)
diff --git a/app-crypt/tpm2-tools/Manifest b/app-crypt/tpm2-tools/Manifest
index 741b1437cdb9..d5b9f54e1603 100644
--- a/app-crypt/tpm2-tools/Manifest
+++ b/app-crypt/tpm2-tools/Manifest
@@ -1,4 +1,7 @@
 AUX tpm2-tools-4.2.1-libressl.patch 825 BLAKE2B c6cd9fd6f8aaacd3aa672a31fd727cfae6c64a015e95e2e0fb282b541168a8ad7a45c65186a18651c3bf6d4252de951891b03719c472b0b23639fd1c09729132 SHA512 202aef9a49c9ace31cac0030867c9842c7426e1c11a16c95740fc8818ef83d7e4c7723b09ef372dc8958576f8204f94aa1bd0a8fb7782c6e7b3eb1f37b675cf5
-DIST tpm2-tools-4.2.1.tar.gz 879294 BLAKE2B 7619f72f0fe39360f111822b4ec7a0bb90156f295977115c4612efac33059dd786abfa5d5f46a8fcc134fce11d099b03cb7f9ee01aa3addf5a3bb2455e1eb2d4 SHA512 4da103e70880d72a9aa402dea39ea439a0657729af22f08ac7275022c475ab46cb3dd6123d6846669d9b7f8f9af7b3e3df7c3b1d33cd0149b649b7941c84c339
-EBUILD tpm2-tools-4.2.1-r1.ebuild 920 BLAKE2B 59f32bcbb807f20891c5205a03b437c849878131f436090b309907c431b1b2ab57be199d1a3979df7dbd98ed3d60126ab33bc6631238b7ce9d3dac43e89299b1 SHA512 71efa17243b2831214d292e210e05d12ae4049f6b9c28070daf4184d4edab8b028e3da769072238095dfa9fba9d9667a58e285ac600dd82ea1000a6c47df9ba0
+AUX tpm2-tools-4.3.0-Remove-WError.patch 360 BLAKE2B 440f48fca6e8aaf9b2c0fd094011738c467a22dc31bd94b53f6788b8fa52c00c5d7ebe074434be60b6370dcf1e94ee4d57bcfc93857fcf03dbdff30c8e157445 SHA512 0d246d1446b5b2ebca0e12467c746a731897311448840a7aac35b57d22edcdec0c9f424d1c95c9614d969a57dba458bbbad8826516cc05329b47d2dad05318fe
+DIST tpm2-tools-4.3.0.tar.gz 881544 BLAKE2B 0415f30845658e84e97a964abebc3082e45fb880c10bec405cd89c7bfa373ace10b669c4af78e7e47f2d2bb62fc7cc34b2e54e392a95c8f9b8956b8c92af6aee SHA512 4e622bbc8642ba7fd93a7343900560fe3779cba03e363d16f391fc8929724a11913d238e3986de06982cbced27c3c2ca8c7e73d75796407b8646c101ccf393a8
+DIST tpm2-tools-5.0.tar.gz 990855 BLAKE2B 5d39bbef0bc6f0d84f37c64c697260343a9f9e134bce015a6b529176195adb907672f35b85382b0a4785e40e368030ac347083086c3799bdfe86dced1ac69848 SHA512 ea57a28a61e28b78cae7067ff58facd8754fafab7a2689fd93f8b3374073b6ac30301a75f8ff5c654800ab469ee6604d0b8a86c310631b9545b816ecaa05968e
+EBUILD tpm2-tools-4.3.0.ebuild 1034 BLAKE2B bd21c6df2ee04a4142106433037c5b128dd640ef3682ad95337fa02ab26ab9db8a83634f6c4da96626b7e0561cacc0c9caaa76f176d734ec7c3bc391c58e6908 SHA512 8fee1ec42475cddb2c0ba7944f3535481baf084ee10235ba61b2b45fc321dc9d96b9dd976aa3568370e7d1dc8daef4515d58c32a633739a06e999ef7a627e3e6
+EBUILD tpm2-tools-5.0.ebuild 1034 BLAKE2B a00c8bf40b3484ab0e35945db2d8c6731ab3caa28b8df935f3dab6292e0c9210a371c9ec612850a7e19f15f67a39f1009b373d975cf603e3a0725bbc81805072 SHA512 b48935ce3f285b8b8a72d1e22055b1365d6bf54bd576770023b4a6a4a0c8f2ff7b6cc092c4583a5553efe5cce422ff7026182c66d06a51a159af1f09985caaa6
 MISC metadata.xml 525 BLAKE2B 5fa89e3cfb69fe00abe745690aafc6e45b8394e1673521049ae2bb834454f3100ef65d4080010c4fed7265bcd6c9dd6cb9015a159674bb71622646d5dd5dd57b SHA512 533cc4a3dc31600a948c931d144eeee3cdb265286677966ed7bf26953deec79f1c9e0c2c7152e1a5ef3bc067bbc3d88a7ae0678b9395be3a7b01d76976a9a4d9
diff --git a/app-crypt/tpm2-tools/files/tpm2-tools-4.3.0-Remove-WError.patch b/app-crypt/tpm2-tools/files/tpm2-tools-4.3.0-Remove-WError.patch
new file mode 100644
index 000000000000..caa3fac23bf4
--- /dev/null
+++ b/app-crypt/tpm2-tools/files/tpm2-tools-4.3.0-Remove-WError.patch
@@ -0,0 +1,12 @@
+diff --git a/configure.ac b/configure.ac
+index 7b5c2196..d07d5433 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -210,7 +210,6 @@ AS_IF([test x"$enable_hardening" != x"no"], [
+ 
+   add_hardened_c_flag([-Wall])
+   add_hardened_c_flag([-Wextra])
+-  add_hardened_c_flag([-Werror])
+ 
+   add_hardened_c_flag([-Wformat])
+   add_hardened_c_flag([-Wformat-security])
diff --git a/app-crypt/tpm2-tools/tpm2-tools-4.2.1-r1.ebuild b/app-crypt/tpm2-tools/tpm2-tools-4.3.0.ebuild
index ea91b076cb65..7ccea9899c4b 100644
--- a/app-crypt/tpm2-tools/tpm2-tools-4.2.1-r1.ebuild
+++ b/app-crypt/tpm2-tools/tpm2-tools-4.3.0.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=7
 
+inherit autotools
+
 DESCRIPTION="Tools for the TPM 2.0 TSS"
 HOMEPAGE="https://github.com/tpm2-software/tpm2-tools"
 SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz"
@@ -24,9 +26,15 @@ RDEPEND="net-misc/curl:=
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 PATCHES=(
-	"${FILESDIR}/${P}-libressl.patch"
+	"${FILESDIR}/${PN}-4.2.1-libressl.patch"
+	"${FILESDIR}/${PN}-4.3.0-Remove-WError.patch"
 )
 
+src_prepare() {
+	eautoreconf
+	default
+}
+
 src_configure() {
 	econf \
 		$(use_enable fapi) \
diff --git a/app-crypt/tpm2-tools/tpm2-tools-5.0.ebuild b/app-crypt/tpm2-tools/tpm2-tools-5.0.ebuild
new file mode 100644
index 000000000000..3252b0db14e7
--- /dev/null
+++ b/app-crypt/tpm2-tools/tpm2-tools-5.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Tools for the TPM 2.0 TSS"
+HOMEPAGE="https://github.com/tpm2-software/tpm2-tools"
+SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+fapi libressl"
+
+# Integration test are now run as part of the testing suite, which will fail
+# because none of the supported TPM emulators are in Portage. In a future
+# version of tpm2-tools, swtpm will be supported and the tests can be run.
+RESTRICT="test"
+
+RDEPEND="net-misc/curl:=
+	>=app-crypt/tpm2-tss-3.0.1:=[fapi?]
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+PATCHES=(
+	"${FILESDIR}/${PN}-4.2.1-libressl.patch"
+	"${FILESDIR}/${PN}-4.3.0-Remove-WError.patch"
+)
+
+src_prepare() {
+	eautoreconf
+	default
+}
+
+src_configure() {
+	econf \
+		$(use_enable fapi) \
+		$(use_enable !libressl hardening)
+}
diff --git a/app-crypt/tpm2-totp/Manifest b/app-crypt/tpm2-totp/Manifest
index a18481c54bc4..c26fde8d1b47 100644
--- a/app-crypt/tpm2-totp/Manifest
+++ b/app-crypt/tpm2-totp/Manifest
@@ -1,3 +1,3 @@
-DIST tpm2-totp-0.2.1.tar.gz 427226 BLAKE2B e6a9dbcdac4d7fc31048aff968e3eea097752c79a3c1b8551d22558a6b143a758e7bb507722185c648000f4b1edd2f0bbdd443890b5763b297f3d42cfbd84d9d SHA512 2bda34e89b76319a40206e08c0208b0f139309c0b0e40e7168b5e7562096750df504dfcae3a39e6f82fdccbf7a79ed0802d115fbd7560dc3f5b52d81fe8fb59c
-EBUILD tpm2-totp-0.2.1-r1.ebuild 696 BLAKE2B 4adbf823093d5e8868fe20d0c1bec2c86afa1d5b32b7800ae3a040fbb77b244bb9e1999d20d9a5bce6f367e6ee5093e465d22a29f3e2e2acb7217ffd69a5b2ec SHA512 aaa9cd2384921a0b723ef6ee9b661b5eb8a42aa8a8124d0747dcf70b49dfc2e2ac8320e97bb731a83491e1f1e8c3642aeb271f1570e3318f4264fdb87d046c12
-MISC metadata.xml 457 BLAKE2B a9c8431a32d462bb22c6362828b488746c0ec6f7cb0e2990894db416eedc1b0093b2b6a34cf05797ffe1769c5706f41099ec0a239904d3cd66f948dbe330d12c SHA512 eb49af2e52b354ee329f7bff699ad3a8d30efb83162f907806896021a54fd6d8cc17fa3ba037332004fed460576b4c1ac2e7323ff10331e053d8423540f17542
+DIST tpm2-totp-0.3.0.tar.gz 428874 BLAKE2B 413f4418cd1ce9a996f36c83e27c3fe256b2d3f5ff36e7df1dc1b651e38afa222be9742d5cfa76287263a4e1402dabea3400b41a1e1bde9f31fe03f82894f4f1 SHA512 d47cc8155a60a464afe602c3114ff8e6b2ff825457e6069693947421716b97c34b00f70adbcb4cda1b5b9639b8a3dfc7800295bbff99822da7a8077ebf78d6b2
+EBUILD tpm2-totp-0.3.0.ebuild 994 BLAKE2B d9b207eeb13a40283cedd2993049d09bab514d93cc71071d6332a6d589280d39908cbb1f5b69e9c014aa7e531d2e67498a66131e1389a8c52f6b7e3f93a990e2 SHA512 bcdc1cb8bee0503710d1d673ace426fb340e6a3982c237b09cdfb4f2a9c8370209e9e099a9a56262938a51348790082411323fb30650354aff25d29b20f2952d
+MISC metadata.xml 544 BLAKE2B 4c6496211180d7893b35163eab8ca8f6a6cede115470f0e4bbeaaed773d81c8d08cd45949276e33842d321bd4834f978ef1f1fff09545c261fe02e0add3b6a52 SHA512 47d8998acc8e248fd70743a7cd53ecfd04f9ffdd5f0332be0efb5cf6112d0909044b9562e2401b9d7f6f98d5dd008dd71d56d8c2c85847536d18e93da706122e
diff --git a/app-crypt/tpm2-totp/metadata.xml b/app-crypt/tpm2-totp/metadata.xml
index ff3a177c4bdd..fb1b2ed30d06 100644
--- a/app-crypt/tpm2-totp/metadata.xml
+++ b/app-crypt/tpm2-totp/metadata.xml
@@ -12,4 +12,7 @@
 	<upstream>
 		<remote-id type="github">tpm2-software/tpm2-totp</remote-id>
 	</upstream>
+	<use>
+		<flag name="plymouth">Add <pkg>sys-boot/plymouth</pkg> support</flag>
+	</use>
 </pkgmetadata>
diff --git a/app-crypt/tpm2-totp/tpm2-totp-0.2.1-r1.ebuild b/app-crypt/tpm2-totp/tpm2-totp-0.3.0.ebuild
index e2c2d163e572..b02901ba1dcd 100644
--- a/app-crypt/tpm2-totp/tpm2-totp-0.2.1-r1.ebuild
+++ b/app-crypt/tpm2-totp/tpm2-totp-0.3.0.ebuild
@@ -12,12 +12,26 @@ SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/v${PV}/${P}.ta
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64"
+IUSE="plymouth test"
+
+REQUIRED_USE="test? ( plymouth )"
+
+RDEPEND="app-crypt/tpm2-tss
+	media-gfx/qrencode
+	plymouth? ( sys-boot/plymouth )"
+DEPEND="${RDEPEND}
+	test? (
+		app-crypt/swtpm
+		app-crypt/tpm2-tools
+		>=app-crypt/tpm2-tss-3.0.0
+		sys-apps/fakeroot
+		sys-auth/oath-toolkit
+	)"
 
-RDEPEND=">=app-crypt/tpm2-tss-2.0
-	media-gfx/qrencode:="
-DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
+RESTRICT="!test? ( test )"
+
 src_prepare() {
 	default
 	eautoreconf
@@ -26,7 +40,9 @@ src_prepare() {
 src_configure() {
 	econf \
 		--disable-static \
-		--disable-defaultflags
+		--disable-defaultflags \
+		$(use_enable plymouth) \
+		$(use_enable test integration)
 }
 
 src_install() {
diff --git a/app-crypt/tpm2-tss-engine/Manifest b/app-crypt/tpm2-tss-engine/Manifest
index ee8ecb9f8a07..f31212c9f9d0 100644
--- a/app-crypt/tpm2-tss-engine/Manifest
+++ b/app-crypt/tpm2-tss-engine/Manifest
@@ -1,3 +1,3 @@
-DIST tpm2-tss-engine-1.1.0_rc1.tar.gz 38749 BLAKE2B 74063555404f2c61a21ba05f0eb1217fa78db4296d48712dccf1a113f5b7edef3d10f3347b955562a97f974342eeecdedebf0f2073551c4d0e4277b8320f72b7 SHA512 e5620886c3b27fea3a51ff136bddaa6eb5d57277ca29a79964cd600703b03447341a535bb46079c15caf96cfe6f45943322b2f2dd0c48f453d6b9c57e76989bc
-EBUILD tpm2-tss-engine-1.1.0_rc1.ebuild 877 BLAKE2B e4c94cd2a0ae1d384d184a6e61b0aca663486ac575c082c479034274b4ce3d60843c543bdfeaae6ee45115e370b4850cd67e7f85349c109afb4a39e5c54936cf SHA512 415b82124ab4285c6fa3ab8fb3158f2c2100447dd80c82eec3389be3937496d8a4f43ed96da8f62d9154bdc332b5a37f0be774daee5728ce38a8bd45ace74c11
+DIST tpm2-tss-engine-1.1.0.tar.gz 394448 BLAKE2B 0502907dc9ce872f31be3b980f975a02af2e3e4b369d188afa5327bd4475d93dbf43769dc7ddc11e8cbda8d1fde09f28a9aef9145e859a90225cd397f62c7a2c SHA512 5d2e08178be54350e8672245023d601a0d9d520f8c49e977af49d7c59b91d033c14b4a347b71e042fe7c5ff12af9fcc43b69fd1dc83a9f0db12d47d43e1107f4
+EBUILD tpm2-tss-engine-1.1.0.ebuild 824 BLAKE2B 468c0e8f67cf86c2b7aec7466bcba1ef7180ac24c73f1716510a53f79f0f0aaffa5df7d80276ddf9a6784dae9661650c11bf858fb03734918bc0d618f785e428 SHA512 b4a7b735533ffe077aad28c0cae60f0e611fe5b58b8dbd0bd87195e19a76d8dde7506f115f29ff86e4b93a7e3de8cc5fe923eb65db0e11ab9a058a6ba9793193
 MISC metadata.xml 463 BLAKE2B 7e0574fa7ade812b4a7176f30d0218a70e0396f2c76ccaedac3cc50ffd0aca7581f7b6075ee98828634d7f3b6b7af63059bfed2eab84b52fce418ee787e237be SHA512 b6d0746d2806d1e1f2a741b5ccd97abfc74e6fd8562796175a900ebf28244d8b3a8a1d9cc4bcd70cf51abd66eb180594f972e03c68deed57fa0023d726b6227b
diff --git a/app-crypt/tpm2-tss-engine/tpm2-tss-engine-1.1.0_rc1.ebuild b/app-crypt/tpm2-tss-engine/tpm2-tss-engine-1.1.0.ebuild
index 48317f9f77c1..3a7aa01ae008 100644
--- a/app-crypt/tpm2-tss-engine/tpm2-tss-engine-1.1.0_rc1.ebuild
+++ b/app-crypt/tpm2-tss-engine/tpm2-tss-engine-1.1.0.ebuild
@@ -5,11 +5,9 @@ EAPI=7
 
 inherit autotools bash-completion-r1
 
-MY_PV="${PV/_/-}"
-
 DESCRIPTION="OpenSSL Engine for TPM2 devices"
 HOMEPAGE="https://github.com/tpm2-software/tpm2-tools"
-SRC_URI="https://github.com/tpm2-software/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
@@ -23,7 +21,6 @@ DEPEND="${RDEPEND}
 	test? ( dev-util/cmocka )"
 BDEPEND="sys-devel/autoconf-archive
 	virtual/pkgconfig"
-S="${WORKDIR}/${PN}-${MY_PV}"
 
 src_prepare() {
 	default
@@ -36,7 +33,6 @@ src_configure() {
 		--disable-defaultflags \
 		--disable-static \
 		--with-completionsdir="$(get_bashcompdir)"
-
 }
 
 src_install () {
diff --git a/app-crypt/tpm2-tss/Manifest b/app-crypt/tpm2-tss/Manifest
index be3e35ae7877..80aa0f97c88c 100644
--- a/app-crypt/tpm2-tss/Manifest
+++ b/app-crypt/tpm2-tss/Manifest
@@ -2,10 +2,11 @@ AUX tpm2-tss-2.4.1-Dont-run-systemd-sysusers-in-Makefile.patch 531 BLAKE2B 45a14
 AUX tpm2-tss-2.4.1-configure.ac-wrap-PKG_CHECK_MODULES-in-braces.patch 2073 BLAKE2B 09e64b791b75a6bb673402fe94bd4b4bac91f07f98e9053941470b0f44034d6892e6070aaa08326b25c1567018eef898b6508ded8bdbdfd0dd342ca22d0cdcc6 SHA512 d354f656481db5ead0d48ae0389954cc6735a037a6b09cda251360b937128b5807d4b3c5819dbceaa1767db2232ff8dea2f00af3998c182ee3533f97365aeda2
 AUX tpm2-tss-2.4.2-Dont-run-systemd-sysusers-in-Makefile.patch 452 BLAKE2B 8b05bcdbe62333226d89a0275de8cfaa6b4f87d508a5f5c7da260d713244f468e07fbcb5e5c071bd9f8679dd369120d4d41c3c2d9a6c6cf81e17498e1a8b397b SHA512 c8255213c3712cc9f0bdce0080c9f14644926bd45103c89e0dfdbd8dfb4d4c1168bd6c0582b4c671d4c65f6b965246eaefb86e9ae2f43d354a67584f97ef9745
 AUX tpm2-tss-3.0.0-Dont-run-systemd-sysusers-in-Makefile.patch 478 BLAKE2B 0739aa873be6b3faa025fc38ab562da07afc0a7016856bc99f5b1fdd9202a24124d8f5789de0381ec136480cf24337754ae795f84252d8b38ead94dee1362317 SHA512 d94fab5dca4823a5839e54a1a284331dda449b7a76b01de390cf21535e88531b002b433ec0b4b8246c0f16417b2116ef4a6c63863c0aaf151f1885f0bab66945
-DIST tpm2-tss-2.4.1.tar.gz 1445103 BLAKE2B c7be91b93d19b5afeddb6ec455db9ba06795f8dc76ee2a0c6cbabbd8f623930d7c9fdf6319497c70790445531d1e36fe3f904f4c1f4bc9254d833b6d19280f1f SHA512 51551d63fa404e23664aaad1b247bd4b1f93812ced1aed144c37f28cdb3adb4e696aa9e93a502c8fa0eb7e9b4376ac9377f0537eb4c717b68c0b014fee7a0643
-DIST tpm2-tss-2.4.2.tar.gz 1461987 BLAKE2B 7d37818ba91c4128862206d5179dcde2c5149b5b00807b242a0b4311531ad2da9e8ad435a6b46872aab5eb91777012010a352ba0f478737740175e0353275643 SHA512 db31d216abcefdad76f5d9ff2995c99c552400392a4dec800b962fa1fa3ac83effacca831602a9b7f814045c996a1bb066802c5373b54233aa24ddafd636c27e
-DIST tpm2-tss-3.0.0.tar.gz 1509288 BLAKE2B 23c46ba6c9ea2b61703556d3aab5b4e75b1a0242a688c44e8c254a4defd8258e100a933598755373ffec9db3ca0ab9d35e6a290a73851c2a456449e04bd8313a SHA512 ba54904f2cd8cbcca85ce4d4ac5c8650da6ab076e8d8d142e1b7ee75c5e9a645520f1a5ac8ffe5269deceba84762c9074b131296e8b2d4c684ddc335a828d7a8
-EBUILD tpm2-tss-2.4.1.ebuild 1773 BLAKE2B 0b8ad6d1eb92cae0c57fa37a28b3415427cf0a6310aa120e4224dce23c433e8f9dfd8b1005717d4c8e1672c3e59a8c1ce6119e67327cc23bdb999069eb464373 SHA512 a609ca5ff1c17ce961335d0eaabd53a11a7c9d9090f83004bfe336dfa2e85b04d09937e26336f26be044c258668adc8fbab568f2d3dd45670abaebd7b77b8ca7
-EBUILD tpm2-tss-2.4.2.ebuild 1703 BLAKE2B 853fb221ab9c00a9f13ec06e57047595ebe611625d2ff405a29fb79b53a11d9546e3ae910e46f5a5ac1afdd8f3a314eb64bd7453f9e1e8ae629e1f0971e14ac8 SHA512 075ff834e07e11c8df2fadce856441bb45f1e30c47c46f839e5e6b5487edb4bb87ad1b27be239b0261ab4e6a583a611bdf69493e5e890388b0d813ed14d2bd2f
-EBUILD tpm2-tss-3.0.0.ebuild 1700 BLAKE2B 757cfe421b8efdadddc692c87d022a4cc9b2cb81b8f164853a0452007b41e6507275e2d6843e9893accdb12cdbf013f8a4c378454535fc5bb2d22a3c7b372615 SHA512 4c8002a932997356daf5cf3ac4aefc26baf5bb3624a8369ba4ff09a81092c6516ca40037e002016f65e5f9361a1a5fe6c8e32db95266c4ab0d5915aaf9fbea0c
+AUX tpm2-tss-3.0.1-Fix-underquoting-in-configure-ac.patch 990 BLAKE2B 275ce64a386e1d3a5e458b7914c9885e196d40f44d1af57bf2925f0c794946884ea9ebbf60e82ccd747986f9f8feaefa07f43742353a4da99f1fd13d17196975 SHA512 02c3c6f0cbb9f5a70988e7ba7c27d2b19b2ba74c024ca34f71f9803bdac4935b19bd0650bd9069b0c628e2a72449ed69710f59f576261aa68884777bf8f0d7f7
+DIST tpm2-tss-2.4.3.tar.gz 1439120 BLAKE2B 21acce29f96e8039124874c024b43eb8d2c4ffda27db58bb4f34446747c0fa6953c6ca390f8e87d22c1349123bada81051b119eaf7a28c7d1ad8a9195287c312 SHA512 4adaeb2724b720017e9d488f66de879ebdc0dbc2a4f7536493214913a49d2c631e302be26f710f0f45b0d514212cb036ca7ba9715ee13c29dda1d4a61595aa27
+DIST tpm2-tss-2.4.4.tar.gz 1440127 BLAKE2B f5db64281af92bc74d92ecffedbaa051aef21277d8c1c56fb0eb2c47fdebc12772eb18a7c2a2cb671730a1089227f756314ee02acfaa5307fedbfddb86565a81 SHA512 df35bace1744a93e5072a26490e7724604fcc8b04f2b1be71be0069750b8cff7ca4c5c6134e54fbe76f0797d5e83dcfbc8ce248a800d064fbf3be9e3e4745f73
+DIST tpm2-tss-3.0.2.tar.gz 1489725 BLAKE2B e68a6ce24070c9f4966367ecd55cef324b0bef2786dbcdedb894a19dcd71fbb2eda473f612885db4c816c6c2c15711ee192d441be6eb6fd665dd13180e70b556 SHA512 0b295bb1a135c904344e8a11ae9a293f71d60ea045bacd59a9b778ba19e88e1b91022f24a4775615c215db450584574901838146bc4d4d286ee8b686b72b0bab
+EBUILD tpm2-tss-2.4.3.ebuild 1706 BLAKE2B 8093b404fa89ac49f22375f59b4f9e4f77e6f73fbb63841734f02413ce26d78c5f689630ee085419e3abb70e0b27d9bc341ca10ed329c5f0e676fdd65a760cbb SHA512 96e2af5daf4e0ad4ac2fa98afa35438383b56a61da704db591ffe502d35ae092c952674504d93758ddfdf7d39ee1bf91bd8a1b41f807188858a6314d6fc4a393
+EBUILD tpm2-tss-2.4.4.ebuild 1789 BLAKE2B e87e5282b9fffc2a2cc69ec2fe2911abea2ae8b2f339c8f15a1224c3dc747a2762d92ffd708ddc97b20c296ed9d61a7bdf94c60982a7eca8594abaac896b760d SHA512 b998791025a6a3ceff0a874b69bb3fa846462d19f99864a8abdef1915e7f8663ae183ea09c79e8c36f00e37f9d5513a6bb4cfbadb1ee0e4889534484ceafbdb6
+EBUILD tpm2-tss-3.0.2.ebuild 1780 BLAKE2B 89aad07e3a6bf66825d898bb98001a42f0cdcac534723e8ea6a2d5506eeabed823eb2958f4a1d50d35e10f4ff3699eb506ec5dee9da04415a04f92815d4f1807 SHA512 222bb72f83518a459fd777773034a101f352a8cfe67f9d6b06e2b5f8658b6b25cf6be522c07f0a6008a32bb9dad73b0e5f6fcd064f0fe7dada7f56dbd245b37b
 MISC metadata.xml 792 BLAKE2B fe3f4ee796a06707683eb6fab993d34075a23267c4838bec5f063187c323b74e81e4e21c9e314be01d2a07853b7d2bbb0288b379c77053d6f6d2c99c372ba3a0 SHA512 7d1441a4bb5fbeb10fce0673f5b572edd4eef3be89184d2296e019b676cddd39d590da558ee3a83eba31cba56caf0eab6ec4b8bff9bed421660a5688ad38ae64
diff --git a/app-crypt/tpm2-tss/files/tpm2-tss-3.0.1-Fix-underquoting-in-configure-ac.patch b/app-crypt/tpm2-tss/files/tpm2-tss-3.0.1-Fix-underquoting-in-configure-ac.patch
new file mode 100644
index 000000000000..a593716c97ea
--- /dev/null
+++ b/app-crypt/tpm2-tss/files/tpm2-tss-3.0.1-Fix-underquoting-in-configure-ac.patch
@@ -0,0 +1,22 @@
+diff --git a/configure.ac b/configure.ac
+index ff59dd7c..3049032b 100755
+--- a/configure.ac
++++ b/configure.ac
+@@ -285,7 +285,7 @@ AC_ARG_ENABLE([integration],
+         [build and execute integration tests])],,
+     [enable_integration=no])
+ AS_IF([test "x$enable_integration" = "xyes"],
+-     AS_IF([test "$HOSTOS" = "Linux"],
++     [AS_IF([test "$HOSTOS" = "Linux"],
+            [ERROR_IF_NO_PROG([ss])],
+            [ERROR_IF_NO_PROG([sockstat])])
+        ERROR_IF_NO_PROG([echo])
+@@ -335,7 +335,7 @@ AS_IF([test "x$enable_integration" = "xyes"],
+              [AC_MSG_ERROR([No simulator executable found in PATH for testing TCTI.])])
+        AC_SUBST([INTEGRATION_TCTI], [$integration_tcti])
+        AC_SUBST([INTEGRATION_ARGS], [$integration_args])
+-       AC_SUBST([ENABLE_INTEGRATION], [$enable_integration]))
++       AC_SUBST([ENABLE_INTEGRATION], [$enable_integration])])
+ AM_CONDITIONAL([ENABLE_INTEGRATION],[test "x$enable_integration" = "xyes"])
+ #
+ # sanitizer compiler flags
diff --git a/app-crypt/tpm2-tss/tpm2-tss-2.4.2.ebuild b/app-crypt/tpm2-tss/tpm2-tss-2.4.3.ebuild
index 6f62e2098b94..011fcaefd4a0 100644
--- a/app-crypt/tpm2-tss/tpm2-tss-2.4.2.ebuild
+++ b/app-crypt/tpm2-tss/tpm2-tss-2.4.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 arm arm64 x86"
 IUSE="doc +fapi gcrypt +openssl static-libs test"
 
 RESTRICT="!test? ( test )"
@@ -33,7 +33,7 @@ BDEPEND="virtual/pkgconfig
 	doc? ( app-doc/doxygen )"
 
 PATCHES=(
-	"${FILESDIR}/${P}-Dont-run-systemd-sysusers-in-Makefile.patch"
+	"${FILESDIR}/${PN}-2.4.2-Dont-run-systemd-sysusers-in-Makefile.patch"
 )
 
 pkg_setup() {
diff --git a/app-crypt/tpm2-tss/tpm2-tss-2.4.1.ebuild b/app-crypt/tpm2-tss/tpm2-tss-2.4.4.ebuild
index 7133a5cfcb7c..67d6b4fa14c7 100644
--- a/app-crypt/tpm2-tss/tpm2-tss-2.4.1.ebuild
+++ b/app-crypt/tpm2-tss/tpm2-tss-2.4.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="doc +fapi gcrypt +openssl static-libs test"
 
 RESTRICT="!test? ( test )"
@@ -33,8 +33,8 @@ BDEPEND="virtual/pkgconfig
 	doc? ( app-doc/doxygen )"
 
 PATCHES=(
-	"${FILESDIR}/${P}-Dont-run-systemd-sysusers-in-Makefile.patch"
-	"${FILESDIR}/${P}-configure.ac-wrap-PKG_CHECK_MODULES-in-braces.patch"
+	"${FILESDIR}/${PN}-2.4.1-configure.ac-wrap-PKG_CHECK_MODULES-in-braces.patch"
+	"${FILESDIR}/${PN}-2.4.2-Dont-run-systemd-sysusers-in-Makefile.patch"
 )
 
 pkg_setup() {
diff --git a/app-crypt/tpm2-tss/tpm2-tss-3.0.0.ebuild b/app-crypt/tpm2-tss/tpm2-tss-3.0.2.ebuild
index b746508251c2..a5458854763f 100644
--- a/app-crypt/tpm2-tss/tpm2-tss-3.0.0.ebuild
+++ b/app-crypt/tpm2-tss/tpm2-tss-3.0.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="doc +fapi  +openssl mbedtls static-libs test"
 
 RESTRICT="!test? ( test )"
@@ -31,7 +31,8 @@ BDEPEND="virtual/pkgconfig
 	doc? ( app-doc/doxygen )"
 
 PATCHES=(
-	"${FILESDIR}/${P}-Dont-run-systemd-sysusers-in-Makefile.patch"
+	"${FILESDIR}/${PN}-3.0.0-Dont-run-systemd-sysusers-in-Makefile.patch"
+	"${FILESDIR}/${PN}-3.0.1-Fix-underquoting-in-configure-ac.patch"
 )
 
 pkg_setup() {
diff --git a/app-crypt/trousers/Manifest b/app-crypt/trousers/Manifest
index b4ff7d1c0183..9c42a58cb841 100644
--- a/app-crypt/trousers/Manifest
+++ b/app-crypt/trousers/Manifest
@@ -7,6 +7,9 @@ AUX trousers-0.3.14-Makefile.am-Mark-tddl.a-nodist.patch 746 BLAKE2B 91dec77a329
 AUX trousers-0.3.14-fno-common.patch 385 BLAKE2B 7ed20c894c4687275804adf8d820227e5b246f02880d38b29dc6a17d12a4932059f237913f8d1841d56ee32c652cf732c01e77cd1235255b8e2fc28bc9a78027 SHA512 cf771b065d972b9974c93ec67a471a8ed3da737178a14b2d14537ee7948544bcbf071201d42d6e2b1333a3c30e8104cd1dbb344327a424597e5046e50137a692
 AUX trousers-0.3.14-libressl.patch 877 BLAKE2B 6416ecf1cf99678299e4ac39756920de61e598ec9b9c91c17cf8eddfa10af145b813756e2fae3b39fef8682eeb2ee722b3979d52570f41b99708fb4ba2cebe2d SHA512 3aba9ec7554d4fdb941063f771b40c5700efefdbb6e5df186824e93a6b2c61801acb4be60cdbe71dcee9360c0f59229e5d17f1a18aa981132807b5e74efc2d59
 AUX trousers-0.3.14-tcsd-fixes.patch 2203 BLAKE2B 8085cfd36817e35d54d39a012037945440fcae6e5040f7a7fd35a3c814df93264382a87eb06758b6042b64bef851ab3d5f5e424c2b946c0d1eaa92ebb97a733f SHA512 cc2827ed501cc29dcadd00537161804a62918c9dc703b2a773227aaf74a695d026b44c70848819a78b01cc785831117ae9dfa1d4c30133241b97dd32e8e838ba
+AUX trousers-0.3.15-libressl.patch 1018 BLAKE2B b762dfb984f84644e04076aeab8317555961103e0eb9c19e6b9fc5b5635054f0d53121e94d4887cd804628dcedff4c62362298a1bf7f520ff6c5eff6db769745 SHA512 9b0b01a326cc0149ace71f045a38a065e2ca61d640321b253dfc905c81913c97788922214cfe949e871dbf98c5487c61e023032a137b2ee70a4c45f7e1f03484
 DIST trousers-0.3.14.tar.gz 1378438 BLAKE2B 3dc2824fa2ca1b1f1181f98d59e85276e7d38af4bfc07ee8246431d9ccb300a8e0820b318643d4cf5d757d2a49492c8686e2fe9de03484263d2189d4bbaa32d0 SHA512 bf87f00329cf1d76a12cf6b6181fa22f90e76af3c5786e6e2db98438d2d3f0c0e05364374664173f45e3a2f6c0e2364948d0b958a7845cb23fcb340150cd9b21
+DIST trousers-0.3.15.tar.gz 4699936 BLAKE2B 53c60498ed6a9d3d87295b00676e5d0d82452918c35af6b98c7979ffa2dc04dd817e7cd3f4a33ca17c30b90eab53d80b2bb25306fe9db7bda2125019edfed280 SHA512 769c7d891c6306c1b3252448f86e3043ee837e566c9431f5b4353512113e2907f6ce29c91e8044c420025b79c5f3ff2396ddce93f73b1eb2a15ea1de89ac0fdb
 EBUILD trousers-0.3.14-r3.ebuild 1673 BLAKE2B 4c86cb8c9764179850cb778094a3dcdcbd4775955858981e8d5ce958217f51e2d6529059e31f61149156d517fe2f3179f7d85ae9a4724f3c2f1aa9c34da6bd84 SHA512 555038110e4fe3ff35c5fbfb9d1f35e3f72345dbbd31381b0de9a4f09404c1241456088d185c5dc2d94eda55d54277820d9a8145493b8499f1734bfb7f6413e2
+EBUILD trousers-0.3.15.ebuild 1597 BLAKE2B a402299093ac80756a929fd82b503c5ee718969fb4676a83d58a027ae3b2174bdc988d6a7e505ba64a5e9057143d7e2601e8698ca078bc2f8a4734aabc1d3c3d SHA512 1ff94752e3051e2d469e0f73f094ac7336b41b809cabaf8781925889da8f0d23bf52cabb9c0553c75c4a176a2351f58d8a32cba53acffff4ace5366ce913d29f
 MISC metadata.xml 507 BLAKE2B 1674e8c11713df517fd8d2aead0b5207a114de5b34559ed1b1a2527e73ee7e749a13d5a7e10330f940bc61c51ed9083e3ce423db428503f25295e1fd3b64d576 SHA512 f1c304734694001da4b95f1f18cb6891d3fc9df1db1013ad7155b2f60fd466f46947b3fa9e78d50c2a4a2fb1d0ca98b8ebb8017dde2bfcadd847e422df8885d7
diff --git a/app-crypt/trousers/files/trousers-0.3.15-libressl.patch b/app-crypt/trousers/files/trousers-0.3.15-libressl.patch
new file mode 100644
index 000000000000..e4aee00d8d97
--- /dev/null
+++ b/app-crypt/trousers/files/trousers-0.3.15-libressl.patch
@@ -0,0 +1,31 @@
+From 88e90ee4c36f0decdf7c15e271bccb8b0809a21a Mon Sep 17 00:00:00 2001
+From: Stefan Strogin <stefan@steils.org>
+Date: Tue, 24 Nov 2020 11:08:13 +0200
+Subject: [PATCH] trousers: do not re-declare RSA_set0_key with LibreSSL
+
+The method RSA_set0_key is provided by LibreSSL since 2.7.0, that means
+in all currently supported versions.
+
+Upstream-Status: Submitted
+[https://sourceforge.net/p/trousers/trousers/merge-requests/2/]
+Signed-off-by: Stefan Strogin <stefan@steils.org>
+---
+ src/trspi/crypto/openssl/rsa.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/trspi/crypto/openssl/rsa.c b/src/trspi/crypto/openssl/rsa.c
+index 24f13e7..cf46c08 100644
+--- a/src/trspi/crypto/openssl/rsa.c
++++ b/src/trspi/crypto/openssl/rsa.c
+@@ -38,7 +38,7 @@
+ #define DEBUG_print_openssl_errors()
+ #endif
+ 
+-#if (OPENSSL_VERSION_NUMBER < 0x10100001L) || defined(LIBRESSL_VERSION_NUMBER)
++#if (OPENSSL_VERSION_NUMBER < 0x10100001L)
+ static int
+ RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d)
+ {
+-- 
+2.29.2
+
diff --git a/app-crypt/trousers/trousers-0.3.15.ebuild b/app-crypt/trousers/trousers-0.3.15.ebuild
new file mode 100644
index 000000000000..041250710cb6
--- /dev/null
+++ b/app-crypt/trousers/trousers-0.3.15.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools linux-info readme.gentoo-r1 systemd udev
+
+DESCRIPTION="An open-source TCG Software Stack (TSS) v1.1 implementation"
+HOMEPAGE="http://trousers.sf.net"
+SRC_URI="mirror://sourceforge/trousers/${PN}/${P}.tar.gz"
+
+LICENSE="CPL-1.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~ppc ~ppc64 ~s390 ~x86"
+IUSE="doc libressl selinux" # gtk
+
+# gtk support presently does NOT compile.
+#	gtk? ( >=x11-libs/gtk+-2 )
+
+DEPEND="acct-group/tss
+	acct-user/tss
+	>=dev-libs/glib-2
+	!libressl? ( >=dev-libs/openssl-0.9.7:0= )
+	libressl? ( dev-libs/libressl:0= )"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-tcsd )"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.3.13-nouseradd.patch"
+	"${FILESDIR}/${PN}-0.3.14-Makefile.am-Mark-tddl.a-nodist.patch"
+	"${FILESDIR}/${P}-libressl.patch"
+)
+
+DOCS="AUTHORS ChangeLog NICETOHAVES README TODO"
+
+DOC_CONTENTS="
+	If you have problems starting tcsd, please check permissions and
+	ownership on /dev/tpm* and ~tss/system.data
+"
+
+CONFIG_CHECK="~TCG_TPM"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# econf --with-gui=$(usex gtk gtk openssl)
+	econf --with-gui=openssl
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+
+	keepdir /var/lib/tpm
+	use doc && dodoc doc/*
+	newinitd "${FILESDIR}"/tcsd.initd tcsd
+	newconfd "${FILESDIR}"/tcsd.confd tcsd
+	systemd_dounit "${FILESDIR}"/tcsd.service
+	udev_dorules "${FILESDIR}"/61-trousers.rules
+	fowners tss:tss /var/lib/tpm
+	readme.gentoo_create_doc
+}
diff --git a/app-crypt/veracrypt/Manifest b/app-crypt/veracrypt/Manifest
index 4188f80dd95d..fa6fe88cad6e 100644
--- a/app-crypt/veracrypt/Manifest
+++ b/app-crypt/veracrypt/Manifest
@@ -6,5 +6,5 @@ DIST veracrypt-1.24_p4.tar.gz 25212608 BLAKE2B 12d124cc5c869b8112e29624fcc5af3dd
 DIST veracrypt-1.24_p7.tar.gz 25113248 BLAKE2B 8ead3325ce6fadf4ca8211ea45daaa82a655f29006f224235f44200839289d42fabe84da2e731fc6a169a7d157535c719b2cd9294524e68532c0065e41ed733c SHA512 d149736d4d6740a89bfce892f44757600c6411776b471a208a75b4573bbc6125535ef1b68c2f55903ff82f4d0fff13b8b07d3cf15c7a301c39158aefffc29e17
 EBUILD veracrypt-1.24_p2.ebuild 3122 BLAKE2B 1fee5173e4c599692ccaa0737c3103405478cdba846055002a0c7c803e90c4886da8aa8c18d37a669b5964fda4e5ee022311239b8edb3caff000dde40cda51d8 SHA512 b908d997ceec7ecbbd1fdca1ccc92a205b40879d29730cd5148a57734d4038386a656ac6ed5afc29b8f369764a8e4032e2ca382eda4c59089fffe6282126d171
 EBUILD veracrypt-1.24_p4.ebuild 2538 BLAKE2B 5860c80d59157f5eb10a6017d837a7eaaf746aba035760b3d4a03bfa00f53fed9b62e83c706ff729a7c873c71cf80ef32eba7269b75c9a9ea5d4d3eb14e20094 SHA512 ecb74dbd33d71828558fab05e246cd7d2bda552f3b9998ecd97b5259a3cee54fb8fb3fcf1b75399fbd41c3d308e91d3f188795baffb7f5284561e9bd3a0856e4
-EBUILD veracrypt-1.24_p7.ebuild 2539 BLAKE2B de8b817eccd3c079c59c09272b7ccdc8c4d354694eec1e8533af94fbe91923024ff16e2e9055d923cf431905ad56e20bed23cd6a25c90694c09e9bb9caba7a20 SHA512 6b9b71177d6e67d211af262b98317db801b2cd4fc3408b404dc512eaf698e0725b45b9bd10d58929ba09e7e0ea219736c3588f4a8a0c79f79ba05b42ac70d516
+EBUILD veracrypt-1.24_p7.ebuild 2538 BLAKE2B 5860c80d59157f5eb10a6017d837a7eaaf746aba035760b3d4a03bfa00f53fed9b62e83c706ff729a7c873c71cf80ef32eba7269b75c9a9ea5d4d3eb14e20094 SHA512 ecb74dbd33d71828558fab05e246cd7d2bda552f3b9998ecd97b5259a3cee54fb8fb3fcf1b75399fbd41c3d308e91d3f188795baffb7f5284561e9bd3a0856e4
 MISC metadata.xml 399 BLAKE2B a7d22abada8009869e82b80f8b2274e1acc2fb1488d584c9d730f231057519404445a0d048ad70a47f7d946bc987f836fdfd87da296537a307e234175e521acc SHA512 ac0676510d8d2ac2430dd244ed5e4d18de1cbb7050563fcdd46fc8511c9813dc3609565a6c071f75d9cd26e73c1f453cc8cf9b9b47e0822bd93548a8baaf62ca
diff --git a/app-crypt/veracrypt/veracrypt-1.24_p7.ebuild b/app-crypt/veracrypt/veracrypt-1.24_p7.ebuild
index 120e43f27ad2..10a8cfcacd0a 100644
--- a/app-crypt/veracrypt/veracrypt-1.24_p7.ebuild
+++ b/app-crypt/veracrypt/veracrypt-1.24_p7.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/${PN}/VeraCrypt/archive/VeraCrypt_${MY_PV}.tar.gz ->
 # For this reason, we don't have to worry about their licenses
 LICENSE="Apache-2.0 BSD truecrypt-3.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="+asm cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_ssse3 doc X"
 RESTRICT="bindist mirror"
 
diff --git a/app-crypt/yubikey-manager-qt/Manifest b/app-crypt/yubikey-manager-qt/Manifest
index 3b0e2fbe7380..b62e7f33b5c1 100644
--- a/app-crypt/yubikey-manager-qt/Manifest
+++ b/app-crypt/yubikey-manager-qt/Manifest
@@ -1,3 +1,5 @@
 DIST yubikey-manager-qt-1.1.4.tar.gz 13318769 BLAKE2B 4ca85d8f9681f725cf9f8d547d850516c77a618c595814c8add12250677e495952229c966a2e59d449dfa33ac9c6788f6daa8494702137eab937b299f896e8dd SHA512 9e3e85a22d7be4e6ab30b3fd068fcc3406348d2b38f96e1ef8d693bf37edafaf8f16dc408cc9319173e871cc24d2cc4db5853ec3f8a0365221722504dc6fde04
+DIST yubikey-manager-qt-1.1.5.tar.gz 16066508 BLAKE2B cd15950c68cacc3e2904a5e1fbb3a2d98544084717f379202ccfe70082b0971959178730afb9ddbbfa20f436ef8d7cdf820df1e88539f99ce77913f60228af0f SHA512 b019a7cdebd741cd536a18670795f83c7e010e221b4f9c82dcd3c57b0c4bce878865c6605f10c962f4bd5e926c285a894ea97d2925ba091847ece5ffa7ce5bb6
 EBUILD yubikey-manager-qt-1.1.4-r2.ebuild 1484 BLAKE2B a6c7f1164f1c5b625620c0f129a29d78ef2326a92145edb300c6f5495b7d1edd09659c227f841fdc4fee1a8c3cb7e6d72d40b4bf5b751b5cea44735cd11b8208 SHA512 b8f5929a0fd399c67ed3fcea6a69b47444f4676a63f27c610122d26dd831db70499f5e15aa9da41ba59bbb532ce93d048443bef4e6bbeb531bf3e47f88d488a7
+EBUILD yubikey-manager-qt-1.1.5.ebuild 1489 BLAKE2B 19cd5a064a2e62ff8c1b3a1ef5fb1ba37ef3c54d31749fd0de7f4e1cee3de663bc7abd33a19e28eaca93095d23c3db46f14901d6ef235158f8c40429f5046c3f SHA512 5db64a2de704cf7eeb7d3bafdf903dc66283eb7615dc05234ddd9d7b525047eca21f5a0825efcfeb8ab87ea7f37208fa188ab081e8adfc7fb41f2bac66a2f429
 MISC metadata.xml 371 BLAKE2B 1081e69aeb641c9d7de472bed98dfb336bc37e5374becbec4603316176419dcdb337f29b355b3395b778d250a99e32b181b84b42d4b7c10dedce7c47a6a187f6 SHA512 ed480648e967bfa3d95f71a5131963290e4265c487a345b69e34ad23c4ab18d82b08cd1e4a12f389533cc9690163fed90c05d471375fadd074c99a235105e837
diff --git a/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.1.5.ebuild b/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.1.5.ebuild
new file mode 100644
index 000000000000..7154bd824ef8
--- /dev/null
+++ b/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.1.5.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit eutils qmake-utils python-single-r1 desktop
+
+DESCRIPTION="Cross-platform application for configuring any YubiKey over all USB transports"
+HOMEPAGE="https://developers.yubico.com/yubikey-manager-qt https://github.com/Yubico/yubikey-manager-qt"
+SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+DEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		>=app-crypt/yubikey-manager-1.0.0[${PYTHON_MULTI_USEDEP}]
+		<app-crypt/yubikey-manager-4.0.0[${PYTHON_MULTI_USEDEP}]
+		dev-python/cryptography[${PYTHON_MULTI_USEDEP}]
+	')
+	dev-python/pyotherside[${PYTHON_SINGLE_USEDEP}]
+	dev-qt/qtcore:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgraphicaleffects:5
+	dev-qt/qtgui:5
+	dev-qt/qtquickcontrols:5[widgets]
+	dev-qt/qtquickcontrols2:5[widgets]
+	dev-qt/qtsingleapplication[qt5(+),X]
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}-${P}"
+
+src_prepare() {
+	default
+
+	sed -i -e "s/ykman-cli//" ${PN}.pro || die
+	sed -e "/CONFIG += c++11/a CONFIG += qtsingleapplication" \
+		-i ykman-gui/ykman-gui.pro || die
+}
+
+src_configure() {
+	eqmake5
+}
+
+src_install() {
+	emake install INSTALL_ROOT="${D}"
+
+	domenu resources/ykman-gui.desktop
+	doicon -s 128 resources/icons/ykman.png
+	doicon -s scalable resources/icons/ykman.svg
+
+	einstalldocs
+}
author	V3n3RiX <venerix@redcorelinux.org>	2020-11-25 22:39:15 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-11-25 22:39:15 +0000
commit	d934827bf44b7cfcf6711964418148fa60877668 (patch)
tree	0625f358789b5e015e49db139cc1dbc9be00428f /app-crypt
parent	2e34d110f164bf74d55fced27fe0000201b3eec5 (diff)