gentoo resync : 10.02.2020

22 files changed, 273 insertions, 146 deletions

diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 34fdf02da361..0c756cc4f328 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/acme/Manifest b/app-crypt/acme/Manifest
index 0769b403a527..5979bfb5abd5 100644
--- a/app-crypt/acme/Manifest
+++ b/app-crypt/acme/Manifest
@@ -1,8 +1,12 @@
+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.2.0.ebuild 1750 BLAKE2B 93dd49e3c1329e7377544581c53aaf2a949a6d8f3f9d09a121e50c52fe618714b6173cb82b3a7179591bcff12051389e35705bac79bd1e6eacf45e3a67bcb59c SHA512 80cdd3fc105bd094a3c78066b4913112871a150e4797db5469450cbb709c17a63c1b39c0b2932d819c9f47242872801fba31b16b7b0072a1f15de8a42939a849
+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
new file mode 100644
index 000000000000..0ce5fe5770d8
--- /dev/null
+++ b/app-crypt/acme/acme-0.39.0.ebuild
@@ -0,0 +1,69 @@
+# 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
new file mode 100644
index 000000000000..0ce5fe5770d8
--- /dev/null
+++ b/app-crypt/acme/acme-0.40.1.ebuild
@@ -0,0 +1,69 @@
+# 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.2.0.ebuild b/app-crypt/acme/acme-1.2.0.ebuild
index da68660fa26a..4aaf884c944a 100644
--- a/app-crypt/acme/acme-1.2.0.ebuild
+++ b/app-crypt/acme/acme-1.2.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=(python{2_7,3_6,3_7,3_8})
+PYTHON_COMPAT=(python{3_6,3_7,3_8})
 
 if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
diff --git a/app-crypt/certbot/Manifest b/app-crypt/certbot/Manifest
index 23325d756aac..11da46ba93f9 100644
--- a/app-crypt/certbot/Manifest
+++ b/app-crypt/certbot/Manifest
@@ -1,8 +1,12 @@
+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.2.0.ebuild 1455 BLAKE2B de6c7604cbc1438fcd7f143a84ed56391afbd6c20a9fa52b6672c229776c6fc79f14382a5f3f8023e1fdbc9d8914bed0402b575327a6bc92dde2b77484060658 SHA512 2d7959da9ba52dfd5b29b4da05133b016c7764b8c48b5906b046a41aa66399f47662d8a829b7f6d34ce791379d719fd57195fc3ac20df9539dcf1b39090e9983
-EBUILD certbot-9999.ebuild 1455 BLAKE2B de6c7604cbc1438fcd7f143a84ed56391afbd6c20a9fa52b6672c229776c6fc79f14382a5f3f8023e1fdbc9d8914bed0402b575327a6bc92dde2b77484060658 SHA512 2d7959da9ba52dfd5b29b4da05133b016c7764b8c48b5906b046a41aa66399f47662d8a829b7f6d34ce791379d719fd57195fc3ac20df9539dcf1b39090e9983
+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
new file mode 100644
index 000000000000..00ca3acc612d
--- /dev/null
+++ b/app-crypt/certbot/certbot-0.39.0.ebuild
@@ -0,0 +1,50 @@
+# 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-1.2.0.ebuild b/app-crypt/certbot/certbot-0.40.1.ebuild
index ec673774775d..6ec4076e0c5b 100644
--- a/app-crypt/certbot/certbot-1.2.0.ebuild
+++ b/app-crypt/certbot/certbot-0.40.1.ebuild
@@ -9,9 +9,8 @@ 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}
 
 inherit distutils-r1
 
@@ -29,7 +28,7 @@ RDEPEND="
 	>=app-crypt/acme-0.40.0[${PYTHON_USEDEP}]
 	>=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
 	dev-python/configobj[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.8[${PYTHON_USEDEP}]
+	>=dev-python/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}]
@@ -46,6 +45,6 @@ DEPEND="
 
 python_test() {
 	# acme is not installed, removing it here is fine, the dir just confuses tests
-	rm -R ../acme
+	rm -R acme
 	pytest -vv ${PN} || die
 }
