gentoo auto-resync : 13:07:2024 - 12:26:41

22 files changed, 84 insertions, 129 deletions

diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 9351d24a4d7d..ee9397d011ce 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/acme/Manifest b/app-crypt/acme/Manifest
index fcea2f7c7d45..2d8b0efd26f9 100644
--- a/app-crypt/acme/Manifest
+++ b/app-crypt/acme/Manifest
@@ -1,4 +1,4 @@
 DIST certbot-2.10.0.gh.tar.gz 2322931 BLAKE2B cb84815ec2db2b4b365f2f2bdee1749263b540a1b67f9195280bdb122307337d294beb403bc05b236a94ed0782b0d093e2b8527a65cb69cac949fa627388e8bd SHA512 444981952140376808a9aa475a692df91e60fffc6d45902a3f809bc07311a7d6597ad56e712d3dae234450eb1c735db431182e784bc748511e68bf4f5f2d6cbd
-EBUILD acme-2.10.0.ebuild 1505 BLAKE2B adad3e39f8383ddabc5c44c32b1e15bdc947240d4c19902ece9c5020c0224b8565ab9a8c9c9f6a3eb6bb1cac434feca8813c06488788dfd11094738f78c02062 SHA512 3f33ac1862f9a7fae75d94f3d7cc5b25a3ce67b3b3386adf16590d6bfce0115b87d15ac973bd44c8e1fc758345cd099cf681267a7aecd4209cde181ba020ec8a
-EBUILD acme-9999.ebuild 1509 BLAKE2B 7c3b706bb30d7df6cf4e5266da927d5ee8b9945a50c7ffc207b971c1932dfb5ef397bedc498cd489afc436af2a471a8016ebf7791f6e0d8187b96f128110fe54 SHA512 e446e337620c4fa03a2a15c352ebe2cfa819a624a179cb26f2a5e60557e8a9a007ba7d83c06ead880eae2333ac5f38b9a87d4a1d79f89c49bbb16af413aa3ca1
+EBUILD acme-2.10.0.ebuild 1531 BLAKE2B 15f0041fcccb610f9fc9b4ca24ebcf871b5577bdc82e266c7fb4efe929dc431bd4020ee903510399fea14972d0a20590ca3471d6ec7c5f02e6cd0e4c0e406372 SHA512 b63e983e64a5a65f5c5f19a579c57ee8269ae8840e3c2afd2c16b2d4bc57290425d49d7882de4b1afcf7a5bfaf51bdea524e4f93d127d13eb2452a38e3f65270
+EBUILD acme-9999.ebuild 1535 BLAKE2B 33a51a7dac9b7af72bcedeec816cbe5142a948f2d86c1843020c356c020a9b835a38fea1b557148c9b1b3727753d391c31e13a5533553e0c030c6d5fb93c5ce9 SHA512 1d88d4a3814ee9204b57d2f2623bdf7afc29d9c3cceece965802cfb03361e30bab6f4e8cf66bb31b41e3353e63d0f4383c1e17ab1b4789aaa196e2367e647193
 MISC metadata.xml 401 BLAKE2B 30a2ac1f03749a8e3bb98723c57f47ab6bcf7bfa58c2b6e21c309fae279feca0d3612df6c2a1dafaf27b4f0781c583a140322feac1a1cf2c13e50861cad129ea SHA512 d8e725b71ca81ce4ca6565ed58271b283c25394448f0f48f726f232122577c33d5b2d726e117419b2fae99f9dae29a8080bb9564eccbca13368c83988cf3da01
diff --git a/app-crypt/acme/acme-2.10.0.ebuild b/app-crypt/acme/acme-2.10.0.ebuild
index c4eb5dcd71c8..92f4d9253ea9 100644
--- a/app-crypt/acme/acme-2.10.0.ebuild
+++ b/app-crypt/acme/acme-2.10.0.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..12} )
 DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..13} )
 
 inherit distutils-r1
 
@@ -27,7 +27,8 @@ 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/
 "
 
@@ -37,8 +38,6 @@ SLOT="0"
 
 BDEPEND="
 	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
 		dev-python/typing-extensions[${PYTHON_USEDEP}]
 	)
 "
@@ -55,5 +54,11 @@ RDEPEND="
 	>=dev-python/requests-toolbelt-0.3.0[${PYTHON_USEDEP}]
 "
 
