If USE=pgo tuning fails, ignore the results rather than aborting the build #456346 by Justin Lecher.

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

5 files changed, 47 insertions, 33 deletions

diff --git a/dev-libs/gmp/ChangeLog b/dev-libs/gmp/ChangeLog
index 9f86b7e3a3df..90f0b162c5d0 100644
--- a/dev-libs/gmp/ChangeLog
+++ b/dev-libs/gmp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/gmp
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/ChangeLog,v 1.177 2013/05/21 18:48:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/ChangeLog,v 1.178 2013/05/26 16:14:48 vapier Exp $
+
+  26 May 2013; Mike Frysinger <vapier@gentoo.org> gmp-5.1.0.ebuild,
+  gmp-5.1.1.ebuild, gmp-5.1.2.ebuild:
+  If USE=pgo tuning fails, ignore the results rather than aborting the build
+  #456346 by Justin Lecher.
 
 *gmp-5.1.2 (21 May 2013)
 
diff --git a/dev-libs/gmp/Manifest b/dev-libs/gmp/Manifest
index 53de47510401..de8a376e339b 100644
--- a/dev-libs/gmp/Manifest
+++ b/dev-libs/gmp/Manifest
@@ -38,25 +38,25 @@ EBUILD gmp-5.0.2_p1.ebuild 2842 SHA256 7631e4e1703d8bcd6098bd4dbda141f402a627bb5
 EBUILD gmp-5.0.3.ebuild 2765 SHA256 528f4aed6b044fb4a8c8fa86bb50ae7960329b03a5d3b11cd5d4945a4e20bc75 SHA512 910d8abd30caced65698b35c2c0952bca95a949e5739e34c840bf7ccb4f811c5599968f4941dc46eef466a2e3da8ef737858cd65c6b2743b677f69c6fbdc3ba3 WHIRLPOOL 5cca010d59b5d72b6dcc2b63bf6acf12ea70cdb2c5881420f68f3de032738ce1ad53b4862d899cd18ae2d3ad57fc04ff490a731e1aa88d22956e8158d326e534
 EBUILD gmp-5.0.4.ebuild 2761 SHA256 96b6aee15c93e99469a140052e4b2dac8a1556db35c6c2d122eae407309f6be5 SHA512 d4540c5a3450b606441577dec1af437cf09721d4cbb0270f9ac630d23b57f01c7449db2941ce97e9541f2fded333c705db01bf911224c923682b6b0d1f369010 WHIRLPOOL d44520d7d9a5e81de7ec6cb661f6a64bc2acdad1f60e747ba61559607f79049f5098dae4fe4fb7924ed760b5bffc9d27d13c8d58053bd4431d8e8d31c6666c2d
 EBUILD gmp-5.0.5.ebuild 2759 SHA256 5db00b82a974c7da6f5b9b78ea27d5948bc99c5b02d2a43796e9dbd3679e2451 SHA512 90e70ba4e9b93ebfb1d3fb780408c0f3558a7a81e55ea102dea2bc5c08cb85f11a273eede7171561988c873708ae1273a7a679dfb9be347dd8d035fe7982824a WHIRLPOOL a76bcf9cdb2b301704475faaecaedaf62b8e047caad370995b81b2e532b1743a9186763d4cfbb8675c3c587262fa068f17d1b390c8d0fcf5460ccd46ceef7dc6
