Backport fix from upstream for renaming ftdump to fdtdump #372895 by dacook.

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

6 files changed, 198 insertions, 17 deletions

diff --git a/sys-apps/dtc/ChangeLog b/sys-apps/dtc/ChangeLog
index 41ab21bfb6cf..f614c2deb9f2 100644
--- a/sys-apps/dtc/ChangeLog
+++ b/sys-apps/dtc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/dtc
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dtc/ChangeLog,v 1.13 2012/11/03 19:24:19 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dtc/ChangeLog,v 1.14 2012/11/10 01:52:23 vapier Exp $
+
+*dtc-1.3.0-r1 (10 Nov 2012)
+
+  10 Nov 2012; Mike Frysinger <vapier@gentoo.org> +dtc-1.3.0-r1.ebuild,
+  +files/dtc-1.3.0-fdtdump.patch, dtc-1.3.0.ebuild, dtc-9999.ebuild:
+  Backport fix from upstream for renaming ftdump to fdtdump #372895 by dacook.
 
   03 Nov 2012; Samuli Suominen <ssuominen@gentoo.org> -dtc-1.0.0.ebuild,
   -files/dtc-1.0.0-Makefile.patch, -dtc-1.2.0.ebuild:
@@ -53,4 +59,3 @@
   07 Dec 2007; Luca Barbato <lu_zero@gentoo.org> +metadata.xml,
   +dtc-1.0.0.ebuild:
   First commit (imported from cell overlay)
-
diff --git a/sys-apps/dtc/Manifest b/sys-apps/dtc/Manifest
index 2a3ec981e762..9fb7b50aab21 100644
--- a/sys-apps/dtc/Manifest
+++ b/sys-apps/dtc/Manifest
@@ -1,19 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX dtc-1.3.0-fdtdump.patch 3074 SHA256 dcbb26c0eb7a6ced4fc58b9cd37be6ae9342636d21cf8141568703631e016f7f SHA512 6d7211c2444c484c0c4950b7bd1e1b0ee9da218b0ebafd2fce942a8cb28709d3324eac6422ec0dcce5a0ea44edfa7321ee0c7475508afbef2d0faeaf6b7d3b1c WHIRLPOOL 6f37be47a571e8480e8a7b24cc1b8f9a18000c5de95605b750d879d2485a082c1d78e9a453ee6874663d205811516561cf07b29e98f0f4c029f8942dae58e284
 DIST dtc-v1.3.0.tgz 108540 SHA256 4da48956d812e221f68d1d538cd58ca8ed7412af4ab9ef42a702db9173c372fe SHA512 4506eb4c3eaccabbf6773a3b0cbf3b174560e5004cf8af9f88448ad1371d1c57d793f078b2bd99b63714df538e74d6dfe16f112bc8283d412b1026f5f5c8220e WHIRLPOOL 4e87da05024d94998999a5e0090f91e4af4a66937dc6d5deec9bf7dd320fd9e732d30ccb6195dd0ce924c0f3c817d6af4731761e08dbc0e365e85ad8719e7935
