diff --git a/app-crypt/nwipe/Manifest b/app-crypt/nwipe/Manifest
index f8fe6319aad22..96b0675c3aff4 100644
--- a/app-crypt/nwipe/Manifest
+++ b/app-crypt/nwipe/Manifest
@@ -1,2 +1 @@
-DIST nwipe-0.39.tar.gz 7307826 BLAKE2B 33b3cf16c28ec1057536f9a7a1b2571d4d601678aeb7b8c58c4d6c31585a052a8802b6e1d2303a20af00ffeab999f152f219926ee0c773a9422cdaf4a5272052 SHA512 0c620ab6fd9a0aa97dc0df0aad8a1db0c85b8fc22902633cc94fe52c10ac38607c8dcab3a3ea1fa223212a6cc28021773cdba92a0a36714e2187c49e395a5deb
 DIST nwipe-0.40.tar.gz 7344219 BLAKE2B 596b56bb38931d35319a16bfee219cbd9b79e622a9a8b0d5b6059fdf4fd513fe8c6cc1f2e74fbd6144496b74890a62097b5e556e3f10ff819f2c96e296cb3851 SHA512 763349138263612ee1f1c9b933a7b647fdb8fc9f29d7185545574d44e2495b939383865e27dfcfb17d781d68e324b0bd9d2924439f50d1ce2e24d1e85ae971aa
diff --git a/app-crypt/nwipe/nwipe-0.39.ebuild b/app-crypt/nwipe/nwipe-0.39.ebuild
deleted file mode 100644
index d845e4e3bc8d7..0000000000000
--- a/app-crypt/nwipe/nwipe-0.39.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="Securely erase disks using a variety of recognized methods"
-HOMEPAGE="https://github.com/martijnvanbrummelen/nwipe/"
-SRC_URI="https://github.com/martijnvanbrummelen/nwipe/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-libs/libconfig:=
-	sys-apps/hdparm
-	sys-block/parted
-	sys-libs/ncurses:=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-	eautoreconf
-}
diff --git a/app-misc/jdupes/Manifest b/app-misc/jdupes/Manifest
index a662d9106a6ab..3ff97c653fb48 100644
--- a/app-misc/jdupes/Manifest
+++ b/app-misc/jdupes/Manifest
@@ -1,3 +1,2 @@
 DIST jdupes-1.28.0.tar.gz 176657 BLAKE2B 51f560db6b49eefd1ddc249d05e4034321fae03e6ba8d316c964e021dfca658e8f46311eebb261fad922060c4ecbced2316cb780c71e88cb021b084f31f181c9 SHA512 5de369b92653382845bf89f4a1fe894cee9914cd0124c3ca0217d05e5cef14050a14ad538e154c970f81b1b300e02fd055befdbbcd1c79bd790e6e26a4be5b84
-DIST jdupes-1.30.0.tar.gz 178406 BLAKE2B 94841775e962b6fcca931588984870139ff8ed0fa4b92c6d265117b81d7e891c43f5d49dff20853c8fc835726f62f15671a5d98b2597b38520b478888ab02eb4 SHA512 154fc8d3851478f7128878796f266593bc52811b4d940c6dc2887d07298a0dcdd4f8ecb964544dc0a999c6025dfd3d8853b3082bc7a588b7622b0b5742034fee
 DIST jdupes-1.31.1.tar.gz 178534 BLAKE2B 602793fe995318fa571fa4fadc4ef1e7ca8b669ce3f4c75d63dced19e30cbc1aaf702611b908ff8d3954da78b1610ce5d6c2a7eb0b72ccb39b9d4a78835ec2a8 SHA512 1b0163d261c523007e1000a188e4d738f1aa9d1d92ef90097b64eb870bbf60555617a34b8d5ca34117ed6c0a0965c600c06a228229392bfbe7e488cd78520e0a
