Add fix from upstream for missing symbols.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

5 files changed, 201 insertions, 5 deletions

diff --git a/sys-apps/dtc/ChangeLog b/sys-apps/dtc/ChangeLog
index 3105ec379357..fa5f2cc3f3f0 100644
--- a/sys-apps/dtc/ChangeLog
+++ b/sys-apps/dtc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/dtc
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dtc/ChangeLog,v 1.22 2015/05/01 06:08:05 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dtc/ChangeLog,v 1.23 2015/05/06 05:57:23 vapier Exp $
+
+*dtc-1.4.1-r1 (06 May 2015)
+
+  06 May 2015; Mike Frysinger <vapier@gentoo.org> +dtc-1.4.1-r1.ebuild,
+  +files/dtc-1.4.1-echo-n.patch, +files/dtc-1.4.1-missing-syms.patch:
+  Add fix from upstream for missing symbols.
 
   01 May 2015; Jeroen Roovers <jer@gentoo.org> dtc-1.4.1.ebuild:
   Stable for PPC64 (bug #535644).
diff --git a/sys-apps/dtc/Manifest b/sys-apps/dtc/Manifest
index 54153b5020de..cf7ed5db6977 100644
--- a/sys-apps/dtc/Manifest
+++ b/sys-apps/dtc/Manifest
@@ -2,20 +2,33 @@
 Hash: SHA256
 
 AUX dtc-1.3.0-fdtdump.patch 3074 SHA256 dcbb26c0eb7a6ced4fc58b9cd37be6ae9342636d21cf8141568703631e016f7f SHA512 6d7211c2444c484c0c4950b7bd1e1b0ee9da218b0ebafd2fce942a8cb28709d3324eac6422ec0dcce5a0ea44edfa7321ee0c7475508afbef2d0faeaf6b7d3b1c WHIRLPOOL 6f37be47a571e8480e8a7b24cc1b8f9a18000c5de95605b750d879d2485a082c1d78e9a453ee6874663d205811516561cf07b29e98f0f4c029f8942dae58e284
+AUX dtc-1.4.1-echo-n.patch 2169 SHA256 0577e72f0d9ad18bb3699a1033cd19824948146d625db4637cf6b3a0a29b32f3 SHA512 e481ed5489557dccbb31274bae2afc7798da79db63052db7e490b3428f04d01cf5661e8ce9794886a4669f5fbc783b8f5ac1993e34e9ae351a6e6207b10e4b2f WHIRLPOOL dfff36f3ef90ad8d03c33e86c25328646d935065ee24c6f473d4586aa8cd6dc64060ea92b038dbfe0ca9ec5f1f73b07cc48381436f1d9ed76d3b97fd97682f2f
+AUX dtc-1.4.1-missing-syms.patch 851 SHA256 668fccb537b1b26a51c85b6e6959f638abd3c0c68bc37bda5d2f05b608f71c94 SHA512 8217b73ea88f5e48ab4192074f6ce6dc21eebd1cef362fabee32fdd7a50951a2c55ea8d738e43d140763b93821b8f84dbe35c8871c6018a4d56191bb3f3e9ecb WHIRLPOOL 321ee4881411a787aa1cbcddaeb732e17d80b63394a5bf9dc0f2783ea975396b0114c9d1ccb0cee3918d9c7bebf64ed50f31a6f0b6f2294dc9bd842bfe6a142f
 DIST dtc-1.4.1.tar.xz 107920 SHA256 77992ad8eac7b68f553d0ba58e5b51604ac803d126196c99e3ae38aaae28bb94 SHA512 63df730e65f62b8c9648cfee5461809188f4198cbf98de25fbe5cb7f2f43c405266abb740501740f59847dc6faf0588bcbc734d08ae5430b05c2601e070d6d05 WHIRLPOOL 93e9ed26024e4650bb2de6323ea639a3e52622aa3891a9f9404959b600d2c1cbc633d18e30d3629ac54ae662e8c58a7d0ca7910a9b323cd8dd4ff6e43a3fdf67
 DIST dtc-v1.3.0.tgz 108540 SHA256 4da48956d812e221f68d1d538cd58ca8ed7412af4ab9ef42a702db9173c372fe SHA512 4506eb4c3eaccabbf6773a3b0cbf3b174560e5004cf8af9f88448ad1371d1c57d793f078b2bd99b63714df538e74d6dfe16f112bc8283d412b1026f5f5c8220e WHIRLPOOL 4e87da05024d94998999a5e0090f91e4af4a66937dc6d5deec9bf7dd320fd9e732d30ccb6195dd0ce924c0f3c817d6af4731761e08dbc0e365e85ad8719e7935
 DIST dtc-v1.4.0.tar.xz 105160 SHA256 6df33a5da65fd43e0bc265a6c99104ca2962a97cf2d78171ed10d68e546ce198 SHA512 d0021c27e3614776db72c3d84cf05b98b1c49e14991ce12db6a90e9ac7d8aa248064f071c7a3b5bc9a20e9b22f070187778faa49bb3a5d0916afdfd9a929b743 WHIRLPOOL 366dd030aeaf042a7b60c7f900befaac124799d2db02c272d513615e08b208de26ab678c2dc48187f52f19bc2d5bcdf9b5694521298122706726e11ddaaa2afe
 EBUILD dtc-1.3.0-r1.ebuild 1172 SHA256 73927255216c51c719af7c99a96e76381abd9ea22833b286b5c343dab1a911cf SHA512 30dd33aa6ce3f19a6a50def0836b2d1e75fd9d606863455768c817220e76c26505c054533a731264696a6ba1a6d9a68ac525ea82a4ec4f9c5226133bfd51c51e WHIRLPOOL 1baf3ca9d5b05e79f09334f8826b1bd2082c75e91f32fef63f86a9468ef749cef9750c3a08534d10690dbe12ff047b239113221079cdb10d379c02cdac10595d
 EBUILD dtc-1.3.0.ebuild 965 SHA256 ddaefc795bcbc127d4318e51df33803c325fd21ae91c316d345151fe06a8d518 SHA512 d6944a29b11587d1f2e61b5fbda0148450c37d85cbe34e7fbbb0ae0cd495d4cfb65f21df2dd1da5a29d95e8fc1cf7410192111141696b4b248425d8223aaf01b WHIRLPOOL 023d25ca2e54d3ae01a2c3010de67c822094e8745822cc8f03dbcb8bfa6c101cbc49bc2a974b750a7311a8d86771839dea27989d1af1661936caa831af21227d
 EBUILD dtc-1.4.0.ebuild 1136 SHA256 aac409a2af1e9b92098f0a2d30e04d8145bfe4f8f69b8863849accba1cab86fc SHA512 1599cf5c9c8202914dca9cdf7784d1873dc74e585207675416836e1ba66429f0566bb6d1317431b3f91871ac4047ea1b2421435a96c222b2736179569cce473c WHIRLPOOL 3ad60b046957eb4cecfcdd90f8ed422ddbb59a1818e441560982695c49062feee36f892b1a61b3bd91d3d36c441e7894b630b13142e8701176af12d8f0979f03
+EBUILD dtc-1.4.1-r1.ebuild 1240 SHA256 ecc7498ffab039d10a36e46e1a707886d03ca00854ae970a78484e754d4f48e3 SHA512 f292128832d07d79e7020ad95d0bddc8268f3fe82a20fae3d6cffdc9189d49dd2c72db9d39ffc56bea8b8c56150ecc43e8b4b1c40357f68390704e195f850ddd WHIRLPOOL aac3b9e115d5ea1604a2c60d80086ca813e77bfdd28162cee335c356d1fa08a4dfc9cd95eea0ec00e1fcad2399b4d6c4ca707fd2d9af98676b90a3e8b77611b5
 EBUILD dtc-1.4.1.ebuild 1135 SHA256 d1e77123bf8acab6452d8af39966cae90ebc45a9ab8de7ae292b643a8e024d72 SHA512 33804fb9690167e8631fd5da3e2fb5717953a148602c2fc58f720c3d3c7d8b22dddf0109fbd969542a03a46e7b87faf65cfc685b5181e9fa1f64705566ce5397 WHIRLPOOL eb32bef02d99882be718d3474fcca9abd2791a4eb75ee01bcab44500f94bf5e5a0c433763ac36a84e92b86494fd5bd6fb147a4903c228b547a5595dd82075cb0
 EBUILD dtc-9999.ebuild 1131 SHA256 4e64da5540e9176971b74804de8ea9ed6db7ccbaeb3f45b426f00e2d9b3c7d2e SHA512 4180e044c9609954b62d2d77a2e45c4e3486c995d1bfed5c8c25fac9bb75d58f4fad34929e96e82bbc49b17c674fe2bd3db85336c407c09f3a068427f0d9827d WHIRLPOOL 4ea51fc702ac058300dcde37fa4f8aa026015ff56c6bc573b89fe99a587c1773544e60fb97146e3092e104570ed8624ed737f7b3b0903f5f899c4babc5b4acf0
-MISC ChangeLog 3062 SHA256 18aabbca01c3db3e291c02f57a20c89d534a50fde23931f2ed53d9a818eaee00 SHA512 8b0373f6e09a06cd166c342eb461ae5bbe1d5dc379f418c0f55f136434cbed727bd835a0152242ad0179389ae65073a56d55dbd12a98a492d9f727ab7fa468dc WHIRLPOOL 240b3fe19cf6027b8ad9da94e29ca9450c20c9e8a3b2f48d2aeeb0ac8e3ef382a306caaf0c1fbc3a10b267467314f75bb8eb8e1fd39357f261a0f1971d1b8da1
+MISC ChangeLog 3282 SHA256 af2ce1f9b16a6f7770676efaa0f70ded80b7fc163061388fa9e93b5bf051fb5d SHA512 9c39c4f139a1da24d6bb354aa736c4cd23b0d9a18b03bd120e61e5688021ba034391aa6f7971ebff4fa0b7dac3ebddfd7972bbab8a924c9bfe0cfe71071828bc WHIRLPOOL b962de3e8779c1f4feed7c1c4efff183756e123a1759db747b99a0eaf9b829981bde0fa9256dc8eb6c3f38b726f16f3163dbbf08c11a2024c020524ec0f801aa
 MISC metadata.xml 220 SHA256 847364a734851351edf36827cbb7333a71af6f3451f1ef472ad817b4a310115e SHA512 aa0e629dc2916118eb5d2d0f1dd215ada6c7a7697abeaa410eba81a916f324de1471e461325e5faba813690fa7b784d2e868f79b6be53f4e81be17f2731a7c6a WHIRLPOOL 22925650d982fd35de775e3520958bd1d26eb6e2e5a37307e6f13225b73186ef3c8a213e93d74d7a1a2fbe8325935d46aff12c10537be5418a7d425f35fee4b0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlVDGEYACgkQVWmRsqeSphOO2ACffLE6DQK296Hza2KrZ1cxv0Fl
-yvwAn0ouatFxX4EdItVa5OEatKc4wU9w
-=ZaVr
+iQIbBAEBCAAGBQJVSa1EAAoJEPGu1DbS6WIAfeUP90edljfXQNuOyT2lH/l69D+1
+zUfQReJMrFkYCzoDqT4Pqv0aqCsUDmBjNmYRVOuCxdmpubvChYeDfoesbUIImX7K
+VfyRrVoNrvWjUnQMwKAwZEskwFxKIC/8tkBsDOgNd2b0EMXVkDWne0egHvQ4D8a0
+9J7WIWbtopT3VT0Er6tP0j8Mdm9YixwlOj+9X9kv7ybQBrWNz/Uxi4ySiUfyuwds
+sLu1Cg++Eydt6/gZQgXm8iQRC6ioGfUv3/GSVKFMk2K6y6Av2jLz28URN4NfkwJi
+Q53IRRZD4QJjG16FhEat4zr5iDRH6l1Ixq0D33uOeLOAjRyJoL9KfcEJd4w+nLia
+qpe3Y+qaNe5IfPNj0JsBeMYc9IweoXutg+ogJ2BNuzruoXeQMgoyf7FW/o1qEwCs
+qErt1CphCCmcHDZwN9UMVIJtMSo68OaCGkGiZ2yP6i/s6tHI3DcCnJwytz7kpzxk
+f2HZeWM4m1Xzb2WcY6vqyEkUPywchQJ1x33um/8LThKljMXG68KKP16FFiXRtJyg
+In0dBcTFYSIo6V+F7fKlrEZS/7ESx0FkG/RIJXJYyR5UOfTgghvpS0IaU78cPmkU
+/BLCZS0Uyaz4fSywOUGnByhweNh+sm8lPlmaOeJY2gqTFm2fkcqSkjHZE+EnKcX4
+0yLDfduXueDleELnXKk=
+=33BK
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/dtc/dtc-1.4.1-r1.ebuild b/sys-apps/dtc/dtc-1.4.1-r1.ebuild
new file mode 100644
index 000000000000..59458b2c2142
--- /dev/null
+++ b/sys-apps/dtc/dtc-1.4.1-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dtc/dtc-1.4.1-r1.ebuild,v 1.1 2015/05/06 05:57:23 vapier Exp $
+
+EAPI="4"
+
+inherit multilib toolchain-funcs eutils
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/dtc/dtc.git"
+	inherit git-2
+else
+	SRC_URI="mirror://kernel/software/utils/${PN}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Open Firmware device tree compiler"
+HOMEPAGE="http://devicetree.org/Device_Tree_Compiler"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="static-libs"
+
+RDEPEND=""
+DEPEND="app-arch/xz-utils
+	sys-devel/flex
+	sys-devel/bison"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-missing-syms.patch
+	epatch "${FILESDIR}"/${P}-echo-n.patch
+	sed -i \
+		-e '/^CFLAGS =/s:=:+=:' \
+		-e '/^CPPFLAGS =/s:=:+=:' \
+		-e 's:-Werror::' \
+		-e 's:-g -Os::' \
+		-e "/^PREFIX =/s:=.*:= ${EPREFIX}/usr:" \
+		-e "/^LIBDIR =/s:=.*:= \$(PREFIX)/$(get_libdir):" \
+		Makefile || die
+	tc-export AR CC
+	export V=1
+}
+
+src_test() {
+	# Enable parallel tests.
+	emake check
+}
+
+src_install() {
+	default
+	use static-libs || find "${ED}" -name '*.a' -delete
+	dodoc Documentation/manual.txt
+}
diff --git a/sys-apps/dtc/files/dtc-1.4.1-echo-n.patch b/sys-apps/dtc/files/dtc-1.4.1-echo-n.patch
new file mode 100644
index 000000000000..cd45b952a49e
--- /dev/null
+++ b/sys-apps/dtc/files/dtc-1.4.1-echo-n.patch
@@ -0,0 +1,95 @@
+From ed3d76cd1c8f91f5e86424e899448d6221b0f76c Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@chromium.org>
+Date: Wed, 6 May 2015 01:53:39 -0400
+Subject: [PATCH] tests: convert `echo -n` to `printf`
+
+The -n option is not standard in POSIX, so convert to printf which should
+work the same in every shell.
+
+Signed-off-by: Mike Frysinger <vapier@chromium.org>
+---
+ tests/run_tests.sh | 20 ++++++++++----------
+ 1 file changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/tests/run_tests.sh b/tests/run_tests.sh
+index c870432..0dda54a 100755
+--- a/tests/run_tests.sh
++++ b/tests/run_tests.sh
+@@ -42,20 +42,20 @@ base_run_test() {
+ 
+ shorten_echo () {
+     limit=32
+-    echo -n "$1"
++    printf "$1"
+     shift
+     for x; do
+ 	if [ ${#x} -le $limit ]; then
+-	    echo -n " $x"
++	    printf " $x"
+ 	else
+ 	    short=$(echo "$x" | head -c$limit)
+-	    echo -n " \"$short\"...<${#x} bytes>"
++	    printf " \"$short\"...<${#x} bytes>"
+ 	fi
+     done
+ }
+ 
+ run_test () {
+-    echo -n "$@:	"
++    printf "$@:	"
+     if [ -n "$VALGRIND" -a -f $1.supp ]; then
+ 	VGSUPP="--suppressions=$1.supp"
+     fi
+@@ -63,7 +63,7 @@ run_test () {
+ }
+ 
+ run_sh_test () {
+-    echo -n "$@:	"
++    printf "$@:	"
+     base_run_test sh "$@"
+ }
+ 
+@@ -106,12 +106,12 @@ wrap_error () {
+ 
+ run_wrap_error_test () {
+     shorten_echo "$@"
+-    echo -n " {!= 0}:	"
++    printf " {!= 0}:	"
+     base_run_test wrap_error "$@"
+ }
+ 
+ run_dtc_test () {
+-    echo -n "dtc $@:	"
++    printf "dtc $@:	"
+     base_run_test wrap_test $VALGRIND $DTC "$@"
+ }
+ 
+@@ -126,7 +126,7 @@ asm_to_so_test () {
+ run_fdtget_test () {
+     expect="$1"
+     shift
+-    echo -n "fdtget-runtest.sh "$expect" $@:	"
++    printf "fdtget-runtest.sh "$expect" $@:	"
+     base_run_test sh fdtget-runtest.sh "$expect" "$@"
+ }
+ 
+@@ -134,14 +134,14 @@ run_fdtput_test () {
+     expect="$1"
+     shift
+     shorten_echo fdtput-runtest.sh "$expect" "$@"
+-    echo -n ":	"
++    printf ":	"
+     base_run_test sh fdtput-runtest.sh "$expect" "$@"
+ }
+ 
+ run_fdtdump_test() {
+     file="$1"
+     shorten_echo fdtdump-runtest.sh "$file"
+-    echo -n ":	"
++    printf ":	"
+     base_run_test sh fdtdump-runtest.sh "$file"
+ }
+ 
+-- 
+2.4.0
+
diff --git a/sys-apps/dtc/files/dtc-1.4.1-missing-syms.patch b/sys-apps/dtc/files/dtc-1.4.1-missing-syms.patch
new file mode 100644
index 000000000000..7057be7bd8ac
--- /dev/null
+++ b/sys-apps/dtc/files/dtc-1.4.1-missing-syms.patch
@@ -0,0 +1,30 @@
+From a4b093f7366fdb429ca1781144d3985fa50d0fbb Mon Sep 17 00:00:00 2001
+From: Julien Grall <julien.grall@linaro.org>
+Date: Tue, 17 Mar 2015 16:00:34 +0000
+Subject: [PATCH] libfdt: Add missing functions to shared library
+
+The commit 4e76ec7 "libfdt: Add fdt_next_subnode() to permit easy
+subnode iteration" adds new functions (fdt_{first,next}_subnode) but
+forgot to mark them as 'global' in the shared library.
+
+Signed-off-by: Julien Grall <julien.grall@linaro.org>
+---
+ libfdt/version.lds | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/libfdt/version.lds b/libfdt/version.lds
+index 80b322b..941208e 100644
+--- a/libfdt/version.lds
++++ b/libfdt/version.lds
+@@ -54,6 +54,8 @@ LIBFDT_1.2 {
+ 		fdt_get_property_by_offset;
+ 		fdt_getprop_by_offset;
+ 		fdt_next_property_offset;
++		fdt_first_subnode;
++		fdt_next_subnode;
+ 
+ 	local:
+ 		*;
+-- 
+2.4.0
+