Clean up build.

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Manifest-Sign-Key: 0xFB7C4156

3 files changed, 27 insertions, 36 deletions

diff --git a/dev-embedded/u-boot-tools/ChangeLog b/dev-embedded/u-boot-tools/ChangeLog
index b7a1263264e7..fc6f06fac16a 100644
--- a/dev-embedded/u-boot-tools/ChangeLog
+++ b/dev-embedded/u-boot-tools/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-embedded/u-boot-tools
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/u-boot-tools/ChangeLog,v 1.29 2012/11/09 21:57:35 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/u-boot-tools/ChangeLog,v 1.30 2012/11/10 07:13:49 vapier Exp $
+
+  10 Nov 2012; Mike Frysinger <vapier@gentoo.org> u-boot-tools-2012.10.ebuild:
+  Clean up build.
 
   09 Nov 2012; Markos Chandras <hwoarang@gentoo.org>
   u-boot-tools-2012.10.ebuild:
diff --git a/dev-embedded/u-boot-tools/Manifest b/dev-embedded/u-boot-tools/Manifest
index c6a6808b20e0..c2e3782bdad1 100644
--- a/dev-embedded/u-boot-tools/Manifest
+++ b/dev-embedded/u-boot-tools/Manifest
@@ -4,23 +4,23 @@ Hash: SHA256
 DIST u-boot-2011.12.tar.bz2 8610390 SHA256 41820d65eb848411f71b9222957b3532607be0a754da916067876194148b907c SHA512 eb6df1153f215cd6fde7bba89ab9305a9904a0c2e4a8abb48151d269111d92e28f3e22553918b668b92e3b0049448ee511c07ab6269fec0c65c49dbdb91bbcd7 WHIRLPOOL e82226ec1b7b7a1fbb6351de0b18d3d804ccc319351d8cfa7ec9dbdec4948dbf0204fc70df51841bc65f487d44ba9e54d9cf3277b3b66dda85cbf0fcfb2caeef
 DIST u-boot-2012.10.tar.bz2 9449657 SHA256 dddec75070b5faa5df463085e3e1d27c6d058ec3481c666917baa961956d4d17 SHA512 026d17ce767f27dd282c91a626e6ff41cd6bcad375186732c8933956974d7412076ae28ef59263ed880055d4e8dbb20c09144b24d678fa3b9955b500f1c7e402 WHIRLPOOL 5e6a78cf65e904a5b082800cea8a511369296226812039409defdebf1e825823bf224b6b51447c839fe20edb61f42cf1703dff98f97ce9b553171c7ac72f44bf
 EBUILD u-boot-tools-2011.12.ebuild 968 SHA256 aa393fcee05d9569799d5fe738a9a93ccf23dc26321339220e085bbb78a12d37 SHA512 4c9f64a548e0c75bc4df592b4612ba8d3481796098ca5f9b7a969a32702de80db0079306a3e35640600cd71b4175bc82db0de5d9e366338b2f96dec5d9a09296 WHIRLPOOL 7ab790d485fd647d37844ca411e949849452409044862bc8581b5f24f52bd2f299d01d5204b609f4b84f84be277de77df00b6ac44a73968f9c9fbb92f9e479f7
-EBUILD u-boot-tools-2012.10.ebuild 1769 SHA256 975bc4b9ad250851f96f209955942da6423d63d4c068fc71a8417702d467a92d SHA512 2eb11004f01c3f7b36a96c15605cc25466fea97ca51209277411dfd61657df48198d93ce8b4f707522287f09aec584723a8c3a10a6894d3c9dff18e4007b25a9 WHIRLPOOL 884ed96d61e8fd757440c3e19c416199afe15ecccc176a8234df7b6cd912bbda0e77d14ed680838485eae8e8310e122bb06ad5ca852e97540ac38eab807ab672
-MISC ChangeLog 4591 SHA256 fdfc381b6a8070116e8ca4c55d6c4a889d2fe9135f27cdcdb40f98bd1cd9bf58 SHA512 11251156bc4e2f7f46f611ca374b4f4b5709bdf6c011e46c352060dfd523c5a19b90be6d3994fa04b020fee252c17c9cfcbc51dacb5aeb43927c4960b8a5060b WHIRLPOOL 8aa6c3f934dc5340aa3781813b16338f7322de8cd6813c7037345fb2f11a325f3e20948ba0bc8eaecfaf8d01308412656319b711fee6a568e00b73918707886f
+EBUILD u-boot-tools-2012.10.ebuild 1194 SHA256 0b405af61002bac11df09da78f3c8dae16b18beb13983424fc442799ddff40aa SHA512 3d4f5241d71465419c09ee72d191bdd5376307faa26df8a0a1963bd7aad38bb6c6d1138c80d7cac5488b083914fb684a9e26aac9358dad6d901c0687201399eb WHIRLPOOL 93690c18975e182ad8c1be7ce1c48b41fe751cfc1f431bd59fae82ad958dff6725bd5ec45b251fd1359b5d2dcf9df23169c5b5799e076836759b517f5b0387b3
+MISC ChangeLog 4687 SHA256 bcb20ad7b0844e9b0ac18b03809439c1008ccca2144950307abea61fb054d8d1 SHA512 15b66a6cd491a4473aeadfbed4da30b61c0d90ee034fd2632abd939143a086ec704217ff939cbe9b871bad1b6f1c26d70cfd85cadc2b949a0639aa8e7f378534 WHIRLPOOL bec16709b2296b27fb30eecb00585e0020d037bf6a733becef7cfcb2ea7ccef29fab774679bac328cfc67d7fea422fa6e04362bf6c0af6820f4e48f941a1df55
 MISC metadata.xml 165 SHA256 fb7ede94a0633f77d601e3e81580eac1624a3bca14401a49d94082579507ba0a SHA512 2be6b57c8e55824d56afbe9ab641639e6e1b4cf73bf2795c2778e373777ad545b5211e06510f13703583e7bb18817f623bc00dddbc8c52ad5f100f085e5dfddf WHIRLPOOL 7fe27fc76b523efadbe65a61c187e78592bc1563423791709914a6263c587a8843c75e19c64f989c7fc8a105c6433a874116ec670df3a27b930634d7e14fb1fe
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQnXxPAAoJEPqDWhW0r/LChZwQAIt7WqVuR5vZOLnewlZkdJpb
-fuXquIWdpjmf93X/KmUb8hXtFIjlodfr+LdaHk2KRMsHLNk5hwD7UyiM+UEVxi8Q
-CH1hs7e37NUkyxECEhuxq2is+rNGtCN7FFatpeDE8ChBDMRfSOvGCMXjdyK103if
-k5GWdnQl4hJoSnEdlx1oSPDcF5a2tkmule9ORJff7+9+59T3m55mKqnoG4Wp8Ox5
-rr3UXwX0aiyTQtdv4M1Fx+sQvYOjvvBlUBg75Y1nAkPG4z1SGHIyfh9fOLZzyhuH
-1Mq2yT6idOoXnwcZ63ZiERvRpfFJZqeqCSFgXcyUry4Bc8CtdSWNgW4HGqDxHN8s
-BFnNLDCSUJhSopt/6D17a2JFAoYWiqVuRNnbqrTJSJMgi6m5F1K1VUncy+vC1tsn
-DcUgOgYfjfPDviMGuKTRnQRP6emFCpWz6EuflZMFQ3yucbHI2MsDfE3hhfbLi7Th
-Ys1EWzBQYJc8MHmmTi2e2ji/jH1+DoLUslxUSwK7NahZxEqZFv2/evjuMSODV2lp
-6OVlfzCCWH16MLJogdM6h5VnbrZqtZSZJoWTUZd+GEa6w++Bm04YYP9HRiLonWLW
-m7kEXW/y/721Z5C7Fb4nzelQ7dYHBRXoBqS2xGl789QgR472Yv3xTupZyVyEMpbn
-xD7C85zYZPvvzdn+1Sku
-=fw6Z
+iQIcBAEBCAAGBQJQnf71AAoJELEHsLL7fEFWt8QP/2SdJsB1GmhJ8x9d+OGnoXbY
+2ib4laKVWDHz1r12gvRXCpU1/JJnWnHWseLxLaqaNSjyW5GYe+bq4EdfJiM/WIwg
+ic1OefpyfK2OoxYJ1iwjejlMa1iRgPTfsZGKtGT9tS4h7PYunEWsV4WL7a2izEto
+MvrMoDp/phDevFMq68MjBQIlIhLqjAC5Uvc4wfi/hGJ3tMSijXiNCzXVyZ8MVelN
+9Oc5TyVRoCHp8jcQZC8P7vMlvLir5u/AW4R4umyhK8HzC5v6uIsmyUdyq1/e6Mvl
+C4/C0iUkRaWo3Q6mKQsmvYUQQewwbrar0bImASy+O2ph6HlqS30GryVoWh6Bdb+K
+NVrvCx5dRuH03jfnPBYehHqx/qfi3KqKhAccVEZ/HhR0OvMzfQqL/H3xQCnpoDId
+VwZK4ai+trlpC3iLbCGKJ2yxrCr736e6VlHiGHWTrDwo/VRAnmMtEw2kYtrQCRqH
+Pa6SLTZqAV4/tyA3znaeT1dtw805IhQMYOiK3n4G8L6NlhvnfsnvUumX1zgnAFVv
+/GFI5E30wmFn0SG2yIHKFLcKECZHTH27MjhwYyss6O06RKWTRnR9/7qrSPcnYCfK
+Mtm0OA8QgSNDqAVqRSWTAq2XFCJLM5dzB1Lb43Adju3lVM6dlfet9lGHqHkc4kLi
+6UYUgQtlF/eQDptf8ll/
+=2Exh
 -----END PGP SIGNATURE-----
diff --git a/dev-embedded/u-boot-tools/u-boot-tools-2012.10.ebuild b/dev-embedded/u-boot-tools/u-boot-tools-2012.10.ebuild
index ce68ed79dbdb..1f61c7fd110f 100644
--- a/dev-embedded/u-boot-tools/u-boot-tools-2012.10.ebuild
+++ b/dev-embedded/u-boot-tools/u-boot-tools-2012.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/u-boot-tools/u-boot-tools-2012.10.ebuild,v 1.3 2012/11/09 21:57:35 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/u-boot-tools/u-boot-tools-2012.10.ebuild,v 1.4 2012/11/10 07:13:49 vapier Exp $
 
 EAPI="4"
 
@@ -20,36 +20,24 @@ S=${WORKDIR}/${MY_P}
 
 src_prepare() {
 	sed -i -e "s:-g ::" tools/Makefile || die
-	# We don't have a config.h as we are building
-	# for host and not for a board
-	sed -i -e "/config.h/d" tools/env/fw_env.c || die
-	# All this insanity is not required if there is no
-	# /usr/include/image.h installed
-	if [[ -e ${ROOT}/usr/include/image.h ]]; then
-		einfo "A image.h header is installed in /usr/include/"
-		einfo "Fixing u-boot files to use the local image.h header"
-		# FIXME: HACK. media-libs/lensfun installs image.h
-		# Copy local image.h to tools/ and common/ directory
-		cp include/image.h common/image.h || die
-		cp include/image.h tools/image.h || die
-		sed -i -e "s:<image.h>:\"image.h\":" common/image.c || die
-		# Fix headers so local copy is picked up first
-		grep -r "<image\.h>" tools/* | cut -d ":" -f 1 | \
-			xargs sed -i -e "s:<image.h>:\"image.h\":" || die
-	fi
+	# This has been fixed upstream after 2012.10
+	sed -i '/include.*config.h/d' tools/env/fw_env.[ch] || die
+	# Make sure we find local u-boot headers first #429302
+	ln -s ../include/image.h tools/ || die
 }
 
 src_compile() {
 	emake \
-		HOSTSTRIP=echo \
+		HOSTSTRIP=: \
 		HOSTCC="$(tc-getCC)" \
 		HOSTCFLAGS="${CFLAGS} ${CPPFLAGS}"' $(HOSTCPPFLAGS)' \
 		HOSTLDFLAGS="${LDFLAGS}" \
+		CONFIG_ENV_OVERWRITE=y \
 		tools-all
 }
 
 src_install() {
-	cd tools env
+	cd tools
 	dobin bmp_logo gen_eth_addr img2srec mkimage
 	dobin easylogo/easylogo
 	dobin env/fw_printenv