Always use built-in ConfigParser to work-around issues with configparser-3.2, bug #500856.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

5 files changed, 69 insertions, 21 deletions

diff --git a/sys-devel/llvm/ChangeLog b/sys-devel/llvm/ChangeLog
index e632eee3e4a6..9a680741bd2d 100644
--- a/sys-devel/llvm/ChangeLog
+++ b/sys-devel/llvm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-devel/llvm
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.197 2014/05/11 11:17:08 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.198 2014/06/11 07:49:45 mgorny Exp $
+
+  11 Jun 2014; Michał Górny <mgorny@gentoo.org>
+  +files/llvm-3.4-cmake-configparser.patch, llvm-3.4-r2.ebuild,
+  llvm-3.4.1-r1.ebuild:
+  Always use built-in ConfigParser to work-around issues with configparser-3.2,
+  bug #500856.
 
   11 May 2014; Michał Górny <mgorny@gentoo.org> -llvm-3.3-r1.ebuild,
   -llvm-3.4-r1.ebuild, -llvm-3.4.ebuild:
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index bf8137ba91ba..3684fa8a74f4 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -29,6 +29,7 @@ AUX llvm-3.3-cmake-modulepath.patch 916 SHA256 9d0a00b543c4db58cc65bcf82bafd0aba
 AUX llvm-3.3-gentoo-install.patch 5321 SHA256 4f2e80f5567227e3539052a743ef0432f108d76e6fb9ba373dc51dbf159e0410 SHA512 90075d4bb5bdefb76bfb191dcb1b618de464434d9d084b2f99cc5034d33b112378f9aae1d289d30a2f8926132c17ea32ba1bf4049c3a61a418d37f903634b259 WHIRLPOOL 39b3ce4e937985483be7b4d19a37c0837b3c27f308f09fe8aee185b9fb43782b540f6b6be042b8f6dc4b5037be64284e2e233e65b3558e4b4eb1095a7d586a4f
 AUX llvm-3.3-insecure-rpath.patch 881 SHA256 27d893e5f551d245f15c01a94df81dd9ad069c2a980cf6a8860fb429eb37a5d8 SHA512 f03d1f522d0153fcbef677bf85202a6ddff408362d9ebc3e4f9f21814b43d28b033b0efb3ee86f5c11a4ac3a91b8afc80d022bddcd839ba503b29cf946e40218 WHIRLPOOL cfca8d189f88c0e26b4c3091db6c4267a90307c5728e64ee3ca55272a884389e56ed186904d9d66b44b870792eaae049cf6e66ee38efaf757655a4be4a0cec6e
 AUX llvm-3.3-r2-gentoo-install.patch 4043 SHA256 a8e24328888dc0459fb5c24e244c30baf7f8ec75875fc7293f9e1029d75fb1f2 SHA512 f829d9f8e0d5730a8221a8be9a1d87c7c79a09f498f00d5f9cb7d1172dcdcb2ba1b68b8b5454225dde230d642240d0f647439f34befa23b64156b2f7c2247027 WHIRLPOOL e937127359c474bb843cef34116d2ca8651c4d22ef7ebfc8cd2a22537e483cfdad7e78c1fc4a7d4bee92fa19995bdab9dc8b7cd96594f114ddc9a6af4604ac63