diff --git a/app-misc/jdupes/jdupes-1.30.0-r2.ebuild b/app-misc/jdupes/jdupes-1.30.0-r2.ebuild
deleted file mode 100644
index 6857b451cdfb2..0000000000000
--- a/app-misc/jdupes/jdupes-1.30.0-r2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 2021-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="Identify duplicate files on the filesystem"
-HOMEPAGE="https://codeberg.org/jbruchon/jdupes"
-if [[ "${PV}" == *9999 ]] ; then
-	EGIT_REPO_URI="https://codeberg.org/jbruchon/jdupes.git"
-	inherit git-r3
-else
-	SRC_URI="https://codeberg.org/jbruchon/jdupes/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}"/${PN}
-	KEYWORDS="~amd64 ~arm64 ~riscv"
-fi
-LICENSE="MIT"
-SLOT="0"
-
-# Please keep a careful eye on the minimum libjoycode version! (Just pick
-# latest released at the time if necessary.)
-DEPEND=">=dev-libs/libjodycode-4.0.1"
-RDEPEND="${DEPEND}"
-
-IUSE="+dedupe hardened"
-
-# tests exists, but are empty (dropped by upstream)
-RESTRICT="test"
-
-src_prepare() {
-	sed -i -e '/PREFIX/s/=/?=/' Makefile || die
-	default
-}
-
-src_compile() {
-	tc-export CC
-	local myconf=(
-		$(usex dedupe 'ENABLE_DEDUPE=1' '')
-		$(usex hardened 'HARDEN=1' '')
-	)
-	emake ${myconf[@]}
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install
-	einstalldocs
-}
diff --git a/dev-cpp/sparsehash/sparsehash-2.0.4-r1.ebuild b/dev-cpp/sparsehash/sparsehash-2.0.4-r1.ebuild
deleted file mode 100644
index acb2560d7dd17..0000000000000
--- a/dev-cpp/sparsehash/sparsehash-2.0.4-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="An extremely memory-efficient hash_map implementation"
-HOMEPAGE="https://github.com/sparsehash/sparsehash"
-SRC_URI="https://github.com/sparsehash/sparsehash/archive/${P}.tar.gz"
-S="${WORKDIR}/${PN}-${P}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-
-PATCHES=( "${FILESDIR}"/${PN}-2.0.3-fix-buildsystem.patch )
-
-src_prepare() {
-	default
-	eautoreconf
-}
diff --git a/dev-cpp/sparsehash/sparsehash-2.0.4-r2.ebuild b/dev-cpp/sparsehash/sparsehash-2.0.4-r2.ebuild
index 8b170f5fd14a4..8266844f7b1b6 100644
--- a/dev-cpp/sparsehash/sparsehash-2.0.4-r2.ebuild
+++ b/dev-cpp/sparsehash/sparsehash-2.0.4-r2.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}-${P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-2.0.3-fix-buildsystem.patch"
diff --git a/dev-db/pgcli/Manifest b/dev-db/pgcli/Manifest
index ed4bf472ab0df..2e1f09bfa426a 100644
--- a/dev-db/pgcli/Manifest
+++ b/dev-db/pgcli/Manifest
@@ -1,2 +1 @@
-DIST pgcli-4.0.1.tar.gz 646421 BLAKE2B ceb0537344d1fc4c22fc424b7d1df809515778e9d1e492aead517c904ed6274f8c330e1f9bd73da377543e0d078acc8c385951a6717784205dbff0ab427b2d49 SHA512 eba490b979d7b1120eda817c3fe2afc2f2a8e4608e67e41be9b73597dc51027fbe013d5f72f8a6f2853c85395fb51f622dcf6b30c8d2185e5d9a9c1aada378ba
 DIST pgcli-4.1.0.tar.gz 651048 BLAKE2B d5fd9dcce5ebaaa2ece556891a6a7d0e6fc9a82d20490a3a0a0a6f9eb445305a965057bfff8cdbed88e5a8494a647d566f8754f67194ce674173f949382b710d SHA512 77e19e953d8793527352efdd145742de8eba09f5ebfbf054fd53e06286b0411a3e11d9fe7b3d1f1d0f8ce275eba8f7148c6f271326fe7e912ce261c2a25e890c
diff --git a/dev-db/pgcli/pgcli-4.0.1-r1.ebuild b/dev-db/pgcli/pgcli-4.0.1-r1.ebuild
deleted file mode 100644
index d168855385f80..0000000000000
--- a/dev-db/pgcli/pgcli-4.0.1-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-inherit distutils-r1
-
-DESCRIPTION="CLI for Postgres with auto-completion and syntax highlighting"
-HOMEPAGE="https://www.pgcli.com https://github.com/dbcli/pgcli"
-SRC_URI="https://github.com/dbcli/pgcli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD MIT"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-
-RDEPEND="
-	dev-python/click[${PYTHON_USEDEP}]
-	>=dev-python/cli-helpers-2.2.1[${PYTHON_USEDEP}]
-	dev-python/configobj[${PYTHON_USEDEP}]
-	dev-python/pgspecial[${PYTHON_USEDEP}]
-	dev-python/prompt-toolkit[${PYTHON_USEDEP}]
-	dev-python/psycopg:0[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/setproctitle[${PYTHON_USEDEP}]
-	dev-python/sqlparse[${PYTHON_USEDEP}]
-	dev-python/sshtunnel[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-db/postgresql
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	# https://github.com/dbcli/pgcli/pull/1452
-	"${FILESDIR}/${P}-no-pendulum.patch"
-)
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# hang while trying to create a keyring
-		# https://bugs.gentoo.org/925085
-		tests/test_main.py::test_pg_service_file
-		tests/test_ssh_tunnel.py::test_ssh_tunnel
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-libs/libjodycode/Manifest b/dev-libs/libjodycode/Manifest
index b914c27e9a211..bf43d9a2f001a 100644
--- a/dev-libs/libjodycode/Manifest
+++ b/dev-libs/libjodycode/Manifest
@@ -1,3 +1,2 @@
 DIST libjodycode-3.1.2.tar.gz 26895 BLAKE2B eecd4d78cef637cb57e1401cb4128550323b416917d0fa45fd28da828ee796d95e9c35c6d34a6fbe6e5785679535abfef07c1991001f450f6adc03e4c8f5ef5d SHA512 62cd71f9c35efd9d007ad0f2c99ccb106319351de1c4715f4edbd6030c44bbcb00f98f1df74d5fe0eae3971c7ef05dd294421bd60113cc2e666c558a501f2c28
-DIST libjodycode-4.0.1.tar.gz 37410 BLAKE2B 8e483758e8957055a5b1381cd205e48a125d0cd6b0d9a49e16396f16e64fc6dd645f00521c90425c0f9ba7acda0442cf1d63e24840fa289aa0530299f04d806c SHA512 835eda9d8b5c7541c306e58dd3b0546c7c65690d36cfd05bf297646ed7d1ec3062739c84dde179bff26c87771d09c134e5d455f50248ad139598450ba35b90b5
 DIST libjodycode-4.1.2.tar.gz 48020 BLAKE2B 6e178af900eb8a91d098e2422e172b8f6d1dfc5def9a5f34f7399e84b8c77344dc3cffa4c582c86d2c33c0dbf44aa60d6faa6cf2b7742e321b569126c1c8ca53 SHA512 b6217e107f8ce0ac02668c0b50e258c5fdc77d13bb3abfea0df8fd4bb5a17a4595c1c957040947c65872e6e22fa6844db35f29c5aa7738d2a407c32bf74259bd
diff --git a/dev-libs/libjodycode/libjodycode-4.0.1.ebuild b/dev-libs/libjodycode/libjodycode-4.0.1.ebuild
deleted file mode 100644
index 1eb1ea18e7d5d..0000000000000
--- a/dev-libs/libjodycode/libjodycode-4.0.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2023-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Shared code used by several utilities written by Jody Bruchon"
-HOMEPAGE="https://codeberg.org/jbruchon/libjodycode"
-SRC_URI="https://codeberg.org/jbruchon/libjodycode/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-static-lib.patch
-)
-
-src_compile() {
-	emake sharedlib
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		LIB_DIR="/usr/$(get_libdir)" \
-		PREFIX="${EPREFIX}"/usr \
-		install
-	einstalldocs
-}
diff --git a/dev-libs/npth/Manifest b/dev-libs/npth/Manifest
index 2ccde18e9eea7..7bf4f6aba1dee 100644
--- a/dev-libs/npth/Manifest
+++ b/dev-libs/npth/Manifest
@@ -1,3 +1,2 @@
-DIST npth-1.7.tar.bz2 313213 BLAKE2B 39bc5857fb61a4264bef6ff23c28755d2a3b3ceef93034aefd5cf1c2ad905adf696c6753ebd5cea5e0a875df4ecb97db03e023a50a27f51ec0641bbc36b54089 SHA512 8893023bcf953a3f7c490cf8116bed323a9d4af2bea35277e919f437916fda8b8e68ded28ec1777717cf9187c504892556159cbdb8bc02ed4a8b30b3d897d244
 DIST npth-1.8.tar.bz2 317739 BLAKE2B 554620f6a45f57bb958d245f7464abffd565b592941f0c404ce384c854be57ee35754a78dcf6afac751ee87e1df230bf3d2b78fb37cb1ef3e5ea534ddfd4ef2a SHA512 34fdeea3d8a7a594d8fdbcc6d5d389b5c8e282e8e84c1491b1e51960c0fa007df6a1d62543f0107f0772f3215557d4b25c2a9c7067cb0ae2f8de7b4d63d09fb4
 DIST npth-1.8.tar.bz2.sig 238 BLAKE2B 6078bb8eed027a85c86abd7d8a442b65227bdd87d3f6f30cf1568079ba19643ddeb70ab7560cf63c4a69463d1550c9b19aa938ec9d74e9a6c5579c7af2263979 SHA512 c63a98efefd988badfcefb21bc0e6b30ea3c958d964806ecf52eecfd724d8e3eee98e175aa95e216128a33d3cf4412bb108e708608cb02f087368ac02f4e0c2b
diff --git a/dev-libs/npth/npth-1.7-r1.ebuild b/dev-libs/npth/npth-1.7-r1.ebuild
deleted file mode 100644
index d4d1fd5ccba4d..0000000000000
--- a/dev-libs/npth/npth-1.7-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools flag-o-matic
-
-DESCRIPTION="New GNU Portable Threads Library"
-HOMEPAGE="https://git.gnupg.org/cgi-bin/gitweb.cgi?p=npth.git"
-SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-musl.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
-
-	econf $(use_enable test tests) \
-		--enable-install-npth-config
-}
-
-src_install() {
-	default
-
-	# no static archives
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-python/smbus2/Manifest b/dev-python/smbus2/Manifest
index efd6f598b9992..e57b4cf806502 100644
--- a/dev-python/smbus2/Manifest
+++ b/dev-python/smbus2/Manifest
@@ -1,2 +1 @@
-DIST smbus2-0.6.0.gh.tar.gz 18399 BLAKE2B f80846185c85c4942b824d65a7cf060eaf4648303105e6bd8654912152979516e8c246090d8449fc31f3f49a12253e86cd250919b1b45f5d870c7e233c031fd3 SHA512 e3fe85e01fc0e2ce87461c5a0001a595139785d8b53fdb5058c93902b436515bb05c33e2071f2259761507e82f65e40ee2c46f33fd889ccd3bdd5b7b0681dfbe
 DIST smbus2-0.6.1.gh.tar.gz 18332 BLAKE2B 26a3f9d48d46ad55ea90e83dd1b135e8b9f6e3abe09f85754f8148d2e22094d6adf9c0e8f4d729cb2bd8d3858b278ea2701e2e379c991d1a8daed5a89ccd60f0 SHA512 e524c7a5727bb88379454581fde7314c866da3ed415d5918d0232e8e0b53c306efbe39340d422703e90fbe4b7b5eb6f3cba9e80d36759cfb243d1d1291fec0b4
diff --git a/dev-python/smbus2/smbus2-0.6.0.ebuild b/dev-python/smbus2/smbus2-0.6.0.ebuild
deleted file mode 100644
index 54b17db944908..0000000000000
--- a/dev-python/smbus2/smbus2-0.6.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2022-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{11..14} )
-
-inherit distutils-r1
-
-DESCRIPTION="A drop-in replacement for smbus-cffi/smbus-python in pure Python"
-HOMEPAGE="
-	https://pypi.org/project/smbus2/
-	https://github.com/kplindegaard/smbus2/
-"
-SRC_URI="
-	https://github.com/kplindegaard/smbus2/archive/refs/tags/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64"
-
-EPYTEST_PLUGINS=()
-distutils_enable_tests pytest
-
-python_test() {
-	epytest -s
-}
diff --git a/eclass/go-env.eclass b/eclass/go-env.eclass
index 98faa20795a4f..af843a8e81bae 100644
--- a/eclass/go-env.eclass
+++ b/eclass/go-env.eclass
@@ -6,12 +6,12 @@
 # Flatcar Linux Maintainers <infra@flatcar-linux.org>
 # @AUTHOR:
 # Flatcar Linux Maintainers <infra@flatcar-linux.org>
