gentoo auto-resync : 09:04:2023 - 05:33:50

15 files changed, 8 insertions, 323 deletions

diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 937ab3abe858..73589a46b1a5 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/acme/Manifest b/app-crypt/acme/Manifest
index 25909de96f07..823e70a0e7ef 100644
--- a/app-crypt/acme/Manifest
+++ b/app-crypt/acme/Manifest
@@ -1,12 +1,8 @@
-DIST certbot-2.2.0.gh.tar.gz 1331053 BLAKE2B 4a3e6d8b0b3b7f8537bd6b24234bad7657842ee64865bcef2701e572501640b7a2d49cf4dc62db25cda1039be2d20fb77ac6415cdcb4756fce0f96b5cb7410c6 SHA512 242bfa8e5b60c28b49457403b41421ef782b9f98f325cc423b58283fef410b33691c3ce126188b191c80fcd488fe5d51acfc5ca575c8e7c5b6b08198844bffb7
-DIST certbot-2.2.0.tar.gz 1331053 BLAKE2B 4a3e6d8b0b3b7f8537bd6b24234bad7657842ee64865bcef2701e572501640b7a2d49cf4dc62db25cda1039be2d20fb77ac6415cdcb4756fce0f96b5cb7410c6 SHA512 242bfa8e5b60c28b49457403b41421ef782b9f98f325cc423b58283fef410b33691c3ce126188b191c80fcd488fe5d51acfc5ca575c8e7c5b6b08198844bffb7
 DIST certbot-2.3.0.gh.tar.gz 1335613 BLAKE2B af8ff393f92755e8e312f7596fe99abefa35c42cef6fa6688f7f3dd4a310205385fec81366df30d8edfe28d8abd3db447c9e1a3770fe31c3d45c69f04a038660 SHA512 5f52d9b0dd390fc696389a94ff897d803ee062feca50bb66972e197dcd79b0096b337cece2798557c3878903577171fd9afe1f18a4a2131ad7e6a62d0d945ebb
 DIST certbot-2.4.0.gh.tar.gz 1333159 BLAKE2B 534c7d090cc8a2b77b2dd8bd8c407409260c18e7741223a327bb240dac9685b1ca152d4a20bb0ec46d8717f89bd3de6f494019c57afe22a74db69641a3ed209e SHA512 c307c97154935a3a01b468d6e91505caba6073b4c01071c87382bdc08c892094d95d75b047047d3221b7d8018a61ce974c0f4defbfdee00b136af920fd579108
 DIST certbot-2.5.0.gh.tar.gz 1333903 BLAKE2B 2d30764616d2253fe320ad94182e64cc3e1ce75bd90322fcf7c303a52e32420a57cf84a3acf3f8f4825e058d6fe1e59438b728dacdf9032c4d8797312903825e SHA512 92313e352409d543f260fedee3f376c4750d9428cd39fde3518b162091667173ba6d582b4e91477f7122cf198f24119ecf34b2dce12734afbfc0ebedc395a49e
-EBUILD acme-2.2.0-r1.ebuild 1404 BLAKE2B 84c2396d7abc854ab81ad63158e61063e718615887dd2b5e9952dd1c4f233c9ea8ee05753ae2c9287f6374afa06f8a69bd2784ea5ef2c7acf322e696723212b3 SHA512 12addf2938ec2473276b0b307e0acef15876fd50e51dc746913b287a65fa24d50c4d869a020482a86672725cb268618ef8671b5ecfcbacfc9aec0346da31132a
-EBUILD acme-2.2.0.ebuild 1140 BLAKE2B 4f646f46a985e09549e659f696b781eb69e2b2773bdddbcc3a7f1f71ea4e2b77b56ef1df933ced67bc351208066d4695351fb8ffc19cc8f6333b96fdfeacd5e0 SHA512 da095bc1131b61c20638116953cd267bb63c47cc321039cde25cd69ef7c9090009a2f0f236029c4871bb7112f0db02bf5645516f5f812accb5498b53fe2b757c
 EBUILD acme-2.3.0.ebuild 1402 BLAKE2B df9665a34c0beed33d54b66ed5ad93c15d6a1b50ac1cde5bd1a6a5059f4b87365d2bf73689eaece592710dec958c5c187faad469d4c1f1200a3a16f3c1b8f069 SHA512 e0a80e909447e049c98f465214a3b0a15fe1ac1ba8067b3bc57f91a7e1d70a5988d448c7d7284df470423de141dac3b291e3e9d751d8c6fba78b792058584f77
