Merge updates from master

57 files changed, 92 insertions, 581 deletions

diff --git a/app-crypt/tpm2-tss/Manifest b/app-crypt/tpm2-tss/Manifest
index e08c54ad4a15..25adb5daaa34 100644
--- a/app-crypt/tpm2-tss/Manifest
+++ b/app-crypt/tpm2-tss/Manifest
@@ -1,3 +1,2 @@
-DIST tpm2-tss-4.0.1.tar.gz 1787139 BLAKE2B 627cdefeff6c64148f9da1425922a0a7a72debcee4930ffab208a3b9b66127c2d4f923e3e105bfd45410cdb13c19cb40cc15a720e9a05dd32ff622dabf5fcc32 SHA512 ed6ddc52cb0e8c1082a4bb001e1225eb9905fd2380da88db5fd69ff5b5d9d43a93eb67b634e49d53eb5d586832da3aef2c4c7e5f18d51bb730481f8913319d7d
 DIST tpm2-tss-4.0.2.tar.gz 1833499 BLAKE2B 91e70bcc66099fe5d7d53cf98a2c46582e96f204fc7bcb89c46497cc811ca1eb39c752be077a6e8132fc980a6581a2df075fcc6670d646d1270e642c144f043c SHA512 e92038de985ac928bf87a707b0f9b190aaa936827923ea5e3cbdda216cbc6cf8590af650c59c2e1e420ad9914dc6c1f14232ab7930ffc1a50fb0c49fdef6d3f0
 DIST tpm2-tss-4.1.3.tar.gz 1902009 BLAKE2B d8592f4797a4254883667476efb2fdf3c95547d9c472fe3557031e934c725e20e3cc70a9b7b41eaddac71e8d9f94beb5fbb39aec5d81b3eeb1b612df27312923 SHA512 c9a5e1e90f6545a466d43790ab2d67c52c4b788a0b21f8212575e27e04e0ac663105863fe00824e08a4e56a4f8c6b00c48c1a1c132531b8569cd5042c3bb9e69
diff --git a/app-crypt/tpm2-tss/files/tpm2-tss-4.0.0-Dont-install-files-into-run.patch b/app-crypt/tpm2-tss/files/tpm2-tss-4.0.0-Dont-install-files-into-run.patch
deleted file mode 100644
index ca51ab7f9382..000000000000
--- a/app-crypt/tpm2-tss/files/tpm2-tss-4.0.0-Dont-install-files-into-run.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 2c81cfa9..2673995c 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -767,13 +767,11 @@ define set_tss_permissions
- endef
- 
- define make_fapi_dirs
--    ($(call make_tss_dir,$(DESTDIR)$(runstatedir)/tpm2-tss/eventlog/) || true) && \
-     ($(call make_tss_dir,$(DESTDIR)$(localstatedir)/lib/tpm2-tss/system/keystore/))
- endef
- 
- define set_fapi_permissions
-     if test -z "${DESTDIR}"; then \ e
--        ($(call set_tss_permissions,$(DESTDIR)$(runstatedir)/tpm2-tss)) && \
-         ($(call set_tss_permissions,$(DESTDIR)$(localstatedir)/lib/tpm2-tss)) \
-     fi
- endef
-@@ -784,7 +782,6 @@ endef
- 
- define check_fapi_dirs
-     if test -z "${DESTDIR}"; then \
--        ($(call check_dir,$(DESTDIR)$(runstatedir)/tpm2-tss/eventlog/)) && \
-         ($(call check_dir,$(DESTDIR)$(localstatedir)/lib/tpm2-tss/system/keystore/)) \
-     fi;
- endef
diff --git a/app-crypt/tpm2-tss/tpm2-tss-4.0.1-r1.ebuild b/app-crypt/tpm2-tss/tpm2-tss-4.0.1-r1.ebuild
deleted file mode 100644
index 558f221a5be8..000000000000
--- a/app-crypt/tpm2-tss/tpm2-tss-4.0.1-r1.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools flag-o-matic linux-info multilib-minimal tmpfiles udev
-
-DESCRIPTION="TCG Trusted Platform Module 2.0 Software Stack"
-HOMEPAGE="https://github.com/tpm2-software/tpm2-tss"
-SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/4"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
-IUSE="doc +fapi +openssl mbedtls +policy static-libs test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	^^ ( mbedtls openssl )
-	fapi? ( openssl !mbedtls )
-	policy? ( openssl !mbedtls )
-"
-
-RDEPEND="
-	acct-group/tss
-	acct-user/tss
-	sys-apps/util-linux:=[${MULTILIB_USEDEP}]
-	fapi? (
-		dev-libs/json-c:=[${MULTILIB_USEDEP}]
-		>=net-misc/curl-7.80.0[${MULTILIB_USEDEP}]
-	)
-	mbedtls? ( net-libs/mbedtls:=[${MULTILIB_USEDEP}] )
-	openssl? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] )
-"
-
-DEPEND="
-	${RDEPEND}
-	test? ( app-crypt/swtpm
-		dev-libs/uthash
-		dev-util/cmocka
-		fapi? ( >=net-misc/curl-7.80.0 ) )
-"
-
-BDEPEND="
-	sys-apps/acl
-	virtual/pkgconfig
-	doc? ( app-text/doxygen )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.0.0-Dont-install-files-into-run.patch"
-	"${FILESDIR}/${PN}-4.0.1-Make-sysusers-and-tmpfiles-optional.patch"
-	"${FILESDIR}/${PN}-4.0.1-Do-not-consider-failures-to-write-files-in-sys-hard.patch"
-)
-
-pkg_setup() {
-	local CONFIG_CHECK="~TCG_TPM"
-	linux-info_pkg_setup
-	kernel_is ge 4 12 0 || ewarn "At least kernel 4.12.0 is required"
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	# Fails with inlining
-	filter-flags -fno-semantic-interposition
-	# tests fail with LTO enabbled. See bug 865275 and 865279
-	filter-lto
-
-	local myconf=(
-		--localstatedir=/var
-		$(multilib_native_use_enable doc doxygen-doc)
-		$(use_enable fapi)
-		$(use_enable policy)
-		$(use_enable static-libs static)
-		$(multilib_native_use_enable test unit)
-		$(multilib_native_use_enable test integration)
-		$(multilib_native_use_enable test self-generated-certificate)
-		--disable-tcti-libtpms
-		--disable-defaultflags
-		--disable-weakcrypto
-		--with-crypto="$(usex mbedtls mbed ossl)"
-		--with-runstatedir=/run
-		--with-udevrulesdir="$(get_udevdir)/rules.d"
-		--with-udevrulesprefix=60-
-		--without-sysusersdir
-		--with-tmpfilesdir="/usr/lib/tmpfiles.d"
-	)
-
-	ECONF_SOURCE=${S} econf "${myconf[@]}"
-}
-
-multilib_src_install() {
-	default
-	keepdir /var/lib/tpm2-tss/system/keystore
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	tmpfiles_process tpm2-tss-fapi.conf
-	udev_reload
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/app-crypt/tpm2-tss/tpm2-tss-4.0.1.ebuild b/app-crypt/tpm2-tss/tpm2-tss-4.0.1.ebuild
deleted file mode 100644
index d4391f09ea96..000000000000
--- a/app-crypt/tpm2-tss/tpm2-tss-4.0.1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools flag-o-matic linux-info multilib-minimal tmpfiles udev
-
-DESCRIPTION="TCG Trusted Platform Module 2.0 Software Stack"
-HOMEPAGE="https://github.com/tpm2-software/tpm2-tss"
-SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/4"
-KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
-IUSE="doc +fapi +openssl mbedtls +policy static-libs test"
-
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="^^ ( mbedtls openssl )
-		fapi? ( openssl !mbedtls )
-		policy? ( openssl !mbedtls )"
-
-RDEPEND="acct-group/tss
-	acct-user/tss
-	sys-apps/util-linux:=[${MULTILIB_USEDEP}]
-	fapi? ( dev-libs/json-c:=[${MULTILIB_USEDEP}]
-		>=net-misc/curl-7.80.0[${MULTILIB_USEDEP}] )
-	mbedtls? ( net-libs/mbedtls:=[${MULTILIB_USEDEP}] )
-	openssl? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] )"
-
-DEPEND="${RDEPEND}
-	test? ( app-crypt/swtpm
-		dev-libs/uthash
-		dev-util/cmocka
-		fapi? ( >=net-misc/curl-7.80.0 ) )"
-BDEPEND="sys-apps/acl
-	virtual/pkgconfig
-	doc? ( app-text/doxygen )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.0.0-Dont-install-files-into-run.patch"
-	"${FILESDIR}/${PN}-4.0.1-Make-sysusers-and-tmpfiles-optional.patch"
-	)
-
-pkg_setup() {
-	local CONFIG_CHECK=" \
-		~TCG_TPM
-	"
-	linux-info_pkg_setup
-	kernel_is ge 4 12 0 || ewarn "At least kernel 4.12.0 is required"
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	# Fails with inlining
-	filter-flags -fno-semantic-interposition
-	# tests fail with LTO enabbled. See bug 865275 and 865279
-	filter-lto
-
-	ECONF_SOURCE=${S} econf \
-		--localstatedir=/var \
-		$(multilib_native_use_enable doc doxygen-doc) \
-		$(use_enable fapi) \
-		$(use_enable policy) \
-		$(use_enable static-libs static) \
-		$(multilib_native_use_enable test unit) \
-		$(multilib_native_use_enable test integration) \
-		$(multilib_native_use_enable test self-generated-certificate) \
-		--disable-tcti-libtpms \
-		--disable-defaultflags \
-		--disable-weakcrypto \
-		--with-crypto="$(usex mbedtls mbed ossl)" \
-		--with-runstatedir=/run \
-		--with-udevrulesdir="$(get_udevdir)/rules.d" \
-		--with-udevrulesprefix=60- \
-		--without-sysusersdir \
-		--with-tmpfilesdir="/usr/lib/tmpfiles.d"
-}
-
-multilib_src_install() {
-	default
-	keepdir /var/lib/tpm2-tss/system/keystore
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	tmpfiles_process tpm2-tss-fapi.conf
-	udev_reload
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/app-crypt/tpm2-tss/tpm2-tss-4.0.2-r1.ebuild b/app-crypt/tpm2-tss/tpm2-tss-4.0.2-r2.ebuild
index d9036d26badd..b5f0eb1e7049 100644
--- a/app-crypt/tpm2-tss/tpm2-tss-4.0.2-r1.ebuild
+++ b/app-crypt/tpm2-tss/tpm2-tss-4.0.2-r2.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
@@ -29,7 +29,7 @@ RDEPEND="
 		dev-libs/json-c:=[${MULTILIB_USEDEP}]
 		>=net-misc/curl-7.80.0[${MULTILIB_USEDEP}]
 	)
