3 files changed, 79 insertions, 0 deletions
diff --git a/sys-devel/bmake/Manifest b/sys-devel/bmake/Manifest
index 19756270cef9..3e31469b43e6 100644
--- a/sys-devel/bmake/Manifest
+++ b/sys-devel/bmake/Manifest
@@ -1,8 +1,11 @@
 AUX bmake-20181221-fix-gcc10-fno-common.patch 575 BLAKE2B f8e767c442683332b258cb4df3cad965cc2cb2903ce404e6f0f923c6ff1135e3e51d28e3b1855fe0ac27e5db839ae117236ead9cf8fed3bef6706dff9754e56f SHA512 d6986497844239b7c67e721b76387c391a7bf71a7122dfa54aadbada6add5bf3d810aea0f8f119d47c76445266f90a2cc39bef23b398cb3ee396de6cefa0020b
 AUX bmake-20201117-tests.patch 425 BLAKE2B 55f487ddf626698b0b5de6fc37cb06ba90f1fdca6a43d63fc74429615ef27ab3ac74d0e073f7741cbc6b92f328e0a7b1b70c97a3e34d870525a1e8810b36d87f SHA512 7a6521e6a94cb71d8afdf231ca25958737ccc8daa8b3ec9e12cb4032804c7aeaecea9d4abbcd1289e477de349780da818fb862c4d13d324f0b0cd066916b47f2
+AUX bmake-20201222-tests.patch 670 BLAKE2B 869d70085b20d2a8f9eb2f28401b22beb4af3833fba85dab842efb57e4189f826f224fb10b8a70975eb5402bb2200418eed56daf537633d51be06db7a5b7a8ae SHA512 33f7caa47fc0401f3d3ce9546b3745728a8d59c2e09f2fadaef4a9a2ab881896f291b79cd13e5662743a1a2d93bfcd7a525f4d3b050312d000d11ead2fc674f5
 DIST bmake-20200318.tar.gz 572827 BLAKE2B f10c6f3e87497508e26154acb3e8a07b78daeba083228478023443b5ccaf540385c1d594fb968ed1fe9ccad30680e7c527db48fc3787c01930f62f88f1fb6699 SHA512 a405226e8f4a9a985ed00dc359390da7890d70f8a7b7e134db05da34ebc3c6ee2373497a9e44e0d75bb64edd81f860fd0cc204bdf7f392dd4e9d2e6a5fe9e507
 DIST bmake-20201117.tar.gz 696371 BLAKE2B e92568e844d74f1ace157d68ea029c7a999351b18c3afab50ab584abb8c41691dee5fe4f2e1fd7936103cbbabe33dbbd6c7b2b0af2e0cc199dbb83150b237f8c SHA512 b78e6f6276032fe68a67196d18b6786556b1079109998b1c9a585a9d58e9245294ee01b3b787329a04e7f024fa72763c109351a8da9ec09f8bf8407393758588
+DIST bmake-20201222.tar.gz 727973 BLAKE2B cd093418c646e6b15e47f08c3c8e6a5daa5db2c9a1f76b4e8d639e0a50444ad518836585af7381bb2952309dd82716046a85e42121180133c9ccd546963a7748 SHA512 ddf1152adf99b350ae1ff1dd473319cd7c277c696f29b3ccba9080ecb9da0013f334b183c46a6e0a34708071a8f4f89d813264436e1946ebdc1923e6fe7440d9
 DIST mk-20191111.tar.gz 102361 BLAKE2B 6a542c41e2a2153bd3c812aa9bcdc78a47bf2e9121835279afa2e57ec9cdd44f72a1cd7b48a7647d56b0586c547656f45359821cd2013c5a90532568e12086b5 SHA512 4a3e2344e7ada0666bcb147fcd4627030ba9b928acab6876215c8529b23909be4ced802bea177b078a6b4457370d2d0070114c0d69979622274be74336778861
 EBUILD bmake-20200318.ebuild 1137 BLAKE2B 5ceb9e88fec798df6afebae8dd6534a95ee5a977369a52bd9dde1525c471a0fd838cd667e3c5c1d7ce3a29f6e9fc449c1cf011fe75cdbfd5a397410f99cf3860 SHA512 aab466bfc237621ba3f5f5840b93c4fef6b42464f0c302380dad7d3caee053ec7b6510136188ffed382a8017cb44f41e36155637e1d6d51c1ba0bd15faaaaccf
 EBUILD bmake-20201117.ebuild 1152 BLAKE2B 643222e719b1bc152f930c85c026a19077645e767d1b1256d72882beb1b271348c944d54e5433aa96f3364fd6204e341d2854f2b93dc0f6ed40d487cd588b475 SHA512 b06d919e2d9adff7d7a39498fd1a8e2fd231af83dcac3a358e751cdda1e47e247957465e785245ffd56d0cf1ddc5015c9e23a5be28d5d5a4855d8bb8b713f49f