diff --git a/app-crypt/certbot/certbot-1.2.0-r1.ebuild b/app-crypt/certbot/certbot-1.2.0-r1.ebuild
new file mode 100644
index 000000000000..c81039179f59
--- /dev/null
+++ b/app-crypt/certbot/certbot-1.2.0-r1.ebuild
@@ -0,0 +1,49 @@
+# 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-2.8[${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}"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# required as deps of deps can trigger this too...
+	echo '    ignore:.*collections\.abc:DeprecationWarning' >> ../pytest.ini
+	distutils-r1_python_prepare_all
+}
diff --git a/app-crypt/certbot/certbot-9999.ebuild b/app-crypt/certbot/certbot-9999.ebuild
index ec673774775d..c81039179f59 100644
--- a/app-crypt/certbot/certbot-9999.ebuild
+++ b/app-crypt/certbot/certbot-9999.ebuild
@@ -38,14 +38,12 @@ RDEPEND="
 	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
+DEPEND="${CDEPEND}"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# required as deps of deps can trigger this too...
+	echo '    ignore:.*collections\.abc:DeprecationWarning' >> ../pytest.ini
+	distutils-r1_python_prepare_all
 }
diff --git a/app-crypt/gcr/Manifest b/app-crypt/gcr/Manifest
index c46588da4fa8..37ff63ceadf2 100644
--- a/app-crypt/gcr/Manifest
+++ b/app-crypt/gcr/Manifest
@@ -1,8 +1,6 @@
 AUX 3.34.0-fix-desktop-files.patch 2102 BLAKE2B a733e4c0c62d8d80229663efe81d5d563404c3dc428838ed5a1515fada5a1e4da92eee38f37918d80ffd3121603e4ce1e4dab82ebe433d838bf0949794a88fa2 SHA512 9967470ccaeea405ad55fc16f699ac5048bf803eb9043258c2f532ff36fbf252d683b45b6f0fd1a19d9f48f5f0ace60fff50881dd8ab1e13c5c1a9170d5eff6a
-DIST gcr-3.20.0.tar.xz 1324216 BLAKE2B dca283d1bde4994ee60666b2d5fdc4f0861df453355dcf20cea22a87808da0b9284506460ecdfe779ab9ecdf4ce17e231bd1d9426d677511684c35e43da19550 SHA512 0acd0fb085a38507b1cc895ac773f91c6f4e14d2ea7e27b8e74c85ef78426597b6ea08ebee696452b0651939ec4a0d8a4a2523c41b3a8a0bd1b0d7b338b1d9c7
 DIST gcr-3.28.1.tar.xz 1334896 BLAKE2B e7035dd0ac5ef9e9b0898e3e4512768ec7cb548cf0ec4ace5a4f0f9a63d3015f8a041bc6f0a0c990c1666eb92c047eab4c19338a8ccf2d8aa9b11830dbd9d5c5 SHA512 ae36c39584d6bc2ba9d86de8bc71eac21fb3251b966ab1eddf467d01ed5789ba6e6597c83ea2ed9403e632893e7c7cb6c17e04878d726b72528af9199bebb3da
 DIST gcr-3.34.0.tar.xz 1454244 BLAKE2B fc84e5eaa3b2822d1c04fff3b8b343de2655cce34317327a3594b506172c703a9d4b1d5562ed213bc1ae7df5d31ac1c5ab3c5733cfe8e5edf85e334ce7ff85f4 SHA512 9314b531ed46a42b2c8c1531c7d95003db04f2c8065e46f4e6a84ec26400ce6302ea71c4db42a8c7b98884a0b84d75a0ca65d988aa0fe6de6d897d772b070093