-	mbedtls? ( net-libs/mbedtls:=[${MULTILIB_USEDEP}] )
+	mbedtls? ( net-libs/mbedtls:0=[${MULTILIB_USEDEP}] )
 	openssl? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] )
 "
 
diff --git a/app-crypt/tpm2-tss/tpm2-tss-4.0.2.ebuild b/app-crypt/tpm2-tss/tpm2-tss-4.0.2.ebuild
deleted file mode 100644
index 40a410cf2a97..000000000000
--- a/app-crypt/tpm2-tss/tpm2-tss-4.0.2.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools flag-o-matic linux-info multilib-minimal tmpfiles udev
-
-DESCRIPTION="TCG Trusted Platform Module 2.0 Software Stack"
-HOMEPAGE="https://github.com/tpm2-software/tpm2-tss"
-SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/4"
-KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
-IUSE="doc +fapi +openssl mbedtls +policy static-libs test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	^^ ( mbedtls openssl )
-	fapi? ( openssl !mbedtls )
-	policy? ( openssl !mbedtls )
-"
-
-RDEPEND="
-	acct-group/tss
-	acct-user/tss
-	sys-apps/util-linux:=[${MULTILIB_USEDEP}]
-	fapi? (
-		dev-libs/json-c:=[${MULTILIB_USEDEP}]
-		>=net-misc/curl-7.80.0[${MULTILIB_USEDEP}]
-	)
-	mbedtls? ( net-libs/mbedtls:=[${MULTILIB_USEDEP}] )
-	openssl? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] )
-"
-
-DEPEND="
-	${RDEPEND}
-	test? ( app-crypt/swtpm
-		dev-libs/uthash
-		dev-util/cmocka
-		fapi? ( >=net-misc/curl-7.80.0 ) )
-"
-
-BDEPEND="
-	sys-apps/acl
-	virtual/pkgconfig
-	doc? ( app-text/doxygen )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.0.2-Dont-install-files-into-run.patch"
-	"${FILESDIR}/${PN}-4.0.1-Make-sysusers-and-tmpfiles-optional.patch"
-	"${FILESDIR}/${PN}-4.0.1-Do-not-consider-failures-to-write-files-in-sys-hard.patch"
-)
-
-pkg_setup() {
-	local CONFIG_CHECK="~TCG_TPM"
-	linux-info_pkg_setup
-	kernel_is ge 4 12 0 || ewarn "At least kernel 4.12.0 is required"
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	# Fails with inlining
-	filter-flags -fno-semantic-interposition
-	# tests fail with LTO enabbled. See bug 865275 and 865279
-	filter-lto
-
-	local myconf=(
-		--localstatedir=/var
-		$(multilib_native_use_enable doc doxygen-doc)
-		$(use_enable fapi)
-		$(use_enable policy)
-		$(use_enable static-libs static)
-		$(multilib_native_use_enable test unit)
-		$(multilib_native_use_enable test integration)
-		$(multilib_native_use_enable test self-generated-certificate)
-		--disable-tcti-libtpms
-		--disable-defaultflags
-		--disable-weakcrypto
-		--with-crypto="$(usex mbedtls mbed ossl)"
-		--with-runstatedir=/run
-		--with-udevrulesdir="$(get_udevdir)/rules.d"
-		--with-udevrulesprefix=60-
-		--without-sysusersdir
-		--with-tmpfilesdir="/usr/lib/tmpfiles.d"
-	)
-
-	ECONF_SOURCE=${S} econf "${myconf[@]}"
-}
-
-multilib_src_install() {
-	default
-	keepdir /var/lib/tpm2-tss/system/keystore
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	tmpfiles_process tpm2-tss-fapi.conf
-	udev_reload
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/app-crypt/tpm2-tss/tpm2-tss-4.1.3.ebuild b/app-crypt/tpm2-tss/tpm2-tss-4.1.3-r1.ebuild
index 0f0b23883e0b..c9b5cd0a29b1 100644
--- a/app-crypt/tpm2-tss/tpm2-tss-4.1.3.ebuild
+++ b/app-crypt/tpm2-tss/tpm2-tss-4.1.3-r1.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
@@ -29,7 +29,7 @@ RDEPEND="
 		dev-libs/json-c:=[${MULTILIB_USEDEP}]
 		>=net-misc/curl-7.80.0[${MULTILIB_USEDEP}]
 	)