-EBUILD acme-2.4.0.ebuild 1404 BLAKE2B 84c2396d7abc854ab81ad63158e61063e718615887dd2b5e9952dd1c4f233c9ea8ee05753ae2c9287f6374afa06f8a69bd2784ea5ef2c7acf322e696723212b3 SHA512 12addf2938ec2473276b0b307e0acef15876fd50e51dc746913b287a65fa24d50c4d869a020482a86672725cb268618ef8671b5ecfcbacfc9aec0346da31132a
+EBUILD acme-2.4.0.ebuild 1402 BLAKE2B df9665a34c0beed33d54b66ed5ad93c15d6a1b50ac1cde5bd1a6a5059f4b87365d2bf73689eaece592710dec958c5c187faad469d4c1f1200a3a16f3c1b8f069 SHA512 e0a80e909447e049c98f465214a3b0a15fe1ac1ba8067b3bc57f91a7e1d70a5988d448c7d7284df470423de141dac3b291e3e9d751d8c6fba78b792058584f77
 EBUILD acme-2.5.0.ebuild 1453 BLAKE2B cdf87ca4055d908b047890eb96ae60359618ebd8ae106651036d26dbe3119ba04bdc090c9b93ed9bf5080fec7df367ca3846074f23841d9b1746467f906e61b0 SHA512 c208d7ea9f91d5f0f400bbc9313089a16b1b79c12874f58b506df7eb40f7a3498e981fa10715d04c0af7a33bd23b1bbc55ff8ae03a94e917d04c358548d9a2ef
 EBUILD acme-9999.ebuild 1453 BLAKE2B cdf87ca4055d908b047890eb96ae60359618ebd8ae106651036d26dbe3119ba04bdc090c9b93ed9bf5080fec7df367ca3846074f23841d9b1746467f906e61b0 SHA512 c208d7ea9f91d5f0f400bbc9313089a16b1b79c12874f58b506df7eb40f7a3498e981fa10715d04c0af7a33bd23b1bbc55ff8ae03a94e917d04c358548d9a2ef
 MISC metadata.xml 401 BLAKE2B 30a2ac1f03749a8e3bb98723c57f47ab6bcf7bfa58c2b6e21c309fae279feca0d3612df6c2a1dafaf27b4f0781c583a140322feac1a1cf2c13e50861cad129ea SHA512 d8e725b71ca81ce4ca6565ed58271b283c25394448f0f48f726f232122577c33d5b2d726e117419b2fae99f9dae29a8080bb9564eccbca13368c83988cf3da01