-distutils_enable_sphinx docs dev-python/sphinx-rtd-theme
+distutils_enable_sphinx docs \
+	dev-python/sphinx-rtd-theme
 distutils_enable_tests pytest
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
diff --git a/app-crypt/acme/acme-9999.ebuild b/app-crypt/acme/acme-9999.ebuild
index 1bdc2aa52244..7cc340a48d80 100644
--- a/app-crypt/acme/acme-9999.ebuild
+++ b/app-crypt/acme/acme-9999.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..12} )
 DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..13} )
 
 inherit distutils-r1
 
@@ -27,7 +27,8 @@ 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/
 "
 
@@ -37,8 +38,6 @@ SLOT="0"
 
 BDEPEND="
 	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
 		dev-python/typing-extensions[${PYTHON_USEDEP}]
 	)
 "
@@ -55,5 +54,11 @@ RDEPEND="
 	>=dev-python/requests-toolbelt-0.3.0[${PYTHON_USEDEP}]
 "
 
-distutils_enable_sphinx docs dev-python/sphinx-rtd-theme
+distutils_enable_sphinx docs \
+	dev-python/sphinx-rtd-theme
 distutils_enable_tests pytest
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
diff --git a/app-crypt/certbot-apache/Manifest b/app-crypt/certbot-apache/Manifest
index e604903cd17f..fdd02d912a36 100644
--- a/app-crypt/certbot-apache/Manifest
+++ b/app-crypt/certbot-apache/Manifest
@@ -1,4 +1,4 @@
 DIST certbot-2.10.0.gh.tar.gz 2322931 BLAKE2B cb84815ec2db2b4b365f2f2bdee1749263b540a1b67f9195280bdb122307337d294beb403bc05b236a94ed0782b0d093e2b8527a65cb69cac949fa627388e8bd SHA512 444981952140376808a9aa475a692df91e60fffc6d45902a3f809bc07311a7d6597ad56e712d3dae234450eb1c735db431182e784bc748511e68bf4f5f2d6cbd
-EBUILD certbot-apache-2.10.0.ebuild 1075 BLAKE2B 0cb18c2288f4442b6d59e5ec8192cddc5b85e0d84f3d3fb515b7cabd0df7644fb302a607fec3ba4e7bd44869e4dc4097572f5ba11bc49e0b7b2616fc19e5803e SHA512 52175f4e9e7335b694d7641e0627af39c1212ed053dac10679d8b73274c6a4cb47deb82a74bdf1b3150bf7209af1fd1faa1dbeaa5571b4788068914cbb097cf6
-EBUILD certbot-apache-9999.ebuild 1077 BLAKE2B 97f45a1a0071324b429819b7d7a2e82be3d0aa1521895fba504412da1feb9a4da00cca26c07cb9c8a4cc36653556883731ab0038398957bfd2d4ea3336b409c3 SHA512 7e16b7166e626fd6f533402efa5b8835941ffb00d8c2cb09f985401a4955d05b306ac5b3ef35f2542037dbe0f526ea4e321b9da0d2164b15f6f95db61a92f914
-MISC metadata.xml 359 BLAKE2B 7f8ac46ecea304579baca80978cc35905720d1950caa183b5b5b297afab8bf6ea328324bacc438e9ecd91176230e42e55deda1c15e1ba73c63b2021ac2842c0f SHA512 a50b1db5a30eac290ac6645fcb30b0d5c4d8e51d83cff284e76358ee4fe7cef9366e40b06f532ba64a2131672972ea10b73541a9bd42cc323c17f6d26f6b0197
+EBUILD certbot-apache-2.10.0.ebuild 1059 BLAKE2B 2641256468b204ce2a9594154025201ec733d73ecd6191cfeae7143db0ff860f1a12a65cea08bd07163a3ae9ef3809582bf1646f9077d8191c4a9fa8ef0830c8 SHA512 6077a0fa14c31bdeab385fb3c81ee831576e0baabb1aa76d153e046cc1d5a6919ec64050f6eaa3297d6a2cf2307c243d4244326070af0317858e58ab92cf49d4
+EBUILD certbot-apache-9999.ebuild 1061 BLAKE2B a2e239e321f4087db6bb21f600cff8ed20ae1add9b4e402f5ca2a1762633a7a2a2edf7e9dcec510ef21b68ed91d68064a573e8bb9c186d77a89d36ac4baa5e83 SHA512 77fdc3ea4cce89c1811f6dad1cdda02b18a6f3f394acd908ef168d958337dac200c109ddce5fbdf299afaaf6c4315c8af60242a72d6f66b1cfee994b419af6e2
+MISC metadata.xml 411 BLAKE2B 5876f2ab00aae84a0649504ffa17ea14abba64e38c915adb12f8817736b83ca19b4c220d79fff23259a772a621c145b0987bbe9ac959b956113b2e1ec40f5123 SHA512 ab6822225853f8941e2bf841b945c3dc484eb9c9667f8583f52951ca87e264315a50d44985fbd9487793e8b72c9a0bd05c0a267f06bf60f64003ad94820267ba
diff --git a/app-crypt/certbot-apache/certbot-apache-2.10.0.ebuild b/app-crypt/certbot-apache/certbot-apache-2.10.0.ebuild
index 60a48f903d53..a577178eee91 100644
--- a/app-crypt/certbot-apache/certbot-apache-2.10.0.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-2.10.0.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..12} )
 DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..13} )
 
 inherit distutils-r1
 