-# @SUPPORTED_EAPIS: 7 8
+# @SUPPORTED_EAPIS: 7 8 9
 # @BLURB: Helper eclass for setting up the Go build environment.
 # @DESCRIPTION:
 # This eclass includes helper functions for setting up the build environment for
 # Go ebuilds. Intended to be called by other Go eclasses in an early build
-# stage, e.g. src_unpack.
+# stage, e.g. src_configure.
 
 # @ECLASS_VARIABLE: GOMAXPROCS
 # @USER_VARIABLE
@@ -77,7 +77,7 @@
 # Optimisation setting for riscv when building for CBUILD.
 
 case ${EAPI} in
-	7|8) ;;
+	7|8|9) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
@@ -86,6 +86,26 @@ _GO_ENV_ECLASS=1
 
 inherit flag-o-matic multiprocessing sysroot toolchain-funcs
 
+# @ECLASS_VARIABLE: CGO_ENABLED
+# @DESCRIPTION:
+# Whether to enable the cgo tool that lets Go packages call C code. Upstream Go
+# enables this by default for native builds when a C compiler is found. Some
+# projects will forcibly enable it by necessity. Other projects may disable it
+# by default or even forcibly disable it to make the resulting binaries more
+# portable. When enabled, certain standard library packages will use the libc
+# over their own built-in code for things like DNS resolution, which is
+# generally preferable. It makes sense for a distribution to enable it where
+# possible, even when cross-compiling. Ebuilds may force this setting one way or
+# the other before inheriting this eclass where necessary, although upstream
+# projects will likely do this for you. If you believe that a project should not
+# force it, then please work with upstream to have the variable respected.
+# Ebuilds may also disable it by default if this is more appropriate. See
+# https://pkg.go.dev/cmd/cgo.
+case ${EAPI} in
+	7|8) : ;;
+	*) export CGO_ENABLED="${CGO_ENABLED:-1}" ;;
+esac
+
 # @FUNCTION: go-env_set_compile_environment
 # @DESCRIPTION:
 # Sets up the environment to build Go code for CHOST. This includes variables
