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

19 files changed, 425 insertions, 134 deletions

diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index a3c7f5fc75c6..ad3ffb159c36 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/acme/Manifest b/app-crypt/acme/Manifest
index 933055af40ea..a3229f00ccb7 100644
--- a/app-crypt/acme/Manifest
+++ b/app-crypt/acme/Manifest
@@ -7,6 +7,7 @@ EBUILD acme-2.10.0.ebuild 1531 BLAKE2B 15f0041fcccb610f9fc9b4ca24ebcf871b5577bdc
 EBUILD acme-2.11.0.ebuild 1531 BLAKE2B 15f0041fcccb610f9fc9b4ca24ebcf871b5577bdc82e266c7fb4efe929dc431bd4020ee903510399fea14972d0a20590ca3471d6ec7c5f02e6cd0e4c0e406372 SHA512 b63e983e64a5a65f5c5f19a579c57ee8269ae8840e3c2afd2c16b2d4bc57290425d49d7882de4b1afcf7a5bfaf51bdea524e4f93d127d13eb2452a38e3f65270
 EBUILD acme-3.0.1.ebuild 1575 BLAKE2B d39ba92589e3242535091947f9c9bf881b9235a165ba07b895379b7c285489d208694c0395506a6a792e45b4cfd5104cbbb010ee54fc5300e28c9415c0ed9642 SHA512 dddc4f7343dc3a60e97ea06ec4942a9b4a2ea5f7b54687faeac4037f22b2dabbc862f8545b5025596f957529d55422dbc55f1c3b04b42a24cb30b7fc621dad9a
 EBUILD acme-3.1.0.ebuild 1575 BLAKE2B 9d7ca735492e3c266c54e2f7760620a656947da18af710eba5afaffd207e7815235fbbb9526433f9b8215741bb8d11bc60fa96f210510c8fd3ed1c27531c628d SHA512 1da6b99cd820608ed21d9e9effa14e3d0bc36d97025741def2fb4d5603f3c73d3a208112a1d84495acd33ffb9029fd3ffb5c387158e5b33852603bd5a4373369
+EBUILD acme-3.2.0-r100.ebuild 695 BLAKE2B 592a67f4b06c93c5df74fa76acb85e682b44eedb3aa25bcbdf1a98992e6b82c1ce01f1505cfcb9a4b3e16b9614d0e398d18ef56edb8f980805deccf952bdf20f SHA512 74a7b392195ca1ad13435d3f17e08c9c9f544bf07f30f57b507d920ec9d4f01e65f198ccd9d45f8cd8a915393dfe78188e569714f394c050efaa8e7b33560f0d
 EBUILD acme-3.2.0.ebuild 1508 BLAKE2B 695537e9d5675f72bb40c6bc23521de55466df94bdbfbca2622dfae1b26a66ea966155907623a2305eb9b1fa36b8150d482ab3b5ac7103531f32d3e259b52282 SHA512 87f0652d223a8f8ae7e8cdbcfe2f142aa1873d9b1156008f86d4235030ba279cbd31849f0d2ac1017969b047267a7f5ad04ab728f3e5b9b7ad05271d28f6ffe5
