[gentoo-commits] repo/gentoo:master commit in: app-crypt/certbot-apache/

["Sam James" <sam@gentoo.org>]

commit:     3b9387f8ab11e48df1afb2db06a1f635901205b2
Author:     Thibaud CANALE <thican <AT> thican <DOT> net>
AuthorDate: Mon Mar  3 14:22:27 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Mar  4 22:45:08 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b9387f8

app-crypt/certbot-apache: provide transition package

The new merged app-crypt/certbot has blockers on all the old split
modules like certbot-nginx, which leads to poor UX when users who have
e.g. certbot-nginx in their world file now to try to upgrade.

Add a dummy set of ebuilds for the old split modules to depend on the
merged certbot with the right USE, which we can last-rite in a while.

Signed-off-by: Thibaud CANALE <thican <AT> thican.net>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../certbot-apache-3.2.0-r100.ebuild               | 29 +++++++++++++++
 .../certbot-apache/certbot-apache-9999.ebuild      | 43 ++++++----------------
 2 files changed, 41 insertions(+), 31 deletions(-)

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."
+}