gentoo auto-resync : 09:01:2025 - 06:41:15

11 files changed, 235 insertions, 3 deletions

diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 50c8c8e6597a..95204fe1df4b 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/acme/Manifest b/app-crypt/acme/Manifest
index 8d65fd06da36..4e8d98499e57 100644
--- a/app-crypt/acme/Manifest
+++ b/app-crypt/acme/Manifest
@@ -1,8 +1,10 @@
 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-3.0.1.gh.tar.gz 2325233 BLAKE2B 247505fb500c829de875aa0886f27727de4ccc4f474dd13957b524b84af99e6ee5d1e86f09577422932a498ec9fda24ae36377d117365531ad1f8eddb0148272 SHA512 7aec63ec7705f4e13acb7cef5d770f103222ddf3dca30760c42cd3aeb0531d630111518960c299d89bccba4134b544a329fa02659fac5f977c9ca0321b2d1e2e
+DIST certbot-3.1.0.gh.tar.gz 2299990 BLAKE2B 596f11d4ebb161ee6ba67f4f150a77e081399f11f4e4652923c94297661149c9cb889afc51b46b6111847820823d90edc3a7f1e14c451122f88e6e777bf48795 SHA512 efd0b0c1540a6e3b631fa80eac65c9e8b31b1e5e1242f56d3723ca7e1b1b2121dfe1bf8e122fe9a9b994460553f1fa085b11d1369b3160f5c51c939b2cccd638
 EBUILD acme-2.10.0.ebuild 1531 BLAKE2B 15f0041fcccb610f9fc9b4ca24ebcf871b5577bdc82e266c7fb4efe929dc431bd4020ee903510399fea14972d0a20590ca3471d6ec7c5f02e6cd0e4c0e406372 SHA512 b63e983e64a5a65f5c5f19a579c57ee8269ae8840e3c2afd2c16b2d4bc57290425d49d7882de4b1afcf7a5bfaf51bdea524e4f93d127d13eb2452a38e3f65270
 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-9999.ebuild 1575 BLAKE2B d39ba92589e3242535091947f9c9bf881b9235a165ba07b895379b7c285489d208694c0395506a6a792e45b4cfd5104cbbb010ee54fc5300e28c9415c0ed9642 SHA512 dddc4f7343dc3a60e97ea06ec4942a9b4a2ea5f7b54687faeac4037f22b2dabbc862f8545b5025596f957529d55422dbc55f1c3b04b42a24cb30b7fc621dad9a
 MISC metadata.xml 401 BLAKE2B 30a2ac1f03749a8e3bb98723c57f47ab6bcf7bfa58c2b6e21c309fae279feca0d3612df6c2a1dafaf27b4f0781c583a140322feac1a1cf2c13e50861cad129ea SHA512 d8e725b71ca81ce4ca6565ed58271b283c25394448f0f48f726f232122577c33d5b2d726e117419b2fae99f9dae29a8080bb9564eccbca13368c83988cf3da01
diff --git a/app-crypt/acme/acme-3.1.0.ebuild b/app-crypt/acme/acme-3.1.0.ebuild
new file mode 100644
index 000000000000..3a210871357e
--- /dev/null
+++ b/app-crypt/acme/acme-3.1.0.ebuild
@@ -0,0 +1,65 @@
+# 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://pypi.org/project/acme/
+	https://letsencrypt.org/
+"
+
+S="${WORKDIR}/${PARENT_P}/${PN}"
+LICENSE="Apache-2.0"
+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.
+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}]
+"
+
+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 fdd02d912a36..483520c76b8e 100644
--- a/app-crypt/certbot-apache/Manifest
+++ b/app-crypt/certbot-apache/Manifest
@@ -1,4 +1,6 @@
 DIST certbot-2.10.0.gh.tar.gz 2322931 BLAKE2B cb84815ec2db2b4b365f2f2bdee1749263b540a1b67f9195280bdb122307337d294beb403bc05b236a94ed0782b0d093e2b8527a65cb69cac949fa627388e8bd SHA512 444981952140376808a9aa475a692df91e60fffc6d45902a3f809bc07311a7d6597ad56e712d3dae234450eb1c735db431182e784bc748511e68bf4f5f2d6cbd