-EBUILD acme-9999.ebuild 1575 BLAKE2B d39ba92589e3242535091947f9c9bf881b9235a165ba07b895379b7c285489d208694c0395506a6a792e45b4cfd5104cbbb010ee54fc5300e28c9415c0ed9642 SHA512 dddc4f7343dc3a60e97ea06ec4942a9b4a2ea5f7b54687faeac4037f22b2dabbc862f8545b5025596f957529d55422dbc55f1c3b04b42a24cb30b7fc621dad9a
+EBUILD acme-9999.ebuild 665 BLAKE2B 34b0c40cf14619a873d69957aab3a0281d4039347baa508355d76991cc018ed3f5229c7739e4ac81c508b886d915e4e20e5c3c43baaa809747e5e22e108df62b SHA512 abc856cd6dbe750ac4982eca4821c5e1ed1ad6a903548939957e7bf4d63853f6116916021f108fad23a95270469ba108fc5219aa972b8cc3dd574a8cd1cf4dd5
 MISC metadata.xml 401 BLAKE2B 30a2ac1f03749a8e3bb98723c57f47ab6bcf7bfa58c2b6e21c309fae279feca0d3612df6c2a1dafaf27b4f0781c583a140322feac1a1cf2c13e50861cad129ea SHA512 d8e725b71ca81ce4ca6565ed58271b283c25394448f0f48f726f232122577c33d5b2d726e117419b2fae99f9dae29a8080bb9564eccbca13368c83988cf3da01
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."
 }
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."
+}
diff --git a/app-crypt/certbot-dns-dnsimple/Manifest b/app-crypt/certbot-dns-dnsimple/Manifest
index 6571a3cdbf5f..41f49387c048 100644
--- a/app-crypt/certbot-dns-dnsimple/Manifest
+++ b/app-crypt/certbot-dns-dnsimple/Manifest
@@ -1,5 +1,6 @@
 DIST certbot-2.10.0.gh.tar.gz 2322931 BLAKE2B cb84815ec2db2b4b365f2f2bdee1749263b540a1b67f9195280bdb122307337d294beb403bc05b236a94ed0782b0d093e2b8527a65cb69cac949fa627388e8bd SHA512 444981952140376808a9aa475a692df91e60fffc6d45902a3f809bc07311a7d6597ad56e712d3dae234450eb1c735db431182e784bc748511e68bf4f5f2d6cbd
 DIST certbot-3.2.0.gh.tar.gz 2309823 BLAKE2B 30ff3f40dc4d7724ad7b9a5eaf48f15fa579d49902dd23d21d8b2d36a4371da05f8c9417b0b2bf49a12565ba9dec180a9d805f22e0e8d1342ae5ea64b43d5219 SHA512 8fc3753dcdc954e143da31a0308269b99abadcdefc008c54c2cabac14a3bf99e757f1007349806a7dabf4a8fe19fd3a365ddea85c1dbeb3b453ae91503ea2288
 EBUILD certbot-dns-dnsimple-2.10.0.ebuild 899 BLAKE2B 7cf6e2cab506a2835651cc2072e6f9deca6173aeddcbc7a8b655f7d9b7052de25e2f36c23b1777ae2dfe5ce6643f721d09218b458b71abe97276f0cc894eb318 SHA512 710fb98ebca2be80b7a4dda4dfdf9a3cf15caf783b86ee2579e30d7be60efd8c90da2a03bc0163fd7401c54b2a1e2f1db5499014ebad5b0b8e611ccc5b4ca196
+EBUILD certbot-dns-dnsimple-3.2.0-r100.ebuild 814 BLAKE2B 74a998d9e10430e50b4af5da644d226a9dc354b739ea0c6a0b847471e0cb976021296d9b4c80566da01f20231831af0c07f77ba70071a47abd019d11d680e200 SHA512 d3de3d0d86f4f495eab761b9b4ad3112e999a85e94d838846ecf5b50a5d0b17baff3c24f2475f275993493a923f37c25505a8c2adc281f8959208afd48d28d55
 EBUILD certbot-dns-dnsimple-3.2.0.ebuild 1222 BLAKE2B 1edcd7c917bf3069687a8f3785a4ea7148733672839f175f5f59e19b5390b199a22b3797ea96b84eacb0a59936c46d97a781fe5ad9b16433cdf22ff30ffceaf0 SHA512 e54d7be1e00d565389f0ea7b2474d4bc36f50ff97c6bdbdf21b08976c66047087e510100e0396f294cd9000e9ee1885101dd9f23c81dda38129d15c55c44dae5
 MISC metadata.xml 569 BLAKE2B d554766b1b933cefdeced04082594e224d1f6bc66036cacecb649f2c21a0135ee5000a043c0587157453afb4a3f4ffd8096a89c654124d9424db4456bee8cf53 SHA512 fd01e6495d9fd1d28ce47a729bf014b953b57cd01227e682fd6f34c1e0fc15f4799d7cff98fb0e9eb3af150765b6906ec15693257a125e65187469ab451c38d3
