gentoo auto-resync : 08:01:2023 - 18:16:34

12 files changed, 15 insertions, 334 deletions

diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index f3da33281248..e894b4009730 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/automake/Manifest b/sys-devel/automake/Manifest
index 7b8f51522c55..4c9f94335e1b 100644
--- a/sys-devel/automake/Manifest
+++ b/sys-devel/automake/Manifest
@@ -9,12 +9,8 @@ AUX automake-1.16.2-fix-instmany-python.sh-test.patch 676 BLAKE2B b4368612ef22de
 AUX automake-1.16.2-fix-py-compile-basedir.sh-test.patch 985 BLAKE2B 9a07629d107316ed765990ef2e1356a16dfb6231829315bab704dc7fdb4716dce9320eef4baaef3ab76db2908b9071c4cb35c6607be8b984896b2cfbcdb8b474 SHA512 22c1db04dcb71a6d1519c0d54e18c40f0ad5d4ada82edf606c8c0da6a3fb6dadcd7ec5289da2373b17c063211cb1ef6c85b5a6a7e355f906ca660bc402ce184b
 AUX automake-1.16.2-py3-compile.patch 2412 BLAKE2B 20a3ce66047ad5106f0cafccce19fc8acd47ee0ba01882d1ff18c1a15592ef68b9c3debb61df78a31f238938a93ca4dc281b358b588727864673b09b11167131 SHA512 3bb9769d37b02e89373612752f127c582f948347a6f54e8b24dba262e14ca860e8fa507d96c0d51f0d64587371b9da17eb270dd5b7695091181731e35e5b9c2d
 DIST automake-1.11.6.tar.xz 1092908 BLAKE2B 17254d81d6920c32aa877b6c892025de8e4060b8bcbe50fff841ada513dd462ddde8fc6838b4976098a812f8fda047e7186cb62cea8175df615dde75a9959144 SHA512 6e4cdf69f07734954f770fd4a7211a8c9dc69fe25a7746bd3c1e01d3139c94cab2900399e87371548833e99687e0d2b59c5e746ab2fdfbc7d47f2c1d439137ba
-DIST automake-1.13.4.tar.xz 1449608 BLAKE2B 03dee42d65362a6f36e81c83d516c85faba1aac59bdc0d941077fde9be7742da0f57b48d678169e7a0e8b652c3ef46c314cdd3efb0fc489c389852fed1c39a02 SHA512 c9b145c1b822a4d83f2899f4280a76ccae932301b273f4c9718dc7f53161aa03dc1be2c1fb1a61083c54186e1908ae2c8284250aa1d8f6dea484767aca1344d3
-DIST automake-1.15.1.tar.xz 1509496 BLAKE2B e6ade31089f969140472004cd9854318470228c64e4f8e829d48c5379f62d2c5f8ef9509131c577653e81868d94544ecf6520f86b5d582ebb6ed65c832039f30 SHA512 02f661b2676f1d44334ce1c7188f9913a6874bf46ba487708ad8090ad57905f14aead80fefed815e21effacfbb925e23b944ea7dd32563dca39c1a4174eda688
 DIST automake-1.16.5.tar.xz 1601740 BLAKE2B 87408abc57e1d4317a2b518fb3606d0f6d156522e7333016dd84747cd8922f27ef7fcc93220b11f794ce52bf8fd9a788d0166a4d1964d7c283905f269977ac7c SHA512 3084ae543aa3fb5a05104ffb2e66cfa9a53080f2343c44809707fd648516869511500dba50dae67ff10f92a1bf3b5a92b2a0fa01cda30adb69b9da03994d9d88
 EBUILD automake-1.11.6-r3.ebuild 2572 BLAKE2B 378123d8b34874e9838ce279363cb9ee3c3e1b4e45335dd8016499809b1c550996943f0e4c46932294a2cfea06eb71bccb9ee6476078eaba2ca3d53a762876d1 SHA512 808f016c339714b8be0745d64e90236ecf91e8ce855aa9d31b1ec8a95906d45c57de512f7d114629584731d08ea537bcca38587ed4bdf6e70562a5b5954cf39e