-EBUILD gcr-3.20.0.ebuild 1830 BLAKE2B 38d18d2e2b4cf13d8ad5f9fbb7eb8ccd21c038eed114b2f5b22f7ebf51e37fc93d53403d07c0d8519db3f1c62a2e54cc4e472465cf1683f0bfb105c240cdcad6 SHA512 8fc50555fa762a3cd89e5d224361c7b58f2253db402928d59ad595707ee76e2ee15bc9a0547730f318347d4017974471c23e9fd28520e077069d2c2590cda00b
 EBUILD gcr-3.28.1.ebuild 1871 BLAKE2B fce62eb9dbbf5f51545d7506ec2f439ae3d2991c077b4fdb00ed6f0e47d1b8310437843c3e291d8661c487e75bed955404c23fff8c4bc46b014934c93b74f63d SHA512 8af0259414d7777538fab1dd68da4c39f9c68cbe37bc9ce5f01c833530673db4f2d4d92c259e9c3589918256a43175f0c59acabb747b29d9f567263a7fd2fe19
 EBUILD gcr-3.34.0-r1.ebuild 1897 BLAKE2B 547c94084e23f342d15c7fe24558bd63608734ebec1430800ad719591be1f91bcb8388f6d3ca2ed3d2b8307b0be6854e6daec1289a5601fa971f0852bb57f9f1 SHA512 e9df77eb782b097d0376a6129bb43915a1f76fd2f731dae57a688fb749a452ae0a9f1d07db0c613a0c34b38f306e9ed656af0c89646e68d77746a405a912a86e
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-crypt/gcr/gcr-3.20.0.ebuild b/app-crypt/gcr/gcr-3.20.0.ebuild
deleted file mode 100644
index 822c8e5baacc..000000000000
--- a/app-crypt/gcr/gcr-3.20.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_USE_DEPEND="vapigen"
-PYTHON_COMPAT=( python2_7 )
-
-inherit gnome2 python-any-r1 vala virtualx
-
-DESCRIPTION="Libraries for cryptographic UIs and accessing PKCS#11 modules"
-HOMEPAGE="https://git.gnome.org/browse/gcr"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0/1" # subslot = suffix of libgcr-3
-
-IUSE="debug gtk +introspection vala"
-REQUIRED_USE="vala? ( introspection )"
-
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-
-COMMON_DEPEND="
-	>=app-crypt/p11-kit-0.19
-	>=dev-libs/glib-2.38:2
-	>=dev-libs/libgcrypt-1.2.2:0=
-	>=dev-libs/libtasn1-1:=
-	>=sys-apps/dbus-1
-	gtk? ( >=x11-libs/gtk+-3.12:3[X,introspection?] )
-	introspection? ( >=dev-libs/gobject-introspection-1.34:= )
-"
-RDEPEND="${COMMON_DEPEND}
-	!<gnome-base/gnome-keyring-3.3
-"
-# gcr was part of gnome-keyring until 3.3
-DEPEND="${COMMON_DEPEND}
-	${PYTHON_DEPS}
-	dev-libs/gobject-introspection-common
-	dev-libs/libxslt
-	dev-libs/vala-common
-	dev-util/gdbus-codegen
-	>=dev-util/gtk-doc-am-1.9
-	>=dev-util/intltool-0.35
-	sys-devel/gettext
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-# eautoreconf needs:
-#	dev-libs/gobject-introspection-common
-#	dev-libs/vala-common
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# Disable stupid flag changes
-	sed -e 's/CFLAGS="$CFLAGS -g"//' \
-		-e 's/CFLAGS="$CFLAGS -O0"//' \
-		-i configure.ac configure || die
-
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_with gtk) \
-		$(use_enable introspection) \
-		$(use_enable vala) \
-		$(usex debug --enable-debug=yes --enable-debug=default) \
-		--disable-update-icon-cache \
-		--disable-update-mime
-}
-
-src_test() {
-	virtx emake check
-}
diff --git a/app-crypt/heimdal/Manifest b/app-crypt/heimdal/Manifest
index fc40900aa872..721f9e0b4e72 100644
--- a/app-crypt/heimdal/Manifest
+++ b/app-crypt/heimdal/Manifest
@@ -15,7 +15,7 @@ AUX krb5.conf 424 BLAKE2B 49b8a0aab6e0dacb70b91e030bb5f2b8bdfe4253026f85e2c9d16b
 DIST heimdal-7.5.0.tar.gz 10071281 BLAKE2B 917f5855248c333e5ec35bf992973d8b5fb84581b9c3bc8d42c328e5f878ce24c5596c5a1e3fbca786a71be04984068efbb817f7336135056d1feae38895758f SHA512 6d1ad77e795df786680b5e68e2bfefee27bd0207eab507295d7af7053135de9c9ebb517d2c0235bc3a7d50945e18044515f0d76c0899b6b74aa839f1f3e5b131
 DIST heimdal-7.6.0.tar.gz 10186832 BLAKE2B 456b495a3d0a196cf02d6042c6db72c772327545fbc84f7bb758f55f3fca025432bf319fc33e9e0b5fe5ca78b83aea9dc47d77bf1f5b69ae88f1286a22c41263 SHA512 3f7ce090cf8da91f19675a1d9f6bd65c83b3a847337739481506f09d74001cb44283b103ba684dac8a5f11ec48605b5476240c534f6fc36442fb874b73680200
 DIST heimdal-7.7.0.tar.gz 10189293 BLAKE2B db9cdd1861dc9214a7f76b3d8b9656cfc0bad11cb6eadffa4fa29ea7f9aabd4c3d1b628c510644ec9abe1b3bf27a413ccf8cd590d602c4a4ac54ba3deb4cedc4 SHA512 6660939b5a36ce36310721a08a089fb671d1e3d2e8ac74ea4775bfa5f8f772d32de805551456200fe96cc486c092c44beb84f5dd877008bc305490ee971bbf99
