Patch chell-0.4 for ghc 7.10

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0x618E971F

diff --git a/dev-haskell/chell/ChangeLog b/dev-haskell/chell/ChangeLog
index 89f6af61d19f77192bf456604f9dbe848a201b67..2f01c4a9b9edb44163c4162b42e51bcc5e6a6893 100644 (file)
--- a/dev-haskell/chell/ChangeLog
+++ b/dev-haskell/chell/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-haskell/chell
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/chell/ChangeLog,v 1.3 2014/07/25 09:16:26 slyfox Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/chell/ChangeLog,v 1.4 2015/01/02 03:27:03 gienah Exp $
+
+  02 Jan 2015; Mark Wright <gienah@gentoo.org> +files/chell-0.4-ghc-7.10.patch,
+  chell-0.4.ebuild:
+  Patch chell-0.4 for ghc 7.10
 
   25 Jul 2014; Sergei Trofimovich <slyfox@gentoo.org> chell-0.4.ebuild:
   Drop trailing '.' from description.

diff --git a/dev-haskell/chell/Manifest b/dev-haskell/chell/Manifest
index 744042e91197ef9c91add6462abc9e4f91b777ce..78a5ab3471dec675f1b04f3113fc66b8802f430b 100644 (file)
--- a/dev-haskell/chell/Manifest
+++ b/dev-haskell/chell/Manifest
@@ -1,14 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX chell-0.4-ghc-7.10.patch 683 SHA256 dc4a47eb33d20ff2aca7e03f240f696f12d44ecd00ee6019b8c5c4f52d5d58e7 SHA512 bf525edef8f76f6d05f4bdf2b5aeb92e72c30e74be09d2717cc5dbf59c4379b2103605fc23fdbf8edb71994e7c84e4b192d906af9a649b3dc6dd61d3a7976845 WHIRLPOOL 66d86886e12d50ff0a2b96538b146201ee3a30cbae19f6521cfda99b5c47b979bd6a6758057318121880f09b4ada0e325c70ea84cae9c78755615943bd315733
 DIST chell-0.4.tar.gz 12437 SHA256 cf824e5ada55b18aa1e3fca93996fb04521cafcb7db0fccd1fec757eecc9d6c3 SHA512 8acbab62b84566ca03f44465de6911d72b3fae16292ff3f666bd6614c2e6c7bf9a2be04ca4a6b3d53802f29d23569034908371244a015b4159fea173b24f602c WHIRLPOOL 6771ad4bf27f5ce6852e74d3fe54b23048cc7d6594b94c29e7a725b63dd8beaee0b661840d389e59bf994e579bd442783123feabd28cee6d937a0fa0961f632f
