sys-apps/kbd: Sync with Gentoo

It's from Gentoo commit 50e334876dbbd54b22db3882de1016b2467c615a.

sdk_container/src/third_party/portage-stable/sys-apps/kbd/Manifest

@@ -1,3 +1,2 @@
-DIST kbd-2.5.1.tar.xz 1491952 BLAKE2B aab4c3d78c28709bf562b54fe94c0533d5c33185e183bf3eb944f89147b250d9df9b30b64a06eb4742feafe8c05a6aa491a7f007b4d6d9077bc19a4628ba05ae SHA512 74855f486aff5fc2f93a6cb29460a590c94eac653b001574e1b4eb1300ea99dfed9222f9e5d1d3a05a112a6880591d5c44ed6e76b8a64edf744ecb0892f562d0
-DIST kbd-2.6.4.tar.xz 1504584 BLAKE2B 25e55be0210c206c1f5eb0d85045bb1cbb2442cf88fb7eb28f7bbb8dd0d86473f48444fd9d80dfc624ce7ba8b39bfe1152ee6cf1877fab444e09600e93dae0ee SHA512 a4149cb0f85fd79b333a6c137d70896a30ebceb1cf9d4b5eef3abb2e1866d83b46cee651e4f3e512bf7e0ccd232d955c14f693e57020a3626e4943c4695fc8ab
 DIST kbd-2.7.1.tar.xz 1471648 BLAKE2B c817f78a0a377df5fcf2a6ba1608504fa875762db5bda1f061493e68ee6f6ef1fa085c0e440d74daeb6ad990ac48956caf7ab7f2a523b0d3b2480e69a9d810f5 SHA512 9c541fdbb77e5b1a757848fb4c6f8bb5a61791220938cbfe899aa16b412a87e98fc97fc06ba39d0f983e4cc808d0dcd983560e12c7f36e4df683a3002c51af09
+DIST kbd-2.8.0.tar.xz 1482152 BLAKE2B 3b1917e37bbb4f2a975cf1f6bbfeba6a6ee486378d770c3b0232c62c40fe758181a15799f9119e3e4eedbb356a0677b3fba4b0afef135d346801693a6ef432cc SHA512 66b532e782b6be3f53521a8d1c96f2ce895201dae48f8797c563be895dfdf4e9c03b9ccf39708d1b7dd1ffb13d526e499874e8e4ba74d22b507c1d32e4b410a3

sdk_container/src/third_party/portage-stable/sys-apps/kbd/kbd-2.5.1.ebuild

@@ -1,83 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit autotools git-r3
-	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 ~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"
-	fi
-fi
-
-DESCRIPTION="Keyboard and console utilities"
-HOMEPAGE="https://kbd-project.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="nls pam 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-alternatives/gzip
-	pam? (
-		!app-misc/vlock
-		sys-libs/pam
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	test? ( dev-libs/check )
-"
-
-src_prepare() {
-	default
-
-	# Rename conflicting keymaps to have unique names, bug #293228
-	# 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
-
-	if [[ ${PV} == 9999 ]] || [[ $(ver_cut 3) -ge 90 ]] ; then
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-werror
-
-		$(use_enable nls)
-		$(use_enable pam vlock)
-		$(use_enable test tests)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	docinto html
-	dodoc docs/doc/*.html
-
-	# USE="test" installs .la files
-	find "${ED}" -type f -name "*.la" -delete || die
-}

sdk_container/src/third_party/portage-stable/sys-apps/kbd/kbd-2.8.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
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]] ; then
 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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~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"
@@ -27,11 +27,6 @@ SLOT="0"
 IUSE="nls selinux pam 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.*"
-
 DEPEND="
 	app-alternatives/gzip
 	pam? (
@@ -44,6 +39,7 @@ RDEPEND="
 	selinux? ( sec-policy/selinux-loadkeys )
 "
 BDEPEND="
+	sys-devel/flex
 	virtual/pkgconfig
 	test? ( dev-libs/check )
 "
@@ -66,6 +62,9 @@ src_prepare() {
 }
 
 src_configure() {
+	# https://github.com/legionus/kbd/issues/121
+	unset LEX
+
 	local myeconfargs=(
 		--disable-werror
 
@@ -78,15 +77,28 @@ src_configure() {
 }
 
 src_test() {
+	# These tests want a tty and the check passes when it shouldn't
+	# when running via the ebuild.
+	sed -i -e "s:tty 2>/dev/null:false:" tests/testsuite || die
+
+	# Workaround Valgrind being mandatory for tests
+	# https://github.com/legionus/kbd/issues/133 (bug #956964)
+	#
+	# XXX: Drop this on next release (>2.8.0) and replace with
+	# --disable-memcheck in configure.
+	cat <<-EOF > tests/valgrind.sh || die
+	#!/bin/sh
+	shift
+	exec "\$@" 1>stdout 2>stderr
+	EOF
+	chmod +x tests/valgrind.sh || die
+
 	emake -Onone check TESTSUITEFLAGS="--jobs=$(get_makeopts_jobs)"
 }
 
 src_install() {
 	default
 
-	docinto html
-	dodoc docs/doc/*.html
-
 	# USE="test" installs .la files
 	find "${ED}" -type f -name "*.la" -delete || die
 }

sdk_container/src/third_party/portage-stable/sys-apps/kbd/kbd-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
@@ -39,6 +39,7 @@ RDEPEND="
 	selinux? ( sec-policy/selinux-loadkeys )
 "
 BDEPEND="
+	sys-devel/flex
 	virtual/pkgconfig
 	test? ( dev-libs/check )
 "
@@ -61,8 +62,13 @@ src_prepare() {
 }
 
 src_configure() {
+	# https://github.com/legionus/kbd/issues/121
+	unset LEX
+
 	local myeconfargs=(
 		--disable-werror
+		# No Valgrind for the testsuite
+		--disable-memcheck
 
 		$(use_enable nls)
 		$(use_enable pam vlock)
@@ -73,6 +79,10 @@ src_configure() {
 }
 
 src_test() {
+	# These tests want a tty and the check passes when it shouldn't
+	# when running via the ebuild.
+	sed -i -e "s:tty 2>/dev/null:false:" tests/testsuite || die
+
 	emake -Onone check TESTSUITEFLAGS="--jobs=$(get_makeopts_jobs)"
 }