gentoo resync : 05.03.2021

5 files changed, 8 insertions, 81 deletions

diff --git a/app-crypt/acme/Manifest b/app-crypt/acme/Manifest
index 75b07949ec5d..2e3e62e4742e 100644
--- a/app-crypt/acme/Manifest
+++ b/app-crypt/acme/Manifest
@@ -1,8 +1,6 @@
-DIST certbot-1.10.1.tar.gz 1416402 BLAKE2B e00ba6bf69dbf4bc91be325d4c9ba470214aeef18b4ad4ac5efbf7d077ffa9498e9cff2eff00045bc1024930f95ec56e1773c3a193a982b393caf7ee19f8ccc0 SHA512 332e92dd7d91b9774e55ef8d2c0217a57167a26d1e86d36196fc601b4abb23f40033f94112c4b4bff5f8bc54e1e32ecd68b1f01e7d67bc4fd8f7dd98ce0362cc
-DIST certbot-1.11.0.tar.gz 1419116 BLAKE2B 4749dcd897822d4e1981ef57334a493e7b729205f3ae808893ed4cab682b74c8779893378fa5cd2651b4ef681518c5aac751514104b64adfd7a17435946c46b7 SHA512 b744e44e8a7981d7b28064a2b7b5d1f47ac1ea465fa350b4f849004f38e6b3966e3118e5ebd8c1c83b9a4a065c31005c0e2cb33f75a0b04125fbe2ac17312a24
 DIST certbot-1.12.0.tar.gz 1419901 BLAKE2B 0ee1059c34ed6c73d1a066d54592917d5c65a8a193034f2d158397b559d2c7278d25fd3d4f2c4e553cd1737bfd8e871e8afba70e483fc4401cfa9deca913ded0 SHA512 1fbbba6294c6cd11a7f3b3887ac8775ed6c8cacd22879f68a4e3d8fb03021357dd0f32d8c96806b4f5b922dc243e332cfb36ac966f509fba739551e23e0d20fa
-EBUILD acme-1.10.1.ebuild 1721 BLAKE2B 4f81cf2a6d8311a1861bde56cca57daf1924bff122302160228eaaf9f111393339ad7fe3f0f05f768e0dd392d141780fdaf5215d62812ad5f5cf7d922bd22afb SHA512 6688cd42bf77c19ec34ea1d17ba4d54a1006fcc140c0c7f1163edb0c2895a18d5d5b61da34665f49360a4b74cf189d44c84195789ac98bb0ff61c69d82ed3cef
-EBUILD acme-1.11.0.ebuild 1721 BLAKE2B 4f81cf2a6d8311a1861bde56cca57daf1924bff122302160228eaaf9f111393339ad7fe3f0f05f768e0dd392d141780fdaf5215d62812ad5f5cf7d922bd22afb SHA512 6688cd42bf77c19ec34ea1d17ba4d54a1006fcc140c0c7f1163edb0c2895a18d5d5b61da34665f49360a4b74cf189d44c84195789ac98bb0ff61c69d82ed3cef
-EBUILD acme-1.12.0.ebuild 1724 BLAKE2B 91285b0680721244251a76beee8d70a036aaaafa4fd32f190edc8dff5f9fdddcd44b42567f475db7b45f1c8d11603c5457d362a81b1d9973b03ac3ebfbff5d2d SHA512 dd76ab4d8f3b159097e7a4f3ad47e80610db27afe8c86908ac8dfaa7984f0657c452b5ee068c4470b0a1b2e6b7d52d220997af68eb929021ed724f15f8f8f9b9
-EBUILD acme-9999.ebuild 1724 BLAKE2B 91285b0680721244251a76beee8d70a036aaaafa4fd32f190edc8dff5f9fdddcd44b42567f475db7b45f1c8d11603c5457d362a81b1d9973b03ac3ebfbff5d2d SHA512 dd76ab4d8f3b159097e7a4f3ad47e80610db27afe8c86908ac8dfaa7984f0657c452b5ee068c4470b0a1b2e6b7d52d220997af68eb929021ed724f15f8f8f9b9
+DIST certbot-1.13.0.tar.gz 1426058 BLAKE2B 661aeb430e468a46362c537efd253bb581c7e94b32c67131ae951a67b14d8b6d0f806b7c66a7f60375bb5fe95c714e1b58d3c811d5e0ee21e371b1ff611f74a8 SHA512 1c88027a2259ef9cfb852dd5bd0d326de52d8d7bcec984ee50dc7e5dfe60e2ea68b50afa255b95b2cac08f51467d6584d5671f2410b112b50ce5e4312969ad48
+EBUILD acme-1.12.0.ebuild 1722 BLAKE2B 028fc0e59a8902a96f1476e0114781659173a85ec6e87cede7941b61597285548924ab6ee8976624bc506463b1699d86f6dd3c092d4c990e5380e69c1ba57fd5 SHA512 757ba13b0756030605b1d8a3dfe0451a7a04fc731897581b3c52e03f90c79139d276e7eefd53999ee4d32889ecc29eb29e4de57de68e2edc5848ef4f3c49be5a
+EBUILD acme-1.13.0.ebuild 1681 BLAKE2B b3ede9a67c5e6462e623921bc02190a909c2b22d712c527a9de590af5892fc4770d9d3bd1174a0f0f1fcb054a93fdb88862b315260b74aae3755f666d1d91cfa SHA512 61652a5c834a08bcfe9aa806a985c25c9845022db1d458b7e8d77629a483269e41e583cfff536097bde43ad02a021be3652c5a73eda0f4661aa206aaff800eda
+EBUILD acme-9999.ebuild 1681 BLAKE2B b3ede9a67c5e6462e623921bc02190a909c2b22d712c527a9de590af5892fc4770d9d3bd1174a0f0f1fcb054a93fdb88862b315260b74aae3755f666d1d91cfa SHA512 61652a5c834a08bcfe9aa806a985c25c9845022db1d458b7e8d77629a483269e41e583cfff536097bde43ad02a021be3652c5a73eda0f4661aa206aaff800eda
 MISC metadata.xml 400 BLAKE2B a09af005ab6b00b9eb6e9252814273c932609e4dd6020c2289f5dafc8aa3e6bcb9696dc887767f29271af4a93fae73116f688937613ff9a340d5747a801097e5 SHA512 92c877fdfd16f55997573f2719eed9a9609fe34baff4c8b09bdb500c9eaf3e2bd3536e60127f171a92c4a1b8d9446e00208856754758c21779a8bbd137c3fab7