-	mbedtls? ( net-libs/mbedtls:=[${MULTILIB_USEDEP}] )
+	mbedtls? ( net-libs/mbedtls:0=[${MULTILIB_USEDEP}] )
 	openssl? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] )
 "
 
diff --git a/app-emulation/virt-manager/virt-manager-5.0.0-r1.ebuild b/app-emulation/virt-manager/virt-manager-5.0.0-r1.ebuild
index 6de0dd7d7d6f..828d4e623a57 100644
--- a/app-emulation/virt-manager/virt-manager-5.0.0-r1.ebuild
+++ b/app-emulation/virt-manager/virt-manager-5.0.0-r1.ebuild
@@ -89,7 +89,8 @@ src_install() {
 
 	if ! use gui; then
 		rm -r "${ED}/usr/share/applications/${PN}.desktop" || die
-		rm -r "${ED}/usr/share/${PN}/{ui,icons}/" || die
+		rm -r "${ED}/usr/share/${PN}/icons/" || die
+		rm -r "${ED}/usr/share/${PN}/ui/" || die
 		rm -r "${ED}/usr/share/icons/" || die
 		rm -r "${ED}/usr/bin/${PN}" || die
 	fi
diff --git a/app-emulation/virt-manager/virt-manager-9999.ebuild b/app-emulation/virt-manager/virt-manager-9999.ebuild
index 6de0dd7d7d6f..828d4e623a57 100644
--- a/app-emulation/virt-manager/virt-manager-9999.ebuild
+++ b/app-emulation/virt-manager/virt-manager-9999.ebuild
@@ -89,7 +89,8 @@ src_install() {
 
 	if ! use gui; then
 		rm -r "${ED}/usr/share/applications/${PN}.desktop" || die
-		rm -r "${ED}/usr/share/${PN}/{ui,icons}/" || die
+		rm -r "${ED}/usr/share/${PN}/icons/" || die
+		rm -r "${ED}/usr/share/${PN}/ui/" || die
 		rm -r "${ED}/usr/share/icons/" || die
 		rm -r "${ED}/usr/bin/${PN}" || die
 	fi
diff --git a/dev-cpp/cppgir/Manifest b/dev-cpp/cppgir/Manifest
index c92b1402b795..49a377a5abab 100644
--- a/dev-cpp/cppgir/Manifest
+++ b/dev-cpp/cppgir/Manifest
@@ -1,2 +1 @@
-DIST cppgir-2.0_p20240315.tar.bz2 135008 BLAKE2B ebd304fe08ec9c203b9bfad1e63f3c0878ea9894487d10b0f5f47dfd41c826c5231cb91c1026b2a203e94bb3b017055c42264623ea6534e7eb78c99357308323 SHA512 e2fe3a042189e190a84c9c62ae5f44f2495a61e77e776b7862d8d673c2d94fe6968fa7f03f68291475cc1f00c46dd6f58d10fd2e6e2fdfab96479ef528937775
 DIST cppgir-2.0_p20240928.tar.bz2 137200 BLAKE2B 8841b721120add8f75516d63217ffa1c293d7ffba7599353f8cb34400ebb0984224e49f434498bbe879a9864697b5e85fc7908a7977fd6c4874111daec5af72c SHA512 b2e0cf180b9ebe527d90c81cb4587282c71848fe6e54dee24d5fc88643adfd9915f63fa43f45f45177459d05a1f7deaa414caf0d41378849db968c8bfbd4e24c
diff --git a/dev-cpp/cppgir/cppgir-2.0_p20240315.ebuild b/dev-cpp/cppgir/cppgir-2.0_p20240315.ebuild
deleted file mode 100644
index b8b203459ce3..000000000000
--- a/dev-cpp/cppgir/cppgir-2.0_p20240315.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic
-
-DESCRIPTION="GObject-Introspection C++ binding wrapper generator"
-HOMEPAGE="https://gitlab.com/mnauw/cppgir"
-
-MY_PV="1cde1aaa0696ab7989f512abdb0694614ffe8d87"
-SRC_URI="https://gitlab.com/mnauw/cppgir/-/archive/${MY_PV}/cppgir-${MY_PV}.tar.bz2 -> ${P}.tar.bz2"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~loong ~ppc64 ~riscv"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-libs/libfmt:=
-"
-DEPEND="${RDEPEND}
-	dev-cpp/expected-lite
-"
-BDEPEND="
-	doc? ( app-text/ronn-ng )
-	test? ( dev-libs/glib )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_DOC=$(usex doc)
-		-DBUILD_TESTING=$(usex test)
-		-DBUILD_EXAMPLES=no
-		-DINTERNAL_EXPECTED=no
-	)
-
-	append-cppflags \
-		-UDEFAULT_GIRPATH \
-		-DDEFAULT_GIRPATH="${EPREFIX}/usr/share:${EPREFIX}/usr/local/share"
-
-	cmake_src_configure
-}
diff --git a/dev-java/jakarta-annotation-api/jakarta-annotation-api-3.0.0.ebuild b/dev-java/jakarta-annotation-api/jakarta-annotation-api-3.0.0.ebuild
index 7d5404665521..1003626c65b7 100644
--- a/dev-java/jakarta-annotation-api/jakarta-annotation-api-3.0.0.ebuild
+++ b/dev-java/jakarta-annotation-api/jakarta-annotation-api-3.0.0.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
@@ -15,7 +15,7 @@ S="${WORKDIR}/common-annotations-api-${PV}"
 
 LICENSE="EPL-2.0 GPL-2-with-classpath-exception"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
+KEYWORDS="amd64 arm64 ppc64"
 
 DEPEND=">=virtual/jdk-11:*"
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/randomized-runner/randomized-runner-2.8.2.ebuild b/dev-java/randomized-runner/randomized-runner-2.8.2.ebuild
index 4ad376fc8c6a..cf6edd323b25 100644
--- a/dev-java/randomized-runner/randomized-runner-2.8.2.ebuild
+++ b/dev-java/randomized-runner/randomized-runner-2.8.2.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
@@ -16,7 +16,7 @@ S="${WORKDIR}/randomizedtesting-release-${PV}/${PN}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
+KEYWORDS="amd64 arm64 ppc64"
 
 CP_DEPEND="dev-java/junit:4"
 