-EBUILD heimdal-7.5.0.ebuild 4346 BLAKE2B 9a2a4af96f914167d224dc57a463ea4b5ddb6d2bb43f4fee5f8fe1734a947ed66382b919573538ae3c0c0773cec5e4ba15900427dd37c905cf9a3c3e6178b4ba SHA512 2d7caf14e6f7754c0aa2bbfd52d54b66c99dbcca8d6e5d870261d49ff6e8aeb2cc66472f12bd4370ad66e2fe752323ad95aaf35667d90a3c153c14873ff7f844
-EBUILD heimdal-7.6.0.ebuild 4553 BLAKE2B b48931abe23fc0127b920c73a26733ad9662b82acbe686995a396aa726f391e3c4bf286b8bcb4c98fb2e61dd228dd8e6b33665f8466614cc4c6bbe21b87777df SHA512 1f61122041a96810e9f6f5945a5ce116f3e44de6e47ff13c607b978edaa742aba32db7d756941d41e74d09ab5292510e8132bd014831517d6c0a71ce25d66266
+EBUILD heimdal-7.5.0.ebuild 4340 BLAKE2B e766908af9d3876478d02cf7d890962e94579115b1878a51aa21c00131aeb8d8859e7967d736092b21f32ee23e3a1830a7fe2bc44f62d0bd59712308c6d199ec SHA512 5fe057c1b4a498204386ee027bb7be25b458b00cc23798fec0aefd026143072c98c43785c0a42896f69760af85c35ea12736e20e5f1fc3d43fdb793d9ad18923
+EBUILD heimdal-7.6.0.ebuild 4547 BLAKE2B 498c0a8333d3adc915f4ee17cbec3a1bd572abccaa1b36d943cb1993995ceb27ae6b5c5bfcaa377e9f2b79833f78b70eb53b364be2a980b55ad39ea8d9a3f713 SHA512 4499d4ac0122f3142499699c0e72cf905ebdb41a61279e546c4740d3e9a04018048dedaf6c150da59709f4346680fa4f9bff3f4cd0f3335529efc96164773086
 EBUILD heimdal-7.7.0-r1.ebuild 4545 BLAKE2B 38277ef5002d659f4260eeacd3b39cf82eb1e6a3b13ba67f2d3015d211592270d938e91f1060dd05a0fcd78f8ce8707d1807fa0164ef1e415130efe8324ffe5c SHA512 78c263c9abf545732fe091798f662c423a02e2e30180502b70676f6a653d71b9f8984db0b719ddc524028aa67bf74ceef545225cd77d27b516d11bb15c0e3d8e
 MISC metadata.xml 722 BLAKE2B 9ec2bb074bf4932b0bb2f949eb3c33c8ed8b82305d6641a6954084120c658005cecc2cac57ad85a1df520f5bfd115deef57f80d874ba850d857a813b5a87c139 SHA512 5f3c28c222eb668e3c1d3b7fe24ae3622c82f94b6008a4c3458aa76afac9508d6e7f150de0f06e4845a5b0653ea04112fe0c2b421f199b5feb9ef771ab0b0b28
