sys-apps/toybox: add 0.8.9

Closes: https://bugs.gentoo.org/874825
Signed-off-by: Sam James <sam@gentoo.org>

4 files changed, 91 insertions, 6 deletions

diff --git a/sys-apps/toybox/Manifest b/sys-apps/toybox/Manifest
index ba6f861052d8..20175538592d 100644
--- a/sys-apps/toybox/Manifest
+++ b/sys-apps/toybox/Manifest
@@ -1 +1,2 @@
 DIST toybox-0.8.8.tar.gz 3492750 BLAKE2B d53864e07392a511e4e861fcf5b0fdc8b43e5d82f13fb9eba62b850053aa547e0e057245062c34d4205019bba6223dff1a514b1bb0dde54734bcd3b1df82b122 SHA512 3ffe4de6b17770ad9c43f98f2c69a110f94e5a85da909f8f770bbc9abaff42a524237b4ffaaa8b9800c8d31f0a8b6d3521f03bfdd0d1260fa421ef2525a34290
+DIST toybox-0.8.9.tar.gz 3517516 BLAKE2B 1c57fe43785c1925762de6d8c3af012d3726b18338b0543ce3c775fefdcf1121327c1486d28786e42aafa5b5e7208475d942a02099715b0cb751e79788326622 SHA512 73a3ec2a0d69b1566e1663e94b2bc7764b9f93e53978725f036f066837ab2769033e8bf17d5550e565656781cacf27d93960dd611ffed5425fa006d1d3104351
diff --git a/sys-apps/toybox/files/toybox-0.8.9-verbose-build-fix.patch b/sys-apps/toybox/files/toybox-0.8.9-verbose-build-fix.patch
new file mode 100644
index 000000000000..d629ffddfe28
--- /dev/null
+++ b/sys-apps/toybox/files/toybox-0.8.9-verbose-build-fix.patch
@@ -0,0 +1,18 @@
+https://github.com/landley/toybox/commit/c5e7495fe46d4b2b2c225f222efc6b9070de2c3a
+
+From c5e7495fe46d4b2b2c225f222efc6b9070de2c3a Mon Sep 17 00:00:00 2001
+From: Rob Landley <rob@landley.net>
+Date: Fri, 13 Jan 2023 11:50:58 -0600
+Subject: [PATCH] Ensure make wrapper sees success return code in verbose mode
+ (V=1)
+
+--- a/scripts/make.sh
++++ b/scripts/make.sh
+@@ -303,4 +303,5 @@ fi
+ # multiplexer binary via truncate-and-write through a symlink.
+ do_loudly chmod 555 "$OUTNAME" || exit 1
+ 
+-[ -z "$V" ] && echo >&2
++# Ensure make wrapper sees success return code
++[ -z "$V" ] && echo >&2 || true
+
diff --git a/sys-apps/toybox/toybox-0.8.9.ebuild b/sys-apps/toybox/toybox-0.8.9.ebuild
new file mode 100644
index 000000000000..d890b64c89af
--- /dev/null
+++ b/sys-apps/toybox/toybox-0.8.9.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multiprocessing savedconfig toolchain-funcs
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/landley/toybox.git"
+else
+	SRC_URI="https://landley.net/code/toybox/downloads/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+DESCRIPTION="Common linux commands in a multicall binary"
+HOMEPAGE="https://landley.net/code/toybox/"
+
+LICENSE="0BSD"
+SLOT="0"
+
+DEPEND="virtual/libcrypt:="
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-verbose-build-fix.patch
+)
+
+src_prepare() {
+	default
+	restore_config .config
+}
+
+src_configure() {
+	tc-export CC STRIP
+	export HOSTCC="$(tc-getBUILD_CC)"
+	# Respect CFLAGS
+	export OPTIMIZE="${CFLAGS}"
+
+	if [[ -f .config ]]; then
+		yes "" | emake -j1 oldconfig > /dev/null
+		return 0
+	else
+		einfo "Could not locate user configfile, so we will save a default one"
+		emake -j1 defconfig > /dev/null
+	fi
+}
+
+src_compile() {
+	unset CROSS_COMPILE
+	export CPUS=$(makeopts_jobs)
+	emake V=1 NOSTRIP=1
+}
+
+src_test() {
+	emake V=1 test
+}
+
+src_install() {
+	save_config .config
+	dobin toybox
+}
diff --git a/sys-apps/toybox/toybox-9999.ebuild b/sys-apps/toybox/toybox-9999.ebuild
index 888ca615d7a4..d890b64c89af 100644
--- a/sys-apps/toybox/toybox-9999.ebuild
+++ b/sys-apps/toybox/toybox-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit multiprocessing savedconfig toolchain-funcs
 
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/landley/toybox.git"
 else
 	SRC_URI="https://landley.net/code/toybox/downloads/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm64 ~x86"
 fi
 
 DESCRIPTION="Common linux commands in a multicall binary"
@@ -22,6 +22,10 @@ SLOT="0"
 DEPEND="virtual/libcrypt:="
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-verbose-build-fix.patch
+)
+
 src_prepare() {
 	default
 	restore_config .config
@@ -45,14 +49,14 @@ src_configure() {
 src_compile() {
 	unset CROSS_COMPILE
 	export CPUS=$(makeopts_jobs)
-	emake V=1
+	emake V=1 NOSTRIP=1
 }
 
 src_test() {
-	emake test
+	emake V=1 test
 }
 
 src_install() {
 	save_config .config
-	newbin generated/unstripped/toybox toybox
+	dobin toybox
 }