@@ -28,7 +28,8 @@ 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/
 "
 
@@ -36,10 +37,6 @@ S="${WORKDIR}/${PARENT_P}/${PN}"
 LICENSE="Apache-2.0"
 SLOT="0"
 
-BDEPEND="
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-
 RDEPEND="
 	>=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
 	>=app-crypt/certbot-${PV}[${PYTHON_USEDEP}]
diff --git a/app-crypt/certbot-apache/certbot-apache-9999.ebuild b/app-crypt/certbot-apache/certbot-apache-9999.ebuild
index fb8db6b19c03..940cfe35b4bb 100644
--- a/app-crypt/certbot-apache/certbot-apache-9999.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-9999.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..12} )
 DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..13} )
 
 inherit distutils-r1
 
@@ -28,7 +28,8 @@ 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/
 "
 
@@ -36,10 +37,6 @@ S="${WORKDIR}/${PARENT_P}/${PN}"
 LICENSE="Apache-2.0"
 SLOT="0"
 
-BDEPEND="
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-
 RDEPEND="
 	>=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
 	>=app-crypt/certbot-${PV}[${PYTHON_USEDEP}]
diff --git a/app-crypt/certbot-apache/metadata.xml b/app-crypt/certbot-apache/metadata.xml
index 9a9d9e317b99..252f51dabde0 100644
--- a/app-crypt/certbot-apache/metadata.xml
+++ b/app-crypt/certbot-apache/metadata.xml
@@ -8,5 +8,6 @@
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">certbot/certbot</remote-id>
+		<remote-id type="pypi">certbot-apache</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-crypt/certbot-dns-dnsimple/Manifest b/app-crypt/certbot-dns-dnsimple/Manifest
index 6e0690b525c1..d4aee39c6c57 100644
--- a/app-crypt/certbot-dns-dnsimple/Manifest
+++ b/app-crypt/certbot-dns-dnsimple/Manifest
@@ -1,5 +1,3 @@
 DIST certbot-2.10.0.gh.tar.gz 2322931 BLAKE2B cb84815ec2db2b4b365f2f2bdee1749263b540a1b67f9195280bdb122307337d294beb403bc05b236a94ed0782b0d093e2b8527a65cb69cac949fa627388e8bd SHA512 444981952140376808a9aa475a692df91e60fffc6d45902a3f809bc07311a7d6597ad56e712d3dae234450eb1c735db431182e784bc748511e68bf4f5f2d6cbd
