gentoo resync : 07.05.2021

4 files changed, 2 insertions, 60 deletions

diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 688c2508f2d3..cfa4d210e99a 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/bmake/Manifest b/sys-devel/bmake/Manifest
index 4c987759b376..2d15f96be91a 100644
--- a/sys-devel/bmake/Manifest
+++ b/sys-devel/bmake/Manifest
@@ -3,9 +3,7 @@ AUX bmake-20210206-tests.patch 467 BLAKE2B 7c66cfbb610f2ea9615a737dd2d97fbea359e
 AUX bmake-20210314-mk-fixes.patch 2054 BLAKE2B 404e99593f04408e3f62d8c6118fc1676ef414b4cc18f5ec8b089182fad8865ad79e40c236e58b084f3194bdcc94c92e1e10e40efbddc142b84053117065e202 SHA512 8c9e823dd158e352021f0905e2a15cb8d7da3020c49a8f824cc5dbd8f33910fc64629d5f400fd8651a16b07e0685a1247a661fd9230a62b7330bd5fc71427dd4
 DIST bmake-20210314.tar.gz 749343 BLAKE2B 765b06577d8b06924627de7c2551e4fa25bdf533f2ce96db09a63af01d965e2bc29001e2c07df98a15d72b3c57a11e99974df82b9ec12257c9340baf563c3faf SHA512 d27c3787102d32ccd541909aaf76083ff9d2f704b938ba64d234c5d29d2e7dea320e99bbee53d3594aa830ced59d512d8701487ec5b0c277339e705d6e64f97d
 DIST bmake-20210420.tar.gz 755281 BLAKE2B fe98dc5d0c5a11aecf45b160cfe5b69ef49e56a973823e84ec1f607023aa94d66cd87bc3f31fc340dc86eae0a6e87ca2a71b8367f3e9bb1a9eae8626d13a80ea SHA512 3bb603965c149e4f6bee4afff9710921e943bd1faaf5d142418a5f7a0752416e094b6a0f0dfc998bf6bedc391f668162856a51167e34b6f2ad2a0a498c96ed35
-DIST mk-20191111.tar.gz 102361 BLAKE2B 6a542c41e2a2153bd3c812aa9bcdc78a47bf2e9121835279afa2e57ec9cdd44f72a1cd7b48a7647d56b0586c547656f45359821cd2013c5a90532568e12086b5 SHA512 4a3e2344e7ada0666bcb147fcd4627030ba9b928acab6876215c8529b23909be4ced802bea177b078a6b4457370d2d0070114c0d69979622274be74336778861
 DIST mk-20210330.tar.gz 107380 BLAKE2B 9ac30a117d9ba31635cf8d8d29fdba76f148611f47628403ca8f807081c32509f10498d3c30fd24985e5420af4710fe59fc6315d71f2d0c1cfed93263a06553a SHA512 6acd3ee911442934082f4f877d795b07c5e23022eaa9c0874799d97e92a2f5a663cb45f94b7f9745c49cbbce6b7e755a29e381ccfb9e68a0be1eedbd22fd5d3b
-EBUILD bmake-20210314-r1.ebuild 1256 BLAKE2B e1668867a1c00f5ddb8294d4a93adc1732d95c0109c7faa09c02ae13d9db6997783d46a7c734a37a1100af03f81e43e5e109a7f00f951bfb6294fdc646faf1b2 SHA512 247d01869d8acd0012a6c3044c663bee9ea9261a581fc5a4192b31e032baa6517c252d7e73f4a8035f7c45d92e2d0db7e3bc01e51687b8975c3a60da8dc39909
-EBUILD bmake-20210314.ebuild 1264 BLAKE2B 1d2ad0ac93474541a1204c5c578ecd362824c56db353a4773c244e6b3b0f1065bc7e0a7723d215531e97ebe896e1b331539a9fec6a6e94cd3c720d7f71e8ed87 SHA512 5ab3623c0bf2c2db457e44077613c78fb67cc6dc83f583b0f0231f667c6c3b99ae399041e3036d0ced22a360d4468401f89108fc9f7ae0a7bc9afb1490f8d0af
+EBUILD bmake-20210314-r1.ebuild 1255 BLAKE2B 62db0d1572ca35fe9990a739ae0e3d80b11189961267badd6222dfc0d3075d669264842e0fa13c15c99abe0359feda0daef3739c5beb2f294b4c4268fd175541 SHA512 e660f58fcc19d271e05389f7ca9651de6afc3960eaf9f17381abcd49d7e59a01b4d472e4515fe7f009354141bcfe84d35c8e274a5562fbee4d98a386033927b4
 EBUILD bmake-20210420.ebuild 1266 BLAKE2B cb60e843e69c740861b71e9c3cd91e7fbd77f5c90b05e125e7b98ad9139756849f8489918b33fa10dac730c03dcfbf43f90611b10bcbe220a65767c27fc77572 SHA512 bf6dc50d38b4834298873a46bdff63a9e978ca06c7cc0e9917cb068b5030371b65c1684d6448bdbac09063af81f55df2fb3445a07253f687f7f4cca582a796c1
 MISC metadata.xml 356 BLAKE2B c8acffcd095f37e19987d6d116df6654453aab320818262c98e1ccec0871084adb919e408599eb6b4460544c2ec8660abe1e0add7a858d41dc48492f78d1c53d SHA512 c63247454ecc0add57dc73ae2e16421dab39ad199d592c459366b567f3ef3f63c706cb66ac3bdadfafe8a995216e35dc3f90f22ad45a7c078b302b48116f4645
diff --git a/sys-devel/bmake/bmake-20210314-r1.ebuild b/sys-devel/bmake/bmake-20210314-r1.ebuild
index b68c5fb35989..d8e7d457313c 100644
--- a/sys-devel/bmake/bmake-20210314-r1.ebuild
+++ b/sys-devel/bmake/bmake-20210314-r1.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-20210314.ebuild b/sys-devel/bmake/bmake-20210314.ebuild
deleted file mode 100644
index eba8ee5a671f..000000000000
--- a/sys-devel/bmake/bmake-20210314.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# 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}"/${PN}-20210206-tests.patch )
-
-src_prepare() {
-	default
-	cd "${WORKDIR}" || die
-	eapply "${FILESDIR}"/${PN}-20210206-lib-mk.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"
-}