diff --git a/dev-lang/haxe/haxe-4.3.6-r1.ebuild b/dev-lang/haxe/haxe-4.3.6-r2.ebuild
index e9be60dc63a5..491ce6f87e76 100644
--- a/dev-lang/haxe/haxe-4.3.6-r1.ebuild
+++ b/dev-lang/haxe/haxe-4.3.6-r2.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
@@ -38,7 +38,7 @@ RDEPEND="
 	dev-lang/neko:=
 	dev-libs/boehm-gc:=
 	dev-libs/libpcre:=
-	net-libs/mbedtls:=
+	net-libs/mbedtls:0=
 	sys-libs/zlib:=
 "
 DEPEND="
diff --git a/dev-lang/neko/neko-2.4.0.ebuild b/dev-lang/neko/neko-2.3.0-r3.ebuild
index f51030b4e47b..2191b6d96b38 100644
--- a/dev-lang/neko/neko-2.4.0.ebuild
+++ b/dev-lang/neko/neko-2.3.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -33,7 +33,7 @@ RDEPEND="
 	sqlite? ( dev-db/sqlite:3= )
 	ssl? (
 		dev-libs/openssl:=
-		net-libs/mbedtls:=
+		net-libs/mbedtls:0=
 	)
 "
 DEPEND="${RDEPEND}"
diff --git a/dev-lang/neko/neko-2.3.0-r2.ebuild b/dev-lang/neko/neko-2.4.0-r1.ebuild
index f51030b4e47b..2191b6d96b38 100644
--- a/dev-lang/neko/neko-2.3.0-r2.ebuild
+++ b/dev-lang/neko/neko-2.4.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -33,7 +33,7 @@ RDEPEND="
 	sqlite? ( dev-db/sqlite:3= )
 	ssl? (
 		dev-libs/openssl:=
-		net-libs/mbedtls:=
+		net-libs/mbedtls:0=
 	)
 "
 DEPEND="${RDEPEND}"
diff --git a/dev-libs/libevent/libevent-2.2.1-r2.ebuild b/dev-libs/libevent/libevent-2.2.1-r3.ebuild
index 64aa2bd59b5c..16f66939a1f7 100644
--- a/dev-libs/libevent/libevent-2.2.1-r2.ebuild
+++ b/dev-libs/libevent/libevent-2.2.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -31,7 +31,7 @@ IUSE="
 RESTRICT="test"
 
 DEPEND="
-	mbedtls? ( net-libs/mbedtls:=[${MULTILIB_USEDEP}] )
+	mbedtls? ( net-libs/mbedtls:0=[${MULTILIB_USEDEP}] )
 	ssl? ( >=dev-libs/openssl-1.0.1h-r2:=[${MULTILIB_USEDEP}] )
 "
 RDEPEND="
diff --git a/dev-libs/libevent/libevent-9999.ebuild b/dev-libs/libevent/libevent-9999.ebuild
index 471fb8418bef..cf26212e3cb4 100644
--- a/dev-libs/libevent/libevent-9999.ebuild
+++ b/dev-libs/libevent/libevent-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -23,7 +23,7 @@ IUSE="
 RESTRICT="test"
 
 DEPEND="
-	mbedtls? ( net-libs/mbedtls:=[${MULTILIB_USEDEP}] )
+	mbedtls? ( net-libs/mbedtls:0=[${MULTILIB_USEDEP}] )
 	ssl? ( >=dev-libs/openssl-1.0.1h-r2:=[${MULTILIB_USEDEP}] )
 "
 RDEPEND="
diff --git a/dev-libs/libzip/libzip-1.11.2.ebuild b/dev-libs/libzip/libzip-1.11.2-r1.ebuild
index 918572c6f00a..568eae26576c 100644
--- a/dev-libs/libzip/libzip-1.11.2.ebuild
+++ b/dev-libs/libzip/libzip-1.11.2-r1.ebuild
@@ -26,7 +26,7 @@ DEPEND="
 			>=net-libs/gnutls-3.6.5:=
 		)
 		!gnutls? (
-			mbedtls? ( net-libs/mbedtls:= )
+			mbedtls? ( net-libs/mbedtls:0= )
 			!mbedtls? ( dev-libs/openssl:= )
 		)
 	)
diff --git a/dev-libs/libzip/libzip-1.9.2.ebuild b/dev-libs/libzip/libzip-1.9.2-r1.ebuild
index 40578c7008c6..4481cb00690e 100644
--- a/dev-libs/libzip/libzip-1.9.2.ebuild
+++ b/dev-libs/libzip/libzip-1.9.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -27,7 +27,7 @@ DEPEND="
 			>=net-libs/gnutls-3.6.5:=
 		)
 		!gnutls? (
-			mbedtls? ( net-libs/mbedtls:= )
+			mbedtls? ( net-libs/mbedtls:0= )
 			!mbedtls? ( dev-libs/openssl:0= )
 		)
 	)
diff --git a/dev-libs/spdlog/spdlog-1.15.0.ebuild b/dev-libs/spdlog/spdlog-1.15.0.ebuild
index 85cc51616b1c..fedc85e430e8 100644
--- a/dev-libs/spdlog/spdlog-1.15.0.ebuild
+++ b/dev-libs/spdlog/spdlog-1.15.0.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
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/gabime/${PN}"
 else
 	SRC_URI="https://github.com/gabime/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~loong ~mips ppc ~ppc64 ~riscv ~s390 sparc ~x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-perl/Memory-Process/Memory-Process-0.60.0.ebuild b/dev-perl/Memory-Process/Memory-Process-0.60.0.ebuild
index 1f31c8752e97..01fe3344e306 100644
--- a/dev-perl/Memory-Process/Memory-Process-0.60.0.ebuild
+++ b/dev-perl/Memory-Process/Memory-Process-0.60.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Perl class to determine actual memory usage"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~s390 ~sparc"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc64 ~s390 ~sparc"
 
 RDEPEND="
 	dev-perl/Memory-Usage
diff --git a/dev-perl/Memory-Usage/Memory-Usage-0.201.0.ebuild b/dev-perl/Memory-Usage/Memory-Usage-0.201.0.ebuild
index dd37dd352e74..b24d47f0a781 100644
--- a/dev-perl/Memory-Usage/Memory-Usage-0.201.0.ebuild
+++ b/dev-perl/Memory-Usage/Memory-Usage-0.201.0.ebuild
@@ -10,6 +10,6 @@ inherit perl-module
 DESCRIPTION="Tools to determine actual memory usage"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~s390 ~sparc"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc64 ~s390 ~sparc"
 
 BDEPEND="dev-perl/Module-Install"
diff --git a/dev-scheme/gauche/gauche-0.9.15.ebuild b/dev-scheme/gauche/gauche-0.9.15-r1.ebuild
index 16f7c7362b73..95768382c202 100644
--- a/dev-scheme/gauche/gauche-0.9.15.ebuild
+++ b/dev-scheme/gauche/gauche-0.9.15-r1.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"
@@ -9,8 +9,9 @@ MY_P="${P^g}"
 MY_P="${MY_P/_p/-p}"
 
 DESCRIPTION="A Unix system friendly Scheme Interpreter"