-DIST certbot-2.6.0.gh.tar.gz 1336339 BLAKE2B 0c0575ad553ebe0f3ab56da750572bca46b30d034033e43c30c3793c114050ad824a277eab0be5a47326ea099e58e9a421448b53fc1b9173afae9a0ec308ac62 SHA512 d694156886484511f5a38fb5e40f98b2e2dbe4bc5110c95b2084ec03b39cb0eb9bbc623c7bca4a81054e980c8dbac752949042391813298a27be7e70410882e3
-EBUILD certbot-dns-dnsimple-2.10.0.ebuild 834 BLAKE2B 9525ba9439f154e378e3760d862e2026a3cd13e6641107c81ab4f4a62fe2342ac1fb7a7761201df5c800d2989327a8f53f7bda6cd796a95eb1f821159e89cf1b SHA512 6336a2d2d66225a27da377c5c7d9eb8f4f386017fe7da6f50b9f0b24a331e2d4097d5b32119ae6494138d2476edd96ca6e50c3574d9bb20fcd606284be1f002d
-EBUILD certbot-dns-dnsimple-2.6.0.ebuild 834 BLAKE2B 0c8ac17177cbcffd622dfa9dbb056803200787b5d1ee4db905da38015f0339d46fcbd340aa9aaf20bae7cd553cb3428f394f6abe6e5e41eac11bccd6189bc4c8 SHA512 8e0d5f8bc0f73d1dd3ad3034ebb821552b779d75744f847e14a6c7ac7c136153b1aba2aa0ca12280bdbc4c88a662dae591c77051ae0c209a4efb06076b64593d
+EBUILD certbot-dns-dnsimple-2.10.0.ebuild 899 BLAKE2B 7cf6e2cab506a2835651cc2072e6f9deca6173aeddcbc7a8b655f7d9b7052de25e2f36c23b1777ae2dfe5ce6643f721d09218b458b71abe97276f0cc894eb318 SHA512 710fb98ebca2be80b7a4dda4dfdf9a3cf15caf783b86ee2579e30d7be60efd8c90da2a03bc0163fd7401c54b2a1e2f1db5499014ebad5b0b8e611ccc5b4ca196
 MISC metadata.xml 569 BLAKE2B d554766b1b933cefdeced04082594e224d1f6bc66036cacecb649f2c21a0135ee5000a043c0587157453afb4a3f4ffd8096a89c654124d9424db4456bee8cf53 SHA512 fd01e6495d9fd1d28ce47a729bf014b953b57cd01227e682fd6f34c1e0fc15f4799d7cff98fb0e9eb3af150765b6906ec15693257a125e65187469ab451c38d3
diff --git a/app-crypt/certbot-dns-dnsimple/certbot-dns-dnsimple-2.10.0.ebuild b/app-crypt/certbot-dns-dnsimple/certbot-dns-dnsimple-2.10.0.ebuild
index 49462ea339f0..a1f386d01a17 100644
--- a/app-crypt/certbot-dns-dnsimple/certbot-dns-dnsimple-2.10.0.ebuild
+++ b/app-crypt/certbot-dns-dnsimple/certbot-dns-dnsimple-2.10.0.ebuild
@@ -4,16 +4,23 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 
 inherit distutils-r1
 
+MY_P=certbot-${PV}
 DESCRIPTION="DNSimple Authenticator plugin for Certbot (Let's Encrypt Client)"
-HOMEPAGE="https://github.com/certbot/certbot https://certbot-dns-dnsimple.readthedocs.io/en/stable/"
+HOMEPAGE="
+	https://github.com/certbot/certbot/
+	https://pypi.org/project/certbot-dns-dnsimple/
+	https://certbot-dns-dnsimple.readthedocs.io/en/stable/
+"
 # Use common certbot tarball
-SRC_URI="https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> certbot-${PV}.gh.tar.gz"
-
-S="${WORKDIR}/certbot-${PV}/${PN}"
+SRC_URI="
+	https://github.com/certbot/certbot/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}/${PN}
 
 LICENSE="Apache-2.0"
 SLOT="0"
@@ -25,5 +32,6 @@ RDEPEND="
 	>=dev-python/dns-lexicon-3.2.1[${PYTHON_USEDEP}]
 "
 
-distutils_enable_sphinx docs dev-python/sphinx-rtd-theme
+distutils_enable_sphinx docs \
+	dev-python/sphinx-rtd-theme
 distutils_enable_tests pytest