-EBUILD dtc-1.3.0.ebuild 1034 SHA256 f83db376e3642200be6097a56ad573f6327d82d64bd7204c6ae9d842467a1b95 SHA512 b71f32cb30b4910787a05d9a3842c58735cb0a4875f2192893ffa2142990ebf8deecc7631a8a29a77bf4aa69557b2a5ae18e02706d5e79c2ac6de1a626ce4890 WHIRLPOOL b8b419ee846d208d5dea9d43564378ee61b0ffea9bc8f25d4987da833156b85baa29eaf53a83561beedbfcebd062839888435cd7d68f0e90bbd70197eddbac3f
-EBUILD dtc-9999.ebuild 1179 SHA256 758ab044a3acf475fb3aa506ea7411075ba066ad221545b2c39552be09c760bc SHA512 b80f78ec84550d66797a9a405e41190b44582ed1efc689f466d3e9d5b152b792a0154d357fe915bafeba72bc1aa6651e1a8e76ead6496b74ede386355d527907 WHIRLPOOL 146a573ba74de4b56ec770b4b7e308b5f56a37c81c9861ee462ad8c8ad03fb4b78928a911e0a0c74383a315299fef81e9e49dd6a398aed3b70cccfb9e490eac8
-MISC ChangeLog 1928 SHA256 d682e71e00ea525bdea3088e17873c91c6ad3e8b8b55c38d3baf361180506238 SHA512 11f3cfd86fcdb35289137d136299a9f16bead30e0dfcee465bf0fa9c925a1ac49fd0dae843a81b99081523e3305966434c9ef1b5b367cb185950363516065c13 WHIRLPOOL 0d53b5f8fb0f877e28dc01be1d971b05fd2fb3ac30a2950e11a30bf3890796b1857d4dafc756e40e5026e9ef8a46ebb8cd956b224c2e20cd2938dd9c615a8169
+EBUILD dtc-1.3.0-r1.ebuild 1167 SHA256 08ca82775e679132214cbc00d4c0e2777232b6619bb9a7b3fdbc5aeb848b22d8 SHA512 936239798d8d15d9692f9e571c3027dbb14353ec6d7d315ed44a43c47fe78105ae67d0962366313771be47e1943c59b6b7d1c5622a3dfcb105d26990dce87b42 WHIRLPOOL 5bde7bd68f8347f5f06aed2bf2d6e7684c8b73c498f43d053190f670cbce919558a4fa7bbf6a5cf9637069d25c05720185871cd71f2061b5dac5495500f3dcf4
+EBUILD dtc-1.3.0.ebuild 961 SHA256 fcdcea76cc602540666a52188934c72a524f76316f4af1e6c662ff0311ffa296 SHA512 406fe2869c9a7f29797c2f3f1d05ae4b984911d04a15dd6e1e4756c70136ff04b2c5446be34b8cd6f8d580646767243e1a2f4bc6507e4e2e74554e0783eb816b WHIRLPOOL 89b37851d499e0326a4519a3a1b41fc0e719603bb7e0bbce17bd969831cd5e1ffa18dd31e19a30d5bf55b8d96b07f815dfa52ccb6848e0ef122ed6643fcaa9ab
+EBUILD dtc-9999.ebuild 1107 SHA256 1546c09cff0dd936b1ff6fecdd275bcbef70f12af798dccf0192f1576412a254 SHA512 58af0f23464b09a0f5516ecb547b445052c3fead7027caf1ffbae467030de51cbdaa2f2b7cd17d455167dd49c4cb176ef72d7e51670f3a30d8265ecd29189b92 WHIRLPOOL a927ca0696f5759acc387e0a91bfa3acb8260a77c476fe8720f07f05e0274c56ca83fef9c3b79bfd65b411568a929df1dfb3b8af1eed2223e3352ecb26fef152
+MISC ChangeLog 2174 SHA256 b1487391c2751ddef16f274004ff247d834c4afc602a719af4b6b8e82891ca9b SHA512 876099eff2096539ac81c6cb34a8c04b9c5f43f4ba9fca2e2698532e4b743e607dfa4c2fe6ea48f88ef0ace7da5111152e1fe6639ff38f74e7b34e1544be39fe WHIRLPOOL fc907492e161c76cc6b1f96c33e91b66b8e9b5a88dcad80b6a2bbb47be92a9b127824de08e02c8e18b202fd19baa192ea1810751954d9c9c6440730969640b57
 MISC metadata.xml 220 SHA256 847364a734851351edf36827cbb7333a71af6f3451f1ef472ad817b4a310115e SHA512 aa0e629dc2916118eb5d2d0f1dd215ada6c7a7697abeaa410eba81a916f324de1471e461325e5faba813690fa7b784d2e868f79b6be53f4e81be17f2731a7c6a WHIRLPOOL 22925650d982fd35de775e3520958bd1d26eb6e2e5a37307e6f13225b73186ef3c8a213e93d74d7a1a2fbe8325935d46aff12c10537be5418a7d425f35fee4b0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQlW45AAoJEEdUh39IaPFNFqQH/jwvr7ulgYa44KGNRva+A4DP