-HOMEPAGE="http://practical-scheme.net/gauche/"
+HOMEPAGE="https://practical-scheme.net/gauche/"
 SRC_URI="https://github.com/shirok/${PN^g}/releases/download/release${PV//./_}/${MY_P}.tgz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0/$(ver_cut 1-2)8"
@@ -18,11 +19,10 @@ KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="ipv6 test"
 RESTRICT="!test? ( test )"
 
-RDEPEND="net-libs/mbedtls:=
+RDEPEND="net-libs/mbedtls:0=
 	sys-libs/gdbm
 	virtual/libcrypt:="
 DEPEND="${RDEPEND}"
-S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-ext-ldflags.patch
diff --git a/dev-util/lcov/lcov-2.0-r4.ebuild b/dev-util/lcov/lcov-2.0-r4.ebuild
index 554d6f08c8a1..b45eedd0934d 100644
--- a/dev-util/lcov/lcov-2.0-r4.ebuild
+++ b/dev-util/lcov/lcov-2.0-r4.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/linux-test-project/lcov/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~s390 ~sparc"
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc64 ~s390 ~sparc"
 fi
 
 LICENSE="GPL-2+"
diff --git a/media-video/obs-studio/obs-studio-30.2.3.ebuild b/media-video/obs-studio/obs-studio-30.2.3-r1.ebuild
index 043f43465d42..81b7effe5cfc 100644
--- a/media-video/obs-studio/obs-studio-30.2.3.ebuild
+++ b/media-video/obs-studio/obs-studio-30.2.3-r1.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
@@ -117,7 +117,7 @@ DEPEND="
 	python? ( ${PYTHON_DEPS} )
 	qsv? ( media-libs/libvpl )
 	speex? ( media-libs/speexdsp )
-	ssl? ( net-libs/mbedtls:= )
+	ssl? ( net-libs/mbedtls:0= )
 	test? ( dev-util/cmocka )
 	truetype? (
 		media-libs/fontconfig
diff --git a/media-video/obs-studio/obs-studio-31.0.0-r2.ebuild b/media-video/obs-studio/obs-studio-31.0.0-r3.ebuild
index 79bc62763bf4..7f7837436298 100644
--- a/media-video/obs-studio/obs-studio-31.0.0-r2.ebuild
+++ b/media-video/obs-studio/obs-studio-31.0.0-r3.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
@@ -69,7 +69,7 @@ DEPEND="
 	media-libs/x264:=
 	>=media-video/ffmpeg-6.1:=[nvenc?,opus,x264]
 	net-misc/curl
-	net-libs/mbedtls:=
+	net-libs/mbedtls:0=
 	sys-apps/dbus
 	sys-apps/pciutils
 	sys-apps/util-linux
diff --git a/media-video/obs-studio/obs-studio-9999.ebuild b/media-video/obs-studio/obs-studio-9999.ebuild
index a7536b82f747..f190a7c6135c 100644
--- a/media-video/obs-studio/obs-studio-9999.ebuild
+++ b/media-video/obs-studio/obs-studio-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
@@ -69,7 +69,7 @@ DEPEND="
 	media-libs/x264:=
 	>=media-video/ffmpeg-6.1:=[nvenc?,opus,x264]
 	net-misc/curl
-	net-libs/mbedtls:=
+	net-libs/mbedtls:0=
 	sys-apps/dbus
 	sys-apps/pciutils
 	sys-apps/util-linux
diff --git a/net-dns/inadyn/inadyn-2.12.0-r1.ebuild b/net-dns/inadyn/inadyn-2.12.0-r2.ebuild
index 380d72354dd1..e93a10ff8773 100644
--- a/net-dns/inadyn/inadyn-2.12.0-r1.ebuild
+++ b/net-dns/inadyn/inadyn-2.12.0-r2.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 @@ DEPEND="
 		dev-libs/nettle:=
 		net-libs/gnutls:=
 	)
-	mbedtls? ( net-libs/mbedtls:= )
+	mbedtls? ( net-libs/mbedtls:0= )
 	openssl? ( dev-libs/openssl:= )
 "
 RDEPEND="${DEPEND}"
