gentoo resync : 20.03.2022

5 files changed, 90 insertions, 8 deletions

diff --git a/app-crypt/certbot/Manifest b/app-crypt/certbot/Manifest
index ca22241ba70c..3f0e2cf67d04 100644
--- a/app-crypt/certbot/Manifest
+++ b/app-crypt/certbot/Manifest
@@ -1,6 +1,10 @@
-DIST certbot-1.21.0.tar.gz 1343180 BLAKE2B 79bbaafe96bca4cee9aabb39f4e9f1f12be4d2e1d9c1b156966061606ac3b07e5d80c5053baa03698e5513477076ca8f604aff43f77ee7f45d70d4b88429a875 SHA512 11ea781c5113cf68e3a76cafc2cf38d5ebc9cdb2f40a79eae0cdeac5d40f8dac05a4c71a269d5a6ff78027a1db0676195a8413e28a87d00aaf1602f6f2ce5b5e
 DIST certbot-1.22.0.tar.gz 1352714 BLAKE2B 213dc08d3a88e0d20d6324c026a47eb96b9e45fbde41f79e37c2e62c655d7c6df01292e110d2e78ea085dfc62ef3c7b623279224029c9ae2a59e69c5c00054a5 SHA512 9a7a0d11e9fd5bd59b526a2cc5d0029b972e34a2bf41035c2d8ab535b93fc6d985ee8ea3dd5e50a7f4af80450135b739d1297245ad21b47b8362cddb03738932
-EBUILD certbot-1.21.0.ebuild 1187 BLAKE2B 30decf00d4fdf50a058a243f996a0e0f5a6ce5f72134ad22df8d4c46425122ed9da41d6242d149209a85710c7f358351f994a0261365f04e6b0aaba92db94dee SHA512 81e5770fbc0f731f0058dde4ffd501f1bdc54d697842009847d0ccfa49bdc6e9e01795824eb9a8fbf7995a7cbd2707d476c6d4f2f96f43b727eea2d17e658265
+DIST certbot-1.23.0.tar.gz 1361107 BLAKE2B a1b1e029436eb32840d56ca815478df3774a30b69552c5f7a4ca18b054a49c8ce342fe7f7ffecfb6c0fb93338bb722d57e4537e1f142ab162bb8208575ee34be SHA512 bb64139c6406e7c87571beb94d435e079368cbb249d96b522dab72a9529b3a825f9258aac70c5a582d58117c700da281fb43ed8369f40a236c0b7e6acb5237b0
+DIST certbot-1.24.0.tar.gz 1360049 BLAKE2B e1c7f4b56ac66b73f74eb8c9d6c31bc12529c2e7a1a51679e715227e61a2e72a30aa5053abe1684be9d665e399ca67f2d11afcc5c60c76bb86d1c0feb68308ca SHA512 fa2a45e650107f48da1e5d7d7469e8a23598e0e0e1127bc62a66ba2351a8fe518da6ec3e53370f7042631ee74e82c65fcc323c71e8f485911363e805ccb6f045
+DIST certbot-1.25.0.tar.gz 1362891 BLAKE2B c109f7777328dcaa2760b524a005f648f8695518a3a052a1d3ff20367f0b704c2a15c912ede091ef6f0f2faf2838caaa74d3bdac6deeb4cc069e6ca16cfb26a7 SHA512 e32cac530d7854cb626aed6d7bac7b4482b7c3634d94fbabd6fa767f9c1268ed3baed0c945362df247e4fc7d51147e5561825850d52c1a8f11b3a1fb2827bd4a
 EBUILD certbot-1.22.0.ebuild 1189 BLAKE2B 48787ae31f36e63f29778acd2065e7415ae8b5d567d91560ebd000efa5d9fa31e4c2011c195587013ffc86c0c0adc2a318c7477330e01f3829b46043b34f7ecf SHA512 88734a7665c33ce553b63fb7473a2687e2e305984fb1eb4288402fc1a7d01b3099d2c081f884d5da2768476ff8b02eeab42be46fe8bb2599e120e8095837a24b
