commit: 610c01b6f6080ceacd0b235fd910d80fca7c56fd Author: Thibaud CANALE <thican <AT> thican <DOT> net> AuthorDate: Mon Mar 3 14:16:46 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=610c01b6
app-crypt/acme: 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> app-crypt/acme/acme-3.2.0-r100.ebuild | 29 +++++++++++++++++ app-crypt/acme/acme-9999.ebuild | 60 +++++++---------------------------- 2 files changed, 40 insertions(+), 49 deletions(-) diff --git a/app-crypt/acme/acme-3.2.0-r100.ebuild b/app-crypt/acme/acme-3.2.0-r100.ebuild new file mode 100644 index 000000000000..f4a7ab961278 --- /dev/null +++ b/app-crypt/acme/acme-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="An implementation of the ACME protocol" +HOMEPAGE=" + https://github.com/certbot/certbot + https://pypi.org/project/acme/ + 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 +" + +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 where module ${PN} is present by default." +} diff --git a/app-crypt/acme/acme-9999.ebuild b/app-crypt/acme/acme-9999.ebuild index 31c4a24b9787..7b38b55372c2 100644 --- a/app-crypt/acme/acme-9999.ebuild +++ b/app-crypt/acme/acme-9999.ebuild @@ -1,65 +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="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://github.com/certbot/certbot https://pypi.org/project/acme/ https://letsencrypt.org/ " -S="${WORKDIR}/${PARENT_P}/${PN}" -LICENSE="Apache-2.0" +LICENSE="metapackage" SLOT="0" -BDEPEND=" - test? ( - 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. +# Meta package for transition +# No need to upgrade thanks to ">=" RDEPEND=" - dev-python/chardet[${PYTHON_USEDEP}] - >=dev-python/cryptography-3.2.1[${PYTHON_USEDEP}] - >=dev-python/josepy-1.13.0[${PYTHON_USEDEP}] - <dev-python/josepy-2[${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}] + >=app-crypt/certbot-9999 " -distutils_enable_sphinx docs \ - dev-python/sphinx-rtd-theme -distutils_enable_tests pytest - -python_test() { - local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 - epytest +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 where module ${PN} is present by default." }