diff --git a/net-im/telegram-desktop/telegram-desktop-5.10.0.ebuild b/net-im/telegram-desktop/telegram-desktop-5.10.0-r1.ebuild
index 8557b3f04dad..ef5345800daa 100644
--- a/net-im/telegram-desktop/telegram-desktop-5.10.0.ebuild
+++ b/net-im/telegram-desktop/telegram-desktop-5.10.0-r1.ebuild
@@ -129,7 +129,7 @@ src_prepare() {
 	# Control automagic dep only needed when USE="webkit wayland"
 	if ! use webkit || ! use wayland; then
 		sed -e 's/QT_CONFIG(wayland_compositor_quick)/0/' \
-			-i Telegram/Telegram/lib_webview/webview/platform/linux/webview_linux_compositor.h
+			-i Telegram/lib_webview/webview/platform/linux/webview_linux_compositor.h || die
 	fi
 
 	cmake_src_prepare
diff --git a/net-im/telegram-desktop/telegram-desktop-5.9.0-r1.ebuild b/net-im/telegram-desktop/telegram-desktop-5.9.0-r2.ebuild
index 65bdd0fb2274..f820c72628bc 100644
--- a/net-im/telegram-desktop/telegram-desktop-5.9.0-r1.ebuild
+++ b/net-im/telegram-desktop/telegram-desktop-5.9.0-r2.ebuild
@@ -129,7 +129,7 @@ src_prepare() {
 	# Control automagic dep only needed when USE="webkit wayland"
 	if ! use webkit || ! use wayland; then
 		sed -e 's/QT_CONFIG(wayland_compositor_quick)/0/' \
-			-i Telegram/Telegram/lib_webview/webview/platform/linux/webview_linux_compositor.h
+			-i Telegram/lib_webview/webview/platform/linux/webview_linux_compositor.h || die
 	fi
 
 	cmake_src_prepare
diff --git a/net-irc/inspircd/inspircd-3.17.1.ebuild b/net-irc/inspircd/inspircd-3.17.1-r1.ebuild
index 21d0bac2f66b..b5dd27a9abd4 100644
--- a/net-irc/inspircd/inspircd-3.17.1.ebuild
+++ b/net-irc/inspircd/inspircd-3.17.1-r1.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
@@ -24,7 +24,7 @@ RDEPEND="
 	gnutls? ( net-libs/gnutls:= dev-libs/libgcrypt:0 )
 	ldap? ( net-nds/openldap:= )
 	maxminddb? ( dev-libs/libmaxminddb:= )
-	mbedtls? ( net-libs/mbedtls:= )
+	mbedtls? ( net-libs/mbedtls:0= )
 	mysql? ( dev-db/mysql-connector-c:= )
 	pcre? ( dev-libs/libpcre )
 	pcre2? ( dev-libs/libpcre2 )
diff --git a/net-libs/librist/librist-0.2.8.ebuild b/net-libs/librist/librist-0.2.8-r1.ebuild
index d5c984d28111..3debbeee8199 100644
--- a/net-libs/librist/librist-0.2.8.ebuild
+++ b/net-libs/librist/librist-0.2.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2018-2023 Gentoo Authors
+# Copyright 2018-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -9,22 +9,21 @@ DESCRIPTION="Library for Reliable Internet Stream Transport (RIST) protocol"
 HOMEPAGE="https://code.videolan.org/rist/librist"
 
 SRC_URI="https://code.videolan.org/rist/librist/-/archive/v${PV}/librist-v${PV}.tar.bz2"
-KEYWORDS="~arm64"
-
+S="${WORKDIR}/librist-v${PV}"
 LICENSE="BSD-2"
 SLOT="0"
+KEYWORDS="~arm64"
+
 IUSE="test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-libs/cJSON
-	net-libs/mbedtls:=
+	net-libs/mbedtls:0=
 "
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
-S="${WORKDIR}/librist-v${PV}"
-
 src_configure() {
 	local emesonargs=(
 		-Dstatic_analyze=false
diff --git a/net-libs/libssh/libssh-0.10.6-r1.ebuild b/net-libs/libssh/libssh-0.10.6-r2.ebuild
index 96aceba24d24..ff5c0510997d 100644
--- a/net-libs/libssh/libssh-0.10.6-r1.ebuild
+++ b/net-libs/libssh/libssh-0.10.6-r2.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
@@ -32,7 +32,7 @@ RDEPEND="
 	)
 	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
 	gssapi? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-	mbedtls? ( net-libs/mbedtls:=[${MULTILIB_USEDEP}] )
+	mbedtls? ( net-libs/mbedtls:0=[${MULTILIB_USEDEP}] )
 	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
 "
 DEPEND="${RDEPEND}
diff --git a/net-libs/libssh/libssh-0.11.1.ebuild b/net-libs/libssh/libssh-0.11.1-r1.ebuild
index 57664907ccdb..a1ddb76df753 100644
--- a/net-libs/libssh/libssh-0.11.1.ebuild
+++ b/net-libs/libssh/libssh-0.11.1-r1.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
@@ -26,7 +26,7 @@ RESTRICT="!test? ( test )"
 RDEPEND="
 	!mbedtls? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
 	gssapi? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-	mbedtls? ( net-libs/mbedtls:=[${MULTILIB_USEDEP}] )
+	mbedtls? ( net-libs/mbedtls:0=[${MULTILIB_USEDEP}] )
 	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
 "
 DEPEND="${RDEPEND}
diff --git a/net-libs/libssh/libssh-9999.ebuild b/net-libs/libssh/libssh-9999.ebuild
index 1cab5e95f04b..956a471414a6 100644
--- a/net-libs/libssh/libssh-9999.ebuild
+++ b/net-libs/libssh/libssh-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
@@ -26,7 +26,7 @@ RESTRICT="!test? ( test )"
 RDEPEND="
 	!mbedtls? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
 	gssapi? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-	mbedtls? ( net-libs/mbedtls:=[${MULTILIB_USEDEP}] )
+	mbedtls? ( net-libs/mbedtls:0=[${MULTILIB_USEDEP}] )
 	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
 "
 DEPEND="${RDEPEND}
diff --git a/net-libs/libwebsockets/libwebsockets-4.3.3.ebuild b/net-libs/libwebsockets/libwebsockets-4.3.3-r1.ebuild
index 2e0c4457d823..6657425c8e80 100644
--- a/net-libs/libwebsockets/libwebsockets-4.3.3.ebuild
+++ b/net-libs/libwebsockets/libwebsockets-4.3.3-r1.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
@@ -36,7 +36,7 @@ RDEPEND="
 	sqlite3? ( dev-db/sqlite:= )
 	ssl? (
 		!mbedtls? ( dev-libs/openssl:0= )
-		mbedtls? ( net-libs/mbedtls:= )
+		mbedtls? ( net-libs/mbedtls:0= )
 	)"
 DEPEND="${RDEPEND}"
 BDEPEND="
diff --git a/net-misc/curl/curl-8.10.1-r1.ebuild b/net-misc/curl/curl-8.10.1-r2.ebuild
index 15453a09b464..fefabb8b133a 100644
--- a/net-misc/curl/curl-8.10.1-r1.ebuild
+++ b/net-misc/curl/curl-8.10.1-r2.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
@@ -106,7 +106,7 @@ RDEPEND="
 		)
 		mbedtls? (
 			app-misc/ca-certificates
-			net-libs/mbedtls:=[${MULTILIB_USEDEP}]
+			net-libs/mbedtls:0=[${MULTILIB_USEDEP}]
 		)
 		openssl? (
 			>=dev-libs/openssl-0.9.7:=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}]
diff --git a/net-misc/curl/curl-8.11.0.ebuild b/net-misc/curl/curl-8.11.0-r1.ebuild
index 35717336263a..256378637261 100644
--- a/net-misc/curl/curl-8.11.0.ebuild
+++ b/net-misc/curl/curl-8.11.0-r1.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
@@ -106,7 +106,7 @@ RDEPEND="
 		)
 		mbedtls? (
 			app-misc/ca-certificates
-			net-libs/mbedtls:=[${MULTILIB_USEDEP}]
+			net-libs/mbedtls:0=[${MULTILIB_USEDEP}]
 		)
 		openssl? (
 			>=dev-libs/openssl-0.9.7:=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}]
diff --git a/net-misc/curl/curl-8.11.1-r1.ebuild b/net-misc/curl/curl-8.11.1-r2.ebuild
index ddd74bc97377..96c0bc7723d3 100644
--- a/net-misc/curl/curl-8.11.1-r1.ebuild
+++ b/net-misc/curl/curl-8.11.1-r2.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
@@ -106,7 +106,7 @@ RDEPEND="
 		)
 		mbedtls? (
 			app-misc/ca-certificates
-			net-libs/mbedtls:=[${MULTILIB_USEDEP}]
+			net-libs/mbedtls:0=[${MULTILIB_USEDEP}]
 		)
 		openssl? (
 			>=dev-libs/openssl-0.9.7:=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}]
diff --git a/net-misc/curl/curl-8.8.0-r1.ebuild b/net-misc/curl/curl-8.8.0-r2.ebuild
index 71a852bab339..89b07c74c60e 100644
--- a/net-misc/curl/curl-8.8.0-r1.ebuild
+++ b/net-misc/curl/curl-8.8.0-r2.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
@@ -84,7 +84,7 @@ RDEPEND="
 		)
 		mbedtls? (
 			app-misc/ca-certificates
-			net-libs/mbedtls:=[${MULTILIB_USEDEP}]
+			net-libs/mbedtls:0=[${MULTILIB_USEDEP}]
 		)
 		openssl? (
 			>=dev-libs/openssl-0.9.7:=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}]