diff --git a/app-crypt/acme/acme-1.11.0.ebuild b/app-crypt/acme/acme-1.11.0.ebuild
deleted file mode 100644
index 8e2217c937ce..000000000000
--- a/app-crypt/acme/acme-1.11.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=(python{3_7,3_8,3_9})
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
-	inherit git-r3
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> certbot-${PV}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-	S=${WORKDIR}/certbot-${PV}/acme
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="An implementation of the ACME protocol"
-HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/cryptography-1.3.4[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/josepy-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.15.1[${PYTHON_USEDEP}]
-	dev-python/pyrfc3339[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.10[${PYTHON_USEDEP}]
-	>=dev-python/requests-toolbelt-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	)
-	test? (
-		${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-src_compile() {
-	python_foreach_impl run_in_build_dir default
-	distutils-r1_src_compile
-	if use doc ; then
-		cd docs || die
-		sphinx-build -b html -d _build/doctrees   . _build/html
-	fi
-}
-
-python_test() {
-	nosetests -w ${PN} || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/app-crypt/acme/acme-1.12.0.ebuild b/app-crypt/acme/acme-1.12.0.ebuild
index 00d5ef84ecfd..0fa69fe3c564 100644
--- a/app-crypt/acme/acme-1.12.0.ebuild
+++ b/app-crypt/acme/acme-1.12.0.ebuild
@@ -11,7 +11,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/acme/acme-1.10.1.ebuild b/app-crypt/acme/acme-1.13.0.ebuild
index 8e2217c937ce..6e86a07321fd 100644
--- a/app-crypt/acme/acme-1.10.1.ebuild
+++ b/app-crypt/acme/acme-1.13.0.ebuild
@@ -11,7 +11,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
 
@@ -26,15 +26,14 @@ IUSE="doc test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	>=dev-python/cryptography-1.3.4[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-2.1.4[${PYTHON_USEDEP}]
 	>=dev-python/idna-2.0.0[${PYTHON_USEDEP}]
 	>=dev-python/josepy-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.15.1[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-17.3.0[${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? (
diff --git a/app-crypt/acme/acme-9999.ebuild b/app-crypt/acme/acme-9999.ebuild
index 00d5ef84ecfd..6e86a07321fd 100644
--- a/app-crypt/acme/acme-9999.ebuild
+++ b/app-crypt/acme/acme-9999.ebuild
@@ -34,7 +34,6 @@ RDEPEND="
 	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.11.0[${PYTHON_USEDEP}]
 "
 DEPEND="
 	doc? (