From 976741b2ad23e5256406765cb95991654df5d0ad Mon Sep 17 00:00:00 2001 From: Dale Showers Date: Mon, 10 Mar 2025 18:35:05 -0400 Subject: [PATCH 1/6] net-im/matterhorn-bin: drop v9000.0.0 Signed-off-by: Dale Showers --- net-im/matterhorn-bin/Manifest | 1 - .../matterhorn-bin-90000.0.0.ebuild | 44 ------------------- 2 files changed, 45 deletions(-) delete mode 100644 net-im/matterhorn-bin/matterhorn-bin-90000.0.0.ebuild diff --git a/net-im/matterhorn-bin/Manifest b/net-im/matterhorn-bin/Manifest index 00984ff673..5764ea10bf 100644 --- a/net-im/matterhorn-bin/Manifest +++ b/net-im/matterhorn-bin/Manifest @@ -1,2 +1 @@ -DIST matterhorn-bin-90000.0.0.tar.bz2 10042565 BLAKE2B d523aa9a87a741ce60be4b0b85bd276981182237112c26f26ff94e9d728fe7db9d09005803e8dcfd5231fae40c21f39bd68e303704c4afa6b3e06a3cebf54da6 SHA512 e4e73eeea5d2441a8e04e2b4394ecc2924a44478482a2db49c3c3cbd3983c45620f9e0b22f42e99d9febdf979c223f5a29c407afad0313cf3b55133d139b382e DIST matterhorn-bin-90000.0.1.tar.bz2 10380853 BLAKE2B c8296851b4b7e6a7efb28ee9d1c569e85ac2aee5e8ad9a6bdc65c9e46a6425c31ea4f7cf1a703431429d2b7bdb8e39056f3a1ad7b2ad7d9e78bcbe8517e428c9 SHA512 0719fec269922fab3d0535409c751ec39c6ad1ee983481ffd00482e987818ee4b48b8961f9bb52ec4b55fa9871f4f1ba96d8764df3807f20716046b61b65b68d diff --git a/net-im/matterhorn-bin/matterhorn-bin-90000.0.0.ebuild b/net-im/matterhorn-bin/matterhorn-bin-90000.0.0.ebuild deleted file mode 100644 index 178617c2eb..0000000000 --- a/net-im/matterhorn-bin/matterhorn-bin-90000.0.0.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -MY_PN="${PN%-bin}" -MY_P="${MY_PN}-${PV}-ubuntu-22.04-jammy-x86_64" - -DESCRIPTION="Terminal based Mattermost client" -HOMEPAGE="https://github.com/matterhorn-chat/matterhorn" -SRC_URI="https://github.com/matterhorn-chat/${MY_PN}/releases/download/${PV}/${MY_P}.tar.bz2 -> ${P}.tar.bz2" - -S="${WORKDIR}/${MY_P}" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="-* ~amd64" - -RDEPEND=" - ${DEPEND} - dev-libs/gmp:0 - sys-libs/ncurses:0/6 - sys-libs/zlib:0/1 -" - -QA_PREBUILT="*" - -src_install() { - default - - dobin matterhorn - - dodoc docs/commands.md - dodoc docs/keybindings.md - dodoc docs/sample-config.ini - - insinto /usr/share/${MY_PN} - exeinto /usr/share/${MY_PN}/notification-scripts - doins -r emoji - doins -r syntax - doins -r client-scripts - doexe notification-scripts/notify - doexe notification-scripts/notifyV2 -} From 3f81eb3ed225f8165c0dc382f36610b8234ea5ae Mon Sep 17 00:00:00 2001 From: Dale Showers Date: Mon, 10 Mar 2025 18:36:09 -0400 Subject: [PATCH 2/6] net-im/matterhorn-bin: add 9000.1.0 Signed-off-by: Dale Showers --- net-im/matterhorn-bin/Manifest | 1 + .../matterhorn-bin-90000.1.0.ebuild | 44 +++++++++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 net-im/matterhorn-bin/matterhorn-bin-90000.1.0.ebuild diff --git a/net-im/matterhorn-bin/Manifest b/net-im/matterhorn-bin/Manifest index 5764ea10bf..3f529f14e5 100644 --- a/net-im/matterhorn-bin/Manifest +++ b/net-im/matterhorn-bin/Manifest @@ -1 +1,2 @@ DIST matterhorn-bin-90000.0.1.tar.bz2 10380853 BLAKE2B c8296851b4b7e6a7efb28ee9d1c569e85ac2aee5e8ad9a6bdc65c9e46a6425c31ea4f7cf1a703431429d2b7bdb8e39056f3a1ad7b2ad7d9e78bcbe8517e428c9 SHA512 0719fec269922fab3d0535409c751ec39c6ad1ee983481ffd00482e987818ee4b48b8961f9bb52ec4b55fa9871f4f1ba96d8764df3807f20716046b61b65b68d +DIST matterhorn-bin-90000.1.0.tar.bz2 10455111 BLAKE2B aadb68ca74e1d2b9188087342a306005fa5e733aa6ae95a552ef56694ab5e635f0f0aced77516c16c92c7d698daf0ab08f9fa471111cdb1936609b8339ccaa54 SHA512 d6c77b7a62dd29641cbf43429ede291419250d4284e9950300e266cd9f9c1e6235392cb1c8b5c13c19f35c7a6971a915bdef3d5edbe76a240847a268e94ac875 diff --git a/net-im/matterhorn-bin/matterhorn-bin-90000.1.0.ebuild b/net-im/matterhorn-bin/matterhorn-bin-90000.1.0.ebuild new file mode 100644 index 0000000000..178617c2eb --- /dev/null +++ b/net-im/matterhorn-bin/matterhorn-bin-90000.1.0.ebuild @@ -0,0 +1,44 @@ +# Copyright 2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_PN="${PN%-bin}" +MY_P="${MY_PN}-${PV}-ubuntu-22.04-jammy-x86_64" + +DESCRIPTION="Terminal based Mattermost client" +HOMEPAGE="https://github.com/matterhorn-chat/matterhorn" +SRC_URI="https://github.com/matterhorn-chat/${MY_PN}/releases/download/${PV}/${MY_P}.tar.bz2 -> ${P}.tar.bz2" + +S="${WORKDIR}/${MY_P}" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="-* ~amd64" + +RDEPEND=" + ${DEPEND} + dev-libs/gmp:0 + sys-libs/ncurses:0/6 + sys-libs/zlib:0/1 +" + +QA_PREBUILT="*" + +src_install() { + default + + dobin matterhorn + + dodoc docs/commands.md + dodoc docs/keybindings.md + dodoc docs/sample-config.ini + + insinto /usr/share/${MY_PN} + exeinto /usr/share/${MY_PN}/notification-scripts + doins -r emoji + doins -r syntax + doins -r client-scripts + doexe notification-scripts/notify + doexe notification-scripts/notifyV2 +} From e27cefa80395149fb781d20b5e3f983fb0fb3459 Mon Sep 17 00:00:00 2001 From: David Roman Date: Tue, 11 Mar 2025 12:32:34 +0100 Subject: [PATCH 3/6] dev-python/guidata: enable py3.13 Signed-off-by: David Roman --- dev-python/guidata/guidata-3.7.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-python/guidata/guidata-3.7.1.ebuild b/dev-python/guidata/guidata-3.7.1.ebuild index a07b62dd95..0c40dbf2ff 100644 --- a/dev-python/guidata/guidata-3.7.1.ebuild +++ b/dev-python/guidata/guidata-3.7.1.ebuild @@ -4,7 +4,7 @@ EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{11..12} ) +PYTHON_COMPAT=( python3_{11..13} ) inherit distutils-r1 pypi From daa5b4bbb9ecf30fa89529d368267de1d5d47638 Mon Sep 17 00:00:00 2001 From: Thibaud CANALE Date: Tue, 11 Mar 2025 14:07:14 +0100 Subject: [PATCH 4/6] app-crypt/certbot-dns-rfc2136: add 2.11.1 Signed-off-by: Thibaud CANALE --- app-crypt/certbot-dns-rfc2136/Manifest | 1 + .../certbot-dns-rfc2136-2.11.1.ebuild | 79 +++++++++++++++++++ 2 files changed, 80 insertions(+) create mode 100644 app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-2.11.1.ebuild diff --git a/app-crypt/certbot-dns-rfc2136/Manifest b/app-crypt/certbot-dns-rfc2136/Manifest index 715100bf16..ac044a44d8 100644 --- a/app-crypt/certbot-dns-rfc2136/Manifest +++ b/app-crypt/certbot-dns-rfc2136/Manifest @@ -1,5 +1,6 @@ DIST certbot-2.10.0.gh.tar.gz 2322931 BLAKE2B cb84815ec2db2b4b365f2f2bdee1749263b540a1b67f9195280bdb122307337d294beb403bc05b236a94ed0782b0d093e2b8527a65cb69cac949fa627388e8bd SHA512 444981952140376808a9aa475a692df91e60fffc6d45902a3f809bc07311a7d6597ad56e712d3dae234450eb1c735db431182e784bc748511e68bf4f5f2d6cbd DIST certbot-2.11.0.gh.tar.gz 2322114 BLAKE2B d266483d1ffc9f9274df3d5e389ed961758e77e9455a7324132bb2bfe4896db663642a98ac7250d35fbbd60d6aef0d6d2a58f98ad17130958dcfcd61283c2479 SHA512 ba47fc98faaf47278c58e107356371c06039f70ad539d2ca1ac39462bb45c7a6c55ed525d8bd8b11cd35cf807f3423e19309022751a492ba19ded79cfbb6d7f4 +DIST certbot-2.11.1.gh.tar.gz 2323842 BLAKE2B 6ff759bcac0e49139ae65c3f257ffad87e122184d36aa43446b700efad817fe78232edabfcbf57b4e6041ac8aa7ffa771b0d16e6194a0080e81ab4032c230a9f SHA512 985af624f6da30893db4bb527e3b6eeaa85de869dbb734dfe005c5f7b9638cef123963534290ee488612f77928d06461bbf6120ac77ce35aaa0c1adaeae3cb7c DIST certbot-3.0.1.gh.tar.gz 2325233 BLAKE2B 247505fb500c829de875aa0886f27727de4ccc4f474dd13957b524b84af99e6ee5d1e86f09577422932a498ec9fda24ae36377d117365531ad1f8eddb0148272 SHA512 7aec63ec7705f4e13acb7cef5d770f103222ddf3dca30760c42cd3aeb0531d630111518960c299d89bccba4134b544a329fa02659fac5f977c9ca0321b2d1e2e 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 diff --git a/app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-2.11.1.ebuild b/app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-2.11.1.ebuild new file mode 100644 index 0000000000..8e228a6ec2 --- /dev/null +++ b/app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-2.11.1.ebuild @@ -0,0 +1,79 @@ +# 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_{11..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" +fi + +DESCRIPTION="RFC 2136 DNS Authenticator plugin for Certbot (Let’s Encrypt client)" +HOMEPAGE=" + https://github.com/certbot/certbot + https://certbot-dns-rfc2136.readthedocs.io/en/stable/ + https://pypi.org/project/certbot-dns-rfc2136/ + https://letsencrypt.org/ +" + +S="${WORKDIR}/${PARENT_P}/${PN}" +LICENSE="Apache-2.0" +SLOT="0" + +BDEPEND=" + test? ( + dev-python/pytest[${PYTHON_USEDEP}] + ) +" + +# See module setup.py for dependencies +RDEPEND=" + >=app-crypt/acme-${PV}[${PYTHON_USEDEP}] + >=app-crypt/certbot-${PV}[${PYTHON_USEDEP}] + >=dev-python/dnspython-1.15.0[${PYTHON_USEDEP}] +" + +distutils_enable_sphinx docs \ + dev-python/sphinx-rtd-theme +distutils_enable_tests pytest + +# Same than PATCHES but from repository's root directory, +# please see function `python_prepare_all` below. +# Simplier for users IMHO. +PARENT_PATCHES=( +) + +# Here for patches within "${PN}" subdirectory. +PATCHES=( +) + +python_prepare_all() { + pushd "${WORKDIR}/${PARENT_P}" > /dev/null || die + [[ -n "${PARENT_PATCHES[@]}" ]] && eapply "${PARENT_PATCHES[@]}" + eapply_user + popd > /dev/null || die + + distutils-r1_python_prepare_all +} + +python_test() { + local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 + epytest +} From 5d45b32c6d59468e5ebfdf559e58a4b929569058 Mon Sep 17 00:00:00 2001 From: Thibaud CANALE Date: Tue, 11 Mar 2025 14:18:58 +0100 Subject: [PATCH 5/6] app-crypt/certbot-dns-rfc2136: drop 2.10.0, 2.11.0, 3.0.1, 3.1.0 Signed-off-by: Thibaud CANALE --- app-crypt/certbot-dns-rfc2136/Manifest | 4 -- .../certbot-dns-rfc2136-2.10.0.ebuild | 69 ------------------- .../certbot-dns-rfc2136-2.11.0.ebuild | 69 ------------------- .../certbot-dns-rfc2136-3.0.1.ebuild | 69 ------------------- .../certbot-dns-rfc2136-3.1.0.ebuild | 69 ------------------- 5 files changed, 280 deletions(-) delete mode 100644 app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-2.10.0.ebuild delete mode 100644 app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-2.11.0.ebuild delete mode 100644 app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-3.0.1.ebuild delete mode 100644 app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-3.1.0.ebuild diff --git a/app-crypt/certbot-dns-rfc2136/Manifest b/app-crypt/certbot-dns-rfc2136/Manifest index ac044a44d8..c5936a6c31 100644 --- a/app-crypt/certbot-dns-rfc2136/Manifest +++ b/app-crypt/certbot-dns-rfc2136/Manifest @@ -1,6 +1,2 @@ -DIST certbot-2.10.0.gh.tar.gz 2322931 BLAKE2B cb84815ec2db2b4b365f2f2bdee1749263b540a1b67f9195280bdb122307337d294beb403bc05b236a94ed0782b0d093e2b8527a65cb69cac949fa627388e8bd SHA512 444981952140376808a9aa475a692df91e60fffc6d45902a3f809bc07311a7d6597ad56e712d3dae234450eb1c735db431182e784bc748511e68bf4f5f2d6cbd -DIST certbot-2.11.0.gh.tar.gz 2322114 BLAKE2B d266483d1ffc9f9274df3d5e389ed961758e77e9455a7324132bb2bfe4896db663642a98ac7250d35fbbd60d6aef0d6d2a58f98ad17130958dcfcd61283c2479 SHA512 ba47fc98faaf47278c58e107356371c06039f70ad539d2ca1ac39462bb45c7a6c55ed525d8bd8b11cd35cf807f3423e19309022751a492ba19ded79cfbb6d7f4 DIST certbot-2.11.1.gh.tar.gz 2323842 BLAKE2B 6ff759bcac0e49139ae65c3f257ffad87e122184d36aa43446b700efad817fe78232edabfcbf57b4e6041ac8aa7ffa771b0d16e6194a0080e81ab4032c230a9f SHA512 985af624f6da30893db4bb527e3b6eeaa85de869dbb734dfe005c5f7b9638cef123963534290ee488612f77928d06461bbf6120ac77ce35aaa0c1adaeae3cb7c -DIST certbot-3.0.1.gh.tar.gz 2325233 BLAKE2B 247505fb500c829de875aa0886f27727de4ccc4f474dd13957b524b84af99e6ee5d1e86f09577422932a498ec9fda24ae36377d117365531ad1f8eddb0148272 SHA512 7aec63ec7705f4e13acb7cef5d770f103222ddf3dca30760c42cd3aeb0531d630111518960c299d89bccba4134b544a329fa02659fac5f977c9ca0321b2d1e2e -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 diff --git a/app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-2.10.0.ebuild b/app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-2.10.0.ebuild deleted file mode 100644 index 5adc26678b..0000000000 --- a/app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-2.10.0.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{11..12} ) -DISTUTILS_USE_PEP517=setuptools - -inherit distutils-r1 - -PARENT_PN="${PN%-dns-rfc2136}" -PARENT_P="${PARENT_PN}-${PV}" - -DESCRIPTION="RFC 2136 DNS Authenticator plugin for Certbot (Let’s Encrypt client)" -HOMEPAGE=" - https://github.com/certbot/certbot - https://letsencrypt.org/ -" -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" -fi - -S="${WORKDIR}/${PARENT_P}/${PN}" - -LICENSE="Apache-2.0" -SLOT="0" - -BDEPEND=" - test? ( dev-python/pytest[${PYTHON_USEDEP}] ) -" - -RDEPEND=" - ${PYTHON_DEPS} - >=app-crypt/acme-${PV}[${PYTHON_USEDEP}] - >=app-crypt/certbot-${PV}[${PYTHON_USEDEP}] - >=dev-python/dnspython-1.15.0[${PYTHON_USEDEP}] -" - -distutils_enable_sphinx docs dev-python/sphinx-rtd-theme -distutils_enable_tests pytest - -# Same than PATCHES but from repository's root directory, -# please see function `python_prepare_all` below. -# Simplier for users IMHO. -PARENT_PATCHES=( -) - -# Here for patches within "${PN}" subdirectory. -PATCHES=( -) - -python_prepare_all() { - pushd "${WORKDIR}/${PARENT_P}" > /dev/null || die - [[ -n "${PARENT_PATCHES[@]}" ]] && eapply "${PARENT_PATCHES[@]}" - eapply_user - popd > /dev/null || die - - distutils-r1_python_prepare_all -} diff --git a/app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-2.11.0.ebuild b/app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-2.11.0.ebuild deleted file mode 100644 index 23b65c1c78..0000000000 --- a/app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-2.11.0.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{11..13} ) -DISTUTILS_USE_PEP517=setuptools - -inherit distutils-r1 - -PARENT_PN="${PN%-dns-rfc2136}" -PARENT_P="${PARENT_PN}-${PV}" - -DESCRIPTION="RFC 2136 DNS Authenticator plugin for Certbot (Let’s Encrypt client)" -HOMEPAGE=" - https://github.com/certbot/certbot - https://letsencrypt.org/ -" -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" -fi - -S="${WORKDIR}/${PARENT_P}/${PN}" - -LICENSE="Apache-2.0" -SLOT="0" - -BDEPEND=" - test? ( dev-python/pytest[${PYTHON_USEDEP}] ) -" - -RDEPEND=" - ${PYTHON_DEPS} - >=app-crypt/acme-${PV}[${PYTHON_USEDEP}] - >=app-crypt/certbot-${PV}[${PYTHON_USEDEP}] - >=dev-python/dnspython-1.15.0[${PYTHON_USEDEP}] -" - -distutils_enable_sphinx docs dev-python/sphinx-rtd-theme -distutils_enable_tests pytest - -# Same than PATCHES but from repository's root directory, -# please see function `python_prepare_all` below. -# Simplier for users IMHO. -PARENT_PATCHES=( -) - -# Here for patches within "${PN}" subdirectory. -PATCHES=( -) - -python_prepare_all() { - pushd "${WORKDIR}/${PARENT_P}" > /dev/null || die - [[ -n "${PARENT_PATCHES[@]}" ]] && eapply "${PARENT_PATCHES[@]}" - eapply_user - popd > /dev/null || die - - distutils-r1_python_prepare_all -} diff --git a/app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-3.0.1.ebuild b/app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-3.0.1.ebuild deleted file mode 100644 index 23b65c1c78..0000000000 --- a/app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-3.0.1.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{11..13} ) -DISTUTILS_USE_PEP517=setuptools - -inherit distutils-r1 - -PARENT_PN="${PN%-dns-rfc2136}" -PARENT_P="${PARENT_PN}-${PV}" - -DESCRIPTION="RFC 2136 DNS Authenticator plugin for Certbot (Let’s Encrypt client)" -HOMEPAGE=" - https://github.com/certbot/certbot - https://letsencrypt.org/ -" -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" -fi - -S="${WORKDIR}/${PARENT_P}/${PN}" - -LICENSE="Apache-2.0" -SLOT="0" - -BDEPEND=" - test? ( dev-python/pytest[${PYTHON_USEDEP}] ) -" - -RDEPEND=" - ${PYTHON_DEPS} - >=app-crypt/acme-${PV}[${PYTHON_USEDEP}] - >=app-crypt/certbot-${PV}[${PYTHON_USEDEP}] - >=dev-python/dnspython-1.15.0[${PYTHON_USEDEP}] -" - -distutils_enable_sphinx docs dev-python/sphinx-rtd-theme -distutils_enable_tests pytest - -# Same than PATCHES but from repository's root directory, -# please see function `python_prepare_all` below. -# Simplier for users IMHO. -PARENT_PATCHES=( -) - -# Here for patches within "${PN}" subdirectory. -PATCHES=( -) - -python_prepare_all() { - pushd "${WORKDIR}/${PARENT_P}" > /dev/null || die - [[ -n "${PARENT_PATCHES[@]}" ]] && eapply "${PARENT_PATCHES[@]}" - eapply_user - popd > /dev/null || die - - distutils-r1_python_prepare_all -} diff --git a/app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-3.1.0.ebuild b/app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-3.1.0.ebuild deleted file mode 100644 index c0f4751241..0000000000 --- a/app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-3.1.0.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{11..13} ) -DISTUTILS_USE_PEP517=setuptools - -inherit distutils-r1 - -PARENT_PN="${PN%-dns-rfc2136}" -PARENT_P="${PARENT_PN}-${PV}" - -DESCRIPTION="RFC 2136 DNS Authenticator plugin for Certbot (Let’s Encrypt client)" -HOMEPAGE=" - https://github.com/certbot/certbot - https://letsencrypt.org/ -" -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" -fi - -S="${WORKDIR}/${PARENT_P}/${PN}" - -LICENSE="Apache-2.0" -SLOT="0" - -BDEPEND=" - test? ( dev-python/pytest[${PYTHON_USEDEP}] ) -" - -RDEPEND=" - ${PYTHON_DEPS} - >=app-crypt/acme-${PV}[${PYTHON_USEDEP}] - >=app-crypt/certbot-${PV}[${PYTHON_USEDEP}] - >=dev-python/dnspython-2.6.1[${PYTHON_USEDEP}] -" - -distutils_enable_sphinx docs dev-python/sphinx-rtd-theme -distutils_enable_tests pytest - -# Same than PATCHES but from repository's root directory, -# please see function `python_prepare_all` below. -# Simplier for users IMHO. -PARENT_PATCHES=( -) - -# Here for patches within "${PN}" subdirectory. -PATCHES=( -) - -python_prepare_all() { - pushd "${WORKDIR}/${PARENT_P}" > /dev/null || die - [[ -n "${PARENT_PATCHES[@]}" ]] && eapply "${PARENT_PATCHES[@]}" - eapply_user - popd > /dev/null || die - - distutils-r1_python_prepare_all -} From 06b267b5d8f28fc3ddc8275a8bd799773ed0864b Mon Sep 17 00:00:00 2001 From: Thibaud CANALE Date: Tue, 11 Mar 2025 14:26:35 +0100 Subject: [PATCH 6/6] app-crypt/certbot-dns-rfc2136: 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 --- .../certbot-dns-rfc2136-3.2.0-r100.ebuild | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-3.2.0-r100.ebuild diff --git a/app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-3.2.0-r100.ebuild b/app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-3.2.0-r100.ebuild new file mode 100644 index 0000000000..372aa09385 --- /dev/null +++ b/app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-3.2.0-r100.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="RFC 2136 DNS Authenticator plugin for Certbot (Let’s Encrypt Client)" +HOMEPAGE=" + https://github.com/certbot/certbot + https://pypi.org/project/certbot-dns-rfc2136/ + https://certbot-dns-rfc2136.readthedocs.io/en/stable/ + https://letsencrypt.org/ +" + +LICENSE="metapackage" +SLOT="0" + +KEYWORDS="~amd64 ~arm64 ~riscv" + +# Meta package for transition +# No need to upgrade thanks to ">=" +RDEPEND=" + >=app-crypt/certbot-${PV}-r100[certbot-dns-rfc2136] +" + +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-dns-rfc2136] for this module." +}