gentoo resync : 27.10.2021

6 files changed, 99 insertions, 3 deletions

diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index e8ec7da11560..43d43abdfa8a 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/bmake/Manifest b/sys-devel/bmake/Manifest
index 36b24745cac9..e46f9840d1de 100644
--- a/sys-devel/bmake/Manifest
+++ b/sys-devel/bmake/Manifest
@@ -2,7 +2,9 @@ AUX bmake-20210206-tests.patch 467 BLAKE2B 7c66cfbb610f2ea9615a737dd2d97fbea359e
 AUX bmake-20210314-mk-fixes.patch 2054 BLAKE2B 404e99593f04408e3f62d8c6118fc1676ef414b4cc18f5ec8b089182fad8865ad79e40c236e58b084f3194bdcc94c92e1e10e40efbddc142b84053117065e202 SHA512 8c9e823dd158e352021f0905e2a15cb8d7da3020c49a8f824cc5dbd8f33910fc64629d5f400fd8651a16b07e0685a1247a661fd9230a62b7330bd5fc71427dd4
 DIST bmake-20210808.tar.gz 765029 BLAKE2B 27ff99395e7cdc00a118ebfb5b043180ffbd9d5385b008c49baae8bf953e45e277aeb133d736bd282c1ffc08bd7c3b87b4dc23d0b188a86469116e1d94ed2409 SHA512 d0afb9b6a50858c330cccf57a8f8b35ddf1ea1faefc2110237e30262b35eb69c1a4918e48acc2ed3deed8b11bf87b80429d71c46366c81ceb7427a79a3e58089
 DIST bmake-20211001.tar.gz 767532 BLAKE2B 1571db7f342d91b1504598dc53ca1f1e9aeea4c4ed3f637721803107122fcf7ed9c8cfdc034d996ab400364d35ff721fb0b248a92e5a1283dacd7a83c9c7b1d5 SHA512 b8d3d19facfa3ef46ca8c966f8ccfaeff65a1d9f210072fa569fa12573900babd6d6624e397e71d76d58b551fad13c26e590d02eb94f726e29a6a00d1b8b0b75
+DIST bmake-20211020.tar.gz 774610 BLAKE2B 22152ba1905e445a685ba92ee999b0f9154578f633140614aa45eb8eb67e7759b6ac04b4c35db609d887a3552c5f77a34390f9108c14ac97c2db7bcb53505e2d SHA512 23513885c462348eb694f5208db62fd489e2376cdc0d44c3182b16042253e1ed8cc0df9331375f493034afe514dede471e037b4f84a4b192df0f4d45a86725a8
 DIST mk-20210330.tar.gz 107380 BLAKE2B 9ac30a117d9ba31635cf8d8d29fdba76f148611f47628403ca8f807081c32509f10498d3c30fd24985e5420af4710fe59fc6315d71f2d0c1cfed93263a06553a SHA512 6acd3ee911442934082f4f877d795b07c5e23022eaa9c0874799d97e92a2f5a663cb45f94b7f9745c49cbbce6b7e755a29e381ccfb9e68a0be1eedbd22fd5d3b
 EBUILD bmake-20210808.ebuild 1265 BLAKE2B 9e38d36c77052e8829a8e75a36178a705218f910f0b588ca1f459de6f1a3e1f0445894ab7a34da2723e1caf14494b8a1fef663395b657e0dc492ec38aff94f4d SHA512 f7d935f6c5b449c52c67b0f2cf61d7e6eeba38d4d24f7934f46023cf2fcc136d06c1f4443d51340723b32b00bc7314f0af99dbe342edc515f74e489ee3da0e3c
 EBUILD bmake-20211001.ebuild 1266 BLAKE2B a5942f2e09caac94b265833f06d341cf4c15856cd81dcb44e606250ffbd13b8ed541ccc11a953fdf5762da59c151667a5755fa2436415d6bc09e2498b89c63ca SHA512 e2afff68379224b51a8274901f00a18e7f230d95ee63488d936ddaa1f419331f16f7f379266d27f6408f4b1bd743d867ddf5706653ea196bbe76ac9fe5dbfd10