+DIST certbot-3.1.0.gh.tar.gz 2299990 BLAKE2B 596f11d4ebb161ee6ba67f4f150a77e081399f11f4e4652923c94297661149c9cb889afc51b46b6111847820823d90edc3a7f1e14c451122f88e6e777bf48795 SHA512 efd0b0c1540a6e3b631fa80eac65c9e8b31b1e5e1242f56d3723ca7e1b1b2121dfe1bf8e122fe9a9b994460553f1fa085b11d1369b3160f5c51c939b2cccd638
 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-9999.ebuild 1061 BLAKE2B a2e239e321f4087db6bb21f600cff8ed20ae1add9b4e402f5ca2a1762633a7a2a2edf7e9dcec510ef21b68ed91d68064a573e8bb9c186d77a89d36ac4baa5e83 SHA512 77fdc3ea4cce89c1811f6dad1cdda02b18a6f3f394acd908ef168d958337dac200c109ddce5fbdf299afaaf6c4315c8af60242a72d6f66b1cfee994b419af6e2
 MISC metadata.xml 411 BLAKE2B 5876f2ab00aae84a0649504ffa17ea14abba64e38c915adb12f8817736b83ca19b4c220d79fff23259a772a621c145b0987bbe9ac959b956113b2e1ec40f5123 SHA512 ab6822225853f8941e2bf841b945c3dc484eb9c9667f8583f52951ca87e264315a50d44985fbd9487793e8b72c9a0bd05c0a267f06bf60f64003ad94820267ba
diff --git a/app-crypt/certbot-apache/certbot-apache-3.1.0.ebuild b/app-crypt/certbot-apache/certbot-apache-3.1.0.ebuild
new file mode 100644
index 000000000000..b65adf0df968
--- /dev/null
+++ b/app-crypt/certbot-apache/certbot-apache-3.1.0.ebuild
@@ -0,0 +1,46 @@
+# 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://pypi.org/project/certbot-apache/
+	https://letsencrypt.org/
+"
+
+S="${WORKDIR}/${PARENT_P}/${PN}"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+RDEPEND="
+	>=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
+	>=app-crypt/certbot-${PV}[${PYTHON_USEDEP}]
+	dev-python/python-augeas[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/app-crypt/certbot-nginx/Manifest b/app-crypt/certbot-nginx/Manifest
index 6cd9f932e7f5..5dbff17d1ab2 100644
--- a/app-crypt/certbot-nginx/Manifest
+++ b/app-crypt/certbot-nginx/Manifest
@@ -1,4 +1,6 @@
 DIST certbot-2.10.0.gh.tar.gz 2322931 BLAKE2B cb84815ec2db2b4b365f2f2bdee1749263b540a1b67f9195280bdb122307337d294beb403bc05b236a94ed0782b0d093e2b8527a65cb69cac949fa627388e8bd SHA512 444981952140376808a9aa475a692df91e60fffc6d45902a3f809bc07311a7d6597ad56e712d3dae234450eb1c735db431182e784bc748511e68bf4f5f2d6cbd
+DIST certbot-3.1.0.gh.tar.gz 2299990 BLAKE2B 596f11d4ebb161ee6ba67f4f150a77e081399f11f4e4652923c94297661149c9cb889afc51b46b6111847820823d90edc3a7f1e14c451122f88e6e777bf48795 SHA512 efd0b0c1540a6e3b631fa80eac65c9e8b31b1e5e1242f56d3723ca7e1b1b2121dfe1bf8e122fe9a9b994460553f1fa085b11d1369b3160f5c51c939b2cccd638
 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-9999.ebuild 1126 BLAKE2B 78734ec57887a381835175c5f7e93c19905babfe939790045d20e3fa8619c7e573e77c664c983355c1166f25539fdb2616a989f6530756a90366bc3b7559658c SHA512 c59de36e98b8e3c65999c2e6ecab212c886d116912b81c4feeccc802618b8f9ead6d4285b9de4751cd5bfdc3f2cbc509c586e43bd38c552541f9dcdeae30043b
 MISC metadata.xml 386 BLAKE2B 563da29504a6d168cd88576a509ff6934a5002b50ad4d3157746fd438bfc32eb8ce031ada46136e3f4cfe3ff3a26eae28b0532eb32020da730a8f93310ce492e SHA512 04549f9c813962d55b8594593409f961865117d6c463c057dbfd7d71d1ea7c8ff64c991371a266df279ad0ac4b3c3d25f684860e28933e5a840345c34af51fb1
diff --git a/app-crypt/certbot-nginx/certbot-nginx-3.1.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-3.1.0.ebuild
new file mode 100644
index 000000000000..a5a1b4b7e4c2
--- /dev/null
+++ b/app-crypt/certbot-nginx/certbot-nginx-3.1.0.ebuild
@@ -0,0 +1,47 @@
+# 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://letsencrypt.org/
+"
+
+S="${WORKDIR}/${PARENT_P}/${PN}"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+# The requirement is really 17.5.0 but easier to require latest stable >= 23.1.1
+# to avoid broken 23.1.0.
+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}]
+"
+
+distutils_enable_tests pytest
diff --git a/app-crypt/certbot/Manifest b/app-crypt/certbot/Manifest
index 4c28527bae0c..bc2d5802e52c 100644
--- a/app-crypt/certbot/Manifest
+++ b/app-crypt/certbot/Manifest
@@ -1,9 +1,11 @@
 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-3.0.1.gh.tar.gz 2325233 BLAKE2B 247505fb500c829de875aa0886f27727de4ccc4f474dd13957b524b84af99e6ee5d1e86f09577422932a498ec9fda24ae36377d117365531ad1f8eddb0148272 SHA512 7aec63ec7705f4e13acb7cef5d770f103222ddf3dca30760c42cd3aeb0531d630111518960c299d89bccba4134b544a329fa02659fac5f977c9ca0321b2d1e2e