+EBUILD bmake-20201222.ebuild 1153 BLAKE2B 1cb5132e060ae65c0afe2a4b14740172ae2f43be23d1ca93b60001fcd0901d227ad8170d5f11cd593bbcaa80f90375f79fdab656b89876bb5d3370add35b7fea SHA512 6d1eef0c8c9371350ccb28b95c11518f0413c9224e993bd94eb6bf1fa97a51da9662e85acaa353134ddb898d37710910a12a93b1223a2b5268d31f3fb241b20e
 MISC metadata.xml 244 BLAKE2B bd2c6209566a4936a38d9109a9a533aa1669dd50701ff8a96d2a65411aa692517ab70cafd98afcad7058979d62f1a7ac796c5b99a520c0f6ca1ed92cf9e0e207 SHA512 57959095dc10704e073e5517ac49ceee80e42fb1cc3f26b1b7308f872ffda810ce42e0b80ea6da57faa7a759878a9b8d2476fe351fecac1450f9c83751802787
diff --git a/sys-devel/bmake/bmake-20201222.ebuild b/sys-devel/bmake/bmake-20201222.ebuild
new file mode 100644
index 000000000000..547f81f91f68
--- /dev/null
+++ b/sys-devel/bmake/bmake-20201222.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MK_VER=20191111
+
+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"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+S="${WORKDIR}/${PN}"
+
+# Skip failing test (sandbox and csh)
+PATCHES=( "${FILESDIR}"/${P}-tests.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/sys-devel/bmake/files/bmake-20201222-tests.patch b/sys-devel/bmake/files/bmake-20201222-tests.patch
new file mode 100644
index 000000000000..9a5efb79246e
--- /dev/null
+++ b/sys-devel/bmake/files/bmake-20201222-tests.patch
@@ -0,0 +1,26 @@
+--- a/unit-tests/Makefile
++++ b/unit-tests/Makefile
+@@ -183,7 +183,6 @@ TESTS+=		dotwait
+ TESTS+=		envfirst
+ TESTS+=		error
+ TESTS+=		# escape	# broken by reverting POSIX changes
+-TESTS+=		export
+ TESTS+=		export-all
+ TESTS+=		export-env
+ TESTS+=		export-variants
+@@ -280,7 +279,6 @@ TESTS+=		sh-leading-plus
+ TESTS+=		sh-meta-chars
+ TESTS+=		sh-multi-line
+ TESTS+=		sh-single-line
+-TESTS+=		shell-csh
+ TESTS+=		shell-custom
+ .if exists(/bin/ksh)
+ TESTS+=		shell-ksh
+@@ -316,7 +314,6 @@ TESTS+=		var-op-append
+ TESTS+=		var-op-assign
+ TESTS+=		var-op-default
+ TESTS+=		var-op-expand
+-TESTS+=		var-op-shell
+ TESTS+=		var-op-sunsh
+ TESTS+=		var-recursive
+ TESTS+=		varcmd