gentoo (leap year) resync : 29.02.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-02-29 18:01:47 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-02-29 18:01:47 +0000
commit: ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (patch)
tree: 9f47ee47c31a0f13f9496879cd88a1042550aa81 /app-crypt
parent: 53cba99042fa967e2a93da9f8db806fe2d035543 (diff)
66 files changed, 408 insertions, 846 deletions
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 97b40c173d40..ac4d85cd7543 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/WiRouterKeyRec/Manifest b/app-crypt/WiRouterKeyRec/Manifest
index 16a4a17f2154..b9ec25298f88 100644
--- a/app-crypt/WiRouterKeyRec/Manifest
+++ b/app-crypt/WiRouterKeyRec/Manifest
@@ -1,3 +1,3 @@
 DIST WiRouterKeyRec-1.1.2.zip 117262 BLAKE2B fe140bf19d7a1af1c8c6e04725f3d3e67c30b3f108d64f1fe706b1e28e8767d08219e30b78e67b33553a00dea03ca344acf43c8b75f3c5f7633980e08d095f2b SHA512 a3c449497e3f3fed88dfbb35a90a2cfa5937efa02393e825ec51ab390b7094ce619d3238a916afd2b48e35e0e261b454f7d7005af46d6a45d77b2e1d4faaac51
-EBUILD WiRouterKeyRec-1.1.2.ebuild 758 BLAKE2B abd31022e3b03d9fc6bc29110b59978d0b3b86b068c3225652df98fa7792047375047f21d2cf3075ae20c3f00259561b884fdea3f34697bd26bee97b5fd61249 SHA512 8dd77dbeab105218d10f5ce0a28f79c57c548625816ed6aea04a5c6dca10712dcf156c2c45d6f485dc86ea56ffeb803468d73e0b78b37519e26a4ed5330a2631
+EBUILD WiRouterKeyRec-1.1.2.ebuild 752 BLAKE2B 38207e55209043d4dc0a5c7da31a8342a3e6e574508b98a39bb96443deb19725f58774193f9c34714e73eaf95d2f3ca75b080f520a12577d52f654751a8a292b SHA512 30390834be43e05c1167a7431c5b0b098ab912a3eb509fd2c3879f8d18f55ba52011fe4785afecf799c3c687b40fa9536cdf6b87b26df3362002df176eb5db5a
 MISC metadata.xml 246 BLAKE2B 5439993f129fd56fc43062bce991abdd20627118aa0e723a343c721cbc910de4f8b7b34b6f1587acfe0a60d488d4b1d093c69eb7d78f6accade89bced7d69b93 SHA512 482630597bd2d56c1eaed7099225b4475aec8768e20bad70ea9d6b96791fa38359ba572ab9ad0fc7ea72f1ab736ed1e92fc3c156c3427b008c7220285edce11c
diff --git a/app-crypt/WiRouterKeyRec/WiRouterKeyRec-1.1.2.ebuild b/app-crypt/WiRouterKeyRec/WiRouterKeyRec-1.1.2.ebuild
index 7167e5643698..e6e66ef98382 100644
--- a/app-crypt/WiRouterKeyRec/WiRouterKeyRec-1.1.2.ebuild
+++ b/app-crypt/WiRouterKeyRec/WiRouterKeyRec-1.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -22,18 +22,18 @@ RDEPEND=""
 
 S=${WORKDIR}/${MY_P}
 
