commit: 45ddaeeb385ff4dd38c81fc2c74ba4709dd3ec8f Author: Thibaud CANALE <thican <AT> thican <DOT> net> AuthorDate: Tue Apr 8 20:06:44 2025 +0000 Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> CommitDate: Tue Apr 8 21:13:19 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45ddaeeb
app-crypt/certbot: add 4.0.0 Closes: https://bugs.gentoo.org/953447 Bug: https://bugs.gentoo.org/951716 Signed-off-by: Thibaud CANALE <thican <AT> thican.net> Closes: https://github.com/gentoo/gentoo/pull/41504 Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org> app-crypt/certbot/Manifest | 1 + .../{certbot-9999.ebuild => certbot-4.0.0.ebuild} | 158 +++------------------ app-crypt/certbot/certbot-9999.ebuild | 158 +++------------------ 3 files changed, 35 insertions(+), 282 deletions(-) diff --git a/app-crypt/certbot/Manifest b/app-crypt/certbot/Manifest index 7e330815fe1e..d12d6f8329b5 100644 --- a/app-crypt/certbot/Manifest +++ b/app-crypt/certbot/Manifest @@ -5,3 +5,4 @@ DIST certbot-3.0.1.gh.tar.gz 2325233 BLAKE2B 247505fb500c829de875aa0886f27727de4 DIST certbot-3.1.0.gh.tar.gz 2299990 BLAKE2B 596f11d4ebb161ee6ba67f4f150a77e081399f11f4e4652923c94297661149c9cb889afc51b46b6111847820823d90edc3a7f1e14c451122f88e6e777bf48795 SHA512 efd0b0c1540a6e3b631fa80eac65c9e8b31b1e5e1242f56d3723ca7e1b1b2121dfe1bf8e122fe9a9b994460553f1fa085b11d1369b3160f5c51c939b2cccd638 DIST certbot-3.2.0.gh.tar.gz 2309823 BLAKE2B 30ff3f40dc4d7724ad7b9a5eaf48f15fa579d49902dd23d21d8b2d36a4371da05f8c9417b0b2bf49a12565ba9dec180a9d805f22e0e8d1342ae5ea64b43d5219 SHA512 8fc3753dcdc954e143da31a0308269b99abadcdefc008c54c2cabac14a3bf99e757f1007349806a7dabf4a8fe19fd3a365ddea85c1dbeb3b453ae91503ea2288 DIST certbot-3.3.0.gh.tar.gz 2312043 BLAKE2B c7525be3116badf8de8de068d5f6a7daf79630c72bf338c58bf770478f8d827d8de2d9eb15b4c44fcd6e23c1357344cbb8529eed95359d305a0b77043e1adccc SHA512 8cc8939dc37c8c354e673110a63335322e16745c63a562e896f3ee1429ca70ebbb22920984e7aafa7c38e10fa0fa17e458d206799eb36c86280590c606aeed19 +DIST certbot-4.0.0.gh.tar.gz 2309431 BLAKE2B ddf38b29fe0db9a0434291b85c11f40b89411ae2261951390d542a694996ce89e11100b4a37832271737be55d8c114150bfc56782dc0be673a5d23ada8d91933 SHA512 a34c65c603a5e07ac95143168d651b7d76c3d9403b39b12201d74a23ddbd42019062cb2c0819faae82f2691462324538f1d4db6cdb44c82eddeb4782c0bd86f9 diff --git a/app-crypt/certbot/certbot-9999.ebuild b/app-crypt/certbot/certbot-4.0.0.ebuild similarity index 55% copy from app-crypt/certbot/certbot-9999.ebuild copy to app-crypt/certbot/certbot-4.0.0.ebuild index 2811f5dc7b47..4cf65c67fa57 100644 --- a/app-crypt/certbot/certbot-9999.ebuild +++ b/app-crypt/certbot/certbot-4.0.0.ebuild @@ -19,11 +19,7 @@ else https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz " - #KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" - # Only for amd64, arm64 and x86 because of dev-python/python-augeas - #KEYWORDS="~amd64 ~arm64 ~x86" - # Only for amd64 and x86 because of dev-python/dns-lexicon - KEYWORDS="~amd64 ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" fi DESCRIPTION="Let’s Encrypt client to automate deployment of X.509 certificates" @@ -86,8 +82,7 @@ RDEPEND=" >=dev-python/configobj-5.0.6[${PYTHON_USEDEP}] >=dev-python/cryptography-43.0.0[${PYTHON_USEDEP}] >=dev-python/distro-1.0.1[${PYTHON_USEDEP}] - >=dev-python/josepy-1.13.0[${PYTHON_USEDEP}] - <dev-python/josepy-2[${PYTHON_USEDEP}] + >=dev-python/josepy-2.0.0[${PYTHON_USEDEP}] >=dev-python/parsedatetime-2.4[${PYTHON_USEDEP}] >=dev-python/pyopenssl-25.0.0[${PYTHON_USEDEP}] dev-python/pyrfc3339[${PYTHON_USEDEP}] @@ -151,18 +146,12 @@ RDEPEND=" # ) # " -# Note: "docs" is not an actual directory under "S", they are actually -# under each modules, see python_compile_all redefinition, but keep -# this instruction enabled for dependency configuration. -distutils_enable_sphinx docs \ - dev-python/sphinx-rtd-theme distutils_enable_tests pytest -src_prepare() { - local S_BACKUP="${S}" +certbot_dirs=() - local certbot_dirs=() - local base module dir +my_certbot_dirs_listing() { + local base module for base in "${CERTBOT_BASE[@]}"; do certbot_dirs+=("${base}") done @@ -170,142 +159,29 @@ src_prepare() { use "certbot-${module}" \ && certbot_dirs+=("certbot-${module}") done - - for dir in "${certbot_dirs[@]}"; do - S="${WORKDIR}/${P}/${dir}" - pushd "${S}" > /dev/null || die - distutils-r1_src_prepare - popd > /dev/null || die - done - - # Restore S - S="${S_BACKUP}" } -src_configure() { - local S_BACKUP="${S}" - - local certbot_dirs=() - local base module dir - for base in "${CERTBOT_BASE[@]}"; do - certbot_dirs+=("${base}") - done - for module in "${CERTBOT_MODULES_EXTRA[@]}"; do - use "certbot-${module}" \ - && certbot_dirs+=("certbot-${module}") - done - - for dir in "${certbot_dirs[@]}"; do - S="${WORKDIR}/${P}/${dir}" - pushd "${S}" > /dev/null || die - distutils-r1_src_configure - popd > /dev/null || die - done +src_prepare() { + default - # Restore S - S="${S_BACKUP}" + my_certbot_dirs_listing } -src_compile() { - # Used for building documentation - # Stores temporary modules docs in each subdirectories, will be used for HTML_DOCS - local temp_docs="${T}/docs" - use doc && { - mkdir "${temp_docs}" || die - } - - local S_BACKUP="${S}" +python_compile() { + local dir + for dir in "${certbot_dirs[@]}"; do + pushd "${dir}" > /dev/null || die - local certbot_dirs=() - local base module dir - for base in "${CERTBOT_BASE[@]}"; do - certbot_dirs+=("${base}") - done - for module in "${CERTBOT_MODULES_EXTRA[@]}"; do - use "certbot-${module}" \ - && certbot_dirs+=("certbot-${module}") - done + distutils-r1_python_compile + # Delete previous build directory to avoid collision. + rm -rf "${BUILD_DIR}/build" - for dir in "${certbot_dirs[@]}"; do - S="${WORKDIR}/${P}/${dir}" - pushd "${S}" > /dev/null || die - distutils-r1_src_compile popd > /dev/null || die done - - # Restore S - S="${S_BACKUP}" - - use doc && { - # Replace HTML_DOCS with one single entry to avoid merging - HTML_DOCS=( "${temp_docs}" ) - } -} - -python_compile_all() { - # There is no documentation in certbot-apache or certbot-nginx. - if [[ "${dir}" = "certbot-apache" ]] || [[ "${dir}" = "certbot-nginx" ]]; then - return - fi - - # Used to build documentation - use doc && { - sphinx_compile_all - - # Subdirectory "_build/html" from build_sphinx in eclass/python-utils-r1.eclass - mv "${_DISTUTILS_SPHINX_SUBDIR}/_build/html" "${temp_docs}/${dir}" || die - } } python_test() { local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 - epytest -} - -src_test() { - local S_BACKUP="${S}" - - local certbot_dirs=() - local base module dir - for base in "${CERTBOT_BASE[@]}"; do - certbot_dirs+=("${base}") - done - for module in "${CERTBOT_MODULES_EXTRA[@]}"; do - use "certbot-${module}" \ - && certbot_dirs+=("certbot-${module}") - done - - for dir in "${certbot_dirs[@]}"; do - S="${WORKDIR}/${P}/${dir}" - pushd "${S}" > /dev/null || die - distutils-r1_src_test - popd > /dev/null || die - done - - # Restore S - S="${S_BACKUP}" -} - -src_install() { - local S_BACKUP="${S}" - - local certbot_dirs=() - local base module dir - for base in "${CERTBOT_BASE[@]}"; do - certbot_dirs+=("${base}") - done - for module in "${CERTBOT_MODULES_EXTRA[@]}"; do - use "certbot-${module}" \ - && certbot_dirs+=("certbot-${module}") - done - - for dir in "${certbot_dirs[@]}"; do - S="${WORKDIR}/${P}/${dir}" - pushd "${S}" > /dev/null || die - distutils-r1_src_install - popd > /dev/null || die - done - - # Restore S - S="${S_BACKUP}" + # Argument required to change pytest rootdir. + epytest "${BUILD_DIR}" } diff --git a/app-crypt/certbot/certbot-9999.ebuild b/app-crypt/certbot/certbot-9999.ebuild index 2811f5dc7b47..4cf65c67fa57 100644 --- a/app-crypt/certbot/certbot-9999.ebuild +++ b/app-crypt/certbot/certbot-9999.ebuild @@ -19,11 +19,7 @@ else https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz " - #KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" - # Only for amd64, arm64 and x86 because of dev-python/python-augeas - #KEYWORDS="~amd64 ~arm64 ~x86" - # Only for amd64 and x86 because of dev-python/dns-lexicon - KEYWORDS="~amd64 ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" fi DESCRIPTION="Let’s Encrypt client to automate deployment of X.509 certificates" @@ -86,8 +82,7 @@ RDEPEND=" >=dev-python/configobj-5.0.6[${PYTHON_USEDEP}] >=dev-python/cryptography-43.0.0[${PYTHON_USEDEP}] >=dev-python/distro-1.0.1[${PYTHON_USEDEP}] - >=dev-python/josepy-1.13.0[${PYTHON_USEDEP}] - <dev-python/josepy-2[${PYTHON_USEDEP}] + >=dev-python/josepy-2.0.0[${PYTHON_USEDEP}] >=dev-python/parsedatetime-2.4[${PYTHON_USEDEP}] >=dev-python/pyopenssl-25.0.0[${PYTHON_USEDEP}] dev-python/pyrfc3339[${PYTHON_USEDEP}] @@ -151,18 +146,12 @@ RDEPEND=" # ) # " -# Note: "docs" is not an actual directory under "S", they are actually -# under each modules, see python_compile_all redefinition, but keep -# this instruction enabled for dependency configuration. -distutils_enable_sphinx docs \ - dev-python/sphinx-rtd-theme distutils_enable_tests pytest -src_prepare() { - local S_BACKUP="${S}" +certbot_dirs=() - local certbot_dirs=() - local base module dir +my_certbot_dirs_listing() { + local base module for base in "${CERTBOT_BASE[@]}"; do certbot_dirs+=("${base}") done @@ -170,142 +159,29 @@ src_prepare() { use "certbot-${module}" \ && certbot_dirs+=("certbot-${module}") done - - for dir in "${certbot_dirs[@]}"; do - S="${WORKDIR}/${P}/${dir}" - pushd "${S}" > /dev/null || die - distutils-r1_src_prepare - popd > /dev/null || die - done - - # Restore S - S="${S_BACKUP}" } -src_configure() { - local S_BACKUP="${S}" - - local certbot_dirs=() - local base module dir - for base in "${CERTBOT_BASE[@]}"; do - certbot_dirs+=("${base}") - done - for module in "${CERTBOT_MODULES_EXTRA[@]}"; do - use "certbot-${module}" \ - && certbot_dirs+=("certbot-${module}") - done - - for dir in "${certbot_dirs[@]}"; do - S="${WORKDIR}/${P}/${dir}" - pushd "${S}" > /dev/null || die - distutils-r1_src_configure - popd > /dev/null || die - done +src_prepare() { + default - # Restore S - S="${S_BACKUP}" + my_certbot_dirs_listing } -src_compile() { - # Used for building documentation - # Stores temporary modules docs in each subdirectories, will be used for HTML_DOCS - local temp_docs="${T}/docs" - use doc && { - mkdir "${temp_docs}" || die - } - - local S_BACKUP="${S}" +python_compile() { + local dir + for dir in "${certbot_dirs[@]}"; do + pushd "${dir}" > /dev/null || die - local certbot_dirs=() - local base module dir - for base in "${CERTBOT_BASE[@]}"; do - certbot_dirs+=("${base}") - done - for module in "${CERTBOT_MODULES_EXTRA[@]}"; do - use "certbot-${module}" \ - && certbot_dirs+=("certbot-${module}") - done + distutils-r1_python_compile + # Delete previous build directory to avoid collision. + rm -rf "${BUILD_DIR}/build" - for dir in "${certbot_dirs[@]}"; do - S="${WORKDIR}/${P}/${dir}" - pushd "${S}" > /dev/null || die - distutils-r1_src_compile popd > /dev/null || die done - - # Restore S - S="${S_BACKUP}" - - use doc && { - # Replace HTML_DOCS with one single entry to avoid merging - HTML_DOCS=( "${temp_docs}" ) - } -} - -python_compile_all() { - # There is no documentation in certbot-apache or certbot-nginx. - if [[ "${dir}" = "certbot-apache" ]] || [[ "${dir}" = "certbot-nginx" ]]; then - return - fi - - # Used to build documentation - use doc && { - sphinx_compile_all - - # Subdirectory "_build/html" from build_sphinx in eclass/python-utils-r1.eclass - mv "${_DISTUTILS_SPHINX_SUBDIR}/_build/html" "${temp_docs}/${dir}" || die - } } python_test() { local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 - epytest -} - -src_test() { - local S_BACKUP="${S}" - - local certbot_dirs=() - local base module dir - for base in "${CERTBOT_BASE[@]}"; do - certbot_dirs+=("${base}") - done - for module in "${CERTBOT_MODULES_EXTRA[@]}"; do - use "certbot-${module}" \ - && certbot_dirs+=("certbot-${module}") - done - - for dir in "${certbot_dirs[@]}"; do - S="${WORKDIR}/${P}/${dir}" - pushd "${S}" > /dev/null || die - distutils-r1_src_test - popd > /dev/null || die - done - - # Restore S - S="${S_BACKUP}" -} - -src_install() { - local S_BACKUP="${S}" - - local certbot_dirs=() - local base module dir - for base in "${CERTBOT_BASE[@]}"; do - certbot_dirs+=("${base}") - done - for module in "${CERTBOT_MODULES_EXTRA[@]}"; do - use "certbot-${module}" \ - && certbot_dirs+=("certbot-${module}") - done - - for dir in "${certbot_dirs[@]}"; do - S="${WORKDIR}/${P}/${dir}" - pushd "${S}" > /dev/null || die - distutils-r1_src_install - popd > /dev/null || die - done - - # Restore S - S="${S_BACKUP}" + # Argument required to change pytest rootdir. + epytest "${BUILD_DIR}" }
