Fix agda 2.3.0.1 build with haskell-src-exts-1.13.0

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

4 files changed, 39 insertions, 7 deletions

diff --git a/sci-mathematics/agda/ChangeLog b/sci-mathematics/agda/ChangeLog
index c5e173b0f6b0..ea8d6eccbf4c 100644
--- a/sci-mathematics/agda/ChangeLog
+++ b/sci-mathematics/agda/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-mathematics/agda
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/agda/ChangeLog,v 1.12 2012/03/25 13:55:19 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/agda/ChangeLog,v 1.13 2012/04/01 02:18:07 gienah Exp $
+
+  01 Apr 2012; Mark Wright <gienah@gentoo.org>
+  +files/agda-2.3.0.1-haskell-src-exts-1.13.patch, agda-2.3.0.1.ebuild:
+  Fix agda 2.3.0.1 build with haskell-src-exts-1.13.0
 
 *agda-2.3.0.1 (25 Mar 2012)
 
diff --git a/sci-mathematics/agda/Manifest b/sci-mathematics/agda/Manifest
index 0e46d128da76..00331840af2a 100644
--- a/sci-mathematics/agda/Manifest
+++ b/sci-mathematics/agda/Manifest
@@ -7,6 +7,7 @@ AUX agda-1.0.2-upstream-fixes.patch 2011 RMD160 2a8800c74748746e78b8e27e9f869ec2
 AUX agda-2.2.6-emacs.patch 945 RMD160 b9897c1e9a53c269535d5fd9171273da47a2ee40 SHA1 05df4ee7c6a1e0348a6d03818a69768e00854b34 SHA256 aa3e0fc6164cb0d722fc5dc31e23b2372320c2f2a4a45c1e722df2dd3de8f5a5
 AUX agda-2.3.0-emacs.patch 949 RMD160 4ef386a55009863f819a31f596a709a427291822 SHA1 4f811e03d7a40c96445bf944581caba7a162ab6e SHA256 1449803290440d01d792254edb68f4a3692394f6ea1fdc8128d993dadc66e5a0
 AUX agda-2.3.0.1-emacs.patch 955 RMD160 1fae765f23993f8352717381895022c85f1959e4 SHA1 6d1fbf83b3e8d28bd8259a7f38943e20050caf89 SHA256 8a124f71c4580923a2d8ecd39064a999da313bf7f7085e322d8259421f17496b
+AUX agda-2.3.0.1-haskell-src-exts-1.13.patch 1077 RMD160 1a846bd60ba511614ad71f68c0adfd371a3f210c SHA1 aae50f28d80b2f9f4e24f56344facc700a03eb3c SHA256 d88f7e113b701d6d67bbbd1965f878886bfb08483e238172b721e4f61f106585
 AUX agda-make_install.patch 549 RMD160 323539535e17244e979f0fd14684f4375e0de4ef SHA1 f7e9a2b633b7c03f305db1210f954f34e5dc4037 SHA256 f23e6fa062ca5ef3c6b1e6b7e9133a19bcf3846e12fdd1659d23d44d252946fc
 DIST Agda-1.0.2.tar.gz 505642 RMD160 6686a0bd5920a83a3e08ef2894b8ddf1620f21c2 SHA1 fffcb8ca8d565e40756cd57035d869a90d2538cc SHA256 2ab56783a26e84f64422316daf0ce160f983667357361e2986baa13fb17e7ea1
 DIST Agda-2.2.6.tar.gz 1376824 RMD160 436b8ca196c0141e58d352dc88d4fa048dfa7cee SHA1 f9d2ed26379d572f47d1a7da3945407929af28c6 SHA256 3ea0f18d475e9a27ab4a6362e0888aa173f8eb9630085124aaf79df336168ca6
@@ -14,14 +15,14 @@ DIST Agda-2.3.0.1.tar.gz 612342 RMD160 5228de0bffc63b6604c4d2263fc2a5587262c6ec
 DIST Agda-2.3.0.tar.gz 608029 RMD160 759a5d057def93ca6cd87f5e40f5a32953fbbad6 SHA1 128fcca71d1c1ddc2cdbfeb61e5ad41ad4d7ec97 SHA256 608e130bd33a1c14ea544b46bfb55c0c8e31ab43952572df38df90d086e30cdc
 EBUILD agda-1.0.2-r2.ebuild 1234 RMD160 548f429956b77cf1514b6b8b7cbe1d48bf2966d8 SHA1 970eaae13da56585a9c2fb5d96be5162405b17fb SHA256 f5e5b1f82c4197d1fd820a54e9273c48074229bf0dd75a78f1ac11d2c744c48b
 EBUILD agda-2.2.6-r1.ebuild 1350 RMD160 39158bf9155e5b46bce03ad1520b803829d6bd7f SHA1 40b51ac6f2b6f6ad88e98aafcdfc98487dd3cc94 SHA256 3d17da7d37b43cfe8f3fb3391d226bb33e9323330d52091027a89b2e1be0922c