diff --git a/app-crypt/heimdal/heimdal-7.5.0.ebuild b/app-crypt/heimdal/heimdal-7.5.0.ebuild
index c3321f3eec67..d7c507879e26 100644
--- a/app-crypt/heimdal/heimdal-7.5.0.ebuild
+++ b/app-crypt/heimdal/heimdal-7.5.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 VIRTUALX_REQUIRED="manual"
 
 inherit autotools db-use multilib multilib-minimal python-any-r1 virtualx flag-o-matic
diff --git a/app-crypt/heimdal/heimdal-7.6.0.ebuild b/app-crypt/heimdal/heimdal-7.6.0.ebuild
index 4cf287ec2237..34b364981f11 100644
--- a/app-crypt/heimdal/heimdal-7.6.0.ebuild
+++ b/app-crypt/heimdal/heimdal-7.6.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 VIRTUALX_REQUIRED="manual"
 
 inherit autotools db-use multilib multilib-minimal python-any-r1 virtualx flag-o-matic
diff --git a/app-crypt/libykneomgr/Manifest b/app-crypt/libykneomgr/Manifest
deleted file mode 100644
index 315743e89005..000000000000
--- a/app-crypt/libykneomgr/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST libykneomgr-0.1.8.tar.gz 626257 BLAKE2B 4819420f36261251261264dfe688297107fa857cc78081dbbdaa90e5c821ceaafa7d770e431fdfec4c199273c67ec684da1f4570883c300f9283e73aeea42d17 SHA512 536db3a81b74d24e727cc09c5bb898723b602e6c55e249745ced59d5f9416673fdbecd80bb7ebc7031be349092c8fb4f5623c8f6972ab870ec1f50ac1bc2f795
-EBUILD libykneomgr-0.1.8.ebuild 562 BLAKE2B 9093de1a3a9be78f616849b4b5200f4063299ae24522a5118579a2570c843d22fb616f092cf4c9e641d2aaaeb3b36f566c9c9edd461fdc5c76f899005cba8d21 SHA512 a2b23d24768dcfd8d1b52bb95a3dda25c8879c50dc33fd13f9f45e5b9d71c3dfb7fdbb40c734cc4606c0ee55b743c0c12f4388ba4aa0ad2b11c167f13c14874e
-MISC metadata.xml 325 BLAKE2B 081e2efabea13e3dde8cc81bdb0a84a344cef9f553bd97a621b7eaeef8ba2b83741624a1e804368904b2dc48fdc3802d66e699331f1468e2a65d5768a5e40b28 SHA512 cf1683292cefaf49a20764fe6f5ef848bb196273aef6d2fd0e1b2c4da848ab93ebf0bf0388587b7e0de0ae38af5346b3ce7cff55f27af9c914834af775e95a41
diff --git a/app-crypt/libykneomgr/libykneomgr-0.1.8.ebuild b/app-crypt/libykneomgr/libykneomgr-0.1.8.ebuild
deleted file mode 100644
index 06befd824408..000000000000
--- a/app-crypt/libykneomgr/libykneomgr-0.1.8.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit udev
-
-DESCRIPTION="YubiKey NEO CCID Manager C Library"
-HOMEPAGE="https://developers.yubico.com/libykneomgr/"
-SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="kernel_linux"
-
-DEPEND="sys-apps/pcsc-lite
-	dev-libs/libzip"
-RDEPEND="${DEPEND}
-	>=app-crypt/ccid-1.4.18[usb]"
-BDEPEND="virtual/pkgconfig"
-
-src_configure() {
-	econf \
-		--with-backend=pcsc \
-		--disable-static
-}
diff --git a/app-crypt/libykneomgr/metadata.xml b/app-crypt/libykneomgr/metadata.xml
deleted file mode 100644
index e3e73c06a863..000000000000
--- a/app-crypt/libykneomgr/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-    <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="github">Yubico/libykneomgr</remote-id>
-    <bugs-to>https://github.com/Yubico/libykneomgr/issues</bugs-to>
-  </upstream>
-</pkgmetadata>
diff --git a/app-crypt/rotix/Manifest b/app-crypt/rotix/Manifest
index b79d57eff2f7..0d2818ca7392 100644
--- a/app-crypt/rotix/Manifest
+++ b/app-crypt/rotix/Manifest
@@ -2,5 +2,5 @@ AUX 0.83-respect-CFLAGS-and-dont-strip.patch 623 BLAKE2B 62cff4d1566fbb926314240
 AUX rotix-0.83-interix.patch 252 BLAKE2B 319f34ee0d874d5a608259d4fd3f018ec085ec28f96b8a620b4b1606b844acec7d3b665e62b5c032bbe2d928f924d1dcbc519628a8ccde9e0ac259be2f485871 SHA512 4c3862c22fb6c39f8f9653d7415414f28c31f91eeac284fa277c2527abe0a4d549f1eda141a5409b9ba171bbab3c4a2b9c66ecf438413e542682a85b2c549b8c
 AUX rotix-0.83-locale.diff 256 BLAKE2B a7564979a38ff517bbe0592ba12e2aab92c44fc828180c2587ec4b5db3acf4ffbf71feba959625faf93b9fd997d39c9330e4255e8c875bbc1653b66fe140e1c9 SHA512 7b8c82bac78c48f5d43c0246c41e7a7910f0119cc7b56500789d722d87f00e9d2356150063e07ae281435d5af60f9e15956c5bc0b236ea5f225435886117c4b0
 DIST rotix-0.83.tar.bz2 14685 BLAKE2B 296e094dfef2b35db39041e92d350befc970f3594c7aa2962b4dba0215e99b50ea887d3d636dc2e38ee570b60462bcf8304a6f7ee005315fa115b821ee0f29ad SHA512 1f318e15bd51cc197d9d9fc36e37b29c18fe7a8e8c40654c69ccf97d32b896afa7cc517c562750f6c1262baddbb451bd8a29ada994176e442630d8ed56ccf572
