Switch `export -n` to `unset`, and also clear CPPFLAGS & LDFLAGS.

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

7 files changed, 49 insertions, 146 deletions

diff --git a/sys-boot/yaboot/ChangeLog b/sys-boot/yaboot/ChangeLog
index 71a2dd9084d0..2d56d0d55691 100644
--- a/sys-boot/yaboot/ChangeLog
+++ b/sys-boot/yaboot/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-boot/yaboot
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/yaboot/ChangeLog,v 1.44 2012/06/20 13:54:25 josejx Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/yaboot/ChangeLog,v 1.45 2015/05/17 04:09:05 vapier Exp $
+
+  17 May 2015; Mike Frysinger <vapier@gentoo.org> -yaboot-1.3.17-r1.ebuild,
+  -yaboot-1.3.17.ebuild, yaboot-1.3.14-r2.ebuild, yaboot-1.3.16.ebuild,
+  yaboot-1.3.17-r2.ebuild:
+  Switch `export -n` to `unset`, and also clear CPPFLAGS & LDFLAGS.
 
   20 Jun 2012; Joseph Jezak <josejx@gentoo.org> yaboot-1.3.17-r2.ebuild,
   files/yaboot-stubfuncs.patch:
diff --git a/sys-boot/yaboot/Manifest b/sys-boot/yaboot/Manifest
index a5da020e0e63..c9ed005a8732 100644
--- a/sys-boot/yaboot/Manifest
+++ b/sys-boot/yaboot/Manifest
@@ -1,30 +1,38 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX chrpfix.patch 979 RMD160 3614e117f5430fbe7e19fe79fd9ec950d5cab30b SHA1 08657c233ad4ac151bf0d4fe0a1c950558c9c3a1 SHA256 cbd5d5e1df0111619b58975d8605d36ce30767a129dd9de53fc302d750e03045
-AUX new-ofpath 4319 RMD160 b86557264798e47d1ecfd3dc0b98f788d8132619 SHA1 d88c2df11c29f5bb1eef394da08b222e556877d8 SHA256 7a20474bdb92f0f99b1142c45583883932807bcb3534cdc14c1238a438152dcc
-AUX new-ofpath-devspec.patch 936 RMD160 e77a55d05c0b0b4fb02726736904990db25621a9 SHA1 293b99a8ed16650f48a0cc35c5e9bc181f43d928 SHA256 dc01e8fbfcd90a6361ee77c7d8e21a8f94e415155c2101dbd0d381bee1559e5b
-AUX sysfs-ofpath.patch 3432 RMD160 9cd4283cb45db5139c6200feca6ceeebcbd3bef8 SHA1 cd001ebbd3fa63a753311521be8394dc4f2768b5 SHA256 a00601f12a361f19ec6ab7ef38c65b1f424624d65f80e30d9591618dc22a1f0e
-AUX yaboot-1.3.16-memalign.patch 889 RMD160 e5ed2a0b6f0c9262ba9a9d3469c4a0c16e775383 SHA1 ee96d95f16098afeb97483287eb1306e6daa7243 SHA256 babf5a43e40197a234cb4c637e8f542b89c26ab801175f1977aaf05882d8592f
-AUX yaboot-1.3.17-nopiessp-gcc4.patch 1495 RMD160 e79f715a1aff784b9fee789c41a8fa6deeab7b89 SHA1 e35d0c217ec5ff16fb293814fe95bca9009ff333 SHA256 b49b64f54de33026f9a8238685735bd737f007b898650b2a42eac4c4dbbc205d
-AUX yaboot-nopiessp-gcc4.patch 1623 RMD160 2c5cd0e61acf01bc82a5f49cf07838f143c49f99 SHA1 4a783fbb82f35f0d2792ff5a83dd480326677752 SHA256 61775623e47719ee0dfce343fa86957e17b4e40c6e695c254b1862cefa428fa1
-AUX yaboot-nopiessp.patch 1885 RMD160 ad6bc10b7f9eca86a155691ed11e7e8b234ff6bf SHA1 6adb7f426fede91e9f2a5276bf87b6f2ad0bea1d SHA256 69fcfa7a6c464304b8a9c68da8331909948686955f4a9e10d23505f700bee1ab
-AUX yaboot-stubfuncs.patch 3803 RMD160 9eefe3d21508bf7e44ac08d400f32b45c597d197 SHA1 aa9eb35148f59c4153b255ca5bc78e4de719de47 SHA256 58af65c19cb6f464bc32eaae1266eebbe1ff0a27857a984edc725a036c7ceecc
-AUX yabootconfig-1.3.13.patch 1655 RMD160 fd3e62c5cddbe359df3f2abee225392e0ff86144 SHA1 c50bd7dabe553e00c466cfa63cbdb9f20257a74b SHA256 ee662c068ba7800d1d0c85a927f3990658cc488ebd3672e40740b7473ba3bb20
-DIST yaboot-1.3.14.tar.gz 219089 RMD160 dd46fc044732c5bdf3dc23b3faa1dd746895cdd5 SHA1 2bf7594a921075371acf468a46776d0f93e315a6 SHA256 b1b0ddc798e332dc03065bac871b05f700b6f8383951a05dee68a7438f644933
-DIST yaboot-1.3.16.tar.gz 220360 RMD160 738118a5f12ab39c24c2e5983d8852e1b439c846 SHA1 6c87bb041e8dc569b624d99ec5a5d53c8911319f SHA256 16635d5ed0298d46e26e1da8f7a793e185ddb796e3e567554869676650a44650
-DIST yaboot-1.3.17.tar.gz 224325 RMD160 6dce388238a6a4e554c1ab3e7cae4fbe4416dde3 SHA1 672011dbcd35890ae984ede6ddfcda0a75221115 SHA256 2fb738d8fd48b94ab2534a4fdf63738ad02c1a30f4b2add91f837baff8fa2aa1
-EBUILD yaboot-1.3.14-r2.ebuild 1268 RMD160 dddd538a19b1720f3410f0c3d7089d64895ce78c SHA1 6b817e1c7169c1c8c43a71e5be0baed1aa6fa8d6 SHA256 7b47d3446fb9f7f26be7f17191a93082400643958792eb6f405a7dd732de73a6
-EBUILD yaboot-1.3.16.ebuild 1341 RMD160 4b2126940730b0b9741c598426bea086cd7826e6 SHA1 853d744db363364f0c5b9af85b24b0f2f9a63192 SHA256 6a21594179712ca4819fdb7265cc6aa259a69a108f82de6529e7fa97c86bef7c
-EBUILD yaboot-1.3.17-r1.ebuild 1487 RMD160 4cafa16241f1294beaea20ca9859054e9a142414 SHA1 a34f3d573324f3c967cbf03494cb12c85d581957 SHA256 ced24c7338d45ab33ad29327e0b71f7ddaa45373209c95d18b2c0216c2781fb0
-EBUILD yaboot-1.3.17-r2.ebuild 1640 RMD160 2efbbabb293d89622b1b9b93967b56cfc0021ad3 SHA1 05559e04765c3a7c0d6d7fbb37e037df64ff8f22 SHA256 c4c61afddfb2fd72f4c5908063cb6b66a5b1e3cef6e1dc6ce1ca118c6bbeb09b
-EBUILD yaboot-1.3.17.ebuild 1382 RMD160 a72b1e10eb053cadbb91ce70798fb3a8a6a39a4d SHA1 69456b6a0525fec2ff2b826f18f6b16f7b9abe8e SHA256 6193823e37ae89c66d483848b660f91ffd41189c14173a0995299cc3e1287c89
-MISC ChangeLog 10944 RMD160 0614d1ef22bf3a7666560b92c60cd3d2e98646b8 SHA1 5c509d2f9e880a305d3595e62253e07a18b14162 SHA256 ff26866ba3c98b9cf8f429a890bf8f933e973df5a1a9ff9a2d24c083e672c412
-MISC metadata.xml 175 RMD160 a674189a82ea2172e0949ce49eb80dd5bc23ddf5 SHA1 c203d37a08bfb7b826b080650c3019705490bfb1 SHA256 123ecdec2aa3d066ff52ce8a8013191ede4c949290dad2afc2a2c505500e765a
+AUX chrpfix.patch 979 SHA256 cbd5d5e1df0111619b58975d8605d36ce30767a129dd9de53fc302d750e03045 SHA512 e9be3e0a49b24c6b3879f45b29a14e186df95ebcfb2f4960b38c96c341de5123bc0bb8d42ed6ccab9a0bfb6632d1a5424b2167b4c6b566ee2a914a6594b80510 WHIRLPOOL 22168cd2916be096504c5c3b0a8833e4f98180caebfa834985e90f727dbcb384e34388b0dda9836f66de5a1be525319c6f0eb8faf105663b5c3682f3b3ea9043
+AUX new-ofpath 4319 SHA256 7a20474bdb92f0f99b1142c45583883932807bcb3534cdc14c1238a438152dcc SHA512 8095d1e085a38d3c058e750acabaaf58464117f1af03fcc4604e86c58cd305e138b340420d3f1a5da5e3752dea59cc823599a6cc7a585195011f0030f1b80787 WHIRLPOOL 4599f740b20bb45afde6088a5c89052d31b5d671f8ce3a36182dd37b3d3f806e2edf3f7922ba1881f4fb8a04887f26c690f04b8ebd4d85b087433e8d3ca65732
+AUX new-ofpath-devspec.patch 936 SHA256 dc01e8fbfcd90a6361ee77c7d8e21a8f94e415155c2101dbd0d381bee1559e5b SHA512 4848ebb10a3879224a5748741ed7134c3ae54f7425b786eae7ab6a9f13bdc893c70c15c2e1986a4a2d1f3f26fdc20c0da92c81c9f47e42c061670963d5cb82f0 WHIRLPOOL 367370688c1f79e00879c4fcd36c959c4487a24736a5533276615752e1c34b198ebda187fd2f90bbb852eee789cde9314f2f7c43b12cf1071b82bbf0ceddfaa5
+AUX sysfs-ofpath.patch 3432 SHA256 a00601f12a361f19ec6ab7ef38c65b1f424624d65f80e30d9591618dc22a1f0e SHA512 e99946565708581ac0c606b4490f129eb7fd3687ef30350c4fd5a184a296cf8803d9ea4429a8c00011e7a491040ac2369185bd56cc327437755ce533e4749e38 WHIRLPOOL 08620422b67f26bbe79b755d026c2b3c07d88ed46c677981b136ffc077e1ce656b675bbc804ef033d107cabc7c8a9085153338664229a1c4b5de78714078382e
+AUX yaboot-1.3.16-memalign.patch 889 SHA256 babf5a43e40197a234cb4c637e8f542b89c26ab801175f1977aaf05882d8592f SHA512 d80c9c9d8592f33d39b900c86dbda3a13ec23f8d6b1a6d9612ba59b6c38218b9e41b9f3a3aa01bd39c8b91ae01d7ea4693ae93b0e7cf9c0912f7243e1364820c WHIRLPOOL 94606fabdbcb854141642e2bb7c6a5b7d0a571dedc489b22b3de658bd2c3e74118cdfbb44f100faaacb48b34b7162fd4313e8f66d3b389efff317b1f93b693ac
+AUX yaboot-1.3.17-nopiessp-gcc4.patch 1495 SHA256 b49b64f54de33026f9a8238685735bd737f007b898650b2a42eac4c4dbbc205d SHA512 30020247039f29e78799b5fa3e2054510294d266feb2014e02c3129dfccf67e7a9da3f565b1b3b9bcebb81d359dd15bc45fdec5f3fa37d15e913fb634409324b WHIRLPOOL 6c871e84e5f29bab65d29c2a355be9e88795330f8ea921e8ac1bfce6909dc30fc8b99b81306143937c14c256f042a371f4b2558b73fd540a4741dd0a676534ac
+AUX yaboot-nopiessp-gcc4.patch 1623 SHA256 61775623e47719ee0dfce343fa86957e17b4e40c6e695c254b1862cefa428fa1 SHA512 02e44f87a4c82bd218ba3e51cd76fe08b47552251193e9da8c39fe79b736387e7deceb4b4687b28924271e6f673cec1050084cfd85fde365c61ecd3a81eead77 WHIRLPOOL dc26c7135091deaf1779b1e45853e7ef869f3d44cf978ac9e331da57254ada63abc3932f1d948732035ef2e7e59bcf9ed33bc0a818e67b046c1f07facf3f22e9
+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.17.tar.gz 224325 SHA256 2fb738d8fd48b94ab2534a4fdf63738ad02c1a30f4b2add91f837baff8fa2aa1 SHA512 da910c4c6ca2de817342bf4dbcefe2857606043e614782581a86bae206cf6cfe5597ad47aea15369feb60e02d8a4f9f4aa3b12863d715c757584c1f4d7ffb9de WHIRLPOOL 8440faadd955aae0484a2d05c4b712d40b9f438224bbf26b2cf9e178944a007aeac779ae7a9ef2431f2404b24440930d34a63b36f46d8c58d4b7ce98af5c92bc
+EBUILD yaboot-1.3.14-r2.ebuild 1273 SHA256 c0c6c58702763ffe0acc34119d6d740a140a43af7f9efae2db45252a8dce22fa SHA512 f40c5d2bd73b6d9f7ea4f1f0935af6daba2b18603f47982c296f39283d242bea12089dd33e30997a46040b1517e2e6fcb2c0d6a368a94d5316b6faa13b8472bc WHIRLPOOL cb28b43497ca1b6de285f81e2c71ef5dee886c2432b9e3d4efa673b462a84f768304b0940365b99447aabd50fe0f979ea4366ffaf47ee575299df170abdf13d4
+EBUILD yaboot-1.3.16.ebuild 1343 SHA256 14aa16f2f61185ff27117d64f300a7bb61505bd3ab6cef4b93f2f69764a0780a SHA512 06fc70fb5f26012b7c6eb1349c1295b0b47498e62caada5ff70030b2950c25381bb72dbba627b2f0f584a48528269885f3ae431b42734ec29d3f4b26d41363c7 WHIRLPOOL 279a44187ef53faca1ebf7b09650e3b9ceb4d22e4127c961b55bb6836833d669849ca86b16fea674ad51eed60dea021f6c0d2278d359cc46ae35f5250618527b
+EBUILD yaboot-1.3.17-r2.ebuild 1642 SHA256 5318af00d32e7e07b97e040e57d402be767beca55f9295b49f98065562688b95 SHA512 19900be65a201d6e8b4132f5e753f6c00cfcc6eb32eb3c7f55eb29c34955ed98ba64397156dfe65b6d203430741bc3ecda84a3ff069957e22182ae3308cc6b11 WHIRLPOOL 0c531aacd7b39dc451c6779a446d9e636b5c0b493f2cc7bc6d1331675043ae4fdcedc50217104d7c08a6bdb61306ef0c36e57994c159bcca88d96102e3a5c765
+MISC ChangeLog 11188 SHA256 8aa7ac16dbb7cef5ceb41514a3a9897fb6f065ff89c98fc9a0ba2dc950b9f379 SHA512 10db27cabb87b7561623c3f2a3e0dc1306b79f4461591c87913491f984235398c92ada045dce4e1415d812c6b7c6e3763b6fcee524fdf12e3960c9c63f651bb6 WHIRLPOOL 6c76f3d2fd5bd8f17c0e45e5178537dbaba22000ab6ba0668093f31f73dfd87f873a97147debb455d2f6a445a9ea5d13a400b781b6d5d57558ecf6e99ab9bc50
+MISC metadata.xml 175 SHA256 123ecdec2aa3d066ff52ce8a8013191ede4c949290dad2afc2a2c505500e765a SHA512 9933194f53703c4f34f6b7145e9236acfa60669c9a036c2c9da309f1adec5f4addf508040b7be6b935dfc36ed652dd3b2cefc5e48bc48f0e01c9def0022ca7e2 WHIRLPOOL edb132936f3b6adc3944344b9e2b57de7a126febbc799869e3838933eebd307d02c99f3466aeaf2ebe7d3fd4c9cab66c56fbff0e8b02734314c20926b4a11e46
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEARECAAYFAk/h1h0ACgkQcsIHjyDViGQmmQCfatlGn1ix2k0MdY+5cmABLf18
-TOQAoNQ9SSwViDZFDeVIx2m0AjZfkonh
-=VH1O
+iQIcBAEBCAAGBQJVWBRiAAoJEPGu1DbS6WIAY5AP/io7zmPdA62GoE2QE1RI9Gwa
+W9jNap/96fxlAU0AyiHI1FqCXqxhH+oWKntitJ7FEoQldbSzZ4p0K5HMHQXgfPAs
+hV6ZIF4vcxxEx8+Jx09vXy3ehgQ8+2w5Di+MaEfjRxEDFoyeV4u8iei7lty6HcpB
+0l1U5X+tQfJqg9qQVRXoM1Id4hCqbQ6OsvK/xl13mIOa7uGIffBmGGVNDVqT0oAe
+/0lfllTPt/rA2NEXq72pbbMojaphdPp8HMFeZp0OHkLH2+eL/lNahj+qiZoYjUdi
+UZSH2xUpd7sP8xX8syT1uJm2eq/Aa9hbIcewG1WHjji5diVFF4mSiBUEc1t4n+m2
+b9g1uh5K5MS7wKM/UzAw3bDpPMup19BzCvJ+P4s3EYQrjqKJ6MC73+YJiyncrhdh
++DwKq6wnlDHsbMtJ2M6Ko0kYnRtaaVq7nnGuB/bGEGyn6uUtDr9WxZJiAFZlPM3M
+Hoz0+7ThEbujO+zkslk3cYEvSZoNz9AYfXV9PhQGur9AeMRjnfOxcZzL7ejfq7M/
+hknvSYakntxUWIiWOUSKBiH6fbKRnW8GPQ1dlu2GKthWXPFLichj0c/D8029LshC
+0xYSJhgtWaGzEYnMY9Je+V1SOf9kYlkU1zpZcEbVaMVEv9fw123RTgfJk1WrUDWB
+uu7wWRNvQngYsbpfvnDy
+=jFCg
 -----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 af1461d9f135..3d452c60c35f 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-2011 Gentoo Foundation
