gentoo auto-resync : 12:02:2023 - 09:56:54

5 files changed, 93 insertions, 10 deletions

diff --git a/sys-apps/toybox/Manifest b/sys-apps/toybox/Manifest
index c059915a065a..2bf578b370ec 100644
--- a/sys-apps/toybox/Manifest
+++ b/sys-apps/toybox/Manifest
@@ -1,4 +1,7 @@
+AUX toybox-0.8.9-verbose-build-fix.patch 596 BLAKE2B 97d33f59307e95a2fffcee7f3be403af6bd699a116f00296662af7a9ce595ab2abed9f66a124b66ff88a989b0560e12e1315799468f352a7d533e5a320a7c7ed SHA512 db7256575a76813c90cb4ee50104899073cae0f8f5c12555f27c9294551c5e9839dd526ed2dac42de02f885ecc9e4982083d5917f25d0f4937552060dda372e5
 DIST toybox-0.8.8.tar.gz 3492750 BLAKE2B d53864e07392a511e4e861fcf5b0fdc8b43e5d82f13fb9eba62b850053aa547e0e057245062c34d4205019bba6223dff1a514b1bb0dde54734bcd3b1df82b122 SHA512 3ffe4de6b17770ad9c43f98f2c69a110f94e5a85da909f8f770bbc9abaff42a524237b4ffaaa8b9800c8d31f0a8b6d3521f03bfdd0d1260fa421ef2525a34290
-EBUILD toybox-0.8.8.ebuild 1093 BLAKE2B f99a814b9febaaaa0ce25393685f14111efa7441451b6ebbcaa05b22a36b87dba8fef3b5e13e71478e4d4bca4399a3702c5ee22e70cb5dfc6ecfd2bb7be24c56 SHA512 ca1e7701983b9d58b096724fb34420a35e444eb6c067dcc588d8194b4193f591d75731bcc6ceab4847db1c0f5c93fef397be0c33f6dc4ef53eb5851b305ab7fa
-EBUILD toybox-9999.ebuild 1107 BLAKE2B 358ed22338fb171dacc7188c253d2e2d420fb71a40b7e89fa2dc4d6bbe8826753ce427cf197190016027a85a8864f92cc49c9b039a927c28ee3c5914e179391b SHA512 4e01be739c890495cc1bfe74efbe6675842f56007010efbb3da2355de3b6fe9d875afb1cff93c8ac1375b116f03901777e65bb3fc4b40df797c122999d27f4c3
+DIST toybox-0.8.9.tar.gz 3517516 BLAKE2B 1c57fe43785c1925762de6d8c3af012d3726b18338b0543ce3c775fefdcf1121327c1486d28786e42aafa5b5e7208475d942a02099715b0cb751e79788326622 SHA512 73a3ec2a0d69b1566e1663e94b2bc7764b9f93e53978725f036f066837ab2769033e8bf17d5550e565656781cacf27d93960dd611ffed5425fa006d1d3104351
+EBUILD toybox-0.8.8.ebuild 1094 BLAKE2B 8da6b9001b651c2db1f7ae75bec8c360b99dd168beeafe16ccba6a8046ef3c7bbf20affd58e0211164021d2fd19dd5283c49fe5451863536e9140f686becfd7e SHA512 b7a561e33b059e08785007b8a03c5b89e9421492720f4a551b625b0d75e7104dd87c59f293e87161ee81edfcb231153cb88c3cca5f09122a44ef62685c40012c
+EBUILD toybox-0.8.9.ebuild 1157 BLAKE2B 63f3855063b4af38f22c6ee0a738e23e610c09d7ca0ec3fd07bddecefb957ad274325495b8f71bc68d7f9c0d83e05da537f90ccd81886cee6a2cd1795d556b3a SHA512 5901a63e8b79f64dea89ae4f76b389178c8ffc8f59bff660c80cfc295610180d6597e5fea1465368a86a37be6ca19f2ad1a6f9b81e75d56dab8cb69e7a8edf22
+EBUILD toybox-9999.ebuild 1100 BLAKE2B eeffd33afc882ec6011712f3abe7459009aa89d2534b539e6184fefb64a073431420731133c612ac199b5c03a38ed7ac5073d6b32431959f6bc645b94488d2b3 SHA512 8a72fcd031657c17baa7d92aadb1b7702150406318fb9b8564ea931a135d74cd321d80c39a117c74bd1ca7188eeffe77b3f89a189538dd564b15cb1f37d1fd5d
 MISC metadata.xml 337 BLAKE2B 04ab7063fa6daade79c6b5d854037e293c0e3806daa944612c6bfdecab8fc6eafa44b2f8733b564f7e8ac31ca80600d7d4d46ba286f77c5ad3bb10b1355e0f76 SHA512 0d19951758b228c339f8f47bddc9191be38f08416be86ea4130603271abc91b13f780a947348e012585847a233cb5e34e57e0a73de183362656fc7869bf528f1
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.8.ebuild b/sys-apps/toybox/toybox-0.8.8.ebuild
index 01a70f0ff7e1..917c870334f9 100644
--- a/sys-apps/toybox/toybox-0.8.8.ebuild
+++ b/sys-apps/toybox/toybox-0.8.8.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=7
@@ -49,7 +49,7 @@ src_compile() {
 }
 
 src_test() {
-	emake test
+	emake tests
 }
 
 src_install() {
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..2d47626cc148
--- /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 tests
+}
+
+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..35f861185918 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"
@@ -45,14 +45,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 tests
 }
 
 src_install() {
 	save_config .config
-	newbin generated/unstripped/toybox toybox
+	dobin toybox
 }