diff --git a/app-crypt/certbot-dns-dnsimple/certbot-dns-dnsimple-3.2.0-r100.ebuild b/app-crypt/certbot-dns-dnsimple/certbot-dns-dnsimple-3.2.0-r100.ebuild
new file mode 100644
index 000000000000..f38b47a761ba
--- /dev/null
+++ b/app-crypt/certbot-dns-dnsimple/certbot-dns-dnsimple-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="DNSimple Authenticator plugin for Certbot (Let’s Encrypt Client)"
+HOMEPAGE="
+	https://github.com/certbot/certbot
+	https://pypi.org/project/certbot-dns-dnsimple/
+	https://certbot-dns-dnsimple.readthedocs.io/en/stable/
+	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-dns-dnsimple]
+"
+
+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-dnsimple] for this module."
+}
diff --git a/app-crypt/certbot-dns-nsone/Manifest b/app-crypt/certbot-dns-nsone/Manifest
index 77574527ef13..3d84027d2374 100644
--- a/app-crypt/certbot-dns-nsone/Manifest
+++ b/app-crypt/certbot-dns-nsone/Manifest
@@ -1,5 +1,6 @@
 DIST certbot-1.18.0.gh.tar.gz 1332615 BLAKE2B eb086710b943893025d6e1091470ca02de074232372f4c9fa21fa83a347fe54df988b9553c8cf6afd6e166b8c464d595171984c984008a872e16c0179bb774b2 SHA512 94b16ba0586e0f5d3036280c68f9976c25889ca48fbbe7aded41f0d9feba2300a3f0ff8fe321b39d8642bcdd874c7332cf2acb3187b5869fe415831f58a75a7b
 DIST certbot-3.2.0.gh.tar.gz 2309823 BLAKE2B 30ff3f40dc4d7724ad7b9a5eaf48f15fa579d49902dd23d21d8b2d36a4371da05f8c9417b0b2bf49a12565ba9dec180a9d805f22e0e8d1342ae5ea64b43d5219 SHA512 8fc3753dcdc954e143da31a0308269b99abadcdefc008c54c2cabac14a3bf99e757f1007349806a7dabf4a8fe19fd3a365ddea85c1dbeb3b453ae91503ea2288
 EBUILD certbot-dns-nsone-1.18.0-r1.ebuild 881 BLAKE2B 618bd9da56d0c182196aa57ff92c6883ee3b09d4ae216615500d39b2c2faaf68e3af2a12261f39678fc9235154940a33f6c7ce49752efabf24c7bd6bf7e92b52 SHA512 c3b3c9b7fd5336fe7280cdee2b38613a27f8e4cc99b116f07899339acb220f56cdb2defdb923ed5e0dfc99c5233ad19daa75b68b327a3090f9e91a676051da0d
+EBUILD certbot-dns-nsone-3.2.0-r100.ebuild 748 BLAKE2B a98d008d3f90a53d1c33b1c859e32b25fa8cfec4dcaaf42d8e3f09f914a1d1aec947e7ad405511d6b6aa6bafc8ee04ea01849d0a238ac04ad5b7e8dbd503ca76 SHA512 82d1fbefcd64d64e461dbb4fa50149d56e93619c76a5186991d37508e6011d8ce48959696631c05913f170f949e13a61f89cacbb0e6beed1b55dfc5e3e0a211c
 EBUILD certbot-dns-nsone-3.2.0.ebuild 1207 BLAKE2B c04be060fc789d8064cacb26099e975cdc1cca89cb828d3d7354658954bd3bdc7ecedd3d5454cea2b58018b0d82bc41c175d982ecb03e3a8297c2381a2ac2877 SHA512 d35ff15f9f1979d24e5bab64f4018dfc2fbaf62256268d11d8120dc5db7ae078d5a9279354302208297b3ff9e897900f8ff9b1c30fd17bd5053c5e240c9c5a9e
 MISC metadata.xml 407 BLAKE2B 8f65d9f92992da12fcd4fcb71f67ee91b1029af1a784bd03e2d3726a1ac9bb14f161692b2f12c9553e0fc6e45d6088e505a8d616f3c209445332a191f572e731 SHA512 b7ded216ba7f9e9babdfef03565444233d48e132807064bb9befb3a551b1344e75def76da891a5e40f102610da8ca05e6182f0501bf296c25543fae378c94ccd
diff --git a/app-crypt/certbot-dns-nsone/certbot-dns-nsone-3.2.0-r100.ebuild b/app-crypt/certbot-dns-nsone/certbot-dns-nsone-3.2.0-r100.ebuild
new file mode 100644
index 000000000000..c1d80c423c7d
--- /dev/null
+++ b/app-crypt/certbot-dns-nsone/certbot-dns-nsone-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="NS1 DNS Authenticator plugin for Certbot (Let’s Encrypt Client)"
+HOMEPAGE="
+	https://github.com/certbot/certbot
+	https://pypi.org/project/certbot-dns-nsone/
+	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-dns-nsone]
+"
+
+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-nsone] for this module."
+}
diff --git a/app-crypt/certbot-nginx/Manifest b/app-crypt/certbot-nginx/Manifest
index 43e0507dc00a..03051668e181 100644
--- a/app-crypt/certbot-nginx/Manifest
+++ b/app-crypt/certbot-nginx/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-nginx-2.10.0.ebuild 1164 BLAKE2B ff16d406ec7a3021a4bcd8e5c14ac019c403f30579a3ce2e969d58fd84eb8cca97917364276d84d005ff132b8f5b5e31cf6c1cfdf3c830f2b6d405fc268fb4dd SHA512 1b87b69774b282dae30d5ea4d54f1caac1a5de7d0e404ef7e4ced525465bf979cd695d59ea88f73caf7abd4f95224947ffe9771bfd529466ee78a267259f960a
 EBUILD certbot-nginx-3.1.0.ebuild 1126 BLAKE2B f261f82c3ae26c88a5a7ee5ef73e360bf9dfa4f56b253860083db96d96eb41989796d9959e347acd45d757056bf9768aa42bc5c4c0570b57ebd19b29a04e09de SHA512 3e1831829dcc04b8b092aeddc286966128137983876bad3266a477406d947626a052d4175bb159c30b27131e3cab0092cae4c656986ac18e1bfd56efcaf12f12