diff --git a/app-crypt/certbot-dns-dnsimple/certbot-dns-dnsimple-2.6.0.ebuild b/app-crypt/certbot-dns-dnsimple/certbot-dns-dnsimple-2.6.0.ebuild
deleted file mode 100644
index 9169bbe14d00..000000000000
--- a/app-crypt/certbot-dns-dnsimple/certbot-dns-dnsimple-2.6.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="DNSimple Authenticator plugin for Certbot (Let's Encrypt Client)"
-HOMEPAGE="https://github.com/certbot/certbot https://certbot-dns-dnsimple.readthedocs.io/en/stable/"
-# Use common certbot tarball
-SRC_URI="https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> certbot-${PV}.gh.tar.gz"
-
-S="${WORKDIR}/certbot-${PV}/${PN}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
-	>=app-crypt/certbot-${PV}[${PYTHON_USEDEP}]
-	>=dev-python/dns-lexicon-3.2.1[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx docs dev-python/sphinx-rtd-theme
-distutils_enable_tests pytest
diff --git a/app-crypt/certbot-dns-nsone/Manifest b/app-crypt/certbot-dns-nsone/Manifest
index ac921d708170..97157e1cd11b 100644
--- a/app-crypt/certbot-dns-nsone/Manifest
+++ b/app-crypt/certbot-dns-nsone/Manifest
@@ -1,5 +1,3 @@
 DIST certbot-1.18.0.gh.tar.gz 1332615 BLAKE2B eb086710b943893025d6e1091470ca02de074232372f4c9fa21fa83a347fe54df988b9553c8cf6afd6e166b8c464d595171984c984008a872e16c0179bb774b2 SHA512 94b16ba0586e0f5d3036280c68f9976c25889ca48fbbe7aded41f0d9feba2300a3f0ff8fe321b39d8642bcdd874c7332cf2acb3187b5869fe415831f58a75a7b
-DIST certbot-dns-nsone-1.18.0.tar.gz 1332615 BLAKE2B eb086710b943893025d6e1091470ca02de074232372f4c9fa21fa83a347fe54df988b9553c8cf6afd6e166b8c464d595171984c984008a872e16c0179bb774b2 SHA512 94b16ba0586e0f5d3036280c68f9976c25889ca48fbbe7aded41f0d9feba2300a3f0ff8fe321b39d8642bcdd874c7332cf2acb3187b5869fe415831f58a75a7b
-EBUILD certbot-dns-nsone-1.18.0-r1.ebuild 833 BLAKE2B b6bbb8014daf1a3d4335dacffa96eef48de5adf1145813bc007bde84e159d1c9789743050ae0a3e87cd21f78727d0debde9ff7601db205c6b7c3fb977b5f2635 SHA512 b345a9bf69eecbbdb39b1320d15a35e89c17c7c3eedd1f4b4072f1ac4733f90f2d00d532ea0db39c86a6cbf2692c70958175be50055b92d816b91a792143a2f0
-EBUILD certbot-dns-nsone-1.18.0.ebuild 801 BLAKE2B 79003cfd8adc8b0b59771a7529667eee0c7703ddf983174583bd4d6c24e4fee744864604ae857f1147c79afc1ddd1e1fb195734e71d16b6a5a5643b403475335 SHA512 90265df0cfd07ed5bb225e08ff656e48c829410f654ab211244d6500bad64302e68004aecd9def00f3d217c2f620875d777b792c631facd2974ccf821b72bfd4
+EBUILD certbot-dns-nsone-1.18.0-r1.ebuild 881 BLAKE2B 618bd9da56d0c182196aa57ff92c6883ee3b09d4ae216615500d39b2c2faaf68e3af2a12261f39678fc9235154940a33f6c7ce49752efabf24c7bd6bf7e92b52 SHA512 c3b3c9b7fd5336fe7280cdee2b38613a27f8e4cc99b116f07899339acb220f56cdb2defdb923ed5e0dfc99c5233ad19daa75b68b327a3090f9e91a676051da0d
 MISC metadata.xml 407 BLAKE2B 8f65d9f92992da12fcd4fcb71f67ee91b1029af1a784bd03e2d3726a1ac9bb14f161692b2f12c9553e0fc6e45d6088e505a8d616f3c209445332a191f572e731 SHA512 b7ded216ba7f9e9babdfef03565444233d48e132807064bb9befb3a551b1344e75def76da891a5e40f102610da8ca05e6182f0501bf296c25543fae378c94ccd
diff --git a/app-crypt/certbot-dns-nsone/certbot-dns-nsone-1.18.0-r1.ebuild b/app-crypt/certbot-dns-nsone/certbot-dns-nsone-1.18.0-r1.ebuild
index 530fec9a0dfb..c8fab3722ee6 100644
--- a/app-crypt/certbot-dns-nsone/certbot-dns-nsone-1.18.0-r1.ebuild
+++ b/app-crypt/certbot-dns-nsone/certbot-dns-nsone-1.18.0-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 
 inherit distutils-r1
 
@@ -12,6 +12,7 @@ MY_P=certbot-${PV}
 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/
 "
 SRC_URI="
@@ -31,5 +32,6 @@ RDEPEND="
 	>=dev-python/dns-lexicon-3.2.1[${PYTHON_USEDEP}]
 "
 
-distutils_enable_sphinx docs dev-python/sphinx-rtd-theme
+distutils_enable_sphinx docs \
+	dev-python/sphinx-rtd-theme
 distutils_enable_tests pytest
diff --git a/app-crypt/certbot-dns-nsone/certbot-dns-nsone-1.18.0.ebuild b/app-crypt/certbot-dns-nsone/certbot-dns-nsone-1.18.0.ebuild
deleted file mode 100644
index 8691a783350c..000000000000
--- a/app-crypt/certbot-dns-nsone/certbot-dns-nsone-1.18.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_10 )
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-SRC_URI="https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-S=${WORKDIR}/certbot-${PV}/${PN}
-
-inherit distutils-r1
-
-DESCRIPTION="NS1 DNS Authenticator plugin for Certbot (Let's Encrypt Client)"
-HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-RDEPEND="
-	>=app-crypt/certbot-${PV}[${PYTHON_USEDEP}]
-	>=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]
-	>=dev-python/dns-lexicon-3.2.1[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx docs dev-python/sphinx-rtd-theme
-distutils_enable_tests pytest
diff --git a/app-crypt/certbot-nginx/Manifest b/app-crypt/certbot-nginx/Manifest
index b9c4ba13bea1..6cd9f932e7f5 100644
--- a/app-crypt/certbot-nginx/Manifest
+++ b/app-crypt/certbot-nginx/Manifest
@@ -1,4 +1,4 @@
 DIST certbot-2.10.0.gh.tar.gz 2322931 BLAKE2B cb84815ec2db2b4b365f2f2bdee1749263b540a1b67f9195280bdb122307337d294beb403bc05b236a94ed0782b0d093e2b8527a65cb69cac949fa627388e8bd SHA512 444981952140376808a9aa475a692df91e60fffc6d45902a3f809bc07311a7d6597ad56e712d3dae234450eb1c735db431182e784bc748511e68bf4f5f2d6cbd
-EBUILD certbot-nginx-2.10.0.ebuild 1181 BLAKE2B 51a16d81e44535bffda13ef01946bfeed350bc14cee45add0a81c199f78c58e4c53dc18c9dc897caa03b8862fbcde2fdb33866bed4a61b1c9ed4e2f26da8531f SHA512 e4d049958a31d7fd00ab726395087b3418dc196e1292f29f5a99140d981889a989725bb23d436f65ee9f468251d01ad9f63633acec5f1bfb4c405cf901fc48ed
-EBUILD certbot-nginx-9999.ebuild 1185 BLAKE2B e6e9e5af8cbed1873b6429cf15974d2d91ae7f836814815e79a23e40d67c81679d9532331b7b67cd76117a80f094c0d392579080548e814db450add5a2b724d8 SHA512 f8ed3a116230a1f1f56002fe9db704928fcccd2b410543e646a0bed7b8c56ce1a1c3a47bf126b8292bbd2325d4369084b3397660fa625197082dfe30d0f2f7ac
-MISC metadata.xml 335 BLAKE2B 048854ec6bc919f9bf9b0bc74e7c291841cbfea0e571f43437937c5dd78cc65f9df53463adcf313441e01323491709b462bd9bc364876eb1508a83b3426b6b78 SHA512 25ac45574a568e362c419dfbeade4a977afa2885e7b32fb4c3d4c765450b09aa98cf419df1a39ab194518ad6f2b582e162d4dd4eec14f278635d63bf66352523
+EBUILD certbot-nginx-2.10.0.ebuild 1164 BLAKE2B ff16d406ec7a3021a4bcd8e5c14ac019c403f30579a3ce2e969d58fd84eb8cca97917364276d84d005ff132b8f5b5e31cf6c1cfdf3c830f2b6d405fc268fb4dd SHA512 1b87b69774b282dae30d5ea4d54f1caac1a5de7d0e404ef7e4ced525465bf979cd695d59ea88f73caf7abd4f95224947ffe9771bfd529466ee78a267259f960a
+EBUILD certbot-nginx-9999.ebuild 1126 BLAKE2B 78734ec57887a381835175c5f7e93c19905babfe939790045d20e3fa8619c7e573e77c664c983355c1166f25539fdb2616a989f6530756a90366bc3b7559658c SHA512 c59de36e98b8e3c65999c2e6ecab212c886d116912b81c4feeccc802618b8f9ead6d4285b9de4751cd5bfdc3f2cbc509c586e43bd38c552541f9dcdeae30043b
+MISC metadata.xml 386 BLAKE2B 563da29504a6d168cd88576a509ff6934a5002b50ad4d3157746fd438bfc32eb8ce031ada46136e3f4cfe3ff3a26eae28b0532eb32020da730a8f93310ce492e SHA512 04549f9c813962d55b8594593409f961865117d6c463c057dbfd7d71d1ea7c8ff64c991371a266df279ad0ac4b3c3d25f684860e28933e5a840345c34af51fb1
diff --git a/app-crypt/certbot-nginx/certbot-nginx-2.10.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-2.10.0.ebuild
index 87265cf83dd8..b60917d51d4f 100644
--- a/app-crypt/certbot-nginx/certbot-nginx-2.10.0.ebuild
+++ b/app-crypt/certbot-nginx/certbot-nginx-2.10.0.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..12} )
 DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..13} )
 
 inherit distutils-r1
 
