gentoo auto-resync : 14:11:2023 - 04:26:45

13 files changed, 8 insertions, 240 deletions

diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 5ac70f061c78..ec95a23a3856 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/acme/Manifest b/app-crypt/acme/Manifest
index a1d240cd560f..e1daf1412033 100644
--- a/app-crypt/acme/Manifest
+++ b/app-crypt/acme/Manifest
@@ -1,12 +1,10 @@
 DIST certbot-2.6.0.gh.tar.gz 1336339 BLAKE2B 0c0575ad553ebe0f3ab56da750572bca46b30d034033e43c30c3793c114050ad824a277eab0be5a47326ea099e58e9a421448b53fc1b9173afae9a0ec308ac62 SHA512 d694156886484511f5a38fb5e40f98b2e2dbe4bc5110c95b2084ec03b39cb0eb9bbc623c7bca4a81054e980c8dbac752949042391813298a27be7e70410882e3
-DIST certbot-2.7.0.gh.tar.gz 1336481 BLAKE2B 224f26819ee55b99a26540e7f56a8466c806d08149cce511d28d77ce9f5fb8073ec65e6cfa3e0c168ca84ddcbf85478ff335b84feaadee66db6c5a811be202be SHA512 1e1defcd143f804a36b50e3104d239bf20873545474ceb654269a5879e15cfbb76a18bd569f5e6e12de1036779e72c74d9896707daabc314fc5d67acc1c5180d
 DIST certbot-2.7.1.gh.tar.gz 1336424 BLAKE2B 46351af6c6ec918cdfdcfd44009bc878ea4599f0bafc5c61b6385bdba8ba4f47bc7ef20d11bbfb1fc5fef435336e7c7a3de1c7f302047744fb283779d0366033 SHA512 01b4ca4455408bffddb6d8c49fc97a72692995a9c7e887ef3b4b259e1ebb11f5e3651ebb9a53b0a30c81457b3c49c28b5250493070c2c3cb3caa5ed4f707d149
 DIST certbot-2.7.2.gh.tar.gz 1343827 BLAKE2B 83fade55e9ea348b5a0fb10ab425f1d23ef6f4e8d43e7c762e363230548ede061ace66cbc49212cca1262809bcf046703859b80a93d698b7ffc545ff16f56bf5 SHA512 bb82a6f6f8d4042e598f9b4b583fd3ea3128026f41acbacb9ee932b195522e565eaddf7ae8d6a661cab5e2f15a436e234f36e0388c730844bff40a3f982a45ee
 DIST certbot-2.7.3.gh.tar.gz 1344285 BLAKE2B b32a57c5a13cb1dac474f291eba17c51abe11455455d9831d88c77e0559e9c76b78da2e4dc14165dc892c61b901713687e72657504947ca810c9c139038fe4f0 SHA512 6251f7c3062fcac5b13df94d70c5bcf72e541da4f1dd73a3cc3198fbab050cc3e584fc8ccae9819435896c1d2d2df372ce7465ef571592896afcfee473148f0c
 DIST certbot-2.7.4.gh.tar.gz 1345476 BLAKE2B 9050765a345ab1195edbf6f0194b9442f64d468f34d26a6ec780901850835ce488d235b72d0a4d5079f29b433454b2bd24e1c0b2001e136216734e353f3627d9 SHA512 4363a2b9cc0d80692c26b6e4e82d7b2f1b57145f82603d33591cc6d00f08a920a2f9b963268c9a24211492e570fc8a91a1c64ccbcd4a44068e30590ce0a1d369
 EBUILD acme-2.6.0.ebuild 1506 BLAKE2B eaac3de9e1b624f7ce6ae78429e94b7828dd3075ca8dccb438833fdbf3441b13d4e66c9a7b933691581c8edb87ab2a8971641b67b66b8387b46e52a74dc4b57f SHA512 dfe6e029e7f6c525d366b5399ffa5513ce2fb113cab50892d9b4dea01b74ca867d316f81dec93f93a14fbb902b596f2662358bcf561a69c172ea7094520bbc2e
