Fixed bug #314599 (build failure against ghc-6.10+)

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

diff --git a/dev-haskell/haskell-src-exts/ChangeLog b/dev-haskell/haskell-src-exts/ChangeLog
index 11a6e71c4cc03e7a25b638af4eec1479d0f42b0f..2e3785250d133937c099ed4db38817e328947144 100644 (file)
--- a/dev-haskell/haskell-src-exts/ChangeLog
+++ b/dev-haskell/haskell-src-exts/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-haskell/haskell-src-exts
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haskell-src-exts/ChangeLog,v 1.12 2010/06/14 17:33:54 kolmodin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haskell-src-exts/ChangeLog,v 1.13 2010/07/12 18:53:17 slyfox Exp $
+
+  12 Jul 2010; Sergei Trofimovich <slyfox@gentoo.org>
+  haskell-src-exts-0.2.ebuild:
+  Fixed bug #314599 (build failure against ghc-6.10+). Thanks to Amy de
+  Buitléir <amy@nualeargais.ie> for the report.
 
 *haskell-src-exts-1.9.0 (14 Jun 2010)
 

diff --git a/dev-haskell/haskell-src-exts/Manifest b/dev-haskell/haskell-src-exts/Manifest
index 58eddcb916cce4e05e2191a56cac94999f6f1f0d..e289cbc0a19f11bced3c33e5f56d34c382f9825c 100644 (file)
--- a/dev-haskell/haskell-src-exts/Manifest
+++ b/dev-haskell/haskell-src-exts/Manifest
@@ -1,17 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX haskell-src-exts-0.2-hiding-isSymbol.patch 3016 RMD160 b6030108cbe3fc3a187854e751c179cf794dbb0f SHA1 2d49f3cb4e9651fccba162a4e91b3b5747a80190 SHA256 4bf72b759ff79278e67fa91f830fcbd8f3e6a26025234bd4e7889abc19148078
 DIST haskell-src-exts-0.2.tar.gz 59520 RMD160 4fb15828c41cce431f947dcb549b3aa579367dcb SHA1 c4b9a76dbc6be91ba58835f7646b21750af68701 SHA256 f818f7f9ea079e4ee9689d8cb0a5d86b23603a9ba58f2fb047439e3c6f29b4d2
 DIST haskell-src-exts-1.9.0.tar.gz 176438 RMD160 c8bf9ca9bf8c6eafb56e28031a316c1483112619 SHA1 e8017cbec5c287ec8b6c7b7d247e083c7502d7a2 SHA256 dedb529217dfe393f75f26b735f7dd09eea50006481f60d06e169de6f328d1da
-EBUILD haskell-src-exts-0.2.ebuild 1279 RMD160 62c857cff7359a0e9e34c73508be70f04caaa290 SHA1 bed1421f92de86a4ec3acbfe5557ea19495e34ee SHA256 b0b623d66c406c33cf9b91fb7072d601eb63da022717d76aa54e2500612e267e
+EBUILD haskell-src-exts-0.2.ebuild 1323 RMD160 a118cfdda0503a13c40ef459d3db297e71168196 SHA1 e8f2fb142afbd58ba1d9140bb1582a0611210de9 SHA256 fa9bca7d8a7c0d479fb1f6fb7a1f4cbb9154a6f505b12616ed9d1dc1ed8bfb83
 EBUILD haskell-src-exts-1.9.0.ebuild 749 RMD160 102a23406cdd2ab1fa012947eb8001702e8f71db SHA1 20011ec607d39bd86a6d8de38b002eb387a6abf5 SHA256 dce1f8c198a85c0809d57090de09540ed700f8384a086422980267a8c32a8984
-MISC ChangeLog 1967 RMD160 e4900d4b48d44aca885d3ad54d9b984942b81289 SHA1 803c6b843b23da8cd9a9eecaed4a77878ec5de86 SHA256 4a51b8a68e58b651d853a9db0f5e21df372ab243c436df8fa35cb62faf58ea35
+MISC ChangeLog 2172 RMD160 9585ce42d923d44be9e2868a18237e881638a281 SHA1 c87693afe2a7fb5d8bd231e4a2be70642f1edc2c SHA256 105a920e6f730beb82ca020ecc490e8e5458e5526f475aedbd8d6a6fe012d318
 MISC metadata.xml 671 RMD160 fd9612929239d60ebebb881ba6f46fbe7c436fef SHA1 1ad0b0c59ee28e08d9849c9542411f0d28c78346 SHA256 7acde279d06a1095afbb79856ee028b68346cd45ebee58f734e965045e625c1d
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iEYEARECAAYFAkwWaAgACgkQ1n/CYbXjntLTFwCfa5x255WGv6e2mLnkS1HvK9aG
-zxQAn0M3s0d3y2vR5wBgaSaNtrNXyH23
-=KApL
------END PGP SIGNATURE-----

diff --git a/dev-haskell/haskell-src-exts/haskell-src-exts-0.2.ebuild b/dev-haskell/haskell-src-exts/haskell-src-exts-0.2.ebuild
index 476a1d60b5f9f8416bf0a4641c676fab46b4c686..8290cfaa8e03584b0819dcd29f812b74e3c91a47 100644 (file)
--- a/dev-haskell/haskell-src-exts/haskell-src-exts-0.2.ebuild
+++ b/dev-haskell/haskell-src-exts/haskell-src-exts-0.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haskell-src-exts/haskell-src-exts-0.2.ebuild,v 1.11 2007/12/13 05:41:30 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haskell-src-exts/haskell-src-exts-0.2.ebuild,v 1.12 2010/07/12 18:53:17 slyfox Exp $
 
 CABAL_FEATURES="lib happy"
 inherit base haskell-cabal eutils versionator
@@ -19,6 +19,8 @@ DEPEND=">=dev-lang/ghc-6.2
 
 S=${WORKDIR}/haskell-src-exts/src/haskell-src-exts
 
+CABAL_CONFIGURE_FLAGS="--constraint=base<4"
+
 src_unpack() {
        base_src_unpack