-src_prepare () {
+src_prepare() {
 	sed -i "s:wirouterkeyrec:${PN}:" src/*.h || die
 }
 
-src_compile () {
+src_compile() {
 	emake \
 		CC="$(tc-getCC)" \
 		CFLAGS="${CFLAGS}" \
 		LDFLAGS="${LDFLAGS}"
 }
 
-src_install () {
+src_install() {
 	newbin build/wirouterkeyrec ${PN}
 	insinto /etc/${PN}
 	doins config/agpf_config.lst config/teletu_config.lst
diff --git a/app-crypt/acme/Manifest b/app-crypt/acme/Manifest
index 5979bfb5abd5..771009885579 100644
--- a/app-crypt/acme/Manifest
+++ b/app-crypt/acme/Manifest
@@ -1,12 +1,6 @@
-DIST certbot-0.39.0.tar.gz 1350312 BLAKE2B 5f21c45d25754cb1ed0ad92e8d03637928a274637de09903509c7e78c40fd197e95cfa1f3effecef938d6ab8369dc6811714ddb5a93a806048e0998d1032e4f9 SHA512 17ab17a5f74e3fba58b1a8b9afe0c3656c7b2a5ea3585edb05ad84e36250c6a8d4d28bd692bc97d033c95eb0bbeff4eb84981ae0006e36d55846cd38373b86a0
-DIST certbot-0.40.1.tar.gz 1353347 BLAKE2B 86b3df4047101d00d5f17cf3a1a11e5800e850f5a9f736507ad373e552c27e9e4a3a17695f5a817d191cad383fc17336214fc1d8de7a99354ce4d2f5c6e728c1 SHA512 e5517a20cf26efba850728b3f81db5d6c3c5570b0a1c8eeeec9d4a4401ac04bcf44c6a2f1c248bf6e0b1be4a21b54f6168ccd11dc766304805f13b4cb16336b3
-DIST certbot-1.0.0.tar.gz 1336032 BLAKE2B ca26cfd3d9f802b09eaf387225f24fbb01385f81dfa661dfb5acbd97982a6fc773c56abf6b3f99db7f2b0cdc8c5a7175d264714592858b38217e444d4e1d2b4b SHA512 649ddd3d9305e166ef36de4e4e48b1171d5f369d9d60c026ab37a03e7b221cd815e93e69460662e6436b56cec076005582457e9d45499114306ad808a2497912
 DIST certbot-1.1.0.tar.gz 1346768 BLAKE2B 5c86edec3102ce0eb822465458ec86cbc98eb5e76c3c582d8a72ecab91e709f16e7a1576c684bc04bfd0c70918f34e84e0b3b264f949a1fb9bf9503fa9d6b179 SHA512 905b21a8a50b4df4eb92b464d10dec094ba4e7f5eaf3ad3dae1704a794952df6b51873ca919246a9b6698fd652a7c264efc742617ba0a25757ab99397759c343
 DIST certbot-1.2.0.tar.gz 1354262 BLAKE2B 1abdf4cb99ecdac6b9b8d2ebdd6897a3182a147f0175e2db4c6b0feaa3f6c615ee3146dd63627a83266c223456c5aba44b018be4059574d0209aec89065d9925 SHA512 ed52a31a71b3762b8cd217ea2784d9cb01f7c1a50cef3b7e0d99483ca3ab623b90ab7d4896674e0d1c06e2e8370c02162418d934de7d3048b0471416616146fe
-EBUILD acme-0.39.0.ebuild 1740 BLAKE2B 36f55fbd1d389ac9b009bbb46d0de42cde53ae1c01f7a05318c5ce6725094c7cf55a1850c01af01bb92bef1c0720026889cdc042dcdd04a1a7ba4d5343787a50 SHA512 12ef8bdefb9bedc3dae4c549a2af0a26b223ca1266660f1a06e8926e4bc53a7478b4fc55c7a952c10008f0e5c83934704d5eec3e6056fb4ae17fbc7e61e41876
-EBUILD acme-0.40.1.ebuild 1740 BLAKE2B 36f55fbd1d389ac9b009bbb46d0de42cde53ae1c01f7a05318c5ce6725094c7cf55a1850c01af01bb92bef1c0720026889cdc042dcdd04a1a7ba4d5343787a50 SHA512 12ef8bdefb9bedc3dae4c549a2af0a26b223ca1266660f1a06e8926e4bc53a7478b4fc55c7a952c10008f0e5c83934704d5eec3e6056fb4ae17fbc7e61e41876
-EBUILD acme-1.0.0.ebuild 1740 BLAKE2B 36f55fbd1d389ac9b009bbb46d0de42cde53ae1c01f7a05318c5ce6725094c7cf55a1850c01af01bb92bef1c0720026889cdc042dcdd04a1a7ba4d5343787a50 SHA512 12ef8bdefb9bedc3dae4c549a2af0a26b223ca1266660f1a06e8926e4bc53a7478b4fc55c7a952c10008f0e5c83934704d5eec3e6056fb4ae17fbc7e61e41876
-EBUILD acme-1.1.0.ebuild 1746 BLAKE2B eb09320774e53a3f6b2b0c9cf229ca86b40f98c1cac803a359d5ba4310556afcc223d54818fac64bb34bddb9033676a5fb6321376874da73e8cf01024a14019f SHA512 c87f8c6be501bde475a17525f6cb5b1f26e627590fc393b06f62ec0d211952f4ab146a66718cb37e4e275d7bbd2fd861eadfae814035b5a2b81b59d8574d1670
+EBUILD acme-1.1.0.ebuild 1744 BLAKE2B 4dc4d69eee70fead7baf6cdc811510fe7b6e5f49deb84b765223555b8a9ac29fdc299c35ab260cd05ce5447b3b6cfe152ef110e2a0c18ebd9c34dd78ad5fce4d SHA512 b69c7b8a952c95415894c299e49c26cbf1a6bb5929f52f10d23f4e297b6cf6a6c7f1427a94834536416518245899d498395574f46b6dd0a015c626d01c75994c
 EBUILD acme-1.2.0.ebuild 1746 BLAKE2B eb09320774e53a3f6b2b0c9cf229ca86b40f98c1cac803a359d5ba4310556afcc223d54818fac64bb34bddb9033676a5fb6321376874da73e8cf01024a14019f SHA512 c87f8c6be501bde475a17525f6cb5b1f26e627590fc393b06f62ec0d211952f4ab146a66718cb37e4e275d7bbd2fd861eadfae814035b5a2b81b59d8574d1670
 EBUILD acme-9999.ebuild 1746 BLAKE2B eb09320774e53a3f6b2b0c9cf229ca86b40f98c1cac803a359d5ba4310556afcc223d54818fac64bb34bddb9033676a5fb6321376874da73e8cf01024a14019f SHA512 c87f8c6be501bde475a17525f6cb5b1f26e627590fc393b06f62ec0d211952f4ab146a66718cb37e4e275d7bbd2fd861eadfae814035b5a2b81b59d8574d1670
 MISC metadata.xml 384 BLAKE2B 55780995cb61c11ca859c9f1de17b1c22c9c92902f551ccd1ee6f030df9d513bb5519a2c62bf33bc6a5872790d033ba966e5ed137d84a4f66ab4ba7636a88887 SHA512 cf8393b25aa363bc1db4ebd23274affd1eaf999a4c2ab8d359730f421961dafd5c96fcf14c247f3f5419616116e2351d72fbf0e29301ea44ac522e865c7b0fa1
diff --git a/app-crypt/acme/acme-0.39.0.ebuild b/app-crypt/acme/acme-0.39.0.ebuild
deleted file mode 100644
index 0ce5fe5770d8..000000000000
--- a/app-crypt/acme/acme-0.39.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})
-
-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/mock[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.13.1[${PYTHON_USEDEP}]
-	dev-python/pyrfc3339[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.10[${PYTHON_USEDEP}]
-	>=dev-python/requests-toolbelt-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	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}]
-	)
-	>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]
-"
-
-src_compile() {
-	python_foreach_impl run_in_build_dir default
-	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-0.40.1.ebuild b/app-crypt/acme/acme-0.40.1.ebuild
deleted file mode 100644
index 0ce5fe5770d8..000000000000
--- a/app-crypt/acme/acme-0.40.1.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})
-
-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/mock[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.13.1[${PYTHON_USEDEP}]
-	dev-python/pyrfc3339[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.10[${PYTHON_USEDEP}]
-	>=dev-python/requests-toolbelt-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	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}]
-	)
-	>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]
-"
-
-src_compile() {
-	python_foreach_impl run_in_build_dir default
-	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.0.0.ebuild b/app-crypt/acme/acme-1.0.0.ebuild
deleted file mode 100644
index 0ce5fe5770d8..000000000000
--- a/app-crypt/acme/acme-1.0.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})
-
-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/mock[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.13.1[${PYTHON_USEDEP}]
-	dev-python/pyrfc3339[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.10[${PYTHON_USEDEP}]
-	>=dev-python/requests-toolbelt-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	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}]
-	)
-	>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]
-"
-
-src_compile() {
-	python_foreach_impl run_in_build_dir default
-	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.1.0.ebuild b/app-crypt/acme/acme-1.1.0.ebuild
index 4aaf884c944a..db4f214816dc 100644
--- a/app-crypt/acme/acme-1.1.0.ebuild
+++ b/app-crypt/acme/acme-1.1.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]]; then
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> certbot-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 	S=${WORKDIR}/certbot-${PV}/acme
 fi
 
diff --git a/app-crypt/certbot-apache/Manifest b/app-crypt/certbot-apache/Manifest
index 70891cfef048..1d35220fd8f0 100644
--- a/app-crypt/certbot-apache/Manifest
+++ b/app-crypt/certbot-apache/Manifest
@@ -1,8 +1,6 @@
-DIST certbot-1.0.0.tar.gz 1336032 BLAKE2B ca26cfd3d9f802b09eaf387225f24fbb01385f81dfa661dfb5acbd97982a6fc773c56abf6b3f99db7f2b0cdc8c5a7175d264714592858b38217e444d4e1d2b4b SHA512 649ddd3d9305e166ef36de4e4e48b1171d5f369d9d60c026ab37a03e7b221cd815e93e69460662e6436b56cec076005582457e9d45499114306ad808a2497912
 DIST certbot-1.1.0.tar.gz 1346768 BLAKE2B 5c86edec3102ce0eb822465458ec86cbc98eb5e76c3c582d8a72ecab91e709f16e7a1576c684bc04bfd0c70918f34e84e0b3b264f949a1fb9bf9503fa9d6b179 SHA512 905b21a8a50b4df4eb92b464d10dec094ba4e7f5eaf3ad3dae1704a794952df6b51873ca919246a9b6698fd652a7c264efc742617ba0a25757ab99397759c343
 DIST certbot-1.2.0.tar.gz 1354262 BLAKE2B 1abdf4cb99ecdac6b9b8d2ebdd6897a3182a147f0175e2db4c6b0feaa3f6c615ee3146dd63627a83266c223456c5aba44b018be4059574d0209aec89065d9925 SHA512 ed52a31a71b3762b8cd217ea2784d9cb01f7c1a50cef3b7e0d99483ca3ab623b90ab7d4896674e0d1c06e2e8370c02162418d934de7d3048b0471416616146fe
-EBUILD certbot-apache-1.0.0.ebuild 1097 BLAKE2B 313adadcf61861dd7b3ac60bed718590e70ee86da4bb67d91544b76da821c2cd2780fb8c0fbdd7ffd241189deef90c710d1b4b060c0fc981d254c68ca75b45da SHA512 b61efbe4957fe60e394ecadf56e51abb3f362027d26106223c84d9f89ca6e1158d9c24e036ff6fda6313942d390325f207e79a238b9a6b642646528b09002dc8
-EBUILD certbot-apache-1.1.0.ebuild 1098 BLAKE2B 774ad4f402a5b07c7ac2b845569a6f76d142680e010f654965ec010ca5ccc08918260fac4f96e5cfb4fe414c3bae4f9d5e6228c07bcc079852eac9ec9e04c9ff SHA512 468a948daf3723be0da7984d5f19b9c27c6a9a9585d32d0ae69c4ff181590005e7c112518b50e29da28ff823cc783d407f7c06d33ea3f262f9f6192541f26c7b
+EBUILD certbot-apache-1.1.0.ebuild 1096 BLAKE2B 540c15a57415af6b2d33bd1e9c3e4c24274f2f4faacc025ebf06b55dc7e444581ec03b7d275a4a7a9eef2694ec4f31556d0c09adfdb669a42f7dbc3f4b09da98 SHA512 be5fb128ea3744d9e8d50c631502a3c79a8a65a9121fcae43b6cfa1fd4da5893862b7c372e1597f43f40a4f04eaf96751bb5f040dd02b8afdea6a2085eb07960
 EBUILD certbot-apache-1.2.0.ebuild 1098 BLAKE2B 48134461ad6db972453423f9d57c4d3bbb0c4823015f2ae8f36c2059a75124d105e7fa6594eb7a313e3220f07d0fed8f56cfe99d0a37df64b66e8e14dd3c67ad SHA512 0f276ad597397a20050801349dfd03782ad40a414f13a28070594468484e9761a629a3c8e4889d36a8cf8c58f3b0b2ca61b98761ecf8d2a7b66a80584eb65a73
 EBUILD certbot-apache-9999.ebuild 1098 BLAKE2B 48134461ad6db972453423f9d57c4d3bbb0c4823015f2ae8f36c2059a75124d105e7fa6594eb7a313e3220f07d0fed8f56cfe99d0a37df64b66e8e14dd3c67ad SHA512 0f276ad597397a20050801349dfd03782ad40a414f13a28070594468484e9761a629a3c8e4889d36a8cf8c58f3b0b2ca61b98761ecf8d2a7b66a80584eb65a73
 MISC metadata.xml 334 BLAKE2B 4adbd04c0edcc84925da47b32fee63d4652bf2a1bf5222a56e0e1c7cfe8aaa34275a2652c4416f8a80de11fd88217d8626d610fa857f0615f18bfd773a279e55 SHA512 e3d6dda6c44557523fd48b464b6d39fc45b90ba2ecbe03fb300a655973c1b2e654a24d8d381b769eba00d0d80fb5881e1dfec1694e223cd83047abba9f01a44f
diff --git a/app-crypt/certbot-apache/certbot-apache-1.0.0.ebuild b/app-crypt/certbot-apache/certbot-apache-1.0.0.ebuild
deleted file mode 100644
index 775499f0b0df..000000000000
--- a/app-crypt/certbot-apache/certbot-apache-1.0.0.ebuild
+++ /dev/null
@@ -1,39 +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})
-
-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-0.39.0[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	dev-python/python-augeas[${PYTHON_USEDEP}]
-	dev-python/zope-component[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
-DEPEND="test? ( ${RDEPEND}
-	dev-python/nose[${PYTHON_USEDEP}] )
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	nosetests || die
-}
diff --git a/app-crypt/certbot-apache/certbot-apache-1.1.0.ebuild b/app-crypt/certbot-apache/certbot-apache-1.1.0.ebuild
index cef80d06281a..ac62ff48ce52 100644
--- a/app-crypt/certbot-apache/certbot-apache-1.1.0.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-1.1.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]]; then
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/${PN%-apache}/${PN%-apache}/archive/v${PV}.tar.gz -> ${PN%-apache}-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 	S=${WORKDIR}/${PN%-apache}-${PV}/${PN}
 fi
 
diff --git a/app-crypt/certbot-dns-nsone/Manifest b/app-crypt/certbot-dns-nsone/Manifest
index 9dd37bcd0fe3..3b5c701fa5da 100644
--- a/app-crypt/certbot-dns-nsone/Manifest
+++ b/app-crypt/certbot-dns-nsone/Manifest
@@ -1,3 +1,3 @@
 DIST certbot-dns-nsone-0.39.0.tar.gz 1350312 BLAKE2B 5f21c45d25754cb1ed0ad92e8d03637928a274637de09903509c7e78c40fd197e95cfa1f3effecef938d6ab8369dc6811714ddb5a93a806048e0998d1032e4f9 SHA512 17ab17a5f74e3fba58b1a8b9afe0c3656c7b2a5ea3585edb05ad84e36250c6a8d4d28bd692bc97d033c95eb0bbeff4eb84981ae0006e36d55846cd38373b86a0
-EBUILD certbot-dns-nsone-0.39.0.ebuild 939 BLAKE2B d6245541de24ac10cbd80d05d459987d368e8f3c63181cc526ed63f38af7f8c45ba858825ec4e7540be818c5af3d7cf9c4acf9fa7a15678ea82ac3e87b930212 SHA512 5b48a8ec5f7ee92c02129344e95d2dd8ec44eb4ac1dd630096728282feb5329b9b3b71acd7a1e5f226f079ed1d9c909c247f12a2f56ec9ab850718b4ff8aad7a
+EBUILD certbot-dns-nsone-0.39.0-r1.ebuild 953 BLAKE2B 596f64848b906959fe7e542e7d61c3462efe35253b67f7cb8f64bd13b4cf386ebb090d5008518b51a713362c4fd81782dc40344094f7631f90c790965f661434 SHA512 e65a292b00f55c5d0bd79e242427ff78012acaed3a391fa3b4f5d97ce367730c7a5e4f03626e0afc4a0ad518a12b5e701a8e10ac43fcf575d42badcc5bcab393
 MISC metadata.xml 253 BLAKE2B 7dac7f77dcc8de31f439cc6d7770a503f95be9c2f8ae57df9e725df941e2b31a90a43664a485a5fad9510b9ae060ba7aaaddba29324338dd9eb07d88a63c7dce SHA512 303268e1f46e337e32c64b544c0962ecbe8de1799c42736b3c3515b6f31954a655830c402317bd0534cac12059e17eeb5f360d010432dff795a136662a5c10f1
diff --git a/app-crypt/certbot-dns-nsone/certbot-dns-nsone-0.39.0.ebuild b/app-crypt/certbot-dns-nsone/certbot-dns-nsone-0.39.0-r1.ebuild
index 6a9e578cd9a5..221d334e171b 100644
--- a/app-crypt/certbot-dns-nsone/certbot-dns-nsone-0.39.0.ebuild
+++ b/app-crypt/certbot-dns-nsone/certbot-dns-nsone-0.39.0-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=(python3_6)
+EAPI=7
+PYTHON_COMPAT=(python3_6 python3_7)
 
 if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
@@ -25,9 +25,9 @@ IUSE=""
 
 CDEPEND=">=dev-python/setuptools-1.0[${PYTHON_USEDEP}]"
 RDEPEND="${CDEPEND}
-	=app-crypt/certbot-${PV%.*}*[${PYTHON_USEDEP}]
-	=app-crypt/acme-${PV%.*}*[${PYTHON_USEDEP}]
+	>=app-crypt/certbot-0.31.0[${PYTHON_USEDEP}]
+	>=app-crypt/acme-0.39.0[${PYTHON_USEDEP}]
 	dev-python/mock[${PYTHON_USEDEP}]
 	dev-python/zope-interface[${PYTHON_USEDEP}]
-	dev-python/dns-lexicon[${PYTHON_USEDEP}]"
+	>=dev-python/dns-lexicon-2.2.1[${PYTHON_USEDEP}]"
 DEPEND="${CDEPEND}"
diff --git a/app-crypt/certbot-nginx/Manifest b/app-crypt/certbot-nginx/Manifest
index c94f523861f4..718d289c6077 100644
--- a/app-crypt/certbot-nginx/Manifest
+++ b/app-crypt/certbot-nginx/Manifest
@@ -1,8 +1,6 @@
-DIST certbot-1.0.0.tar.gz 1336032 BLAKE2B ca26cfd3d9f802b09eaf387225f24fbb01385f81dfa661dfb5acbd97982a6fc773c56abf6b3f99db7f2b0cdc8c5a7175d264714592858b38217e444d4e1d2b4b SHA512 649ddd3d9305e166ef36de4e4e48b1171d5f369d9d60c026ab37a03e7b221cd815e93e69460662e6436b56cec076005582457e9d45499114306ad808a2497912
 DIST certbot-1.1.0.tar.gz 1346768 BLAKE2B 5c86edec3102ce0eb822465458ec86cbc98eb5e76c3c582d8a72ecab91e709f16e7a1576c684bc04bfd0c70918f34e84e0b3b264f949a1fb9bf9503fa9d6b179 SHA512 905b21a8a50b4df4eb92b464d10dec094ba4e7f5eaf3ad3dae1704a794952df6b51873ca919246a9b6698fd652a7c264efc742617ba0a25757ab99397759c343
 DIST certbot-1.2.0.tar.gz 1354262 BLAKE2B 1abdf4cb99ecdac6b9b8d2ebdd6897a3182a147f0175e2db4c6b0feaa3f6c615ee3146dd63627a83266c223456c5aba44b018be4059574d0209aec89065d9925 SHA512 ed52a31a71b3762b8cd217ea2784d9cb01f7c1a50cef3b7e0d99483ca3ab623b90ab7d4896674e0d1c06e2e8370c02162418d934de7d3048b0471416616146fe
-EBUILD certbot-nginx-1.0.0.ebuild 1002 BLAKE2B d6602a191e2accb784b6be26005156a450b2225eedcc5a6c9b95543af4621d93a5f1f863c23ffd916ed0f6e611d47b08860cba761ab95de362c337cd8c39d8da SHA512 5ea3e1e23b26c784e9d0e3a28bb465849256e64157b1c04fb8a1848943d539fc7ac7ca81428d194b62f11d4753214cc03b718deb9767225620171c22d4892868
-EBUILD certbot-nginx-1.1.0.ebuild 1004 BLAKE2B 41f4dbc93cc7553c439796fcf2af1dde5d466fbd622471984bf15abedc54cad3fb15d069993baa736c71cb4ea65bb0f741dbbb20814156bbc04abcd1d468b240 SHA512 83647384bcf381a783d2871c7e09e90423345c5ea726eab7a42a9219f091cbd6cc96c621d00cfe3e6f32f79d7383a25be023867e3c7cec9d83291555fe5833d4
+EBUILD certbot-nginx-1.1.0.ebuild 1002 BLAKE2B d6602a191e2accb784b6be26005156a450b2225eedcc5a6c9b95543af4621d93a5f1f863c23ffd916ed0f6e611d47b08860cba761ab95de362c337cd8c39d8da SHA512 5ea3e1e23b26c784e9d0e3a28bb465849256e64157b1c04fb8a1848943d539fc7ac7ca81428d194b62f11d4753214cc03b718deb9767225620171c22d4892868
 EBUILD certbot-nginx-1.2.0.ebuild 1004 BLAKE2B d9c6cdfb14346b94daab36f639191aeb826d1e550ac22c972d6f7203690a565274992111172c5672f2d695030920e762bca222f7fea1ccfc415a3b8e5c7951a2 SHA512 b728d99c7675bb42c1af6dcd3c88cbca72f7e3a3e4651e916437ec7aaac5fa43b675b47560a04b879c2f454c1e8f11bd2dd436eba1fe6761399c44c9068a0116
 EBUILD certbot-nginx-9999.ebuild 1004 BLAKE2B d9c6cdfb14346b94daab36f639191aeb826d1e550ac22c972d6f7203690a565274992111172c5672f2d695030920e762bca222f7fea1ccfc415a3b8e5c7951a2 SHA512 b728d99c7675bb42c1af6dcd3c88cbca72f7e3a3e4651e916437ec7aaac5fa43b675b47560a04b879c2f454c1e8f11bd2dd436eba1fe6761399c44c9068a0116
 MISC metadata.xml 334 BLAKE2B 4adbd04c0edcc84925da47b32fee63d4652bf2a1bf5222a56e0e1c7cfe8aaa34275a2652c4416f8a80de11fd88217d8626d610fa857f0615f18bfd773a279e55 SHA512 e3d6dda6c44557523fd48b464b6d39fc45b90ba2ecbe03fb300a655973c1b2e654a24d8d381b769eba00d0d80fb5881e1dfec1694e223cd83047abba9f01a44f
diff --git a/app-crypt/certbot-nginx/certbot-nginx-1.0.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-1.0.0.ebuild
deleted file mode 100644
index 0344f2130cb1..000000000000
--- a/app-crypt/certbot-nginx/certbot-nginx-1.0.0.ebuild
+++ /dev/null
@@ -1,34 +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})
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
-	inherit git-r3
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/${PN%-nginx}/${PN%-nginx}/archive/v${PV}.tar.gz -> ${PN%-nginx}-${PV}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-	S=${WORKDIR}/${PN%-nginx}-${PV}/${PN}
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="Nginx plugin for certbot (Let's Encrypt Client)"
-HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${CDEPEND}
-	>=app-crypt/acme-1.0.0[${PYTHON_USEDEP}]
-	>=app-crypt/certbot-1.0.0[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-1.5.5[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}"
diff --git a/app-crypt/certbot-nginx/certbot-nginx-1.1.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-1.1.0.ebuild
index f272a24ec51d..0344f2130cb1 100644
--- a/app-crypt/certbot-nginx/certbot-nginx-1.1.0.ebuild
+++ b/app-crypt/certbot-nginx/certbot-nginx-1.1.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]]; then
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/${PN%-nginx}/${PN%-nginx}/archive/v${PV}.tar.gz -> ${PN%-nginx}-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 	S=${WORKDIR}/${PN%-nginx}-${PV}/${PN}
 fi
 
diff --git a/app-crypt/certbot/Manifest b/app-crypt/certbot/Manifest
index 11da46ba93f9..2505908ab426 100644
--- a/app-crypt/certbot/Manifest
+++ b/app-crypt/certbot/Manifest
@@ -1,12 +1,6 @@
-DIST certbot-0.39.0.tar.gz 1350312 BLAKE2B 5f21c45d25754cb1ed0ad92e8d03637928a274637de09903509c7e78c40fd197e95cfa1f3effecef938d6ab8369dc6811714ddb5a93a806048e0998d1032e4f9 SHA512 17ab17a5f74e3fba58b1a8b9afe0c3656c7b2a5ea3585edb05ad84e36250c6a8d4d28bd692bc97d033c95eb0bbeff4eb84981ae0006e36d55846cd38373b86a0
-DIST certbot-0.40.1.tar.gz 1353347 BLAKE2B 86b3df4047101d00d5f17cf3a1a11e5800e850f5a9f736507ad373e552c27e9e4a3a17695f5a817d191cad383fc17336214fc1d8de7a99354ce4d2f5c6e728c1 SHA512 e5517a20cf26efba850728b3f81db5d6c3c5570b0a1c8eeeec9d4a4401ac04bcf44c6a2f1c248bf6e0b1be4a21b54f6168ccd11dc766304805f13b4cb16336b3
-DIST certbot-1.0.0.tar.gz 1336032 BLAKE2B ca26cfd3d9f802b09eaf387225f24fbb01385f81dfa661dfb5acbd97982a6fc773c56abf6b3f99db7f2b0cdc8c5a7175d264714592858b38217e444d4e1d2b4b SHA512 649ddd3d9305e166ef36de4e4e48b1171d5f369d9d60c026ab37a03e7b221cd815e93e69460662e6436b56cec076005582457e9d45499114306ad808a2497912
 DIST certbot-1.1.0.tar.gz 1346768 BLAKE2B 5c86edec3102ce0eb822465458ec86cbc98eb5e76c3c582d8a72ecab91e709f16e7a1576c684bc04bfd0c70918f34e84e0b3b264f949a1fb9bf9503fa9d6b179 SHA512 905b21a8a50b4df4eb92b464d10dec094ba4e7f5eaf3ad3dae1704a794952df6b51873ca919246a9b6698fd652a7c264efc742617ba0a25757ab99397759c343
 DIST certbot-1.2.0.tar.gz 1354262 BLAKE2B 1abdf4cb99ecdac6b9b8d2ebdd6897a3182a147f0175e2db4c6b0feaa3f6c615ee3146dd63627a83266c223456c5aba44b018be4059574d0209aec89065d9925 SHA512 ed52a31a71b3762b8cd217ea2784d9cb01f7c1a50cef3b7e0d99483ca3ab623b90ab7d4896674e0d1c06e2e8370c02162418d934de7d3048b0471416616146fe
-EBUILD certbot-0.39.0.ebuild 1428 BLAKE2B 5c288ee7e10e92d44df09d28acf4632554aba6c3f78dd33ff50401f36edcb2d6beea5630ee1963ca5dd0d717518d5edfff0bae3a996cef6e2c9192cb8a89b9e8 SHA512 68398fc8f28b8881d112441d5d9e0456747c405e082286124ccd02f774c6ef1620303b68b523d5e15be1bb698941980e9a59089bc4e09ffe3ac61623225fc89b
-EBUILD certbot-0.40.1.ebuild 1428 BLAKE2B 22e72539d53f41247344d5d5be1bf5927af5729fdcb6d855baae72296a6b10647181c6d3fb84cd73df1a00c61353b29273abba33c2fc4d49ddd5543f6a10e7d3 SHA512 7b675c8bacc8c866db0129e1fe8234025458ad2c8e9874f008eda6cb6072942ff4d5447d9a7aeb4a6678c7d893683e5e63dfeda8d85df1d479065ee9f33c72f4
-EBUILD certbot-1.0.0-r1.ebuild 1455 BLAKE2B 91ae921207d96441d709b1115cf23339bb2bbc2d425af09d49f7ff355671b3ec828ff9149e00741090fcbc4437f61391a8fa0b2855e7597df746f2ea0829fd61 SHA512 fe422a4c25b7425f7060a6e11dad6accd665fcb749ed0212d6e77fe38bd99e54492aec2fe53c1e07b702a1eb7b94d0613fc925cf9bdd86ffe744179395230120
-EBUILD certbot-1.1.0.ebuild 1455 BLAKE2B de6c7604cbc1438fcd7f143a84ed56391afbd6c20a9fa52b6672c229776c6fc79f14382a5f3f8023e1fdbc9d8914bed0402b575327a6bc92dde2b77484060658 SHA512 2d7959da9ba52dfd5b29b4da05133b016c7764b8c48b5906b046a41aa66399f47662d8a829b7f6d34ce791379d719fd57195fc3ac20df9539dcf1b39090e9983
+EBUILD certbot-1.1.0.ebuild 1453 BLAKE2B fd554d1af958b7563762899563164851a8ac1fb7b1b37a566a191349af3a98f39c08a52f153ebe7a7e9187ceb0a516dd54943f746bbdf3c3e6a0b1938de5f61e SHA512 b537ac478cdc54147a8f78b9e72378131bf39ee3c0d057ab68f0c9c4ca63613daad5054e8286441e3820b2117733ed2dc254b0284b85ce52e59d199d1c6d4ab6
 EBUILD certbot-1.2.0-r1.ebuild 1480 BLAKE2B ba986a8752ea1a113425338c76a6c2c2928af3f7b33cbc49cca872bb61b269e541dc01709c0f29b6994760a15eaadff2da97a5d5d128f086af105e1b6c44e93a SHA512 a8039218848544651e80e11215e6f5cfa75ed2f244a9db61108b573a082e499f70cd4f358573f7a4aa423635755338b627ea212d8ef0e9f16338bce5ddf43412
 EBUILD certbot-9999.ebuild 1480 BLAKE2B ba986a8752ea1a113425338c76a6c2c2928af3f7b33cbc49cca872bb61b269e541dc01709c0f29b6994760a15eaadff2da97a5d5d128f086af105e1b6c44e93a SHA512 a8039218848544651e80e11215e6f5cfa75ed2f244a9db61108b573a082e499f70cd4f358573f7a4aa423635755338b627ea212d8ef0e9f16338bce5ddf43412
 MISC metadata.xml 334 BLAKE2B e7b28e7d3e7c6fdce0c5120b29fbf5aa607408e2add6c0ad42e921fb1add9def38c6cb191129a5a6e1f0e3ea119caa6cdc74955b572e5d2c6f854d0b7c7c521a SHA512 a24ccf633fc9c2670dcd35801d95bd8ca0f4ea4d3d53b6651f2e8e3e280b95ec8a464d99f5423942c14b0777ae4551f46c1ff285caea460bc91cbc417a7a5b70
diff --git a/app-crypt/certbot/certbot-0.39.0.ebuild b/app-crypt/certbot/certbot-0.39.0.ebuild
deleted file mode 100644
index 00ca3acc612d..000000000000
--- a/app-crypt/certbot/certbot-0.39.0.ebuild
+++ /dev/null
@@ -1,50 +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})
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="Let's encrypt client to automate deployment of X.509 certificates"
-HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="
-	${CDEPEND}
-	>=app-crypt/acme-0.29.0[${PYTHON_USEDEP}]
-	>=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
-	dev-python/configobj[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.2.3[${PYTHON_USEDEP}]
-	>=dev-python/distro-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/josepy-1.1.0[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	>=dev-python/parsedatetime-1.3[${PYTHON_USEDEP}]
-	dev-python/pyrfc3339[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/zope-component[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
-DEPEND="
-	${CDEPEND}
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	# acme is not installed, removing it here is fine, the dir just confuses tests
-	rm -R acme
-	pytest -vv ${PN} || die
-}
diff --git a/app-crypt/certbot/certbot-0.40.1.ebuild b/app-crypt/certbot/certbot-0.40.1.ebuild
deleted file mode 100644
index 6ec4076e0c5b..000000000000
--- a/app-crypt/certbot/certbot-0.40.1.ebuild
+++ /dev/null
@@ -1,50 +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})
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="Let's encrypt client to automate deployment of X.509 certificates"
-HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="
-	${CDEPEND}
-	>=app-crypt/acme-0.40.0[${PYTHON_USEDEP}]
-	>=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
-	dev-python/configobj[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.2.3[${PYTHON_USEDEP}]
-	>=dev-python/distro-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/josepy-1.1.0[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	>=dev-python/parsedatetime-1.3[${PYTHON_USEDEP}]
-	dev-python/pyrfc3339[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/zope-component[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
-DEPEND="
-	${CDEPEND}
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	# acme is not installed, removing it here is fine, the dir just confuses tests
-	rm -R acme
-	pytest -vv ${PN} || die
-}
diff --git a/app-crypt/certbot/certbot-1.0.0-r1.ebuild b/app-crypt/certbot/certbot-1.0.0-r1.ebuild
deleted file mode 100644
index 6b8dd39904dd..000000000000
--- a/app-crypt/certbot/certbot-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,51 +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})
-
-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 )"
-
-CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="
-	${CDEPEND}
-	>=app-crypt/acme-0.40.0[${PYTHON_USEDEP}]
-	>=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
-	dev-python/configobj[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.2.3[${PYTHON_USEDEP}]
-	>=dev-python/distro-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/josepy-1.1.0[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	>=dev-python/parsedatetime-1.3[${PYTHON_USEDEP}]
-	dev-python/pyrfc3339[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/zope-component[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
-DEPEND="
-	${CDEPEND}
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	# acme is not installed, removing it here is fine, the dir just confuses tests
-	rm -R ../acme
-	pytest -vv ${PN} || die
-}
diff --git a/app-crypt/certbot/certbot-1.1.0.ebuild b/app-crypt/certbot/certbot-1.1.0.ebuild
index ec673774775d..0bdc5cb8d9fb 100644
--- a/app-crypt/certbot/certbot-1.1.0.ebuild
+++ b/app-crypt/certbot/certbot-1.1.0.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 fi
 S=${WORKDIR}/${P}/${PN}
 
diff --git a/app-crypt/eid-mw/Manifest b/app-crypt/eid-mw/Manifest
index 26f90c17b5c4..da31055d9802 100644
--- a/app-crypt/eid-mw/Manifest
+++ b/app-crypt/eid-mw/Manifest
@@ -2,8 +2,8 @@ AUX eid-sign-test-4.4.19.patch 8320 BLAKE2B c2295a64a5353f79ea44703b7256f667b5c6
 DIST eid-mw-4.4.1.tar.gz 7708697 BLAKE2B 7bdbaa37af1cdd5a8abd1519939f663c7c871cea49850932d97c391465de362885b061c024285ab2690473a4bb1ba57a70fdc12a720246b2a610ac9525f6395e SHA512 9de54858ac052eeff101070dd11c5cf60ab1d29b8dc8d946680745acf9aa6ba1044ca5451eca6066b5b467fbc32a2a23bbe7e8551ca7559e6003a4097a304cfc
 DIST eid-mw-4.4.19.tar.gz 7941144 BLAKE2B c02f975081eacf7803839461ae91e3c6a24c3e2fc60064a981cc71f629925679b0df997e8acbe2da2f1e58dcc665b8633e3c9bf28b07be90ac8cdd0448e80848 SHA512 21530111461302123be662dd60f3fbd56ffd8a0537cac88c99d5a6bcd9163a27bc34e05beaf7502dd5ada247ca324d21590a866907b5a7a02ce3d8d78fcac634
 DIST eid-mw-4.4.23.tar.gz 7502185 BLAKE2B ab223c2d860f44806a6043a40891d89ab3418dd232bba1d60bd9b0b6871a77e6e24bc73c49afcffabc8ae7f16c235aabfb17efb8af7543b0e2bd3fe76ba655f7 SHA512 7c90d7ca08dcd2ba4d0c918b5ba6305da6107de457209acb9a0cc3243891c9b654b1c12fe4da53ec8bad65617198c0caffdb0482e343a8d807f00762e6672310
-EBUILD eid-mw-4.4.1.ebuild 2106 BLAKE2B 07d74477ca6ff373abf1168f520dd33179984691ab192fedff4d9370a68addc4990dc7172be8b1e6d8813da8089c534ed8c577daedd0aa7d2bfae6011f8e0f2d SHA512 a86805eed173ea10bb088d2374f134d9841257c2a51d5ffb51c0316811e62794243129965bb1ed46bc45419826e6ae1c4781cc8a9addf62e98f5411bf4cdde3e
-EBUILD eid-mw-4.4.19.ebuild 2433 BLAKE2B 07aa37e8d8d8abd22d8d46c1efbdd908e8cd76452b2d7fa50765d22326ddffcd140c02614db5469547fd81e8efe6f3fca4df681148a8d09a799f7ffb46db221d SHA512 b809f8d26a9357e848b5e59e10dd2aa9a07fdf2b410f1fc4ad4f4c8f232c996977c37ac68151434f44037bfe4230b67507dca8fae39ad219fb4f565d044cfd75
-EBUILD eid-mw-4.4.23.ebuild 2434 BLAKE2B f4fe30f8854caa026e9d7dbdc23c84d8f9868df3565843d33f254c7649f4a1a0398aed2064125df93923e651fc1beef1e9a7099d001ab101e6ceccf51f8b175a SHA512 0c93cab093e663d3eb3cdf65562bade29fd3e8a873243d0c81224afb11054469d7cce2be6814eff8eb29cccd4186fad9425921542c2abbe339b43da7b5d1ee8a
-EBUILD eid-mw-9999.ebuild 1832 BLAKE2B c6c9b0de69514b1d036e8e3566e8ecbcfdd6426bcc55bdbcfce15de389dca83d65a0cf50d3e9eb5b35fca7114e02e13cf3bfd3139e46298874ea5b872248b007 SHA512 1c4383bb1764fe4f8dbeabad9be447d682e2ee08e8174a7d7aa4a978c1243048cfcae54dc0d7b45e6acaa415b52cde1199aee6f94f5b9ef1f790f632dfbc28ee
+EBUILD eid-mw-4.4.1.ebuild 2108 BLAKE2B 470147b6b68b7a07a6b8cde6be249ea31cd2398e19c1b0a907ed99bc9b4fb0483c3b20bd1a4c210c44d2579c21ade7d052c525d7424d8f07d1f9cf90f7399998 SHA512 6df5ec722a76b27ec6d7e5a4c376b56db319cddeae9b35a4f055171d2b82c808ee8992ca78ad62d33d1595cca3b4511638d6322c9613cd5e303c67ece89bd9a4
+EBUILD eid-mw-4.4.19.ebuild 2435 BLAKE2B a30208a4d272202e15fe06ad98a576659bfde03154a5777fe9e1735dae67cf8cd033bf473cd789154e58037a255e6833519baa1f07b7a5849b17312bbbcd9a14 SHA512 c5e88ddcb80365f9b12ad02c12023be271ee75cdea4053483b91a5bb1e41f1d32d25524a1577ed605de02e3764129fc7c52c2d1046832fc5a484e308b326680e
+EBUILD eid-mw-4.4.23.ebuild 2436 BLAKE2B e7e84d3a8438cfaa24136b3da49a540d959855de635cf18e90820af30fbf8800ac0894ae52aba3b4acf44770d2412cb809bfed47472a08f9203824979992b77f SHA512 fbe9c66ac6dc51f7b682c55d62c4a4f3fcebd50a29bb09295a9b5e72e69e728266961d8433fa7947ad6a2aec89fc4f504912112be43e62d9a10f8fe643473007
+EBUILD eid-mw-9999.ebuild 1834 BLAKE2B db2a93efedb7039567f01c7d9418b48e3b97957d7ee154b9dbd199f77e07e5f78fbd1994d556562672955aae464cb71dfb2a5d08e802c879dacab2eb2f887093 SHA512 2b3e97dd5010b73b737e79faf8ec40e787b91e626b11a15932bac5153d37267676c3d51f2e88880e96a1fa530442589a3340a35a1d8be4503c41eeaf19db7101
 MISC metadata.xml 1445 BLAKE2B f402be7a768b67e34a736cdfaafc0df9f29301ba2d4b50f4ff27b9b08085826a67e452bb239893ef79d10eebb8981488cc71ca7f7015152783ad939e64df6d85 SHA512 b3934c2c2be9adc2f4d4d8ab654b8b21056bcbf29a67751ead9c8f1be4339a651a6d315c6ee1c182c3e8a32ad630c73f0990bd4fce4d34afa948055f0447ea98
diff --git a/app-crypt/eid-mw/eid-mw-4.4.1.ebuild b/app-crypt/eid-mw/eid-mw-4.4.1.ebuild
index 445cf84dbf83..f446179c580b 100644
--- a/app-crypt/eid-mw/eid-mw-4.4.1.ebuild
+++ b/app-crypt/eid-mw/eid-mw-4.4.1.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
@@ -77,14 +77,14 @@ src_install() {
 	fi
 }
 
-pkg_postinst(){
+pkg_postinst() {
 	if use gtk; then
 		gnome2_schemas_update
 		gnome2_icon_cache_update
 	fi
 }
 
-pkg_postrm(){
+pkg_postrm() {
 	if use gtk; then
 		gnome2_schemas_update
 		gnome2_icon_cache_update
diff --git a/app-crypt/eid-mw/eid-mw-4.4.19.ebuild b/app-crypt/eid-mw/eid-mw-4.4.19.ebuild
index 98c8bfee6ce3..a73a18dec69e 100644
--- a/app-crypt/eid-mw/eid-mw-4.4.19.ebuild
+++ b/app-crypt/eid-mw/eid-mw-4.4.19.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
@@ -86,7 +86,7 @@ src_install() {
 	fi
 }
 
-pkg_postinst(){
+pkg_postinst() {
 	if use gtk; then
 		gnome2_schemas_update
 		xdg_desktop_database_update
@@ -94,7 +94,7 @@ pkg_postinst(){
 	fi
 }
 
-pkg_postrm(){
+pkg_postrm() {
 	if use gtk; then
 		gnome2_schemas_update
 		xdg_desktop_database_update
diff --git a/app-crypt/eid-mw/eid-mw-4.4.23.ebuild b/app-crypt/eid-mw/eid-mw-4.4.23.ebuild
index 95d518b2d3f6..6dc98d418711 100644
--- a/app-crypt/eid-mw/eid-mw-4.4.23.ebuild
+++ b/app-crypt/eid-mw/eid-mw-4.4.23.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
@@ -86,7 +86,7 @@ src_install() {
 	fi
 }
 
-pkg_postinst(){
+pkg_postinst() {
 	if use gtk; then
 		gnome2_schemas_update
 		xdg_desktop_database_update
@@ -94,7 +94,7 @@ pkg_postinst(){
 	fi
 }
 
-pkg_postrm(){
+pkg_postrm() {
 	if use gtk; then
 		gnome2_schemas_update
 		xdg_desktop_database_update
diff --git a/app-crypt/eid-mw/eid-mw-9999.ebuild b/app-crypt/eid-mw/eid-mw-9999.ebuild
index 4f93816f0b92..023f52ee56b0 100644
--- a/app-crypt/eid-mw/eid-mw-9999.ebuild
+++ b/app-crypt/eid-mw/eid-mw-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -68,14 +68,14 @@ src_install() {
 	fi
 }
 
-pkg_postinst(){
+pkg_postinst() {
 	if use gtk; then
 		gnome2_schemas_update
 		gnome2_icon_cache_update
 	fi
 }
 
-pkg_postrm(){
+pkg_postrm() {
 	if use gtk; then
 		gnome2_schemas_update
 		gnome2_icon_cache_update
diff --git a/app-crypt/p11-kit/Manifest b/app-crypt/p11-kit/Manifest
index e5643f002d61..c9ea56110a7d 100644
--- a/app-crypt/p11-kit/Manifest
+++ b/app-crypt/p11-kit/Manifest
@@ -1,10 +1,5 @@
-AUX p11-kit-0.23.12-mktime.patch 683 BLAKE2B 16d25f2634dea248659ee9790555afaf0e3af14a05d7f186a23f321044f319f9302ef893d5f196855de7e4c04283bceb482c6e4986bd8ac10c0ec43c56bdf748 SHA512 d4f381e27271583a8a4fbf44e4b10eb9a5a3a700e8b1c820182c87dbc5bbfe963e4bd2ff0389b58e765a8810018bae5f18dfa2ed3b967dc5275087609a95e366
-DIST p11-kit-0.23.16.1.tar.gz 1292783 BLAKE2B 60be56656156c86d6f0f3285bd691ed85ec1a992e8a789f0f21f9ada172a8cab0581cc42f89c3079a1bd7b3493f0d38cd952711fda50c2e80bf96e94fcd9ff87 SHA512 7d0bbd793b43dba081054b4d022a8dbd1d477a3bd6aced72a641087023cf020f1d898899a08e737880e6c810f924814c62497c5ecb19f8322cde42667426a9a7
-DIST p11-kit-0.23.18.1.tar.gz 1305755 BLAKE2B 6d453fad0f4b42e3ae583e76bd206377fd30dd32d98dda94ba3b2fe505cde4c3e05410e685ebe9e8e2f6cae7da3cbd2b78203cae64b8c000b1a2f2ec2a902c4c SHA512 941996aea75025dad5dfc6f9b4609bc92bc0888d5b2b58de0d498d6cf75d059421405d9c3bad51122108b6ad1e41e434609ead23404efe635cdb806836ccadbd
 DIST p11-kit-0.23.19.tar.xz 822652 BLAKE2B c1750e2d0b8ebdfcf70695259401a029b2d5739d8222c37f128f94f8a4313321956e120dcba5c7cb882d16e1a6b12398f9dfa88ef601e826f0dfec5acbf438c8 SHA512 1a7feb2c14381f2ca87386b6a81f46cfb27ccce70ad87a2fc86726e2827b49971958e40c4fc54df01df7570d82058afe82d21c5b3c59fb8310aa641d3b370da2
 DIST p11-kit-0.23.20.tar.xz 822588 BLAKE2B adda58acc121d38d3520d20daf8f59c3c46f81afe807d9277fae70e836d194d08cfea0405d2186d548ea91be56eee63d576a318c330fa844a0cf1889960db384 SHA512 1eb88773fdd49dd48c7e089744e9dbbf6c1033a4863f3bfe75a68d842804baa3c373cb1b28ee625dd69a6e16c89df4ac755e0928495dccf38c007c530f6cfa57
-EBUILD p11-kit-0.23.16.1-r1.ebuild 2000 BLAKE2B 941d96d1ef86dbaf54ef8a58929db1527347539e1cb30034c1cca0d91abbdbc7aecb5c541537e0e89ece154475e4e4b6e7c77cd4aa9d67970f44692a3481ee3e SHA512 33748e18cd48c50c69eb4641a6faff8d1fc535b914d1fed4105f5eaeb0bc34fa4f77e73315fcb5ba6713d9f285ad1a24507c318c717f07590d67543148d6259d
-EBUILD p11-kit-0.23.18.1.ebuild 1955 BLAKE2B d49489e85d05b6c4f4be571032a7203a7142a31a0378ab6d67c04d003dbffccb25e15fc71fbb1a71c081117d9aee9859c30d1ecf7608a4536e00ccc483c864e5 SHA512 f3b0fd9f48e8989f6ab8cdafd44790356a2793bbd562bb10f11d6961baec1f078bcee4807b679fd9a8c727b80eb9cc1b75eeb64f108c232f45baddbee6915c16
-EBUILD p11-kit-0.23.19.ebuild 1957 BLAKE2B 8a8d2dee1652a9b35e6a252cf9f6929d80168cf94581f57de67779fde70eec56e38965acb5650678ef87b1287acfa908552d74f5d5faccb6e63bfbd6477f0956 SHA512 81b6206c1d1bfdccc6cca14cb9ddf398d194d598dcf4a16659acbbf5e3dc2f92dea7bddddb7bf130a695972182452466543e09e18fb7a89a8aa8a10e1daf033d
-EBUILD p11-kit-0.23.20.ebuild 1957 BLAKE2B 8a8d2dee1652a9b35e6a252cf9f6929d80168cf94581f57de67779fde70eec56e38965acb5650678ef87b1287acfa908552d74f5d5faccb6e63bfbd6477f0956 SHA512 81b6206c1d1bfdccc6cca14cb9ddf398d194d598dcf4a16659acbbf5e3dc2f92dea7bddddb7bf130a695972182452466543e09e18fb7a89a8aa8a10e1daf033d
+EBUILD p11-kit-0.23.19-r1.ebuild 1940 BLAKE2B 5ef3765ecfc860f35514703980a7f6b5677883ef9e05071277fe823351c42f21826677e4c842f99aff1afafec202c7857cf58ac2fd58800f52b4a15039f08f05 SHA512 25f16504693adf5cb96848dc564fca75bebb1065641a6a7971847127465dfcd1ac3aee386737aa992720d2b6b6488d457e945b8812cf8196e8b1215bcf3a0135
+EBUILD p11-kit-0.23.20-r1.ebuild 1950 BLAKE2B 006a0f29891942df9a47f8819a92c356fbe6849c3cc4ff62ec998b46240a9caba46802b8c993f8e19b7585f5ff501fbb3b22bbefa14ca7664b9c53f7a042dc3b SHA512 cb6cc6d8cda826ea464ecec52e3533254a4287470b010fe5958c11f13835910595a97cfb727c36ca5d1415d018d63d436f8c2a27e838fac466f827f4595adc49
 MISC metadata.xml 461 BLAKE2B 4e2b3a011845a7f8c6e4afc0f176615b5badbb64f73a6f83854c4b40babc1b2cafafd0dc26ea65a16d2b96a314600218271e63aeb58f5fb1a3dec3fbffd4973c SHA512 947edc1be15e91e32b12b75b95ba95ea3db9528c2e6bbaf3006f9d9c842bf63256614b1da3129b5a8dd9f2c57771523a79d02febdc17ce9214cbe91276eee82a
diff --git a/app-crypt/p11-kit/files/p11-kit-0.23.12-mktime.patch b/app-crypt/p11-kit/files/p11-kit-0.23.12-mktime.patch
deleted file mode 100644
index 7cc0baada973..000000000000
--- a/app-crypt/p11-kit/files/p11-kit-0.23.12-mktime.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 3d009fda4cb39157d6876e7d16cbc57f7b59bc86 Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Mon, 1 Jul 2019 13:38:25 +0300
-Subject: [PATCH] trust: do not allow daylight to invalidate date validation
-
-Issue: 235
-Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
----
- trust/builder.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/trust/builder.c b/trust/builder.c
-index d819dc8..2fc0c40 100644
---- a/trust/builder.c
-+++ b/trust/builder.c
-@@ -261,6 +261,7 @@ type_date (p11_builder *builder,
- 		return false;
- 
- 	memcpy (&two, &tm, sizeof (tm));
-+	two.tm_isdst = -1;	// do not perform tz fixup
- 	if (mktime (&two) < 0)
- 		return false;
- 
--- 
-2.21.0
-
diff --git a/app-crypt/p11-kit/p11-kit-0.23.18.1.ebuild b/app-crypt/p11-kit/p11-kit-0.23.18.1.ebuild
deleted file mode 100644
index 3a5ba72d93a0..000000000000
--- a/app-crypt/p11-kit/p11-kit-0.23.18.1.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
-
-inherit multilib-minimal
-
-DESCRIPTION="Provides a standard configuration setup for installing PKCS#11"
-HOMEPAGE="https://p11-glue.github.io/p11-glue/p11-kit.html"
-SRC_URI="https://github.com/p11-glue/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+asn1 debug +libffi +trust"
-REQUIRED_USE="trust? ( asn1 )"
-
-RDEPEND="asn1? ( >=dev-libs/libtasn1-3.4:=[${MULTILIB_USEDEP}] )
-	libffi? ( >=virtual/libffi-3.0.0:=[${MULTILIB_USEDEP}] )
-	trust? ( app-misc/ca-certificates )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-pkg_setup() {
-	# disable unsafe tests, bug#502088
-	export FAKED_MODE=1
-}
-
-src_prepare() {
-	if [[ ${CHOST} == *-solaris2.* && ${CHOST##*-solaris2.} -lt 11 ]] ; then
-		# Solaris 10 and before doesn't know about XPG7 (XOPEN_SOURCE=700)
-		# drop to XPG6 to make feature_tests.h happy
-		sed -i -e '/define _XOPEN_SOURCE/s/700/600/' common/compat.c || die
-		# paths.h isn't available, oddly enough also not used albeit included
-		sed -i -e '/#include <paths.h>/d' trust/test-trust.c || die
-		# we don't have SUN_LEN here
-		sed -i -e 's/SUN_LEN \(([^)]\+)\)/strlen (\1->sun_path)/' \
-			p11-kit/server.c || die
-	fi
-	default
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable trust trust-module) \
-		$(use_with trust trust-paths ${EPREFIX}/etc/ssl/certs/ca-certificates.crt) \
-		$(use_enable debug) \
-		$(use_with libffi) \
-		$(use_with asn1 libtasn1)
-
-	if multilib_is_native_abi; then
-		# re-use provided documentation
-		ln -s "${S}"/doc/manual/html doc/manual/html || die
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/app-crypt/p11-kit/p11-kit-0.23.16.1-r1.ebuild b/app-crypt/p11-kit/p11-kit-0.23.19-r1.ebuild
index 3b3fbdb534df..978b8822962d 100644
--- a/app-crypt/p11-kit/p11-kit-0.23.16.1-r1.ebuild
+++ b/app-crypt/p11-kit/p11-kit-0.23.19-r1.ebuild
@@ -7,7 +7,7 @@ inherit multilib-minimal
 
 DESCRIPTION="Provides a standard configuration setup for installing PKCS#11"
 HOMEPAGE="https://p11-glue.github.io/p11-glue/p11-kit.html"
-SRC_URI="https://github.com/p11-glue/${PN}/releases/download/${PV}/${P}.tar.gz"
+SRC_URI="https://github.com/p11-glue/p11-kit/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0"
@@ -16,15 +16,11 @@ IUSE="+asn1 debug +libffi +trust"
 REQUIRED_USE="trust? ( asn1 )"
 
 RDEPEND="asn1? ( >=dev-libs/libtasn1-3.4:=[${MULTILIB_USEDEP}] )
-	libffi? ( >=virtual/libffi-3.0.0:=[${MULTILIB_USEDEP}] )
+	libffi? ( dev-libs/libffi:=[${MULTILIB_USEDEP}] )
 	trust? ( app-misc/ca-certificates )"
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
-PATCHES=(
-	"${FILESDIR}/${PN}-0.23.12-mktime.patch"
-)
-
 pkg_setup() {
 	# disable unsafe tests, bug#502088
 	export FAKED_MODE=1
diff --git a/app-crypt/p11-kit/p11-kit-0.23.19.ebuild b/app-crypt/p11-kit/p11-kit-0.23.20-r1.ebuild
index 4a9b986476e8..385d79a3bbe8 100644
--- a/app-crypt/p11-kit/p11-kit-0.23.19.ebuild
+++ b/app-crypt/p11-kit/p11-kit-0.23.20-r1.ebuild
@@ -16,7 +16,7 @@ IUSE="+asn1 debug +libffi +trust"
 REQUIRED_USE="trust? ( asn1 )"
 
 RDEPEND="asn1? ( >=dev-libs/libtasn1-3.4:=[${MULTILIB_USEDEP}] )
-	libffi? ( >=virtual/libffi-3.0.0:=[${MULTILIB_USEDEP}] )
+	libffi? ( dev-libs/libffi:=[${MULTILIB_USEDEP}] )
 	trust? ( app-misc/ca-certificates )"
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
diff --git a/app-crypt/p11-kit/p11-kit-0.23.20.ebuild b/app-crypt/p11-kit/p11-kit-0.23.20.ebuild
deleted file mode 100644
index 4a9b986476e8..000000000000
--- a/app-crypt/p11-kit/p11-kit-0.23.20.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
-
-inherit multilib-minimal
-
-DESCRIPTION="Provides a standard configuration setup for installing PKCS#11"
-HOMEPAGE="https://p11-glue.github.io/p11-glue/p11-kit.html"
-SRC_URI="https://github.com/p11-glue/p11-kit/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+asn1 debug +libffi +trust"
-REQUIRED_USE="trust? ( asn1 )"
-
-RDEPEND="asn1? ( >=dev-libs/libtasn1-3.4:=[${MULTILIB_USEDEP}] )
-	libffi? ( >=virtual/libffi-3.0.0:=[${MULTILIB_USEDEP}] )
-	trust? ( app-misc/ca-certificates )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-pkg_setup() {
-	# disable unsafe tests, bug#502088
-	export FAKED_MODE=1
-}
-
-src_prepare() {
-	if [[ ${CHOST} == *-solaris2.* && ${CHOST##*-solaris2.} -lt 11 ]] ; then
-		# Solaris 10 and before doesn't know about XPG7 (XOPEN_SOURCE=700)
-		# drop to XPG6 to make feature_tests.h happy
-		sed -i -e '/define _XOPEN_SOURCE/s/700/600/' common/compat.c || die
-		# paths.h isn't available, oddly enough also not used albeit included
-		sed -i -e '/#include <paths.h>/d' trust/test-trust.c || die
-		# we don't have SUN_LEN here
-		sed -i -e 's/SUN_LEN \(([^)]\+)\)/strlen (\1->sun_path)/' \
-			p11-kit/server.c || die
-	fi
-	default
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable trust trust-module) \
-		$(use_with trust trust-paths ${EPREFIX}/etc/ssl/certs/ca-certificates.crt) \
-		$(use_enable debug) \
-		$(use_with libffi) \
-		$(use_with asn1 libtasn1)
-
-	if multilib_is_native_abi; then
-		# re-use provided documentation
-		ln -s "${S}"/doc/manual/html doc/manual/html || die
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/app-crypt/qca/Manifest b/app-crypt/qca/Manifest
index 07315dc35ee5..24a6a15bb8cc 100644
--- a/app-crypt/qca/Manifest
+++ b/app-crypt/qca/Manifest
@@ -1,6 +1,6 @@
 AUX qca-disable-pgp-test.patch 446 BLAKE2B a98d5951d7b89c65787d7d586a5504949c51271ebe09c5e19b90a2e24f24fb6d03d6c1f76d7ad4234354bc2507cf7031c716b3b2bf8243b8c1d85065079dded4 SHA512 30bb6d31b9392166d6bbae39da2eeb1788ac9cccffb801b074468a3606a6e1a56d6a41ee276d3b8b8d39112bf6aea7025f07f4810bb835102bd00521ee9eb104
 DIST qca-2.2.1.tar.xz 691676 BLAKE2B d5bcc0d6e791811e1efcdbf2e09916fe40ad682b0e59b2993c73a5bd79e09fc28facdec81259a982bee05223c8dfce78b9a6b729ca4e566c0901a13b91575379 SHA512 3a0e8aa7cf3ea9a7244facaf1d521ebca2753af37636e7bf5f21c57ae880ac9682ae7d6d9fa5ce41b73568ff9538214956b89cd41228c2cb828d9068c2031a9c
-DIST qca-2.2.90.tar.xz 729488 BLAKE2B bc061118afa7912d249317dd4af9d2f4619b339ec892e33d1c757dc11a4a8b06db96d2437f08abeb48e4a1277cb399d8b3d60d8e2645b2d81cf9d20735ac3cb4 SHA512 5c431b66f898786271881c1275883e332fbfecd62ee265cae2ad345a13ff74ca36fc9b3e93972dcf29c4333f1c8049488ca52ca809c977553b422b9a27b45b7c
+DIST qca-2.3.0.tar.xz 729504 BLAKE2B 71cf9dfae00066c14e1055da1fa1a8e1210f538b1addfde1b99a9b26b1e8f7dd61e289d0f505b5ec04d5f4745216d4fd0f8be8f8de9e9cbf74123907ba703d0e SHA512 ca9251868e073834562fa62ffc64b3e7817c9ddadc6bc3fb99cf8b5c8d859969562170a98874be9590c617b2dd8e5590d2c83792554f54bb880c677902db22fe
 EBUILD qca-2.2.1.ebuild 1833 BLAKE2B 64c2b736ebff641da4e54b6a46babee9076299122e7ca930d359c657f5f486fe4410856bafc6e862f2de110bc61be81073b4ecb62dd669dfb73e3374bdcf5fcd SHA512 38d71d80a624012431f6ff8b160fd9abbfd66db36119fcf72b20c4b3f5b0111d833f80c66505a1dbbe690b4736299373668ad63b829f92e3a11ca9b97ac45213
-EBUILD qca-2.2.90.ebuild 1750 BLAKE2B 9e2a252c6c5a416411537e5c6d4371a1b83d5b4612940355618d80fb6c75f7bbd28753a0e01d3097761e20c75353aff5fce9c8f8b7d085736e2d237a9a7a8cad SHA512 8706723bba0dadc89e4b9fdf5f8f11406a16ee2ded2e24f6a9a45be2a2cdaf72bc7c3af896e4cd42a9886dc2bb89b9763e4d6d6e452e4f34a4889e39dd529c5c
+EBUILD qca-2.3.0.ebuild 1846 BLAKE2B 9ea57312678c2e1ccd0f83c693b7eef865862756ea9ffbb5b0ac757f8fef43de7d190054f7b7a894258841dfdf0cb6ed61b4b5857bbfc7bb5d85cdf9ceaccb82 SHA512 0b1ec052cef38004ab5bbce03d7110eef216b915da85f9d3f4a0c4d84a32cb0a6e97b35c4e3df29e086953103a2c2efb7941946a3e18758c1b9ebacd3436617f
 MISC metadata.xml 745 BLAKE2B ff8e25b082d3c642fce099df1a218a4936bdc862a96fd237303d040c477544cf6368d23cc5de414d95f021e9c6ec475879225ab201f7c6d6711c04153ac53140 SHA512 6b82494b8dfe0d36da9818a6dcf775252dbb7051430232ccc2519c449cc2877da6478ca98f5b7a982a7660a869a0b8ae7a814fb18108ff42fed9712a9253e867
diff --git a/app-crypt/qca/qca-2.2.90.ebuild b/app-crypt/qca/qca-2.3.0.ebuild
index 0531711ed4fa..adf2da003f33 100644
--- a/app-crypt/qca/qca-2.2.90.ebuild
+++ b/app-crypt/qca/qca-2.3.0.ebuild
@@ -7,11 +7,11 @@ inherit kde.org cmake qmake-utils
 
 DESCRIPTION="Qt Cryptographic Architecture (QCA)"
 HOMEPAGE="https://userbase.kde.org/QCA"
-SRC_URI="mirror://kde/unstable/${PN}/${PV}/${P}.tar.xz"
+SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="2"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 IUSE="botan debug doc examples gcrypt gpg logger nss pkcs11 sasl softstore +ssl test"
 
 RESTRICT="!test? ( test )"
diff --git a/app-crypt/scute/Manifest b/app-crypt/scute/Manifest
index ceeba7bbbd20..c6aa1e3451fd 100644
--- a/app-crypt/scute/Manifest
+++ b/app-crypt/scute/Manifest
@@ -1,3 +1,6 @@
 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
-MISC metadata.xml 924 BLAKE2B bb0ebeccee119b2b861a49d6d9cbfc996462dcde41d7afa25fb3bf21c6cc5977a85350878f8087cb87a9e889bfc0e1e77b07801843ef62597844f0524450625c SHA512 ecde34768937a2c45c5cb393e34d47eae6f26d7a3c1f525dc63c706971476692286759b3beb189d02694379740f9ce7aee6b2dcd3404b423955462917da107b2
+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/metadata.xml b/app-crypt/scute/metadata.xml
index 3889f4a06370..080fa800cb8c 100644
--- a/app-crypt/scute/metadata.xml
+++ b/app-crypt/scute/metadata.xml
@@ -1,25 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>lucas.yamanishi@gmail.com</email>
-    <name>Lucas Yamanishi</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
-  <longdescription>
-    Scute is a PKCS #11 module that adds support for the OpenPGP
-    smartcard card to the Mozilla Network Security Services (NSS).
-  </longdescription>
-  <upstream>
-    <maintainer>
-      <email>mb@g10code.de</email>
-      <name>Marcus Brinkmann</name>
-    </maintainer>
-    <changelog>http://git.gnupg.org/cgi-bin/gitweb.cgi?p=scute.git;a=blob_plain;f=ChangeLog;hb=HEAD</changelog>
-    <doc lang="en">http://www.scute.org/documentation.xhtml</doc>
-    <bugs-to>https://bugs.g10code.com/gnupg/</bugs-to>
-  </upstream>
+	<maintainer type="person">
+		<email>soap@gentoo.org</email>
+		<name>David Seifert</name>
+	</maintainer>
+	<longdescription>
+		Scute is a PKCS #11 module that adds support for the OpenPGP smartcard card to the Mozilla Network Security Services (NSS).
+	</longdescription>
+	<upstream>
+		<maintainer>
+			<email>mb@g10code.de</email>
+			<name>Marcus Brinkmann</name>
+		</maintainer>
+		<changelog>http://git.gnupg.org/cgi-bin/gitweb.cgi?p=scute.git;a=blob_plain;f=ChangeLog;hb=HEAD</changelog>
+		<doc lang="en">http://www.scute.org/documentation.xhtml</doc>
+		<bugs-to>https://bugs.g10code.com/gnupg/</bugs-to>
+	</upstream>
 </pkgmetadata>
diff --git a/app-crypt/scute/scute-1.6.0.ebuild b/app-crypt/scute/scute-1.6.0.ebuild
new file mode 100644
index 000000000000..597dcf357385
--- /dev/null
+++ b/app-crypt/scute/scute-1.6.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# 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
+	https://dev.gentoo.org/~soap/distfiles/${P}-manual-eps-images.tar.xz"
+
+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}"
+BDEPEND+="
+	sys-apps/texinfo"
+
+src_unpack() {
+	default
+
+	# have to use pregenerated EPS files required for the texinfo documentation,
+	# due to bug 664236 preventing even converting *to* eps.
+	mv scute-eps/*.eps "${S}"/doc/manual/ || die
+}
+
+src_configure() {
+	econf \
+		--libdir="${EPREFIX}"/usr/$(get_libdir)/pkcs11 \
+		--with-libgpg-error-prefix="${ESYSROOT}"/usr \
+		--with-libassuan-prefix="${ESYSROOT}"/usr
+}
+
+src_install() {
+	default
+
+	# only building plugins
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-crypt/ssh-multiadd/Manifest b/app-crypt/ssh-multiadd/Manifest
index 77eb0df69d66..d28bdfee2162 100644
--- a/app-crypt/ssh-multiadd/Manifest
+++ b/app-crypt/ssh-multiadd/Manifest
@@ -1,3 +1,3 @@
 DIST ssh-multiadd-1.3.2.tar.gz 14035 BLAKE2B 1de9e8593be128b792d6babe9ada37e7f611045d573e3430c0bc08a66d9c6acb00f5f6c453b22fd2308233cc8e58c62ab116de1aae702d066f664036bb029027 SHA512 fd4f26bfa5e2f654fc650470353901c6f418685f971ec4b5834afd0136e77469523c49b7cacb1b9716ff6c8cbbe810a057b214927f0325524170db84aebacbb3
-EBUILD ssh-multiadd-1.3.2-r1.ebuild 682 BLAKE2B 03116f84d519517597ea91bad356c8b1f78fa976df95a6719d2c14c6d7d77abe5e9c82b77a6e7fb0ec498e170c63033fb1437324be4e6eb990ec499460e2321b SHA512 5744aadd5c4ae1070299465beecde93886f481d763576a6bcf09c03e13f9849dc4516bd5c435cd1b7ca1664dae2167c1a46650442b4571c4a7bac5e1a76646ea
+EBUILD ssh-multiadd-1.3.2-r1.ebuild 680 BLAKE2B ef89a9c3a7a5b9a483e7afb5b0f9f8df1e7830e083ab62e3bd195d53cbfee859e85335f5103371956068e72e730b9876e93cec5ccb765961b74f8c7fb6c1919d SHA512 583716cc0d498671d7f74ecc9ceeddda121d2de1fde15ac908e9d64b268cfc9c8059416d7e2b19cc786c1455b11d82018eae1fdba09f37eb91bb5cbc2a9f2b3b
 MISC metadata.xml 251 BLAKE2B 958e5ce6ef310471d4c88ef4cfd054eb9476b56abe4e8b82b003632bae4d56a800530601a7fd4b0129fdf22fe5124e8642f60835c6792cdfe38e09afb2d701ec SHA512 10bbd614739518c3b33fc05f34caa511ad71c599e2df0cb58514f05186b9c4ef73e00e3c78018c38581376a90a7968a01c35620fca32fdc5a91a762233a8c5fd
diff --git a/app-crypt/ssh-multiadd/ssh-multiadd-1.3.2-r1.ebuild b/app-crypt/ssh-multiadd/ssh-multiadd-1.3.2-r1.ebuild
index e68bcf0944a4..b73f0399baf4 100644
--- a/app-crypt/ssh-multiadd/ssh-multiadd-1.3.2-r1.ebuild
+++ b/app-crypt/ssh-multiadd/ssh-multiadd-1.3.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -26,7 +26,7 @@ src_prepare() {
 	python_fix_shebang .
 }
 
-src_compile(){
+src_compile() {
 	:
 }
 
diff --git a/app-crypt/swtpm/Manifest b/app-crypt/swtpm/Manifest
index d3b8b6ac17ea..5b5405ff54f5 100644
--- a/app-crypt/swtpm/Manifest
+++ b/app-crypt/swtpm/Manifest
@@ -1,5 +1,5 @@
 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.2.0.tar.gz 297419 BLAKE2B 9045cfd127d2f7e8e2e202818a375b4f6398806a097ed0df73abb76426db3af65a0d27f5e7212ce099d796862d3a9b3d421e987cf159bdce8879fc764eb5e923 SHA512 bda54690c0438138ff7adcc212fb125d2bb62618b10305eeced776e014bb135ea1a1dd1271a99fb2c60bf7e418644ded029c3c09ec2c6c1258e5062122cacf19
-EBUILD swtpm-0.2.0.ebuild 1249 BLAKE2B 13f4d7d1c7491c94527986f04fcc429db6fe9c57988bf75d99605fc72e012b528bcf9790b382ce0451f60fdc91e12e0ac5d07bbc6f6fecf0488f9821dbab0ed1 SHA512 0a8a85b50443d8abe5922f8ad638386f3665801e6023ee72c67e62d8ddddc7b91cbf81e475c3ba065a6fc32a9561167ab0a1ea96b9dd37fbc7acdf4ac521a26c
+EBUILD swtpm-0.2.0-r1.ebuild 1417 BLAKE2B dfcf8f0024e9677269a841e2a62cc45eeb15de7d647da257812eea22c76af426786a0f63d192c148a041de6aadda2a040f3aa56aacd1d3f91f09963ae249ef0f SHA512 c1636ad8734fdf739a06f33ab111703c2553fa48c29d2e2bb002311d270a9fe76d9929ffce4052fb55b2d5afd4d3fec27c86eaf4c560cc973d6802a3524cd1e4
 MISC metadata.xml 457 BLAKE2B defc06c2642823aa760cafc22e90f891f9337358bfaa446778e1f4107f6e295ec21b5987f49bdcee3fd7b68084be1b864d7569e74bd729345e4886b08c617a06 SHA512 c80e24dc4ec41e5aae1e7fe67208c945e62c02f469164d0a76445269e3e0204674cd593956f99fa1539505e1a70a15bbf6c02afcf6b38592f04f3c4d3f275e08
diff --git a/app-crypt/swtpm/swtpm-0.2.0.ebuild b/app-crypt/swtpm/swtpm-0.2.0-r1.ebuild
index 170483bd7cb5..eeb7c5075a97 100644
--- a/app-crypt/swtpm/swtpm-0.2.0.ebuild
+++ b/app-crypt/swtpm/swtpm-0.2.0-r1.ebuild
@@ -13,11 +13,10 @@ SRC_URI="https://github.com/stefanberger/swtpm/archive/v${PV}.tar.gz -> ${P}.tar
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="fuse gnutls seccomp test"
+IUSE="fuse gnutls libressl seccomp test"
 RESTRICT="!test? ( test )"
 
-COMMON_DEPEND="dev-libs/libtpms
-	dev-libs/openssl:0
+COMMON_DEPEND="
 	fuse? (
 		dev-libs/glib:2
 		sys-fs/fuse:0
@@ -26,6 +25,14 @@ COMMON_DEPEND="dev-libs/libtpms
 		   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 )
 "
 
@@ -61,4 +68,5 @@ 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/tpm-tools/Manifest b/app-crypt/tpm-tools/Manifest
index cc9e72eebb88..c478afac7315 100644
--- a/app-crypt/tpm-tools/Manifest
+++ b/app-crypt/tpm-tools/Manifest
@@ -1,4 +1,4 @@
 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
 EBUILD tpm-tools-1.3.9.1-r1.ebuild 1018 BLAKE2B ec2e15103c01f08048ccf9beacc3e7505d45add816a2871301f3c566365f75c514759907ee2fe3bfdd01e75a7ca4ed5e1c0c4c40fbdc1d199dd0073e87362bf5 SHA512 f196ad0f3b5a0f4ffc37280d26bac4faa4ae072de3a032822d68d6ed41859c33a1e8036fc294e010bfc8af0046d65c4290ce5a61af9b520839bfee4be54f377a
-MISC metadata.xml 437 BLAKE2B 996a2b0589cad35e07abebe94f5b72ab91af5a143e8150f8dc1aa13252f0dce07e5831537199173c3bd244486ad913ed1d7b6a29c0501125e1041377d87c1df3 SHA512 e8ecc28c83cba3e72f7950dc0969486e8e4e0da613c37c76aa3e50b113e0adb6bb9a2172681266fb294a6cbb1fd7406d2d7a28771af635c71b40b3ad031d2465
+MISC metadata.xml 620 BLAKE2B 476e96fcb039ddb412218d88dcdd4cf2fff9fab8c1f84d4c8e8388963c3150facf9b23e661c5f3552928fe6695105e8ee713895e88bdcd87b648eec6d2adc59b SHA512 38c4cfaa0c8d3b3f606247d76a52e82e3dab7c487e73780180a197763a695c3d023ac54706c87238f75f2ef8ba6b1913bcfd7769c36506690830fd98b6cb7d6e
diff --git a/app-crypt/tpm-tools/metadata.xml b/app-crypt/tpm-tools/metadata.xml
index c53b4aaedf5a..d0084064703c 100644
--- a/app-crypt/tpm-tools/metadata.xml
+++ b/app-crypt/tpm-tools/metadata.xml
@@ -1,14 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <use>
-    <flag name="pkcs11">
-      Build Token data management utilities based on OpenCryptoki's
-      (<pkg>dev-libs/opencryptoki</pkg>) PKCS#11 implementation.
-    </flag>
-  </use>
-  <upstream>
-    <remote-id type="sourceforge">trousers</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>salah.coronya@gmail.com</email>
+		<name>Salah Coronya</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<use>
+		<flag name="pkcs11">
+		Build Token data management utilities based on OpenCryptoki's
+		(<pkg>dev-libs/opencryptoki</pkg>) PKCS#11 implementation.
+		</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">trousers</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-crypt/tpm2-abrmd/Manifest b/app-crypt/tpm2-abrmd/Manifest
index 72802e9afda6..729e8a8c56db 100644
--- a/app-crypt/tpm2-abrmd/Manifest
+++ b/app-crypt/tpm2-abrmd/Manifest
@@ -2,5 +2,7 @@ AUX tpm2-abrmd-2.1.1-build.patch 4350 BLAKE2B 9d8dd854954bb79239a2b443d7d6a8eb4a
 AUX tpm2-abrmd.confd 17 BLAKE2B f3b6301cb29f0f741c26025bded10af8948eb7f16faca051828b063f4fdab823309fac085e69e281600f77646f3e2bd91c1a5079bd675569aef8db762fdbe991 SHA512 ca7c4782ccc3ee7592bb4b24a6a81c624d22969cf9b9e1c3e22d45e85d3720836b1f22735ccf2ba51258c6eb0b30c4d88d7bed893f58b1aac7423fb7013529f9
 AUX tpm2-abrmd.initd 390 BLAKE2B 5dbaccf073eba208e13c24f92127e41c4c71fe62dd9bf2062301efbcc16daa1559ffba127399a189d6466e21a8cf9b85ac0e09d34f495be58430eb3cfe0886ef SHA512 aef622face110e22831dddab8a6474b4d003e6d50da9d334653a88ef0a7fca88377379a56fef9c404af5222c8c2fb97090eca913aa7d96183c4e14d7ab470044
 DIST tpm2-abrmd-2.1.1.tar.gz 561352 BLAKE2B 4106811b238fee7b503bf0afb4ed857371bab023d8e449d5864eebb2386779e2bc8fb0f2bf8e334ebd8d7abe5c569f2b2cc2ea60b07672b1d3294092e63c2a5a SHA512 d685812c26a097190ced5a9e8ceb1544eb9e3858606123644d5496031706af91e5ba9fb54eb371bcb4eed4d236617f7a21a49a792196db9c5ebf277582ac7124
-EBUILD tpm2-abrmd-2.1.1-r1.ebuild 1211 BLAKE2B 1d21d99ed796ba182a8d1188cdeab2f8ed68d107b80223f69d9dd4f76d346dfe593e1912c44b629a408485b1c102d0ce8d643f6721c7f5d5ba0dd0e1e8a34526 SHA512 6d537e4bd4f81d68a954a710c211ea0bf759ff0c1dd7bd4c4462dd57c8f6a8fa72caf274ea5996d29a3049d4ca1677a159d10360c8f0e4e18fb46ba8d700c1e1
-MISC metadata.xml 256 BLAKE2B ef1b528e6888edab8fb403562cc532d082bef9cd585a69c35e1e180662c319351d05e708ed47d0daf911f68eb2842deca3f0bbfea58310e6fcd75e0fa406a1c4 SHA512 d7f2c7e7308b4fae73309ff23cd8210df042d969cc5d2419ccb5b8017b1ea5d1842a9943f4b4e6e0d9d5cd56a12327e7bb8d9da578799f67516110611005c152
+DIST tpm2-abrmd-2.3.1.tar.gz 566988 BLAKE2B 281c1288baaa07b93939219143f4ecc2420b353d04d751746b6e43c93e092d0facb3d0ddbc20129328666d69954dd16ea7e709fea99690af80b2c83e1ac855e4 SHA512 144ab2b147cd18f892f3c05181efdbed2ac422fe8507eb42871ffe571340b6395431743a4f1995a7ce7a914fd5e7afd2b17328062c893a0403708c2c4d92e0cb
+EBUILD tpm2-abrmd-2.1.1-r2.ebuild 1211 BLAKE2B ae3015831a8031e1bce98392f65b7c699c6bdbb4ae0abce74e9860939b6fc64c2d28af158d7d891fba18fedc633b2f10d5aaa948ff7cc6751917958157bf0d9f SHA512 3d2e9786b3e41ffbe30ab123c509d535f89b460ec91dcc3ee031b7fe00e5e2355cf567f91ea8f2182a84b0c4934d3cac94a43a083f29b28eaf8d130c87cff1cb
+EBUILD tpm2-abrmd-2.3.1.ebuild 1170 BLAKE2B 18af00b2e1596539fbc3f4d8e760129544a8912188df9319c6f8d53ea64f9a7f68dc3da265ca8c203cf61acdc0fa5115a99fd9aeb234497d78ba3137a26edda0 SHA512 20d7a6601a5e89f0921761d8b8341e7be729dd991a624ada4ff1ed2eddb36584fddf2560b6e8405872b6a9bdb2edb4e71f2cea794a2d939bd8f9486a1847a85e
+MISC metadata.xml 458 BLAKE2B 049bd6e5ef39abed2d063afe42162fbd7afa04776d9cae8d35c2704ed9ebcdd7ab575dd87350744d443211d6ed4a7a8f3a8d1a12abc4f0673d0c642d3b9412ff SHA512 c44d5ffb197cca46a7c06e1d7d74351590624a0ac62d2fd41e07c8f2dd51877a3770b7c047c4880f3bbea9ac4488a8045bf5aa364c8faf5e0c9bc030620702f7
diff --git a/app-crypt/tpm2-abrmd/metadata.xml b/app-crypt/tpm2-abrmd/metadata.xml
index 3693cb8ff2e3..ddc35e0cf88d 100644
--- a/app-crypt/tpm2-abrmd/metadata.xml
+++ b/app-crypt/tpm2-abrmd/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>salah.coronya@gmail.com</email>
+		<name>Salah Coronya</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">tpm2-software/tpm2-abrmd</remote-id>
 	</upstream>
diff --git a/app-crypt/tpm2-abrmd/tpm2-abrmd-2.1.1-r1.ebuild b/app-crypt/tpm2-abrmd/tpm2-abrmd-2.1.1-r2.ebuild
index 535dcd41a597..dddc82c0e866 100644
--- a/app-crypt/tpm2-abrmd/tpm2-abrmd-2.1.1-r1.ebuild
+++ b/app-crypt/tpm2-abrmd/tpm2-abrmd-2.1.1-r2.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
@@ -17,11 +17,11 @@ IUSE="static-libs test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="sys-apps/dbus:=
+	acct-group/tss
+	acct-user/tss
 	dev-libs/glib:=
 	app-crypt/tpm2-tss:="
 DEPEND="${RDEPEND}
-	acct-group/tss
-	acct-user/tss
 	test? ( dev-util/cmocka )"
 BDEPEND="virtual/pkgconfig
 	dev-util/gdbus-codegen"
diff --git a/app-crypt/tpm2-abrmd/tpm2-abrmd-2.3.1.ebuild b/app-crypt/tpm2-abrmd/tpm2-abrmd-2.3.1.ebuild
new file mode 100644
index 000000000000..53562b771fdc
--- /dev/null
+++ b/app-crypt/tpm2-abrmd/tpm2-abrmd-2.3.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools systemd
+
+DESCRIPTION="TPM2 Access Broker & Resource Manager"
+HOMEPAGE="https://github.com/tpm2-software/tpm2-abrmd"
+SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="static-libs test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="acct-group/tss
+	 acct-user/tss
+	 sys-apps/dbus:=
+	 dev-libs/glib:=
+	 app-crypt/tpm2-tss:="
+DEPEND="${RDEPEND}
+	test? ( dev-util/cmocka )"
+BDEPEND="virtual/pkgconfig
+	dev-util/gdbus-codegen"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		$(use_enable test unit) \
+		--disable-defaultflags \
+		--with-dbuspolicydir="${EPREFIX}/etc/dbus-1/system.d" \
+		--with-systemdpresetdir="$(systemd_get_systemunitdir)/../system-preset" \
+		--with-systemdpresetdisable \
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+}
diff --git a/app-crypt/tpm2-tools/Manifest b/app-crypt/tpm2-tools/Manifest
index 666901454dd2..a411def2a4ae 100644
--- a/app-crypt/tpm2-tools/Manifest
+++ b/app-crypt/tpm2-tools/Manifest
@@ -1,4 +1,7 @@
 AUX tpm2-tools-3.1.3-libressl.patch 2589 BLAKE2B 2d949ed3d8470bbfee647e691f03ee4a53cc70230140dddba85424238670f147465eecaf85ce95696782e2cf3e8229fa5233300e93e33f4d48c0d56485f3d0a5 SHA512 e45ba9fa0f758105cccd4ded4422f285fdf3c8bd35240c8301ac911049618ae35ad5084045dc72658aced371a4af807dc521e830fdafe1cf9b71bc0f1a7a1325
+AUX tpm2-tools-4.1.1-libressl.patch 825 BLAKE2B c6cd9fd6f8aaacd3aa672a31fd727cfae6c64a015e95e2e0fb282b541168a8ad7a45c65186a18651c3bf6d4252de951891b03719c472b0b23639fd1c09729132 SHA512 202aef9a49c9ace31cac0030867c9842c7426e1c11a16c95740fc8818ef83d7e4c7723b09ef372dc8958576f8204f94aa1bd0a8fb7782c6e7b3eb1f37b675cf5
 DIST tpm2-tools-3.1.4.tar.gz 589388 BLAKE2B aaaa9a0158d0658dc2db4734b18ea1d49bd6c0aef84c4f1236f3134245165dccdb0bada69d92f0e5a59ecb1f2973e5cd25924d2b9c4cad2891d9e4f9fb94a84b SHA512 c5e1be4ffab305ee42a8b4a9c9aa4373158259a58844e273465f97a74f913fb12098b9fd81127148be95ecba7378f6a45b96af256dde3101a237e5e33e8e8ccb
+DIST tpm2-tools-4.1.1.tar.gz 779914 BLAKE2B 5b347b00508183cbde407e01454df0a7eb3a8080cb5b8f73d153c4972b38b98ac7c066664b54aeedef03b9bfd97b3cff482dbc44d5f11215af9c3c7754380d75 SHA512 25952cf947f0acd16b1a8dbd3ac8573bce85ff970a7e24c290c4f9cd29418e77a3e48ac82c932fbd250887a9303ab301ff92db594c2fffaba47b873382444d26
 EBUILD tpm2-tools-3.1.4.ebuild 720 BLAKE2B 496847fa7e4159f6ef979582e0f5924c7ee2087b245b7eb271a1527f466daeec997befe10c12be9c00ae1f43de83ec3d94f5411da6ed399bc81080c723badc8c SHA512 a1076e0809cbf374ecaaa6dffe6b3f4c6e2c0b928daefc0b894c2f6d0df2215d2957f5fca5232ce4e11eb7d9f44eb26b6505be1f3b20f0b72c65a1851d5e082f
-MISC metadata.xml 256 BLAKE2B 471e60418669580a7ce88f03ff1ad8243c73ab7829ea0ba1701ce1de665c49a06914cb466832681d616240835dcba2d6059dfd4786374150a9379a4f365b6e5b SHA512 e8d9bb2aa327e85ef4df414e504633815b18b74a5ba11a9943b6e6870ad76392af0fa85344ec0e6cfbd2a1b5cecef32a6330e742249064cbb34d04c5140e33b3
+EBUILD tpm2-tools-4.1.1.ebuild 729 BLAKE2B 8c0fe6c6a4592db23e60b40305687f3a3dc8b3bdebefddb6c0c29466c9d727500a8f4377d169970d8c79a6bf844d6facd510bbb9914c9f74b74c4793ed4f333c SHA512 c525f61453f097becb19cfd013231ef0eca394381dadf5649a16da0d657a6200d7bab62db8da31c1bf7a9c517e84fb1e12bb443eec08508da711a3e9207653b6
+MISC metadata.xml 458 BLAKE2B 74440e0ad0ec6ee767ed199a4852cb113ba0ff8a721b3239e1520e3b3ab60049755a27e6bf11e0c374a0167e6902247cac05be95d09cbb25d0317f7e09846406 SHA512 7d29bd3b94ab72846cc99b5ea427b607ccff1671097769721e242dd6b555872fa9c8869a5a3ad75a312f9415a59f58a801cba0a22c6542dd9e4a2ded1d3b1f79
diff --git a/app-crypt/tpm2-tools/files/tpm2-tools-4.1.1-libressl.patch b/app-crypt/tpm2-tools/files/tpm2-tools-4.1.1-libressl.patch
new file mode 100644
index 000000000000..2f39db3283c3
--- /dev/null
+++ b/app-crypt/tpm2-tools/files/tpm2-tools-4.1.1-libressl.patch
@@ -0,0 +1,26 @@
+From a1ac2ee0c6592e6f730458c03a2abd1532c66046 Mon Sep 17 00:00:00 2001
+From: Salah Coronya <salah.coronya@gmail.com>
+Date: Sun, 12 Jan 2020 19:17:48 -0600
+Subject: [PATCH] lib/tpm2_openssl.c: Fix build for libressl
+
+Signed-off-by: Salah Coronya <salah.coronya@gmail.com>
+---
+ lib/tpm2_openssl.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/tpm2_openssl.c b/lib/tpm2_openssl.c
+index 505dd7a0..fd3861d9 100644
+--- a/lib/tpm2_openssl.c
++++ b/lib/tpm2_openssl.c
+@@ -14,7 +14,7 @@
+ #include "tpm2_openssl.h"
+ 
+ /* compatibility function for OpenSSL versions < 1.1.0 */
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ static int BN_bn2binpad(const BIGNUM *a, unsigned char *to, int tolen) {
+     int r;
+     int topad;
+-- 
+2.24.1
+
diff --git a/app-crypt/tpm2-tools/metadata.xml b/app-crypt/tpm2-tools/metadata.xml
index 42a8d7b7aea8..b28056e87941 100644
--- a/app-crypt/tpm2-tools/metadata.xml
+++ b/app-crypt/tpm2-tools/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>salah.coronya@gmail.com</email>
+		<name>Salah Coronya</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">tpm2-software/tpm2-tools</remote-id>
 	</upstream>
diff --git a/app-crypt/tpm2-tools/tpm2-tools-4.1.1.ebuild b/app-crypt/tpm2-tools/tpm2-tools-4.1.1.ebuild
new file mode 100644
index 000000000000..a2ad7f1f2dcc
--- /dev/null
+++ b/app-crypt/tpm2-tools/tpm2-tools-4.1.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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="libressl test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=app-crypt/tpm2-tss-2.3.1:=
+	net-misc/curl:=
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )"
+DEPEND="${RDEPEND}
+	test? ( dev-util/cmocka )"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${P}-libressl.patch"
+)
+
+src_configure() {
+	econf \
+		$(use_enable !libressl hardening) \
+		$(use_enable test unit)
+}
diff --git a/app-crypt/tpm2-totp/Manifest b/app-crypt/tpm2-totp/Manifest
index 719cb6dd949c..6a47d3521e9f 100644
--- a/app-crypt/tpm2-totp/Manifest
+++ b/app-crypt/tpm2-totp/Manifest
@@ -1,4 +1,3 @@
-AUX tpm2-totp-0.1.1-build.patch 2384 BLAKE2B 55acd1b8b8c3425542e7207653598b3c2854c84699d3b40f5f64d75e67a51868a5a8b1aca960124694ceaf3793a3f7a2f3dc51e1a3a71418502625c35785e033 SHA512 7330fccd400be74952652515b5c90a49d91e4b70a4488df18b4e34402ce03bcf2e480223a6b70d5f98b23e7fe0e8b38aa8d46012752a881498f2c804a96481f6
-DIST tpm2-totp-0.1.1.tar.gz 357787 BLAKE2B c7a24b30c155cfd5387180a2c8584497327eadd701068aa5eb3c385bbadf26f448f88c238849fbf68c4e7265f01d3783b3aa50a912070df1c2fd4485310f2299 SHA512 33a4af16a292ddd674a399bf12ce0b355d95de7014e8be11816a1d88edfd36ae222a8b7508f3aa1be3b46c7e04bf2712ee4839cf9f4f83fc308cb4f639ec5b9f
-EBUILD tpm2-totp-0.1.1.ebuild 722 BLAKE2B 2df2c7d4102da1a0d119260d802d76af2705ced973d1108b2309485407cf29805117c97009dcf47286ea97536d3eff7c13eff7057eec94a339f396ced5518c65 SHA512 961b438f32a367ef19b161355bd0e3157ec7a0ebb8fc77032a92531cd6cb5d9ab971443e47ba44035930f274efb3d5ea6b899982f41958815ce0c9c516c759d9
-MISC metadata.xml 255 BLAKE2B 83f5573006dd43d1a93725143c337deafb573112198d8fb41570a9fa137d41cdacf05337955e7b80cb417bd1d05bed98ea3bb80bea7721a0807e75f30d6e5ba1 SHA512 1f2d7ad8dfbe9cda78c28aa8abfdcdc87f39e30220902c179fc6b4985966ee42c1bdd8051bff74728110438a46e1ee00df5d7e277d9ab06eddfb6b56e9fd60e4
+DIST tpm2-totp-0.2.1.tar.gz 427226 BLAKE2B e6a9dbcdac4d7fc31048aff968e3eea097752c79a3c1b8551d22558a6b143a758e7bb507722185c648000f4b1edd2f0bbdd443890b5763b297f3d42cfbd84d9d SHA512 2bda34e89b76319a40206e08c0208b0f139309c0b0e40e7168b5e7562096750df504dfcae3a39e6f82fdccbf7a79ed0802d115fbd7560dc3f5b52d81fe8fb59c
+EBUILD tpm2-totp-0.2.1.ebuild 675 BLAKE2B a60f721b94ea6fadb92e18179d252cb887ebd3b5cab5a469d6e4240f5517d3bfc9172c88b8f0c526764c477550de58c188f83feca5e5db437dcc0d5be0b78d07 SHA512 6a71882c10f410a795df26a7923b2194167596fa974e74b5d3e9981653b6f3a73115b37889195aa85e5361dc6d3af41ce48aae7c69eb8d518ee90e4a85a03a38
+MISC metadata.xml 457 BLAKE2B a9c8431a32d462bb22c6362828b488746c0ec6f7cb0e2990894db416eedc1b0093b2b6a34cf05797ffe1769c5706f41099ec0a239904d3cd66f948dbe330d12c SHA512 eb49af2e52b354ee329f7bff699ad3a8d30efb83162f907806896021a54fd6d8cc17fa3ba037332004fed460576b4c1ac2e7323ff10331e053d8423540f17542
diff --git a/app-crypt/tpm2-totp/files/tpm2-totp-0.1.1-build.patch b/app-crypt/tpm2-totp/files/tpm2-totp-0.1.1-build.patch
deleted file mode 100644
index 232b4f9e8682..000000000000
--- a/app-crypt/tpm2-totp/files/tpm2-totp-0.1.1-build.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 2652497a15572d2484f57fee8be252d0d5fe4f8c Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Fri, 31 May 2019 01:39:29 +0300
-Subject: [PATCH] build: add --disable-defaultflags
-
-Align with tpm2-tss to allow downstream to provide flags.
-
-Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
----
- configure.ac | 42 +++++++++++++++++++++++++-----------------
- 1 file changed, 25 insertions(+), 17 deletions(-)
-
-https://github.com/tpm2-software/tpm2-totp/pull/39
-
-diff --git a/configure.ac b/configure.ac
-index baf596b..ac11e1e 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -47,23 +47,31 @@ AC_SUBST([LIBEXECDIR])
- 
- AC_CONFIG_FILES([Makefile dist/tpm2-totp.pc dist/dracut/module-setup.sh dist/initcpio/install/plymouth-tpm2-totp])
- 
--AX_ADD_COMPILER_FLAG([-std=c99])
--AX_ADD_COMPILER_FLAG([-Wall])
--AX_ADD_COMPILER_FLAG([-Wextra])
--AX_ADD_COMPILER_FLAG([-Wformat-security])
--AX_ADD_COMPILER_FLAG([-Werror])
--AX_ADD_COMPILER_FLAG([-fstack-protector-all])
--AX_ADD_COMPILER_FLAG([-fpic])
--AX_ADD_COMPILER_FLAG([-fPIC])
--
--# work around GCC bug #53119
--#   https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53119
--AX_ADD_COMPILER_FLAG([-Wno-missing-braces])
--
--AX_ADD_LINK_FLAG([-Wl,--no-undefined])
--AX_ADD_LINK_FLAG([-Wl,-z,noexecstack])
--AX_ADD_LINK_FLAG([-Wl,-z,now])
--AX_ADD_LINK_FLAG([-Wl,-z,relro])
-+AC_ARG_ENABLE([defaultflags],
-+              [AS_HELP_STRING([--disable-defaultflags],
-+                              [Disable default preprocessor, compiler, and linker flags.])],
-+              [enable_defaultflags=$enableval],
-+              [enable_defaultflags=yes])
-+AS_IF([test "x$enable_defaultflags" = "xyes"],
-+      [
-+      AX_ADD_COMPILER_FLAG([-std=c99])
-+      AX_ADD_COMPILER_FLAG([-Wall])
-+      AX_ADD_COMPILER_FLAG([-Wextra])
-+      AX_ADD_COMPILER_FLAG([-Wformat-security])
-+      AX_ADD_COMPILER_FLAG([-Werror])
-+      AX_ADD_COMPILER_FLAG([-fstack-protector-all])
-+      AX_ADD_COMPILER_FLAG([-fpic])
-+      AX_ADD_COMPILER_FLAG([-fPIC])
-+
-+      # work around GCC bug #53119
-+      #   https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53119
-+      AX_ADD_COMPILER_FLAG([-Wno-missing-braces])
-+
-+      AX_ADD_LINK_FLAG([-Wl,--no-undefined])
-+      AX_ADD_LINK_FLAG([-Wl,-z,noexecstack])
-+      AX_ADD_LINK_FLAG([-Wl,-z,now])
-+      AX_ADD_LINK_FLAG([-Wl,-z,relro])
-+      ])
- 
- AX_CODE_COVERAGE
- m4_ifdef([_AX_CODE_COVERAGE_RULES],
--- 
-2.21.0
-
diff --git a/app-crypt/tpm2-totp/metadata.xml b/app-crypt/tpm2-totp/metadata.xml
index b07ebff083cd..ff3a177c4bdd 100644
--- a/app-crypt/tpm2-totp/metadata.xml
+++ b/app-crypt/tpm2-totp/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>salah.coronya@gmail.com</email>
+		<name>Salah Coronya</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">tpm2-software/tpm2-totp</remote-id>
 	</upstream>
diff --git a/app-crypt/tpm2-totp/tpm2-totp-0.1.1.ebuild b/app-crypt/tpm2-totp/tpm2-totp-0.2.1.ebuild
index 8b2622c25865..345b03f9a7aa 100644
--- a/app-crypt/tpm2-totp/tpm2-totp-0.1.1.ebuild
+++ b/app-crypt/tpm2-totp/tpm2-totp-0.2.1.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
@@ -13,15 +13,11 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64"
 
-RDEPEND=">=app-crypt/tpm2-tss-2.0:=
+RDEPEND=">=app-crypt/tpm2-tss-2.0
 	media-gfx/qrencode:="
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
-PATCHES=(
-	"${FILESDIR}/${P}-build.patch"
-)
-
 src_prepare() {
 	default
 	eautoreconf
diff --git a/app-crypt/tpm2-tss-engine/Manifest b/app-crypt/tpm2-tss-engine/Manifest
index 82cb84fa6960..9ce542e4cf92 100644
--- a/app-crypt/tpm2-tss-engine/Manifest
+++ b/app-crypt/tpm2-tss-engine/Manifest
@@ -1,5 +1,4 @@
-AUX tpm2-tss-engine-1.0.0-build.patch 2362 BLAKE2B d1e28ef019da77a9f857b90d9bce7d03a55504e0b74b7aafa2e56e417cc528b55ea8284ca9e2e30b35dd357a829b0329f26e595f9c421315c6b08ec8ac2aba80 SHA512 6a5fa163ccf8e0b24c9f1641b1c29be55d437d2e026343d9f33872fe2f2914a440884c705ec0c679130533ffa67d8ee33d475385568c57ed5d738d84b598c49d
-AUX tpm2-tss-engine-1.0.0-libressl.patch 1054 BLAKE2B 42f666eb44e61659e941758ab48bcf76c5be94be5944d7437db0671b286f038d8cee3e8754ca84fdbb0957b7e964445e798d2c494354c6ca9eff576ce45d7f6d SHA512 9b7c769d6a65ec67a522d78abb56da8c8560074a6bc1efcb300669308bfeeb39340da7c049a4c5d0a446f9e0d4e9fc03ee80ad0db52395c4a81013e11d27796d
-DIST tpm2-tss-engine-1.0.0.tar.gz 382277 BLAKE2B 6580eb83f4e9391a12df2fb9cb86ace385a9e29004a64f6ca9378d9b8f60572a7761f4f486e1010d435487fed28858737d2bb71b08e400e9551a7b83c198bbe7 SHA512 b06722c82c9cefd5184125b26fb46bd7b20d62631c21c51a028348833c4786b41ff64f2c1cb7d53f749a6cf35b8fae02ae02285fc43d1d044e2d2b6e2e7048a3
-EBUILD tpm2-tss-engine-1.0.0.ebuild 821 BLAKE2B 986550cef0aeefccb1e0b123d7bbcecfdefa6c5b41bbc9b2e9afe411578a3ac7192294fb6cda7f54a6d6640a288e24b7b25f211ae11bd08c0bae15203bcb41a5 SHA512 26fd09212feab98c4bf353b37400692d3595fcf1229fc2c19715b07cf84b0dfec5019d300bd2aa3e74017992f2a347cfb32590865dc583f5ca44f453335a3751
-MISC metadata.xml 261 BLAKE2B 1f28a367c89055b59f6e03dba69b5f2ca8305effc0475795410a035eea72b2586a0e18b62bcb56fab8b387cb1bf86598cb206ac57a8bc68007371b1543a3f443 SHA512 c30b7dd0d2a8e605cd0d2b33a22e3da2fc8f7592d5b4b5292f3a8c59d872ee342bcfc3b9b3971f69a2a4bacc319f3be53b64d495815d608198e77b68203cba4d
+AUX tpm2-tss-engine-1.0.1-build-add-disable-defaultflags.patch 2205 BLAKE2B 59d04d10159899a453204a4812d768d78cba86b2ca649692d105107790a157fb6bf32fe202ede43a4c57437f87ee7d8c5917d6493386841e9c8574b86db93882 SHA512 d1e97ec52a459da7de3e53797cfac118230da90988a8112d7118c084a85cd04f6f3b8053d2fcae9bf3b819f4ab5ac3cd04d74cd4c8a7c7c725c0547436bfb045
+DIST tpm2-tss-engine-1.0.1.tar.gz 382715 BLAKE2B b33b91bf892509f8ed88bea1ba9611f06c9342726932baebbe918fcd4208f6c4b07710db666261b7676b90feb796746552804553e79ef817c02587504d266f44 SHA512 106fc6aadf0b4b27c3b38be596356aa59b4b76ec1602e8c5564aec6b4be7e2b5d6077006ee13d41e58402255b879aadaa966c758b5b326ae32742007ce2ef238
+EBUILD tpm2-tss-engine-1.0.1.ebuild 750 BLAKE2B 76b054f7a11d9ab8093d5a119a55a6822b92ed2108713dfb23193df1fa8d17ba196e39b1c97bd8f77f9bfee4485fb0c867b3b91a7cce18d0c530dea36c2a5e05 SHA512 49a0b8e9661ebe6af52f093ad80e9f92cac5d9b5a0dbeaae8a62723dbe3b2a60a4f9d2cda4de0d8e7432bfbb48f924e0c9842f2f19ac5f1d588a91797971711d
+MISC metadata.xml 463 BLAKE2B 7e0574fa7ade812b4a7176f30d0218a70e0396f2c76ccaedac3cc50ffd0aca7581f7b6075ee98828634d7f3b6b7af63059bfed2eab84b52fce418ee787e237be SHA512 b6d0746d2806d1e1f2a741b5ccd97abfc74e6fd8562796175a900ebf28244d8b3a8a1d9cc4bcd70cf51abd66eb180594f972e03c68deed57fa0023d726b6227b
diff --git a/app-crypt/tpm2-tss-engine/files/tpm2-tss-engine-1.0.0-libressl.patch b/app-crypt/tpm2-tss-engine/files/tpm2-tss-engine-1.0.0-libressl.patch
deleted file mode 100644
index 66bb68e76940..000000000000
--- a/app-crypt/tpm2-tss-engine/files/tpm2-tss-engine-1.0.0-libressl.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From deb2b6697babf99aaf3f64b342ce414b48638ea3 Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Fri, 31 May 2019 20:36:47 +0300
-Subject: [PATCH] build: libressl fix incomplete type
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-src/tpm2-tss-engine-rand.c:90:1: error: variable ‘rand_methods’ has initializer but incomplete type
-   90 | static RAND_METHOD rand_methods = {
-      | ^~~~~~
-src/tpm2-tss-engine-rand.c:91:5: warning: excess elements in struct initializer
-
-Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
----
- src/tpm2-tss-engine-rand.c | 1 +
- 1 file changed, 1 insertion(+)
-
-https://github.com/tpm2-software/tpm2-tss-engine/pull/120
-
-diff --git a/src/tpm2-tss-engine-rand.c b/src/tpm2-tss-engine-rand.c
-index 50d5661..86980a5 100644
---- a/src/tpm2-tss-engine-rand.c
-+++ b/src/tpm2-tss-engine-rand.c
-@@ -32,6 +32,7 @@
- #include <string.h>
- 
- #include <openssl/engine.h>
-+#include <openssl/rand.h>
- 
- #include <tss2/tss2_mu.h>
- #include <tss2/tss2_esys.h>
--- 
-2.21.0
-
diff --git a/app-crypt/tpm2-tss-engine/files/tpm2-tss-engine-1.0.0-build.patch b/app-crypt/tpm2-tss-engine/files/tpm2-tss-engine-1.0.1-build-add-disable-defaultflags.patch
index aa2b2e4e4fd3..7556a80600da 100644
--- a/app-crypt/tpm2-tss-engine/files/tpm2-tss-engine-1.0.0-build.patch
+++ b/app-crypt/tpm2-tss-engine/files/tpm2-tss-engine-1.0.1-build-add-disable-defaultflags.patch
@@ -1,22 +1,20 @@
-From 92aee12fbd246461a22925dd054c4d6394c4fdf5 Mon Sep 17 00:00:00 2001
+From 56cc4110e1ef0667ff248a689c50803c2ec4312b Mon Sep 17 00:00:00 2001
 From: Alon Bar-Lev <alon.barlev@gmail.com>
 Date: Fri, 31 May 2019 02:30:37 +0300
-Subject: [PATCH] build: add --disable-defaultflags
+Subject: [PATCH 2/3] build: add --disable-defaultflags
 
 Align with tpm2-tss to allow downstream to provide flags.
 
 Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
 ---
- configure.ac | 42 +++++++++++++++++++++++++-----------------
- 1 file changed, 25 insertions(+), 17 deletions(-)
-
-https://github.com/tpm2-software/tpm2-tss-engine/pull/117
+ configure.ac | 41 ++++++++++++++++++++++++-----------------
+ 1 file changed, 24 insertions(+), 17 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index f3a399c..f59cfaf 100644
+index d14c4d7..3ee45c5 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -80,23 +80,31 @@ AS_IF([test "x$enable_tctienvvar" = xyes], [AC_DEFINE([ENABLE_TCTIENVVAR], [1])]
+@@ -84,23 +84,30 @@ AC_ARG_ENABLE([tctienvvar],
  
  AC_CONFIG_FILES([Makefile])
  
@@ -39,8 +37,7 @@ index f3a399c..f59cfaf 100644
 -AX_ADD_LINK_FLAG([-Wl,-z,relro])
 +AC_ARG_ENABLE([defaultflags],
 +              [AS_HELP_STRING([--disable-defaultflags],
-+                              [Disable default preprocessor, compiler, and linker flags.])],
-+              [enable_defaultflags=$enableval],
++                              [Disable default preprocessor, compiler, and linker flags.])],,
 +              [enable_defaultflags=yes])
 +AS_IF([test "x$enable_defaultflags" = "xyes"],
 +      [
@@ -66,5 +63,5 @@ index f3a399c..f59cfaf 100644
  AX_CODE_COVERAGE
  m4_ifdef([_AX_CODE_COVERAGE_RULES],
 -- 
-2.21.0
+2.24.1
 
diff --git a/app-crypt/tpm2-tss-engine/metadata.xml b/app-crypt/tpm2-tss-engine/metadata.xml
index 8a310e85c09b..3625c1b74945 100644
--- a/app-crypt/tpm2-tss-engine/metadata.xml
+++ b/app-crypt/tpm2-tss-engine/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>salah.coronya@gmail.com</email>
+		<name>Salah Coronya</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">tpm2-software/tpm2-tss-engine</remote-id>
 	</upstream>
diff --git a/app-crypt/tpm2-tss-engine/tpm2-tss-engine-1.0.0.ebuild b/app-crypt/tpm2-tss-engine/tpm2-tss-engine-1.0.1.ebuild
index 45bd390504e9..8bdced04657f 100644
--- a/app-crypt/tpm2-tss-engine/tpm2-tss-engine-1.0.0.ebuild
+++ b/app-crypt/tpm2-tss-engine/tpm2-tss-engine-1.0.1.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
@@ -12,19 +12,17 @@ SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/v${PV}/${P}.ta
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="libressl test"
+IUSE="test"
 RESTRICT="!test? ( test )"
 
 RDEPEND=">=app-crypt/tpm2-tss-2.2.2:=
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )"
+	dev-libs/openssl:0"
 DEPEND="${RDEPEND}
 	test? ( dev-util/cmocka )"
 BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}/${P}-build.patch"
-	"${FILESDIR}/${P}-libressl.patch"
+	"${FILESDIR}/${P}-build-add-disable-defaultflags.patch"
 )
 
 src_prepare() {
diff --git a/app-crypt/tpm2-tss/Manifest b/app-crypt/tpm2-tss/Manifest
index ecb1d29afe00..2067daca1ea6 100644
--- a/app-crypt/tpm2-tss/Manifest
+++ b/app-crypt/tpm2-tss/Manifest
@@ -1,3 +1,5 @@
 DIST tpm2-tss-2.2.3.tar.gz 912179 BLAKE2B 36b2a462512822dccb3adab605ea9922132f027455a1d2895b6735f6200fe44f08288477c99afd0f6c06b4bff3090104b6412b12ea4a518888cf756fb8ee53c4 SHA512 68087cbf2b7acc33788e90b3825bf2c91faa65cfc04b576790634c88876a8a6930d6943f83b7cf0858e37e5e7307703d0c975b9fc0b0ad1d87f66c74b65bd411
-EBUILD tpm2-tss-2.2.3-r1.ebuild 1275 BLAKE2B 668138a018c9e3d811c941265f555f0b835d2a0f3e35a30efa280bb36fbdd9707193c23728448bc8be7b03f1759133f69b7f718de42b714b11f7af368da264f5 SHA512 f40fe96f4ad6427abe10c8573deb16586c2a48455af487b7eaba427b1cfac00847dfb316037600fafb18fb731fa7fbb631b87dca0a1f8d43e23ca4889d6e0f9a
-MISC metadata.xml 428 BLAKE2B eb2275eb4f616c25503204fb29175ba8c9ca6e4e65445f1c4815147edb458f118a8c108a3c177abb4396d3c4e329c4cda48b51e5ed4d1d25da0412b3d34e4129 SHA512 88ecc48675325a5fcadfc0ef3ee07f723b474131b82d0d17ddd0e98ab8227c21f82e9c00eb4d09a9c8a334bb7c29debccfdec0cf355a360e2ea8789a35a1f056
+DIST tpm2-tss-2.3.2.tar.gz 1087241 BLAKE2B cccefc0635ba141b2e54025da064e6328b3c4c74b4b11a25f2230e0e499e235eea67f6df8d1a6cb011c53ce23978827cb4c633e631540bfca88b85d6c8762ed7 SHA512 7b679b54f3478c3adee5b6c3135cbe491ffd9f4712991f465edbd6c7d2831e5f1537038ec36f288e9545c719d5d167b61116c924cf5d816220615d0b58a1d436
+EBUILD tpm2-tss-2.2.3-r2.ebuild 1277 BLAKE2B aeda0dcbeffe97619fd36effb25a419c0eb19a8bbc08535cfc18e9f7f099fdf3cfcf07d0558fdfca8bfff5fd8428cd93b17dbbb66b0185482071df144d338458 SHA512 3c1e19d927bd3a129c38dc0c5c203c2247010c9350028736615d0d6aa74b9b8647d68c442ee98df6227bf6bd272b010725dfe6713b75930a1ce6236d2fde3b88
+EBUILD tpm2-tss-2.3.2.ebuild 1303 BLAKE2B 3f3246ecb856d52668f64dd897d9ed5bb3f41f733679657ec71109df7fdfd593c14f10a6c51badd40ef98795b7c578ce4a7f68682f1cccb636b3cf7411932b3f SHA512 5f727d24ac58fdb5764acb795cfdc88733b75e678f9c6323f7d627740eb2250e337fc4fbd547c882f2909721cc84eb37fa96b83a49165e172a6d8fb8bf75c0ae
+MISC metadata.xml 630 BLAKE2B 71c85033656a3bccc387016c188d9e51bf46d5063ce3f910dc204073ee5f8f48f7b18db5630c182de2f4d6745960edf84c0e369c18c4ba222e6d79f76b5ddbb0 SHA512 c7a8877acd32975f5cb57369f268da56ca7494f6552876f212e87c6dbf2df321dff634cefeda8819f4a7c95768884ef93b9d8a7aa640051b21ee3b6ae3aec1a1
diff --git a/app-crypt/tpm2-tss/metadata.xml b/app-crypt/tpm2-tss/metadata.xml
index b774da17d883..227ecac58567 100644
--- a/app-crypt/tpm2-tss/metadata.xml
+++ b/app-crypt/tpm2-tss/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>salah.coronya@gmail.com</email>
+		<name>Salah Coronya</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="gcrypt">Use <pkg>dev-libs/libgcrypt</pkg> as crypto engine</flag>
 		<flag name="openssl">Use <pkg>dev-libs/openssl</pkg> as crypto engine</flag>
diff --git a/app-crypt/tpm2-tss/tpm2-tss-2.2.3-r1.ebuild b/app-crypt/tpm2-tss/tpm2-tss-2.2.3-r2.ebuild
index e2b86a17e071..cc1d9f37f2ab 100644
--- a/app-crypt/tpm2-tss/tpm2-tss-2.2.3-r1.ebuild
+++ b/app-crypt/tpm2-tss/tpm2-tss-2.2.3-r2.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
@@ -21,11 +21,12 @@ REQUIRED_USE="
 	openssl? ( !gcrypt )
 	|| ( gcrypt openssl )"
 
-RDEPEND="gcrypt? ( dev-libs/libgcrypt:0= )
-	openssl? ( dev-libs/openssl:0= )"
-DEPEND="${RDEPEND}
+RDEPEND="
 	acct-group/tss
 	acct-user/tss
+	gcrypt? ( dev-libs/libgcrypt:0= )
+	openssl? ( dev-libs/openssl:0= )"
+DEPEND="${RDEPEND}
 	test? ( dev-util/cmocka )"
 BDEPEND="virtual/pkgconfig
 	doc? ( app-doc/doxygen )"
diff --git a/app-crypt/tpm2-tss/tpm2-tss-2.3.2.ebuild b/app-crypt/tpm2-tss/tpm2-tss-2.3.2.ebuild
new file mode 100644
index 000000000000..0a32297970f1
--- /dev/null
+++ b/app-crypt/tpm2-tss/tpm2-tss-2.3.2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-info udev
+
+DESCRIPTION="TCG Trusted Platform Module 2.0 Software Stack"
+HOMEPAGE="https://github.com/tpm2-software/tpm2-tss"
+SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/0"	# sublot is libtss2-sys number
+KEYWORDS="~amd64"
+IUSE="doc +gcrypt openssl static-libs test"
+
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	gcrypt? ( !openssl )
+	openssl? ( !gcrypt )
+	|| ( gcrypt openssl )"
+
+RDEPEND="acct-group/tss
+	 acct-user/tss
+	 gcrypt? ( dev-libs/libgcrypt:0= )
+	 openssl? ( dev-libs/openssl:0= )"
+DEPEND="${RDEPEND}
+	test? ( dev-util/cmocka )"
+BDEPEND="virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+pkg_setup() {
+	local CONFIG_CHECK=" \
+		~TCG_TPM
+	"
+	linux-info_pkg_setup
+	kernel_is ge 4 12 0 || ewarn "At least kernel 4.12.0 is required"
+}
+
+src_configure() {
+	econf \
+		$(use_enable doc doxygen-doc) \
+		$(use_enable static-libs static) \
+		$(use_enable test unit) \
+		--disable-defaultflags \
+		--disable-weakcrypto \
+		--with-crypto="$(usex gcrypt gcrypt ossl)" \
+		--with-udevrulesdir="$(get_udevdir)/rules.d" \
+		--with-udevrulesprefix=60-
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-crypt/trousers/Manifest b/app-crypt/trousers/Manifest
index a6457c09cc0f..ad327d93b6ad 100644
--- a/app-crypt/trousers/Manifest
+++ b/app-crypt/trousers/Manifest
@@ -7,4 +7,4 @@ AUX trousers-0.3.14-libressl.patch 877 BLAKE2B 6416ecf1cf99678299e4ac39756920de6
 DIST trousers-0.3.14.tar.gz 1378438 BLAKE2B 3dc2824fa2ca1b1f1181f98d59e85276e7d38af4bfc07ee8246431d9ccb300a8e0820b318643d4cf5d757d2a49492c8686e2fe9de03484263d2189d4bbaa32d0 SHA512 bf87f00329cf1d76a12cf6b6181fa22f90e76af3c5786e6e2db98438d2d3f0c0e05364374664173f45e3a2f6c0e2364948d0b958a7845cb23fcb340150cd9b21
 EBUILD trousers-0.3.14-r1.ebuild 3009 BLAKE2B c0cf45bdd4222448ea82cf8c539908317da6ca42d3ab3efdaf0dc4ebcc10cf57c8ca8ee1962d31be21cadea2cd78de8525ea9b3980f650bc507fae4050e4e8e3 SHA512 14edff453cc4839ab014e4c22006c897f4873eb1949ae69155ec5693a4050590f5fca1be75c7773391f7f86102620d0cf11a76a073dd38c5b29cde66d201817c
 EBUILD trousers-0.3.14-r2.ebuild 2954 BLAKE2B 67d448c9c62f6d42697a69da984b74c68cfde09debbf35d8467c35100a25e41d0376a92d7a2d8d6b423d1135758f7690757955ce5f0b55f60ce7b398dcd4b947 SHA512 50ddb4573571095768267333c56ca0be2bb017f79cfbea5f333da37d9d6d0908b75d8945c4d6a335f02e755175de375df9ac45b5d2a605be00d76ab94a76eed4
-MISC metadata.xml 310 BLAKE2B 298d7b3d24553b2f5d0f9c2fa952521305ce1c73e78cc95fc354b3761f0dc1ccc6689e4b38ad99bd884e856593c966a06b01c9d8718598fd17df554a2d3b3e03 SHA512 073ee341a6756bd3857181b6da834e6e7d0d01db0127f6ff0313472b89b2de75ff9929d4d2b05a4a500a46e2199dc27698b4c51d5e6e0c3608d46487b462813c
+MISC metadata.xml 507 BLAKE2B 1674e8c11713df517fd8d2aead0b5207a114de5b34559ed1b1a2527e73ee7e749a13d5a7e10330f940bc61c51ed9083e3ce423db428503f25295e1fd3b64d576 SHA512 f1c304734694001da4b95f1f18cb6891d3fc9df1db1013ad7155b2f60fd466f46947b3fa9e78d50c2a4a2fb1d0ca98b8ebb8017dde2bfcadd847e422df8885d7
diff --git a/app-crypt/trousers/metadata.xml b/app-crypt/trousers/metadata.xml
index 96e4e5905066..643c6bf8c70a 100644
--- a/app-crypt/trousers/metadata.xml
+++ b/app-crypt/trousers/metadata.xml
@@ -1,9 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->	
-  <upstream>
-    <remote-id type="cpe">cpe:/a:debian:trousers</remote-id>
-    <remote-id type="sourceforge">trousers</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>salah.coronya@gmail.com</email>
+		<name>Salah Coronya</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>	
+	<upstream>
+		<remote-id type="cpe">cpe:/a:debian:trousers</remote-id>
+		<remote-id type="sourceforge">trousers</remote-id>
+	</upstream>
 </pkgmetadata>
author	V3n3RiX <venerix@redcorelinux.org>	2020-02-29 18:01:47 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-02-29 18:01:47 +0000
commit	ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (patch)
tree	9f47ee47c31a0f13f9496879cd88a1042550aa81 /app-crypt
parent	53cba99042fa967e2a93da9f8db806fe2d035543 (diff)