Drop hardcoded -I/usr/include which breaks cross-compiles and is not needed for native builds.

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

5 files changed, 44 insertions, 23 deletions

diff --git a/sys-boot/yaboot/ChangeLog b/sys-boot/yaboot/ChangeLog
index dd0fe91ecedd..5567ddf20102 100644
--- a/sys-boot/yaboot/ChangeLog
+++ b/sys-boot/yaboot/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-boot/yaboot
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/yaboot/ChangeLog,v 1.46 2015/05/17 04:12:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/yaboot/ChangeLog,v 1.47 2015/05/17 04:16:27 vapier Exp $
+
+  17 May 2015; Mike Frysinger <vapier@gentoo.org> yaboot-1.3.14-r2.ebuild,
+  yaboot-1.3.16.ebuild, yaboot-1.3.17-r2.ebuild:
+  Drop hardcoded -I/usr/include which breaks cross-compiles and is not needed
+  for native builds.
 
   17 May 2015; Mike Frysinger <vapier@gentoo.org> yaboot-1.3.14-r2.ebuild,
   yaboot-1.3.16.ebuild, yaboot-1.3.17-r2.ebuild:
diff --git a/sys-boot/yaboot/Manifest b/sys-boot/yaboot/Manifest
index 8e6c56daf799..e4e2ce2fb195 100644
--- a/sys-boot/yaboot/Manifest
+++ b/sys-boot/yaboot/Manifest
@@ -11,28 +11,28 @@ AUX yaboot-nopiessp-gcc4.patch 1623 SHA256 61775623e47719ee0dfce343fa86957e17b4e
 AUX yaboot-nopiessp.patch 1885 SHA256 69fcfa7a6c464304b8a9c68da8331909948686955f4a9e10d23505f700bee1ab SHA512 b2cf36b27e8487c99fecef9c609fe192f6067ff935ef7006ba94c0d5aae165dc796c19604513d38b77ee7bf06950ecd7828e751811e94d4eb528e3b1f5bf18d3 WHIRLPOOL 4b2e5abb584d15b89c2a4f54c59afa3e49e0cf5ea2730306297918db50a7bb67f10b8f499c4328aa668e3076c50ce8430c2252da153159eedf66e89a0bedeaaf
 AUX yaboot-stubfuncs.patch 3803 SHA256 58af65c19cb6f464bc32eaae1266eebbe1ff0a27857a984edc725a036c7ceecc SHA512 43e4adf2cb788e70b9245449cb4e116bf8511c6cfb66a22ab580f184bd9daaa7e79b96b442b119a0e8a6d1c8404dd69caa5a158153902c670723823ab1811bf1 WHIRLPOOL 44ae7403c0d88f98b76c3b887ddc8d694c615e85527907feb30afb1d7f4f2c7b7b566d31f4fce16b2893c373d3888a9e9abd93ca569b521031d55e3fafc56705
 AUX yabootconfig-1.3.13.patch 1655 SHA256 ee662c068ba7800d1d0c85a927f3990658cc488ebd3672e40740b7473ba3bb20 SHA512 0efcae987f7cc9b93a86bbcbe1e74b3ee6228b0db3937adea1f6c8b2e48c58cab35db80209ae6e79ff3e9f992c374b65a7786adf46787c0bbe400270ae006e98 WHIRLPOOL 28fb906a0de9bab0d383de289d25ab5be5941c1be51d2348f2c4bd12ee7c6259785eb948b5239be5d19a0c32c3962f05cfa7bad52fad1b889dfa09ea2633f5cd
