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

3 files changed, 2 insertions, 54 deletions

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)"