gentoo resync : 20.10.2021

4 files changed, 45 insertions, 4 deletions

diff --git a/app-crypt/certbot/Manifest b/app-crypt/certbot/Manifest
index ce9a13876033..27cf80eaa64d 100644
--- a/app-crypt/certbot/Manifest
+++ b/app-crypt/certbot/Manifest
@@ -1,6 +1,8 @@
 DIST certbot-1.18.0.tar.gz 1332615 BLAKE2B eb086710b943893025d6e1091470ca02de074232372f4c9fa21fa83a347fe54df988b9553c8cf6afd6e166b8c464d595171984c984008a872e16c0179bb774b2 SHA512 94b16ba0586e0f5d3036280c68f9976c25889ca48fbbe7aded41f0d9feba2300a3f0ff8fe321b39d8642bcdd874c7332cf2acb3187b5869fe415831f58a75a7b
 DIST certbot-1.19.0.tar.gz 1338653 BLAKE2B b6ed909da2aed9853cf3dc6b936c513f33a127548ee30ac45a32a682141c5e4e79401ea328b7caf4e28d1d85aa2a9831e93deaa26c93216708a33be465dc8387 SHA512 2c1beb8c06299b9003fafd970cd3e977db85c4e84f1bf710166b7a99035b5c43a2a222d8d51513ac595255dd8eda02a1fb834c01ce68921927715c880052536e
+DIST certbot-1.20.0.tar.gz 1339066 BLAKE2B 01278a53ea7166037c039d270ddd11a10c0570a9f038571dc6791e51f214fbff1589371b40c0dc73cbc18ed2005cfc231452bd00b039841a09ddb3c65d4ab122 SHA512 d35b2574811ac896ad119355be3a901438400e81a67388bd93290c4e7e9f6fa60dad99b51bc9bac7a7ac60714ed8bb6f60f522ce1a1a169886d0a15f0d0e371b
 EBUILD certbot-1.18.0.ebuild 1180 BLAKE2B 55c9e5b606cd2d9e569483cc6d5e9ed558654685c30186dff79b38c0de8f449d16cf8b50151b0edee8343a8840e390019b75523be78f5db085914bc22bab57b4 SHA512 8299e5833351978765b9fc49dfb9f0434882a14d82ece0b21104ecdcd5d2e501d9c2407d0792ed1a9a3e26b56da0488c6d28603f9d85616296c50e0105b0d2e6
-EBUILD certbot-1.19.0.ebuild 1189 BLAKE2B 2bf07d3f5ce29a1d6fa94feac130e9b6826a5168762919953ff7496158103289a75f271c104774c6c9927750bcf126d40c3def6ade3bf15b108d4615b8e38e44 SHA512 2c6b143f928639c81cbd3d3d1b260a9231f75755ad10b470cd7e28b0f982094026f31ad75402f7e3aa20891448233751fb97b3185f79707d96f582c1b93d52ac
-EBUILD certbot-9999.ebuild 1189 BLAKE2B 2bf07d3f5ce29a1d6fa94feac130e9b6826a5168762919953ff7496158103289a75f271c104774c6c9927750bcf126d40c3def6ade3bf15b108d4615b8e38e44 SHA512 2c6b143f928639c81cbd3d3d1b260a9231f75755ad10b470cd7e28b0f982094026f31ad75402f7e3aa20891448233751fb97b3185f79707d96f582c1b93d52ac
+EBUILD certbot-1.19.0.ebuild 1187 BLAKE2B 94b32edb5153d49fd642b4f2eef6d14ff8691fd48586ccdb441ba51c5bc26b635281a0690850f1f98a93702021d129c0bceb144dc724622a641a7d9390537559 SHA512 5338016400e8103c6296efeba175452bbdfc962db04fec75a1dc8217fc20a1d727005e3d639eac127c1e32db146ac0e36aceb045f9b76cb2ab95618597da0400
+EBUILD certbot-1.20.0.ebuild 1189 BLAKE2B 361260e42aa3fd2f5ded08115be7a560baddc87b244c5149318bb7d86be6b1221a842d20a6b5e8ace174575d8ed2a9a8ac360fbc01756625d428bf13c314f64b SHA512 b9a40cca88a725402f3fb982868d885165d9136333ee80a04567376e21ee84ba50356b9b394c139332bafed2b3ac7d76b1fb6f5bf5ff7de6cf22feec7fa713ed
+EBUILD certbot-9999.ebuild 1189 BLAKE2B 361260e42aa3fd2f5ded08115be7a560baddc87b244c5149318bb7d86be6b1221a842d20a6b5e8ace174575d8ed2a9a8ac360fbc01756625d428bf13c314f64b SHA512 b9a40cca88a725402f3fb982868d885165d9136333ee80a04567376e21ee84ba50356b9b394c139332bafed2b3ac7d76b1fb6f5bf5ff7de6cf22feec7fa713ed
 MISC metadata.xml 359 BLAKE2B 7f8ac46ecea304579baca80978cc35905720d1950caa183b5b5b297afab8bf6ea328324bacc438e9ecd91176230e42e55deda1c15e1ba73c63b2021ac2842c0f SHA512 a50b1db5a30eac290ac6645fcb30b0d5c4d8e51d83cff284e76358ee4fe7cef9366e40b06f532ba64a2131672972ea10b73541a9bd42cc323c17f6d26f6b0197
diff --git a/app-crypt/certbot/certbot-1.19.0.ebuild b/app-crypt/certbot/certbot-1.19.0.ebuild
index 4c776f1113cc..d84a4206f10c 100644
--- a/app-crypt/certbot/certbot-1.19.0.ebuild
+++ b/app-crypt/certbot/certbot-1.19.0.ebuild
@@ -11,7 +11,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 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 fi
 S=${WORKDIR}/${P}/${PN}
 
diff --git a/app-crypt/certbot/certbot-1.20.0.ebuild b/app-crypt/certbot/certbot-1.20.0.ebuild
new file mode 100644
index 000000000000..18900751b704
--- /dev/null
+++ b/app-crypt/certbot/certbot-1.20.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+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 ~riscv ~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"
+
+RDEPEND="
+	>=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
+	>=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
+	>=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-2.8[${PYTHON_USEDEP}]
+	>=dev-python/distro-1.0.1[${PYTHON_USEDEP}]
+	>=dev-python/josepy-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/parsedatetime-2.4[${PYTHON_USEDEP}]
+	dev-python/pyrfc3339[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/zope-component[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/app-crypt/certbot/certbot-9999.ebuild b/app-crypt/certbot/certbot-9999.ebuild
index 4c776f1113cc..18900751b704 100644
--- a/app-crypt/certbot/certbot-9999.ebuild
+++ b/app-crypt/certbot/certbot-9999.ebuild
@@ -29,7 +29,7 @@ RDEPEND="
 	>=dev-python/configobj-5.0.6[${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/josepy-1.9.0[${PYTHON_USEDEP}]
 	>=dev-python/parsedatetime-2.4[${PYTHON_USEDEP}]
 	dev-python/pyrfc3339[${PYTHON_USEDEP}]
 	dev-python/pytz[${PYTHON_USEDEP}]