+DIST certbot-3.1.0.gh.tar.gz 2299990 BLAKE2B 596f11d4ebb161ee6ba67f4f150a77e081399f11f4e4652923c94297661149c9cb889afc51b46b6111847820823d90edc3a7f1e14c451122f88e6e777bf48795 SHA512 efd0b0c1540a6e3b631fa80eac65c9e8b31b1e5e1242f56d3723ca7e1b1b2121dfe1bf8e122fe9a9b994460553f1fa085b11d1369b3160f5c51c939b2cccd638
 EBUILD certbot-2.10.0.ebuild 1528 BLAKE2B 34449bcf95187bed02f610a3ab4b5252e241b48385705c53bcf6afa140a4a5d7c216b50f0d2910d32b9f2dec37de298b29cc4106bcb91cf914938c2634725625 SHA512 c52d34a393a7788ae9062a752e3205218301a6b84b6716ebece6cc3b4568197b841cec020f14b71c66cc7790e1076b833bf286f950aeaf80015159e9187493fe
 EBUILD certbot-2.11.0-r3.ebuild 1532 BLAKE2B cbb39b14012b2e7575bf75535536c2c006b25ddb458eeeca91a0536e55a2ddd8f4661a19d9bad4b6d460eae5ee36f80fc10336e5ea879cc10eacb750b13ca8de SHA512 4d11ee2ca9aa12139d677a35382fc60ff6226fe594ded11e5256afb5d769ac2db25bb854959b78521e5b50a1266133f5004b8ef63586593c3673fdb2208e29f8
 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-9999.ebuild 1572 BLAKE2B 0200fb1f4425354e788fce567e63a4e302afa1409c73085491c3f32e7bce0d9830521e2907ad7c03f29f8e9ce10931a53bb11d385a643ee21417194c5767d453 SHA512 dd4680db1d2157a551d76639a4586b4ff6e9d68677e969009f78697a1b50a5e9799765102602a8075b3da41f93980060756c22f13a03f7152d92072eb4287e66
 MISC metadata.xml 404 BLAKE2B 81266457a8db353ea7c650478797e49ba61828d9cf0116a94fc62e5ee7a87272b25660f45741cf98843cfc2a5c286284b59f568ad8f4ad33d2bce60bc04549dc SHA512 d7b1e2417cba958f59b05cac02fee15e361fe9657f28d53d6308011767637d838dc09dd4ce21ba56d5174af0fa4cb6a7fee5771f780d7127d9de5a9e628172fd
