3 files changed, 65 insertions, 8 deletions
diff --git a/sys-apps/toybox/Manifest b/sys-apps/toybox/Manifest
index d61d193e2300..8e4bd6048634 100644
--- a/sys-apps/toybox/Manifest
+++ b/sys-apps/toybox/Manifest
@@ -1,8 +1,10 @@
 DIST toybox-0.8.0.tar.gz 975002 BLAKE2B e137c3616d2affaf8b6f234cab49190b98540fe8f954244172f9ca80c749069f85ff8addd94e1018d3680f1a307df54671ee9b01726c5279f340f8fee3669609 SHA512 aeb15a02782cc0b3b46a892e2d82834e5172a7da04e2498eaefec58221305dd24a86aada5ce05978bd4694895ffeb94ae980fd767f4ee00c499b3dd518fd3e20
 DIST toybox-0.8.1.tar.gz 1015363 BLAKE2B a765a133910b7c8d903a1fa95338b8dee1267c3b7430267d47c4157d966256d16c615500acc38428296b9612649fafdaa111a149df7415ac580c01cfdd361025 SHA512 22f91046c75f986e44927ec89feab6c6afa1f614e5b0eae73e43f6ccd5c4328991ad283858fb1a5cb4d697806f38b8ab81782c160860a2c34ecbef3885636d5e
 DIST toybox-0.8.3.tar.gz 1098057 BLAKE2B d962c4fd1c79229ace5a0836b6170e3ce8a5435df660b5306f5dd0aab32f4509b5c3cf5cc87eea597d336c7cdd51ca4895cadd420febeb9ef9270e85909f8dec SHA512 e2c5a22547cbd85bfee84c4aed3016895e4e0eba9b6f3dfc6cdfa0a0d59dfd74203a35389dcd0b2c557dd04eebbb051f9a458762af3abb32b473bd8924ed7b74
+DIST toybox-0.8.4.tar.gz 1133770 BLAKE2B adc695c2ddd592b9de7137db623621410afaa4cdf2dfde647f24f25d38de99ad38907b5e5aa2ded0d6b2eceafc71763a25e04abc33e8f057934fceed6df22e69 SHA512 507604f96ee89094ca7b4b218985659a8de41578d1a4f267c7282baf11306419e94bb4bfcb06835dff3e46f974a0bb49f89e4c427c69c590738a4a37b62969b8
 EBUILD toybox-0.8.0.ebuild 1150 BLAKE2B 60afaa318851dcdf112b5e46a5963f539e095444f53f4ab9d9645a1ebac53b4cc78ff0eafa54b6dc413590c7e2ea21dbebbb8dd373c4d0d560b60d00e8869075 SHA512 0d0402203c6f292dbc1ea35fbde8a3bb37f3b5ea217c93d33a6865332be020bd4b1dbe376638a2531ef6b1bc65d9c83fcf57a35fb7518242d6b31c8ea82ec9ba
 EBUILD toybox-0.8.1.ebuild 1152 BLAKE2B 5085537d8d99a88301e9a1d4cb835d88207fb584a23ca38abdb3c00c459ba37a669f83c98c838fafbcdc73695c7060abfc08bca49a0c56959a2c070a88d4a310 SHA512 b52bd51a23f1e413abbb8f4e07e4d116f024e7113f0fa78c53788896322d448820f80de74db5fbd267204c4d6e1ee0c3e96b07db568ccddf9b969a0851d36c18
 EBUILD toybox-0.8.3.ebuild 1152 BLAKE2B 69e582a35a852a026721e245e63e4cd48b3ceea36d2c3e412aac8bc31b3372b439668b3eb2343a8eac1eeaa5c526aa8f486ff4459cc68eee7c9edd5cb5abd338 SHA512 2f4f3619467b6b1fed69666d63dc43824fbab1e25e0fd2ffb179deb7d366852674a4ec84de5f40c7f2812d3afd0b5e78142de7baf6b3ae6bff0b08833b302df7