-EBUILD acme-2.7.0.ebuild 1510 BLAKE2B 90d6f2b5c740938e43199b63deabb24c58482977654f6c2a4eb76493961772a4f296452af46dbb1b9437c823a6916b6d2a5d6a3155793198720b5988604e9239 SHA512 b6324a3f7aae817df99ea8e58d21ba380824126dd810717a0053c4849754b833003d7cf399aefb514d9377accbb823ac81b2c9d0c0a9d095313d701e5ddc3f09
-EBUILD acme-2.7.1.ebuild 1510 BLAKE2B 90d6f2b5c740938e43199b63deabb24c58482977654f6c2a4eb76493961772a4f296452af46dbb1b9437c823a6916b6d2a5d6a3155793198720b5988604e9239 SHA512 b6324a3f7aae817df99ea8e58d21ba380824126dd810717a0053c4849754b833003d7cf399aefb514d9377accbb823ac81b2c9d0c0a9d095313d701e5ddc3f09
+EBUILD acme-2.7.1.ebuild 1506 BLAKE2B eaac3de9e1b624f7ce6ae78429e94b7828dd3075ca8dccb438833fdbf3441b13d4e66c9a7b933691581c8edb87ab2a8971641b67b66b8387b46e52a74dc4b57f SHA512 dfe6e029e7f6c525d366b5399ffa5513ce2fb113cab50892d9b4dea01b74ca867d316f81dec93f93a14fbb902b596f2662358bcf561a69c172ea7094520bbc2e
 EBUILD acme-2.7.2.ebuild 1510 BLAKE2B 90d6f2b5c740938e43199b63deabb24c58482977654f6c2a4eb76493961772a4f296452af46dbb1b9437c823a6916b6d2a5d6a3155793198720b5988604e9239 SHA512 b6324a3f7aae817df99ea8e58d21ba380824126dd810717a0053c4849754b833003d7cf399aefb514d9377accbb823ac81b2c9d0c0a9d095313d701e5ddc3f09
 EBUILD acme-2.7.3.ebuild 1510 BLAKE2B 90d6f2b5c740938e43199b63deabb24c58482977654f6c2a4eb76493961772a4f296452af46dbb1b9437c823a6916b6d2a5d6a3155793198720b5988604e9239 SHA512 b6324a3f7aae817df99ea8e58d21ba380824126dd810717a0053c4849754b833003d7cf399aefb514d9377accbb823ac81b2c9d0c0a9d095313d701e5ddc3f09
 EBUILD acme-2.7.4.ebuild 1510 BLAKE2B 90d6f2b5c740938e43199b63deabb24c58482977654f6c2a4eb76493961772a4f296452af46dbb1b9437c823a6916b6d2a5d6a3155793198720b5988604e9239 SHA512 b6324a3f7aae817df99ea8e58d21ba380824126dd810717a0053c4849754b833003d7cf399aefb514d9377accbb823ac81b2c9d0c0a9d095313d701e5ddc3f09