+EBUILD bmake-20211020.ebuild 1266 BLAKE2B a5942f2e09caac94b265833f06d341cf4c15856cd81dcb44e606250ffbd13b8ed541ccc11a953fdf5762da59c151667a5755fa2436415d6bc09e2498b89c63ca SHA512 e2afff68379224b51a8274901f00a18e7f230d95ee63488d936ddaa1f419331f16f7f379266d27f6408f4b1bd743d867ddf5706653ea196bbe76ac9fe5dbfd10
 MISC metadata.xml 353 BLAKE2B 70bd5eb274c4693a005986471e5a5c29a162bd0a080a7ba590c64171f2aa171bf9670093419f0b3e9ef304e5478f71df4899082e3dc76b4b0cedfe782a6625df SHA512 ade70c57a7ae5165c432d2024ec685609971347a94ecd69ab73142ff602f4cafb49df880d4dd1cee5695f1ea11c2c0ccc837d9a1ad38e50c61d0d27049279bc5
diff --git a/sys-devel/bmake/bmake-20211020.ebuild b/sys-devel/bmake/bmake-20211020.ebuild
new file mode 100644
index 000000000000..5d5f15630855
--- /dev/null
+++ b/sys-devel/bmake/bmake-20211020.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2021 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/crossdev/Manifest b/sys-devel/crossdev/Manifest
index bcd79e541b6b..c3e7be122041 100644
--- a/sys-devel/crossdev/Manifest
+++ b/sys-devel/crossdev/Manifest
@@ -1,6 +1,8 @@
 DIST crossdev-20210621.tar.xz 28588 BLAKE2B 33ff6069c85cbcff6bf34bf5f6dd8050bd5f9d34e3478c0200965dffd4cee46e71acf4210f533c9b22fd6fe979fa5f447d30b5aaa3a6fc0845b201a80dcb28d8 SHA512 8f8bed6ce53503fa4c2bbce4327d8e1d5ce8edab5ff698f11f312007912a2d73be56242269f798bb633ad3648f6cf936e00e019c05e5781b523059befc26f42c
 DIST crossdev-20210718.tar.xz 28640 BLAKE2B 1e9b9313a5c9a1cb4d82f00e4979794d61b9eaa0035c575ac55092c6c015d820a590c5816d212a4ffad95b96a3dd99a9b94ca7c20b78a7d7b062f16dec6ed329 SHA512 e1a37aebf759abaa30f071f43a528f9059b83456e71fd86fc8202a7eff5c506c1f34fdd260c7b91a03f491b9f2a107ce6a65c2314845a352176fcc5a27a766e2
+DIST crossdev-20211027.tar.xz 28752 BLAKE2B 058d6254c702709c18cc426fe15d7a11cb856336236837a15c0b2cb0c2389198f8b0ea9893e7cdadd6ecdabb3e75c05b64c22448324ce2ea86032cb57e92a5d9 SHA512 6c15d71fb551dcb5cb8e95d7e3b1ecb52b34e47335842408da5acc9d258c1a5fa7e4699681b9b414b1b444df98601aa8b99b2000700485ec6028c076abeafd03
 EBUILD crossdev-20210621.ebuild 832 BLAKE2B 3253956c99cefc7045f6e127dc319b0861fa251755db320ec0bdff9738b3f9480df6c94fe29a6a4597a25f30baee8a86bffe2eade232600d556136840c741601 SHA512 7ca8f2d6dabd9cd3f47b9fb9e09647c70c1c5d321aa832a2ed515c723903a87acfa0b90648c512c921e7c955a53ebc312fefeb6e459b2707a7d5c0c4140250a2
 EBUILD crossdev-20210718.ebuild 840 BLAKE2B e4774046a16df9e3a9956db328aad6ca3ac95fd00b683d4960f52bf28178b05baf62b471447dd84139b4d5942b9b33e8b8f39b5316d32e9ce93ba3317e3bda77 SHA512 4dbcc4d6cec4eaf17cf736b81ffafa0ccfc61737f949e277feca6b266b709dffbf4051a228d017140cee58abced205740209067daea452f3f10d64138c112741
