gentoo resync : 29.12.2022

4 files changed, 2 insertions, 116 deletions

diff --git a/sys-devel/bmake/Manifest b/sys-devel/bmake/Manifest
index 682965630916..76dea7e1c334 100644
--- a/sys-devel/bmake/Manifest
+++ b/sys-devel/bmake/Manifest
@@ -1,11 +1,7 @@
 AUX bmake-20210206-tests.patch 467 BLAKE2B 7c66cfbb610f2ea9615a737dd2d97fbea359ecb0e5b5c746447b9a0e9d2dff188f6f0d45225dd07d1226a86297f0c9ba8b8be7587039f2cc7ceaab4bde61f570 SHA512 3d855d54b64e2871ad8ccd494939c92a6bca2bec61f186e907a9b6b8b4f51b4ff63fcacbb8b6d44cef33a39c6ba2bed6c1fdd30d7ad65ad03d1d659781c420fe
 AUX bmake-20210314-mk-fixes.patch 2054 BLAKE2B 404e99593f04408e3f62d8c6118fc1676ef414b4cc18f5ec8b089182fad8865ad79e40c236e58b084f3194bdcc94c92e1e10e40efbddc142b84053117065e202 SHA512 8c9e823dd158e352021f0905e2a15cb8d7da3020c49a8f824cc5dbd8f33910fc64629d5f400fd8651a16b07e0685a1247a661fd9230a62b7330bd5fc71427dd4
 AUX bmake-20220418-warnings.patch 1304 BLAKE2B 364c458c39541f5901a7e46c2275625972d1879d42fd9c5f347e2f27f3b6f837dc3c1f676b3da1615eab6f91f38766bfc758d58959313e5598c4c9a7445fb93e SHA512 3925f5feea2222bd0b136f41dc633e03254946a88ef6029e4363f2bbcf97214f25479d27489a8f1697ddca5bab4157fb7675aba81534bcfa35eaa16750ce098b
-DIST bmake-20220303.tar.gz 802039 BLAKE2B 73dd831d463ff361a47eee016b962d8de2f7182083eb68f6f7de544c4af0ea94b4346b7c7c2a71f300930c4d1f0c67407059feeb98bf475df1966ceb1d22ff1b SHA512 c10a8aa4e3a0180904aaa3e6d3110be655eaa04365d75454291c837d79b0645da80a042118e2d9581b7399b73bcc472e13425e7ce768446392a3a3f5e2778c32
-DIST bmake-20220330.tar.gz 804133 BLAKE2B 2d8064c0af0fc5d18660e59fe6d08af055dcf1a387974ecdcf346e2c28926dab5266141f037c037a4ddc00e40977cd437bb24f776e37ca09b7308104eafb8e52 SHA512 211cf9f70449921a9ddaf2e0ef23dd170f04005231451d229a0f2bd03e0f60fc1f239d9946d4e46985092cafe987d858ea265207066cf55da2cb5a483e1a31ab
 DIST bmake-20220418.tar.gz 805986 BLAKE2B 6569956d81a9c67cc95756831ec086b392af69cb2b068f11d3beb237ca3f62059b9102695f28aa4093b589af52c512545bd86d91a410d681f3835a99b8270f6f SHA512 89fa5cb6e35ee1cd6a32acf291bda33b3a7272c4ef25d38412b8caa7e092210c8fa04a11d19d3c19b7e60dee2cf0a5049cf393be6e25b6e28bab2eea50e03204
 DIST mk-20210330.tar.gz 107380 BLAKE2B 9ac30a117d9ba31635cf8d8d29fdba76f148611f47628403ca8f807081c32509f10498d3c30fd24985e5420af4710fe59fc6315d71f2d0c1cfed93263a06553a SHA512 6acd3ee911442934082f4f877d795b07c5e23022eaa9c0874799d97e92a2f5a663cb45f94b7f9745c49cbbce6b7e755a29e381ccfb9e68a0be1eedbd22fd5d3b
-EBUILD bmake-20220303.ebuild 1265 BLAKE2B 4bdad1c6658247d849daa6322218c31a88f8af7c0a6d358698974da14a6b7260654e764cdfafe8e5bd1e91c8e38296fd0c5c1ba4d053dfb4b1aa163f3cdfb509 SHA512 8af6400720cdc5da9b157f82ef67fc3931e6e3c478eac903c04f26ae1413ed831ea3bb1e418a1471614c63bc20269659825c909982b5388cfdc6027f3060b8e9
-EBUILD bmake-20220330.ebuild 1266 BLAKE2B 80ef8417fd430ebfc149a435ae9a94aa02471dde537693286199a949d0acf4e1bd5a66e2c02c1230fa0ec04af0c8ce2b3cee186a69e4f6fc3ad0482de77e955b SHA512 cc639387b9ffaa798ea485efdf8994b7cee85f098982306551640b3240e69885e3d9ad96653c9ec18c274ad988f478131cda312c5b50de02aba0093966b0f0d1
-EBUILD bmake-20220418.ebuild 1312 BLAKE2B a51d77327b89fa4526245c8949883c79ed3091b0c62aaa45be1e266d363178948cd3d46c3e94ef6cdbec8231480561dbfdd166d6434d95c98e6e87f2061bd616 SHA512 3c24aeb474b64a3b28093ba26b21ca6b2e9f34ec012c9bc87b6e40048d268ddb48e1feab0ce7f3a640da514aa47899fc8560aac09deacda9b88c7ec93d6b0554
+EBUILD bmake-20220418.ebuild 1311 BLAKE2B 13a2cf3f6fcee46da66355e45a95f37bca25e6b50dbff3d9e9d6c519645f2b79b6a337eb7b637b484131d41e65f85043a7f0742bb0e9d15bc3e8710f4e147843 SHA512 03c1a7df80c9dc2162fd4ad16c543ab5d96e4aa6bb19d7df3b6a75c9dbd518e35b3c209d21bc6eb7b37356f8b888a82f1fd610d694c11f55deeda5b6a30c3b76
 MISC metadata.xml 353 BLAKE2B 70bd5eb274c4693a005986471e5a5c29a162bd0a080a7ba590c64171f2aa171bf9670093419f0b3e9ef304e5478f71df4899082e3dc76b4b0cedfe782a6625df SHA512 ade70c57a7ae5165c432d2024ec685609971347a94ecd69ab73142ff602f4cafb49df880d4dd1cee5695f1ea11c2c0ccc837d9a1ad38e50c61d0d27049279bc5
diff --git a/sys-devel/bmake/bmake-20220303.ebuild b/sys-devel/bmake/bmake-20220303.ebuild
deleted file mode 100644
index a69c0ea95fc0..000000000000
--- a/sys-devel/bmake/bmake-20220303.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# 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"
-}
diff --git a/sys-devel/bmake/bmake-20220330.ebuild b/sys-devel/bmake/bmake-20220330.ebuild
deleted file mode 100644
index 7b11aa7cebf4..000000000000
--- a/sys-devel/bmake/bmake-20220330.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# 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"
-}
diff --git a/sys-devel/bmake/bmake-20220418.ebuild b/sys-devel/bmake/bmake-20220418.ebuild
index 5505e007c65a..7e0fdf7ced79 100644
--- a/sys-devel/bmake/bmake-20220418.ebuild
+++ b/sys-devel/bmake/bmake-20220418.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=(