gentoo resync : 08.10.2021

4 files changed, 4 insertions, 74 deletions

diff --git a/app-crypt/acme/Manifest b/app-crypt/acme/Manifest
index 8d85bbafe401..5ca004ac403e 100644
--- a/app-crypt/acme/Manifest
+++ b/app-crypt/acme/Manifest
@@ -1,8 +1,6 @@
-DIST certbot-1.17.0.tar.gz 1386471 BLAKE2B 26cf23c481cc67e1fa0f698dee83dd42b1d382814f10bdb4d2a459f1274f3d661d2a58815c30110701d46362c3fbaee9f57089a7eda1221c9b9dadb2c48dc79d SHA512 104deb8e6e804a3a3f50c730f00307aa39d9d42756f24be009fedc27c889c1575b456455ee11441e341025db6f528359e927a347554ebd57b64c39e789576eda
 DIST certbot-1.18.0.tar.gz 1332615 BLAKE2B eb086710b943893025d6e1091470ca02de074232372f4c9fa21fa83a347fe54df988b9553c8cf6afd6e166b8c464d595171984c984008a872e16c0179bb774b2 SHA512 94b16ba0586e0f5d3036280c68f9976c25889ca48fbbe7aded41f0d9feba2300a3f0ff8fe321b39d8642bcdd874c7332cf2acb3187b5869fe415831f58a75a7b
 DIST certbot-1.19.0.tar.gz 1338653 BLAKE2B b6ed909da2aed9853cf3dc6b936c513f33a127548ee30ac45a32a682141c5e4e79401ea328b7caf4e28d1d85aa2a9831e93deaa26c93216708a33be465dc8387 SHA512 2c1beb8c06299b9003fafd970cd3e977db85c4e84f1bf710166b7a99035b5c43a2a222d8d51513ac595255dd8eda02a1fb834c01ce68921927715c880052536e
-EBUILD acme-1.17.0.ebuild 1679 BLAKE2B ff4806292419911de014008dc51d250464f90368325db9a0cd73b6ba2881c6f60563fd7831d999ffba75772cbfa24af517d9fa52556f260f13c5855400d635bf SHA512 fbdc63af62a50e9ca6f98ed17b1b1be58a0a206b4e0940557b592f715a3d8bb81c6432132623e497e94806d595d4e71f0a660512c8ee23bd15b84088a62821cf
 EBUILD acme-1.18.0-r1.ebuild 1123 BLAKE2B 37c29dec8eb47e63cc708fd431af8689155798c9a4fe2c07dd2de26980adf8335d523f1a5e06a17c707561571ac6b0b7ba97a477419b1f974c8881fd03b99ca4 SHA512 964a1b0e24ad95302f47a09d1c1f1560d5551547c36f3bd2eaaab6c03a320444ef296f4141017420a61d9d36378490a149a3c325e43e471796a960c913650a5d
-EBUILD acme-1.19.0.ebuild 1125 BLAKE2B e573b1ec4d48443aeec1bde0b70c9c510982b9cfb802c2d8ab2503db9b1830b7066b91da290f51eb234512a9c82bcd60afc93c022a9aae370739984d1b26f607 SHA512 a57c453c1607e03521deebbe7ff3ec55cc214015b7afb69e39b66b2f82c7d51c73fe66a2ff36efd88d0248b5ca50e755c065e1a18e8a833373a9980a025fc017
-EBUILD acme-9999.ebuild 1125 BLAKE2B e573b1ec4d48443aeec1bde0b70c9c510982b9cfb802c2d8ab2503db9b1830b7066b91da290f51eb234512a9c82bcd60afc93c022a9aae370739984d1b26f607 SHA512 a57c453c1607e03521deebbe7ff3ec55cc214015b7afb69e39b66b2f82c7d51c73fe66a2ff36efd88d0248b5ca50e755c065e1a18e8a833373a9980a025fc017
+EBUILD acme-1.19.0.ebuild 1132 BLAKE2B c040463a55642cb2f08cd57c8dd7f8b2d338a785522b3aefb6f71f234d0800442c367ed545bb40b12eb82f0f43e8e26ba366d00f6e3bef8887e902b442cc8570 SHA512 3e75f147716119305b12826babb4431c467fd0bc285627e98ab3aa71008b7d70436cd6ca1cb595b5a8c743a07bea6d064024eba2ad0458486c94f8d2b18b0429
+EBUILD acme-9999.ebuild 1132 BLAKE2B c040463a55642cb2f08cd57c8dd7f8b2d338a785522b3aefb6f71f234d0800442c367ed545bb40b12eb82f0f43e8e26ba366d00f6e3bef8887e902b442cc8570 SHA512 3e75f147716119305b12826babb4431c467fd0bc285627e98ab3aa71008b7d70436cd6ca1cb595b5a8c743a07bea6d064024eba2ad0458486c94f8d2b18b0429
 MISC metadata.xml 401 BLAKE2B 30a2ac1f03749a8e3bb98723c57f47ab6bcf7bfa58c2b6e21c309fae279feca0d3612df6c2a1dafaf27b4f0781c583a140322feac1a1cf2c13e50861cad129ea SHA512 d8e725b71ca81ce4ca6565ed58271b283c25394448f0f48f726f232122577c33d5b2d726e117419b2fae99f9dae29a8080bb9564eccbca13368c83988cf3da01
diff --git a/app-crypt/acme/acme-1.17.0.ebuild b/app-crypt/acme/acme-1.17.0.ebuild
deleted file mode 100644
index 37a6145366aa..000000000000
--- a/app-crypt/acme/acme-1.17.0.ebuild
+++ /dev/null
@@ -1,68 +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-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-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
-}
diff --git a/app-crypt/acme/acme-1.19.0.ebuild b/app-crypt/acme/acme-1.19.0.ebuild
index 7c666ebed1ff..c3e47e636d10 100644
--- a/app-crypt/acme/acme-1.19.0.ebuild
+++ b/app-crypt/acme/acme-1.19.0.ebuild
@@ -14,7 +14,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 ~riscv ~x86"
 	S=${WORKDIR}/certbot-${PV}/acme
 fi
 
diff --git a/app-crypt/acme/acme-9999.ebuild b/app-crypt/acme/acme-9999.ebuild
index 7c666ebed1ff..c3e47e636d10 100644
--- a/app-crypt/acme/acme-9999.ebuild
+++ b/app-crypt/acme/acme-9999.ebuild
@@ -14,7 +14,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 ~riscv ~x86"
 	S=${WORKDIR}/certbot-${PV}/acme
 fi