-DIST yaboot-1.3.14.tar.gz 219089 SHA256 b1b0ddc798e332dc03065bac871b05f700b6f8383951a05dee68a7438f644933
-DIST yaboot-1.3.16.tar.gz 220360 SHA256 16635d5ed0298d46e26e1da8f7a793e185ddb796e3e567554869676650a44650
+DIST yaboot-1.3.14.tar.gz 219089 SHA256 b1b0ddc798e332dc03065bac871b05f700b6f8383951a05dee68a7438f644933 SHA512 7542073159a15787e27fd8246fe4c84c48cec5cc6fe76be06f4591bb9ca459ad0c81f0085f08d944745a186da005a5ace0d3d0b2598711ca3309fad1c5a00e74 WHIRLPOOL 5eb364684b5628ea241719f2ac8c18ef2ee3daa7355da91fc69992187c01b1decce95144eb0d7cbd3a481124a3ff81880261b8e5e5aedf6f87499c3c3c95940c
+DIST yaboot-1.3.16.tar.gz 220360 SHA256 16635d5ed0298d46e26e1da8f7a793e185ddb796e3e567554869676650a44650 SHA512 9cd98335c8b32787567253e628549fe88af5ebe4b81fb6b99741fbbcc0ae3b44dc4fdad527ed27da00103bc0482d9a33d3f128f542884387f5aa754546624e14 WHIRLPOOL 5cd42ff0c041135c53cdd852ca227aba75e154cd557fdc6a740218982f5033da6f4428bda5934b6227dd726f31d2d97e2c37d3706076ecad77969678fe7c8eb4
 DIST yaboot-1.3.17.tar.gz 224325 SHA256 2fb738d8fd48b94ab2534a4fdf63738ad02c1a30f4b2add91f837baff8fa2aa1 SHA512 da910c4c6ca2de817342bf4dbcefe2857606043e614782581a86bae206cf6cfe5597ad47aea15369feb60e02d8a4f9f4aa3b12863d715c757584c1f4d7ffb9de WHIRLPOOL 8440faadd955aae0484a2d05c4b712d40b9f438224bbf26b2cf9e178944a007aeac779ae7a9ef2431f2404b24440930d34a63b36f46d8c58d4b7ce98af5c92bc