+# 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.4 2011/04/10 14:23:30 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/yaboot/yaboot-1.3.14-r2.ebuild,v 1.5 2015/05/17 04:09:05 vapier Exp $
 
 inherit eutils toolchain-funcs
 
@@ -18,8 +18,7 @@ RDEPEND="!ibm? ( sys-fs/hfsutils
 				 sys-fs/mac-fdisk )"
 
 src_compile() {
-	export -n CFLAGS
-	export -n CXXFLAGS
+	unset CFLAGS CXXFLAGS CPPFLAGS LDFLAGS
 	[ -n "$(tc-getCC)" ] || CC="gcc"
 	# dual boot patch
 	epatch "${FILESDIR}/yabootconfig-1.3.13.patch"
diff --git a/sys-boot/yaboot/yaboot-1.3.16.ebuild b/sys-boot/yaboot/yaboot-1.3.16.ebuild
index ec8c6f02361d..05b25ddd2f62 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-2011 Gentoo Foundation
+# 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.5 2011/05/22 07:48:57 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/yaboot/yaboot-1.3.16.ebuild,v 1.6 2015/05/17 04:09:05 vapier Exp $
 
 inherit eutils toolchain-funcs
 
@@ -37,8 +37,7 @@ src_unpack() {
 }
 
 src_compile() {
-	export -n CFLAGS
-	export -n CXXFLAGS
+	unset CFLAGS CXXFLAGS CPPFLAGS LDFLAGS
 	[ -n "$(tc-getCC)" ] || CC="gcc"
 	emake PREFIX=/usr MANDIR=share/man CC="$(tc-getCC)" || die
 }
diff --git a/sys-boot/yaboot/yaboot-1.3.17-r1.ebuild b/sys-boot/yaboot/yaboot-1.3.17-r1.ebuild
deleted file mode 100644
index 8cf06536b7c1..000000000000
--- a/sys-boot/yaboot/yaboot-1.3.17-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2012 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-r1.ebuild,v 1.3 2012/05/15 15:17:48 josejx Exp $
-
-EAPI=2
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="PPC Bootloader"
-SRC_URI="http://yaboot.ozlabs.org/releases/${P}.tar.gz"
-HOMEPAGE="http://yaboot.ozlabs.org"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="-* ppc -ppc64"
-IUSE="ibm"
-
-DEPEND="sys-apps/powerpc-utils
-		sys-fs/e2fsprogs[static-libs]"
-RDEPEND="!ibm? ( sys-fs/hfsutils
-				 sys-fs/hfsplusutils
-				 sys-fs/mac-fdisk )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	cp "${FILESDIR}/new-ofpath" "${S}/ybin/ofpath"
-}
-
-src_prepare() {
-	# dual boot patch
-	epatch "${FILESDIR}/yabootconfig-1.3.13.patch"
-	epatch "${FILESDIR}/chrpfix.patch"
-	if [[ "$(gcc-major-version)" -eq "3" ]]; then
-		epatch "${FILESDIR}/${PN}-nopiessp.patch"
-	fi
-	if [[ "$(gcc-major-version)" -eq "4" ]]; then
-		epatch "${FILESDIR}/${P}-nopiessp-gcc4.patch"
-	fi
-
-	# Error only on real errors, for prom printing format compile failure
-	sed -i "s:-Werror:-Wno-error:g" Makefile
-
-	epatch "${FILESDIR}/${PN}-stubfuncs.patch"
-}
-
-src_compile() {
-	export -n CFLAGS
-	export -n CXXFLAGS
-	[ -n "$(tc-getCC)" ] || CC="gcc"
-	emake PREFIX=/usr MANDIR=share/man CC="$(tc-getCC)" || die
-}
-
-src_install() {
-	sed -i -e 's/\/local//' etc/yaboot.conf
-	make ROOT="${D}" PREFIX=/usr MANDIR=share/man install || die
-	mv "${D}/etc/yaboot.conf" "${D}/etc/yaboot.conf.sample"
-}
diff --git a/sys-boot/yaboot/yaboot-1.3.17-r2.ebuild b/sys-boot/yaboot/yaboot-1.3.17-r2.ebuild
index b499e2de1cd0..9c08768e3586 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-2012 Gentoo Foundation
+# 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.2 2012/06/20 13:54:25 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/yaboot/yaboot-1.3.17-r2.ebuild,v 1.3 2015/05/17 04:09:05 vapier Exp $
 
 EAPI=2
 
@@ -48,8 +48,7 @@ src_prepare() {
 }
 
 src_compile() {
-	export -n CFLAGS
-	export -n CXXFLAGS
+	unset CFLAGS CXXFLAGS CPPFLAGS LDFLAGS
 	[ -n "$(tc-getCC)" ] || CC="gcc"
 	emake PREFIX=/usr MANDIR=share/man CC="$(tc-getCC)" || die
 }
diff --git a/sys-boot/yaboot/yaboot-1.3.17.ebuild b/sys-boot/yaboot/yaboot-1.3.17.ebuild
deleted file mode 100644
index 1fac8bba0e1b..000000000000
--- a/sys-boot/yaboot/yaboot-1.3.17.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2012 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.ebuild,v 1.1 2012/02/24 15:15:33 josejx Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="PPC Bootloader"
-SRC_URI="http://yaboot.ozlabs.org/releases/${P}.tar.gz"
-HOMEPAGE="http://yaboot.ozlabs.org"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="-* ~ppc -ppc64"
-IUSE="ibm"
-
-DEPEND="sys-apps/powerpc-utils"
-RDEPEND="!ibm? ( sys-fs/hfsutils
-				 sys-fs/hfsplusutils
-				 sys-fs/mac-fdisk )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	cp "${FILESDIR}/new-ofpath" "${S}/ybin/ofpath"
-
-	# dual boot patch
-	epatch "${FILESDIR}/yabootconfig-1.3.13.patch"
-	epatch "${FILESDIR}/chrpfix.patch"
-	if [[ "$(gcc-major-version)" -eq "3" ]]; then
-		epatch "${FILESDIR}/${PN}-nopiessp.patch"
-	fi
-	if [[ "$(gcc-major-version)" -eq "4" ]]; then
-		epatch "${FILESDIR}/${P}-nopiessp-gcc4.patch"
-	fi
-
-	# Error only on real errors, for prom printing format compile failure
-	sed -i "s:-Werror:-Wno-error:g" Makefile
-}
-
-src_compile() {
-	export -n CFLAGS
-	export -n CXXFLAGS
-	[ -n "$(tc-getCC)" ] || CC="gcc"
-	emake PREFIX=/usr MANDIR=share/man CC="$(tc-getCC)" || die
-}
-
-src_install() {
-	sed -i -e 's/\/local//' etc/yaboot.conf
-	make ROOT="${D}" PREFIX=/usr MANDIR=share/man install || die
-	mv "${D}/etc/yaboot.conf" "${D}/etc/yaboot.conf.sample"
-}