diff --git a/app-crypt/certbot-dns-rfc2136/Manifest b/app-crypt/certbot-dns-rfc2136/Manifest
index 146d3e9121..44db289daa 100644
--- a/app-crypt/certbot-dns-rfc2136/Manifest
+++ b/app-crypt/certbot-dns-rfc2136/Manifest
@@ -1,2 +1,3 @@
 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
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
new file mode 100644
index 0000000000..044efa8781
--- /dev/null
+++ b/app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-3.0.1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..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/media-video/wl-screenrec/wl-screenrec-0.1.6.ebuild b/media-video/wl-screenrec/wl-screenrec-0.1.6-r1.ebuild
similarity index 94%
rename from media-video/wl-screenrec/wl-screenrec-0.1.6.ebuild
rename to media-video/wl-screenrec/wl-screenrec-0.1.6-r1.ebuild
index 6177f11b36..98228fd56b 100644
--- a/media-video/wl-screenrec/wl-screenrec-0.1.6.ebuild
+++ b/media-video/wl-screenrec/wl-screenrec-0.1.6-r1.ebuild
@@ -110,7 +110,10 @@ CRATES="
 	windows_x86_64_msvc@0.52.6
 "
 
-inherit cargo shell-completion
+LLVM_COMPAT=( {16..19} )
+RUST_NEEDS_LLVM=1
+
+inherit cargo shell-completion llvm-r1
 
 DESCRIPTION="High performance screen/audio recorder for wlroots"
 HOMEPAGE="https://github.com/russelltg/wl-screenrec"
@@ -127,14 +130,21 @@ RESTRICT="test"
 
 BDEPEND="
 	media-video/ffmpeg:=
-	sys-devel/clang
 	x11-libs/libdrm