-EBUILD toybox-9999.ebuild 1152 BLAKE2B e8687d50b6363eb7f58e1c5dcc08fc2121dc7870e71b67d8b309316134a7f08b60469b3673109f78449e026191aa265f12b6a299482344ffea25e96f65216572 SHA512 0d3ab83fe880a38388b8d9e88e9688bf82247790792f3e22bf7f25aaf7c19552022e6f260cf1e4f5dc53a4d32a302805c3fcb9c11273620cbc49e405a8427936
+EBUILD toybox-0.8.4.ebuild 1154 BLAKE2B 1eeb73e01ab5428395dbfd2e78c943c02e994a27e3be0342c1620f8f5a60ff7a3142a8e5e42a9df7a06044dd51e1b42d22193d1d0026e371332805d2260f77c7 SHA512 8a3b37c51d1c27c1e63f1b5f45afdd91f711772bcc07134a05c6ee61c0fe6c200a4f4dd0c25aabd586bd5fee60ab7f078cd279fc328cb44ac3654d850ca6bd05
+EBUILD toybox-9999.ebuild 1154 BLAKE2B 1eeb73e01ab5428395dbfd2e78c943c02e994a27e3be0342c1620f8f5a60ff7a3142a8e5e42a9df7a06044dd51e1b42d22193d1d0026e371332805d2260f77c7 SHA512 8a3b37c51d1c27c1e63f1b5f45afdd91f711772bcc07134a05c6ee61c0fe6c200a4f4dd0c25aabd586bd5fee60ab7f078cd279fc328cb44ac3654d850ca6bd05
 MISC metadata.xml 253 BLAKE2B 7dac7f77dcc8de31f439cc6d7770a503f95be9c2f8ae57df9e725df941e2b31a90a43664a485a5fad9510b9ae060ba7aaaddba29324338dd9eb07d88a63c7dce SHA512 303268e1f46e337e32c64b544c0962ecbe8de1799c42736b3c3515b6f31954a655830c402317bd0534cac12059e17eeb5f360d010432dff795a136662a5c10f1
diff --git a/sys-apps/toybox/toybox-0.8.4.ebuild b/sys-apps/toybox/toybox-0.8.4.ebuild
new file mode 100644
index 000000000000..5b1788940a17
--- /dev/null
+++ b/sys-apps/toybox/toybox-0.8.4.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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 ~x86"
+fi
+
+DESCRIPTION="Common linux commands in a multicall binary"
+HOMEPAGE="https://landley.net/code/toybox/"
+
+# The source code does not explicitly say that it's BSD, but the author has repeatedly said it
+LICENSE="BSD-2"
+SLOT="0"
+
+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
+}
+
+src_test() {
+	emake test
+}
+
+src_install() {
+	save_config .config
+	newbin generated/unstripped/toybox toybox
+}
diff --git a/sys-apps/toybox/toybox-9999.ebuild b/sys-apps/toybox/toybox-9999.ebuild
index 68a184db8ebe..5b1788940a17 100644
--- a/sys-apps/toybox/toybox-9999.ebuild
+++ b/sys-apps/toybox/toybox-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=7
 
 inherit multiprocessing savedconfig toolchain-funcs
 
@@ -13,16 +13,12 @@ else
 	KEYWORDS="~amd64 ~x86"
 fi
 
-# makefile is stupid
-RESTRICT="test"
-
 DESCRIPTION="Common linux commands in a multicall binary"
 HOMEPAGE="https://landley.net/code/toybox/"
 
 # The source code does not explicitly say that it's BSD, but the author has repeatedly said it
 LICENSE="BSD-2"
 SLOT="0"
-IUSE=""
 
 src_prepare() {
 	default
@@ -32,7 +28,10 @@ src_prepare() {
 src_configure() {
 	tc-export CC STRIP
 	export HOSTCC="$(tc-getBUILD_CC)"
-	if [ -f .config ]; then
+	# Respect CFLAGS
+	export OPTIMIZE="${CFLAGS}"
+
+	if [[ -f .config ]]; then
 		yes "" | emake -j1 oldconfig > /dev/null
 		return 0
 	else