@@ -147,9 +167,12 @@ go-env_set_compile_environment() {
 
 	# go run will build binaries for the target system and try to execute them.
 	# This will fail when cross-compiling unless you provide a wrapper.
-	local script
+	local script go_exec
 	if script=$(sysroot_make_run_prefixed); then
-		GOFLAGS+=" -exec=${script}" "${@}"
+		go_exec="${T}/go-exec"
+		PATH="${go_exec}:${PATH}"
+		mkdir -p "${go_exec}" || die
+		ln -snfr "${script}" "${go_exec}/go_${GOOS}_${GOARCH}_exec" || die
 	fi
 }
 
diff --git a/eclass/go-module.eclass b/eclass/go-module.eclass
index 5294f50d8ad8b..1d7b6044d802e 100644
--- a/eclass/go-module.eclass
+++ b/eclass/go-module.eclass
@@ -7,7 +7,7 @@
 # @AUTHOR:
 # William Hubbs <williamh@gentoo.org>
 # Robin H. Johnson <robbat2@gentoo.org>
-# @SUPPORTED_EAPIS: 7 8
+# @SUPPORTED_EAPIS: 7 8 9
 # @BLURB: basic eclass for building software written as go modules
 # @DESCRIPTION:
 # This eclass provides basic settings and functions needed by all software