-Q9gsvSVcjcRqwPH2c3vW+zDMG12UxCAHzuydid4am5A4NOVj1nM7akzsHEM5vkbT
-WIfqWYVHQv8KAUW/Zc6RtsZftr07CZfegpKIhiA3BpkNhTXajp/WMTxkrzdIKK0J
-Sbz+dYdeW4ez0LcTZwXuSsz/Y9x3V9A+VvupnxvgB8cuSxWPMrjVprQ3EZzfWO5K
-/hYKF/VEEwL1C199QfA7w6MXfVkinXdCvnBWrtRafq8JnI1+Unb22ZBYsgS3Mo+a
-HqhhTe2b7dCw/3AwgsuKQFx3pB3dBcfuqqX5tJhUyhMxWoyLv2/xK/+vqAKM/q0=
-=dK5m
+iQIcBAEBCAAGBQJQnbOdAAoJELEHsLL7fEFWzaQP/jXN4iDyKhe6zS2jCkbWNxVd
+ghFBC5opLYncp5oJqnH2HukHUBUVRQvdi6wM88hEpPpSQ5cQ3x22V71m21cj+/Fe
+7tbuj+W3gTjfOeWUrRnwQFSOo/r3lE32D+2GB7M1TiiWPyKQPhx1E5fgYXg9fucg
+ebLb1Z/gvW+30ya1AbmDCyZz8gYWpNPoJ2tjYehLYyHD8rxXtHgwKDfdmBT+l6iA
+TVp+gxL7TgVGu/e289hg36WMuTnNYcaPNrEXV2BQ/uPMAW7MzonpUxCn3sOL3r47
+GJF6Der6vbyF7pMRk6vkO1nEhtQlsiwTLfZb/EGaCnrqeMZFIKo5/vd7Od3uomxF
+kr5QWBiafNDHrtlWOTFK1H7BRihh5mT0McWAweTVZsGWH607JubEJvg2hhir9GjE
+eMR8TyIWPX7NbOfej2uE61UwD+sQn7etUJhfzOSvCuIVjtQghKO4n7PvXvdmpYGa
+hxGeZaJ+tLZ5fqYJfP3sB/iMuk9pmCcMgye5nULGmAvydaaijULvWyR00BQvtUpl
++NQhx0BU4fVLyWI5rMKhk+eCe54IMa5WO5xyoL1crAwIBsj1hgHu/ecdX9hx7rXX
+xw0u4v5YOpBSGIFFVnCuuOcVO1l2XDgA6sOT3zgqne8WAZlPvAsXcMsBExwhCTGJ
+4um5vchqT8GLj1aBwcyb
+=XV8m
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/dtc/dtc-1.3.0-r1.ebuild b/sys-apps/dtc/dtc-1.3.0-r1.ebuild
new file mode 100644
index 000000000000..67b33ab8f794
--- /dev/null
+++ b/sys-apps/dtc/dtc-1.3.0-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dtc/dtc-1.3.0-r1.ebuild,v 1.1 2012/11/10 01:52:23 vapier Exp $
+
+EAPI="4"
+MY_P="${PN}-v${PV}"
+
+inherit multilib toolchain-funcs eutils
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://git.jdl.com/software/dtc.git"
+	inherit git-2
+else
+	SRC_URI="http://www.jdl.com/software/${MY_P}.tgz"
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Open Firmware device-trees compiler"
+HOMEPAGE="http://git.jdl.com/gitweb/?p=dtc.git"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="static-libs"
+
+RDEPEND=""
+DEPEND="sys-devel/flex
+	sys-devel/bison"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-fdtdump.patch #372895
+	sed -i \
+		-e '/^CFLAGS =/s:=:+=:' \
+		-e '/^CPPFLAGS =/s:=:+=:' \
+		-e 's:-Werror::' \
+		-e 's:-g -Os::' \
+		-e '/^PREFIX =/s:=.*:= /usr:' \
+		-e "/^LIBDIR =/s:=.*:= /usr/$(get_libdir):" \
+		Makefile || die
+	tc-export AR CC
+	export V=1
+}
+
+src_test() {
+	emake check
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	use static-libs || find "${ED}" -name '*.a' -delete
+	dodoc Documentation/manual.txt
+}
diff --git a/sys-apps/dtc/dtc-1.3.0.ebuild b/sys-apps/dtc/dtc-1.3.0.ebuild
index b47c69fe6c6a..9f477d0c9285 100644
--- a/sys-apps/dtc/dtc-1.3.0.ebuild
+++ b/sys-apps/dtc/dtc-1.3.0.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/sys-apps/dtc/dtc-1.3.0.ebuild,v 1.4 2012/11/03 19:24:19 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dtc/dtc-1.3.0.ebuild,v 1.5 2012/11/10 01:52:23 vapier Exp $
 
 EAPI=4
 inherit toolchain-funcs