+EBUILD certbot-nginx-3.2.0-r100.ebuild 720 BLAKE2B 83bddf1b0f6c824dd313dab27fcee6c00c0a0cc10299b7a83fa9e4194b5d7c6ef24aaeb15ae86e2670e46cc9ad4beba95d589bdb5ab915792ad149c903bdc80c SHA512 f5f0eec989f387400750cd8fff38e8a256bc18676c6ee4d656785c0638f78bb8e160cd6bcaa4d87929ee9b2ce70c1b5cf22c7e6e1972670da5488dcb3b774c5f
 EBUILD certbot-nginx-3.2.0.ebuild 1094 BLAKE2B bf3198924825562244317e996d3ff234844b801121a4abc0fa416476c2707ad7094220a5d8cd4ff300257eb203a9473c061060b43d7dcca5df2b2336ef80642a SHA512 41764feba696a5a36b08af78f2c75d62d2d28c8dc523db35f953dc92b1dc2b0f98840b8de83908cb46a3a5c52834d4a593983c269af351312fee07eda38940b1
-EBUILD certbot-nginx-9999.ebuild 1126 BLAKE2B 78734ec57887a381835175c5f7e93c19905babfe939790045d20e3fa8619c7e573e77c664c983355c1166f25539fdb2616a989f6530756a90366bc3b7559658c SHA512 c59de36e98b8e3c65999c2e6ecab212c886d116912b81c4feeccc802618b8f9ead6d4285b9de4751cd5bfdc3f2cbc509c586e43bd38c552541f9dcdeae30043b
+EBUILD certbot-nginx-9999.ebuild 690 BLAKE2B e2bce47cadfe6b08d1c4c1e64a1c9f21d83e276fea39c0abded19f0fb09c50ebb20817aad37a7537a690e82f71fa322e82abb9f6bc2389b28358d800890eca5a SHA512 e0cb7e1839897f7a12c4305a0422f4c2427bc6e51ba27a78b74a1506b2975fc23acdcc6292a0d849404a361bed148bc188b749b86504bb207d71be11d5ebe739
 MISC metadata.xml 386 BLAKE2B 563da29504a6d168cd88576a509ff6934a5002b50ad4d3157746fd438bfc32eb8ce031ada46136e3f4cfe3ff3a26eae28b0532eb32020da730a8f93310ce492e SHA512 04549f9c813962d55b8594593409f961865117d6c463c057dbfd7d71d1ea7c8ff64c991371a266df279ad0ac4b3c3d25f684860e28933e5a840345c34af51fb1
diff --git a/app-crypt/certbot-nginx/certbot-nginx-3.2.0-r100.ebuild b/app-crypt/certbot-nginx/certbot-nginx-3.2.0-r100.ebuild
new file mode 100644
index 000000000000..3c44041c645b
--- /dev/null
+++ b/app-crypt/certbot-nginx/certbot-nginx-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="Nginx plugin for Certbot (Let’s Encrypt client)"
+HOMEPAGE="
+	https://github.com/certbot/certbot
+	https://pypi.org/project/certbot-nginx/
+	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-nginx]
+"
+
+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-nginx] for this module."
+}
diff --git a/app-crypt/certbot-nginx/certbot-nginx-9999.ebuild b/app-crypt/certbot-nginx/certbot-nginx-9999.ebuild
index d2c0abefda66..4e32e5329c4d 100644
--- a/app-crypt/certbot-nginx/certbot-nginx-9999.ebuild
+++ b/app-crypt/certbot-nginx/certbot-nginx-9999.ebuild
@@ -1,47 +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%-nginx}"
-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="Nginx plugin for Certbot (Let’s Encrypt client)"
 HOMEPAGE="
 	https://github.com/certbot/certbot