+AUX llvm-3.4-cmake-configparser.patch 1182 SHA256 b5d61e4882e301b361321c3bc69cdee6398b97bbb86ab3895879def6e18907bd SHA512 06e792016a6d7d091a5e15f8a13678e3e59e87bef591f9340ef427c820d0112cc22b7bc9ec57c7066da7f9bca3841a558bd98c71aa7df2aa2da75e53260a5347 WHIRLPOOL 8326541d632a6d4abf8d6444384932a395b6640d8b7f91c8ab29ae9acdd11922acd7652a9e211e5ad704016744d980d0087dbab30b09cab62e160ceed2236936
 AUX llvm-3.4-fix_varargs.patch 6427 SHA256 b764d5c8e2c25aa2634834522aed973ea6ef367d65eb7bed6fca19255af80f82 SHA512 cede7ea9aec7d27dd2ad4a41eb79cf566a03c9384a0fe1b07b52bc470d97a0a54735f5e09ee78cbf2323f28bb3f191e30a6f7454967975791cd70b96e09538d4 WHIRLPOOL a238ba38b5ea13ce7a2d96d4ca2853ff563988b439e4b8dbf99fb6789d46b260469190c7ffe11d5012ca2cb77a8c2be6a95722a3df2aed841938179b219cb6e0
 AUX llvm-3.4-gentoo-install.patch 3528 SHA256 fa2de6dd186091b255832a9b5cb654edddd4c4a16f0f138357c813a40aa9a75b SHA512 e946e1fd422f49d2e150bd641bac0ffe6ea6757b2e6119465090a3c7f5cf69e17c00221bcf67a7fcf29628d93463fb1c57d0d009ff7834151440d779f2d33484 WHIRLPOOL 171f167802ee289716232e16a2c507e3b8dc7913b40df29c55a815ff88596871a1a970c891b0e9b361186cada4d8898e65920d014b4e6eb2178cc207f61bf6da
 AUX llvm-3.5-gentoo-install.patch 3204 SHA256 0c97173613505ea92f0aa79d4e04e797f1917fdc33b34daee05752bb52336d53 SHA512 f60b04f1fc7798f7869f3d80e4c163086c398e01b81220d60ccff42be5899fa036d5ab95257933e89e4c5efd04267a09015917c6a617b86b82d7ab4f5d0de221 WHIRLPOOL 81ce5835b9eb1fe1b162f35d6e37762cc8d613e67c5791f078ecd0e354a87eb92e52452bd6e9a7f70953dabea99d197786e87ed64dc802223149b8e97d6de265
@@ -56,27 +57,27 @@ EBUILD llvm-3.1-r2.ebuild 6033 SHA256 9b9a587d30419fa646764a96e12fc6272f73f72461
 EBUILD llvm-3.2.ebuild 6534 SHA256 eb16cc91887fdb035722d268caaa3e4843825403786fcf74643be2c6f8099f11 SHA512 e781a4e4416a4acee667029744dab7f8e52022df4fcbb89d4d9acf855549f1c0a1661b79ee0067fd052a36bad278f08a2ff7f6e6e44d8c3ea7f82910ac573d9b WHIRLPOOL 115d13959a22867266dd7c0133109ccba063e97972cc2c807fb7a6dd7d3fbef1726caf314e262f6683a97a2c3a6ff776f808de7d80923472fc692554eccbca27
 EBUILD llvm-3.3-r3.ebuild 14172 SHA256 c005ac1508cd6a2b9998be4e22f82567a6b0bd0ca46e05f33500bab04557e70d SHA512 1bebfee461f843ce6dc014510b99cd8f32cc9f0073e4c1bb451d129fc4e694568efd1ea7825c2166f4f6f51dc7be976871191abbfedad3ceab640ac4000720bb WHIRLPOOL ddbdc502a36739b670d3342c41beeaf5b818992559e5e04b2dd0af8cd6834dba4cc801759ae25adc0f1834be8cbf036bb8dff92585d19e20b563343ddf3193f1
 EBUILD llvm-3.3.ebuild 6798 SHA256 4e53042e76ce97e6a460cda74c5dbadc1cee9009345e8f0232e28d53c8f77579 SHA512 5513887c3b5a25a678713b68c216a40801ddecbf5a4dc58d7ad01c1ec8411589e20d8662c34f117e6d64924302504c8ce74b48f3edca1f292b56881eb6176271 WHIRLPOOL 79d6adefc281699477a271f76cb8eb7992d0946b6fcda9149a0976c30138ac882f735eff08c25c0edf37ccc8e31700f6d2d51d38c354c82c06695962e8f9243b
