6 files changed, 149 insertions, 2 deletions
diff --git a/dev-build/bmake/Manifest b/dev-build/bmake/Manifest
index 7364bee6da8b..85d64e7ae395 100644
--- a/dev-build/bmake/Manifest
+++ b/dev-build/bmake/Manifest
@@ -1,4 +1,5 @@
 DIST bmake-20250414.tar.gz 885554 BLAKE2B 6723b5c9798c882ede43b5ed99f8d5b24ff288a1f01a4c0ec51e52e4cc26d09be9f25c9711be638838926a3b605d9358c486909a51e3b6af9e0263f7abbb543b SHA512 1ea5fe7517b3734abb807ee7b5fae01283bfdafba31e0df2e2db3b510353a0c47385ef4e449aa5dda3e3c5ee90a6053412413485d56e9397f4b76b2fd126b07f
 DIST bmake-20250618.tar.gz 890039 BLAKE2B 645c3c549ab32293d2bbdf4701f562ca0cb6981d395769efd380d4f1b2efea643468c05835e6450c4efe8fc53a14e28f0590b3c6b36c27b3e536c89ec53fbda8 SHA512 fd9815cbeb9eb3ab3f1865e5587e67f05a644678b9af8d5c1a5ed792561c7ffb1733dc7bf3da7bf485293f8e84f54cc1a142bf68a857f87dc8b30bbe06721ff8
 DIST bmake-20250804.tar.gz 894313 BLAKE2B 8909dfa0c15b0a909d6b1a73b6cb352d03adbbcf1153609e43b4ecd4ca7acc805e5c635e610955cad1159b2cee7ef2ce87e0d47eab5e855f28ef6e842747febb SHA512 585d99f42182ede5e0db76a104be6c4089567e2476ebdec8945f86c5bd3206ca16623991db8350d45ae92f9b31b39c656f9f1ded265ab5e4c6f0785437561bf7
+DIST bmake-20251111.tar.gz 896003 BLAKE2B 787d05083273169d869d0184824a3f44acceef5d06e11d2a0dae1a5c9658c034aef4e3062d33d5f893f230fa6de13e54149a60c6a80e9cb24622f09e12583588 SHA512 dbea0379a3f081fee3d3eb009177076e6af13956d1104573179944f767c88981d76ef3186f9c396a2dd8686e03a340ba63a0f0a5bf310b59c343be85a5883580
 DIST mk-20210330.tar.gz 107380 BLAKE2B 9ac30a117d9ba31635cf8d8d29fdba76f148611f47628403ca8f807081c32509f10498d3c30fd24985e5420af4710fe59fc6315d71f2d0c1cfed93263a06553a SHA512 6acd3ee911442934082f4f877d795b07c5e23022eaa9c0874799d97e92a2f5a663cb45f94b7f9745c49cbbce6b7e755a29e381ccfb9e68a0be1eedbd22fd5d3b
diff --git a/dev-build/bmake/bmake-20251111.ebuild b/dev-build/bmake/bmake-20251111.ebuild
new file mode 100644
index 000000000000..e9f32136f853
--- /dev/null
+++ b/dev-build/bmake/bmake-20251111.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MK_VER=20210330
+LUA_COMPAT=( lua5-{1..4} luajit )
+
+inherit lua-single
+
+DESCRIPTION="NetBSD's portable make"
+HOMEPAGE="http://www.crufty.net/help/sjg/bmake.html"
+SRC_URI="
+	http://void.crufty.net/ftp/pub/sjg/${P}.tar.gz
+	http://void.crufty.net/ftp/pub/sjg/mk-${MK_VER}.tar.gz"
+S="${WORKDIR}/${PN}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="test? ( ${LUA_REQUIRED_USE} )"
+
+BDEPEND="test? ( ${LUA_DEPS} )"
+
+# Skip failing test (sandbox and csh)
+PATCHES=(
+	"${FILESDIR}"/${PN}-20210206-tests.patch
+	"${FILESDIR}"/${PN}-20250618-lua-test.patch
+)
+
+pkg_setup() {
+	use test && lua-single_pkg_setup
+}
+
+src_prepare() {
+	default
+	cd "${WORKDIR}" || die
+	eapply "${FILESDIR}"/${PN}-20210314-mk-fixes.patch
+}
+
+src_configure() {
+	econf \
+		--with-mksrc=../mk \
+		--with-default-sys-path="${EPREFIX}"/usr/share/mk/${PN} \
+		--with-machine_arch=${ARCH}
+}
+
+src_compile() {
+	sh make-bootstrap.sh || die "bootstrap failed"
+}
+
+src_test() {
+	cd unit-tests || die
+
+	# the 'ternary' test uses ${A} internally, which
+	# conflicts with Gentoo's ${A}, hence unset it for
+	# the tests temporarily.
+	env -u A MAKEFLAGS= \
+		"${S}"/bmake -r -m / TEST_MAKE="${S}"/bmake test || die "tests compilation failed"
+}
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.1
+	FORCE_BSD_MK=1 SYS_MK_DIR=. \
+		sh ../mk/install-mk -v -m 644 "${ED}"/usr/share/mk/${PN} \
+		|| die "failed to install mk files"
+}
diff --git a/dev-build/make/make-4.4.1-r102.ebuild b/dev-build/make/make-4.4.1-r102.ebuild
index 3a8850687935..4f8e4fe3429b 100644
--- a/dev-build/make/make-4.4.1-r102.ebuild
+++ b/dev-build/make/make-4.4.1-r102.ebuild
@@ -18,7 +18,7 @@ elif [[ $(ver_cut 3) -ge 90 || $(ver_cut 4) -ge 90 ]] ; then
 else
 	SRC_URI="mirror://gnu/make/${P}.tar.lz"
 	SRC_URI+=" verify-sig? ( mirror://gnu/make/${P}.tar.lz.sig )"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="GPL-3+"