+	https://pypi.org/project/certbot-nginx/
 	https://letsencrypt.org/
 "
 
-S="${WORKDIR}/${PARENT_P}/${PN}"
-LICENSE="Apache-2.0"
+LICENSE="metapackage"
 SLOT="0"
 
-# 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="
-	>=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
-	>=app-crypt/certbot-${PV}[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-23.1.1[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.2.1[${PYTHON_USEDEP}]
+	>=app-crypt/certbot-9999[certbot-nginx]
 "
 
-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-nginx] for this module."
+}
diff --git a/app-crypt/certbot/Manifest b/app-crypt/certbot/Manifest
index ad8adbaf24df..2cf076317a99 100644
--- a/app-crypt/certbot/Manifest
+++ b/app-crypt/certbot/Manifest
@@ -8,7 +8,7 @@ EBUILD certbot-2.11.0-r3.ebuild 1532 BLAKE2B cbb39b14012b2e7575bf75535536c2c006b
 EBUILD certbot-2.11.0.ebuild 1528 BLAKE2B 34449bcf95187bed02f610a3ab4b5252e241b48385705c53bcf6afa140a4a5d7c216b50f0d2910d32b9f2dec37de298b29cc4106bcb91cf914938c2634725625 SHA512 c52d34a393a7788ae9062a752e3205218301a6b84b6716ebece6cc3b4568197b841cec020f14b71c66cc7790e1076b833bf286f950aeaf80015159e9187493fe
 EBUILD certbot-3.0.1.ebuild 1572 BLAKE2B 0200fb1f4425354e788fce567e63a4e302afa1409c73085491c3f32e7bce0d9830521e2907ad7c03f29f8e9ce10931a53bb11d385a643ee21417194c5767d453 SHA512 dd4680db1d2157a551d76639a4586b4ff6e9d68677e969009f78697a1b50a5e9799765102602a8075b3da41f93980060756c22f13a03f7152d92072eb4287e66
 EBUILD certbot-3.1.0.ebuild 1572 BLAKE2B 92f7bef4a2b4eaa3251d20fd44b33544687acd4cdc7aa2dc7d7bfea69a30163c13c19b2b4e0b78c9fc3c977054e35937d4bba387aa4bc3dce76ca573539e150e SHA512 f43cf0ceb6fb9644aa963b2e74f22cb5104ffcd5564b3d860ab449463a62f934aa34497119916825d6bf1eb701916caa48bb62b701344d167619ca778ee46c3a
-EBUILD certbot-3.2.0-r100.ebuild 6569 BLAKE2B c1bee15c1b8b04ec82ef46701aed25eac0820528c12ad2cc7e4e69fb535de22bd8a35feebaead266a56966f7bab77bd61b2c6bf8a5edadb6ae117e8ea43de6ca SHA512 3f77673f981f585a260a9d40ccf75f09072cd35f9a86e9047729a3274e70f400f001a13a1856f23ef7b302b3a1e8cbded498f42cfc566110e86a2cde4532e8e4
+EBUILD certbot-3.2.0-r100.ebuild 6699 BLAKE2B 3a612895bdca020cc34f2f939817f375509130ac93d994d5c20b8f268dc6b2143a1ae64d3579715dc57038fd917683575f0b640bfd6f874990b20d8435ea7a0d SHA512 c45daf603d6bae056975de47167a1f16a002ea296756458a1eeb481a5845e646f7eaf351c18bacbace30e5c6dab4c1b4fb7dd7d9a78f91de4e73a1e94f3fc001
 EBUILD certbot-3.2.0.ebuild 1572 BLAKE2B f70a02b18dfe12e3768ee98be8392c6d9d753dcb5a69f37aa488634748c7bf685abb6a5ffcbb8330f5b82808d6b9fcf7146c129c3b637134418710d9f65b9fac SHA512 4f0815c0a793bce1d2870480069dd67bcee5795638bb5b5cbf61334a019ea0cb31135df4f57c2488e67d23d928190f1f2d7d9ea6a54e59a8ec975eb46161b372
