summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dev-haskell/test-framework-th-prime/ChangeLog9
-rw-r--r--dev-haskell/test-framework-th-prime/files/test-framework-th-prime-0.0.7-cpphs-1.19.patch11
-rw-r--r--dev-haskell/test-framework-th-prime/test-framework-th-prime-0.0.7.ebuild8
3 files changed, 23 insertions, 5 deletions
diff --git a/dev-haskell/test-framework-th-prime/ChangeLog b/dev-haskell/test-framework-th-prime/ChangeLog
index fdea20e5c196..fe5b7c413ca6 100644
--- a/dev-haskell/test-framework-th-prime/ChangeLog
+++ b/dev-haskell/test-framework-th-prime/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for dev-haskell/test-framework-th-prime
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/test-framework-th-prime/ChangeLog,v 1.4 2014/12/14 11:35:04 gienah Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/test-framework-th-prime/ChangeLog,v 1.5 2015/04/04 12:56:01 gienah Exp $
+
+ 04 Apr 2015; Mark Wright <gienah@gentoo.org>
+ +files/test-framework-th-prime-0.0.7-cpphs-1.19.patch,
+ test-framework-th-prime-0.0.7.ebuild:
+ Patch test-framework-th-prime-0.0.7 to build with cpphs-1.19
*test-framework-th-prime-0.0.7 (14 Dec 2014)
diff --git a/dev-haskell/test-framework-th-prime/files/test-framework-th-prime-0.0.7-cpphs-1.19.patch b/dev-haskell/test-framework-th-prime/files/test-framework-th-prime-0.0.7-cpphs-1.19.patch
new file mode 100644
index 000000000000..a638dcd10106
--- /dev/null
+++ b/dev-haskell/test-framework-th-prime/files/test-framework-th-prime-0.0.7-cpphs-1.19.patch
@@ -0,0 +1,11 @@
+--- test-framework-th-prime-0.0.7-orig/Test/Framework/TH/Prime/Parser.hs 2014-10-08 12:01:25.000000000 +1100
++++ test-framework-th-prime-0.0.7/Test/Framework/TH/Prime/Parser.hs 2015-04-04 23:46:56.120211323 +1100
+@@ -10,7 +10,7 @@
+ import Language.Haskell.Exts.Parser
+ import Language.Haskell.Exts.Syntax hiding (VarName, Exp)
+ import Language.Haskell.TH hiding (Match)
+-import Language.Preprocessor.Cpphs
++import Language.Preprocessor.Cpphs (cppIfdef, defaultBoolOptions)
+
+ ----------------------------------------------------------------
+
diff --git a/dev-haskell/test-framework-th-prime/test-framework-th-prime-0.0.7.ebuild b/dev-haskell/test-framework-th-prime/test-framework-th-prime-0.0.7.ebuild
index 945f1b05ea75..1a3ece788831 100644
--- a/dev-haskell/test-framework-th-prime/test-framework-th-prime-0.0.7.ebuild
+++ b/dev-haskell/test-framework-th-prime/test-framework-th-prime-0.0.7.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/test-framework-th-prime/test-framework-th-prime-0.0.7.ebuild,v 1.1 2014/12/14 11:35:04 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/test-framework-th-prime/test-framework-th-prime-0.0.7.ebuild,v 1.2 2015/04/04 12:56:01 gienah Exp $
EAPI=5
# ebuild generated by hackport 0.4.4.9999
CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
+inherit base haskell-cabal
DESCRIPTION="Template Haskell for test framework"
HOMEPAGE="http://hackage.haskell.org/package/test-framework-th-prime"
@@ -26,3 +26,5 @@ RDEPEND=">=dev-haskell/cpphs-0.2.1:=[profile?]
DEPEND="${RDEPEND}
>=dev-haskell/cabal-1.6
"
+
+PATCHES=("${FILESDIR}/${PN}-0.0.7-cpphs-1.19.patch")