Fix build w/newer binutils bfd.h checks #465952 by Patrick Lauer.

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

3 files changed, 38 insertions, 18 deletions

diff --git a/dev-embedded/dc-tool-ip/ChangeLog b/dev-embedded/dc-tool-ip/ChangeLog
index f3528421a144..cfdf1a5b5870 100644
--- a/dev-embedded/dc-tool-ip/ChangeLog
+++ b/dev-embedded/dc-tool-ip/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-embedded/dc-tool-ip
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/dc-tool-ip/ChangeLog,v 1.7 2010/09/17 07:02:34 vapier Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/dc-tool-ip/ChangeLog,v 1.8 2013/04/15 21:24:53 vapier Exp $
+
+  15 Apr 2013; Mike Frysinger <vapier@gentoo.org> dc-tool-ip-1.0.4.ebuild:
+  Fix build w/newer binutils bfd.h checks #465952 by Patrick Lauer.
 
   17 Sep 2010; Mike Frysinger <vapier@gentoo.org> dc-tool-ip-1.0.4.ebuild,
   +files/dc-tool-ip-1.0.4-headers.patch:
diff --git a/dev-embedded/dc-tool-ip/Manifest b/dev-embedded/dc-tool-ip/Manifest
index ab28ca50c831..04cb6eb485c8 100644
--- a/dev-embedded/dc-tool-ip/Manifest
+++ b/dev-embedded/dc-tool-ip/Manifest
@@ -1,6 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 1.0.4-bfd-update.patch 909 SHA256 daa9420413e29176dcebd4a6e83671ffa6e37e4fa43cb6342ad2067907f3dd9c SHA512 a1a24436104012ec5c56028dd4f7b16d9bcf23923d64d3ba14fd9a6b413770d1ccaaa91d56f62e49afbe77bfb0fdc3bb4eeba12d24b547f0f8598a4f3f6ceb8c WHIRLPOOL 71ec9e71dc5641f3de5349990d49c7e959e92b9cb87998fb2f7449bc4b02a923e3afd8d670efa7227350a5ac73ded245a93cbb592e5841b016170db3525fa0d7
 AUX dc-tool-ip-1.0.4-headers.patch 487 SHA256 f0b049c679f681b492e55f702ce95d4f78cee36043baf7961550a6b23752ead5 SHA512 a83b3d0f214de12fc25ef250f106e325d39e78afacb56db31a7f4c6033e8c848b934260c589967cb6fe1751ca401584b1b66f3593b4cbc2d7c2bcc108d8ab4c2 WHIRLPOOL 4c8262a5c3b8d0b76c6ce744e40b52333aabb865802ea4d91b6f7b3ac2f8a9ceaf00f4dfe0964ecf3f00fd03819eaad705ad8baac04ad79e2d4d38783c2fa383
 DIST dcload-ip-1.0.4-src.tar.gz 104758 SHA256 dc81c28abf11899f22cb53d9de21bb99209e703acca7ae52ea48438b36012946 SHA512 c58f574bf13dd44a00395060af4c718593471242366d09dddb234490d20a6e0322a2c3853613aa1c8a5269802cf6434407d3f6c62c934e8b66f8fc1e86a12536 WHIRLPOOL 4287a318a60495c33dc6ffa0e396b52cc2a6d95f194dbbe800f44a3cff992064a11ac295777edfbe45d35bf095ace6693ba0e67ccc6aec12966a3192ff04ee09