diff --git a/net-misc/curl/curl-8.9.1-r1.ebuild b/net-misc/curl/curl-8.9.1-r2.ebuild
index 6f36295d7391..0648465d5677 100644
--- a/net-misc/curl/curl-8.9.1-r1.ebuild
+++ b/net-misc/curl/curl-8.9.1-r2.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
@@ -106,7 +106,7 @@ RDEPEND="
 		)
 		mbedtls? (
 			app-misc/ca-certificates
-			net-libs/mbedtls:=[${MULTILIB_USEDEP}]
+			net-libs/mbedtls:0=[${MULTILIB_USEDEP}]
 		)
 		openssl? (
 			>=dev-libs/openssl-0.9.7:=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}]
diff --git a/net-misc/curl/curl-9999.ebuild b/net-misc/curl/curl-9999.ebuild
index 09179eadd2f2..5a37525caae2 100644
--- a/net-misc/curl/curl-9999.ebuild
+++ b/net-misc/curl/curl-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
@@ -106,7 +106,7 @@ RDEPEND="
 		)
 		mbedtls? (
 			app-misc/ca-certificates
-			net-libs/mbedtls:=[${MULTILIB_USEDEP}]
+			net-libs/mbedtls:0=[${MULTILIB_USEDEP}]
 		)
 		openssl? (
 			>=dev-libs/openssl-0.9.7:=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}]
diff --git a/net-voip/umurmur/umurmur-0.2.20.ebuild b/net-voip/umurmur/umurmur-0.2.20-r1.ebuild
index d0487801838c..b833732c98d6 100644
--- a/net-voip/umurmur/umurmur-0.2.20.ebuild
+++ b/net-voip/umurmur/umurmur-0.2.20-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,6 +14,7 @@ else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV/_}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="amd64 ~arm x86"
 fi
+S="${WORKDIR}/${P/_}"
 LICENSE="BSD"
 SLOT="0"
 IUSE="gnutls mbedtls shm"
@@ -26,7 +27,7 @@ DEPEND=">=dev-libs/protobuf-c-1.0.0_rc2:=
 		>=net-libs/gnutls-3.0.0:=
 	)
 	!gnutls? (
-		mbedtls? ( net-libs/mbedtls:= )
+		mbedtls? ( net-libs/mbedtls:0= )
 		!mbedtls? ( dev-libs/openssl:0= )
 	)
 "
@@ -45,8 +46,6 @@ PATCHES=(
 	"${FILESDIR}/${PN}-0.2.20-openssl3.patch" #806154
 )
 
-S="${WORKDIR}/${P/_}"
-
 get_ssl_impl() {
 	local ssl_provider=()
 
diff --git a/net-vpn/openvpn/openvpn-2.5.6-r1.ebuild b/net-vpn/openvpn/openvpn-2.5.6-r2.ebuild
index 3636e8880907..68afef4eb0b3 100644
--- a/net-vpn/openvpn/openvpn-2.5.6-r1.ebuild
+++ b/net-vpn/openvpn/openvpn-2.5.6-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -38,7 +38,7 @@ CDEPEND="
 	)
 	lz4? ( app-arch/lz4 )
 	lzo? ( >=dev-libs/lzo-1.07 )
-	mbedtls? ( net-libs/mbedtls:= )
+	mbedtls? ( net-libs/mbedtls:0= )
 	openssl? ( >=dev-libs/openssl-0.9.8:0= )
 	pam? ( sys-libs/pam )
 	pkcs11? ( >=dev-libs/pkcs11-helper-1.11 )
diff --git a/net-vpn/openvpn/openvpn-2.5.7-r1.ebuild b/net-vpn/openvpn/openvpn-2.5.7-r2.ebuild
index d4f1ab61a2e6..0a59debf1b92 100644
--- a/net-vpn/openvpn/openvpn-2.5.7-r1.ebuild
+++ b/net-vpn/openvpn/openvpn-2.5.7-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -38,7 +38,7 @@ CDEPEND="
 	)
 	lz4? ( app-arch/lz4 )
 	lzo? ( >=dev-libs/lzo-1.07 )
-	mbedtls? ( net-libs/mbedtls:= )
+	mbedtls? ( net-libs/mbedtls:0= )
 	openssl? ( >=dev-libs/openssl-0.9.8:0= )
 	pam? ( sys-libs/pam )
 	pkcs11? ( >=dev-libs/pkcs11-helper-1.11 )
diff --git a/net-vpn/openvpn/openvpn-2.6.12.ebuild b/net-vpn/openvpn/openvpn-2.6.12-r1.ebuild
index ebad808e6e1f..ca32558901d9 100644
--- a/net-vpn/openvpn/openvpn-2.6.12.ebuild
+++ b/net-vpn/openvpn/openvpn-2.6.12-r1.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
@@ -37,7 +37,7 @@ COMMON_DEPEND="
 	)
 	lz4? ( app-arch/lz4 )
 	lzo? ( >=dev-libs/lzo-1.07 )
-	mbedtls? ( net-libs/mbedtls:= )
+	mbedtls? ( net-libs/mbedtls:0= )
 	openssl? ( >=dev-libs/openssl-1.0.2:0= )
 	pam? ( sys-libs/pam )
 	pkcs11? ( >=dev-libs/pkcs11-helper-1.11 )
diff --git a/net-vpn/openvpn/openvpn-2.6.4.ebuild b/net-vpn/openvpn/openvpn-2.6.4-r1.ebuild
index 5bc085c9c209..810f3c52ed89 100644
--- a/net-vpn/openvpn/openvpn-2.6.4.ebuild
+++ b/net-vpn/openvpn/openvpn-2.6.4-r1.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
@@ -37,7 +37,7 @@ CDEPEND="
 	)
 	lz4? ( app-arch/lz4 )
 	lzo? ( >=dev-libs/lzo-1.07 )
-	mbedtls? ( net-libs/mbedtls:= )
+	mbedtls? ( net-libs/mbedtls:0= )
 	openssl? ( >=dev-libs/openssl-1.0.2:0= )
 	pam? ( sys-libs/pam )
 	pkcs11? ( >=dev-libs/pkcs11-helper-1.11 )
diff --git a/net-vpn/openvpn/openvpn-2.6.8.ebuild b/net-vpn/openvpn/openvpn-2.6.8-r1.ebuild
index a454e266b420..5302cbd095f6 100644
--- a/net-vpn/openvpn/openvpn-2.6.8.ebuild
+++ b/net-vpn/openvpn/openvpn-2.6.8-r1.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
@@ -37,7 +37,7 @@ COMMON_DEPEND="
 	)
 	lz4? ( app-arch/lz4 )
 	lzo? ( >=dev-libs/lzo-1.07 )
-	mbedtls? ( net-libs/mbedtls:= )
+	mbedtls? ( net-libs/mbedtls:0= )
 	openssl? ( >=dev-libs/openssl-1.0.2:0= )
 	pam? ( sys-libs/pam )
 	pkcs11? ( >=dev-libs/pkcs11-helper-1.11 )
diff --git a/net-vpn/openvpn/openvpn-2.6.9.ebuild b/net-vpn/openvpn/openvpn-2.6.9-r1.ebuild
index a454e266b420..5302cbd095f6 100644
--- a/net-vpn/openvpn/openvpn-2.6.9.ebuild
+++ b/net-vpn/openvpn/openvpn-2.6.9-r1.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
@@ -37,7 +37,7 @@ COMMON_DEPEND="
 	)
 	lz4? ( app-arch/lz4 )
 	lzo? ( >=dev-libs/lzo-1.07 )
