diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/kbd/Manifest b/sdk_container/src/third_party/portage-stable/sys-apps/kbd/Manifest
index 760515e63a..44730a3255 100644
--- a/sdk_container/src/third_party/portage-stable/sys-apps/kbd/Manifest
+++ b/sdk_container/src/third_party/portage-stable/sys-apps/kbd/Manifest
@@ -1 +1,2 @@
 DIST kbd-2.5.1.tar.xz 1491952 BLAKE2B aab4c3d78c28709bf562b54fe94c0533d5c33185e183bf3eb944f89147b250d9df9b30b64a06eb4742feafe8c05a6aa491a7f007b4d6d9077bc19a4628ba05ae SHA512 74855f486aff5fc2f93a6cb29460a590c94eac653b001574e1b4eb1300ea99dfed9222f9e5d1d3a05a112a6880591d5c44ed6e76b8a64edf744ecb0892f562d0
+DIST kbd-2.6.0.tar.xz 1590196 BLAKE2B 9894bab607694cc60cece959573b8f13f687d47b4346fa84e57bffd2c062a5ac2830f9a6766aca70d2242f63f486c898fe5d777fc01dfabe85d004b1f29d364a SHA512 4b8cec06ea2143a285bedb95cb66c313ebac79dc3c64956f969f389186609bc1a066dbf32d6ae308e18947dcbe2f6f684f6c69d4210b40d449735e5704707b27
diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/kbd/kbd-2.5.1.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/kbd/kbd-2.5.1.ebuild
index 9820c07ff6..4b306c04b9 100644
--- a/sdk_container/src/third_party/portage-stable/sys-apps/kbd/kbd-2.5.1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-apps/kbd/kbd-2.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -31,7 +31,7 @@ RESTRICT="!test? ( test )"
 QA_AM_MAINTAINER_MODE=".*--run autom4te --language=autotest.*"
 
 RDEPEND="
-	app-arch/gzip
+	app-alternatives/gzip
 	pam? (
 		!app-misc/vlock
 		sys-libs/pam
diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/kbd/kbd-2.4.0.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/kbd/kbd-2.6.0.ebuild
similarity index 56%
rename from sdk_container/src/third_party/portage-stable/sys-apps/kbd/kbd-2.4.0.ebuild
rename to sdk_container/src/third_party/portage-stable/sys-apps/kbd/kbd-2.6.0.ebuild
index 8d60197a75..47ef0e794f 100644
--- a/sdk_container/src/third_party/portage-stable/sys-apps/kbd/kbd-2.4.0.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-apps/kbd/kbd-2.6.0.ebuild
@@ -1,17 +1,16 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == 9999 ]] ; then
 	inherit autotools git-r3
-	#EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/legion/kbd.git"
-	EGIT_REPO_URI="https://github.com/legionus/kbd.git"
+	EGIT_REPO_URI="https://github.com/legionus/kbd.git https://git.kernel.org/pub/scm/linux/kernel/git/legion/kbd.git"
 	EGIT_BRANCH="master"
 else
 	if [[ $(ver_cut 3) -lt 90 ]] ; then
 		SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"
-		KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 	else
 		inherit autotools
 		SRC_URI="https://github.com/legionus/kbd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
@@ -19,17 +18,20 @@ else
 fi
 
 DESCRIPTION="Keyboard and console utilities"
-HOMEPAGE="http://kbd-project.org/"
+HOMEPAGE="https://kbd-project.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="nls pam test"
-#RESTRICT="!test? ( test )"
-# Upstream has strange assumptions how to run tests (see bug #732868)
-RESTRICT="test"
+RESTRICT="!test? ( test )"
+
+# Testsuite's Makefile.am calls missing(!)
+# ... but this seems to be consistent with the autoconf docs?
+# Needs more investigation: https://www.gnu.org/software/autoconf/manual/autoconf-2.67/html_node/autom4te-Invocation.html
+QA_AM_MAINTAINER_MODE=".*--run autom4te --language=autotest.*"
 
 RDEPEND="
-	app-arch/gzip
+	app-alternatives/gzip
 	pam? (
 		!app-misc/vlock
 		sys-libs/pam
@@ -41,41 +43,38 @@ BDEPEND="
 	test? ( dev-libs/check )
 "
 
-src_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		git-r3_src_unpack
-	else
-		default
-	fi
+src_prepare() {
+	default
 
 	# Rename conflicting keymaps to have unique names, bug #293228
-	cd "${S}"/data/keymaps/i386 || die
+	# See also https://github.com/legionus/kbd/issues/76.
+	pushd "${S}"/data/keymaps/i386 &> /dev/null || die
 	mv fgGIod/trf.map fgGIod/trf-fgGIod.map || die
 	mv olpc/es.map olpc/es-olpc.map || die
 	mv olpc/pt.map olpc/pt-olpc.map || die
 	mv qwerty/cz.map qwerty/cz-qwerty.map || die
-}
+	popd &> /dev/null || die
 
-src_prepare() {
-	default
-	if [[ ${PV} == "9999" ]] || [[ $(ver_cut 3) -ge 90 ]] ; then
+	if [[ ${PV} == 9999 ]] || [[ $(ver_cut 3) -ge 90 ]] ; then
 		eautoreconf
 	fi
 }
 
 src_configure() {
 	local myeconfargs=(
-		# USE="test" installs .a files
-		--disable-static
+		--disable-werror
+
 		$(use_enable nls)
 		$(use_enable pam vlock)
 		$(use_enable test tests)
 	)
+
 	econf "${myeconfargs[@]}"
 }
 
 src_install() {
 	default
+
 	docinto html
 	dodoc docs/doc/*.html
 
diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/kbd/kbd-9999.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/kbd/kbd-9999.ebuild
index a8607b2c1f..47ef0e794f 100644
--- a/sdk_container/src/third_party/portage-stable/sys-apps/kbd/kbd-9999.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-apps/kbd/kbd-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -31,7 +31,7 @@ RESTRICT="!test? ( test )"
 QA_AM_MAINTAINER_MODE=".*--run autom4te --language=autotest.*"
 
 RDEPEND="
-	app-arch/gzip
+	app-alternatives/gzip
 	pam? (
 		!app-misc/vlock
 		sys-libs/pam