@@ -61,7 +61,7 @@
 # @CODE
 
 case ${EAPI} in
-	7|8) ;;
+	7|8|9) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
@@ -182,7 +182,7 @@ declare -A -g _GOMODULE_GOSUM_REVERSE_MAP
 # If set to a non-null value before inherit, the Go part of the
 # ebuild will be considered optional. No dependencies will be added and
 # no phase functions will be exported. You will need to set BDEPEND and
-# call go-module_src_unpack in your ebuild.
+# call go-module_src_unpack and go-module_src_configure in your ebuild.
 
 # @FUNCTION: ego
 # @USAGE: [<args>...]
@@ -347,12 +347,11 @@ go-module_setup_proxy() {
 
 # @FUNCTION: go-module_src_unpack
 # @DESCRIPTION:
-# Sets up GOFLAGS for the system and then unpacks based on the following rules:
+# Unpacks based on the following rules:
 # 1. If EGO_SUM is set, unpack the base tarball(s) and set up the
 #    local go proxy.  This mode is deprecated.
 # 2. Otherwise, if EGO_VENDOR is set, bail out, as this functionality was removed.
 # 3. Otherwise, call 'ego mod verify' and then do a normal unpack.
-# Set compile env via go-env.
 go-module_src_unpack() {
 	if [[ "${#EGO_SUM[@]}" -gt 0 ]]; then
 		eqawarn "QA Notice: This ebuild uses EGO_SUM which is deprecated"
@@ -372,7 +371,9 @@ go-module_src_unpack() {
 		fi
 	fi
 
-	go-env_set_compile_environment
+	case ${EAPI} in
+		7|8) go-env_set_compile_environment ;;
+	esac
 }
 
 # @FUNCTION: _go-module_src_unpack_gosum
@@ -501,8 +502,21 @@ go-module_live_vendor() {
 	popd >& /dev/null || die
 }
 
+# @FUNCTION: go-module_src_configure
+# @DESCRIPTION:
+# Sets up the environment to build Go code for the target system. If manually
+# calling this from your own src_configure, do it between handling build flags
+# and invoking another build system.
+go-module_src_configure() {
+	go-env_set_compile_environment
+}
+
 fi
 
 if [[ ! ${GO_OPTIONAL} ]]; then
 	EXPORT_FUNCTIONS src_unpack
+	case ${EAPI} in
+		7|8) ;;
+		*) EXPORT_FUNCTIONS src_configure ;;
+	esac
 fi