-EBUILD llvm-3.4-r2.ebuild 14631 SHA256 6f431774014c184da35a23c2ff810be515a04dfb169136ec7cf24c6e853f36e5 SHA512 a1adbbd6cb7c478f76d764311bf47e2b77fb298708e20df93f5678bd2ecbbe8a1623f89e97c5a4d88f18981d8f3e2d575355ce1b57607887c5e8cd6df52ec6b1 WHIRLPOOL a5343138214dcbbb61c3c06d8e405cb5ecb690eafd6a90a7f6d1d20a00db0a82d703aeea6f0db81ccfb312ca9c19c6c958c368ada2ead2369e2d6cd46fee1f5a
-EBUILD llvm-3.4.1-r1.ebuild 14874 SHA256 fb0036f7a51eccbfb8a7a0db9059001e6fea00707f4023828a920f526b3c673a SHA512 8b9cb5f38b2ad30f17ef5733ea0f37b19ef069475dff588a268616c7c1c31d0ad81c63d8763e388a6198c9b25c3d18a7954bda73f9fcfd171e6fb63d258a6b25 WHIRLPOOL fa30c98aea48bdc1b915d8411f052d419cc38f6ccecec65382a7d37e662e31c2722a58c7829c4f7dafc23419b64f18adfda2ca1ae4355f7a430479cfbf8ab1a3
+EBUILD llvm-3.4-r2.ebuild 14807 SHA256 c1a3877f54a9c6568fdf19a821f1eb7fa9fbbbe564b6ab7ba203fadc0e806dc4 SHA512 7c501335b83ef0d75200154c1855ca216006fee22b098f5d34336ca26dec58727d2003b7b30959776505b9ea4fe4d209a8b0dfeb44da4950d03e960ed2fd52fe WHIRLPOOL cb6903c6577f8ce9a4ff29550e0980be2cb79e4734c7d25893acdb7460256f9b71070ebac2ad3302ff67c522bd01e9cf691604c3cac41a6fca6ee14849eb0169
+EBUILD llvm-3.4.1-r1.ebuild 15050 SHA256 5d9d3c67d9d099e839ea4c6198377de00049769639a1eb539921e9b571241fc3 SHA512 995cb83cc9489831a35b8ea0c2ec973213e58b7ed930883d28dfe3d837373bb1ef481754e1e37299de14ea965f1bb23d884a015bc75b91a40b9fc180cc3f843f WHIRLPOOL 0251e4057484d61cc982d5c028ebdcee79271e65a20f987607a5d3f0f4c2fc728dc58c687e6d59a75612790a4b5c23e36f842f0152cf4677573f7f8960fd88b8
 EBUILD llvm-9999.ebuild 13012 SHA256 c39f0fd55460f8e6d75260010f0d62c06d1f2f270017f56e385954d9b4a4d536 SHA512 1c29299eff893525ac76d102774c5e8bf664091dbf798adf69f687d579b183195911aefc8cf2e56a85be3ad85082870620fd8c46632c0338b21b72b71ccb8f42 WHIRLPOOL 610a773803cdc6674a4af47f1a6ea6392191926123f7a16af69379e97e3793072e6f4f72e8922722b91be214c70b4f0d7ba0b474eff52290cbca6d04716674f3
-MISC ChangeLog 32851 SHA256 553a7450a88d886f3887e83c13fdd477d8f37c8f80159538c99302bc3d036180 SHA512 f65c561c216162c2a75da82b840cfd07e50160627f50912f5929f7eddf6e4760b5ebaabf147276d3b9b17e49258a75bd7ee4c6af2a79bcdec5854d9cbf52bcc2 WHIRLPOOL 84f49e1577585497f6f814b718e3960ec9f73365fc33385b5e9095453c638f0d1032e2148ce8d8e5d03c1ea33a4b37dc58d87ab864eb683a2716e307ccc5fd71
+MISC ChangeLog 33085 SHA256 6444633d9de57720ea9e2829b0f7e8ff74ace76f041a8091a0f1e3e6a5fdae88 SHA512 96474fdbb04da451975287f37d84689faa779c09dd4529bfc8344d5cbddfad362dccf7bd3b937bdabbb1563deea3ebec8b27d1dec2f798fce76a193fa8a6e949 WHIRLPOOL 85ee2e380be44fe620a05891d929316218ec298176faa6da6cb80dc32401ffebf454e26a83493a7c349b23a49b9184fbf0a71b210bf26797231847bba33bdbc4
 MISC metadata.xml 2787 SHA256 22dc7b91c98fb4258271cc9cd4bd99f214b30f258bbdfea83dc37ac74df8d498 SHA512 4fca0d2551a889e7800c688077adf405697d05730bf66621ac53fdefeeeaddb7a8d868973edc9a6fe48e9a07734f1d43fd88229bae693fe181a7dbb95eeb9481 WHIRLPOOL 6284033d40bef02510f924ec1e6a9d3e1072bf26945fdedde0ddaf1d6d35c3d30971cdefa583a8e4d9db3da67bee04145ace15ded4cee63f534588b66633c76b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQJ8BAEBCABmBQJTb1w1XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJTmAogXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOrawQANXzG0lk7XVWNNKj5eH1vxy9
-D4tTeOJxZV9tp56qsq5CN+/7dOdg4yqnScbCYLA4Lw1kuCsBLDfE+hREzfDLU8vL
-7F5dI+6HVaB4LRmXDIi6KFSbu1EMlbC9FA/0ZfRD2oZyqhxRp7T3j5yipBydMuq3
-dihT/wJWUPrDOMFQ0oOGDmiPGseXsMIhcXVmkIoGgq8lrle6fVmC6bt3de+lG0JJ
-5XZNLELiQESSD/mJxX21QeM48i7g29Z0DoYlqoj2uSoi6zhilBJnevQNP2IHH5Sq
-0BGnFt0n4nzBmIKD2DlXxUByDAP9vPr5j21WtEdFM01p6VZkix0pIXD0N4P2hSZp
-yr4acBQ3uTxSciiwnZ9aYxwxOEgN5i4XR84ip9V1usjLUO1kUfWGmeTlUbTudmhQ
-IflS/tfTbwsIWmWls7nwoUAtOCfHnGN6UIxnSlijHh7stzsKmJElGlbl5+hGsOom
-r6+DZoXRW2ZSahywFwUjDD1mRRd6WGLNwprHR0+Sr5YIRTP0ttpEe0M8cgwByM9I
-mVGRp8RDjcuWiP8rCN3dtuWwkYj7Q1n/jR30ctiOzleKa7zVsybjs6+tGjwmulFq
-qbXCxdOOGDqmh6pdVGe4oJRQcflGdh5dba1MHxt8fbQtumCD3aZIrZ2E7zZJhYa9
-Cf2x+Yf2ciGvEVQi2kMp
-=qbD7
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOlesQAIxwYsISmMPnJF5BJEp1C8/I
+oQAQ4FUKF3xWIwXuqV/wPDnmH9ITDG6ky+ObF50elukh9NQcmKhRGU4SgolNp/0R
+sODKNnV8jXebwgFc4qFLaD5uW9uUTwPwFkM4//VZirDEGoOJGERTFMSQvg7ABzvd
+5zC7HoPiN/XpLWsbzuQRmzSkyJyBgkT0eQE56tPt48Ru3CauvZ0EDG2agrMVyPI2
+uaigg5Q+r9MkLxmWarib2oI9NP2IHkvKLoEgUuhJKOiC8Xbr2O2uwcqFChUCD+Uk
+kjCWZ+J2dUXhZo3SZz2J04Z+fKgTg2r3h/S+XLQryV25s2rowwU+EAhOIPVZPKQq
+SMwNrQ/CfZ31yzRgNRylUqdYCH/w3wGL5Fjyn9tmXQddmcfmoaEXhzL976nDTh4z
+Kk3RGcJLmEtahOepLiM45hajSP99I8CTbiVpuYF132+mgFsNRh6iL5JCAnd0PTyW
+M5dQAtS1ndM77IxLLnWaUM6s5PV6PLRO/ye+V+lHEiDNtvX3oOVLWnuzfe47B7JZ
+OW9jawl4NbyTY7kbXOdE9SvtBTZt28KoXKdf4I3dNOlITkaLkE4r+cEwgfmMhgSs
+H+JWRoBmcHKu7O4WCrWBvwR45koIGZQWK/8FpcTfjyTA3f2JGX9SjpnMtsKNwfgC
+a/GWvaUqRcOuL/74Uqxt
+=EYKm
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/llvm/files/llvm-3.4-cmake-configparser.patch b/sys-devel/llvm/files/llvm-3.4-cmake-configparser.patch
new file mode 100644
index 000000000000..cda8bdc4e1ab
--- /dev/null
+++ b/sys-devel/llvm/files/llvm-3.4-cmake-configparser.patch
@@ -0,0 +1,35 @@
+From 773560acfad511769017e971991c0305dbc0323d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Wed, 11 Jun 2014 09:40:26 +0200
+Subject: [PATCH] Avoid using external configparser in favor of built-in
+ ConfigParser.
+
+We only support Python 2 anyway, and configparser-3.2 is known to break
+the build. Since some packages actually force version 3.2, and we do not
+to pull in extra dependencies, forcing built-in seems to be the best
+option.
+
+Fixes: https://bugs.gentoo.org/show_bug.cgi?id=500856
+---
+ utils/llvm-build/llvmbuild/componentinfo.py | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/utils/llvm-build/llvmbuild/componentinfo.py b/utils/llvm-build/llvmbuild/componentinfo.py
+index eda3a48..c963ef1 100644
+--- a/utils/llvm-build/llvmbuild/componentinfo.py
++++ b/utils/llvm-build/llvmbuild/componentinfo.py
+@@ -3,10 +3,7 @@ Descriptor objects for entities that are part of the LLVM project.
+ """
+ 
+ from __future__ import absolute_import
+-try:
+-    import configparser
+-except:
+-    import ConfigParser as configparser
++import ConfigParser as configparser
+ import sys
+ 
+ from llvmbuild.util import *
+-- 
+2.0.0
+
diff --git a/sys-devel/llvm/llvm-3.4-r2.ebuild b/sys-devel/llvm/llvm-3.4-r2.ebuild
index 6fba4cede180..5ea1f7a324d4 100644
--- a/sys-devel/llvm/llvm-3.4-r2.ebuild
+++ b/sys-devel/llvm/llvm-3.4-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.4-r2.ebuild,v 1.4 2014/05/01 15:09:30 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.4-r2.ebuild,v 1.5 2014/06/11 07:49:45 mgorny Exp $
 
 EAPI=5
 
@@ -167,6 +167,9 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-3.4-gentoo-install.patch
 	# Hack cmake search path for Gentoo, bug #496480
 	epatch "${FILESDIR}"/${PN}-3.3-cmake-modulepath.patch
+	# Use built-in ConfigParser to avoid failures with configparser-3.2
+	# https://bugs.gentoo.org/show_bug.cgi?id=500856
+	epatch "${FILESDIR}"/${PN}-3.4-cmake-configparser.patch
 
 	if use clang; then
 		# Automatically select active system GCC's libraries, bugs #406163 and #417913
diff --git a/sys-devel/llvm/llvm-3.4.1-r1.ebuild b/sys-devel/llvm/llvm-3.4.1-r1.ebuild
index 0881ad16c441..8cb1ea0a4fb5 100644
--- a/sys-devel/llvm/llvm-3.4.1-r1.ebuild
+++ b/sys-devel/llvm/llvm-3.4.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.4.1-r1.ebuild,v 1.1 2014/05/10 22:32:59 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.4.1-r1.ebuild,v 1.2 2014/06/11 07:49:45 mgorny Exp $
 
 EAPI=5
 
@@ -170,6 +170,9 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-3.4-gentoo-install.patch
 	# Hack cmake search path for Gentoo, bug #496480
 	epatch "${FILESDIR}"/${PN}-3.3-cmake-modulepath.patch
+	# Use built-in ConfigParser to avoid failures with configparser-3.2
+	# https://bugs.gentoo.org/show_bug.cgi?id=500856
+	epatch "${FILESDIR}"/${PN}-3.4-cmake-configparser.patch
 
 	if use clang; then
 		# Automatically select active system GCC's libraries, bugs #406163 and #417913