gentoo resync : 20.03.2022

4 files changed, 62 insertions, 5 deletions

diff --git a/sys-devel/bmake/Manifest b/sys-devel/bmake/Manifest
index fd2cdc7269e2..1b13dd33670c 100644
--- a/sys-devel/bmake/Manifest
+++ b/sys-devel/bmake/Manifest
@@ -1,8 +1,10 @@
 AUX bmake-20210206-tests.patch 467 BLAKE2B 7c66cfbb610f2ea9615a737dd2d97fbea359ecb0e5b5c746447b9a0e9d2dff188f6f0d45225dd07d1226a86297f0c9ba8b8be7587039f2cc7ceaab4bde61f570 SHA512 3d855d54b64e2871ad8ccd494939c92a6bca2bec61f186e907a9b6b8b4f51b4ff63fcacbb8b6d44cef33a39c6ba2bed6c1fdd30d7ad65ad03d1d659781c420fe
 AUX bmake-20210314-mk-fixes.patch 2054 BLAKE2B 404e99593f04408e3f62d8c6118fc1676ef414b4cc18f5ec8b089182fad8865ad79e40c236e58b084f3194bdcc94c92e1e10e40efbddc142b84053117065e202 SHA512 8c9e823dd158e352021f0905e2a15cb8d7da3020c49a8f824cc5dbd8f33910fc64629d5f400fd8651a16b07e0685a1247a661fd9230a62b7330bd5fc71427dd4
-DIST bmake-20211212.tar.gz 780800 BLAKE2B 4a69f4881c70319d9548a688284036732ca541c0abc3082dc126ff743e550e6ccd1dee5c0909029e35f7e2329866e806615c2e4f8cd3bd4d7739e9b03f677326 SHA512 210065d90e1d4ec68df78d9c19d7f685d2a3f8dbd837ca1f6e40f250ae94b9e03f8ca07d15d3e9f34f27229b3e410ca9aef633fcc5f7661967a2553846524eb3
 DIST bmake-20220116.tar.gz 785312 BLAKE2B 260ee10b5d295482477a9be92303c946139785f3c2a17cdb8a215322ac8876b708235af83f2c86f21c50da9a4b55b00300f08da40fc0d06ca2eda6caf1aafc50 SHA512 27e400f200afdb0ebc978bbd6a7422e570ab0a79ce609cffddbebb281d59ef752d840be14e08e989c83c14f2955f98d9549c8ae452450c75d03c59c61593fb5c
+DIST bmake-20220214.tar.gz 801006 BLAKE2B 70b86d04cd891d1bc0aa9a7e8aac09edcd486fc0419e5def8696846bf5b7977cdc48a20707b74f5f2a8e69d2ac2aa2f05f6d490efed74770dc80cce0cf21a32a SHA512 c5b17ca1128b0978f832e7c8ecb482d14021eb6c3ffc0c5a535ff7162162f8d5c32c688063f554ad1c37fd3ac26e67df57c66024132d301635e5854ac6c73802
+DIST bmake-20220303.tar.gz 802039 BLAKE2B 73dd831d463ff361a47eee016b962d8de2f7182083eb68f6f7de544c4af0ea94b4346b7c7c2a71f300930c4d1f0c67407059feeb98bf475df1966ceb1d22ff1b SHA512 c10a8aa4e3a0180904aaa3e6d3110be655eaa04365d75454291c837d79b0645da80a042118e2d9581b7399b73bcc472e13425e7ce768446392a3a3f5e2778c32
 DIST mk-20210330.tar.gz 107380 BLAKE2B 9ac30a117d9ba31635cf8d8d29fdba76f148611f47628403ca8f807081c32509f10498d3c30fd24985e5420af4710fe59fc6315d71f2d0c1cfed93263a06553a SHA512 6acd3ee911442934082f4f877d795b07c5e23022eaa9c0874799d97e92a2f5a663cb45f94b7f9745c49cbbce6b7e755a29e381ccfb9e68a0be1eedbd22fd5d3b