-EBUILD crossdev-99999999.ebuild 846 BLAKE2B 98fc8f0163037fd839dfd9f386b0409263bafb7796fbb6f0cf35f557b78145280b91d4fb1307999240cb03f48ef7f16c99cfad703b69338878e3032b786fe2dd SHA512 6f3019e3796dd91303425d249ecd661347efad4251b80ca2baca739551828215d7e5613512be0e50f772130dfd00afacdd3f3c832581154ae7abe7007d2d106a
+EBUILD crossdev-20211027.ebuild 898 BLAKE2B e16a0e822a7a547d040203f4b8bf8f017e2bd424f9a2ec53facb3149fe2903b18552bdccd423f36602a4862bd35ce29aa83623224da97d57a42656a37ee91fb5 SHA512 1c5a13d1ef504394686ffd62c56e2f652488459acdbcbafde780a1bb5a370e8493539cbef0c4c0a64d5d5ff82e50b9ede044e44f98945858e707c0ca434d1f2f
+EBUILD crossdev-99999999.ebuild 898 BLAKE2B e16a0e822a7a547d040203f4b8bf8f017e2bd424f9a2ec53facb3149fe2903b18552bdccd423f36602a4862bd35ce29aa83623224da97d57a42656a37ee91fb5 SHA512 1c5a13d1ef504394686ffd62c56e2f652488459acdbcbafde780a1bb5a370e8493539cbef0c4c0a64d5d5ff82e50b9ede044e44f98945858e707c0ca434d1f2f
 MISC metadata.xml 381 BLAKE2B 1d383a0b95cc180ed7be66205a9525f0a3e973a9b7e296c463e3a735163e1b673140a82dfc0a21ad30d71cad1b482770fb3a0028fef32593e6f7b53df127dcef SHA512 8074c54c17718021de7fcd8aef8b6c137eae75cd41c5dd02f86c987f7465d98af449f92a67fccd489a4f0ab0670ae89fb737e290be37a225acb81b8f1074446f
diff --git a/sys-devel/crossdev/crossdev-20211027.ebuild b/sys-devel/crossdev/crossdev-20211027.ebuild
new file mode 100644
index 000000000000..0c2fe30139d5
--- /dev/null
+++ b/sys-devel/crossdev/crossdev-20211027.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+if [[ ${PV} == "99999999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/crossdev.git"
+else
+	SRC_URI="mirror://gentoo/${P}.tar.xz
+		https://dev.gentoo.org/~sam/distfiles/${P}.tar.xz
+		https://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+DESCRIPTION="Gentoo Cross-toolchain generator"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Crossdev"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+RDEPEND="
+	>=sys-apps/portage-2.1
+	>=app-portage/portage-utils-0.55
+	app-shells/bash
+	sys-apps/gentoo-functions
+"
+BDEPEND="app-arch/xz-utils"
+
+src_install() {
+	default
+
+	if [[ "${PV}" == "99999999" ]] ; then
+		sed -i "s:@CDEVPV@:${EGIT_VERSION}:" "${ED}"/usr/bin/crossdev || die
+	fi
+}
diff --git a/sys-devel/crossdev/crossdev-99999999.ebuild b/sys-devel/crossdev/crossdev-99999999.ebuild
index 72dc1a5881fd..0c2fe30139d5 100644
--- a/sys-devel/crossdev/crossdev-99999999.ebuild
+++ b/sys-devel/crossdev/crossdev-99999999.ebuild
@@ -1,14 +1,15 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=8
+EAPI="8"
 
 if [[ ${PV} == "99999999" ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/crossdev.git"
 else
 	SRC_URI="mirror://gentoo/${P}.tar.xz
-		https://dev.gentoo.org/~sam/distfiles/${P}.tar.xz"
+		https://dev.gentoo.org/~sam/distfiles/${P}.tar.xz
+		https://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi