Ignore flags '--with-compiler/--with-gcc' passed by cabal with 'QA_CONFIGURE_OPTIONS'. Bug #515354 by Patrick Lauer, bug #469618 by Roman Žilka.

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

3 files changed, 15 insertions, 19 deletions

diff --git a/dev-lang/ghc/ChangeLog b/dev-lang/ghc/ChangeLog
index 85ae7695e4af..4bdcc5868423 100644
--- a/dev-lang/ghc/ChangeLog
+++ b/dev-lang/ghc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/ghc
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.255 2014/04/22 14:09:47 mjo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.256 2014/06/27 09:54:02 slyfox Exp $
+
+  27 Jun 2014; Sergei Trofimovich <slyfox@gentoo.org> ghc-7.6.3-r1.ebuild:
+  Ignore flags '--with-compiler/--with-gcc' passed by cabal with
+  'QA_CONFIGURE_OPTIONS'. Bug #515354 by Patrick Lauer, bug #469618 by Roman
+  Žilka.
 
   22 Apr 2014; Michael Orlitzky <mjo@gentoo.org> metadata.xml:
   Fix typo in llvm USE flag description, fixes bug #508398.
diff --git a/dev-lang/ghc/Manifest b/dev-lang/ghc/Manifest
index af3af6af8aaa..b2de56f2b6a3 100644
--- a/dev-lang/ghc/Manifest
+++ b/dev-lang/ghc/Manifest
@@ -101,26 +101,14 @@ EBUILD ghc-7.4.1-r1.ebuild 21359 SHA256 58c914920bddc3dc9ef84509fd58ec2d3cb86ca8
 EBUILD ghc-7.4.1.ebuild 20555 SHA256 24af5f5cac7746f627708fc5e74fc72f528409f2912032a5ed8bf0595d3d88a3 SHA512 040180430cacfb19816dbbb7deed54ea08424d5ceae275a61b25bde38f68419fa6a65e1dc7dddc887f967eeb47ae81f430a2dbc4cc750c542254e91101734d47 WHIRLPOOL b344b1465f05555da6b22be4351820c557cc575e61661dab79dea92ae98530fa57c8174a108cf80b5cfccc6572a4b5b14a23393719e307fca16bf91781c2951e
 EBUILD ghc-7.4.2.ebuild 22109 SHA256 c061678ca7fb3e578856ed5e5ccd72b9e1cf86000889d41b64bf51dcfcdaad3c SHA512 9fa1ac3968cb2e9cc231d2fdaf0fee54b1070c925a86f5fc257858a3bab9eb1b684893a405d4f7fbbc0a6771fa06b7d572e790368f8093e23abed176cefaa43a WHIRLPOOL 813f4113c4dd73bfd0591d48f426a6451b1662458e75ea6b3f748a8d64fec354273cc15f8db218e03965338e87e0b00ffc424dd7defc77a5424ef8651fa29038
 EBUILD ghc-7.6.2.ebuild 25352 SHA256 1986bda9cf2dcc52b90b3dd18d8241bb9d93b5f7b7eac5bf5db99dc2bb0503af SHA512 64ebb74a3132a6a162c30fc588592dbfe72328da0d3fa2435942165e470df0ffbcbb640361d1f0a6a9efaf25a5648149c4e8a5e0a16fc39f4bcaa07907e38038 WHIRLPOOL 68d57561fa4dc29ba9c104c85cf9b0df624860ff2b24438659861c76e3472847fd34de8f619eaf0e010e115a712ab7837c3a39153d663c4a429a3c7ba035de10
-EBUILD ghc-7.6.3-r1.ebuild 28815 SHA256 9fcf34444b5a961200bdb473d9840048d91e2572e1eb13d71b0f877991134e34 SHA512 d8e47a0478ffeb8ba51cf2f5e57e1f6bc1fbf4903bf804ee490819f21d6c2b91e1b1e26466b65b65065d13e86992a6cdcb59e6ef863920547b7fcce93a830e56 WHIRLPOOL 1424f2159eac5a1c3415a4400010ed83b5e6db5609fc2c29cc122692ecb6139e8503f433c350149a979fae874a28d7284ba49465bd797dfb1f61500622e7442e
+EBUILD ghc-7.6.3-r1.ebuild 28932 SHA256 c79880e4049d8657509e56e50e1660fde393ff98ad1ceeae679dbd3d508e6d18 SHA512 eac8d654b5e2e561a6b48fe13b7536e6ed339fa245fff0833fef08bd04d078b7ac1b50d951db59b3049c33cf29320bc07f00b5b544ed590b637cf944eab59683 WHIRLPOOL 39d5be619ef407be82a3a34257b7bd9ae7793f28cfa77f524a79bd3bc66ad26d222d0008a0deb1429c2121822a063bb4a86ade58b393865c2c4abfedd7a40837
 EBUILD ghc-7.6.3.ebuild 26240 SHA256 517f567d0241deee7c473edcc999c7255f7a8cb14e6cc36f13850021e7802310 SHA512 26c8aa9894e1bcc194b2f62dd1741d03e90ea0b8607e760027117c391ab0ff036e66fe76ce8b07d5cc1acf372e3ed4316d9b866d818e5299285cfbfcb13c19eb WHIRLPOOL 429c9f83b45b153145a999655c6a9f17518f70e48ecbfe91cb8d682eacc3ea9d7818b0de23a7507aa454b3885dbcff3a8393f5f4eb734402f1dd0688535500bc
-MISC ChangeLog 46525 SHA256 ee3cb1fd03e9005a4374779b6a587367300333df6facb1dfe98e9de2cfeb3e1c SHA512 6518f2076ced4d9c4ba6cf8a3a090cced284585e4e229e30495354ce970cadf6181e0c77df32eb0556fa177b89986d5b8bef8992f90475e2e1e0eaf55de0f506 WHIRLPOOL 304e6a857c6052038d44abba7c9323bbf07598f96f28002b5c17ced0f64c6761d4c9605f97adfc87fb050e6b3e72d2e3c152eaf359bab7405980e5b56ea36b78
+MISC ChangeLog 46756 SHA256 876e585a03c4e31badae257fcdfb9577799d00fe13058cbaf0cd2bc308ab7b7b SHA512 20954977fd3a7febd6a2784d3ad7f592b43ff9e521c643217f095225601da1d05d127cc61d11c1c3506f400cb91aac9cb4da6d1f4e1d1a96bc9e992d801f60bf WHIRLPOOL 7dff3f3ef9a84f981514e5c5093a6883b9a9c4c6357130c2ec7244aa17af482f75be8ad38b4ec008626f8c83e7841e1a54712fbcc837de4234e2bf2e2eb4aa1b
 MISC metadata.xml 626 SHA256 3bca7daea686cdf5a067c63614567e4764b7130d056205e759f6d8c39bbc70c2 SHA512 687a12b19afe4db07e06e10c51179a69730fc2c236602ecc71011d61644f626d368b8f272e970dbd5bc6ac4dc6bb9c23e2ca06e558c3c0f7bb715dfb3dcdbc35 WHIRLPOOL c15587a1b4d9e5b32556cb281d5a947520629548a9bacc51ff8247bfa09aed2d3420dd6731b0c3a5cc5e8b9a3baba033aa27402b8dcc50bf23dcebe8e3250db3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJTVngwXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQxNEU5RDcyRDdCMUFGREVGQzBCNDFDMUY2
-RjQ4RDNEQTA1QzJEQURCAAoJEG9I09oFwtrbsqoQAIW9f6ONMqa8CM4v9jsiqD6D
-TdngLwMdcJ/fRN44uLtk9D6izgngKiSbdlAjoIDSxS4/HS3UaMWGzSX5Vfsd6U21
-0latW8RJBibIUw59GTE2BYSZztWlayuOL4/0JBN8qXctZpSHjRuiGpPWfGWB69Rt
-i81gtSIdBBGQ7la+/IUV1B5VqTpHZFvgo/4Lns3YoLqKBmyZfGi7dvtUT92vOVs0
-n4oPb4JVvMVqVxCzifz5LOOqpu5FSe2zr24FujM3zX0OJ78H6cJ0WJbLKF5sb577
-NQ+NskJkP0GlSv1J6PXC5Wj9wMzXFt0v5C3PjjwSPduHlcREZqnIx9MdVWMVtVYw
-eXxzIwzPa1AcjOICS0hfrdTLovFpv2pZOzWX85CAIA4eo0mR5qehFPOnFMyuCYFa
-LHhaEsSoUkHCBJ1AQTewdzv27WWBaEIx2yOTi/VA+4wN+4dnRIvzJ7xz2Td4cFg+
-n3ESdEF204V+Bzcm75Sh/nrV4JOzwAy/D50ap2G97B9OfFhgV25uE5qdgZtM3twx
-pitFaIJzo66eSlGi5iJJ71yGhxdoEKC0xfuRbo8lkwu+cWUOJ7KMJa6EPowBdplz
-FShY1Z8mberfZy4DADgEZtDcHOUh0/OERFD/UL4va/fICZFA9s5HkfVAA4Bh5Lrj
-nWNf72Q2am6MGtt0Md6Q
-=LpyF
+iEYEAREIAAYFAlOtPzUACgkQcaHudmEf86p+egCfZjJpn1R9NHVTdqx2orJqLPe6
+4FoAn26GKcixm+J7e0XZXg1Uo+HdmbnW
+=lm+G
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/ghc/ghc-7.6.3-r1.ebuild b/dev-lang/ghc/ghc-7.6.3-r1.ebuild
index 35bfb702d1cb..d2fd97b8b7cc 100644
--- a/dev-lang/ghc/ghc-7.6.3-r1.ebuild
+++ b/dev-lang/ghc/ghc-7.6.3-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/dev-lang/ghc/ghc-7.6.3-r1.ebuild,v 1.10 2014/04/03 20:05:01 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.6.3-r1.ebuild,v 1.11 2014/06/27 09:54:02 slyfox Exp $
 
 # Brief explanation of the bootstrap logic:
 #
@@ -125,6 +125,9 @@ REQUIRED_USE="ia64? ( !gmp )"
 
 use binary && QA_PREBUILT="*"
 
+# haskell libraries built with cabal in configure mode, #515354
+QA_CONFIGURE_OPTIONS+=" --with-compiler --with-gcc"
+
 is_crosscompile() {
 	[[ ${CHOST} != ${CTARGET} ]]
 }