-EBUILD bmake-20211212.ebuild 1265 BLAKE2B 4bdad1c6658247d849daa6322218c31a88f8af7c0a6d358698974da14a6b7260654e764cdfafe8e5bd1e91c8e38296fd0c5c1ba4d053dfb4b1aa163f3cdfb509 SHA512 8af6400720cdc5da9b157f82ef67fc3931e6e3c478eac903c04f26ae1413ed831ea3bb1e418a1471614c63bc20269659825c909982b5388cfdc6027f3060b8e9
-EBUILD bmake-20220116.ebuild 1266 BLAKE2B 80ef8417fd430ebfc149a435ae9a94aa02471dde537693286199a949d0acf4e1bd5a66e2c02c1230fa0ec04af0c8ce2b3cee186a69e4f6fc3ad0482de77e955b SHA512 cc639387b9ffaa798ea485efdf8994b7cee85f098982306551640b3240e69885e3d9ad96653c9ec18c274ad988f478131cda312c5b50de02aba0093966b0f0d1
+EBUILD bmake-20220116.ebuild 1265 BLAKE2B 4bdad1c6658247d849daa6322218c31a88f8af7c0a6d358698974da14a6b7260654e764cdfafe8e5bd1e91c8e38296fd0c5c1ba4d053dfb4b1aa163f3cdfb509 SHA512 8af6400720cdc5da9b157f82ef67fc3931e6e3c478eac903c04f26ae1413ed831ea3bb1e418a1471614c63bc20269659825c909982b5388cfdc6027f3060b8e9
+EBUILD bmake-20220214.ebuild 1266 BLAKE2B 80ef8417fd430ebfc149a435ae9a94aa02471dde537693286199a949d0acf4e1bd5a66e2c02c1230fa0ec04af0c8ce2b3cee186a69e4f6fc3ad0482de77e955b SHA512 cc639387b9ffaa798ea485efdf8994b7cee85f098982306551640b3240e69885e3d9ad96653c9ec18c274ad988f478131cda312c5b50de02aba0093966b0f0d1
+EBUILD bmake-20220303.ebuild 1266 BLAKE2B 80ef8417fd430ebfc149a435ae9a94aa02471dde537693286199a949d0acf4e1bd5a66e2c02c1230fa0ec04af0c8ce2b3cee186a69e4f6fc3ad0482de77e955b SHA512 cc639387b9ffaa798ea485efdf8994b7cee85f098982306551640b3240e69885e3d9ad96653c9ec18c274ad988f478131cda312c5b50de02aba0093966b0f0d1
 MISC metadata.xml 353 BLAKE2B 70bd5eb274c4693a005986471e5a5c29a162bd0a080a7ba590c64171f2aa171bf9670093419f0b3e9ef304e5478f71df4899082e3dc76b4b0cedfe782a6625df SHA512 ade70c57a7ae5165c432d2024ec685609971347a94ecd69ab73142ff602f4cafb49df880d4dd1cee5695f1ea11c2c0ccc837d9a1ad38e50c61d0d27049279bc5
diff --git a/sys-devel/bmake/bmake-20220116.ebuild b/sys-devel/bmake/bmake-20220116.ebuild
index 7b11aa7cebf4..a69c0ea95fc0 100644
--- a/sys-devel/bmake/bmake-20220116.ebuild
+++ b/sys-devel/bmake/bmake-20220116.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 
 # Skip failing test (sandbox and csh)
 PATCHES=( "${FILESDIR}"/${PN}-20210206-tests.patch )
diff --git a/sys-devel/bmake/bmake-20211212.ebuild b/sys-devel/bmake/bmake-20220214.ebuild
index a69c0ea95fc0..7b11aa7cebf4 100644
--- a/sys-devel/bmake/bmake-20211212.ebuild
+++ b/sys-devel/bmake/bmake-20220214.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 
 # Skip failing test (sandbox and csh)
 PATCHES=( "${FILESDIR}"/${PN}-20210206-tests.patch )
diff --git a/sys-devel/bmake/bmake-20220303.ebuild b/sys-devel/bmake/bmake-20220303.ebuild
new file mode 100644
index 000000000000..7b11aa7cebf4
--- /dev/null
+++ b/sys-devel/bmake/bmake-20220303.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MK_VER=20210330
+
+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="~amd64 ~ppc ~x86"
+
+# Skip failing test (sandbox and csh)
+PATCHES=( "${FILESDIR}"/${PN}-20210206-tests.patch )
+
+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"
+}