@@ -42,6 +42,5 @@ src_test() {
 src_install() {
 	emake DESTDIR="${D}" PREFIX="/usr" LIBDIR="/usr/$(get_libdir)" \
 		 install
-	[[ ${D}/usr/bin/ftdump ]] && mv "${D}"/usr/bin/ftdump{,.dtc} #372895
 	dodoc Documentation/manual.txt
 }
diff --git a/sys-apps/dtc/dtc-9999.ebuild b/sys-apps/dtc/dtc-9999.ebuild
index 300eef8fc674..dc8e2c8d28e3 100644
--- a/sys-apps/dtc/dtc-9999.ebuild
+++ b/sys-apps/dtc/dtc-9999.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/sys-apps/dtc/dtc-9999.ebuild,v 1.2 2012/11/03 19:20:21 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dtc/dtc-9999.ebuild,v 1.3 2012/11/10 01:52:23 vapier Exp $
 
 EAPI="4"
 MY_P="${PN}-v${PV}"
@@ -46,7 +46,6 @@ src_test() {
 
 src_install() {
 	emake DESTDIR="${D}" install
-	use static-libs || find "${D}" -name '*.a' -delete
-	[[ ${D}/usr/bin/ftdump ]] && mv "${D}"/usr/bin/ftdump{,.dtc} #372895
+	use static-libs || find "${ED}" -name '*.a' -delete
 	dodoc Documentation/manual.txt
 }
diff --git a/sys-apps/dtc/files/dtc-1.3.0-fdtdump.patch b/sys-apps/dtc/files/dtc-1.3.0-fdtdump.patch
new file mode 100644
index 000000000000..0bb1c8c88742
--- /dev/null
+++ b/sys-apps/dtc/files/dtc-1.3.0-fdtdump.patch
@@ -0,0 +1,118 @@
+https://bugs.gentoo.org/372895
+
+From 8f459c5d72673e1a3a119ac58a7eee56236fca73 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Tue, 25 Oct 2011 17:29:24 -0400
+Subject: [PATCH] fdtdump: rename from ftdump
+
+The freetype package already installs a binary named "ftdump", so the dtc
+package conflicts with that.  So rename the newer dtc tool to "fdtdump".
+This even makes a bit more sense:
+	ftdump: [F]lat device [T]ree [dump]
+	fdtdump: [F]lat [D]evice [T]ree [dump]
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+Acked-by: David Gibson <david@gibson.dropbear.id.au>
+---
+ .gitignore               |  2 +-
+ Documentation/manual.txt | 10 +++++-----
+ Makefile                 |  6 +++---
+ Makefile.utils           |  6 +++---
+ ftdump.c => fdtdump.c    |  2 +-
+ 5 files changed, 13 insertions(+), 13 deletions(-)
+ rename ftdump.c => fdtdump.c (97%)
+
+diff --git a/Documentation/manual.txt b/Documentation/manual.txt
+index f8a8a7b..14508f3 100644
+--- a/Documentation/manual.txt
++++ b/Documentation/manual.txt
+@@ -21,7 +21,7 @@ III - libfdt
+ 
+ IV - Utility Tools
+     1) convert-dtsv0 -- Conversion to Version 1
+-    1) ftdump
++    1) fdtdump
+ 
+ 
+ I - "dtc", the device tree compiler
+@@ -643,10 +643,10 @@ a new file with a "v1" appended the filename.
+ Comments, empty lines, etc. are preserved.
+ 
+ 
+-2) ftdump -- Flat Tree dumping utility
++2) fdtdump -- Flat Device Tree dumping utility
+ 
+-The ftdump program prints a readable version of a flat device tree file.
++The fdtdump program prints a readable version of a flat device tree file.
+ 
+-The syntax of the ftdump command line is:
++The syntax of the fdtdump command line is:
+ 
+-    ftdump <DTB-file-name>
++    fdtdump <DTB-file-name>
+diff --git a/Makefile b/Makefile
+index b32409b..4582f5d 100644
+--- a/Makefile
++++ b/Makefile
+@@ -109,7 +109,7 @@ include Makefile.utils
+ 
+ BIN += convert-dtsv0
+ BIN += dtc
+-BIN += ftdump
++BIN += fdtdump
+ 
+ SCRIPTS = dtdiff
+ 
+@@ -119,7 +119,7 @@ all: $(BIN) libfdt
+ ifneq ($(DEPTARGETS),)
+ -include $(DTC_OBJS:%.o=%.d)
+ -include $(CONVERT_OBJS:%.o=%.d)
+--include $(FTDUMP_OBJS:%.o=%.d)
++-include $(FDTDUMP_OBJS:%.o=%.d)
+ endif
+ 
+ 
+@@ -178,7 +178,7 @@ convert-dtsv0: $(CONVERT_OBJS)
+ 	@$(VECHO) LD $@
+ 	$(LINK.c) -o $@ $^
+ 
+-ftdump:	$(FTDUMP_OBJS)
++fdtdump:	$(FDTDUMP_OBJS)
+ 
+ 
+ #
+diff --git a/Makefile.utils b/Makefile.utils
+index 0ed9297..fae5b00 100644
+--- a/Makefile.ftdump
++++ b/Makefile.ftdump
+@@ -4,8 +4,8 @@
+ # into other systems of Makefiles.
+ #
+ 
+-FTDUMP_SRCS = \
+-	ftdump.c
++FDTDUMP_SRCS = \
++	fdtdump.c
+ 
+-FTDUMP_GEN_SRCS =
++FDTDUMP_GEN_SRCS =
+ 
+-FTDUMP_OBJS = $(FTDUMP_SRCS:%.c=%.o) $(FTDUMP_GEN_SRCS:%.c=%.o)
++FDTDUMP_OBJS = $(FDTDUMP_SRCS:%.c=%.o) $(FDTDUMP_GEN_SRCS:%.c=%.o)
+diff --git a/ftdump.c b/fdtdump.c
+similarity index 97%
+rename from ftdump.c
+rename to fdtdump.c
+index cc55fe2..207a46d 100644
+--- a/ftdump.c
++++ b/fdtdump.c
+@@ -1,5 +1,5 @@
+ /*
+- * ftdump.c - Contributed by Pantelis Antoniou <pantelis.antoniou AT gmail.com>
++ * fdtdump.c - Contributed by Pantelis Antoniou <pantelis.antoniou AT gmail.com>
+  */
+ 
+ #include <stdint.h>
+-- 
+1.7.12.4
+