Fixed build breakage against ghc-6.8+ (bug #247044).

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

3 files changed, 64 insertions, 9 deletions

diff --git a/dev-lang/helium/ChangeLog b/dev-lang/helium/ChangeLog
index 6b39014817af..f76c2ee610fc 100644
--- a/dev-lang/helium/ChangeLog
+++ b/dev-lang/helium/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/helium
-# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/helium/ChangeLog,v 1.23 2009/04/17 20:07:20 caster Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/helium/ChangeLog,v 1.24 2010/07/24 14:39:07 slyfox Exp $
+
+  24 Jul 2010; Sergei Trofimovich <slyfox@gentoo.org> helium-1.6.ebuild:
+  Fixed build breakage against ghc-6.8+ (bug #247044). Thanks to Diego E.
+  'Flameeyes' Pettenò <flameeyes@gentoo.org> for the report.
 
   17 Apr 2009; Vlastimil Babka <caster@gentoo.org> helium-1.1,
   helium-1.2-r1:
diff --git a/dev-lang/helium/Manifest b/dev-lang/helium/Manifest
index e06aafb20ed5..9a164b32b010 100644
--- a/dev-lang/helium/Manifest
+++ b/dev-lang/helium/Manifest
@@ -10,6 +10,6 @@ DIST helium-1.6-ghc.patch.bz2 34579 RMD160 7754353e882d233533011f7e7be0bc92c01b8
 DIST helium-1.6-src.tar.gz 960254 RMD160 9700dde4b77adb73825965c00cdc02d3e1f6fab6 SHA1 9e1d43d25c92f86c57fe5864e26365923dcfe98c SHA256 a93632d031a16c0ea516f4fa7ce63acd0950543c74265e22abd0993856a0a053
 EBUILD helium-1.1.ebuild 1894 RMD160 1a0666daade3bb6f3be442e94ec5065da26ff401 SHA1 b769456ef3ef58e64ed7ccce3aa310dad5fcf0b6 SHA256 4186c2d6a69a479cf966e8ef224bab145f86c4fd6f03533d1456b3a0f996d103
 EBUILD helium-1.2-r1.ebuild 2303 RMD160 1145867666122311a3efee2fd1b5c798022d8b89 SHA1 f7d9e78550d7f9000ba81628d6602cd597b7fbae SHA256 efa8d8aca10d84d52971adb293e13a73b32b528e060a8732dcec6740c2e91245
-EBUILD helium-1.6.ebuild 1771 RMD160 1a25bb2aeb4d26c3901222dc60eab062a24989dc SHA1 7f9fdc814dfc903442b6e83e69954d37d49f1a04 SHA256 999d37f92372b85e154bc7ec0f2cdab13e27b29566894e125335480db69595a8
-MISC ChangeLog 3402 RMD160 a3fc8e4311bf3c820b5c5184174f64dae46e9203 SHA1 b22fea6e2d6fe794dddfad64d69807d42f7d45d7 SHA256 0619606b85462a02ee57713f0c324afc3f9a3e62cbf7244d6fb68c5ff55488dc
+EBUILD helium-1.6.ebuild 3806 RMD160 5c73c49f755e36ee617cff3aeb44155fa4d81fec SHA1 a1999343966cf5271f305aaee1a54f0f73965cdf SHA256 2deb0488e52e9cfd0a38ebb76f3ee9feea2ad0d14558b0dbc7c19ec03b462893
+MISC ChangeLog 3612 RMD160 030382791cdaf61475b215d1f845e3615b0d5654 SHA1 868d2c9d15b656d7ceb0f59a9e56e35fb852cfa2 SHA256 cdf4802053978b6968f26850fd234ae1442fe639a1e00c000ce3a846a71ca401
 MISC metadata.xml 161 RMD160 f485b248c733c0ef48ebe461e56d10631182864d SHA1 e3539af233f1a90c2470823747cae37ab10d5b2e SHA256 f560c0c2c8a2f2ca3c0c03e1836e16da7085b32ea60e03d9add5e405dac9f004
diff --git a/dev-lang/helium/helium-1.6.ebuild b/dev-lang/helium/helium-1.6.ebuild
index 091e7b4feb01..3052414354a5 100644
--- a/dev-lang/helium/helium-1.6.ebuild
+++ b/dev-lang/helium/helium-1.6.ebuild
@@ -1,8 +1,8 @@
-# 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-lang/helium/helium-1.6.ebuild,v 1.2 2007/10/31 13:22:01 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/helium/helium-1.6.ebuild,v 1.3 2010/07/24 14:39:07 slyfox Exp $
 
-inherit eutils
+inherit autotools eutils
 
 DESCRIPTION="Helium (for learning Haskell)"
 HOMEPAGE="http://www.cs.uu.nl/helium"
@@ -15,14 +15,65 @@ SLOT="0"
 KEYWORDS="-amd64 ~ppc -sparc ~x86"
 IUSE="readline"
 
-DEPEND=">=dev-lang/ghc-6.4.2
-	readline? ( sys-libs/readline )"
+DEPEND=">=dev-lang/ghc-6.8
+	dev-haskell/mtl
+	dev-haskell/parsec
+	readline? ( dev-haskell/readline )"
 RDEPEND="dev-libs/gmp
 	readline? ( sys-libs/readline )"
 
 src_unpack() {
 	unpack ${A}
 	epatch "${P}-ghc.patch"
+
+	# split base only
+	sed -e 's/^GHCFLAGS =.*$/& -package containers/' \
+	    -i "${S}/helium/src/Makefile.in"
+
+	# file has non-ASCII syms and it's pulled to ghc for dependency generaton
+	# ghc w/UTF-8 dislikes it: 
+	sed -e 's/\xCA//g' \
+	    -i "${S}/helium/src/Makefile.in"
+
+	# mangle evil 'rec' to 'rec_'. It's not very accurate, but less,
+	# than manually patching ~250 occurences. (ghc-6.10+ has rec as reserved word)
+	local bad_file
+
+	for bad_file in Top/src/Top/Types/Unification.hs \
+			Top/src/Top/Types/Quantification.hs \
+			Top/src/Top/Types/Primitive.hs \
+			Top/src/Top/Solver/PartitionCombinator.hs \
+			Top/src/Top/Repair/Repair.hs \
+			Top/src/Top/Ordering/Tree.hs \
+			Top/src/Top/Implementation/TypeGraph/Standard.hs \
+			Top/src/Top/Implementation/TypeGraph/Path.hs \
+			Top/src/Top/Implementation/TypeGraph/EquivalenceGroup.hs \
+			Top/src/Top/Implementation/TypeGraph/Basics.hs \
+			Top/src/Top/Implementation/TypeGraph/ApplyHeuristics.hs \
+			lvm/src/lib/lvm/LvmRead.hs \
+			lvm/src/lib/core/CoreNoShadow.hs \
+			helium/src/utils/LoggerEnabled.hs \
+			helium/src/staticanalysis/miscellaneous/TypesToAlignedDocs.hs \
+			helium/src/staticanalysis/miscellaneous/TypeConversion.hs \
+			helium/src/staticanalysis/inferencers/TypeInferencing.hs \
+			helium/src/staticanalysis/heuristics/RepairSystem.hs \
+			helium/src/staticanalysis/heuristics/RepairHeuristics.hs \
+			helium/src/staticanalysis/heuristics/ListOfHeuristics.hs \
+			helium/src/staticanalysis/directives/TS_PatternMatching.ag
+	do
+		# take all symbols from exactly this source. This set is not universal,
+		# but it aims to catch (same) lexeme separators on the left and on the right
+		sed -e 's/\([^a-zA-Z_0-9"]\|^\)rec\([^a-zA-Z_0-9"]\|$\)/\1rec_\2/g' \
+	    -i "${S}/$bad_file"
+	done
+
+	# cabal is their friend (oneOf bwcame polymorphic and breaks the test)
+	sed -e 's/Text.ParserCombinators.Parsec/&.Pos/g' \
+	    -e 's/oneOf/newPos/g' \
+	    -i "${S}/helium/configure.in"
+
+	cd "${S}/helium"
+	eautoreconf
 }
 
 src_compile() {