-EBUILD gmp-5.1.0.ebuild 3008 SHA256 c95e71d28d0bc53653527a9e48efdd3d3659552e1ae1fce48b893c790abb8c87 SHA512 6ec72d63ff0f8179ea61af3587a387d8b2739cd5879640c79ad98a2410e4d3733144817eed43786ac7edfc2d292477d11cd156f8bec8459f35f9df84ace4110b WHIRLPOOL e570cbd57e421cf3d35a1fe95ced8475d9260ba93c29e12e1c2e45ca3eca5cf44139bd6c2fd71262a1081b82b7c715461aae6a05c828ba350861a46e198d8f2b
-EBUILD gmp-5.1.1.ebuild 2956 SHA256 a5aa032749ebc4a9c459ecb5d00e313bae0c3e5f42b512ffb4fa92145e50dd6b SHA512 3ad7f9bcbc9333a271654075f8aafa15a76dbada237b2e7fda6428e3d019460f4635e1cb246298f4e33f1f68a264804631a14d74a11d7d76432cdbfb7cbd2038 WHIRLPOOL efb5e0f7770e539471ee0c387ae80cd5b33f472236c069fa03f8e605cebcb88eced91a4ff6327238e7fe4333d63d91515720e05b449f40431ae6608e24433dc1
-EBUILD gmp-5.1.2.ebuild 2910 SHA256 a3ddd60882b8926b7422f9424713300c05cf07ad017ba7255c14f94f339ae877 SHA512 cf59084c30fcb9e8bec6a7946d6410565ddb2d0d9df25d55863b729eb0cb914931dca06648bfefeb7cf2dd30ce441f00573598a651a43c17bae21b79297a1c1a WHIRLPOOL de3256f963bed6d1514e7fa03f1b4e520cf4b3503efecc947b21a730d4b42748c2cd4819312570aabd46abff0e6169478349b1be102fafbc094f369e1cc928cc
-MISC ChangeLog 23448 SHA256 4a5c9e4497649965e0c0e52a4ccd9418bf8e473c323628424e1d2df14a5783e4 SHA512 59fb6ce74c76f5dc6eb14e440cbce63825102c72bb97b531871dbe2458b2c1a8fb809601f9e26a2863b6bf2530f8d443b0c3ae91f5c9384192ea03649b6973c6 WHIRLPOOL 7da6edd3fcfafd44e766f7582f7b0dea6e72a594dda71129beca96a2890bf508c2c3c6e2600cd36595d03490bc7ccc176040d9638982f518d4b2f052934b82c5
+EBUILD gmp-5.1.0.ebuild 3120 SHA256 4210039c47b340af11aaf6455e65a2e86bdb400a192825e942bf2c6a29589ced SHA512 c31a265ad8a23aae3425e80500e0e64cdf9783f003c5768fb2cbafcb264f9608d51254650945ff993c895f64bb50ba24b2c00967ae939b492e9fe7ab7321eaeb WHIRLPOOL ed27f4f3e51eac8a18f41e3ae26c3a522adc09c63ef7d8affcc30222506d9816f7681c1e6650dfb2853f786a2c0a2297b440c78f98764a5775ad24ccb236457c
+EBUILD gmp-5.1.1.ebuild 3068 SHA256 9e50599c1339a519972ada85b6fafb7c5189ea4edaf76e1285023cac36d63e5f SHA512 511b63ab427744f9a73f27193414f52fc2bc596919b9a9b019974de0576c0b1a9ce5c293e8fdd6fa9578ab0ca85d09066ba9e01616d0408a0c89224d7e8fb20d WHIRLPOOL 966a8af3cde957283aefc4d7190185b86cf6d2d9f5f837c80d3744b7b8c6be07b15f480846b29be2ab6d15e14855e30757a36b0e8470f933731e16621c9ee066
+EBUILD gmp-5.1.2.ebuild 3022 SHA256 2c8f0a2227c7dbf458a4dfa9daf0560b3b60b6391c4bd24242054138aeda7905 SHA512 9d3a343945fbfa3afc7ea853e6baca5b950bfc6973ce8ede480c8cddd7dfa5babd6800284a240980763e3b3a8461c0a203433394b2fa5c22b428f76e993021db WHIRLPOOL 4fe671c4b509a5eb64a5bd4c48a9133bc091eba739668999c56093356c8b78339b11c097fa515b8d5e789c18cb78deb7b6cfb1f495b0f5a929c73cfe477f32c5
+MISC ChangeLog 23660 SHA256 a189ac79aa894ac9f3f12a793630fa7c8f56402b8e66d084c463dd5007a40a34 SHA512 46173894a61190a7a9aaac37ce779956bdfa91564f4a75db1d1525597818505d05766dd1fce1d502ebebae66875bff4e6daddb53735b7b9cab894c2f8ea35f51 WHIRLPOOL c95b9a9163f32503faaacc93f85678c22656d324b9610f3850c1a040c7f4afba3030ba7e05d420a417fe6fb3e69208937cf42a864dd81e70cd1e8c57d66feea9
 MISC metadata.xml 315 SHA256 f6cfb0b2b72dab3e088b68df3d21db3f8463b30571e6de17d1431a57f1bc8d26 SHA512 109d0cbf90eff7264eb6502397024425664d8349229ba334797fcca61852e92ea2c3064579c4765793a69e2811a44ffa63b3091f2ffa5a433dc22ab308a2bcba WHIRLPOOL 3320121476ba2740ee9ee338374cccc853990f229e0cb3a23b5c0ed3e925485f5fd4b797b04ec4ae419eadfc5b9a057dcd9435fe507cca65560e09ad158c1ffb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRm8FoAAoJELEHsLL7fEFWnsoP/AglzAf355C7ZlbN5/TUmT0/