-EBUILD certbot-9999.ebuild 1572 BLAKE2B 0200fb1f4425354e788fce567e63a4e302afa1409c73085491c3f32e7bce0d9830521e2907ad7c03f29f8e9ce10931a53bb11d385a643ee21417194c5767d453 SHA512 dd4680db1d2157a551d76639a4586b4ff6e9d68677e969009f78697a1b50a5e9799765102602a8075b3da41f93980060756c22f13a03f7152d92072eb4287e66
+EBUILD certbot-9999.ebuild 6699 BLAKE2B 3a612895bdca020cc34f2f939817f375509130ac93d994d5c20b8f268dc6b2143a1ae64d3579715dc57038fd917683575f0b640bfd6f874990b20d8435ea7a0d SHA512 c45daf603d6bae056975de47167a1f16a002ea296756458a1eeb481a5845e646f7eaf351c18bacbace30e5c6dab4c1b4fb7dd7d9a78f91de4e73a1e94f3fc001
 MISC metadata.xml 1684 BLAKE2B 10bc000ed0b87bd03b7e58882c36e7100654a71a9d0e0ebaf29018524af20ab5fdbeb1ce950ab16a5fa33f99ccc3936c5070cc200e92700ecf21a74a44233fdd SHA512 db04143763a2a42fb026bbc51eae9128e30214873b134ccb4d4ad8fcbe7e1c7284b7928fcec2b6c6ea58dd49acc5cf33312c4fe0af3f001f69fc441032972369
diff --git a/app-crypt/certbot/certbot-3.2.0-r100.ebuild b/app-crypt/certbot/certbot-3.2.0-r100.ebuild
index dd7cd3d9d641..c14b47d5ff54 100644
--- a/app-crypt/certbot/certbot-3.2.0-r100.ebuild
+++ b/app-crypt/certbot/certbot-3.2.0-r100.ebuild
@@ -71,15 +71,15 @@ BDEPEND="
 
 # See each setup.py for dependencies
 # Also discard the previous related packages
+# except their transition step
 RDEPEND="
-	!app-crypt/acme
-	!app-crypt/certbot-apache
-	!app-crypt/certbot-nginx
-	!app-crypt/certbot-dns-dnsimple
-	!app-crypt/certbot-dns-nsone
-	!app-crypt/certbot-dns-cloudflare
-	!app-crypt/certbot-dns-desec
-	!app-crypt/certbot-dns-rfc2136
+	!<app-crypt/acme-3.2.0-r100
+	!<app-crypt/certbot-apache-3.2.0-r100
+	!<app-crypt/certbot-dns-desec-3.2.0-r100
+	!<app-crypt/certbot-dns-dnsimple-3.2.0-r100
+	!<app-crypt/certbot-dns-nsone-3.2.0-r100
+	!<app-crypt/certbot-dns-rfc2136-3.2.0-r100
+	!<app-crypt/certbot-nginx-3.2.0-r100
 
 	dev-python/chardet[${PYTHON_USEDEP}]
 	>=dev-python/configargparse-1.5.3[${PYTHON_USEDEP}]
@@ -137,6 +137,8 @@ RDEPEND="
 	selinux? ( sec-policy/selinux-certbot )
 "
 # RDEPEND+="
+#	!<app-crypt/certbot-dns-cloudflare-3.2.0-r100
+#
 # 	>=dev-python/requests-toolbelt-0.3.0[${PYTHON_USEDEP}] # @TODO is still necessary?
 # 	certbot-dns-cloudflare? (
 # 		# Available in GURU
diff --git a/app-crypt/certbot/certbot-9999.ebuild b/app-crypt/certbot/certbot-9999.ebuild
index c075f01eda7d..c14b47d5ff54 100644
--- a/app-crypt/certbot/certbot-9999.ebuild
+++ b/app-crypt/certbot/certbot-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -19,48 +19,263 @@ else
 		https://github.com/certbot/certbot/archive/v${PV}.tar.gz
 			-> ${P}.gh.tar.gz
 	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+	#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"
 fi
 
 DESCRIPTION="Let’s Encrypt client to automate deployment of X.509 certificates"
 HOMEPAGE="
-	https://github.com/certbot/certbot/
+	https://github.com/certbot/certbot
 	https://pypi.org/project/certbot/
 	https://letsencrypt.org/
 "
 
-S="${WORKDIR}/${P}/${PN}"
 LICENSE="Apache-2.0"
 SLOT="0"
 
+# acme required for certbot, and then required for modules
+CERTBOT_BASE=(acme certbot)
+# List of "subpackages" from tools/_release.sh (without acme which is already above)
+CERTBOT_MODULES_EXTRA=(
+	apache
+	#dns-cloudflare # Requires missing packages, already in GURU
+	#dns-digitalocean # Requires missing packages, already in GURU
+	dns-dnsimple
+	dns-dnsmadeeasy
+	dns-gehirn
+	dns-google
+	dns-linode
+	dns-luadns
+	dns-nsone
+	dns-ovh
+	dns-rfc2136
+	dns-route53
+	dns-sakuracloud
+	nginx
+)
+
 IUSE="selinux"