-	mbedtls? ( net-libs/mbedtls:= )
+	mbedtls? ( net-libs/mbedtls:0= )
 	openssl? ( >=dev-libs/openssl-1.0.2:0= )
 	pam? ( sys-libs/pam )
 	pkcs11? ( >=dev-libs/pkcs11-helper-1.11 )
diff --git a/net-vpn/openvpn/openvpn-9999.ebuild b/net-vpn/openvpn/openvpn-9999.ebuild
index ebad808e6e1f..ca32558901d9 100644
--- a/net-vpn/openvpn/openvpn-9999.ebuild
+++ b/net-vpn/openvpn/openvpn-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
@@ -37,7 +37,7 @@ COMMON_DEPEND="
 	)
 	lz4? ( app-arch/lz4 )
 	lzo? ( >=dev-libs/lzo-1.07 )
-	mbedtls? ( net-libs/mbedtls:= )
+	mbedtls? ( net-libs/mbedtls:0= )
 	openssl? ( >=dev-libs/openssl-1.0.2:0= )
 	pam? ( sys-libs/pam )
 	pkcs11? ( >=dev-libs/pkcs11-helper-1.11 )
diff --git a/www-client/dillo/dillo-3.1.1-r1.ebuild b/www-client/dillo/dillo-3.1.1-r2.ebuild
index 53222bcbf650..59b02fe21509 100644
--- a/www-client/dillo/dillo-3.1.1-r1.ebuild
+++ b/www-client/dillo/dillo-3.1.1-r2.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
@@ -30,7 +30,7 @@ RDEPEND="
 	jpeg? ( media-libs/libjpeg-turbo:= )
 	png? ( >=media-libs/libpng-1.2:= )
 	ssl? (
-		mbedtls? ( net-libs/mbedtls:= )
+		mbedtls? ( net-libs/mbedtls:0= )
 		openssl? ( dev-libs/openssl:= )
 	)
 	test? (
diff --git a/www-client/dillo/dillo-9999.ebuild b/www-client/dillo/dillo-9999.ebuild
index 6afd97ac6375..cd0dca3283fe 100644
--- a/www-client/dillo/dillo-9999.ebuild
+++ b/www-client/dillo/dillo-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
@@ -30,7 +30,7 @@ RDEPEND="
 	jpeg? ( media-libs/libjpeg-turbo:= )
 	png? ( >=media-libs/libpng-1.2:= )
 	ssl? (
-		mbedtls? ( net-libs/mbedtls:= )
+		mbedtls? ( net-libs/mbedtls:0= )
 		openssl? ( dev-libs/openssl:= )
 	)
 	test? (
diff --git a/www-servers/pound/Manifest b/www-servers/pound/Manifest
index 751f3d7fe38f..0fe772636e47 100644
--- a/www-servers/pound/Manifest
+++ b/www-servers/pound/Manifest
@@ -1,2 +1 @@
-DIST Pound-3.0.2.tgz 76000 BLAKE2B 0e3f2dc69771a1d1f3de00a721f02cdc4ff31f4d17ab81f64c368668f03c0c1f12484e2d40e7c1d2d203b033488f2bad57cafd8da5022dfe680a09cdc6b73bec SHA512 4c96a93df2b340049778ed7782377e521fbdd7b6ccaa157748b05941ac7a825b2688f37f3081a7e577b2fa1ec4f64d68a25d27af2210f59da5be0dc10d1391e9
 DIST pound-4.10.tar.gz 554678 BLAKE2B 895ee69bcbac680062af270655af3433daffd60ea7a90875dd1fb867447a9be6b28d18444db758fa9c034002ab256fc76d932b893a426d77b6069e03a63a7e74 SHA512 2e0fadbcdeb87fb8357c14467b7b31e598881e7db7bde725f81fb4668370cad993e00a9c7617ff4343a444393f05521cda6c8e1b3d663af6b5053b7c7fd7c874
diff --git a/www-servers/pound/files/pound-3.0.2-hpack.patch b/www-servers/pound/files/pound-3.0.2-hpack.patch
deleted file mode 100644
index d413082216ab..000000000000
--- a/www-servers/pound/files/pound-3.0.2-hpack.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/src/hpack.c
-+++ b/src/hpack.c
-@@ -69,9 +69,6 @@ static size_t	 hbuf_left(struct hbuf *);
- 
- static struct hpack	 hpack_global;
- 
--#ifdef  __GLIBC__
--/* these functions are available on BSD, but not on Linux */
--
- #include    <stdlib.h>
- 
- void *
-@@ -100,8 +97,6 @@ freezero(void *ptr, size_t size)
-     return;
- }
- 
--#endif
--
- int
- hpack_init(void)
- {
diff --git a/www-servers/pound/files/pound.init-1.9 b/www-servers/pound/files/pound.init-1.9
deleted file mode 100644
index 905c97b78a81..000000000000
--- a/www-servers/pound/files/pound.init-1.9
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting pound"
-	if [ ! -f "/etc/pound.cfg" ]; then
-		eend 1 "configfile /etc/pound.cfg not found."
-	fi
-	start-stop-daemon --quiet --start --exec /usr/sbin/pound -- -f /etc/pound.cfg -p /var/run/pound.pid
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping pound"
-	start-stop-daemon --quiet --stop --pidfile /var/run/pound.pid
-	eend $?
-}
diff --git a/www-servers/pound/pound-3.0.2.ebuild b/www-servers/pound/pound-3.0.2.ebuild
deleted file mode 100644
index bd273b0c3b0a..000000000000
--- a/www-servers/pound/pound-3.0.2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-MY_P="${P/p/P}"
-
-DESCRIPTION="A http/https reverse-proxy and load-balancer"
-HOMEPAGE="https://www.apsis.ch/pound.html"
-SRC_URI="https://www.apsis.ch/pound/${MY_P}.tgz"
-
-LICENSE="BSD GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc x86"
-
-DEPEND="
-	dev-libs/libpcre:=
-	dev-libs/libyaml:=
-	dev-libs/nanomsg:=
-	dev-libs/openssl:=
-	net-libs/mbedtls:=
-	elibc_musl? ( sys-libs/queue-standalone )
-"
-
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( README.md )
-
-PATCHES=(
-	"${FILESDIR}"/${P}-hpack.patch
-)
-
-src_install() {
-	rm GPL.txt || die
-
-	dosbin "${BUILD_DIR}"/pound
-	doman "${S}"/man/pound.8
-	einstalldocs
-
-	dodir /etc/init.d
-	newinitd "${FILESDIR}"/pound.init-1.9 pound
-
-	insinto /etc
-	newins "${FILESDIR}"/pound-2.2.cfg pound.cfg
-}
-
-pkg_postinst() {
-	elog "No demo-/sample-configfile is included in the distribution;"
-	elog "read the man-page for more info."
-	elog "A sample (localhost:8888 -> localhost:80)"
-	elog "for gentoo is given in \"/etc/pound.cfg\"."
-}