@@ -27,7 +27,8 @@ fi
 
 DESCRIPTION="Nginx plugin for Certbot (Let’s Encrypt client)"
 HOMEPAGE="
-	https://github.com/certbot/certbot
+	https://github.com/certbot/certbot/
+	https://pypi.org/project/certbot-nginx/
 	https://letsencrypt.org/
 "
 
@@ -35,10 +36,6 @@ S="${WORKDIR}/${PARENT_P}/${PN}"
 LICENSE="Apache-2.0"
 SLOT="0"
 
-BDEPEND="
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-
 # The requirement is really 17.5.0 but easier to require latest stable >= 23.1.1
 # to avoid broken 23.1.0.
 RDEPEND="
diff --git a/app-crypt/certbot-nginx/certbot-nginx-9999.ebuild b/app-crypt/certbot-nginx/certbot-nginx-9999.ebuild
index a8a7e0f2fb38..d2c0abefda66 100644
--- a/app-crypt/certbot-nginx/certbot-nginx-9999.ebuild
+++ b/app-crypt/certbot-nginx/certbot-nginx-9999.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..12} )
 DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..13} )
 
 inherit distutils-r1
 
@@ -35,10 +35,6 @@ S="${WORKDIR}/${PARENT_P}/${PN}"
 LICENSE="Apache-2.0"
 SLOT="0"
 