+for module in "${CERTBOT_MODULES_EXTRA[@]}"; do
+	IUSE+=" certbot-${module}"
+done
 
 BDEPEND="
 	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
 		dev-python/typing-extensions[${PYTHON_USEDEP}]
 	)
 "
 
-# See certbot/setup.py for acme >= dep
+# See each setup.py for dependencies
+# Also discard the previous related packages
+# except their transition step
 RDEPEND="
-	>=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
+	!<app-crypt/acme-3.2.0-r100
+	!<app-crypt/certbot-apache-3.2.0-r100
+	!<app-crypt/certbot-dns-desec-3.2.0-r100
+	!<app-crypt/certbot-dns-dnsimple-3.2.0-r100
+	!<app-crypt/certbot-dns-nsone-3.2.0-r100
+	!<app-crypt/certbot-dns-rfc2136-3.2.0-r100
+	!<app-crypt/certbot-nginx-3.2.0-r100
+
+	dev-python/chardet[${PYTHON_USEDEP}]
 	>=dev-python/configargparse-1.5.3[${PYTHON_USEDEP}]
 	>=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-3.2.1[${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/parsedatetime-2.4[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-25.0.0[${PYTHON_USEDEP}]
 	dev-python/pyrfc3339[${PYTHON_USEDEP}]
 	>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
+	certbot-apache? (
+		dev-python/python-augeas[${PYTHON_USEDEP}]
+	)
+	certbot-dns-dnsimple? (
+		>=dev-python/dns-lexicon-3.14.1[${PYTHON_USEDEP}]
+	)
+	certbot-dns-dnsmadeeasy? (
+		>=dev-python/dns-lexicon-3.14.1[${PYTHON_USEDEP}]
+	)
+	certbot-dns-gehirn? (
+		>=dev-python/dns-lexicon-3.14.1[${PYTHON_USEDEP}]
+	)
+	certbot-dns-google? (
+		>=dev-python/google-api-python-client-1.6.5[${PYTHON_USEDEP}]
+		>=dev-python/google-auth-2.16.0[${PYTHON_USEDEP}]
+	)
+	certbot-dns-linode? (
+		>=dev-python/dns-lexicon-3.14.1[${PYTHON_USEDEP}]
+	)
+	certbot-dns-luadns? (
+		>=dev-python/dns-lexicon-3.14.1[${PYTHON_USEDEP}]
+	)
+	certbot-dns-nsone? (
+		>=dev-python/dns-lexicon-3.14.1[${PYTHON_USEDEP}]
+	)
+	certbot-dns-ovh? (
+		>=dev-python/dns-lexicon-3.15.1[${PYTHON_USEDEP}]
+	)
+	certbot-dns-rfc2136? (
+		>=dev-python/dnspython-2.6.1[${PYTHON_USEDEP}]
+	)
+	certbot-dns-route53? (
+		>=dev-python/boto3-1.15.15[${PYTHON_USEDEP}]
+	)
+	certbot-dns-sakuracloud? (
+		>=dev-python/dns-lexicon-3.14.1[${PYTHON_USEDEP}]
+	)
+	certbot-nginx? (
+		>=dev-python/pyopenssl-25.0.0[${PYTHON_USEDEP}]
+		>=dev-python/pyparsing-2.4.7[${PYTHON_USEDEP}]
+	)
 	selinux? ( sec-policy/selinux-certbot )
 "
+# RDEPEND+="
+#	!<app-crypt/certbot-dns-cloudflare-3.2.0-r100
+#
+# 	>=dev-python/requests-toolbelt-0.3.0[${PYTHON_USEDEP}] # @TODO is still necessary?
+# 	certbot-dns-cloudflare? (
+# 		# Available in GURU
+# 		>=dev-python/cloudflare-2.19[${PYTHON_USEDEP}]
+# 		<dev-python/cloudflare-2.20[${PYTHON_USEDEP}]
+# 	)
+# 	certbot-dns-digitalocean? (
+# 		# Available in GURU
+# 		>=dev-python/digitalocean-1.11[${PYTHON_USEDEP}]
+# 	)
+# "
 
 distutils_enable_sphinx docs \
 	dev-python/sphinx-rtd-theme
 distutils_enable_tests pytest
 
+src_prepare() {
+	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_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
+
+	# Restore S
+	S="${S_BACKUP}"
+}
+
+src_compile() {
+	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_compile
+		popd > /dev/null || die
+	done
+
+	# Restore S
+	S="${S_BACKUP}"
+}
+
 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}"
+}
diff --git a/app-crypt/swtpm/Manifest b/app-crypt/swtpm/Manifest
index 2a8f514192c1..c960fd7f36c3 100644
--- a/app-crypt/swtpm/Manifest
+++ b/app-crypt/swtpm/Manifest
@@ -4,6 +4,6 @@ AUX swtpm-0.6.0-fix-localca-path.patch 1321 BLAKE2B 06d9e7409dda7554bd819a822e2e
 AUX swtpm-0.8.2-slibtool.patch 779 BLAKE2B 4403ddecb4d1b2f0f40c3f4511ccc51eb0345d8570a5b36ef125c8c8781d8bceee6741b08f77057ca9eb222cfe31045748e722d837c011a393512cd539c1f7e7 SHA512 37bdaf16950b3b94af4ea8d8f042919a550fae1c9a8519eac36acc1fa289daa5677ba227b5e5a224a98b4f6859335a3f4e10de293c8283ac87474a84cef49f9a
 DIST swtpm-0.10.0.tar.gz 414698 BLAKE2B 62ebc5638e7c0b6c2be42d8da5369dfce708339882b582b154aa46d5ae6ed4a59f4e6cc31a05b062190b98a461caed82281bf64b05e8941d3923d200cfde501c SHA512 6f1848b0514799417582c1a5bedf9b7110e3627ab14f02ea193ad76ce8a188eba596494f410405c5f7226e2daf7d9ee889983a2265285839e72de12e6368180d
 DIST swtpm-0.9.0.tar.gz 370942 BLAKE2B bed63851dfdb94f463bbac962044114f75abd36f6558f173fd67be608f50c8954c6038d33bb6e3d2e88427238c7c06048beae23b84b2a1e186c0de98a9bd5ad8 SHA512 4f1723679b85218e80ea6aacdffa687e541ee309ddab9bcb8d8e5aa0b461ee431c880f2e300f1dcae112646f3636593005a342ee0cb762ec115aa599369e111c
-EBUILD swtpm-0.10.0.ebuild 1663 BLAKE2B 5619e526a23d903de5bbdbb1c992855158808d9527946301a0476df44418f5c841f4b5b9b5826d19241f564defc9e8834aecbcfd79e38ecf18bf694d92ae74bb SHA512 1ea5a372e9dc12a9fce448b9bc6fbcca2d673d305356ec02661597e191190da6ece97e8aed214702d5a91f08f4c9df6f6fd4d4313b1745013c78127e5c376b53
+EBUILD swtpm-0.10.0.ebuild 1662 BLAKE2B efed6a7b0df16b1a86b05f7b0f81ee85166cb50a16309fbef92f72a1db6622b452fc4c887a850963248dbc3c3522971571fe114c1bbe2ac552601fa26ae8b3b0 SHA512 5bbe5f36636b326a10bc2702dcc93b5b5bb4f5502304ef48fe8d33fc118ca6b15431aed20649ce4aa94708fe0e60ba44e174803ddbbdf63f9dc966fc358dba4b
 EBUILD swtpm-0.9.0.ebuild 1602 BLAKE2B 2370b7d3776c44a308fe6b15a87c4632b800a233974e951f7a6e254784c73921d141ac90cbfd84b925ab5f43ca13e0feceb113f7186585b52b5f9d24270c4108 SHA512 5dcf477bf01109b2086628ec4beb030eb37cf046051cdd31052708b9ef62ebfc124a3e5828c9ce2bb6cac9617106e6bcf0b7c55b7744b0cbfc826da0c294be61
 MISC metadata.xml 717 BLAKE2B 70de08f9ed69084e7ed07c72ae96ab76cdb8bf489c3d3664edab24d2a904f44a6483bb9685f0e97f4520420dab1b6796e58cff00ba82190459af12398aa4b6d1 SHA512 a4f2977c84e03e215f6455def44ead6f767d6a4803061942b799b38bedaada373b51bbd47bd87c4339df32138a339b5f595a5ea19c5706b5e424329cc8aec0a5
diff --git a/app-crypt/swtpm/swtpm-0.10.0.ebuild b/app-crypt/swtpm/swtpm-0.10.0.ebuild
index b2912798134f..54e6e77a0072 100644
--- a/app-crypt/swtpm/swtpm-0.10.0.ebuild
+++ b/app-crypt/swtpm/swtpm-0.10.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/stefanberger/swtpm/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv x86"
 IUSE="fuse seccomp test"
 RESTRICT="!test? ( test )"