-EBUILD automake-1.13.4-r2.ebuild 2649 BLAKE2B 22a96d73d5b538b18b69321db59141f3c57c9c44f7756090dc21ccb88a115354bacaa47bb6b8c89214fbe07aeabf814e38efd29a612041b8c954986811d9d2b6 SHA512 6a60d26635e18199ee36672aa1e5e07acd0692f15b79d0c8c90032b376b0967f79ba93679692e9e145dc95857b5fab5507c4d7d1cd19a84a8facdb4c38bf99d6
-EBUILD automake-1.15.1-r2.ebuild 3198 BLAKE2B 1df7f839f56b10a1d01c9e9926a426b8b50258e93276a8cf341e7105946fdd8dbb0172f771d5b34f7baa7882dec0803b7efb1ecb421b425ad2bfff62d99e7b62 SHA512 3885cc741e3d959a19320d745ff072e9a9aecc1abde481ddee342f24387c2b5d6de9f74486a179d2f7014d32c047395fef8495b39a2bd7e5ceab4afa6589d08f
 EBUILD automake-1.16.5.ebuild 3541 BLAKE2B 545b10470dbf067f06b05e48e8f21b89c280dbad7c80d0820b59cf7f2b20821c9f3d3e41f6200faf83e83af9d3dccf1fd40b603d3f5db90cb977484369ca1c33 SHA512 c549e7609f218bde08ecd8897c637bc751de764a20fd7e96398b5ff4c314b7848f808eb6dedacb9a700548594250d5909eb41d3cc6abd8af840c261616c290be
 EBUILD automake-9999.ebuild 3347 BLAKE2B 4dbc55dca89d555fc2a313bfce7a98aeb0cdfc882ae45f61eca311bdc205797bf486fcae3520aa3f52de73bdf5c2c58de6f467ea13f07fafb964b44d24515f16 SHA512 74a040fdc14461be096f8a865c37f6686cae80d7cd5a2f426efb731e17595c1c4f1ab6a6d5f0bcccd97b2bcf763ff334586659c44b3dd5fe5c710edfc87590f3
 MISC metadata.xml 332 BLAKE2B d33ce6b379d5d8d44ae9104f3e5c5a0b5b25682072f7222bdd6dd92b97123b3cc011ed078178a8d2cb9e3e3d1da03dde67b3a844374819fdb67b879341a8a5fa SHA512 ad4477b610e680468526c77df5550b44f8d0558237aac887312a463d4da29216a63db372710398d0eb478550550507e81421d1deee272038b3658c38b84e5b06