-EBUILD agda-2.3.0.1.ebuild 1769 RMD160 6f3e6fde29cb734f9f1240b84710028ab5179d03 SHA1 004317f3fb15aa6026102f9c6c4dfab4d2e017cd SHA256 ef53e7e5dd595c5f54b63df598981da3c8f50862b785d28c49a5d90c0e9960ac
+EBUILD agda-2.3.0.1.ebuild 1833 RMD160 190772b6e03fe7919733bddf629c12d2f696d970 SHA1 7dbcbfae532543c1f6ef5257cb6b194489ddebd9 SHA256 7d927b98c725eb1420a4a380bc2e39fee7e399f04de40b03ae99c17615eace5c
 EBUILD agda-2.3.0.ebuild 2176 RMD160 a729ac0acd95d29859d2f4a68b8eebe33cd3080e SHA1 454f3737ff33658a371d4335ab248416e2291f7b SHA256 d943ba545696902ba673a35416b34c77542983a00e21bd3ee1df64c0e79d1fd0
-MISC ChangeLog 2826 RMD160 efa9b593aace71292f3e7a04b93fbb47aa6786f9 SHA1 3cbb4dd7a303c0614d85d761a83dbedfc5df44c4 SHA256 66c5e84634c07e0c229c42438b8d3a670246e0b2e2e901fd3bb9724285287dbd
+MISC ChangeLog 3000 RMD160 2484ba818d2caf09f0f7e411e307a48e9c4538d2 SHA1 915ec99adf920a6f0b9cd43e4613f37b232ab666 SHA256 66d3b3453ca4de61d2c14b9a13295a36dbd556fc6c2ea5c8516e05f6734bfffb
 MISC metadata.xml 668 RMD160 466ee13a2463be6ace75b275eb851eeb2a37f59c SHA1 3f9dcf39927834481b84649e667c144d22509a32 SHA256 165c4a13bd018ab925d952bbcc5bfbb90fc3e52a48c0826d15002a0b4f5857d8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk9vJEQACgkQoBEVQmGOlx8Q+AEA25fYtSdI7OBRDYy5mSf2XlkC
-3X1MSUiY8UGXFodor+sA/R349Hl/PKpTda2sDcwuRa0QURoCva4Yn66Ymh6yuoEA
-=ZknJ
+iF4EAREIAAYFAk93uvQACgkQoBEVQmGOlx/jZAEAr27wQo/jsofd3deW4vbIfuzk
+GcIKra318ruST4Ba0nsA/0e67QnwUuu7RR1oCmWMGh9MrTnDGFFVFtn8y4/ZX5ch
+=tBtU
 -----END PGP SIGNATURE-----
diff --git a/sci-mathematics/agda/agda-2.3.0.1.ebuild b/sci-mathematics/agda/agda-2.3.0.1.ebuild
index 9822de9ac0eb..4eb0f589a344 100644
--- a/sci-mathematics/agda/agda-2.3.0.1.ebuild
+++ b/sci-mathematics/agda/agda-2.3.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/agda/agda-2.3.0.1.ebuild,v 1.1 2012/03/25 13:55:19 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/agda/agda-2.3.0.1.ebuild,v 1.2 2012/04/01 02:18:07 gienah Exp $
 
 # ebuild generated by hackport 0.2.14
 
@@ -43,6 +43,7 @@ S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-emacs.patch
+	epatch "${FILESDIR}"/${PN}-2.3.0.1-haskell-src-exts-1.13.patch
 	cabal-mksetup
 }
 
diff --git a/sci-mathematics/agda/files/agda-2.3.0.1-haskell-src-exts-1.13.patch b/sci-mathematics/agda/files/agda-2.3.0.1-haskell-src-exts-1.13.patch
new file mode 100644
index 000000000000..06e3c702e864
--- /dev/null
+++ b/sci-mathematics/agda/files/agda-2.3.0.1-haskell-src-exts-1.13.patch
@@ -0,0 +1,26 @@
+--- Agda-2.3.0.1-orig/Agda.cabal	2012-03-12 21:09:34.000000000 +1100
++++ Agda-2.3.0.1/Agda.cabal	2012-04-01 11:54:47.565833931 +1000
+@@ -77,7 +77,7 @@
+     build-depends:  epic >= 0.1.13 && < 0.10
+   build-depends:    mtl == 2.0.*,
+                     QuickCheck >= 2.3 && < 2.5,
+-                    haskell-src-exts >= 1.9.6 && < 1.12,
++                    haskell-src-exts >= 1.9.6 && < 1.14,
+                     containers >= 0.1 && < 0.5,
+                     pretty >= 1.0 && < 1.2,
+                     directory >= 1.0 && < 1.2,
+--- Agda-2.3.0.1-orig/src/full/Agda/Compiler/MAlonzo/Compiler.hs	2012-04-01 11:27:52.058688415 +1000
++++ Agda-2.3.0.1/src/full/Agda/Compiler/MAlonzo/Compiler.hs	2012-04-01 11:30:42.732658634 +1000
+@@ -466,8 +466,11 @@
+   ]
+   where
+     parse = HS.parseWithMode
++#if MIN_VERSION_haskell_src_exts(1,13,0)
++              HS.defaultParseMode{HS.extensions = [HS.ExplicitForAll]}
++#else
+               HS.defaultParseMode{HS.extensions = [HS.ExplicitForall]}
+-
++#endif
+     ok (HS.ParseOk d)   = d
+     ok HS.ParseFailed{} = __IMPOSSIBLE__
+