commit:     a1c35bc9521ad61d442ae8a35b1f3f292adacd37
Author:     Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Sun Jan 24 19:23:52 2021 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Jan 24 19:23:52 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1c35bc9

sys-devel/bmake: Bump to 20210110

Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 sys-devel/bmake/Manifest                         |  1 +
 sys-devel/bmake/bmake-20210110.ebuild            | 50 ++++++++++++++++++++++++
 sys-devel/bmake/files/bmake-20210110-tests.patch | 26 ++++++++++++
 3 files changed, 77 insertions(+)

diff --git a/sys-devel/bmake/Manifest b/sys-devel/bmake/Manifest
index 0e18157b7f7..10644e10ac6 100644
--- a/sys-devel/bmake/Manifest
+++ b/sys-devel/bmake/Manifest
@@ -1,4 +1,5 @@
 DIST bmake-20200318.tar.gz 572827 BLAKE2B 
f10c6f3e87497508e26154acb3e8a07b78daeba083228478023443b5ccaf540385c1d594fb968ed1fe9ccad30680e7c527db48fc3787c01930f62f88f1fb6699
 SHA512 
a405226e8f4a9a985ed00dc359390da7890d70f8a7b7e134db05da34ebc3c6ee2373497a9e44e0d75bb64edd81f860fd0cc204bdf7f392dd4e9d2e6a5fe9e507
 DIST bmake-20201117.tar.gz 696371 BLAKE2B 
e92568e844d74f1ace157d68ea029c7a999351b18c3afab50ab584abb8c41691dee5fe4f2e1fd7936103cbbabe33dbbd6c7b2b0af2e0cc199dbb83150b237f8c
 SHA512 
b78e6f6276032fe68a67196d18b6786556b1079109998b1c9a585a9d58e9245294ee01b3b787329a04e7f024fa72763c109351a8da9ec09f8bf8407393758588
 DIST bmake-20201222.tar.gz 727973 BLAKE2B 
cd093418c646e6b15e47f08c3c8e6a5daa5db2c9a1f76b4e8d639e0a50444ad518836585af7381bb2952309dd82716046a85e42121180133c9ccd546963a7748
 SHA512 
ddf1152adf99b350ae1ff1dd473319cd7c277c696f29b3ccba9080ecb9da0013f334b183c46a6e0a34708071a8f4f89d813264436e1946ebdc1923e6fe7440d9
+DIST bmake-20210110.tar.gz 735461 BLAKE2B 
e12882507bff3b47e4531519437e5e3c8fd0628edf8cbf7ca82b2e96745a767bead62f9a61bf3b99c1757803e29dfe757e0b2a48e2a2275a1ceaef1c63db9e24
 SHA512 
5b68b806a32a068e54d2a79796e99c189a6a5236c9596d5ebc9d0bbfa3454e975005c751a9e15eb077a8dc8e236630a900ecf5bee7674b3139d2b82a76c5a1e9
 DIST mk-20191111.tar.gz 102361 BLAKE2B 
6a542c41e2a2153bd3c812aa9bcdc78a47bf2e9121835279afa2e57ec9cdd44f72a1cd7b48a7647d56b0586c547656f45359821cd2013c5a90532568e12086b5
 SHA512 
4a3e2344e7ada0666bcb147fcd4627030ba9b928acab6876215c8529b23909be4ced802bea177b078a6b4457370d2d0070114c0d69979622274be74336778861

diff --git a/sys-devel/bmake/bmake-20210110.ebuild 
b/sys-devel/bmake/bmake-20210110.ebuild
new file mode 100644
index 00000000000..547f81f91f6
--- /dev/null
+++ b/sys-devel/bmake/bmake-20210110.ebuild
@@ -0,0 +1,50 @@
+# 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}"/${P}-tests.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/files/bmake-20210110-tests.patch 
b/sys-devel/bmake/files/bmake-20210110-tests.patch
new file mode 100644
index 00000000000..1557ef85bef
--- /dev/null
+++ b/sys-devel/bmake/files/bmake-20210110-tests.patch
@@ -0,0 +1,26 @@
+--- a/unit-tests/Makefile
++++ b/unit-tests/Makefile
+@@ -188,7 +188,6 @@ TESTS+=            dotwait
+ TESTS+=               envfirst
+ TESTS+=               error
+ TESTS+=               # escape        # broken by reverting POSIX changes
+-TESTS+=               export
+ TESTS+=               export-all
+ TESTS+=               export-env
+ TESTS+=               export-variants
+@@ -285,7 +284,6 @@ TESTS+=            sh-leading-plus
+ TESTS+=               sh-meta-chars
+ TESTS+=               sh-multi-line
+ TESTS+=               sh-single-line
+-TESTS+=               shell-csh
+ TESTS+=               shell-custom
+ .if exists(/bin/ksh)
+ TESTS+=               shell-ksh
+@@ -321,7 +319,6 @@ TESTS+=            var-op-append
+ TESTS+=               var-op-assign
+ TESTS+=               var-op-default
+ TESTS+=               var-op-expand
+-TESTS+=               var-op-shell
+ TESTS+=               var-op-sunsh
+ TESTS+=               var-recursive
+ TESTS+=               varcmd

Reply via email to