diff --git a/sys-devel/automake/automake-1.13.4-r2.ebuild b/sys-devel/automake/automake-1.13.4-r2.ebuild
deleted file mode 100644
index 520ca9e3dae5..000000000000
--- a/sys-devel/automake/automake-1.13.4-r2.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Used to generate Makefile.in from Makefile.am"
-HOMEPAGE="https://www.gnu.org/software/automake/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-# Use Gentoo versioning for slotting.
-SLOT="${PV:0:4}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-RESTRICT="test"
-
-RDEPEND=">=dev-lang/perl-5.6
-	>=sys-devel/automake-wrapper-10
-	>=sys-devel/autoconf-2.69:*
-	sys-devel/gnuconfig"
-DEPEND="${RDEPEND}
-	sys-apps/help2man"
-BDEPEND="app-arch/gzip"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.13-dyn-ithreads.patch
-	"${FILESDIR}"/${PN}-1.13-perl-escape-curly-bracket-r1.patch
-	"${FILESDIR}"/${PN}-1.13-hash-order-workaround.patch
-	"${FILESDIR}"/${PN}-1.14-install-sh-avoid-low-risk-race-in-tmp.patch
-)
-
-src_prepare() {
-	default
-	export WANT_AUTOCONF=2.5
-	sed -i -e "/APIVERSION=/s:=.*:=${SLOT}:" configure || die
-}
-
-# slot the info pages.  do this w/out munging the source so we don't have
-# to depend on texinfo to regen things.  #464146 (among others)
-slot_info_pages() {
-	pushd "${ED}"/usr/share/info >/dev/null || die
-	rm -f dir || die
-
-	# Rewrite all the references to other pages.
-	# before: * aclocal-invocation: (automake)aclocal Invocation.   Generating aclocal.m4.
-	# after:  * aclocal-invocation v1.13: (automake-1.13)aclocal Invocation.   Generating aclocal.m4.
-	local p pages=( *.info ) args=()
-	for p in "${pages[@]/%.info}" ; do
-		args+=(
-			-e "/START-INFO-DIR-ENTRY/,/END-INFO-DIR-ENTRY/s|: (${p})| v${SLOT}&|"
-			-e "s:(${p}):(${p}-${SLOT}):g"
-		)
-	done
-	sed -i "${args[@]}" * || die
-
-	# Rewrite all the file references, and rename them in the process.
-	local f d
-	for f in * ; do
-		d=${f/.info/-${SLOT}.info}
-		mv "${f}" "${d}" || die
-		sed -i -e "s:${f}:${d}:g" * || die
-	done
-
-	popd >/dev/null || die
-}
-
-src_install() {
-	default
-
-	slot_info_pages
-	rm "${ED}"/usr/share/aclocal/README || die
-	rmdir "${ED}"/usr/share/aclocal || die
-	rm \
-		"${ED}"/usr/bin/{aclocal,automake} \
-		"${ED}"/usr/share/man/man1/{aclocal,automake}.1 || die
-
-	# remove all config.guess and config.sub files replacing them
-	# w/a symlink to a specific gnuconfig version
-	local x
-	for x in guess sub ; do
-		dosym ../gnuconfig/config.${x} \
-			/usr/share/${PN}-${SLOT}/config.${x}
-	done
-
-	# Avoid QA message about pre-compressed file in docs
-	local tarfile="${ED}/usr/share/doc/${PF}/amhello-1.0.tar.gz"
-	if [[ -f "${tarfile}" ]] ; then
-		gunzip "${tarfile}" || die
-	fi
-}
diff --git a/sys-devel/automake/automake-1.15.1-r2.ebuild b/sys-devel/automake/automake-1.15.1-r2.ebuild
deleted file mode 100644
index fcc66ddf352f..000000000000
--- a/sys-devel/automake/automake-1.15.1-r2.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://git.savannah.gnu.org/r/${PN}.git"
-
-	inherit git-r3
-else
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	if [[ ${PV/_beta} == ${PV} ]]; then
-		MY_P=${P}
-		SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
-			https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz"
-	else
-		MY_PV="$(ver_cut 1).$(($(ver_cut 2)-1))b"
-		MY_P="${PN}-${MY_PV}"
-
-		# Alpha/beta releases are not distributed on the usual mirrors.
-		SRC_URI="https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz"
-	fi
-	S="${WORKDIR}/${MY_P}"
-fi
-
-DESCRIPTION="Used to generate Makefile.in from Makefile.am"
-HOMEPAGE="https://www.gnu.org/software/automake/"
-
-LICENSE="GPL-2"
-# Use Gentoo versioning for slotting.
-SLOT="${PV:0:4}"
-IUSE=""
-RESTRICT="test"
-
-RDEPEND=">=dev-lang/perl-5.6
-	>=sys-devel/automake-wrapper-10
-	>=sys-devel/autoconf-2.69:*
-	sys-devel/gnuconfig"
-DEPEND="${RDEPEND}
-	sys-apps/help2man"
-BDEPEND="app-arch/gzip"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.15-install-sh-avoid-low-risk-race-in-tmp.patch )
-
-src_prepare() {
-	default
-	export WANT_AUTOCONF=2.5
-	# Don't try wrapping the autotools this thing runs as it tends
-	# to be a bit esoteric, and the script does `set -e` itself.
-	./bootstrap || die
-	sed -i -e "/APIVERSION=/s:=.*:=${SLOT}:" configure || die
-
-	# Bug 628912
-	if ! has_version sys-apps/texinfo ; then
-		touch doc/{stamp-vti,version.texi,automake.info} || die
-	fi
-}
-
-# slot the info pages.  do this w/out munging the source so we don't have
-# to depend on texinfo to regen things.  #464146 (among others)
-slot_info_pages() {
-	pushd "${ED}"/usr/share/info >/dev/null || die
-	rm -f dir || die
-
-	# Rewrite all the references to other pages.
-	# before: * aclocal-invocation: (automake)aclocal Invocation.   Generating aclocal.m4.
-	# after:  * aclocal-invocation v1.13: (automake-1.13)aclocal Invocation.   Generating aclocal.m4.
-	local p pages=( *.info ) args=()
-	for p in "${pages[@]/%.info}" ; do
-		args+=(
-			-e "/START-INFO-DIR-ENTRY/,/END-INFO-DIR-ENTRY/s|: (${p})| v${SLOT}&|"
-			-e "s:(${p}):(${p}-${SLOT}):g"
-		)
-	done
-	sed -i "${args[@]}" * || die
-
-	# Rewrite all the file references, and rename them in the process.
-	local f d
-	for f in * ; do
-		d=${f/.info/-${SLOT}.info}
-		mv "${f}" "${d}" || die
-		sed -i -e "s:${f}:${d}:g" * || die
-	done
-
-	popd >/dev/null || die
-}
-
-src_install() {
-	default
-
-	slot_info_pages
-	rm "${ED}"/usr/share/aclocal/README || die
-	rmdir "${ED}"/usr/share/aclocal || die
-	rm \
-		"${ED}"/usr/bin/{aclocal,automake} \
-		"${ED}"/usr/share/man/man1/{aclocal,automake}.1 || die
-
-	# remove all config.guess and config.sub files replacing them
-	# w/a symlink to a specific gnuconfig version
-	local x
-	for x in guess sub ; do
-		dosym ../gnuconfig/config.${x} \
-			/usr/share/${PN}-${SLOT}/config.${x}
-	done
-
-	# Avoid QA message about pre-compressed file in docs
-	local tarfile="${ED}/usr/share/doc/${PF}/amhello-1.0.tar.gz"
-	if [[ -f "${tarfile}" ]] ; then
-		gunzip "${tarfile}" || die
-	fi
-}
diff --git a/sys-devel/bmake/Manifest b/sys-devel/bmake/Manifest
index e7c03ae0c230..417afff139fa 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-20220901.tar.gz 816362 BLAKE2B f2faf7ee44a83ba340a9682756e8ba3371ce2c6b4712331b666e01b00a483ae79f68b34ae62325ef55eea0ea42d0c23e1e654100913b65ecd607a78cc2cfa1ae SHA512 af8ee6ef896b76c14f63d24eaadd01e87abf2b12db69f334d29c811d69d1479f899d5aa0aadf2e6e87659175d64066bb90f2056b649141fcad20eac7d6057019
-DIST bmake-20220924.tar.gz 820164 BLAKE2B 5f74403ec68d9512ed74972b74219aa647b4c0ea855bd80fbf251f40a785c02f807c5cac0c7704469d343e43c5b84c395d3c1aab8ea3c8695314f016f1fa57c7 SHA512 85fa9e05a6020e7b41ef6af4b5a8f87f1f98651e264ba8cedacacf3b7d1dfbed3f66bb9934c252f71299aea6ac1190b03a9de0c60a833e8ac91ec854cd819f7b
 DIST bmake-20220928.tar.gz 821224 BLAKE2B 9b377a9a8d329d229aae37fd852a68629edb78f7f0f16bf8aeb59df4da886fe89d8b7defd8294fa49fca397d4726e704eb9c95936561fe8a3a0a1fdfe4e5b861 SHA512 13fde6517d79080c5a548b1e47e4fbf00d54752f48b40d10542926b26a3be22da70877ca2b977b43366ec1b632a76a6974c78155c39895910e01e4142e7675a0
 DIST mk-20210330.tar.gz 107380 BLAKE2B 9ac30a117d9ba31635cf8d8d29fdba76f148611f47628403ca8f807081c32509f10498d3c30fd24985e5420af4710fe59fc6315d71f2d0c1cfed93263a06553a SHA512 6acd3ee911442934082f4f877d795b07c5e23022eaa9c0874799d97e92a2f5a663cb45f94b7f9745c49cbbce6b7e755a29e381ccfb9e68a0be1eedbd22fd5d3b
-EBUILD bmake-20220901.ebuild 1311 BLAKE2B 13a2cf3f6fcee46da66355e45a95f37bca25e6b50dbff3d9e9d6c519645f2b79b6a337eb7b637b484131d41e65f85043a7f0742bb0e9d15bc3e8710f4e147843 SHA512 03c1a7df80c9dc2162fd4ad16c543ab5d96e4aa6bb19d7df3b6a75c9dbd518e35b3c209d21bc6eb7b37356f8b888a82f1fd610d694c11f55deeda5b6a30c3b76
-EBUILD bmake-20220924.ebuild 1319 BLAKE2B 481e1222949a47890a40d0f88678ecb2188a56dfaa2b25b6a1df7c772ce6e0ce01369919fee921f3b39bfafe7c39357afdb859d19512227df0d837cfe7aac5e7 SHA512 cc5a8f0d3673ca8516e1cf57f458c34ad26827c1c57810a084432cfcd91783094b9bb2bcec2c5d4d4f7a9ff2b816abd0794e2b130c15dd9792562c008501d960
-EBUILD bmake-20220928.ebuild 1281 BLAKE2B 815bf97b85dc5b9af274a6d7d2245c0e7c02d4a31018bd009696a328068c7dc373fa88f9d213752c4a542c6c38ca836e206c447a13d8db83366b142ad6f679d3 SHA512 824259ba786e879d43cd6d25c1411d4161bda9ba821d5421b5539854c8043fd25bc91ff315a9d22b451e4daecc2b537b84e2ef310616e600274c1f02cf4378f5
+EBUILD bmake-20220928.ebuild 1280 BLAKE2B 8b0a901f552c84562690e3543e66cb388b9a3415ecc83028748711982651b91e75fca5f6e4fbff17b5db3ec52447e9f03b56589ff991e41be979a1026f221389 SHA512 99320a95fc86b80d9449be59e98acaab416c69209528ed0110b00e1fe18b8739a5e8100c8f4a8bb302c6e1ea4f7930253ea5cf69861f5172b02fa987d3bd2f97
 MISC metadata.xml 353 BLAKE2B 70bd5eb274c4693a005986471e5a5c29a162bd0a080a7ba590c64171f2aa171bf9670093419f0b3e9ef304e5478f71df4899082e3dc76b4b0cedfe782a6625df SHA512 ade70c57a7ae5165c432d2024ec685609971347a94ecd69ab73142ff602f4cafb49df880d4dd1cee5695f1ea11c2c0ccc837d9a1ad38e50c61d0d27049279bc5
diff --git a/sys-devel/bmake/bmake-20220901.ebuild b/sys-devel/bmake/bmake-20220901.ebuild
deleted file mode 100644
index 7e0fdf7ced79..000000000000
--- a/sys-devel/bmake/bmake-20220901.ebuild
+++ /dev/null
@@ -1,58 +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
-	"${FILESDIR}"/${PN}-20220418-warnings.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-20220924.ebuild b/sys-devel/bmake/bmake-20220924.ebuild
deleted file mode 100644
index 2a19a8be21df..000000000000
--- a/sys-devel/bmake/bmake-20220924.ebuild
+++ /dev/null
@@ -1,58 +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 ~ppc64 ~x86"
-
-# Skip failing test (sandbox and csh)
-PATCHES=(
-	"${FILESDIR}"/${PN}-20210206-tests.patch
-	"${FILESDIR}"/${PN}-20220418-warnings.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-20220928.ebuild b/sys-devel/bmake/bmake-20220928.ebuild
index 2015f0528d5a..15621472a9d8 100644
--- a/sys-devel/bmake/bmake-20220928.ebuild
+++ b/sys-devel/bmake/bmake-20220928.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~loong ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~loong ~ppc ~ppc64 ~x86"
 
 # Skip failing test (sandbox and csh)
 PATCHES=(
diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest
index 0b519859e860..91c6a06fb6c9 100644
--- a/sys-devel/clang/Manifest
+++ b/sys-devel/clang/Manifest
@@ -16,7 +16,7 @@ EBUILD clang-13.0.1.ebuild 11294 BLAKE2B 33760cbd488068389efed5c011b15288021d1f9
 EBUILD clang-14.0.6-r1.ebuild 11719 BLAKE2B 743e26b68f15e8b4aa7acfe4f7abd095fe42a3ba6dafdff278d0bfe06f57679490e0940a1029f97d5cc3f6d4ac8b44ea63283bbad1052623ee0048fdbbeb54e0 SHA512 ec6da9dcbed9f078307e8265362a5b39dac9d97d8aadbba16395ee7ddb442d34d1d2a1e9e880da41dbdb51fcf3c741c33ac469e5f6ffa4d091adb4d1743fa12b
 EBUILD clang-15.0.6-r1.ebuild 11954 BLAKE2B 5183c85d6e303ec5dae02e2dab25405b2220b3cc2d1236f0335002a9ca152f2980109a20cd3851ff2ca87225926c7da757dd5602cc6ce57c96b04f81da415ffc SHA512 7273c4de97260b85553664b39bab009215904aba985cb9d0608387aeff093e6c9200ec864fa55079ca09b811112a66b8aae7ed9dda0a40466610eba66f01bba5
 EBUILD clang-15.0.6.9999.ebuild 11887 BLAKE2B 54096f168b831260dd077223240e581562d0f85f2b251108b222e2e44926a67688d0aa7cf3e2ae301691f89e72219f9a61d87ae22c06e8cfbc69625a28a2f967 SHA512 c02594b7a0be16c064fc411ada88330ee124912effd732e7d0d8a5bd6bd8b0a51619ec7a73715f8cd17434dfd4d66c692449b95b70312b6b2386e5548db04307
-EBUILD clang-16.0.0.9999.ebuild 11803 BLAKE2B 40e291b238494fae47021adc6ad7cc05c3b66d22d191b3aa3d52b29f1018d4ba32a5f5393b9ee19be581062259b3812be7b4ab553d12cf11e69df472f31664fc SHA512 896119e9df24cff2f80197320b7ac213dd2c03324a2ee1f629ba82ac9d20c61514b1ca708b58c6a9a7534d7b6b7197952df7ee7bc06eda2f1341c1478edb90a6
-EBUILD clang-16.0.0_pre20230101.ebuild 11809 BLAKE2B 5831fc1c041b44c40e628757c3381854ef96d3f4ccab623616b2838bf0b57e91a7846ddd511c8cd44517497e2189535c7e80a518bb80b1e977e200adfd95195d SHA512 ca56f1fbc06cae0aaa2916921ec37c9244e3365d57317be556ce94e3d76d1f50a0aae119a533a1619db995aed304ce660ceeebca3fc733f70a8066484674790d
-EBUILD clang-16.0.0_pre20230107.ebuild 11803 BLAKE2B 40e291b238494fae47021adc6ad7cc05c3b66d22d191b3aa3d52b29f1018d4ba32a5f5393b9ee19be581062259b3812be7b4ab553d12cf11e69df472f31664fc SHA512 896119e9df24cff2f80197320b7ac213dd2c03324a2ee1f629ba82ac9d20c61514b1ca708b58c6a9a7534d7b6b7197952df7ee7bc06eda2f1341c1478edb90a6
+EBUILD clang-16.0.0.9999.ebuild 11882 BLAKE2B 1a9a7c092963b17e51a1253119d748edc38d39c4ab5215d4762d8e13b37ab10f4f2043df8926a436cbc0c85814e95fb4b409ca3bbec0881defab66c204e4c3c7 SHA512 f16ca7ba1822f32b3a1a07da05d140a88d4b344ccd029a6a78c92c9af4bbdfd92ba22022d25101a5f4d649679be703bdde9c5e97e552a59dadd40b2fa8b4530b
+EBUILD clang-16.0.0_pre20230101.ebuild 11888 BLAKE2B bfa7c91e90034714f5ac42ec29c8fa6bfcb82c06bf92a15e374b483089e629d0261d18ea1c66356efed270a28c46aba27a48b98866721aef033c7ae174f4ec8e SHA512 8565434cd90020a51331ca8716a1a65a52a09bb0fed0fa7934600b548ee8cf03fdeef32ddcdee9c6c3b8096f11335674c2e6632354f41c80887a4b8b89c807f3
+EBUILD clang-16.0.0_pre20230107.ebuild 11882 BLAKE2B 1a9a7c092963b17e51a1253119d748edc38d39c4ab5215d4762d8e13b37ab10f4f2043df8926a436cbc0c85814e95fb4b409ca3bbec0881defab66c204e4c3c7 SHA512 f16ca7ba1822f32b3a1a07da05d140a88d4b344ccd029a6a78c92c9af4bbdfd92ba22022d25101a5f4d649679be703bdde9c5e97e552a59dadd40b2fa8b4530b
 MISC metadata.xml 1600 BLAKE2B 8e49e099132445cf695e904acad8a699f3d8c4c1e4cd6ba9d0b97180dfa5b67e9c30b00d1e4cb6cd2f61b27f022accc8d6ee889c6569fc58fbc058186ad216fc SHA512 96b7cf4988ff1fd923ec87311caed458b64888b5acaaf20cc1ad893f2a963158f7f59398f9fd4f9e65cab3df265c0d002048ff874f7a76b94f36377bf9e8f5f6
diff --git a/sys-devel/clang/clang-16.0.0.9999.ebuild b/sys-devel/clang/clang-16.0.0.9999.ebuild
index 34eba8f9bc95..b3eeacb43e1d 100644
--- a/sys-devel/clang/clang-16.0.0.9999.ebuild
+++ b/sys-devel/clang/clang-16.0.0.9999.ebuild
@@ -331,8 +331,10 @@ multilib_src_configure() {
 	if tc-is-cross-compiler; then
 		has_version -b sys-devel/clang:${LLVM_MAJOR} ||
 			die "sys-devel/clang:${LLVM_MAJOR} is required on the build host."
+		local tools_bin=${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/bin
 		mycmakeargs+=(
-			-DLLVM_TOOLS_BINARY_DIR="${BROOT}"/usr/lib/llvm/${LLVM_MAJOR}/bin
+			-DLLVM_TOOLS_BINARY_DIR="${tools_bin}"
+			-DCLANG_TABLEGEN="${tools_bin}"/clang-tblgen
 		)
 	fi
 
diff --git a/sys-devel/clang/clang-16.0.0_pre20230101.ebuild b/sys-devel/clang/clang-16.0.0_pre20230101.ebuild
index 1ffc67b58c67..15f87c70e26c 100644
--- a/sys-devel/clang/clang-16.0.0_pre20230101.ebuild
+++ b/sys-devel/clang/clang-16.0.0_pre20230101.ebuild
@@ -331,8 +331,10 @@ multilib_src_configure() {
 	if tc-is-cross-compiler; then
 		has_version -b sys-devel/clang:${LLVM_MAJOR} ||
 			die "sys-devel/clang:${LLVM_MAJOR} is required on the build host."
+		local tools_bin=${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/bin
 		mycmakeargs+=(
-			-DLLVM_TOOLS_BINARY_DIR="${BROOT}"/usr/lib/llvm/${LLVM_MAJOR}/bin
+			-DLLVM_TOOLS_BINARY_DIR="${tools_bin}"
+			-DCLANG_TABLEGEN="${tools_bin}"/clang-tblgen
 		)
 	fi
 
diff --git a/sys-devel/clang/clang-16.0.0_pre20230107.ebuild b/sys-devel/clang/clang-16.0.0_pre20230107.ebuild
index 34eba8f9bc95..b3eeacb43e1d 100644
--- a/sys-devel/clang/clang-16.0.0_pre20230107.ebuild
+++ b/sys-devel/clang/clang-16.0.0_pre20230107.ebuild
@@ -331,8 +331,10 @@ multilib_src_configure() {
 	if tc-is-cross-compiler; then
 		has_version -b sys-devel/clang:${LLVM_MAJOR} ||
 			die "sys-devel/clang:${LLVM_MAJOR} is required on the build host."
+		local tools_bin=${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/bin
 		mycmakeargs+=(
-			-DLLVM_TOOLS_BINARY_DIR="${BROOT}"/usr/lib/llvm/${LLVM_MAJOR}/bin
+			-DLLVM_TOOLS_BINARY_DIR="${tools_bin}"
+			-DCLANG_TABLEGEN="${tools_bin}"/clang-tblgen
 		)
 	fi