-EBUILD rotix-0.83.ebuild 789 BLAKE2B b8c0b8bf50ac5a4d2aafba90a2ea896fe673767939445e76058cf26ac63092a52fe7cb6370e31b782003f9bd5499abdcf500e1502e31f99aa96c0da2b3f2f0aa SHA512 75654c96d396fe860076066c4b19423f89e830d15b3867f920dd600c26aa75f4634bdd6cfb49ad65006c82695615ad6515450e458f1400a396af4bb422480639
+EBUILD rotix-0.83.ebuild 811 BLAKE2B 3732fa4a6debfedc4d8200713ceee1bae1c702ee81b4550994a05b113980b65722d0fa9f7658f2d823e9f03871fc762c91225cbe0126eeea63020af15f236874 SHA512 b84fc54a2874589f14510b2819b6fa5935dad1497bb5fc5ec528ab4f4b880e99a0f14ccc60e4cc65797c645675fea524f4299b05a3a29a43134924efa612425c
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-crypt/rotix/rotix-0.83.ebuild b/app-crypt/rotix/rotix-0.83.ebuild
index 3e79123b9407..ba5cad60e9fc 100644
--- a/app-crypt/rotix/rotix-0.83.ebuild
+++ b/app-crypt/rotix/rotix-0.83.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 inherit eutils flag-o-matic
 
 DESCRIPTION="Rotix allows you to generate rotational obfuscations"