diff --git a/app-crypt/acme/acme-2.2.0-r1.ebuild b/app-crypt/acme/acme-2.2.0-r1.ebuild
deleted file mode 100644
index 75bfed79eb0c..000000000000
--- a/app-crypt/acme/acme-2.2.0-r1.ebuild
+++ /dev/null
@@ -1,59 +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}]
-	)
-"
-
-RDEPEND="
-	dev-python/chardet[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.5.0[${PYTHON_USEDEP}]
-	>=dev-python/josepy-1.13.0[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-17.5.0[${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.2.0.ebuild b/app-crypt/acme/acme-2.2.0.ebuild
deleted file mode 100644
index b73b5d16b584..000000000000
--- a/app-crypt/acme/acme-2.2.0.ebuild
+++ /dev/null
@@ -1,39 +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_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-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 ~riscv x86"
-	S=${WORKDIR}/certbot-${PV}/acme
-fi
-
-DESCRIPTION="An implementation of the ACME protocol"
-HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-RDEPEND="
-	dev-python/chardet[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.5.0[${PYTHON_USEDEP}]
-	>=dev-python/josepy-1.13.0[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-17.5.0[${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.4.0.ebuild b/app-crypt/acme/acme-2.4.0.ebuild
index 75bfed79eb0c..cfc99164db52 100644
--- a/app-crypt/acme/acme-2.4.0.ebuild
+++ b/app-crypt/acme/acme-2.4.0.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 0e9a543d8f51..b04a3d1b666f 100644
--- a/app-crypt/certbot-apache/Manifest
+++ b/app-crypt/certbot-apache/Manifest
@@ -1,10 +1,8 @@
-DIST certbot-2.2.0.gh.tar.gz 1331053 BLAKE2B 4a3e6d8b0b3b7f8537bd6b24234bad7657842ee64865bcef2701e572501640b7a2d49cf4dc62db25cda1039be2d20fb77ac6415cdcb4756fce0f96b5cb7410c6 SHA512 242bfa8e5b60c28b49457403b41421ef782b9f98f325cc423b58283fef410b33691c3ce126188b191c80fcd488fe5d51acfc5ca575c8e7c5b6b08198844bffb7
 DIST certbot-2.3.0.gh.tar.gz 1335613 BLAKE2B af8ff393f92755e8e312f7596fe99abefa35c42cef6fa6688f7f3dd4a310205385fec81366df30d8edfe28d8abd3db447c9e1a3770fe31c3d45c69f04a038660 SHA512 5f52d9b0dd390fc696389a94ff897d803ee062feca50bb66972e197dcd79b0096b337cece2798557c3878903577171fd9afe1f18a4a2131ad7e6a62d0d945ebb
 DIST certbot-2.4.0.gh.tar.gz 1333159 BLAKE2B 534c7d090cc8a2b77b2dd8bd8c407409260c18e7741223a327bb240dac9685b1ca152d4a20bb0ec46d8717f89bd3de6f494019c57afe22a74db69641a3ed209e SHA512 c307c97154935a3a01b468d6e91505caba6073b4c01071c87382bdc08c892094d95d75b047047d3221b7d8018a61ce974c0f4defbfdee00b136af920fd579108
 DIST certbot-2.5.0.gh.tar.gz 1333903 BLAKE2B 2d30764616d2253fe320ad94182e64cc3e1ce75bd90322fcf7c303a52e32420a57cf84a3acf3f8f4825e058d6fe1e59438b728dacdf9032c4d8797312903825e SHA512 92313e352409d543f260fedee3f376c4750d9428cd39fde3518b162091667173ba6d582b4e91477f7122cf198f24119ecf34b2dce12734afbfc0ebedc395a49e
-EBUILD certbot-apache-2.2.0.ebuild 1076 BLAKE2B 08b8fd1aa6726099790797ecc9d8a943aab30e3101b5a6c8a86f10025edcdb2094f63b663d81d83327552e4fd974a2c9c26b2f60fda699f4d131ae8f397dfac4 SHA512 2212ce672ea10a1bc8449f158470feeac543f9a4ea3c1ebcf0c0b4d01d89e17ef3601f1c1ba415fdeb8104b4dab570ca6877c8d99193722047b76bbae3cb848e
 EBUILD certbot-apache-2.3.0.ebuild 1076 BLAKE2B 08b8fd1aa6726099790797ecc9d8a943aab30e3101b5a6c8a86f10025edcdb2094f63b663d81d83327552e4fd974a2c9c26b2f60fda699f4d131ae8f397dfac4 SHA512 2212ce672ea10a1bc8449f158470feeac543f9a4ea3c1ebcf0c0b4d01d89e17ef3601f1c1ba415fdeb8104b4dab570ca6877c8d99193722047b76bbae3cb848e
-EBUILD certbot-apache-2.4.0.ebuild 1078 BLAKE2B 4c6a746c517a83b34a69b3501317ccf29a341c5c5e02e8a0129992e53c757af939582566694a3c927801bfdc0d8a743a83b81ac76a523a0a7be0bc283eb0e747 SHA512 776da4da5cee6e6840e323aab45f741e16821ed5231f600fe7454016de55c040863bdaa70f5f4f8cb4f88e8d8d5f123d51487268dc15770e4496267990a41992
+EBUILD certbot-apache-2.4.0.ebuild 1076 BLAKE2B 08b8fd1aa6726099790797ecc9d8a943aab30e3101b5a6c8a86f10025edcdb2094f63b663d81d83327552e4fd974a2c9c26b2f60fda699f4d131ae8f397dfac4 SHA512 2212ce672ea10a1bc8449f158470feeac543f9a4ea3c1ebcf0c0b4d01d89e17ef3601f1c1ba415fdeb8104b4dab570ca6877c8d99193722047b76bbae3cb848e
 EBUILD certbot-apache-2.5.0.ebuild 1078 BLAKE2B 4c6a746c517a83b34a69b3501317ccf29a341c5c5e02e8a0129992e53c757af939582566694a3c927801bfdc0d8a743a83b81ac76a523a0a7be0bc283eb0e747 SHA512 776da4da5cee6e6840e323aab45f741e16821ed5231f600fe7454016de55c040863bdaa70f5f4f8cb4f88e8d8d5f123d51487268dc15770e4496267990a41992
 EBUILD certbot-apache-9999.ebuild 1078 BLAKE2B 4c6a746c517a83b34a69b3501317ccf29a341c5c5e02e8a0129992e53c757af939582566694a3c927801bfdc0d8a743a83b81ac76a523a0a7be0bc283eb0e747 SHA512 776da4da5cee6e6840e323aab45f741e16821ed5231f600fe7454016de55c040863bdaa70f5f4f8cb4f88e8d8d5f123d51487268dc15770e4496267990a41992
 MISC metadata.xml 359 BLAKE2B 7f8ac46ecea304579baca80978cc35905720d1950caa183b5b5b297afab8bf6ea328324bacc438e9ecd91176230e42e55deda1c15e1ba73c63b2021ac2842c0f SHA512 a50b1db5a30eac290ac6645fcb30b0d5c4d8e51d83cff284e76358ee4fe7cef9366e40b06f532ba64a2131672972ea10b73541a9bd42cc323c17f6d26f6b0197
diff --git a/app-crypt/certbot-apache/certbot-apache-2.2.0.ebuild b/app-crypt/certbot-apache/certbot-apache-2.2.0.ebuild
deleted file mode 100644
index 9ed5d0b39780..000000000000
--- a/app-crypt/certbot-apache/certbot-apache-2.2.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.4.0.ebuild b/app-crypt/certbot-apache/certbot-apache-2.4.0.ebuild
index 4d1707d36f00..9ed5d0b39780 100644
--- a/app-crypt/certbot-apache/certbot-apache-2.4.0.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-2.4.0.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 6005953abd3a..1712ea28037f 100644
--- a/app-crypt/certbot-nginx/Manifest
+++ b/app-crypt/certbot-nginx/Manifest
@@ -1,10 +1,8 @@
-DIST certbot-2.2.0.gh.tar.gz 1331053 BLAKE2B 4a3e6d8b0b3b7f8537bd6b24234bad7657842ee64865bcef2701e572501640b7a2d49cf4dc62db25cda1039be2d20fb77ac6415cdcb4756fce0f96b5cb7410c6 SHA512 242bfa8e5b60c28b49457403b41421ef782b9f98f325cc423b58283fef410b33691c3ce126188b191c80fcd488fe5d51acfc5ca575c8e7c5b6b08198844bffb7
 DIST certbot-2.3.0.gh.tar.gz 1335613 BLAKE2B af8ff393f92755e8e312f7596fe99abefa35c42cef6fa6688f7f3dd4a310205385fec81366df30d8edfe28d8abd3db447c9e1a3770fe31c3d45c69f04a038660 SHA512 5f52d9b0dd390fc696389a94ff897d803ee062feca50bb66972e197dcd79b0096b337cece2798557c3878903577171fd9afe1f18a4a2131ad7e6a62d0d945ebb
 DIST certbot-2.4.0.gh.tar.gz 1333159 BLAKE2B 534c7d090cc8a2b77b2dd8bd8c407409260c18e7741223a327bb240dac9685b1ca152d4a20bb0ec46d8717f89bd3de6f494019c57afe22a74db69641a3ed209e SHA512 c307c97154935a3a01b468d6e91505caba6073b4c01071c87382bdc08c892094d95d75b047047d3221b7d8018a61ce974c0f4defbfdee00b136af920fd579108
 DIST certbot-2.5.0.gh.tar.gz 1333903 BLAKE2B 2d30764616d2253fe320ad94182e64cc3e1ce75bd90322fcf7c303a52e32420a57cf84a3acf3f8f4825e058d6fe1e59438b728dacdf9032c4d8797312903825e SHA512 92313e352409d543f260fedee3f376c4750d9428cd39fde3518b162091667173ba6d582b4e91477f7122cf198f24119ecf34b2dce12734afbfc0ebedc395a49e
-EBUILD certbot-nginx-2.2.0.ebuild 1077 BLAKE2B 22426848b8b3955a3677cc8e48cc306f9bfa3eb99d81eb716405a7b46388a8e9690bab0c74effd84172d8655984faabba243c81e6a6f5beff301215601ac202b SHA512 3b22d32fb112ad6b968f2ab781765d1cb3c188b4e10369af6a630c843810ced7abf32fb834db3852fbc19b69e8d358bce6fee9632672748a5800f99aaa851f4c
 EBUILD certbot-nginx-2.3.0.ebuild 1077 BLAKE2B 22426848b8b3955a3677cc8e48cc306f9bfa3eb99d81eb716405a7b46388a8e9690bab0c74effd84172d8655984faabba243c81e6a6f5beff301215601ac202b SHA512 3b22d32fb112ad6b968f2ab781765d1cb3c188b4e10369af6a630c843810ced7abf32fb834db3852fbc19b69e8d358bce6fee9632672748a5800f99aaa851f4c
-EBUILD certbot-nginx-2.4.0.ebuild 1079 BLAKE2B 25f25630c9d658a0bc7cb6dabc1242e80c8d0eaeb17d878709193bcf1960a9c60684fb75f47a4e4dea4a67d862450761fa3e0d1101d88cb2d0ba46d3ed34b78a SHA512 47e43d89b84cf7b73c75df5ae02bc580effc1246556ce86fc2b9683f9ef871da8ca8f0620da19d39a87c71fec75e102e8924a005957c5ecf683404082d80a227
+EBUILD certbot-nginx-2.4.0.ebuild 1077 BLAKE2B 22426848b8b3955a3677cc8e48cc306f9bfa3eb99d81eb716405a7b46388a8e9690bab0c74effd84172d8655984faabba243c81e6a6f5beff301215601ac202b SHA512 3b22d32fb112ad6b968f2ab781765d1cb3c188b4e10369af6a630c843810ced7abf32fb834db3852fbc19b69e8d358bce6fee9632672748a5800f99aaa851f4c
 EBUILD certbot-nginx-2.5.0.ebuild 1128 BLAKE2B 9eec9cb9b5e983706df0d88de13bf7dc6dd95d769bee60961174774498c430a2b33d5876ecb18fdecf72453d4e5031cbf1e1ccbfed342eb4acd9da2251b990cc SHA512 8778319d27591058ecb5251631f0988426c498388b41705a1ea08d52bbdb14ca333706091a4786d17f4ea460bf5477ad4caaabdc3a8207974a6253ae2af3a5c9
 EBUILD certbot-nginx-9999.ebuild 1128 BLAKE2B 9eec9cb9b5e983706df0d88de13bf7dc6dd95d769bee60961174774498c430a2b33d5876ecb18fdecf72453d4e5031cbf1e1ccbfed342eb4acd9da2251b990cc SHA512 8778319d27591058ecb5251631f0988426c498388b41705a1ea08d52bbdb14ca333706091a4786d17f4ea460bf5477ad4caaabdc3a8207974a6253ae2af3a5c9
 MISC metadata.xml 335 BLAKE2B 048854ec6bc919f9bf9b0bc74e7c291841cbfea0e571f43437937c5dd78cc65f9df53463adcf313441e01323491709b462bd9bc364876eb1508a83b3426b6b78 SHA512 25ac45574a568e362c419dfbeade4a977afa2885e7b32fb4c3d4c765450b09aa98cf419df1a39ab194518ad6f2b582e162d4dd4eec14f278635d63bf66352523
diff --git a/app-crypt/certbot-nginx/certbot-nginx-2.2.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-2.2.0.ebuild
deleted file mode 100644
index 1e54d1c37e54..000000000000
--- a/app-crypt/certbot-nginx/certbot-nginx-2.2.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%-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}] )
-"
-
-RDEPEND="
-	>=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
-	>=app-crypt/certbot-${PV}[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-17.5.0[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.2.1[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/app-crypt/certbot-nginx/certbot-nginx-2.4.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-2.4.0.ebuild
index 8d6ad2deaa37..1e54d1c37e54 100644
--- a/app-crypt/certbot-nginx/certbot-nginx-2.4.0.ebuild
+++ b/app-crypt/certbot-nginx/certbot-nginx-2.4.0.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 632c8504626e..1593ec343f5a 100644
--- a/app-crypt/certbot/Manifest
+++ b/app-crypt/certbot/Manifest
@@ -1,12 +1,8 @@
-DIST certbot-2.2.0.gh.tar.gz 1331053 BLAKE2B 4a3e6d8b0b3b7f8537bd6b24234bad7657842ee64865bcef2701e572501640b7a2d49cf4dc62db25cda1039be2d20fb77ac6415cdcb4756fce0f96b5cb7410c6 SHA512 242bfa8e5b60c28b49457403b41421ef782b9f98f325cc423b58283fef410b33691c3ce126188b191c80fcd488fe5d51acfc5ca575c8e7c5b6b08198844bffb7
-DIST certbot-2.2.0.tar.gz 1331053 BLAKE2B 4a3e6d8b0b3b7f8537bd6b24234bad7657842ee64865bcef2701e572501640b7a2d49cf4dc62db25cda1039be2d20fb77ac6415cdcb4756fce0f96b5cb7410c6 SHA512 242bfa8e5b60c28b49457403b41421ef782b9f98f325cc423b58283fef410b33691c3ce126188b191c80fcd488fe5d51acfc5ca575c8e7c5b6b08198844bffb7
 DIST certbot-2.3.0.gh.tar.gz 1335613 BLAKE2B af8ff393f92755e8e312f7596fe99abefa35c42cef6fa6688f7f3dd4a310205385fec81366df30d8edfe28d8abd3db447c9e1a3770fe31c3d45c69f04a038660 SHA512 5f52d9b0dd390fc696389a94ff897d803ee062feca50bb66972e197dcd79b0096b337cece2798557c3878903577171fd9afe1f18a4a2131ad7e6a62d0d945ebb
 DIST certbot-2.4.0.gh.tar.gz 1333159 BLAKE2B 534c7d090cc8a2b77b2dd8bd8c407409260c18e7741223a327bb240dac9685b1ca152d4a20bb0ec46d8717f89bd3de6f494019c57afe22a74db69641a3ed209e SHA512 c307c97154935a3a01b468d6e91505caba6073b4c01071c87382bdc08c892094d95d75b047047d3221b7d8018a61ce974c0f4defbfdee00b136af920fd579108
 DIST certbot-2.5.0.gh.tar.gz 1333903 BLAKE2B 2d30764616d2253fe320ad94182e64cc3e1ce75bd90322fcf7c303a52e32420a57cf84a3acf3f8f4825e058d6fe1e59438b728dacdf9032c4d8797312903825e SHA512 92313e352409d543f260fedee3f376c4750d9428cd39fde3518b162091667173ba6d582b4e91477f7122cf198f24119ecf34b2dce12734afbfc0ebedc395a49e
-EBUILD certbot-2.2.0-r1.ebuild 1295 BLAKE2B 49f0a54230986180a3a2e321a2ae3a561de3a5df005a8de32bfdeb45a5d9c9b11d9b32bcb08111cff06e921b60022a979d335d0677809e01f7765b9a848078db SHA512 b533a875ec16a7e5a19ed1742c241491eefce0f796192ca142464a396da57334006e34721128fecfd4217d8b92da2e5b86c4ed8f16078151903b240922c86e83
-EBUILD certbot-2.2.0-r2.ebuild 1546 BLAKE2B b26f23c78d58387d48f22151be2a06a3fb746c061b6860fbc65c23edc9a348afa1e20adcec4570041a517c8d0ec51bdee833e8214ab8183b137920eb66355e6c SHA512 e208f49c909a75bf1cbecf9c8d8c987cdef255252d39e6a03a1c801b0a5939cbf819ef1424ddfa75acc5b91c9477351bd74d80956cb7277d88b4a7ad22fb34a8
 EBUILD certbot-2.3.0.ebuild 1544 BLAKE2B 357fd5071206f2539f877d837be882ac408fde5a1b06457f589db424ab68ce806202316c93236b3744d483d66e98d2f740928c1039e09259988b30b19a147192 SHA512 fece2d5096f13efe19065d298eb3a61a7f5c47caa1507e4817fcb6d78b2fc65ca75bcc6b927c40544dde0a5e6b3fa939decf110d68ebc4ae6a409fef8918d275
-EBUILD certbot-2.4.0.ebuild 1546 BLAKE2B b26f23c78d58387d48f22151be2a06a3fb746c061b6860fbc65c23edc9a348afa1e20adcec4570041a517c8d0ec51bdee833e8214ab8183b137920eb66355e6c SHA512 e208f49c909a75bf1cbecf9c8d8c987cdef255252d39e6a03a1c801b0a5939cbf819ef1424ddfa75acc5b91c9477351bd74d80956cb7277d88b4a7ad22fb34a8
+EBUILD certbot-2.4.0.ebuild 1544 BLAKE2B 357fd5071206f2539f877d837be882ac408fde5a1b06457f589db424ab68ce806202316c93236b3744d483d66e98d2f740928c1039e09259988b30b19a147192 SHA512 fece2d5096f13efe19065d298eb3a61a7f5c47caa1507e4817fcb6d78b2fc65ca75bcc6b927c40544dde0a5e6b3fa939decf110d68ebc4ae6a409fef8918d275
 EBUILD certbot-2.5.0.ebuild 1546 BLAKE2B b26f23c78d58387d48f22151be2a06a3fb746c061b6860fbc65c23edc9a348afa1e20adcec4570041a517c8d0ec51bdee833e8214ab8183b137920eb66355e6c SHA512 e208f49c909a75bf1cbecf9c8d8c987cdef255252d39e6a03a1c801b0a5939cbf819ef1424ddfa75acc5b91c9477351bd74d80956cb7277d88b4a7ad22fb34a8
 EBUILD certbot-9999.ebuild 1546 BLAKE2B b26f23c78d58387d48f22151be2a06a3fb746c061b6860fbc65c23edc9a348afa1e20adcec4570041a517c8d0ec51bdee833e8214ab8183b137920eb66355e6c SHA512 e208f49c909a75bf1cbecf9c8d8c987cdef255252d39e6a03a1c801b0a5939cbf819ef1424ddfa75acc5b91c9477351bd74d80956cb7277d88b4a7ad22fb34a8
 MISC metadata.xml 359 BLAKE2B 7f8ac46ecea304579baca80978cc35905720d1950caa183b5b5b297afab8bf6ea328324bacc438e9ecd91176230e42e55deda1c15e1ba73c63b2021ac2842c0f SHA512 a50b1db5a30eac290ac6645fcb30b0d5c4d8e51d83cff284e76358ee4fe7cef9366e40b06f532ba64a2131672972ea10b73541a9bd42cc323c17f6d26f6b0197
diff --git a/app-crypt/certbot/certbot-2.2.0-r1.ebuild b/app-crypt/certbot/certbot-2.2.0-r1.ebuild
deleted file mode 100644
index bb2f81f204eb..000000000000
--- a/app-crypt/certbot/certbot-2.2.0-r1.ebuild
+++ /dev/null
@@ -1,43 +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_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"
-
-IUSE="selinux"
-
-# See certbot/setup.py for acme >= dep
-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}]
-	selinux? ( sec-policy/selinux-certbot )"
-
-distutils_enable_tests pytest
diff --git a/app-crypt/certbot/certbot-2.2.0-r2.ebuild b/app-crypt/certbot/certbot-2.2.0-r2.ebuild
deleted file mode 100644
index a8c222abcae4..000000000000
--- a/app-crypt/certbot/certbot-2.2.0-r2.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-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}]
-	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.4.0.ebuild b/app-crypt/certbot/certbot-2.4.0.ebuild
index a8c222abcae4..e7d9cff408fb 100644
--- a/app-crypt/certbot/certbot-2.4.0.ebuild
+++ b/app-crypt/certbot/certbot-2.4.0.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"