-BDEPEND="
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-
 # The requirement is really 17.5.0 but easier to require latest stable >= 23.1.1
 # to avoid broken 23.1.0.
 RDEPEND="
diff --git a/app-crypt/certbot-nginx/metadata.xml b/app-crypt/certbot-nginx/metadata.xml
index bcff10da4348..05d4931fecfd 100644
--- a/app-crypt/certbot-nginx/metadata.xml
+++ b/app-crypt/certbot-nginx/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">certbot/certbot</remote-id>
+		<remote-id type="pypi">certbot-nginx</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-crypt/certbot/Manifest b/app-crypt/certbot/Manifest
index d4362fcd5f5d..e56e57c15d4c 100644
--- a/app-crypt/certbot/Manifest
+++ b/app-crypt/certbot/Manifest
@@ -1,4 +1,4 @@
 DIST certbot-2.10.0.gh.tar.gz 2322931 BLAKE2B cb84815ec2db2b4b365f2f2bdee1749263b540a1b67f9195280bdb122307337d294beb403bc05b236a94ed0782b0d093e2b8527a65cb69cac949fa627388e8bd SHA512 444981952140376808a9aa475a692df91e60fffc6d45902a3f809bc07311a7d6597ad56e712d3dae234450eb1c735db431182e784bc748511e68bf4f5f2d6cbd