-EBUILD certbot-9999.ebuild 1191 BLAKE2B 05e3e153929cea53c3d909a88469e65b6921db2cc8592a73fc10869cbbe59a542ffc6852fc8c2d93ab059cea9ced7c5a157662b672e846d96d7fda050eb9f149 SHA512 59b254a68ac117cf50c27db041f6ad0f81bd256364bc10d1480ba3c5ec406fcc57896073b4a55e36659b7a6f9a2cadd282c6fcbaa7e6f52aed236707bf6ce5ac
+EBUILD certbot-1.23.0.ebuild 1189 BLAKE2B 48787ae31f36e63f29778acd2065e7415ae8b5d567d91560ebd000efa5d9fa31e4c2011c195587013ffc86c0c0adc2a318c7477330e01f3829b46043b34f7ecf SHA512 88734a7665c33ce553b63fb7473a2687e2e305984fb1eb4288402fc1a7d01b3099d2c081f884d5da2768476ff8b02eeab42be46fe8bb2599e120e8095837a24b
+EBUILD certbot-1.24.0.ebuild 1200 BLAKE2B 27adf3eb297f285391f215a85e256415502022c664a667174bd860a44ec47f1c3a83c52a9b52bdb2196c32a2d9a91a1ac786455e1de65c302937a3a1b072d105 SHA512 f567319654a632dad0fb186e4f182a6261cf2297916171a1f1a405e8fec4c5ef4ec95a3585c0c531953952ef3034e93b19dfeb89f2d949d56ab80eac2d623f5b
+EBUILD certbot-1.25.0.ebuild 1201 BLAKE2B ad7fab99d0f48ee39b4e5a3a730e02b38cac87f88e491afe2a094eafefd2458aa90c7e54f9ee2f892952d872d1f224034efa3497bd31ad74d1e8c03f6c2301ed SHA512 ed209dfe4b42ba1b2a8d839ad40dab0a18a690b0db1e8388f647b3e1b8e67876015f6d34ee0448d1ab5236f4bfb91a907deb00af0fc43fb8e170152bb5831f49
+EBUILD certbot-9999.ebuild 1201 BLAKE2B ad7fab99d0f48ee39b4e5a3a730e02b38cac87f88e491afe2a094eafefd2458aa90c7e54f9ee2f892952d872d1f224034efa3497bd31ad74d1e8c03f6c2301ed SHA512 ed209dfe4b42ba1b2a8d839ad40dab0a18a690b0db1e8388f647b3e1b8e67876015f6d34ee0448d1ab5236f4bfb91a907deb00af0fc43fb8e170152bb5831f49
 MISC metadata.xml 359 BLAKE2B 7f8ac46ecea304579baca80978cc35905720d1950caa183b5b5b297afab8bf6ea328324bacc438e9ecd91176230e42e55deda1c15e1ba73c63b2021ac2842c0f SHA512 a50b1db5a30eac290ac6645fcb30b0d5c4d8e51d83cff284e76358ee4fe7cef9366e40b06f532ba64a2131672972ea10b73541a9bd42cc323c17f6d26f6b0197
diff --git a/app-crypt/certbot/certbot-1.21.0.ebuild b/app-crypt/certbot/certbot-1.23.0.ebuild
index 6ade5ca6e219..08785c973b2a 100644
--- a/app-crypt/certbot/certbot-1.21.0.ebuild
+++ b/app-crypt/certbot/certbot-1.23.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -27,7 +27,7 @@ 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/cryptography-2.5.0[${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}]
diff --git a/app-crypt/certbot/certbot-1.24.0.ebuild b/app-crypt/certbot/certbot-1.24.0.ebuild
new file mode 100644
index 000000000000..c1e5739445d8
--- /dev/null
+++ b/app-crypt/certbot/certbot-1.24.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 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.5.0[${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-2019.3[${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-1.25.0.ebuild b/app-crypt/certbot/certbot-1.25.0.ebuild
new file mode 100644
index 000000000000..0040de76755a
--- /dev/null
+++ b/app-crypt/certbot/certbot-1.25.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 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.5.0[${PYTHON_USEDEP}]
+	>=dev-python/distro-1.0.1[${PYTHON_USEDEP}]
+	>=dev-python/josepy-1.13.0[${PYTHON_USEDEP}]
+	>=dev-python/parsedatetime-2.4[${PYTHON_USEDEP}]
+	dev-python/pyrfc3339[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2019.3[${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 3c75588e8c44..0040de76755a 100644
--- a/app-crypt/certbot/certbot-9999.ebuild
+++ b/app-crypt/certbot/certbot-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -29,10 +29,10 @@ RDEPEND="
 	>=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
 	>=dev-python/cryptography-2.5.0[${PYTHON_USEDEP}]
 	>=dev-python/distro-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/josepy-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/josepy-1.13.0[${PYTHON_USEDEP}]
 	>=dev-python/parsedatetime-2.4[${PYTHON_USEDEP}]
 	dev-python/pyrfc3339[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
 	dev-python/zope-component[${PYTHON_USEDEP}]
 	dev-python/zope-interface[${PYTHON_USEDEP}]"