Respect more build env settings #240172 & #335742 by Diego E. Pettenò. Fix some missing header warnings.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 45 insertions, 19 deletions

diff --git a/dev-embedded/dc-tool-ip/ChangeLog b/dev-embedded/dc-tool-ip/ChangeLog
index dd430eb896b0..f3528421a144 100644
--- a/dev-embedded/dc-tool-ip/ChangeLog
+++ b/dev-embedded/dc-tool-ip/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-embedded/dc-tool-ip
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/dc-tool-ip/ChangeLog,v 1.6 2007/02/09 01:10:51 flameeyes Exp $
+# 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 $
+
+  17 Sep 2010; Mike Frysinger <vapier@gentoo.org> dc-tool-ip-1.0.4.ebuild,
+  +files/dc-tool-ip-1.0.4-headers.patch:
+  Respect more build env settings #240172 & #335742 by Diego E. Pettenò. Fix
+  some missing header warnings.
 
   09 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
   Regenerate digest in Manifest2 format.
diff --git a/dev-embedded/dc-tool-ip/Manifest b/dev-embedded/dc-tool-ip/Manifest
index dfc998ab6d30..99dc01aa9ef5 100644
--- a/dev-embedded/dc-tool-ip/Manifest
+++ b/dev-embedded/dc-tool-ip/Manifest
@@ -1,15 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX 1.0.4-bfd-update.patch 909 RMD160 024e5655d7fda9ae1e35ffdc9cb841864becaa37 SHA1 8cf691b319032b3d48cab6625ce6faf0dedd5833 SHA256 daa9420413e29176dcebd4a6e83671ffa6e37e4fa43cb6342ad2067907f3dd9c
+AUX dc-tool-ip-1.0.4-headers.patch 487 RMD160 e01323f246e74c0f5bda1e0c29e84c5df30e0069 SHA1 4555e6fcb5ac68c302b0210d1ac0a2276affd3aa SHA256 f0b049c679f681b492e55f702ce95d4f78cee36043baf7961550a6b23752ead5
 DIST dcload-ip-1.0.4-src.tar.gz 104758 RMD160 186393227cd44ba7eef7c89d13275c346e7425b3 SHA1 960b9c51db6623686cfbc0b566ade856114cdb12 SHA256 dc81c28abf11899f22cb53d9de21bb99209e703acca7ae52ea48438b36012946
-EBUILD dc-tool-ip-1.0.4.ebuild 1107 RMD160 c5f0628d3fb61b91933e36ed47bf44321348c978 SHA1 f8caac6f95473e2277de82b612daf7bcc25da908 SHA256 1d82ee1ba31c21e0519d690ad68b224f50373ab09e0bf3ee2120dabe79c5538c
-MISC ChangeLog 658 RMD160 f0f1be4f80d93b99b2ddd405587e9eb8b6259d4c SHA1 e2f418578ad48869aedaef313e440e8af97787e0 SHA256 4e69e6382b2a0584c5256427a4a2937fe56d31f94243217ac9ac3350336c502a
+EBUILD dc-tool-ip-1.0.4.ebuild 1099 RMD160 e7a967d4c52435934656991ff4caa1075d56d6fb SHA1 d959ff348304debfca137396bdaa310835af033d SHA256 fd9f2b6125c914f5310bc7806312f7ec1d7ba4eefab783451949e36ca0447976
+MISC ChangeLog 882 RMD160 d5d9a11704d08d41e0d212ea55350064da587513 SHA1 3ec22e1d12e6bacfd527c676190ff986af15a603 SHA256 87c3ab842600f6db152f44e8ee931ff55ef7d22e92eb4a8c1f7457e037be43a8
 MISC metadata.xml 218 RMD160 a577198e9adf13979756d16d6d3526bdcdfe8fbf SHA1 9388809e030d1159753d6c727b57b8f219fe61fc SHA256 d6099250d2d669ca7616f2806b04185eb2e7bc1f5ea33886ae84764719444d6d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iD8DBQFIQNZlj9hvisErhMIRAtvIAJ406sEFe2USE8TUyAlqn/jl1mZ2yQCgsApM
-L0OFtZxEhyl4Fy79NY9fFGM=
-=5fJw
+iF4EAREIAAYFAkyTEzkACgkQTwhj9JtAlp41lwEApQ2naI39qxfA2FVOH2l0WG0r
+v8MipCKlLwQ2j8eh36AA/jV0MKEP3soBazU5mAL/2NhVjTVhqoXvp+CXyrORKu2h
+=n5Ju
 -----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 2b70c075587f..c585e35a882e 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,11 +1,11 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2010 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.3 2005/08/13 07:30:15 vapier Exp $
+# $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 $
 
 inherit eutils toolchain-funcs
 
 DESCRIPTION="ethernet program loader for the Dreamcast"
-HOMEPAGE="http://adk.napalm-x.com/dc/dcload-ip/ http://cadcdev.sourceforge.net/"
+HOMEPAGE="http://cadcdev.sourceforge.net/"
 SRC_URI="mirror://sourceforge/cadcdev/dcload-ip-${PV}-src.tar.gz"
 
 LICENSE="GPL-2"
@@ -13,25 +13,23 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="doc"
 
-DEPEND=""
-
 S=${WORKDIR}/dcload-ip-${PV}
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${PV}-bfd-update.patch
+	epatch "${FILESDIR}"/${P}-headers.patch
 	sed -i \
 		-e "/^HOSTCC/s:gcc:$(tc-getCC):" \
-		-e "/^HOSTCFLAGS/s:-O2:${CFLAGS}:" \
-		-e "s:-L/usr/local/dcdev/lib::" \
-		-e "s:/usr/local/dcdev/include:.:" \
+		-e "/^HOSTCFLAGS/s:-O2:${CFLAGS} ${CPPFLAGS}:" \
+		-e 's:-L/usr/local/dcdev/lib:$(LDFLAGS):' \
+		-e 's:/usr/local/dcdev/include:.:' \
 		Makefile.cfg || die "sed"
 }
 
 src_compile() {
-	cd "${S}"/host-src/tool
-	emake || die "tool failed"
+	emake -C host-src/tool || die
 }
 
 src_install() {
diff --git a/dev-embedded/dc-tool-ip/files/dc-tool-ip-1.0.4-headers.patch b/dev-embedded/dc-tool-ip/files/dc-tool-ip-1.0.4-headers.patch
new file mode 100644
index 000000000000..678278262900
--- /dev/null
+++ b/dev-embedded/dc-tool-ip/files/dc-tool-ip-1.0.4-headers.patch
@@ -0,0 +1,22 @@
+--- a/host-src/tool/dc-tool.c
++++ b/host-src/tool/dc-tool.c
+@@ -24,6 +24,7 @@
+ #include <fcntl.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ #ifdef _WIN32
+ #include <string.h>
+ #include <windows.h>
+--- a/host-src/tool/syscalls.c
++++ b/host-src/tool/syscalls.c
+@@ -24,6 +24,9 @@
+ #include <fcntl.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
++#include <arpa/inet.h>
++#include <time.h>
+ #include <sys/time.h>
+ #include <unistd.h>
+ #include <utime.h>