-fL8NQXm4Qbx7P9WBbxQW5UuzjNSs22G7t2eIGtcnbrx56688c+AfJq4u1/c2VJmD
-9YEcoHgW5RXJrDaiICIR1HEzsj2WciCZq7nKfgm81tsRwyYmaHQuXae0NVJT4L3x
-2aMLMu46cvyyX6gMHjIECdHiGCarAwff7Y/WCFQJM6Nj6sLjL2y5oVpjqz++SeC1
-qMiBmSEK9VZxLsUZfO5ra2Q5vz1jl5NjWM2pTKqpYWKYdpUP3UcsWkJknwtRSo47
-ZAjU/Aouh7SQdgqR+CcwivtG14jUGwl7ZQK9kWtcl5VMZiwk0m+P9F5btFJlqa55
-Wgusb1ZHFTDJivmOPhDFS7EcqVy5eUR4lquZWZKtPBFzdtUxMLRnOycgRuPtWD2R
-9LNSgJfjrPzutbwSbLZ/EcV+Cy6XxTFdNjx/b1glUcuUuLVlIB6ScwFHVoe0hgEm
-i1qdOCay28celkhzM6y2pTAcd6RlJtDCmHKbMT3JTdL6TS6dIor18yTlGJHwBi6n
-bKpctp3ohFP1M1Ip6bzaTrlHCt/FDBE6imxFj6SGA1/5DEozs2RPLgJMt30zNxDW
-eVpMeiZQE0zS/IEgYP3OIi7Aay/dezqMzrgsu6xDPf6m2pOLN8vEGs6UC5efLgii
-u4jPqhENYNXG1nR2UPZi
-=HwZz
+iQIcBAEBCAAGBQJRojT9AAoJELEHsLL7fEFWxn4QAMdCbfatK4QOmUHFTmGEIsW7
+yIA3y+QkzniyL5qYKxVwC/AlYSjU/Zv4rBrVUCOX031CjpVW7AdXUuzkleCnjQE2
+QznG90WCUNWJdZbGc/LqDdG+VtTtLYC3xBYQgXKpjkz93zkyF1mX897GA81bUWA1
+3yJtMMxkTRnTOYavaset0sB66yzY9JXfizBDp0C4TCoII3aZ0FhFlybfCmdcQ0xs
+zpcW+DsQTJqBM/J7Cek4BDpHL9haAJrI665Ku0X5NTh6yEbUKL7TW5r42PQ1nG8s
+dbPkwLcC21Ytg0yZL6Eu92i6Ftn/yIO5zZzy8CGzDXErywK9MHbWNOWodrAVfUP1
+r6aaHDRLE9OUEtNUVolqJt/u/SSek0Isk0dW5ZSPwUtwXGKdEZ4gLUtO5zLkWCyu
+UmTatUTOeMM/hy6q2N1hIuQXHBkKSDHxnbuq7MF5b02ps73/cbAFbnYr3f6B9PQK
+3rj5Tu++t99Q/mBTYZBrdwyD5rcoxEa1gVPv+BO0JQIFoOg7Q/IjQpDzyFUaDERz
+nuOB7poNMbnVr+NX+eNGeqftmxWKDpsKWDwqleVTJMlIpCLSqIUJI/uQh2KBNjOL
+b7O1L5JCxSp3hTlOgaIpHg/5uzgTEjOqy4dQpEZd7DftpmSzQ7a6t1R2j9cLTdEr
+446av97LjARfFEMn744F
+=yonZ
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/gmp/gmp-5.1.0.ebuild b/dev-libs/gmp/gmp-5.1.0.ebuild
index 79705b0eed1c..53bd77e77868 100644
--- a/dev-libs/gmp/gmp-5.1.0.ebuild
+++ b/dev-libs/gmp/gmp-5.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/gmp-5.1.0.ebuild,v 1.6 2013/04/21 02:21:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/gmp-5.1.0.ebuild,v 1.7 2013/05/26 16:14:48 vapier Exp $
 
 inherit flag-o-matic eutils libtool unpacker toolchain-funcs
 