-EBUILD yaboot-1.3.14-r2.ebuild 1256 SHA256 822f2661695cedb5365a263c9d5730e609e78374c605e7dc5522f6db110091e7 SHA512 599478506f606ac11e7926e7165f8c1ec280933f177c60c875fddaf2a0fc03485fd271fdef68603a2c04574c819ab4f17b5be3c4a1de24e60f4c9d2054e5c3a0 WHIRLPOOL b8dff4b013347f5542f6a84d99f8a5363a9d8d64e72e35ef05b651c1df911b6dfaa310ddb9d83165579acb43f02c05c0e67a16edfdf86e7f84168feb547a29f6
-EBUILD yaboot-1.3.16.ebuild 1326 SHA256 3f8494f699090be75e0867b16cc5b37d60312ea6b1502bc99209fc5a96c6c920 SHA512 4d9a3a1a28959516cb57fbe71f8939e48b6fb09fe1d31fcb96efc6c508114fb4bfd57d21c8c057008c233adcf2f4dfc0b806bfc157580818653c764049bc5224 WHIRLPOOL 7f39955cf1d4e1a61ed095eeae89167f12a4d35cc9d47956256591f02be1a37abdfd78d021306f6ae39b4269464083559c118f0179d7b24cb8bb7d04be5a1fc9
-EBUILD yaboot-1.3.17-r2.ebuild 1625 SHA256 46a38c8559e0c2e050bbecd427ed6cdae076cc4b37fa7393ac5162d4d078f640 SHA512 62be5f1fee9ddca131f9bc2663f048c41b5765678cc9274330b14a0cf5535eab70276d6e095349f1df4660a52e0addb63c50356e9021e07612b853509c4c69cd WHIRLPOOL 806455d3e337277e9fafdf3e45dea15343ade9905f00fcd00ee557e9668d82b11f5f9a58d4c105ba759ca2750003220a7894fe1980464247b508dca69e702958
-MISC ChangeLog 11393 SHA256 8f26c381c4f639ad98599b78619f53c09cc8ec713c70aac6866b6a05c73485e6 SHA512 a800b772900a61164480d3efff2c1689a9f57f508f5627f9a49c3c87a710d5dfea8a89e1edbe7883281b0aff2b406b28e56043ef170170afc9e960e66ec42060 WHIRLPOOL d79d2f934c7cc5c05a826f8f06dbe07c3386ccfa5793fcf3c2dec1d111e675dd0a355b5d9d2650833af736dfe5c59623b89aceaf8e6970010f0540252bebaed6
+EBUILD yaboot-1.3.14-r2.ebuild 1388 SHA256 7cfc954a74f66814a3b432b6a002aefa47570c0665dbda2fc4e4ba95d23201d5 SHA512 4e8a1e46de371da003a42e4b60945b7c7675db6b1b76ce2c8fda64d1fd6a211e690b96dc811e146f8a984caef11ef02d54cef6949643dae19a84c0c0eb2714e7 WHIRLPOOL a6074cbd21320b5f5d67227b8f21236f2f535a1f41bfe899ccd0939ca640b9c93a79a9b0969c3e386f6d00cd9d418ac26bb0cda50cd909b818690a65cacb9e07
+EBUILD yaboot-1.3.16.ebuild 1457 SHA256 241be84e77dd290cd712bbe588741b99cf269a94290a76cf0153c5ab116103c4 SHA512 779597cb82c87e27e7a40320dd74be11607e41d31237984495e0821c7d7971abde7f76571938768da988604f57e4f38d1c418b3206d2eb942678605aa0c70dd7 WHIRLPOOL 12c8011868476fbd786f2ddf331c94ec7ea69159d40f6bc06db15924fce7998942269d26200bde662e24b06439b5895fbfce7eab3599d360c3b4a3bb72739e0e
+EBUILD yaboot-1.3.17-r2.ebuild 1756 SHA256 2331a0a84dc333a70d9454bae14abb0b910537b69a680c33473e728d8c5a41f1 SHA512 91de1bad1adbb985c9eaed5afd154d6dfc66388eacc2b2ea043895a699dbc45e952d812e412fc08f0e6878d0c66f4f905dd8e8f69f76ed4d78e395e780eda656 WHIRLPOOL 03b42e0ff299cc4f59d7a9db3fbc1b979abc6642357a216447fc977530ecb8d2052359a763cc0fcdf02a6c45c1cdd4b843821440678330d7fb19e4529add93f5
+MISC ChangeLog 11617 SHA256 b64d4fd42e6e29ff6f3bcb15aff9bb04a3a5c691a45992d9edf9701836d5f832 SHA512 a84f959f92f8fa37a4c7b15c7c824a41abba34d5d32f7e5822cac684b6c4cf9b1881ce7935ec864ca17d09d7829d73572a8f1643e42723119d0fbc0437016613 WHIRLPOOL 6dbc8f2af10ed50c1b119a70c6b937ca795a952fb909ac501647dab4d9af5929b279909a50ab8a42b9ecc309586d1ebce56bf6115a81b03e82a8eff913bf6ae5
 MISC metadata.xml 175 SHA256 123ecdec2aa3d066ff52ce8a8013191ede4c949290dad2afc2a2c505500e765a SHA512 9933194f53703c4f34f6b7145e9236acfa60669c9a036c2c9da309f1adec5f4addf508040b7be6b935dfc36ed652dd3b2cefc5e48bc48f0e01c9def0022ca7e2 WHIRLPOOL edb132936f3b6adc3944344b9e2b57de7a126febbc799869e3838933eebd307d02c99f3466aeaf2ebe7d3fd4c9cab66c56fbff0e8b02734314c20926b4a11e46
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVWBU7AAoJEPGu1DbS6WIAJm0P/236WnMB5Q/QBqrF6UI55xcz
-rrdZ5UNGsDKDnmACsE8xVUnQWwbQS4tdF2eJNC4cV36EA1P3o07cnvkS6zFwdqlo
-+VxP/kI2uuWw+rutOHu2byg6t8Kceyfzql61Shgoxwz+46RuAwkTUdwhDa3NW/1a
-cqi8yxFmRl819qrJuVRbdWk0Xyc6D8DD3Pf0h1aTUPFeT8/fl7xCrRdpdmp42/Hg
-qfLzDQe8nIL0RAfsIksIBw/gOJXyd8+XD4MICzhSYYQvrxUh5JVE9+9mmUfKmYHv
-UwUyk3oDzLptRy8+h5Q04NzgsJLnI56HqFz8XMn641/tUVwSnR5cyOTvuRi6yoha
-0fJH/fix2PYcrgmOiyBStjQrHAZ1OsCcbDHjDenXNC4O6z3/CfawKZmcOwkpaBdA
-apJzNGNF/oVl8mBhcfP+VyrZSUAA2252kNGyu9VBP+ddmaeAZ3Ka8Jk+21B9FaEG
-oc+0wGkNlGSZHXggpVcmBQBtTs5bSmF+VRJvMPQXbGotmvRQPyuOISJe/BZsGxaP
-Z8dzqTfthx+ZAjBnMBF8q0yKtWVWutXiCC0PUoK8QNiARhf/MQKosUMeMLURG+PX
-xdUqBDT48gANTBKdxv5MZgPGsFHFq6Ysi9YNU6QsfZLP1t+4OYtN7CIEe50JEsWD
-SxttTpDkPocmgOPYM6F2
-=CFqR
+iQIcBAEBCAAGBQJVWBYcAAoJEPGu1DbS6WIAfFgP/0pOwdGS40M2oMwpZKOaLwov
+quEoqxRD9Ry7a42eEGMBN/Xv2F8ol4p8OfCLe5LdtTOP6+1Q2/lecC74TjdxDDy7
+Q7ao1aK/VX8oQWOuqPCoA0dwi6155JStI5z3jNICCsKi0F8A7YR8pMXhApNgAssa
+IY3b7ILnFbtvjJonISE86i+bRh17VDkqU9s6Z+GdmD6uf/f/MuXDVfjwetrgVTKj
+s8toDd/wa3Z9KGUv4VCY9/fMwr5OL2uM5oYsci/Q/fagboJmv2z5mB/FmKEdgDc7
+QbVzPclvu1MngdzNQmmyVZ6DKVw5BtFcsOeir1ZH4M7mIWiWe+7WlLul6XdblF9A
+hCNIwUD9IQUnFzCPezcOQ3aMufhydE8+gWZIyedrDNJ7JP7YkQzuusc4blo949R8
+cLJMBuU+lwJhuXiGlKWgHRh8RBumBDuSXbcl2In3+H32cjYIPH3fhGLw8AE4QJm+
+2VKDeYt74+711/kYWO4M6HF103DH46VU8s+9KnYzjtNWqcg0kzv+huhjtc4Z3SD9
+i+a9TRkIJJKbydoxBqezZ9I0e4HC1N/klBoI4CRkMCL3xEivsLKF4PdubwxSxbnF
+Cd2hreEiYsIfRLK8JuKrNbuFSDdZ3mubZ+7Ryv/L1Dsga8Uw/xdkgD+FoTjpYIb1
+Ix469XV/gGL3kQn6mXU9
+=XuSJ
 -----END PGP SIGNATURE-----