diff --git a/dev-build/scons/scons-4.10.0.ebuild b/dev-build/scons/scons-4.10.0.ebuild
index f694c13f980d..9fa72e9ee5e8 100644
--- a/dev-build/scons/scons-4.10.0.ebuild
+++ b/dev-build/scons/scons-4.10.0.ebuild
@@ -32,7 +32,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-build/steve/Manifest b/dev-build/steve/Manifest
index 7d81206c7267..2187c5ad7a47 100644
--- a/dev-build/steve/Manifest
+++ b/dev-build/steve/Manifest
@@ -1 +1,2 @@
 DIST steve-1.0.2.tar.bz2 12338 BLAKE2B e271557045be0d57a5a69da5bfb6a78e84ff0f53ecdb69f61d678cdda47564f1bc405c0d25d82df81d6ecff33168714afc3721787d8b04323df42c1f7efb6c0b SHA512 c93f8920bb80893224eb77dadfd40f3b86961e711dcf1a639bbe26bb28a0bf86afeda8e12d237ad5474d9461b6d50ecd05d250cbffecc57aa0075f023b49c7eb
+DIST steve-1.1.0.tar.xz 17132 BLAKE2B 3f415d007eb808180499b541cf79684ec62807ba3e60e41466c829ac5a073b6b349d55a90dd75111054bcfd33398de72dd283fef8e3654bb57cbcfeab66ffb94 SHA512 516e7523864de0a13242456a5b3a4b6ba8ea36caf90e61842acb2d56461aa1441c1ad5f2b04d3bbd3d649d9f3622e88726cbbb5b7e15c7ccbb16e179fbac4c11
diff --git a/dev-build/steve/steve-1.1.0.ebuild b/dev-build/steve/steve-1.1.0.ebuild
new file mode 100644
index 000000000000..20fdc5f18363
--- /dev/null
+++ b/dev-build/steve/steve-1.1.0.ebuild
@@ -0,0 +1,74 @@
+# Copyright 2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-info meson systemd udev
+
+DESCRIPTION="A simple jobserver for Gentoo"
+HOMEPAGE="https://gitweb.gentoo.org/proj/steve.git/"
+SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+IUSE="debug"
+
+DEPEND="
+	dev-libs/libevent:=
+	sys-fs/fuse:3=
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+pkg_pretend() {
+	local CONFIG_CHECK="~CUSE"
+	check_extra_config
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use !debug b_ndebug)
+	)
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	# TODO: move these to meson
+	systemd_dounit data/steve.service
+	newconfd data/steve.confd steve
+	newinitd data/steve.initd steve
+	insinto /etc/sandbox.d
+	newins data/sandbox.conf 90steve
+	udev_newrules data/steve.udev 90-steve.rules
+}
+
+pkg_postinst() {
+	udev_reload
+
+	if ! grep -q -s -R -- '--jobserver-auth=fifo:/dev/steve' "${EROOT}"/etc/portage/make.conf
+	then
+		elog "In order to use the system-wide steve instance, enable the service:"
+		elog
+		elog "  systemctl enable --now steve"
+		elog
+		elog "Then add to your make.conf:"
+		elog
+		elog '  MAKEFLAGS="--jobserver-auth=fifo:/dev/steve"'
+		elog '  NINJAOPTS=""'
+		elog
+		elog "You can use -l in NINJAOPTS but *do not* use -j, as it disables"
+		elog "jobserver support."
+	fi
+}
+
+pkg_postrm() {
+	udev_reload
+}