@@ -75,10 +75,13 @@ src_compile() {
 
 	if use pgo ; then
 		emake -j1 -C tune tuneup || die
-		rm gmp-mparam.h || die
-		./tune/tuneup | tee gmp-mparam.h
-		emake clean || die
-		emake || die
+		ebegin "Trying to generate tuned data"
+		./tune/tuneup | tee gmp.mparam.h.new
+		if eend $(( 0 + ${PIPESTATUS[*]/#/+} )) ; then
+			mv gmp-mparam.h.new gmp-mparam.h
+			emake clean || die
+			emake || die
+		fi
 	fi
 }
 
diff --git a/dev-libs/gmp/gmp-5.1.1.ebuild b/dev-libs/gmp/gmp-5.1.1.ebuild
index 25e03b2bf9d7..9d6fcdd74c7a 100644
--- a/dev-libs/gmp/gmp-5.1.1.ebuild
+++ b/dev-libs/gmp/gmp-5.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/gmp-5.1.1.ebuild,v 1.2 2013/04/21 02:21:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/gmp-5.1.1.ebuild,v 1.3 2013/05/26 16:14:48 vapier Exp $
 
 inherit flag-o-matic eutils libtool unpacker toolchain-funcs
 
@@ -74,10 +74,13 @@ src_compile() {
 
 	if use pgo ; then
 		emake -j1 -C tune tuneup || die
-		rm gmp-mparam.h || die
-		./tune/tuneup | tee gmp-mparam.h
-		emake clean || die
-		emake || die
+		ebegin "Trying to generate tuned data"
+		./tune/tuneup | tee gmp.mparam.h.new
+		if eend $(( 0 + ${PIPESTATUS[*]/#/+} )) ; then
+			mv gmp-mparam.h.new gmp-mparam.h
+			emake clean || die
+			emake || die
+		fi
 	fi
 }
 
diff --git a/dev-libs/gmp/gmp-5.1.2.ebuild b/dev-libs/gmp/gmp-5.1.2.ebuild
index 2aa5764c3fc8..baa4a6d20bc3 100644
--- a/dev-libs/gmp/gmp-5.1.2.ebuild
+++ b/dev-libs/gmp/gmp-5.1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/gmp-5.1.2.ebuild,v 1.1 2013/05/21 18:48:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/gmp-5.1.2.ebuild,v 1.2 2013/05/26 16:14:48 vapier Exp $
 
 inherit flag-o-matic eutils libtool unpacker toolchain-funcs
 
@@ -73,10 +73,13 @@ src_compile() {
 
 	if use pgo ; then
 		emake -j1 -C tune tuneup || die
-		rm gmp-mparam.h || die
-		./tune/tuneup | tee gmp-mparam.h
-		emake clean || die
-		emake || die
+		ebegin "Trying to generate tuned data"
+		./tune/tuneup | tee gmp.mparam.h.new
+		if eend $(( 0 + ${PIPESTATUS[*]/#/+} )) ; then
+			mv gmp-mparam.h.new gmp-mparam.h
+			emake clean || die
+			emake || die
+		fi
 	fi
 }