diff --git a/sys-boot/yaboot/yaboot-1.3.14-r2.ebuild b/sys-boot/yaboot/yaboot-1.3.14-r2.ebuild
index ddcf700c3c48..ee939a275d38 100644
--- a/sys-boot/yaboot/yaboot-1.3.14-r2.ebuild
+++ b/sys-boot/yaboot/yaboot-1.3.14-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/yaboot/yaboot-1.3.14-r2.ebuild,v 1.6 2015/05/17 04:12:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/yaboot/yaboot-1.3.14-r2.ebuild,v 1.7 2015/05/17 04:16:27 vapier Exp $
 
 inherit eutils toolchain-funcs
 
@@ -19,6 +19,12 @@ RDEPEND="!ibm? ( sys-fs/hfsutils
 
 src_compile() {
 	unset CFLAGS CXXFLAGS CPPFLAGS LDFLAGS
+
+	# No need to hardcode this path -- the compiler already knows to use it.
+	sed -i \
+		-e 's:-I/usr/include::' \
+		Makefile || die
+
 	# dual boot patch
 	epatch "${FILESDIR}/yabootconfig-1.3.13.patch"
 	epatch "${FILESDIR}/chrpfix.patch"
diff --git a/sys-boot/yaboot/yaboot-1.3.16.ebuild b/sys-boot/yaboot/yaboot-1.3.16.ebuild
index c53dada7f2e4..6773c75114ab 100644
--- a/sys-boot/yaboot/yaboot-1.3.16.ebuild
+++ b/sys-boot/yaboot/yaboot-1.3.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/yaboot/yaboot-1.3.16.ebuild,v 1.7 2015/05/17 04:12:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/yaboot/yaboot-1.3.16.ebuild,v 1.8 2015/05/17 04:16:27 vapier Exp $
 
 inherit eutils toolchain-funcs
 
@@ -22,6 +22,11 @@ src_unpack() {
 	cd "${S}"
 	cp "${FILESDIR}/new-ofpath" "${S}/ybin/ofpath"
 
+	# No need to hardcode this path -- the compiler already knows to use it.
+	sed -i \
+		-e 's:-I/usr/include::' \
+		Makefile || die
+
 	# dual boot patch
 	epatch "${FILESDIR}/yabootconfig-1.3.13.patch"
 	epatch "${FILESDIR}/chrpfix.patch"
diff --git a/sys-boot/yaboot/yaboot-1.3.17-r2.ebuild b/sys-boot/yaboot/yaboot-1.3.17-r2.ebuild
index 9fb9e07f27ba..2e4d576f921e 100644
--- a/sys-boot/yaboot/yaboot-1.3.17-r2.ebuild
+++ b/sys-boot/yaboot/yaboot-1.3.17-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/yaboot/yaboot-1.3.17-r2.ebuild,v 1.4 2015/05/17 04:12:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/yaboot/yaboot-1.3.17-r2.ebuild,v 1.5 2015/05/17 04:16:27 vapier Exp $
 
 EAPI=2
 
@@ -27,6 +27,11 @@ src_unpack() {
 }
 
 src_prepare() {
+	# No need to hardcode this path -- the compiler already knows to use it.
+	sed -i \
+		-e 's:-I/usr/include::' \
+		Makefile || die
+
 	# dual boot patch
 	epatch "${FILESDIR}/yabootconfig-1.3.13.patch"
 	epatch "${FILESDIR}/chrpfix.patch"