+	$(llvm_gen_dep '
+		sys-devel/clang:${LLVM_SLOT}
+	')
 "
 RDEPEND="${BDEPEND}"
 DEPEND="${RDEPEND}"
 
 QA_FLAGS_IGNORED="usr/bin/${PN}"
 
+pkg_setup() {
+	llvm-r1_pkg_setup
+	rust_pkg_setup
+}
+
 src_compile() {
 	cargo_src_compile
 
diff --git a/net-mail/dovecot-fts-xapian/Manifest b/net-mail/dovecot-fts-xapian/Manifest
index 91adf7106c..421b61c850 100644
--- a/net-mail/dovecot-fts-xapian/Manifest
+++ b/net-mail/dovecot-fts-xapian/Manifest
@@ -1,8 +1,3 @@
-DIST dovecot-fts-xapian-1.5.9.tar.gz 34220 BLAKE2B 8cf0772122d5dd8cf25fa2e8a5c02c8a315fdf4fbd346db3d01e78aa3e1116d42fbf30c155a364e064bd2ea4e9b67a48a69b3a3dada2c471c550f1d4fabbc8bd SHA512 e5961e5f6aeed6efabf456487307dfd09e255077e8c2c3af6c390b73b48dd2613f09ad4dfcd64974a91463a05a55078edfb7368d8c01ce0a839847823507b91f
-DIST dovecot-fts-xapian-1.7.10.tar.gz 36894 BLAKE2B a7c00f4946dfa9e2ccb79722ca5a3328a41a3090e0ade83b395d7d9e1b8260fdcda1b39a8e07d01287b07eaa0add5302ff5b67c401a30bfeffcffeb6f0ab1458 SHA512 c00f22e61a5a16a6661528ed25e0fe25e7ef216af22d79d3bc9bb8c4d95513082b72d422c4382c11630c8d89023cbd68bc00cf3a8a750ab7d5d9ef82105bfc2a
-DIST dovecot-fts-xapian-1.7.11.tar.gz 37307 BLAKE2B e841a4d71c02c2c846eb299a4a1ead5d8ba213b9d31ef24124997b2a1e24b27a2c60d6d8ec53cbb300221934c0f2842f9912161a65ad526f3c2012f5a33783fb SHA512 60590be20c92997f663368c088a062d639b8251550637cdda651294ee384b9300367ad583a5ff1808c0fb954cb49f656a3ece312a9f6d69f41f32fe812e24c71
-DIST dovecot-fts-xapian-1.7.12.tar.gz 37328 BLAKE2B 5673e5455bf9ae5a28d3715dd7382bb3fca22af9654f5d40a58d02bd7d9f6e8eabb47dab56a732f2e784696313e7526feeb1d6e65f462c65a8210b7edef55d08 SHA512 516e621c055c495534e0fdcf1580af503a48323d343f75d8164d80676d8b436872e88faa6b869838da9bb6465586d005bcf9724420623c4e295c0fb6c82b9865
-DIST dovecot-fts-xapian-1.7.14.tar.gz 37622 BLAKE2B a6452ed5d940898d56fd0a40346e887a2dce03493b2b45963f0089b40737cdaaab02df5ad97d0a6b7ec606faf683a2e971bae6a3a206322bd3cfff42be3b8cf0 SHA512 cc1308a4da7a48dcdc926e233ee5b8be34623816931a2392020c352f017338a0a8e6c569ac7caba67332f72505981648c5d23f0e77fcf04454de2405a5d1dc1c
 DIST dovecot-fts-xapian-1.7.17.tar.gz 35008 BLAKE2B 4b90b4193e6e62ce1c371f4f381829acdb1be141c4a9533cdda90f1a8a1fb6d7bcd888d3efe549d8e2e1e8baa5f9878e54cfa37e850d61472c40772f8f9611a1 SHA512 a5841d71a2aca0c10555e9a64d43c3b7b1ecd6785bac8178b392a3211ded9f2d40a76c1ba7297d65196e1b98cb549ed6284277762fafa87cd56381c9a2b43679
-DIST dovecot-fts-xapian-1.7.6.tar.gz 36626 BLAKE2B 4112204e78fce042a4db5e6d3bd5d12e2ca6be8199ded4f7b3b7e0ff9977268491aa7e524f00103e1ee07d5ce0b59dcea171c5be19c7857dbeae9416c4fe984e SHA512 83b25bae097fceb56b62355cd8e10788bea850c2f312eb15fca72fb9c1d033d54e56c251eb27eeb971fe405da9d6a3509a3a700bbd0602d785949548ac15ba1f
-DIST dovecot-fts-xapian-1.7.9.tar.gz 36884 BLAKE2B 6e2520a7b8a8250caa2a92af15e6eecdfbdbb542ff439e91baa0c084b3a6f6b02918decd0e0f0d888aba4db54b9566d63a796385a4d56970b69035845e20f84a SHA512 9df23186648902c9ca38f861496bff3e00005096be960a138b7d20eb3baff2734e16949614d1207cce34f2d6626634f58b35ea2c0500e2981f05eea1ad9da718
+DIST dovecot-fts-xapian-1.7.18.tar.gz 35160 BLAKE2B 67f11719336366a8460e3b67b90b4909626b73cface42b845c9efa8dfc5a5a24212c6ed48b8e575786d870c7b8b416936841fd6cc5b1ea078b2d0498db7ae735 SHA512 fed0947c0c7870ef0519359863becea822a51b9c76bc59c7100a7c9961b05740845a3ea5755fbb30e6d79869cb0f5b5b35e60675284ffecee088dfb54f0d5dfc
+DIST dovecot-fts-xapian-1.8.tar.gz 35196 BLAKE2B c30f2579ae168c18ff88e0b2dc65aec110a586a828ed69d5ec2a5b674af99c1dcb7525ac227522703b0a61491db5579e570cb5b8d9733403c978db7b2a0df0d8 SHA512 178922589ae307afbb465bdac9ba352c1198d4a97a204d190461751d0c117dad22119d964d8dbda2fb5f44a05f069536788a02e816a5822da28c8c96720c4a93
diff --git a/net-mail/dovecot-fts-xapian/dovecot-fts-xapian-1.7.10.ebuild b/net-mail/dovecot-fts-xapian/dovecot-fts-xapian-1.7.10.ebuild
deleted file mode 100644
index 241c01def8..0000000000
--- a/net-mail/dovecot-fts-xapian/dovecot-fts-xapian-1.7.10.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="Dovecot FTS plugin backed by Xapian"
-HOMEPAGE="https://github.com/grosjo/fts-xapian"
-SRC_URI="https://github.com/grosjo/fts-xapian/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/fts-xapian-${PV}"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE="static-libs"
-
-RDEPEND="
-	dev-libs/icu:=
-	>=dev-libs/xapian-1.4:=
-	net-mail/dovecot:=
-	dev-db/sqlite:*
-	"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/bug-887887_allow-O2-override.patch"
-	"${FILESDIR}/20240401_verbosity-fix.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# Disable hardening so CFLAGS are left up to the Gentoo user
-	# https://bugs.gentoo.org/888751
-	econf \
-		--enable-hardening=no \
-		--with-dovecot="${EPREFIX}/usr/$(get_libdir)/dovecot" \
-		$( use_enable static-libs static )
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/net-mail/dovecot-fts-xapian/dovecot-fts-xapian-1.7.12.ebuild b/net-mail/dovecot-fts-xapian/dovecot-fts-xapian-1.7.12.ebuild
deleted file mode 100644
index 18a7328b4e..0000000000
--- a/net-mail/dovecot-fts-xapian/dovecot-fts-xapian-1.7.12.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="Dovecot FTS plugin backed by Xapian"
-HOMEPAGE="https://github.com/grosjo/fts-xapian"
-SRC_URI="https://github.com/grosjo/fts-xapian/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/fts-xapian-${PV}"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE="static-libs"
-
-RDEPEND="
-	dev-libs/icu:=
-	>=dev-libs/xapian-1.4:=
-	net-mail/dovecot:=
-	dev-db/sqlite:*
-	"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/bug-887887_allow-O2-override.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# Disable hardening so CFLAGS are left up to the Gentoo user
-	# https://bugs.gentoo.org/888751
-	econf \
-		--enable-hardening=no \
-		--with-dovecot="${EPREFIX}/usr/$(get_libdir)/dovecot" \
-		$( use_enable static-libs static )
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/net-mail/dovecot-fts-xapian/dovecot-fts-xapian-1.7.14.ebuild b/net-mail/dovecot-fts-xapian/dovecot-fts-xapian-1.7.14.ebuild
deleted file mode 100644
index 18a7328b4e..0000000000
--- a/net-mail/dovecot-fts-xapian/dovecot-fts-xapian-1.7.14.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="Dovecot FTS plugin backed by Xapian"
-HOMEPAGE="https://github.com/grosjo/fts-xapian"
-SRC_URI="https://github.com/grosjo/fts-xapian/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/fts-xapian-${PV}"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE="static-libs"
-
-RDEPEND="
-	dev-libs/icu:=
-	>=dev-libs/xapian-1.4:=
-	net-mail/dovecot:=
-	dev-db/sqlite:*
-	"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/bug-887887_allow-O2-override.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# Disable hardening so CFLAGS are left up to the Gentoo user
-	# https://bugs.gentoo.org/888751
-	econf \
-		--enable-hardening=no \
-		--with-dovecot="${EPREFIX}/usr/$(get_libdir)/dovecot" \
-		$( use_enable static-libs static )
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/net-mail/dovecot-fts-xapian/dovecot-fts-xapian-1.5.9.ebuild b/net-mail/dovecot-fts-xapian/dovecot-fts-xapian-1.7.18.ebuild
similarity index 100%
rename from net-mail/dovecot-fts-xapian/dovecot-fts-xapian-1.5.9.ebuild
rename to net-mail/dovecot-fts-xapian/dovecot-fts-xapian-1.7.18.ebuild
diff --git a/net-mail/dovecot-fts-xapian/dovecot-fts-xapian-1.7.6.ebuild b/net-mail/dovecot-fts-xapian/dovecot-fts-xapian-1.7.6.ebuild
deleted file mode 100644
index 18a7328b4e..0000000000
--- a/net-mail/dovecot-fts-xapian/dovecot-fts-xapian-1.7.6.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="Dovecot FTS plugin backed by Xapian"
-HOMEPAGE="https://github.com/grosjo/fts-xapian"
-SRC_URI="https://github.com/grosjo/fts-xapian/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/fts-xapian-${PV}"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE="static-libs"
-
-RDEPEND="
-	dev-libs/icu:=
-	>=dev-libs/xapian-1.4:=
-	net-mail/dovecot:=
-	dev-db/sqlite:*
-	"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/bug-887887_allow-O2-override.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# Disable hardening so CFLAGS are left up to the Gentoo user
-	# https://bugs.gentoo.org/888751
-	econf \
-		--enable-hardening=no \
-		--with-dovecot="${EPREFIX}/usr/$(get_libdir)/dovecot" \
-		$( use_enable static-libs static )
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/net-mail/dovecot-fts-xapian/dovecot-fts-xapian-1.7.9.ebuild b/net-mail/dovecot-fts-xapian/dovecot-fts-xapian-1.7.9.ebuild
deleted file mode 100644
index 241c01def8..0000000000
--- a/net-mail/dovecot-fts-xapian/dovecot-fts-xapian-1.7.9.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="Dovecot FTS plugin backed by Xapian"
-HOMEPAGE="https://github.com/grosjo/fts-xapian"
-SRC_URI="https://github.com/grosjo/fts-xapian/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/fts-xapian-${PV}"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE="static-libs"
-
-RDEPEND="
-	dev-libs/icu:=
-	>=dev-libs/xapian-1.4:=
-	net-mail/dovecot:=
-	dev-db/sqlite:*
-	"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/bug-887887_allow-O2-override.patch"
-	"${FILESDIR}/20240401_verbosity-fix.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# Disable hardening so CFLAGS are left up to the Gentoo user
-	# https://bugs.gentoo.org/888751
-	econf \
-		--enable-hardening=no \
-		--with-dovecot="${EPREFIX}/usr/$(get_libdir)/dovecot" \
-		$( use_enable static-libs static )
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/net-mail/dovecot-fts-xapian/dovecot-fts-xapian-1.7.11.ebuild b/net-mail/dovecot-fts-xapian/dovecot-fts-xapian-1.8.ebuild
similarity index 100%
rename from net-mail/dovecot-fts-xapian/dovecot-fts-xapian-1.7.11.ebuild
rename to net-mail/dovecot-fts-xapian/dovecot-fts-xapian-1.8.ebuild