-HOMEPAGE="https://gentoo.org"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI="http://elektron.its.tudelft.nl/~hemmin98/rotix_releases/${P}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
diff --git a/app-crypt/yubikey-manager-qt/Manifest b/app-crypt/yubikey-manager-qt/Manifest
index c2913a1b3894..8810d933905e 100644
--- a/app-crypt/yubikey-manager-qt/Manifest
+++ b/app-crypt/yubikey-manager-qt/Manifest
@@ -1,3 +1,3 @@
 DIST yubikey-manager-qt-1.1.3.tar.gz 13316325 BLAKE2B 765634b05fff9efdd5ec5e91e0a5de7f04144476b83f7b3ba8a0c8a1bc95ca7132f25e193afca2bec17fe377c683063a14657efc24fb047a64a8f4498c7abaed SHA512 84bcca3f74967ba8aa470b8dd6c8699ff6a93a85ce942934a1d0cd674a4c507ba297d9a5ebb40bae3476ea713965a7bb3816dad1110a045c338f070eb249f02b
-EBUILD yubikey-manager-qt-1.1.3.ebuild 1413 BLAKE2B 0427d39f708ad538f85f0953a131c09a993eaf36236a149a5d9cda0d8652f9ef03f95fdae1cc6451d0fbbb23dade6e0a826cdccebef944e4925ab3fc20b0960d SHA512 d7bf4f802ce38d95b7aeea150ca7d119ac663371664aac5605cc269f1b51f677dcf36e23588708f0daba7d5451877e702c714dc25d3eb53238803f99ba3a3aa7
+EBUILD yubikey-manager-qt-1.1.3-r1.ebuild 1470 BLAKE2B 4a6e9ba2ed294b1ff49808fa17d6b9e06cc3be46033365a611844369f1cc571b8de1a51ce0e6199038c4628cbabef2648713a189d087a423eab2ce9933a1deec SHA512 36b25fb8a6ccca5348b4cc8627066621bff2dab4ae8f508d8d9d43dbebf48a412ca38146c6e66b29658f7cff542813ad76cef1f9d2db7ba6aba1d2c0e7527014
 MISC metadata.xml 371 BLAKE2B 1081e69aeb641c9d7de472bed98dfb336bc37e5374becbec4603316176419dcdb337f29b355b3395b778d250a99e32b181b84b42d4b7c10dedce7c47a6a187f6 SHA512 ed480648e967bfa3d95f71a5131963290e4265c487a345b69e34ad23c4ab18d82b08cd1e4a12f389533cc9690163fed90c05d471375fadd074c99a235105e837
diff --git a/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.1.3.ebuild b/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.1.3-r1.ebuild
index 99fb80953a8b..6fb3d2e0e306 100644
--- a/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.1.3.ebuild
+++ b/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.1.3-r1.ebuild
@@ -17,10 +17,12 @@ KEYWORDS="~amd64"
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
 DEPEND="${PYTHON_DEPS}
-	>=app-crypt/yubikey-manager-1.0.0[${PYTHON_USEDEP}]
-	<app-crypt/yubikey-manager-4.0.0[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/pyotherside[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=app-crypt/yubikey-manager-1.0.0[${PYTHON_MULTI_USEDEP}]
+		<app-crypt/yubikey-manager-4.0.0[${PYTHON_MULTI_USEDEP}]
+		dev-python/cryptography[${PYTHON_MULTI_USEDEP}]
+	')
+	dev-python/pyotherside[${PYTHON_SINGLE_USEDEP}]
 	dev-qt/qtcore:5
 	dev-qt/qtdeclarative:5
 	dev-qt/qtgraphicaleffects:5