gentoo resync : 14.08.2021

4 files changed, 20 insertions, 79 deletions

diff --git a/app-crypt/acme/Manifest b/app-crypt/acme/Manifest
index 41c9c1d178b0..9ded25b78815 100644
--- a/app-crypt/acme/Manifest
+++ b/app-crypt/acme/Manifest
@@ -2,7 +2,7 @@ DIST certbot-1.16.0.tar.gz 1384177 BLAKE2B 4e46e7d7b9db2f6ef19fab60c2d904f84b502
 DIST certbot-1.17.0.tar.gz 1386471 BLAKE2B 26cf23c481cc67e1fa0f698dee83dd42b1d382814f10bdb4d2a459f1274f3d661d2a58815c30110701d46362c3fbaee9f57089a7eda1221c9b9dadb2c48dc79d SHA512 104deb8e6e804a3a3f50c730f00307aa39d9d42756f24be009fedc27c889c1575b456455ee11441e341025db6f528359e927a347554ebd57b64c39e789576eda
 DIST certbot-1.18.0.tar.gz 1332615 BLAKE2B eb086710b943893025d6e1091470ca02de074232372f4c9fa21fa83a347fe54df988b9553c8cf6afd6e166b8c464d595171984c984008a872e16c0179bb774b2 SHA512 94b16ba0586e0f5d3036280c68f9976c25889ca48fbbe7aded41f0d9feba2300a3f0ff8fe321b39d8642bcdd874c7332cf2acb3187b5869fe415831f58a75a7b
 EBUILD acme-1.16.0.ebuild 1679 BLAKE2B ff4806292419911de014008dc51d250464f90368325db9a0cd73b6ba2881c6f60563fd7831d999ffba75772cbfa24af517d9fa52556f260f13c5855400d635bf SHA512 fbdc63af62a50e9ca6f98ed17b1b1be58a0a206b4e0940557b592f715a3d8bb81c6432132623e497e94806d595d4e71f0a660512c8ee23bd15b84088a62821cf
-EBUILD acme-1.17.0.ebuild 1681 BLAKE2B b3ede9a67c5e6462e623921bc02190a909c2b22d712c527a9de590af5892fc4770d9d3bd1174a0f0f1fcb054a93fdb88862b315260b74aae3755f666d1d91cfa SHA512 61652a5c834a08bcfe9aa806a985c25c9845022db1d458b7e8d77629a483269e41e583cfff536097bde43ad02a021be3652c5a73eda0f4661aa206aaff800eda
-EBUILD acme-1.18.0.ebuild 1721 BLAKE2B e5af881b9c3167def1a77e33ee8352e379bc584d1782eb3d927926368745781fa4efed3ec6cc40b7f72ccf47b13eb8b00552500f745507afe8115230208564e0 SHA512 577b685bdbf2e5593f6dda84ca809ac440737991d7fe9f304a8a9a19d8b231752d8e3f77cb130b3a51ac27e574dfc677bb9b6b911905d13cc907b0bd58b1af3d
-EBUILD acme-9999.ebuild 1681 BLAKE2B b3ede9a67c5e6462e623921bc02190a909c2b22d712c527a9de590af5892fc4770d9d3bd1174a0f0f1fcb054a93fdb88862b315260b74aae3755f666d1d91cfa SHA512 61652a5c834a08bcfe9aa806a985c25c9845022db1d458b7e8d77629a483269e41e583cfff536097bde43ad02a021be3652c5a73eda0f4661aa206aaff800eda
+EBUILD acme-1.17.0.ebuild 1679 BLAKE2B ff4806292419911de014008dc51d250464f90368325db9a0cd73b6ba2881c6f60563fd7831d999ffba75772cbfa24af517d9fa52556f260f13c5855400d635bf SHA512 fbdc63af62a50e9ca6f98ed17b1b1be58a0a206b4e0940557b592f715a3d8bb81c6432132623e497e94806d595d4e71f0a660512c8ee23bd15b84088a62821cf
+EBUILD acme-1.18.0-r1.ebuild 1125 BLAKE2B e573b1ec4d48443aeec1bde0b70c9c510982b9cfb802c2d8ab2503db9b1830b7066b91da290f51eb234512a9c82bcd60afc93c022a9aae370739984d1b26f607 SHA512 a57c453c1607e03521deebbe7ff3ec55cc214015b7afb69e39b66b2f82c7d51c73fe66a2ff36efd88d0248b5ca50e755c065e1a18e8a833373a9980a025fc017
+EBUILD acme-9999.ebuild 1125 BLAKE2B e573b1ec4d48443aeec1bde0b70c9c510982b9cfb802c2d8ab2503db9b1830b7066b91da290f51eb234512a9c82bcd60afc93c022a9aae370739984d1b26f607 SHA512 a57c453c1607e03521deebbe7ff3ec55cc214015b7afb69e39b66b2f82c7d51c73fe66a2ff36efd88d0248b5ca50e755c065e1a18e8a833373a9980a025fc017
 MISC metadata.xml 400 BLAKE2B a09af005ab6b00b9eb6e9252814273c932609e4dd6020c2289f5dafc8aa3e6bcb9696dc887767f29271af4a93fae73116f688937613ff9a340d5747a801097e5 SHA512 92c877fdfd16f55997573f2719eed9a9609fe34baff4c8b09bdb500c9eaf3e2bd3536e60127f171a92c4a1b8d9446e00208856754758c21779a8bbd137c3fab7
diff --git a/app-crypt/acme/acme-1.17.0.ebuild b/app-crypt/acme/acme-1.17.0.ebuild
index 6e86a07321fd..37a6145366aa 100644
--- a/app-crypt/acme/acme-1.17.0.ebuild
+++ b/app-crypt/acme/acme-1.17.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.18.0.ebuild b/app-crypt/acme/acme-1.18.0-r1.ebuild
index 2addb06332fc..7c666ebed1ff 100644
--- a/app-crypt/acme/acme-1.18.0.ebuild
+++ b/app-crypt/acme/acme-1.18.0-r1.ebuild
@@ -1,10 +1,13 @@
 # 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})
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
+inherit distutils-r1
+
 if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
 	inherit git-r3
@@ -15,20 +18,15 @@ else
 	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/chardet[${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-17.3.0[${PYTHON_USEDEP}]
 	dev-python/pyrfc3339[${PYTHON_USEDEP}]
@@ -36,34 +34,6 @@ RDEPEND="
 	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
 	>=dev-python/requests-toolbelt-0.3.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
-}
+distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest
diff --git a/app-crypt/acme/acme-9999.ebuild b/app-crypt/acme/acme-9999.ebuild
index 6e86a07321fd..7c666ebed1ff 100644
--- a/app-crypt/acme/acme-9999.ebuild
+++ b/app-crypt/acme/acme-9999.ebuild
@@ -1,10 +1,13 @@
 # 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})
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
+inherit distutils-r1
+
 if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
 	inherit git-r3
@@ -15,54 +18,22 @@ else
 	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/chardet[${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-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-2.14.2[${PYTHON_USEDEP}]
 	>=dev-python/requests-toolbelt-0.3.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
-}
+distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest