Version bump

Package-Manager: portage-2.2.6/cvs/Linux x86_64
Manifest-Sign-Key: 0xC2BA7F3C!

4 files changed, 166 insertions, 17 deletions

diff --git a/dev-embedded/u-boot-tools/ChangeLog b/dev-embedded/u-boot-tools/ChangeLog
index fc6f06fac16a..1dc39828d558 100644
--- a/dev-embedded/u-boot-tools/ChangeLog
+++ b/dev-embedded/u-boot-tools/ChangeLog
@@ -1,6 +1,12 @@
 # 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.30 2012/11/10 07:13:49 vapier Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/u-boot-tools/ChangeLog,v 1.31 2013/09/27 21:49:31 hwoarang Exp $
+
+*u-boot-tools-2013.07 (27 Sep 2013)
+
+  27 Sep 2013; Markos Chandras <hwoarang@gentoo.org>
+  +files/u-boot-no-config.h.patch, +u-boot-tools-2013.07.ebuild:
+  Version bump
 
   10 Nov 2012; Mike Frysinger <vapier@gentoo.org> u-boot-tools-2012.10.ebuild:
   Clean up build.
diff --git a/dev-embedded/u-boot-tools/Manifest b/dev-embedded/u-boot-tools/Manifest
index c2e3782bdad1..12955adb7bf8 100644
--- a/dev-embedded/u-boot-tools/Manifest
+++ b/dev-embedded/u-boot-tools/Manifest
@@ -1,26 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX u-boot-no-config.h.patch 2909 SHA256 a0a862b536d23b2fb110e48d0b7c8ad8e81dfaf50b5952485df490db4ec5a986 SHA512 ddd42863ea74918915846c7b1e561807904875860a33348e72458be85d86fa040ad9b44155de631b0b6731a16660defc88ef712b4ab94484c92d6535fbd76535 WHIRLPOOL 7340f72f16c4dfca164335dc4ccd733b11686962b3bfd8fd8669b20166351d1906885ba7bd2bc8b19210621715fd6b2a6fd7f42fa4e272e4b52bbbae780ec5aa
 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
+DIST u-boot-2013.07.tar.bz2 10067674 SHA256 2bbd440c1b29928d230604eac372fda5152d3ae23f52b1910c77fc5bf531250b SHA512 5c0725c9c5c7c9101d7ef8eb659aafb513ca5742fbafec55e0b64cd68b3e37520de55f71aebba59bf979b8daef2b0c71645b5ab343b7057d601b3cd6ffc6e763 WHIRLPOOL 41f1a78b6f7af206bb2a6c04be23ad1aceaa4a105ede4794b4a9d6777e3e92ae2014906be30c749cae51ea9d865f7e565185d9baaa0e953b01a053b62621ad66
 EBUILD u-boot-tools-2011.12.ebuild 968 SHA256 aa393fcee05d9569799d5fe738a9a93ccf23dc26321339220e085bbb78a12d37 SHA512 4c9f64a548e0c75bc4df592b4612ba8d3481796098ca5f9b7a969a32702de80db0079306a3e35640600cd71b4175bc82db0de5d9e366338b2f96dec5d9a09296 WHIRLPOOL 7ab790d485fd647d37844ca411e949849452409044862bc8581b5f24f52bd2f299d01d5204b609f4b84f84be277de77df00b6ac44a73968f9c9fbb92f9e479f7
 EBUILD u-boot-tools-2012.10.ebuild 1194 SHA256 0b405af61002bac11df09da78f3c8dae16b18beb13983424fc442799ddff40aa SHA512 3d4f5241d71465419c09ee72d191bdd5376307faa26df8a0a1963bd7aad38bb6c6d1138c80d7cac5488b083914fb684a9e26aac9358dad6d901c0687201399eb WHIRLPOOL 93690c18975e182ad8c1be7ce1c48b41fe751cfc1f431bd59fae82ad958dff6725bd5ec45b251fd1359b5d2dcf9df23169c5b5799e076836759b517f5b0387b3
-MISC ChangeLog 4687 SHA256 bcb20ad7b0844e9b0ac18b03809439c1008ccca2144950307abea61fb054d8d1 SHA512 15b66a6cd491a4473aeadfbed4da30b61c0d90ee034fd2632abd939143a086ec704217ff939cbe9b871bad1b6f1c26d70cfd85cadc2b949a0639aa8e7f378534 WHIRLPOOL bec16709b2296b27fb30eecb00585e0020d037bf6a733becef7cfcb2ea7ccef29fab774679bac328cfc67d7fea422fa6e04362bf6c0af6820f4e48f941a1df55
+EBUILD u-boot-tools-2013.07.ebuild 1144 SHA256 38e81cffb9a359b57a24efd49ef0d57da78dcc9ff5b8f4952e623117a0698e3c SHA512 8ddc75003fa8e35c51a2c901849081f1dc0fa698a38c217476798e52f7ad046c80b88574a49fa76a708709174404a9679a2e92a4530ba1fd8bba436fcdd9aaea WHIRLPOOL 335ec3afea57ded685919b302ea9cdf86d82a66e5e725be0aa68c8b3c3bf4e8fef435c00a93ff1d0ad062b704e6747f087e655c96c1a90b98df1d9ada7f67f66
+MISC ChangeLog 4860 SHA256 219b2248325c5b685808191ca16c916ccae7aa6b61857d889d426487d4836219 SHA512 95723b495667fc156f94e130c03b61870ad9b148f8357bdd470cf0acb41dc663c7dba0326b29bf16a4c9d2ca969b58e8030d182b0854dc85e08dbb1caf27b0dd WHIRLPOOL 7a6f10c3d27f68cc3a20f11464b2cd78627d75f5b174146dfa1ea582a2e3f363fb4f3b97fc1ddf635021d60df4ddc17b28c26577066ec7bea472e72c8a86f24f
 MISC metadata.xml 165 SHA256 fb7ede94a0633f77d601e3e81580eac1624a3bca14401a49d94082579507ba0a SHA512 2be6b57c8e55824d56afbe9ab641639e6e1b4cf73bf2795c2778e373777ad545b5211e06510f13703583e7bb18817f623bc00dddbc8c52ad5f100f085e5dfddf WHIRLPOOL 7fe27fc76b523efadbe65a61c187e78592bc1563423791709914a6263c587a8843c75e19c64f989c7fc8a105c6433a874116ec670df3a27b930634d7e14fb1fe
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.21 (GNU/Linux)
 
-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
+iQJ8BAEBCABmBQJSRf0fXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
+OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88rFsP/0UGVMRjlW3Unhg6yriJwWY0
+X97pDkildaWjD3BT+WwUfczpPgM5EdE+F/56BTJVj4IuBYQbBaJPJiE8JKTc3f5p
+FVboBspUIutqop9CYt2zGbazXF9l1SSNJwXLjkaoYNBCI1CWJT0laNTR3GHnQCCl
+eC4xISfCYEAMTEyv0j+UVqC0w5cUsRSl6gfcuO6pKLTAKP4szsKqKSrCoSdTYXho
+/5PB+aeKSwjZR3M228f/Wqx6NS7IP9k1bhymA91JLmiy8U1Y/j0uIYiGK7gaXABd
+ll/jEUyxYgIZIy9QUfArqNT0UquefrcvdMDhACiZcZXEvalQGwWOpm60DoqeYWvH
+cp6LOT+7bRG5bF8pO86hFlf+i6X8XAz0Vxhta1nlfEn8Ym/KKeJOOZMrbikntYTN
+1SdAC0MAAzvZP1TYRCheHjWINGNcbnBv9Em6xcTg8b4edT2VUXwZBMaQsHX7AtZp
+H7JIwVX4EXrotbz6042QsDbFedZzBGYuN5R9jBNUHqPEwu+EBkczu0n5ggP1OqLc
+NRzpJlFs/Lxj1r7QY6lzkS5IRj2/8+BZgZrmmvauJzhaMmoTCJVKC1186mv7p+RC
+VYqia/8+3guXShV30f+AaRbXe+E/SwjiLjzCwT1BkUePS9gyx5noKskA5gaGhKGB
+AINlJ3oBrB0mk8lPyMnT
+=YMH/
 -----END PGP SIGNATURE-----
diff --git a/dev-embedded/u-boot-tools/files/u-boot-no-config.h.patch b/dev-embedded/u-boot-tools/files/u-boot-no-config.h.patch
new file mode 100644
index 000000000000..1009ab00f5b2
--- /dev/null
+++ b/dev-embedded/u-boot-tools/files/u-boot-no-config.h.patch
@@ -0,0 +1,92 @@
+This patch has been reverted later on by
+http://git.denx.de/?p=u-boot.git;a=commit;h=e3c52f2b8779469c843eb79282396f1a5ca3fef5
+
+but we still need it to build the tools without having to configure
+a full u-boot environment.
+
+Signed-off-by: Markos Chandras <hwoarang@gentoo.org>
+
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Sat, 10 Nov 2012 19:47:47 +0000 (+0000)
+Subject: fw_env: fix building w/out a config.h
+X-Git-Tag: v2013.01-rc3~19
+X-Git-Url: http://git.denx.de/?p=u-boot.git;a=commitdiff_plain;h=92ace272d06cec1d7f1533bb9edf914fb5845fba;hp=7a546db2ffc6a713fb8009d8246c29da5420f6a7
+
+fw_env: fix building w/out a config.h
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+Acked-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+
+diff --git a/tools/env/Makefile b/tools/env/Makefile
+index 0e798e0..e6dc5f3 100644
+--- a/tools/env/Makefile
++++ b/tools/env/Makefile
+@@ -26,7 +26,7 @@ include $(TOPDIR)/config.mk
+ HOSTSRCS := $(SRCTREE)/lib/crc32.c  fw_env.c  fw_env_main.c
+ HOSTSRCS += $(SRCTREE)/lib/ctype.c $(SRCTREE)/lib/linux_string.c
+ HOSTSRCS += $(SRCTREE)/common/env_attr.c $(SRCTREE)/common/env_flags.c
+-HEADERS	:= fw_env.h $(OBJTREE)/include/config.h
++HEADERS	:= fw_env.h
+ 
+ # Compile for a hosted environment on the target
+ HOSTCPPFLAGS  = -idirafter $(SRCTREE)/include \
+@@ -36,6 +36,15 @@ HOSTCPPFLAGS  = -idirafter $(SRCTREE)/include \
+ 		-DUSE_HOSTCC \
+ 		-DTEXT_BASE=$(TEXT_BASE)
+ 
++# Pass CONFIG_xxx settings via the command line so that we can build w/out
++# a config.h file existing in the first place.  Useful for generic builds.
++CONFIG_VARS_TO_PASS = \
++	ENV_OVERWRITE \
++	OVERWRITE_ETHADDR_ONCE \
++	ETHADDR
++HOSTCPPFLAGS += \
++	$(foreach x,$(CONFIG_VARS_TO_PASS),$(if $(CONFIG_$(x)),-DCONFIG_$(x)=$(CONFIG_$(x))))
++
+ ifeq ($(MTD_VERSION),old)
+ HOSTCPPFLAGS += -DMTD_OLD
+ endif
+diff --git a/tools/env/fw_env.h b/tools/env/fw_env.h
+index a1a6807..19703c7 100644
+--- a/tools/env/fw_env.h
++++ b/tools/env/fw_env.h
+@@ -21,15 +21,6 @@
+  * MA 02111-1307 USA
+  */
+ 
+-/* Pull in the current config to define the default environment */
+-#ifndef __ASSEMBLY__
+-#define __ASSEMBLY__ /* get only #defines from config.h */
+-#include <config.h>
+-#undef	__ASSEMBLY__
+-#else
+-#include <config.h>
+-#endif
+-
+ /*
+  * To build the utility with the static configuration
+  * comment out the next line.
+@@ -52,22 +43,6 @@
+ #define DEVICE2_ENVSECTORS     2
+ #endif
+ 
+-#ifndef CONFIG_BAUDRATE
+-#define CONFIG_BAUDRATE		115200
+-#endif
+-
+-#ifndef CONFIG_BOOTDELAY
+-#define CONFIG_BOOTDELAY	5	/* autoboot after 5 seconds	*/
+-#endif
+-
+-#ifndef CONFIG_BOOTCOMMAND
+-#define CONFIG_BOOTCOMMAND							\
+-	"bootp; "								\
+-	"setenv bootargs root=/dev/nfs nfsroot=${serverip}:${rootpath} "	\
+-	"ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off; "	\
+-	"bootm"
+-#endif
+-
+ extern int   fw_printenv(int argc, char *argv[]);
+ extern char *fw_getenv  (char *name);
+ extern int fw_setenv  (int argc, char *argv[]);
diff --git a/dev-embedded/u-boot-tools/u-boot-tools-2013.07.ebuild b/dev-embedded/u-boot-tools/u-boot-tools-2013.07.ebuild
new file mode 100644
index 000000000000..2a8efc245798
--- /dev/null
+++ b/dev-embedded/u-boot-tools/u-boot-tools-2013.07.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2013 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-2013.07.ebuild,v 1.1 2013/09/27 21:49:31 hwoarang Exp $
+
+EAPI="5"
+
+inherit eutils toolchain-funcs
+
+MY_P="u-boot-${PV/_/-}"
+DESCRIPTION="utilities for working with Das U-Boot"
+HOMEPAGE="http://www.denx.de/wiki/U-Boot/WebHome"
+SRC_URI="ftp://ftp.denx.de/pub/u-boot/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	sed -i -e "s:-g ::" tools/Makefile || die
+	# Make sure we find local u-boot headers first #429302
+	ln -s ../include/image.h tools/ || die
+	epatch "${FILESDIR}"/u-boot-no-config.h.patch
+}
+
+src_compile() {
+	emake \
+		HOSTSTRIP=: \
+		HOSTCC="$(tc-getCC)" \
+		HOSTCFLAGS="${CFLAGS} ${CPPFLAGS}"' $(HOSTCPPFLAGS)' \
+		HOSTLDFLAGS="${LDFLAGS}" \
+		CONFIG_ENV_OVERWRITE=y \
+		tools-all
+}
+
+src_install() {
+	cd tools
+	dobin bmp_logo gen_eth_addr img2srec mkimage
+	dobin easylogo/easylogo
+	dobin env/fw_printenv
+	dosym fw_printenv /usr/bin/fw_setenv
+	insinto /etc
+	doins env/fw_env.config
+}