-EBUILD chell-0.4.ebuild 1158 SHA256 c876dc87fd111a42e52d17614f0a1bec74d693bedb4c521f7aee6971e8a1be40 SHA512 0440b4a5f92dffcca1c6394bad48ead3b2aa3179ad853ce189f68c900ed8886e50a863f02adf3db4985914b1b671ce8db13aa4ae3e51576b2727cdb678319d8f WHIRLPOOL b5163b316ae5280c3f3be2522d66a6c14d92bb568aa806524504823a1e77b47f83e3b3e43b209399d07addf58d758f9654117b6282afee59c52a1570949c898b
-MISC ChangeLog 574 SHA256 087aba1af8dc7688100a1ec6aba031ea3f690813e186afccf87d28f0574352a4 SHA512 6fce7e2f0069ac905c12dee49571a267c5ef700713b67d8f510c5ea04b1f27ad73f45f519849a7c93c3d2733cec7875423669dfc3ab6d8733412e1a6bb10d847 WHIRLPOOL 2e5b4edbad89cd3b665e7867d5b58d8a485c110f070d2731ad48c48098c9a6a74abfc3b39f29b03ef1030d120c772fe5550a3781b66c9c852ec90c201591e5c5
+EBUILD chell-0.4.ebuild 1213 SHA256 b5ccedcf0165ef930912ae6d19a196169014f7f5600f4e55f5f0ad3ff61d17df SHA512 8b9a46409b723adc8ea673aee14b20184c4dfb20583e7a949daa15e57aeddb1ad067096e5863ae7f57bcc0405fe12406c2f023771433ab361ec850a1b7d09c95 WHIRLPOOL c19ccfbd92775b2497f21146e1704038c34e0c7af4ea6e8f3226bf4aba371f1c208d45b09e248a768b4deba5ba422cf37d857ad2b61125370e24504faac63dc8
+MISC ChangeLog 706 SHA256 4fdc42fcb9ffdac2b9c671f9847109c1db2337691cc3d863a429ba5950b4b077 SHA512 f776abdd5cba3945ecdf6f61d5276a77f61a63f6ca946594f4f72dd05cadec1284cdbf526b3c152e2c3a7bd566f99e84336a2d66b2daee68bb979065b812760a WHIRLPOOL 4a5bab819b45dc2b45f1ce8efe973a4b258de7041b5a3b566320c262a2983c4320d9a5d0ea85cf36b7ddfa4acf9c73988890418e1f17646e6408571eb8628162
 MISC metadata.xml 1290 SHA256 ae6fa0923d2cc8d3e181d4c0d6d811236e9a6345ab35c6e0748e28012c66acc0 SHA512 660e545aea8b37e26d47f942e3ab9d9b82ded88e53fc5ffa25852833e37d2e2c2084a5b822816ff33c90732283d37fd7a465b00d1b96bc70951fc749334f8398 WHIRLPOOL 7019d96b0cc31b0a05117ecbbc57578811335fcfdd16421aee0711f2755aa7d7df7e2d75b93c885767194c1a0d811cb5a54d4bb8c79023a017deacfb0201eaca
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlPSIPMACgkQcaHudmEf86rGbwCfbUWLHPu4NSAUn+0xd+6ketqP
-I0wAn18QgdDXoQUhNoY/HHjVmDfNHlz9
-=Bte6
+iF4EAREIAAYFAlSmEA0ACgkQoBEVQmGOlx+2QQEAtffGvE06BR8gpzzoBEmFXUS8
+tUhYjHqfrq79OomrmpMBAJtcUSKv+QhMqLolyfUmQWFucgJDw9z1M8XWWDEVPwnr
+=FJ5C
 -----END PGP SIGNATURE-----

diff --git a/dev-haskell/chell/chell-0.4.ebuild b/dev-haskell/chell/chell-0.4.ebuild
index 9540daa46a99c99b474a044d6b1507812fb341b0..6fec278d86d2d2bf2433db8c49d248e7d8646b67 100644 (file)
--- a/dev-haskell/chell/chell-0.4.ebuild
+++ b/dev-haskell/chell/chell-0.4.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/chell/chell-0.4.ebuild,v 1.2 2014/07/25 09:16:26 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/chell/chell-0.4.ebuild,v 1.3 2015/01/02 03:27:03 gienah Exp $
 
 EAPI=5
 
 # ebuild generated by hackport 0.3.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
+inherit base haskell-cabal
 
 DESCRIPTION="A simple and intuitive library for automated testing"
 HOMEPAGE="https://john-millikin.com/software/chell/"
@@ -30,6 +30,8 @@ DEPEND="${RDEPEND}
        >=dev-haskell/cabal-1.6.0.3
 "
 
+PATCHES=("${FILESDIR}/${PN}-0.4-ghc-7.10.patch")
+
 src_configure() {
        haskell-cabal_src_configure \
                $(cabal_flag color-output color-output)

diff --git a/dev-haskell/chell/files/chell-0.4-ghc-7.10.patch b/dev-haskell/chell/files/chell-0.4-ghc-7.10.patch
new file mode 100644 (file)
index 0000000..831cdcf
--- /dev/null
+++ b/dev-haskell/chell/files/chell-0.4-ghc-7.10.patch
@@ -0,0 +1,20 @@
+--- chell-0.4-orig/lib/Test/Chell.hs   2014-05-19 03:42:17.000000000 +1000
++++ chell-0.4/lib/Test/Chell.hs        2015-01-02 14:19:11.555163417 +1100
+@@ -1,6 +1,7 @@
+ {-# LANGUAGE TemplateHaskell #-}
+ {-# LANGUAGE TypeSynonymInstances #-}
+ {-# LANGUAGE FlexibleInstances #-}
++{-# LANGUAGE CPP #-}
+ 
+ -- | Chell is a simple and intuitive library for automated testing. It natively
+ -- supports assertion-based testing, and can use companion libraries
+@@ -118,6 +119,9 @@
+       , testOptionTimeout
+       ) where
+ 
++#if MIN_VERSION_base(4,8,0)
++import Prelude hiding(pure)
++#endif
+ import qualified Control.Applicative
+ import qualified Control.Exception
+ import           Control.Exception (Exception)