gentoo auto-resync : 05:03:2025 - 01:46:50

3 files changed, 43 insertions, 32 deletions

diff --git a/app-crypt/certbot-apache/Manifest b/app-crypt/certbot-apache/Manifest
index 6c540ac6a7f2..a8a25f85233f 100644
--- a/app-crypt/certbot-apache/Manifest
+++ b/app-crypt/certbot-apache/Manifest
@@ -3,6 +3,7 @@ DIST certbot-3.1.0.gh.tar.gz 2299990 BLAKE2B 596f11d4ebb161ee6ba67f4f150a77e0813
 DIST certbot-3.2.0.gh.tar.gz 2309823 BLAKE2B 30ff3f40dc4d7724ad7b9a5eaf48f15fa579d49902dd23d21d8b2d36a4371da05f8c9417b0b2bf49a12565ba9dec180a9d805f22e0e8d1342ae5ea64b43d5219 SHA512 8fc3753dcdc954e143da31a0308269b99abadcdefc008c54c2cabac14a3bf99e757f1007349806a7dabf4a8fe19fd3a365ddea85c1dbeb3b453ae91503ea2288
 EBUILD certbot-apache-2.10.0.ebuild 1059 BLAKE2B 2641256468b204ce2a9594154025201ec733d73ecd6191cfeae7143db0ff860f1a12a65cea08bd07163a3ae9ef3809582bf1646f9077d8191c4a9fa8ef0830c8 SHA512 6077a0fa14c31bdeab385fb3c81ee831576e0baabb1aa76d153e046cc1d5a6919ec64050f6eaa3297d6a2cf2307c243d4244326070af0317858e58ab92cf49d4
 EBUILD certbot-apache-3.1.0.ebuild 1061 BLAKE2B cb61fe539dabd637ef7ca2fbff92bee1a21db4af6a838f95ccae05b2fb71964c758d607130bfda566c4365f84063aad7aa6f798b36029d67d6167366eb957de5 SHA512 aa2725b05140f64c93476319261c5940f09a8582741cdb051c0cc13da2b622404c696343aa25a687211ab80819271541ebaddc0afeb7057d23409dca3b06964d
+EBUILD certbot-apache-3.2.0-r100.ebuild 724 BLAKE2B 87b8583a9a928b5a656614a6e8d9565ce713c9f5c69195571445bf5498b58162540db29d1d8e0ee2c9edcf9a3630feb8bff728219741cb2530db027d8cdd8423 SHA512 fd9333dd61503ce33da7ceaa6980207067e492e983c93eb64c85d911b63b2f0ee612c2f271b2aa2029515c2041e2f2da4888a31498970e67b0a3211389a34aba
 EBUILD certbot-apache-3.2.0.ebuild 1093 BLAKE2B aaa0f37484cb0ee6bc9ba5d28db3006695f9608f0ef2431cf3e3d18c7891ae33bcf7dac14cb6117d28791ce2b9a4915af453173fabf9a4be9969268f1dead315 SHA512 92d3f0e46bdb488df72f6c8de94a0c492ed741f6275287f24df1e1987a53f00cc6aaa43c6003f79a6411a7865264e9b632cbbf25e413389c9c096d353754a7f9
-EBUILD certbot-apache-9999.ebuild 1061 BLAKE2B a2e239e321f4087db6bb21f600cff8ed20ae1add9b4e402f5ca2a1762633a7a2a2edf7e9dcec510ef21b68ed91d68064a573e8bb9c186d77a89d36ac4baa5e83 SHA512 77fdc3ea4cce89c1811f6dad1cdda02b18a6f3f394acd908ef168d958337dac200c109ddce5fbdf299afaaf6c4315c8af60242a72d6f66b1cfee994b419af6e2
+EBUILD certbot-apache-9999.ebuild 694 BLAKE2B a73cd6e19580301a125e1b8d953f0262def7b5aabe61d6973dc3565f3f4039e2c7d0f6e8d2c6183b03dc816ac5f4f4e4eb0d0b331fd46e85bed00f1af4d9fca2 SHA512 5c639c9ff6dcbba9366d60e48adc61a43fc94b0f64882a7c4a0e096e6a14cda3968b92fe4f9036a5320cfacfa2de18f6def1004e24e15fd8e78c92e99b69a5e4
 MISC metadata.xml 411 BLAKE2B 5876f2ab00aae84a0649504ffa17ea14abba64e38c915adb12f8817736b83ca19b4c220d79fff23259a772a621c145b0987bbe9ac959b956113b2e1ec40f5123 SHA512 ab6822225853f8941e2bf841b945c3dc484eb9c9667f8583f52951ca87e264315a50d44985fbd9487793e8b72c9a0bd05c0a267f06bf60f64003ad94820267ba
diff --git a/app-crypt/certbot-apache/certbot-apache-3.2.0-r100.ebuild b/app-crypt/certbot-apache/certbot-apache-3.2.0-r100.ebuild
new file mode 100644
index 000000000000..71d563558b2c
--- /dev/null
+++ b/app-crypt/certbot-apache/certbot-apache-3.2.0-r100.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Apache plugin for Certbot (Let’s Encrypt client)"
+HOMEPAGE="
+	https://github.com/certbot/certbot
+	https://pypi.org/project/certbot-apache/
+	https://letsencrypt.org/
+"
+
+LICENSE="metapackage"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+
+# Meta package for transition
+# No need to upgrade thanks to ">="
+RDEPEND="
+	>=app-crypt/certbot-${PV}-r100[certbot-apache]
+"
+
+pkg_postinst() {
+	elog "This is a meta-package to help in transition to single package "
+	elog "app-crypt/certbot."
+	elog "It is advice to simply deselect this package and to emerge "
+	elog "app-crypt/certbot[certbot-apache] for this module."
+}
diff --git a/app-crypt/certbot-apache/certbot-apache-9999.ebuild b/app-crypt/certbot-apache/certbot-apache-9999.ebuild
index 940cfe35b4bb..128d4deab7cd 100644
--- a/app-crypt/certbot-apache/certbot-apache-9999.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-9999.ebuild
@@ -1,46 +1,27 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-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://github.com/certbot/certbot
 	https://pypi.org/project/certbot-apache/
 	https://letsencrypt.org/
 "
 
-S="${WORKDIR}/${PARENT_P}/${PN}"
-LICENSE="Apache-2.0"
+LICENSE="metapackage"
 SLOT="0"
 
+# Meta package for transition
+# No need to upgrade thanks to ">="
 RDEPEND="
-	>=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
-	>=app-crypt/certbot-${PV}[${PYTHON_USEDEP}]
-	dev-python/python-augeas[${PYTHON_USEDEP}]
+	>=app-crypt/certbot-9999[certbot-apache]
 "
 
-distutils_enable_tests pytest
+pkg_postinst() {
+	elog "This is a meta-package to help in transition to single package "
+	elog "app-crypt/certbot."
+	elog "It is advice to simply deselect this package and to emerge "
+	elog "app-crypt/certbot[certbot-apache] for this module."
+}