A few build fixes, including cross-compile support.

Package-Manager: portage-2.2.14_rc1/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

4 files changed, 68 insertions, 22 deletions

diff --git a/sys-apps/toybox/ChangeLog b/sys-apps/toybox/ChangeLog
index 227ecd68fd7b..9e2ec6d0ffad 100644
--- a/sys-apps/toybox/ChangeLog
+++ b/sys-apps/toybox/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/toybox
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/toybox/ChangeLog,v 1.5 2014/10/06 07:20:16 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/toybox/ChangeLog,v 1.6 2014/10/19 03:25:11 floppym Exp $
+
+  19 Oct 2014; Mike Gilbert <floppym@gentoo.org> toybox-0.5.0.ebuild,
+  toybox-9999.ebuild:
+  A few build fixes, including cross-compile support.
 
 *toybox-0.5.0 (06 Oct 2014)
 
diff --git a/sys-apps/toybox/Manifest b/sys-apps/toybox/Manifest
index f7deb39d3838..5ec5c1c7bc14 100644
--- a/sys-apps/toybox/Manifest
+++ b/sys-apps/toybox/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST toybox-0.4.7.tar.bz2 464545 SHA256 56392d602c21a3c9e05f94a64e194ff6467cb8e98ee10c4735e9d659a42c66d1 SHA512 77fa2eb7775d2f9fda5053048f902b91597ca5f1898f1819dc4308b7f6d10b96a09979d4f9853345598d30cce5c773f441454c97472920fffe3abf1cb4234741 WHIRLPOOL 270b25188291d06fb490268aa9e3efa26fe6cb6ca2fd2d3fef43f40c3ecbc6bd69a6303f487ce29e2078c6fc24e71c09de5c8e1e4743bb597f7d02b6f62460f9
 DIST toybox-0.4.8.tar.bz2 492065 SHA256 44fedc94ad4666daecddb6df9082709d68c9ff5950c625215158875c87561be7 SHA512 4b82d0c85e7137c65e4d89dee247852e80e6d6917e5ed55a13a513cfa08a63bc815a1dd2eb685faecdd15ddd5c61dcc01578f49fadbf23db65a78a26acb1441e WHIRLPOOL b8386bd379322b30ad428bab2bb4a03bacb58e505021f19e97808e341e19f0b18146f36bf2c1caeb10f4db59743832f65d41a8fe703683bdbdf2f78125b20ded
 DIST toybox-0.4.9.tar.bz2 526704 SHA256 e6dc9052826a3bdae1923e3301c9e3542e890af5ed66534052943f8412255bff SHA512 e1788ecc5eaf8a92b05c6469c3aca2465eba6ca782df9479beb438e8f18a7dbc53c8533b47e95a792f1f803fde9f542ad216a214853a490c5a53a235b63e0a2c WHIRLPOOL 92422d0ab0493aabc2129ca2c397d0ff65a07f9d3aedf440622bdc02d5bdd30f0a713f0cf23bb5e10d30d5de46dfc5cdaaa561794b78afb31b5544383e072e4b
@@ -6,7 +9,14 @@ EBUILD toybox-0.4.7.ebuild 768 SHA256 4495f37bb605d62c6470abd1417c24de38dcbcbc5a
 EBUILD toybox-0.4.8.ebuild 766 SHA256 580b1e10795794aa6630e97ea4f90ea4b62053073853c9c4a8a526aef4ad334f SHA512 8c1059cd7bbe84cb032a5bed8aecbc727ce2c2ad9a7623ef41d5a38cfb061caf391be64b9f4b64f725e6b853743d6913535f3d8d44a3700bf49e70ce1e3b0518 WHIRLPOOL 07544c06dee3eb49dbac0623cb97724be2a154dd2334c61d94a8ba050a2783ae1271f10e62fb96b6b0d61d4cf8da172c73e1370479c6a5326a23e708bb794f2a
 EBUILD toybox-0.4.9-r1.ebuild 1142 SHA256 6c8cc6af690e9b8d387c3bbe6aaa83a5109257352440caf0ebd7bb6f02261c5f SHA512 0ff50cdc8837bf58ef617197a6ce399692058428fd74262e7f5903a42a2549208ce7f92d87853c4d3c48a9e25c4fb0acadb3a41137b9ff28b29b910d20cb107f WHIRLPOOL 779ec2167982dcff8b81353f5f64af67b8312d7a0b579d956af4ef97a77c50dffc6b13f4c688b7aecbc3b03b0c88caf0111635d9941a7a5972a3e440a0dfec10
 EBUILD toybox-0.4.9.ebuild 784 SHA256 0b6ad5cb4ae5ec548e50b4140a515383f150ee8d9b00fdcc6112762ec035f9de SHA512 701530fd12587c5d04b8929a213260b1d3a61ae6a7f124245d0f9ea14fb7ea9fa9a85034067778b3881f33d1dc0e9e9e6cc05c874176692336b35022b3342a78 WHIRLPOOL d4cc306886729aa63beb94e4434377d054e54d6ed3e6ae11094a115d6eaff8aa775812e3745bf61475370794abb9c8e4d8ae1fbc8383bfdba9018300341ef995
