From: Samuli Suominen <ssuominen@gentoo.org>
Date: Tue, 6 Jul 2010 20:06:19 +0000 (+0000)
Subject: Respect environment flags wrt #241986 by Diego E. Pettenò.
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=376e4ef03c7fcb122835f643a0f7fb5c581aced8;p=gentoo.git

Respect environment flags wrt #241986 by Diego E. Pettenò.
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
---

diff --git a/sys-apps/dtc/ChangeLog b/sys-apps/dtc/ChangeLog
index 54c74d3326a0..32a1dae567bb 100644
--- a/sys-apps/dtc/ChangeLog
+++ b/sys-apps/dtc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/dtc
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dtc/ChangeLog,v 1.4 2008/02/20 23:01:54 coldwind Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dtc/ChangeLog,v 1.5 2010/07/06 20:06:19 ssuominen Exp $
+
+  06 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> dtc-1.0.0.ebuild,
+  +files/dtc-1.0.0-Makefile.patch:
+  Respect environment flags wrt #241986 by Diego E. Pettenò.
 
   20 Feb 2008; Santiago M. Mola <coldwind@gentoo.org> dtc-1.0.0.ebuild:
   Add ~amd64 wrt bug #209995
diff --git a/sys-apps/dtc/Manifest b/sys-apps/dtc/Manifest
index f1b6d76b29bc..ec343d6e9e3c 100644
--- a/sys-apps/dtc/Manifest
+++ b/sys-apps/dtc/Manifest
@@ -1,4 +1,5 @@
+AUX dtc-1.0.0-Makefile.patch 345 RMD160 06932030fa7996953abf5af45dcdc399645782a3 SHA1 72512b277023bf0a1a906b0ecf1d03317c716f27 SHA256 b1177da6ed931d77282006b59300dea972121fdb21fe4f7df1e21ec05eb31577
 DIST dtc-1.0.0.tgz 65849 RMD160 90c0925cdc9978e7e5bb4cb6697734ba2d70970b SHA1 77462706574edd54ea1618fd4765e1127b33c307 SHA256 8228023bb787460e33f6e63ab8cc032599b0ca2f54db4db97dd3e9006f983c59
-EBUILD dtc-1.0.0.ebuild 746 RMD160 61b9a45d90f4b5e965cd564258663c2d5cca1409 SHA1 0691e8539e638affafb65536ae97724b79ef8162 SHA256 99eb23d79587cde21c0115385f099a62b0ea3e2297369c3da533cb3da07dd1c1
-MISC ChangeLog 705 RMD160 013d72fa73448ebc58f3b60a082eadf4d5974119 SHA1 fb812d0ee8d2a9d13f7c813e2094d57e2df393e3 SHA256 d630a23cb464abd398e3ede7ee6be5a932ed42454a0dec464e378c35d74be787
+EBUILD dtc-1.0.0.ebuild 850 RMD160 652f6f5912fdfbdef4f476c00b1bc49dcd67d96c SHA1 ab3c7c20b905a1b6aa6782636158c2741200e110 SHA256 d2f5ba8a7b53fd8c23506315dd0f8c6c669576bed9beff1bf299168aa06921b2
+MISC ChangeLog 876 RMD160 18eaf6cb1b4115fa39be807cd0f12f9522456594 SHA1 056af9028dbe12e8d3bb5edeb864971f3529d3bb SHA256 d3be966af8ff7fb2647fbd2fe5d7b039e28d4ff587a0fd0a6cc40b5a0ccc11ac
 MISC metadata.xml 220 RMD160 8ebd847eafc75facd4d1a7681aa2010609e842d8 SHA1 266ab78ba4815dbf6bf6f4172c8a69f59bc39cab SHA256 847364a734851351edf36827cbb7333a71af6f3451f1ef472ad817b4a310115e
diff --git a/sys-apps/dtc/dtc-1.0.0.ebuild b/sys-apps/dtc/dtc-1.0.0.ebuild
index f1eddb80fb12..9e182031094c 100644
--- a/sys-apps/dtc/dtc-1.0.0.ebuild
+++ b/sys-apps/dtc/dtc-1.0.0.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dtc/dtc-1.0.0.ebuild,v 1.5 2008/02/20 23:01:54 coldwind Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dtc/dtc-1.0.0.ebuild,v 1.6 2010/07/06 20:06:19 ssuominen Exp $
 
-inherit eutils
+EAPI=2
+inherit eutils toolchain-funcs
 
 DESCRIPTION="Utility to pre-compile Open Firmware device-trees for otherwise device-tree-less devices such as the PS3"
 HOMEPAGE="http://www.t2-project.org/packages/dtc.html"
@@ -12,16 +13,20 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ppc ppc64 ~x86"
 IUSE=""
-S="${WORKDIR}/${PN}"
 
-src_compile () {
-	emake PREFIX="/usr" LIBDIR="/usr/$(get_libdir)"
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-Makefile.patch
+}
+
+src_compile() {
+	tc-export AR CC
+	emake PREFIX="/usr" LIBDIR="/usr/$(get_libdir)" || die
 }
 
-src_install () {
-	make DESTDIR="${D}" \
-		 PREFIX="/usr" \
-		 LIBDIR="/usr/$(get_libdir)" \
-		 install
+src_install() {
+	emake DESTDIR="${D}" PREFIX="/usr" LIBDIR="/usr/$(get_libdir)" \
+		 install || die
 	dodoc Documentation/manual.txt
 }
diff --git a/sys-apps/dtc/files/dtc-1.0.0-Makefile.patch b/sys-apps/dtc/files/dtc-1.0.0-Makefile.patch
new file mode 100644
index 000000000000..5e7ad6eb6a0a
--- /dev/null
+++ b/sys-apps/dtc/files/dtc-1.0.0-Makefile.patch
@@ -0,0 +1,25 @@
+Respect environment flags per http://bugs.gentoo.org/241986
+
+--- Makefile
++++ Makefile
+@@ -44,9 +44,8 @@
+ endef
+ 
+ 
+-CPPFLAGS = -I libfdt
+-CFLAGS = -Wall -g
+-LDFLAGS = -Llibfdt
++CPPFLAGS += -Ilibfdt
++CFLAGS += -Wall -Llibfdt
+ 
+ BISON = bison
+ 
+@@ -64,7 +63,7 @@
+ VECHO = :
+ else
+ VECHO = echo "	"
+-ARFLAGS = rc
++ARFLAGS ?= rc
+ .SILENT:
+ endif
+