summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Wright <gienah@gentoo.org>2012-04-13 10:56:39 +0000
committerMark Wright <gienah@gentoo.org>2012-04-13 10:56:39 +0000
commit3b20298ae6c241792e603a6d1597016f28508b43 (patch)
tree824d07d4a0c94b7af3d1b83b87348d2b24fea4b3 /sci-mathematics/agda
parentFix TEXTREL on ppc, patch by and thanks to Kimura Masaru <hiyuh.root@gmail.co... (diff)
downloadgentoo-2-3b20298ae6c241792e603a6d1597016f28508b43.tar.gz
gentoo-2-3b20298ae6c241792e603a6d1597016f28508b43.tar.bz2
gentoo-2-3b20298ae6c241792e603a6d1597016f28508b43.zip
Fix agda 2.3.0.1 build with mtl-2.1
(Portage version: 2.1.10.56/cvs/Linux x86_64)
Diffstat (limited to 'sci-mathematics/agda')
-rw-r--r--sci-mathematics/agda/ChangeLog6
-rw-r--r--sci-mathematics/agda/agda-2.3.0.1.ebuild6
-rw-r--r--sci-mathematics/agda/files/agda-2.3.0.1-mtl-2.1.patch11
3 files changed, 20 insertions, 3 deletions
diff --git a/sci-mathematics/agda/ChangeLog b/sci-mathematics/agda/ChangeLog
index ea8d6eccbf4c..2287fd1a9fdf 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.13 2012/04/01 02:18:07 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/agda/ChangeLog,v 1.14 2012/04/13 10:56:39 gienah Exp $
+
+ 13 Apr 2012; Mark Wright <gienah@gentoo.org>
+ +files/agda-2.3.0.1-mtl-2.1.patch, agda-2.3.0.1.ebuild:
+ Fix agda 2.3.0.1 build with mtl-2.1
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:
diff --git a/sci-mathematics/agda/agda-2.3.0.1.ebuild b/sci-mathematics/agda/agda-2.3.0.1.ebuild
index 4eb0f589a344..513a1e06c219 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.2 2012/04/01 02:18:07 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/agda/agda-2.3.0.1.ebuild,v 1.3 2012/04/13 10:56:39 gienah Exp $
# ebuild generated by hackport 0.2.14
@@ -27,7 +27,8 @@ RDEPEND="<dev-haskell/binary-0.6[profile?]
=dev-haskell/hashtables-1.0*[profile?]
>=dev-haskell/haskeline-0.6.3.2[profile?]
>=dev-haskell/haskell-src-exts-1.9.6[profile?]
- =dev-haskell/mtl-2.0*[profile?]
+ >=dev-haskell/mtl-2.0[profile?]
+ <dev-haskell/mtl-2.2[profile?]
=dev-haskell/quickcheck-2.4*[profile?]
=dev-haskell/xhtml-3000.2*[profile?]
<dev-haskell/zlib-0.6[profile?]
@@ -44,6 +45,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
+ epatch "${FILESDIR}"/${PN}-2.3.0.1-mtl-2.1.patch
cabal-mksetup
}
diff --git a/sci-mathematics/agda/files/agda-2.3.0.1-mtl-2.1.patch b/sci-mathematics/agda/files/agda-2.3.0.1-mtl-2.1.patch
new file mode 100644
index 000000000000..7f592a3d5608
--- /dev/null
+++ b/sci-mathematics/agda/files/agda-2.3.0.1-mtl-2.1.patch
@@ -0,0 +1,11 @@
+--- Agda-2.3.0.1-orig/Agda.cabal 2012-04-01 11:54:47.565833931 +1000
++++ Agda-2.3.0.1/Agda.cabal 2012-04-12 01:24:54.004394444 +1000
+@@ -75,7 +75,7 @@
+ utf8-string == 0.3.*
+ if flag(epic)
+ build-depends: epic >= 0.1.13 && < 0.10
+- build-depends: mtl == 2.0.*,
++ build-depends: mtl >= 2.0 && < 2.2,
+ QuickCheck >= 2.3 && < 2.5,
+ haskell-src-exts >= 1.9.6 && < 1.14,
+ containers >= 0.1 && < 0.5,