-EBUILD dc-tool-ip-1.0.4.ebuild 1099 SHA256 fd9f2b6125c914f5310bc7806312f7ec1d7ba4eefab783451949e36ca0447976 SHA512 17b5d3657d68eafd3827e485f29a4049e65af2f21e68814ec0985ff8db4754e2c422e2518377f22125648bb7a792b0e4d04bd9aca4c53e57477690b21223b398 WHIRLPOOL e5fde5436e46d87738b5f0880df96e0ba22022e135598ec5888565b6e824ca4ab4b8cf212a83296cb08125de3dd08ae7eb5dbc1aeced10c491d8e9e275a52bd4
-MISC ChangeLog 882 SHA256 87c3ab842600f6db152f44e8ee931ff55ef7d22e92eb4a8c1f7457e037be43a8 SHA512 85ad7c7090cf072aa4b3eed6da6794b1a12bcce6af9f733ef08317783f9f03f26e62e1ca810c77d503398fb12799a654560e304d441e3f8925d5e8a230a56c26 WHIRLPOOL e35e73877f50ed3af46c10ab002c3f57ce94a290994ae5e6286ba77c6245d4a6bf751f64060f552cc996148f18fe4ba05cf4243e707fd7507a37e5c18e22ba73
+EBUILD dc-tool-ip-1.0.4.ebuild 1092 SHA256 b99cb225ef3ff298807c96abacee98b999dbbfedf614527a6a03266cf71d4de8 SHA512 e57ec2f1cd16d544298c02daa6369da8e238c3358c428115b65b8d4c1b94f60e0904ca743f2484cbf2f745b46c40106a38e86415d8c685bcfd689ac4f4b6ca58 WHIRLPOOL 4b6aeebbac6c064f047a36f443cf813536aa5686b33d836155466dceee648559de49e7cde8ceba0c07784f9d2f60101060204bed0ebf67084955ab190cec83ff
+MISC ChangeLog 1026 SHA256 b6625ab8cb32f78167300b731e9e3ac3a0e47d0a97df6f5f0278dc6b33ba5af1 SHA512 acd1eb1d45ac855db5dbdfca68c595cb5812a24467ccc2f45b83d6c0bc95e230baaaedbf0199676529819ae57486c19ac99e600afca05bf2e0e6f6d9c2e27e9b WHIRLPOOL d8b045de7df7c5f1459b04c536edc1c0bc2c24e5c6aa0f9ca9e17ce6e80ec736aeac8f233ac66aeb9828c91bc211a7a1394e9a613bf0307cd69f19c4b4ec4dbd
 MISC metadata.xml 218 SHA256 d6099250d2d669ca7616f2806b04185eb2e7bc1f5ea33886ae84764719444d6d SHA512 cc45a7959d48055e526765d8cc2606b6ac4438aaf70bfb884d0aec3ed887e71f72205f4f8b4bcf15dac9a377384f12029f086d09867198f3fb47659b736de440 WHIRLPOOL 5554f1dce6860f74c105a291f96cc18935b39e9e95c20f3b9a071189b0d8e50e8e52fa8ec0165f38c87b57c9c827c684c96b390fcb64609a06720724b18cf445
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJRbHCYAAoJELEHsLL7fEFWtBcP/19RN2nz0XfXF0sWaXfPvYFX
+wIba4DXx1I+DFtRsCIL8UGYyD7R8pb21xJSRCNaUnhQT/+lg2mvQa/mr9P7zk4vr
+dli5Dj5oFrdWcOKISMbi6w6Jojb0/6X+Iwe/vzCO3Eyu7xZ4XXvg+ueepuQJJpn4
+cSf2/q5IS2/g1ObFYlTkz7r18pIERlAW4m0Fe+f39DTnUyjFIDe6EkdWFZ3YRYEN
+3cpRnWCQPUt6OZHi6DbKsBh0SmxZVW4ZGTyqTVj7VntmSSglAhfrSaLwloDqy/uy
+3Dk1o+4+q89ZSx3xs4GOFX5uFzZKRktx1FY/RzXj33Bjip/EJvdxTPzRvGn9UvRO
+B5sbadHu1NmixjDqGsjmtocBdW0S36BRO9SvXajUPxIiXprUzTHSUF59cPEtWTtB
+vRMyPZ2tKu/K+ec6Uy8/Tdl/E55tM2+2nb+zasIA8SVsUmoZm9zBrvUQJr6NOdiG
+Wa5ddelys90Rgaw4DD7h9cpczxqxu7vhLVd9YNqit13xzoQW7reJw2TAoYStOH2n
+/h2e7flTS6JwFPzk3W8HPAaw5+lDaDB0Y4YIrHQjVzp5KJF7ImARfTa4ZBu8+HOE
+ut/lOM5cRfgHQxjARW6iDJEBC7yNGO9XzpNtkQgOevRkhnGFIoV93gsmcdhU7KaX
++GbN3zKS6gjZCPzmOgIe
+=DHub
+-----END PGP SIGNATURE-----
diff --git a/dev-embedded/dc-tool-ip/dc-tool-ip-1.0.4.ebuild b/dev-embedded/dc-tool-ip/dc-tool-ip-1.0.4.ebuild
index c585e35a882e..9797e67f100e 100644
--- a/dev-embedded/dc-tool-ip/dc-tool-ip-1.0.4.ebuild
+++ b/dev-embedded/dc-tool-ip/dc-tool-ip-1.0.4.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/dc-tool-ip/dc-tool-ip-1.0.4.ebuild,v 1.4 2010/09/17 07:02:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/dc-tool-ip/dc-tool-ip-1.0.4.ebuild,v 1.5 2013/04/15 21:24:53 vapier Exp $
 
-inherit eutils toolchain-funcs
+EAPI="4"
+
+inherit eutils flag-o-matic toolchain-funcs
 
 DESCRIPTION="ethernet program loader for the Dreamcast"
 HOMEPAGE="http://cadcdev.sourceforge.net/"
@@ -15,11 +17,10 @@ IUSE="doc"
 
 S=${WORKDIR}/dcload-ip-${PV}
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	epatch "${FILESDIR}"/${PV}-bfd-update.patch
 	epatch "${FILESDIR}"/${P}-headers.patch
+	append-cppflags -DPACKAGE -DPACKAGE_VERSION #465952
 	sed -i \
 		-e "/^HOSTCC/s:gcc:$(tc-getCC):" \
 		-e "/^HOSTCFLAGS/s:-O2:${CFLAGS} ${CPPFLAGS}:" \
@@ -29,18 +30,14 @@ src_unpack() {
 }
 
 src_compile() {
-	emake -C host-src/tool || die
+	emake -C host-src/tool
 }
 
 src_install() {
-	dobin host-src/tool/dc-tool || die "tool"
+	dobin host-src/tool/dc-tool
 	dodoc README NETWORK CHANGES
-
-	docinto make-cd
-	dodoc make-cd/*
-
+	dodoc -r make-cd
 	if use doc ; then
-		docinto example-src
-		dodoc example-src/*
+		dodoc -r example-src
 	fi
 }