diff --git a/app-crypt/acme/acme-2.7.0.ebuild b/app-crypt/acme/acme-2.7.0.ebuild
deleted file mode 100644
index 88e179e64295..000000000000
--- a/app-crypt/acme/acme-2.7.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-DISTUTILS_USE_PEP517=setuptools
-
-inherit distutils-r1
-
-PARENT_PN="certbot"
-PARENT_P="${PARENT_PN}-${PV}"
-
-if [[ "${PV}" == *9999 ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
-	EGIT_SUBMODULES=()
-	EGIT_CHECKOUT_DIR="${WORKDIR}/${PARENT_P}"
-else
-	SRC_URI="
-		https://github.com/certbot/certbot/archive/v${PV}.tar.gz
-			-> ${PARENT_P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-fi
-
-DESCRIPTION="An implementation of the ACME protocol"
-HOMEPAGE="
-	https://github.com/certbot/certbot
-	https://letsencrypt.org/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-S="${WORKDIR}/${PARENT_P}/${PN}"
-
-BDEPEND="
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	)
-"
-# The requirement is really 17.5.0 but easier to require latest stable >= 23.1.1
-# to avoid broken 23.1.0.
-RDEPEND="
-	dev-python/chardet[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-3.2.1[${PYTHON_USEDEP}]
-	>=dev-python/josepy-1.13.0[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-23.1.1[${PYTHON_USEDEP}]
-	dev-python/pyrfc3339[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-toolbelt-0.3.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx docs dev-python/sphinx-rtd-theme
-distutils_enable_tests pytest
diff --git a/app-crypt/acme/acme-2.7.1.ebuild b/app-crypt/acme/acme-2.7.1.ebuild
index 88e179e64295..2b88a178379f 100644
--- a/app-crypt/acme/acme-2.7.1.ebuild
+++ b/app-crypt/acme/acme-2.7.1.ebuild
@@ -22,7 +22,7 @@ else
 		https://github.com/certbot/certbot/archive/v${PV}.tar.gz
 			-> ${PARENT_P}.gh.tar.gz
 	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86"
 fi
 
 DESCRIPTION="An implementation of the ACME protocol"
diff --git a/app-crypt/certbot-apache/Manifest b/app-crypt/certbot-apache/Manifest
index 648f60797fb2..2a04f93f9605 100644
--- a/app-crypt/certbot-apache/Manifest
+++ b/app-crypt/certbot-apache/Manifest
@@ -1,12 +1,10 @@
 DIST certbot-2.6.0.gh.tar.gz 1336339 BLAKE2B 0c0575ad553ebe0f3ab56da750572bca46b30d034033e43c30c3793c114050ad824a277eab0be5a47326ea099e58e9a421448b53fc1b9173afae9a0ec308ac62 SHA512 d694156886484511f5a38fb5e40f98b2e2dbe4bc5110c95b2084ec03b39cb0eb9bbc623c7bca4a81054e980c8dbac752949042391813298a27be7e70410882e3
-DIST certbot-2.7.0.gh.tar.gz 1336481 BLAKE2B 224f26819ee55b99a26540e7f56a8466c806d08149cce511d28d77ce9f5fb8073ec65e6cfa3e0c168ca84ddcbf85478ff335b84feaadee66db6c5a811be202be SHA512 1e1defcd143f804a36b50e3104d239bf20873545474ceb654269a5879e15cfbb76a18bd569f5e6e12de1036779e72c74d9896707daabc314fc5d67acc1c5180d
 DIST certbot-2.7.1.gh.tar.gz 1336424 BLAKE2B 46351af6c6ec918cdfdcfd44009bc878ea4599f0bafc5c61b6385bdba8ba4f47bc7ef20d11bbfb1fc5fef435336e7c7a3de1c7f302047744fb283779d0366033 SHA512 01b4ca4455408bffddb6d8c49fc97a72692995a9c7e887ef3b4b259e1ebb11f5e3651ebb9a53b0a30c81457b3c49c28b5250493070c2c3cb3caa5ed4f707d149
 DIST certbot-2.7.2.gh.tar.gz 1343827 BLAKE2B 83fade55e9ea348b5a0fb10ab425f1d23ef6f4e8d43e7c762e363230548ede061ace66cbc49212cca1262809bcf046703859b80a93d698b7ffc545ff16f56bf5 SHA512 bb82a6f6f8d4042e598f9b4b583fd3ea3128026f41acbacb9ee932b195522e565eaddf7ae8d6a661cab5e2f15a436e234f36e0388c730844bff40a3f982a45ee
 DIST certbot-2.7.3.gh.tar.gz 1344285 BLAKE2B b32a57c5a13cb1dac474f291eba17c51abe11455455d9831d88c77e0559e9c76b78da2e4dc14165dc892c61b901713687e72657504947ca810c9c139038fe4f0 SHA512 6251f7c3062fcac5b13df94d70c5bcf72e541da4f1dd73a3cc3198fbab050cc3e584fc8ccae9819435896c1d2d2df372ce7465ef571592896afcfee473148f0c
 DIST certbot-2.7.4.gh.tar.gz 1345476 BLAKE2B 9050765a345ab1195edbf6f0194b9442f64d468f34d26a6ec780901850835ce488d235b72d0a4d5079f29b433454b2bd24e1c0b2001e136216734e353f3627d9 SHA512 4363a2b9cc0d80692c26b6e4e82d7b2f1b57145f82603d33591cc6d00f08a920a2f9b963268c9a24211492e570fc8a91a1c64ccbcd4a44068e30590ce0a1d369
 EBUILD certbot-apache-2.6.0.ebuild 1076 BLAKE2B 08b8fd1aa6726099790797ecc9d8a943aab30e3101b5a6c8a86f10025edcdb2094f63b663d81d83327552e4fd974a2c9c26b2f60fda699f4d131ae8f397dfac4 SHA512 2212ce672ea10a1bc8449f158470feeac543f9a4ea3c1ebcf0c0b4d01d89e17ef3601f1c1ba415fdeb8104b4dab570ca6877c8d99193722047b76bbae3cb848e
-EBUILD certbot-apache-2.7.0.ebuild 1078 BLAKE2B 4c6a746c517a83b34a69b3501317ccf29a341c5c5e02e8a0129992e53c757af939582566694a3c927801bfdc0d8a743a83b81ac76a523a0a7be0bc283eb0e747 SHA512 776da4da5cee6e6840e323aab45f741e16821ed5231f600fe7454016de55c040863bdaa70f5f4f8cb4f88e8d8d5f123d51487268dc15770e4496267990a41992
-EBUILD certbot-apache-2.7.1.ebuild 1078 BLAKE2B 4c6a746c517a83b34a69b3501317ccf29a341c5c5e02e8a0129992e53c757af939582566694a3c927801bfdc0d8a743a83b81ac76a523a0a7be0bc283eb0e747 SHA512 776da4da5cee6e6840e323aab45f741e16821ed5231f600fe7454016de55c040863bdaa70f5f4f8cb4f88e8d8d5f123d51487268dc15770e4496267990a41992
+EBUILD certbot-apache-2.7.1.ebuild 1076 BLAKE2B 08b8fd1aa6726099790797ecc9d8a943aab30e3101b5a6c8a86f10025edcdb2094f63b663d81d83327552e4fd974a2c9c26b2f60fda699f4d131ae8f397dfac4 SHA512 2212ce672ea10a1bc8449f158470feeac543f9a4ea3c1ebcf0c0b4d01d89e17ef3601f1c1ba415fdeb8104b4dab570ca6877c8d99193722047b76bbae3cb848e
 EBUILD certbot-apache-2.7.2.ebuild 1078 BLAKE2B 4c6a746c517a83b34a69b3501317ccf29a341c5c5e02e8a0129992e53c757af939582566694a3c927801bfdc0d8a743a83b81ac76a523a0a7be0bc283eb0e747 SHA512 776da4da5cee6e6840e323aab45f741e16821ed5231f600fe7454016de55c040863bdaa70f5f4f8cb4f88e8d8d5f123d51487268dc15770e4496267990a41992
 EBUILD certbot-apache-2.7.3.ebuild 1078 BLAKE2B 4c6a746c517a83b34a69b3501317ccf29a341c5c5e02e8a0129992e53c757af939582566694a3c927801bfdc0d8a743a83b81ac76a523a0a7be0bc283eb0e747 SHA512 776da4da5cee6e6840e323aab45f741e16821ed5231f600fe7454016de55c040863bdaa70f5f4f8cb4f88e8d8d5f123d51487268dc15770e4496267990a41992
 EBUILD certbot-apache-2.7.4.ebuild 1078 BLAKE2B 4c6a746c517a83b34a69b3501317ccf29a341c5c5e02e8a0129992e53c757af939582566694a3c927801bfdc0d8a743a83b81ac76a523a0a7be0bc283eb0e747 SHA512 776da4da5cee6e6840e323aab45f741e16821ed5231f600fe7454016de55c040863bdaa70f5f4f8cb4f88e8d8d5f123d51487268dc15770e4496267990a41992
diff --git a/app-crypt/certbot-apache/certbot-apache-2.7.0.ebuild b/app-crypt/certbot-apache/certbot-apache-2.7.0.ebuild
deleted file mode 100644
index 4d1707d36f00..000000000000
--- a/app-crypt/certbot-apache/certbot-apache-2.7.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-DISTUTILS_USE_PEP517=setuptools
-
-inherit distutils-r1
-
-PARENT_PN="${PN%-apache}"
-PARENT_P="${PARENT_PN}-${PV}"
-
-if [[ "${PV}" == *9999 ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
-	EGIT_SUBMODULES=()
-	EGIT_CHECKOUT_DIR="${WORKDIR}/${PARENT_P}"
-else
-	SRC_URI="
-		https://github.com/certbot/certbot/archive/v${PV}.tar.gz
-			-> ${PARENT_P}.gh.tar.gz
-	"
-	# Only for amd64, arm64 and x86 because of dev-python/python-augeas
-	KEYWORDS="~amd64 ~arm64 ~x86"
-fi
-
-DESCRIPTION="Apache plugin for Certbot (Let’s Encrypt client)"
-HOMEPAGE="
-	https://github.com/certbot/certbot
-	https://letsencrypt.org/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-S="${WORKDIR}/${PARENT_P}/${PN}"
-
-BDEPEND="
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-
-RDEPEND="
-	>=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
-	>=app-crypt/certbot-${PV}[${PYTHON_USEDEP}]
-	dev-python/python-augeas[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/app-crypt/certbot-apache/certbot-apache-2.7.1.ebuild b/app-crypt/certbot-apache/certbot-apache-2.7.1.ebuild
index 4d1707d36f00..9ed5d0b39780 100644
--- a/app-crypt/certbot-apache/certbot-apache-2.7.1.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-2.7.1.ebuild
@@ -23,7 +23,7 @@ else
 			-> ${PARENT_P}.gh.tar.gz
 	"
 	# Only for amd64, arm64 and x86 because of dev-python/python-augeas
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 fi
 
 DESCRIPTION="Apache plugin for Certbot (Let’s Encrypt client)"
diff --git a/app-crypt/certbot-nginx/Manifest b/app-crypt/certbot-nginx/Manifest
index 169fc52d1b83..10a31275533e 100644
--- a/app-crypt/certbot-nginx/Manifest
+++ b/app-crypt/certbot-nginx/Manifest
@@ -1,12 +1,10 @@
 DIST certbot-2.6.0.gh.tar.gz 1336339 BLAKE2B 0c0575ad553ebe0f3ab56da750572bca46b30d034033e43c30c3793c114050ad824a277eab0be5a47326ea099e58e9a421448b53fc1b9173afae9a0ec308ac62 SHA512 d694156886484511f5a38fb5e40f98b2e2dbe4bc5110c95b2084ec03b39cb0eb9bbc623c7bca4a81054e980c8dbac752949042391813298a27be7e70410882e3
-DIST certbot-2.7.0.gh.tar.gz 1336481 BLAKE2B 224f26819ee55b99a26540e7f56a8466c806d08149cce511d28d77ce9f5fb8073ec65e6cfa3e0c168ca84ddcbf85478ff335b84feaadee66db6c5a811be202be SHA512 1e1defcd143f804a36b50e3104d239bf20873545474ceb654269a5879e15cfbb76a18bd569f5e6e12de1036779e72c74d9896707daabc314fc5d67acc1c5180d
 DIST certbot-2.7.1.gh.tar.gz 1336424 BLAKE2B 46351af6c6ec918cdfdcfd44009bc878ea4599f0bafc5c61b6385bdba8ba4f47bc7ef20d11bbfb1fc5fef435336e7c7a3de1c7f302047744fb283779d0366033 SHA512 01b4ca4455408bffddb6d8c49fc97a72692995a9c7e887ef3b4b259e1ebb11f5e3651ebb9a53b0a30c81457b3c49c28b5250493070c2c3cb3caa5ed4f707d149
 DIST certbot-2.7.2.gh.tar.gz 1343827 BLAKE2B 83fade55e9ea348b5a0fb10ab425f1d23ef6f4e8d43e7c762e363230548ede061ace66cbc49212cca1262809bcf046703859b80a93d698b7ffc545ff16f56bf5 SHA512 bb82a6f6f8d4042e598f9b4b583fd3ea3128026f41acbacb9ee932b195522e565eaddf7ae8d6a661cab5e2f15a436e234f36e0388c730844bff40a3f982a45ee
 DIST certbot-2.7.3.gh.tar.gz 1344285 BLAKE2B b32a57c5a13cb1dac474f291eba17c51abe11455455d9831d88c77e0559e9c76b78da2e4dc14165dc892c61b901713687e72657504947ca810c9c139038fe4f0 SHA512 6251f7c3062fcac5b13df94d70c5bcf72e541da4f1dd73a3cc3198fbab050cc3e584fc8ccae9819435896c1d2d2df372ce7465ef571592896afcfee473148f0c
 DIST certbot-2.7.4.gh.tar.gz 1345476 BLAKE2B 9050765a345ab1195edbf6f0194b9442f64d468f34d26a6ec780901850835ce488d235b72d0a4d5079f29b433454b2bd24e1c0b2001e136216734e353f3627d9 SHA512 4363a2b9cc0d80692c26b6e4e82d7b2f1b57145f82603d33591cc6d00f08a920a2f9b963268c9a24211492e570fc8a91a1c64ccbcd4a44068e30590ce0a1d369
 EBUILD certbot-nginx-2.6.0.ebuild 1184 BLAKE2B 6c732ea779afcb9913a2869f0b8b7f8d8a21c1604f96598b57de17eca68eb89df1b178f6189de3560e5530c501797524f5fc7a567a6b55195c2936e6a9476470 SHA512 0d816b6d331691f1ace1429d937a128d4b49217077c6004a2ac2fcec8ab27157e5ed5d45dc08b908aff8a0327e9952ce79207770278a5b093d4f1636aeae479b
-EBUILD certbot-nginx-2.7.0.ebuild 1186 BLAKE2B 65530ebcce256a39830ef523a31cfc8ee371b7e0331a618d65d8351fa3bc2819bfe5b8941f5a2a10664ddfb66d40fb9e16e9250ed00323ebaf0996893c44a966 SHA512 89c10ba181f1f83e04ad06e05db20dea7bec7b1943fd69d07f5bce8a9544f798272f458c381ca357c7e7e22c62cd2dec6c6972c68938895263bec0041e2cd792
-EBUILD certbot-nginx-2.7.1.ebuild 1186 BLAKE2B 65530ebcce256a39830ef523a31cfc8ee371b7e0331a618d65d8351fa3bc2819bfe5b8941f5a2a10664ddfb66d40fb9e16e9250ed00323ebaf0996893c44a966 SHA512 89c10ba181f1f83e04ad06e05db20dea7bec7b1943fd69d07f5bce8a9544f798272f458c381ca357c7e7e22c62cd2dec6c6972c68938895263bec0041e2cd792
+EBUILD certbot-nginx-2.7.1.ebuild 1182 BLAKE2B dc5689d5bba026b307fbe81ad1073988fda5e0840e571fd2693cd6b2916396ed231b51f6c6a45a8bd90aeb5d08662f35880d31c52688a340061dde20a7bf9aec SHA512 4f6f2f23e2a4e6acd7758fa27a6cb68a1e5528872f4f91e7982b1ec4c4e6fa2cda675992ed113dc31d7ab89a3cc258e236f502202467e73ed6326f3a9166d9db
 EBUILD certbot-nginx-2.7.2.ebuild 1186 BLAKE2B 65530ebcce256a39830ef523a31cfc8ee371b7e0331a618d65d8351fa3bc2819bfe5b8941f5a2a10664ddfb66d40fb9e16e9250ed00323ebaf0996893c44a966 SHA512 89c10ba181f1f83e04ad06e05db20dea7bec7b1943fd69d07f5bce8a9544f798272f458c381ca357c7e7e22c62cd2dec6c6972c68938895263bec0041e2cd792
 EBUILD certbot-nginx-2.7.3.ebuild 1186 BLAKE2B 65530ebcce256a39830ef523a31cfc8ee371b7e0331a618d65d8351fa3bc2819bfe5b8941f5a2a10664ddfb66d40fb9e16e9250ed00323ebaf0996893c44a966 SHA512 89c10ba181f1f83e04ad06e05db20dea7bec7b1943fd69d07f5bce8a9544f798272f458c381ca357c7e7e22c62cd2dec6c6972c68938895263bec0041e2cd792
 EBUILD certbot-nginx-2.7.4.ebuild 1186 BLAKE2B 65530ebcce256a39830ef523a31cfc8ee371b7e0331a618d65d8351fa3bc2819bfe5b8941f5a2a10664ddfb66d40fb9e16e9250ed00323ebaf0996893c44a966 SHA512 89c10ba181f1f83e04ad06e05db20dea7bec7b1943fd69d07f5bce8a9544f798272f458c381ca357c7e7e22c62cd2dec6c6972c68938895263bec0041e2cd792
diff --git a/app-crypt/certbot-nginx/certbot-nginx-2.7.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-2.7.0.ebuild
deleted file mode 100644
index 681a2d89b66e..000000000000
--- a/app-crypt/certbot-nginx/certbot-nginx-2.7.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-DISTUTILS_USE_PEP517=setuptools
-
-inherit distutils-r1
-
-PARENT_PN="${PN%-nginx}"
-PARENT_P="${PARENT_PN}-${PV}"
-
-if [[ "${PV}" == *9999 ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
-	EGIT_SUBMODULES=()
-	EGIT_CHECKOUT_DIR="${WORKDIR}/${PARENT_P}"
-else
-	SRC_URI="
-		https://github.com/certbot/certbot/archive/v${PV}.tar.gz
-			-> ${PARENT_P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-fi
-
-DESCRIPTION="Nginx plugin for Certbot (Let’s Encrypt client)"
-HOMEPAGE="
-	https://github.com/certbot/certbot
-	https://letsencrypt.org/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-S="${WORKDIR}/${PARENT_P}/${PN}"
-
-BDEPEND="
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-
-# The requirement is really 17.5.0 but easier to require latest stable >= 23.1.1
-# to avoid broken 23.1.0.
-RDEPEND="
-	>=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
-	>=app-crypt/certbot-${PV}[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-23.1.1[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.2.1[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/app-crypt/certbot-nginx/certbot-nginx-2.7.1.ebuild b/app-crypt/certbot-nginx/certbot-nginx-2.7.1.ebuild
index 681a2d89b66e..935da5b0db43 100644
--- a/app-crypt/certbot-nginx/certbot-nginx-2.7.1.ebuild
+++ b/app-crypt/certbot-nginx/certbot-nginx-2.7.1.ebuild
@@ -22,7 +22,7 @@ else
 		https://github.com/certbot/certbot/archive/v${PV}.tar.gz
 			-> ${PARENT_P}.gh.tar.gz
 	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86"
 fi
 
 DESCRIPTION="Nginx plugin for Certbot (Let’s Encrypt client)"
diff --git a/app-crypt/certbot/Manifest b/app-crypt/certbot/Manifest
index 5904888ddcf5..6d5fa9800772 100644
--- a/app-crypt/certbot/Manifest
+++ b/app-crypt/certbot/Manifest
@@ -1,12 +1,10 @@
 DIST certbot-2.6.0.gh.tar.gz 1336339 BLAKE2B 0c0575ad553ebe0f3ab56da750572bca46b30d034033e43c30c3793c114050ad824a277eab0be5a47326ea099e58e9a421448b53fc1b9173afae9a0ec308ac62 SHA512 d694156886484511f5a38fb5e40f98b2e2dbe4bc5110c95b2084ec03b39cb0eb9bbc623c7bca4a81054e980c8dbac752949042391813298a27be7e70410882e3
-DIST certbot-2.7.0.gh.tar.gz 1336481 BLAKE2B 224f26819ee55b99a26540e7f56a8466c806d08149cce511d28d77ce9f5fb8073ec65e6cfa3e0c168ca84ddcbf85478ff335b84feaadee66db6c5a811be202be SHA512 1e1defcd143f804a36b50e3104d239bf20873545474ceb654269a5879e15cfbb76a18bd569f5e6e12de1036779e72c74d9896707daabc314fc5d67acc1c5180d
 DIST certbot-2.7.1.gh.tar.gz 1336424 BLAKE2B 46351af6c6ec918cdfdcfd44009bc878ea4599f0bafc5c61b6385bdba8ba4f47bc7ef20d11bbfb1fc5fef435336e7c7a3de1c7f302047744fb283779d0366033 SHA512 01b4ca4455408bffddb6d8c49fc97a72692995a9c7e887ef3b4b259e1ebb11f5e3651ebb9a53b0a30c81457b3c49c28b5250493070c2c3cb3caa5ed4f707d149
 DIST certbot-2.7.2.gh.tar.gz 1343827 BLAKE2B 83fade55e9ea348b5a0fb10ab425f1d23ef6f4e8d43e7c762e363230548ede061ace66cbc49212cca1262809bcf046703859b80a93d698b7ffc545ff16f56bf5 SHA512 bb82a6f6f8d4042e598f9b4b583fd3ea3128026f41acbacb9ee932b195522e565eaddf7ae8d6a661cab5e2f15a436e234f36e0388c730844bff40a3f982a45ee
 DIST certbot-2.7.3.gh.tar.gz 1344285 BLAKE2B b32a57c5a13cb1dac474f291eba17c51abe11455455d9831d88c77e0559e9c76b78da2e4dc14165dc892c61b901713687e72657504947ca810c9c139038fe4f0 SHA512 6251f7c3062fcac5b13df94d70c5bcf72e541da4f1dd73a3cc3198fbab050cc3e584fc8ccae9819435896c1d2d2df372ce7465ef571592896afcfee473148f0c
 DIST certbot-2.7.4.gh.tar.gz 1345476 BLAKE2B 9050765a345ab1195edbf6f0194b9442f64d468f34d26a6ec780901850835ce488d235b72d0a4d5079f29b433454b2bd24e1c0b2001e136216734e353f3627d9 SHA512 4363a2b9cc0d80692c26b6e4e82d7b2f1b57145f82603d33591cc6d00f08a920a2f9b963268c9a24211492e570fc8a91a1c64ccbcd4a44068e30590ce0a1d369
 EBUILD certbot-2.6.0.ebuild 1542 BLAKE2B 10c66c7271531f24633aac1c6449255f2d69c3326de897419ed47aad915856b6ab032e6411b606d8f3494553e7d5218e13f23a2dc9dbdaed0299bd6d6373cf12 SHA512 ce9805f2b4e3fb87d5786a82ff00f59c57380acaf3ff71a69ceec2b158915297075d7028ecd10b5659c16c924ca4b283b8d7703440728c637e9b6591963a17e4
-EBUILD certbot-2.7.0.ebuild 1546 BLAKE2B babd7b37f08f1bec100a6c677e7c2b91c8f93b8c60407991fb2bc582ce98079168412dc64ae137d0298b61ad360d4aef9b6720ec1ff120bf2c6f08f17138a6d3 SHA512 20d19fb38e4feb7999bf5d393b89596e8654d728f0027328ad6382e1bf12275034fc6cacca0732468ddba6dcec2d40a335d253b05f8302e438dd4c3c5638aca7
-EBUILD certbot-2.7.1.ebuild 1546 BLAKE2B babd7b37f08f1bec100a6c677e7c2b91c8f93b8c60407991fb2bc582ce98079168412dc64ae137d0298b61ad360d4aef9b6720ec1ff120bf2c6f08f17138a6d3 SHA512 20d19fb38e4feb7999bf5d393b89596e8654d728f0027328ad6382e1bf12275034fc6cacca0732468ddba6dcec2d40a335d253b05f8302e438dd4c3c5638aca7
+EBUILD certbot-2.7.1.ebuild 1542 BLAKE2B bb6810355472126dfaa23bdbb027204cf60602f58a4454dd235b7dec946615cf327a29174d5b47627ad8e6b1808e3bf9ca8a91a43b1ce7ae06a1c686a506090f SHA512 ef3c4c718cb7672b12c4d7c525986b6fdf7ee47a919c61b8f6e4e96253f08ed4e8f5be216e4d084c95a314980f6dcc75ed861ba7d179ef38832e9e92456300a3
 EBUILD certbot-2.7.2.ebuild 1546 BLAKE2B babd7b37f08f1bec100a6c677e7c2b91c8f93b8c60407991fb2bc582ce98079168412dc64ae137d0298b61ad360d4aef9b6720ec1ff120bf2c6f08f17138a6d3 SHA512 20d19fb38e4feb7999bf5d393b89596e8654d728f0027328ad6382e1bf12275034fc6cacca0732468ddba6dcec2d40a335d253b05f8302e438dd4c3c5638aca7
 EBUILD certbot-2.7.3.ebuild 1546 BLAKE2B babd7b37f08f1bec100a6c677e7c2b91c8f93b8c60407991fb2bc582ce98079168412dc64ae137d0298b61ad360d4aef9b6720ec1ff120bf2c6f08f17138a6d3 SHA512 20d19fb38e4feb7999bf5d393b89596e8654d728f0027328ad6382e1bf12275034fc6cacca0732468ddba6dcec2d40a335d253b05f8302e438dd4c3c5638aca7
 EBUILD certbot-2.7.4.ebuild 1546 BLAKE2B babd7b37f08f1bec100a6c677e7c2b91c8f93b8c60407991fb2bc582ce98079168412dc64ae137d0298b61ad360d4aef9b6720ec1ff120bf2c6f08f17138a6d3 SHA512 20d19fb38e4feb7999bf5d393b89596e8654d728f0027328ad6382e1bf12275034fc6cacca0732468ddba6dcec2d40a335d253b05f8302e438dd4c3c5638aca7
diff --git a/app-crypt/certbot/certbot-2.7.0.ebuild b/app-crypt/certbot/certbot-2.7.0.ebuild
deleted file mode 100644
index 28d628bba116..000000000000
--- a/app-crypt/certbot/certbot-2.7.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-DISTUTILS_USE_PEP517=setuptools
-
-inherit distutils-r1
-
-if [[ "${PV}" == *9999 ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
-	EGIT_SUBMODULES=()
-	EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
-else
-	SRC_URI="
-		https://github.com/certbot/certbot/archive/v${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-fi
-
-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"
-
-IUSE="selinux"
-
-S="${WORKDIR}/${P}/${PN}"
-
-BDEPEND="
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-cov[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	)
-"
-
-# See certbot/setup.py for acme >= dep
-RDEPEND="
-	>=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
-	>=dev-python/ConfigArgParse-1.5.3[${PYTHON_USEDEP}]
-	>=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-3.2.1[${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}]
-	selinux? ( sec-policy/selinux-certbot )
-"
-
-distutils_enable_sphinx docs dev-python/sphinx-rtd-theme
-distutils_enable_tests pytest
diff --git a/app-crypt/certbot/certbot-2.7.1.ebuild b/app-crypt/certbot/certbot-2.7.1.ebuild
index 28d628bba116..c710cf3ea540 100644
--- a/app-crypt/certbot/certbot-2.7.1.ebuild
+++ b/app-crypt/certbot/certbot-2.7.1.ebuild
@@ -19,7 +19,7 @@ else
 		https://github.com/certbot/certbot/archive/v${PV}.tar.gz
 			-> ${P}.gh.tar.gz
 	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86"
 fi
 
 DESCRIPTION="Let’s Encrypt client to automate deployment of X.509 certificates"