diff --git a/app-crypt/certbot/certbot-3.1.0.ebuild b/app-crypt/certbot/certbot-3.1.0.ebuild
new file mode 100644
index 000000000000..ac59ba6b64e7
--- /dev/null
+++ b/app-crypt/certbot/certbot-3.1.0.ebuild
@@ -0,0 +1,66 @@
+# 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
+
+if [[ "${PV}" == *9999 ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+	EGIT_SUBMODULES=()
+	EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
+else
+	SRC_URI="
+		https://github.com/certbot/certbot/archive/v${PV}.tar.gz
+			-> ${P}.gh.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+fi
+
+DESCRIPTION="Let’s Encrypt client to automate deployment of X.509 certificates"
+HOMEPAGE="
+	https://github.com/certbot/certbot/
+	https://pypi.org/project/certbot/
+	https://letsencrypt.org/
+"
+
+S="${WORKDIR}/${P}/${PN}"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+IUSE="selinux"
+
+BDEPEND="
+	test? (
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	)
+"
+
+# See certbot/setup.py for acme >= dep
+RDEPEND="
+	>=app-crypt/acme-${PV}[${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/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/pyrfc3339[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
+	selinux? ( sec-policy/selinux-certbot )
+"
+
+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/gnupg/Manifest b/app-crypt/gnupg/Manifest
index a6668305b267..4cbe397cf844 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -29,7 +29,7 @@ DIST gnupg-2.5.1.tar.bz2 8126739 BLAKE2B 46955d2eebe14395adc0fdf81e89a32f3f9baaa
 DIST gnupg-2.5.1.tar.bz2.sig 238 BLAKE2B cd024a63ecb82a12e92444cbff8dbc9bef6a4e436d59957aae77927cce0baf9e282e63df7a5159a521c7c8694a0dbe96d6537ad3ec5f779c7c0dea8d02b5e70d SHA512 8ffd5cc72a2907972bf1854e804f6c215ff66ba2d6e91952700f49b2b5ba8bab035d0f42efdb0d3c3166301cda6e716394928bdd9c0d0d1e1789a02c7aa1a926
 EBUILD gnupg-2.2.42-r4.ebuild 5703 BLAKE2B e3b01ff2397a38d7062799195fc52c969d0ac117211eb385c13280211a5e0c7467fe158e1fcc958afda9745c0a9b9ef482d21d4d8809de14ebefddcd089fa6ba SHA512 80845654342a6f301d80e7c22e9efd8531fbdc3cb989c99421ccc2bdc532f79983b4d44088558cfbf2a941869f2bd83c587c262d141851be43b5e15e01ddb0d0
 EBUILD gnupg-2.2.43-r1.ebuild 5573 BLAKE2B 2fb3e5977f4f1828ba87b88100622b84e6c48e892e97e49e65456bfe97d9a8b4f19d5c0b53804eaa8f5a2a8cae3a256478c3b509da77aefb0e9835af3871ba30 SHA512 c6e3532520d1945046e08cef686691ae3efc21e9b2e6a7bf3a7c8e0c24d69130fde03ff6c8336ecd92bb7018bcda5555dd0c9f4332efffcfca1200ae9c039936
-EBUILD gnupg-2.2.45.ebuild 5638 BLAKE2B a1a96f75d347993412a23d9a3ae44a894df8c78001e3017be005cb380c816fc7b7ad5077e0294312a0adaeb81e80d540871872627cd55561e9e5df3226326787 SHA512 67229c138b6827b29906aa1a8094db228eff0e45bc1661fb958c9d3c1b99e671a506fdfb9ae108df50f1617b7091867806b4e33044ea158f5b6dd698703542bd
+EBUILD gnupg-2.2.45.ebuild 5637 BLAKE2B 419a69833e7ce217ee88f66ada8d8f1f486300759cb166cd6e9e3c7a86b800929490b17867f99e2abe9fefb26c8fe9843772f6bcef98759d2f0e2b2a5b948b08 SHA512 8a9757b3c5bbd70d1d19cc097aa4e1d3a51a77cbcb73087e5edc1f4d2be55163327fc95fe2ca19fb61cd0201c050f1af32ac8d3f90d27d8c678992ded72e959c
 EBUILD gnupg-2.4.5-r1.ebuild 5894 BLAKE2B a235df7b022acf9bc4d11fa566b7edf39f60dd865802685f5bf68e6df76913589691476a2d48a885816e8aecc2112de14508e44882e43dd3bbefdedd54385a14 SHA512 f621e0a6227862acdab31bb5902e235b8fd5c3e3908be747d5680957d0d55ad5b92ba6a7e2436d1902cd304a40a62fdca8236e67563624bce0b4d683c0364d9b
 EBUILD gnupg-2.4.5-r2.ebuild 6119 BLAKE2B 2f414a0dfe969c750e09ceacde25805ed8b04cb9ae9630b2731da6473796ca77dbb76bd555198350dd6b837f3cd14f7019a75b63ba05f1f0366dc544747f4ce4 SHA512 04ca8526ddc38c858f50c233568c28111f90c6ae222663eebc5ffcfa3852ee5397eca28fbf73324e771855060dd74792b97eac51c64d79edd2ccb3eb35c3c8f0
 EBUILD gnupg-2.4.6-r1.ebuild 6101 BLAKE2B 1ded223177e3cc27b6ee5d4e849c4346c08cd82ecf4b8004c6583f3632415dd14fc39ccd2c2f769baf02b3cc9f9a4afb3cc400e193fe7b8f40b84a370d6758c4 SHA512 789533b0e3cd6a772ce87acd513b631140fb94df795cd2a64b762c6e191bd27ccdc295cb239ffcd5ede5dcaa0ce52a5779dbcb484a576d28d426dcd6fafff773
diff --git a/app-crypt/gnupg/gnupg-2.2.45.ebuild b/app-crypt/gnupg/gnupg-2.2.45.ebuild
index 06ff2f90dcaa..bf482df1cdeb 100644
--- a/app-crypt/gnupg/gnupg-2.2.45.ebuild
+++ b/app-crypt/gnupg/gnupg-2.2.45.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
@@ -23,7 +23,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl test tofu tools usb user-socket wks-server"
 RESTRICT="!test? ( test )"