-EBUILD certbot-2.10.0.ebuild 1541 BLAKE2B 98b54be4e3b7f3805ea65ef9b3d3510294e57635ca78ab3efc47954a22f5d4da04c0eca5b0aecb440f397049c42de52930ea6bfbc1570f3d32baca757863450b SHA512 be80f8f29e5980033be66446a819c33a701c40de3df20466d7e87b35092d536c3b490c7edf77f14aa75bb3f0eca9366f6663e9038df22a57acd9e5621a02a6f3
-EBUILD certbot-9999.ebuild 1545 BLAKE2B 66fec8af07a14412fcaeb91115b01ef3fe41bbb9d977a4f5d7df07fcc46e4d872f15944600671a38d6e14fd3ea168082f9c6a1793055e5c7ceda8f7b6946d088 SHA512 f348c10f858424243dc4b2b1b867f61449f095ef0f165b46092ead906d4e1a162c0ba646efc97c40e29ea22c1e80374ecb60fecfce34f743eb6575e1487c2a3c
-MISC metadata.xml 359 BLAKE2B 7f8ac46ecea304579baca80978cc35905720d1950caa183b5b5b297afab8bf6ea328324bacc438e9ecd91176230e42e55deda1c15e1ba73c63b2021ac2842c0f SHA512 a50b1db5a30eac290ac6645fcb30b0d5c4d8e51d83cff284e76358ee4fe7cef9366e40b06f532ba64a2131672972ea10b73541a9bd42cc323c17f6d26f6b0197
+EBUILD certbot-2.10.0.ebuild 1528 BLAKE2B 545abbd95761600f13ec22cbcf996ca4b1a04a1fb08b0dadcefa9696a35a3765f009733c3a8b153e22d24df223cb778ac05684110188a7886ee3eed2498d472c SHA512 43c0107185d0e36b0630d5b69e77bc32d43c6dcfe254b5fb8d0f92ae105452f3ca4013a6f1a859a85e0e473855d898637eb1938e7fd67fe138eb29700c3cd839
+EBUILD certbot-9999.ebuild 1532 BLAKE2B 0fa348ecdb0750887cfd220ae9d55e147771b8fc503f2c8ee5d1004066ed1d4a3dccd804088271e09005939483871012f879e327ded91a5657a0205b7079ec89 SHA512 52bc685c1ab676c4f4dd96d40b3ea990a90b67a6d3977eca3e8bc3c7448f841d3a943458245ab16f217acb8db23882139d7fe6b871b2781e62d447c65d2f8c58
+MISC metadata.xml 404 BLAKE2B 81266457a8db353ea7c650478797e49ba61828d9cf0116a94fc62e5ee7a87272b25660f45741cf98843cfc2a5c286284b59f568ad8f4ad33d2bce60bc04549dc SHA512 d7b1e2417cba958f59b05cac02fee15e361fe9657f28d53d6308011767637d838dc09dd4ce21ba56d5174af0fa4cb6a7fee5771f780d7127d9de5a9e628172fd
diff --git a/app-crypt/certbot/certbot-2.10.0.ebuild b/app-crypt/certbot/certbot-2.10.0.ebuild
index 021ba0724501..97ed2a10849a 100644
--- a/app-crypt/certbot/certbot-2.10.0.ebuild
+++ b/app-crypt/certbot/certbot-2.10.0.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..12} )
 DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..13} )
 
 inherit distutils-r1
 
@@ -24,7 +24,8 @@ 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/
 "
 
@@ -36,9 +37,6 @@ IUSE="selinux"
 
 BDEPEND="
 	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-cov[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
 		dev-python/typing-extensions[${PYTHON_USEDEP}]
 	)
 "
@@ -57,5 +55,11 @@ RDEPEND="
 	selinux? ( sec-policy/selinux-certbot )
 "
 
-distutils_enable_sphinx docs dev-python/sphinx-rtd-theme
+distutils_enable_sphinx docs \
+	dev-python/sphinx-rtd-theme
 distutils_enable_tests pytest
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
diff --git a/app-crypt/certbot/certbot-9999.ebuild b/app-crypt/certbot/certbot-9999.ebuild
index 3f039135a22d..7762dd3262d4 100644
--- a/app-crypt/certbot/certbot-9999.ebuild
+++ b/app-crypt/certbot/certbot-9999.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..12} )
 DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..13} )
 
 inherit distutils-r1
 
@@ -24,7 +24,8 @@ 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/
 "
 
@@ -36,9 +37,6 @@ IUSE="selinux"
 
 BDEPEND="
 	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-cov[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
 		dev-python/typing-extensions[${PYTHON_USEDEP}]
 	)
 "
@@ -57,5 +55,11 @@ RDEPEND="
 	selinux? ( sec-policy/selinux-certbot )
 "
 
-distutils_enable_sphinx docs dev-python/sphinx-rtd-theme
+distutils_enable_sphinx docs \
+	dev-python/sphinx-rtd-theme
 distutils_enable_tests pytest
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
diff --git a/app-crypt/certbot/metadata.xml b/app-crypt/certbot/metadata.xml
index 9a9d9e317b99..2f0d5e01680c 100644
--- a/app-crypt/certbot/metadata.xml
+++ b/app-crypt/certbot/metadata.xml
@@ -8,5 +8,6 @@
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">certbot/certbot</remote-id>
+		<remote-id type="pypi">certbot</remote-id>
 	</upstream>
 </pkgmetadata>