diff --git a/eclass/sysroot.eclass b/eclass/sysroot.eclass
index 856aa3a9ec8f4..398d5233f1dab 100644
--- a/eclass/sysroot.eclass
+++ b/eclass/sysroot.eclass
@@ -76,6 +76,22 @@ qemu_arch_if_needed() {
 	return 0
 }
 
+
+# @FUNCTION: _sysroot_compile_and_link_test_exe
+# @USAGE: <output-path-name>
+# @INTERNAL
+# @DESCRIPTION:
+# Compile and link a test executable that does nothing except to return success.
+# The executable is built for the *host* machine using $(tc-getCC), *not* for
+# the build machine using $(tc-getBUILD_CC).
+_sysroot_compile_and_link_test_exe() {
+	[[ -n "${1}" ]] || die 'Must specify test executable path name.'
+	local test="${1}"
+	echo 'int main(void) { return 0; }' > "${test}.c" || die "failed to write ${test##*/}.c"
+	$(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -o "${test}" "${test}.c" || die "failed to build ${test##*/}"
+}
+
+
 # @FUNCTION: sysroot_make_run_prefixed
 # @DESCRIPTION:
 # Create a wrapper script for directly running executables within a (sys)root
@@ -117,7 +133,7 @@ sysroot_make_run_prefixed() {
 		fi
 	fi
 
-	if [[ ${CHOST} = *-mingw32 ]]; then
+	if [[ ${CHOST} = *-mingw32 || ${CHOST} = *-cygwin ]]; then
 		if ! type -P wine >/dev/null; then
 			einfo "Wine not found. Continuing without ${SCRIPT##*/} wrapper."
 			return 2
@@ -135,15 +151,26 @@ sysroot_make_run_prefixed() {
 		einfo "Target is not Linux. Continuing without ${SCRIPT##*/} wrapper."
 		return 2
 	elif ! QEMU_ARCH=$(qemu_arch_if_needed); then
-		# glibc: ld.so is a symlink, ldd is a binary.
-		# musl: ld.so doesn't exist, ldd is a symlink.
-		local DLINKER candidate
-		for candidate in "${MYEROOT}"/usr/bin/{ld.so,ldd}; do
-			if [[ -L ${candidate} ]]; then
-				DLINKER=${candidate}
-				break
-			fi
-		done
+		local DLINKER
+		if [[ "${ABI-${DEFAULT_ABI}}" == "${DEFAULT_ABI}" ]]; then
+			# glibc: ld.so is a symlink, ldd is a binary.
+			# musl: ld.so doesn't exist, ldd is a symlink.
+			local candidate
+			for candidate in "${MYEROOT}"/usr/bin/{ld.so,ldd}; do
+				if [[ -L ${candidate} ]]; then
+					DLINKER=${candidate}
+					break
+				fi
+			done
+		else
+			# non-default ABI needs a non-default dynamic linker
+			SCRIPT+="-${ABI}"
+			local test="${SCRIPT}-test"
+			_sysroot_compile_and_link_test_exe "${test}"
+			read -d '' -r DLINKER < <($(tc-getOBJCOPY) -O binary -j .interp -- "${test}" /dev/stdout)
+			DLINKER="${DLINKER:+${MYEROOT}${DLINKER}}"
+			[[ -f ${DLINKER} && -x ${DLINKER} ]] || DLINKER=
+		fi
 		[[ -n ${DLINKER} ]] || die "failed to find dynamic linker"
 
 		# musl symlinks ldd to ld-musl.so to libc.so. We want the ld-musl.so
@@ -169,8 +196,7 @@ sysroot_make_run_prefixed() {
 		# and worse if QEMU does not support the architecture. We therefore need
 		# to perform our own test up front.
 		local test="${SCRIPT}-test"
-		echo 'int main(void) { return 0; }' > "${test}.c" || die "failed to write ${test##*/}"
-		$(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${test}.c" -o "${test}" || die "failed to build ${test##*/}"
+		_sysroot_compile_and_link_test_exe "${test}"
 
 		if ! "${SCRIPT}" "${test}" &>/dev/null; then
 			einfo "Failed to run ${test##*/}. Continuing without ${SCRIPT##*/} wrapper."
diff --git a/net-misc/mstpd/Manifest b/net-misc/mstpd/Manifest
index cd10d51e9fbe5..96d7d57a738f8 100644
--- a/net-misc/mstpd/Manifest
+++ b/net-misc/mstpd/Manifest
@@ -1,3 +1,2 @@
 DIST mstpd-0.1.0.tar.gz 115670 BLAKE2B d0b666f16941ebb161cf91ad849da9d8f1927e90052f02cbab759685864bdd6040525bcbb69ca3e602140fa7245f1a48eed00d7e8515eb849ae0bd586f41588d SHA512 c3f7e1045e89eaad05b212993e4fb79e3662d247e371340276c59b92e33c732a9d82ed3490ce3b51e79c666db9f999916667d2be5da1f928e1624b288b0295bb
-DIST mstpd-0.1.1.tar.gz 116048 BLAKE2B 2c114397ba53f2477941632b8b80a4e862a3da4fba2eeb3e8b0a55ea4ab48b86dbdd2e68aeeca42be2b1376b22569c2ff4da0d661ed82259ffa89407169a9139 SHA512 073f02bed57c423d008433943ff06b5acd9cfdce37c54c2c71942561a018ed42061e492723f990530d54e0f8147e9cdaf2206f9c5968753bed975f36751470f9
 DIST mstpd-0.2.0.tar.gz 117075 BLAKE2B 6649f4f1797dc0cc924c15c46d02b8e2449a21f068973e15c968adbc9d40d1ff8c18a0dabd36a218edcdd5b3fa5fa8c519551c59692e99079bae24a65df2ca8d SHA512 ba25ca291bf35b3437abb7ff838fcac7a46fe85562f116db56868b1d4a8d25ccee5a9a9cd3e5f6b3129a065cbb6f72840c077b3cd68766d2b305177b1ffe3e81
diff --git a/net-misc/mstpd/mstpd-0.1.1.ebuild b/net-misc/mstpd/mstpd-0.1.1.ebuild
deleted file mode 100644
index 7ce101bea703f..0000000000000
--- a/net-misc/mstpd/mstpd-0.1.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2021-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools bash-completion-r1 systemd
-
-DESCRIPTION="Multiple spanning tree protocol daemon"
-HOMEPAGE="https://github.com/mstpd/mstpd"
-SRC_URI="https://github.com/mstpd/mstpd/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-bashcompletiondir="$(get_bashcompdir)" \
-		--with-systemdunitdir="$(systemd_get_systemunitdir)" \
-		--localstatedir="${EPREFIX}"/
-}
-
-src_install() {
-	default
-	dosym ../../sbin/bridge-stp /lib/mstpctl-utils/mstpctl_restart_config
-	dosym bridge-stp /sbin/mstp_restart
-}
diff --git a/net-vpn/headscale/Manifest b/net-vpn/headscale/Manifest
index bd34f719dfb89..62fe1eddc280b 100644
--- a/net-vpn/headscale/Manifest
+++ b/net-vpn/headscale/Manifest
@@ -1,4 +1,2 @@
-DIST headscale-0.26.1-deps.tar.xz 317685808 BLAKE2B f19f2e6f37fb7d1b95f556dfeb8abbbc1387fab24e7a92aeed1ff2ca8a343ce82fb21445da65deb0ca4876b4fa5b4736cf35dbabb14b3c759f291a5d107e78e7 SHA512 3cebdc100cc6b732b0a72f043463372d12402d156756221822cfcb6a9c346b8595a7974a64ccc83a94b1417c6ece2b9ae7d8b9e596870b96ff20e0042c289faa
-DIST headscale-0.26.1.tar.gz 647514 BLAKE2B eb203404222cb08894835c9a7b1574903077472c3710d956e276742e1ea349004a2dc7e851f589a23560f41960eeb2d33670bdf75458dd613933d0c6e03b584a SHA512 b388ec44f4df3eaea2014673ac9f9fa9a70db9f5f9267b57b65f27180f6a54fc2039f4a5ffbb9b4a4c630eec10083d8e1c6b3dd67d44fb0c4c4c15f95a4db6bb
 DIST headscale-0.27.1-deps.tar.xz 259439520 BLAKE2B 2022da884e144e15da86989841c4f57edf0a182c538f7def89113b2cbc1cefa21bd1734c7ff998349abbda73724b68f45122a8f6be27320c1d82fdbe73a9ab6a SHA512 1e1bef557550e06e5c7eac9943ca61d045cb4dc44a22b09ac751c75d7ac7ed99649f9647b5ce90d5ac7a94f06da44f1bc46b5ada97f0be37cb2efe3d101bfb5c
 DIST headscale-0.27.1.tar.gz 1027977 BLAKE2B 0567e219974b284a309eed6481c997e3c75bf44eb0450547203431b649e5b1ecb99ca540872b5beb8f275ea7cd1c6829eb66c6167082bd7b3ee72c532cc93a6b SHA512 8334042ae90d9beb0f291952f87037efe15b4c184391e22257e04791a5dbdd5c2370b03769de9080dc5e4475cb398c478e713b00946394b245bf2afeda092b78
diff --git a/net-vpn/headscale/headscale-0.26.1.ebuild b/net-vpn/headscale/headscale-0.26.1.ebuild
deleted file mode 100644
index d03ee76fc3083..0000000000000
--- a/net-vpn/headscale/headscale-0.26.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 2023-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module systemd
-
-DESCRIPTION="An open source, self-hosted implementation of the Tailscale control server"
-HOMEPAGE="https://github.com/juanfont/headscale"
-DEPS_URIS=( "https://github.com/dlan17/gentoo-go-deps/releases/download/${P}/${P}-deps.tar.xz" )
-SRC_URI="https://github.com/juanfont/headscale/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	${DEPS_URIS[*]}"
-
-LICENSE="BSD Apache-2.0 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv"
-
-DEPEND="
-	acct-group/headscale
-	acct-user/headscale
-"
-RDEPEND="
-	${DEPEND}
-	net-firewall/iptables
-"
-
-src_compile() {
-	export -n GOCACHE XDG_CACHE_HOME
-	go build -o "./bin/${PN}" "./cmd/${PN}" || die
-}
-
-src_install() {
-	dobin bin/headscale
-	dodoc -r config-example.yaml derp-example.yaml
-	keepdir /etc/headscale /var/lib/headscale
-	systemd_dounit "${FILESDIR}"/headscale.service
-	newconfd "${FILESDIR}"/headscale.confd headscale
-	newinitd "${FILESDIR}"/headscale.initd headscale
-	fowners -R "${PN}":"${PN}" /etc/headscale /var/lib/headscale
-}
-
-pkg_postinst() {
-	[[ -f "${EROOT}"/etc/headscale/config.yaml ]] && return
-	elog "Please create ${EROOT}/etc/headscale/config.yaml before starting the service"
-	elog "An example is in ${EROOT}/usr/share/doc/${P}/config-example.yaml.bz2"
-	ewarn ">=headscale-0.19.0 has a DB structs breaking, please BACKUP your database before upgrading!"
-	ewarn "see also: https://github.com/juanfont/headscale/pull/1171 and https://github.com/juanfont/headscale/pull/1144"
-}