-EBUILD toybox-0.5.0.ebuild 1139 SHA256 d8852292f9da2220a528d7879aca7df6819b03d8ef83b15b4165c901cff897e2 SHA512 f0d4c2d177cab4e96a19649a5654fa0e626ebfa0f9dbaa31f49bbc56c416fff6a819a394d2b7b01aff96f7c4e7569ffbf5022e06b7044a5f21f713cf1d7eecf4 WHIRLPOOL eb6a8298ad1d0e19dfd38f0febc7514b3fbf70dd30c0f58c34846611d8efdbb56db666286b68d7f95054e7b38c304b8d1969e3d9edf42cdd56bff1ee428534f7
-EBUILD toybox-9999.ebuild 731 SHA256 dcc9647ce762a8fba403164632d00c68ff303e0634c32b0b366843285c166c24 SHA512 736df1ca68311e273af0e231544ad8c941099a3fa036416db6e39015de77a21978349e8ee8721cc4dd8a910b112518c04bd996621264337d497aef25b37fb9c7 WHIRLPOOL 2cb6f06d39b827e80c4b892fb0c447e94e05f4846246133c424b872b954791cb4954b2e7115dc6dc356d7db103cb19af8b5fe67eb84fd77d9afd56e5a3b191aa
-MISC ChangeLog 923 SHA256 79f96408a0e8e26e030e76cecac5c43f12c91413ad0c53ddeeeb20907ab96bcf SHA512 c7c4b9e2ca936d3e6307e8d8c58d0a0cde6ed4baa7b1900cb9464bf1c9b190d045436f181384120a8e5b9139e27e01431a83fcba52b9306cb564e0c9c5d2687c WHIRLPOOL 8fe23eb8c63cba4462c2bb33791ab0ca81b7d4df750507a06dd235686b2fc2d49774708c5025137ecfebd4eed44ba77ecd255e4c7c5bd59becd145f7834b4e02
+EBUILD toybox-0.5.0.ebuild 1255 SHA256 997c34d77bce019963b2f04f386efc6e67d86614ba4473a01db87a434c17cd3c SHA512 d59e675b2d1a71998a2da36d9cfb0915d7648340cdbf6cae2ec131d683391cdd146681f4b8fe406f42c7553b3b60a0330f0c0dda2e026b15585e5746528f2ed9 WHIRLPOOL 00a2dee3d5725625e7490d57406580fbc0279a4c4eb31fe043f97ed0c5be13ed3a0b9317f6696ada67b9fad20005007aea7b7c3fb801b1c345196951a31ed3f9
+EBUILD toybox-9999.ebuild 1254 SHA256 02cee88dedf0492a0a5c06a0bacebe37e327636a6b9140049fcc88e8f227616b SHA512 774bd65715bbbc3703e3cfa947f2e660612197c085519a46e8a711673cbe0d30121d49ee392ec36280671e49fd37ea8c8cbd2a626f83fbbd82eefbe6d9aad719 WHIRLPOOL 582fb3fb1558e24b896d37563dea0bd2494ff2190715a9610cecda3ebf9ce8eede9d3d5161109fdc14eb60afc3bf980cc9eabd05223a01f99b5a97fe108d80b6
+MISC ChangeLog 1070 SHA256 396870faa1e14813a2f07fc829f9b464caea1b22c8555694fd310a28c9605bc6 SHA512 254fb5f6b7b74ce9ffc0018acad22fc11558dce14fa605a40c85b8236f54caf8682be9006ff6b8070518f085058ffe3e6dbfd9bbaf091ffaa8916dd8c46cde05 WHIRLPOOL 15aa01b4ff06fe0daff589d21d5b06cc9841e9f40828936682b5496a82f1bd90046b0e7eed957524dfdacd297bc177212c4333bfe72a73554c7d52d3575dd845
 MISC metadata.xml 239 SHA256 57c79f6c1b1b06b8d90265f1cc0affe89b5548b63e811f0313bfb2a0a0aa201a SHA512 1898d4e8bb4f02ffdad555a095ee76f934bd6ee1f914564eac1932f0dd96f26a52f47047324ed0a81009516a84bf72e1b10922fa751f322abf17517f84f62156 WHIRLPOOL 7375ace29b0d9c7e945e141c09b70c79599780bc9d3478e59fbc85dc4330aeda6bf2bb54fde24d25feb181f88618e11e022a90674d1f26ff9ef692bd698ff754
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iF4EAREIAAYFAlRDLxgACgkQC77qH+pIQ6TnBwD/fcqSerS76HXWCro0IlOGI42m
+AU/eHXWjCusErmI6AWcBAKI9tPth41bzEnUM4tCHGwCXPj7vpVn6rflEUq4tek4d
+=nxHY
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/toybox/toybox-0.5.0.ebuild b/sys-apps/toybox/toybox-0.5.0.ebuild
index 6338a8ca5e5c..346166fb6599 100644
--- a/sys-apps/toybox/toybox-0.5.0.ebuild
+++ b/sys-apps/toybox/toybox-0.5.0.ebuild
@@ -1,29 +1,33 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/toybox/toybox-0.5.0.ebuild,v 1.1 2014/10/06 07:20:16 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/toybox/toybox-0.5.0.ebuild,v 1.2 2014/10/19 03:25:11 floppym Exp $
 
 EAPI=5
 
-inherit eutils savedconfig toolchain-funcs
+inherit eutils multiprocessing savedconfig toolchain-funcs
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/gfto/toybox.git"
+else
+	SRC_URI="http://landley.net/code/toybox/downloads/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+fi
 
 # makefile is stupid
 RESTRICT="test"
 
 DESCRIPTION="Common linux commands in a multicall binary"
 HOMEPAGE="http://landley.net/code/toybox/"
-SRC_URI="http://landley.net/code/toybox/downloads/${P}.tar.bz2"
 
 # The source code does not explicitly say that it's BSD, but the author has repeatedly said it
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
 IUSE=""
 
 src_prepare() {
-	sed -i -e 's/LOCALE/LC_ALL/' scripts/make.sh || die
+	epatch_user
 	restore_config .config
-	export CC="$(tc-getCC)"
-	export HOSTCC="$(tc-getCC)"
 }
 
 src_configure() {
@@ -31,13 +35,17 @@ src_configure() {
 		yes "" | emake -j1 oldconfig > /dev/null
 		return 0
 	else
-		ewarn "Could not locate user configfile, so we will save a default one"
+		einfo "Could not locate user configfile, so we will save a default one"
 		emake defconfig > /dev/null
 	fi
 }
 
 src_compile() {
-	emake toybox_unstripped V=1
+	tc-export CC STRIP
+	export HOSTCC=$(tc-getBUILD_CC)
+	unset CROSS_COMPILE
+	export CPUS=$(makeopts_jobs)
+	emake V=1
 }
 
 src_test() {
diff --git a/sys-apps/toybox/toybox-9999.ebuild b/sys-apps/toybox/toybox-9999.ebuild
index 32d8c4c261dc..e01965bdf473 100644
--- a/sys-apps/toybox/toybox-9999.ebuild
+++ b/sys-apps/toybox/toybox-9999.ebuild
@@ -1,34 +1,58 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/toybox/toybox-9999.ebuild,v 1.1 2014/04/01 04:09:36 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/toybox/toybox-9999.ebuild,v 1.2 2014/10/19 03:25:11 floppym Exp $
 
 EAPI=5
 
-inherit eutils git-r3
+inherit eutils multiprocessing savedconfig toolchain-funcs
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/gfto/toybox.git"
+else
+	SRC_URI="http://landley.net/code/toybox/downloads/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+# makefile is stupid
+RESTRICT="test"
 
 DESCRIPTION="Common linux commands in a multicall binary"
 HOMEPAGE="http://landley.net/code/toybox/"
-EGIT_REPO_URI="https://github.com/gfto/toybox.git"
 
 # The source code does not explicitly say that it's BSD, but the author has repeatedly said it
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS=""
 IUSE=""
 
+src_prepare() {
+	epatch_user
+	restore_config .config
+}
+
 src_configure() {
-	make defconfig || die
+	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 defconfig > /dev/null
+	fi
 }
 
 src_compile() {
-	emake || die
+	tc-export CC STRIP
+	export HOSTCC=$(tc-getBUILD_CC)
+	unset CROSS_COMPILE
+	export CPUS=$(makeopts_jobs)
+	emake V=1
 }
 
 src_test() {
-	emake test || die
+	emake test
 }
 
 src_install() {
-	mkdir -p "${D}/usr/bin"
-	cp toybox "${D}/usr/bin" || die
+	save_config .config
+	newbin toybox_unstripped toybox
 }