diff options
author | Mark Wright <gienah@gentoo.org> | 2015-01-02 02:42:13 +0000 |
---|---|---|
committer | Mark Wright <gienah@gentoo.org> | 2015-01-02 02:42:13 +0000 |
commit | 4bceb1862807610554e71d90487fb835cc48de80 (patch) | |
tree | aed94109e224f8c0fb4edd11f0c7324dd1be91ce /dev-haskell/syb | |
parent | Switch to python-any-r1 since Python is only a build-time dependency. (diff) | |
download | gentoo-2-4bceb1862807610554e71d90487fb835cc48de80.tar.gz gentoo-2-4bceb1862807610554e71d90487fb835cc48de80.tar.bz2 gentoo-2-4bceb1862807610554e71d90487fb835cc48de80.zip |
Bump syb to 0.4.3, with tests patched for ghc 7.10.
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 618E971F)
Diffstat (limited to 'dev-haskell/syb')
-rw-r--r-- | dev-haskell/syb/ChangeLog | 10 | ||||
-rw-r--r-- | dev-haskell/syb/files/syb-0.4.3-ghc-7.10.patch | 152 | ||||
-rw-r--r-- | dev-haskell/syb/syb-0.4.3.ebuild | 29 |
3 files changed, 189 insertions, 2 deletions
diff --git a/dev-haskell/syb/ChangeLog b/dev-haskell/syb/ChangeLog index d85eec3ae1f8..787a5beda3a1 100644 --- a/dev-haskell/syb/ChangeLog +++ b/dev-haskell/syb/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-haskell/syb -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/syb/ChangeLog,v 1.32 2014/07/25 08:59:10 slyfox Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/syb/ChangeLog,v 1.33 2015/01/02 02:42:13 gienah Exp $ + +*syb-0.4.3 (02 Jan 2015) + + 02 Jan 2015; Mark Wright <gienah@gentoo.org> +files/syb-0.4.3-ghc-7.10.patch, + +syb-0.4.3.ebuild: + Bump syb to 0.4.3, with tests patched for ghc 7.10. 25 Jul 2014; Sergei Trofimovich <slyfox@gentoo.org> metadata.xml: Drop redundant '<maintainer>' field, leave only '<herd>'. diff --git a/dev-haskell/syb/files/syb-0.4.3-ghc-7.10.patch b/dev-haskell/syb/files/syb-0.4.3-ghc-7.10.patch new file mode 100644 index 000000000000..2773bdc5a631 --- /dev/null +++ b/dev-haskell/syb/files/syb-0.4.3-ghc-7.10.patch @@ -0,0 +1,152 @@ +--- syb-0.4.3-orig/tests/XML.hs 2014-12-31 19:40:41.000000000 +1100 ++++ syb-0.4.3/tests/XML.hs 2015-01-02 12:47:10.082782760 +1100 +@@ -13,6 +13,7 @@ +
+ import Test.HUnit
+
++import Control.Applicative (Alternative(..), Applicative(..))
+ import Control.Monad
+ import Data.Maybe
+ import Data.Generics
+@@ -157,6 +158,17 @@ + else Just (tail x, head x)
+ )
+
++instance Functor ReadX where
++ fmap = liftM
++
++instance Applicative ReadX where
++ pure = return
++ (<*>) = ap
++
++instance Alternative ReadX where
++ (<|>) = mplus
++ empty = mzero
++
+ -- ReadX is a monad!
+ instance Monad ReadX where
+ return x = ReadX (\y -> Just (y,x))
+--- syb-0.4.3-orig/tests/Perm.hs 2014-12-31 19:40:41.000000000 +1100 ++++ syb-0.4.3/tests/Perm.hs 2015-01-02 12:47:02.751422866 +1100 +@@ -11,6 +11,7 @@ +
+ import Test.HUnit
+
++import Control.Applicative (Alternative(..), Applicative(..))
+ import Control.Monad
+ import Data.Generics
+
+@@ -44,6 +45,17 @@ + else Just (tail x, head x)
+ )
+
++instance Functor ReadT where
++ fmap = liftM
++
++instance Applicative ReadT where
++ pure = return
++ (<*>) = ap
++
++instance Alternative ReadT where
++ (<|>) = mplus
++ empty = mzero
++
+ -- ReadT is a monad!
+ instance Monad ReadT where
+ return x = ReadT (\y -> Just (y,x))
+--- syb-0.4.3-orig/tests/Bits.hs 2014-12-31 19:40:41.000000000 +1100 ++++ syb-0.4.3/tests/Bits.hs 2015-01-02 12:46:37.842839944 +1100 +@@ -39,6 +39,7 @@ + import Data.Generics
+ import Data.Char
+ import Data.Maybe
++import Control.Applicative (Alternative(..), Applicative(..))
+ import Control.Monad
+ import CompanyDatatypes
+
+@@ -129,6 +130,16 @@ + data ReadB a = ReadB (Bin -> (Maybe a, Bin))
+ unReadB (ReadB f) = f
+
++instance Functor ReadB where
++ fmap = liftM
++
++instance Applicative ReadB where
++ pure = return
++ (<*>) = ap
++
++instance Alternative ReadB where
++ (<|>) = mplus
++ empty = mzero
+
+ -- It's a monad.
+ instance Monad ReadB where
+--- syb-0.4.3-orig/tests/Encode.hs 2014-12-31 19:40:41.000000000 +1100 ++++ syb-0.4.3/tests/Encode.hs 2015-01-02 12:51:48.500949407 +1100 +@@ -6,6 +6,8 @@ +
+ module Encode () where
+
++import Control.Applicative (Applicative(..))
++import Control.Monad (ap, liftM)
+ import Data.Generics
+
+ data Bit = Zero | One
+@@ -62,6 +64,11 @@ + -- Sec. 3.3 cont'd
+
+ data EncM a -- The encoder monad
++instance Functor EncM where
++ fmap = liftM
++instance Applicative EncM where
++ pure = return
++ (<*>) = ap
+ instance Monad EncM
+ where
+ return = undefined
+--- syb-0.4.3-orig/tests/GRead2.hs 2014-12-31 19:40:41.000000000 +1100 ++++ syb-0.4.3/tests/GRead2.hs 2015-01-02 12:51:27.524567019 +1100 +@@ -10,6 +10,8 @@ +
+ -}
+
++import Control.Applicative (Applicative(..))
++import Control.Monad (ap, liftM)
+ import Data.Generics
+
+ gread :: Data a => String -> Maybe a
+@@ -18,6 +20,13 @@ + -- The decoder monad
+ newtype DecM a = D (String -> Maybe (String, a))
+
++instance Functor DecM where
++ fmap = liftM
++
++instance Applicative DecM where
++ pure = return
++ (<*>) = ap
++
+ instance Monad DecM where
+ return a = D (\s -> Just (s,a))
+ (D m) >>= k = D (\s ->
+--- syb-0.4.3-orig/tests/Ext1.hs 2014-12-31 19:40:41.000000000 +1100 ++++ syb-0.4.3/tests/Ext1.hs 2015-01-02 10:30:39.396517984 +1100 +@@ -1,4 +1,5 @@ + {-# OPTIONS -fglasgow-exts #-}
++{-# LANGUAGE CPP #-}
+
+ module Ext1 (tests) where
+
+@@ -11,8 +12,11 @@ + import Test.HUnit
+
+ import Data.Generics
++#if MIN_VERSION_base(4,8,0)
++import GHC.Base hiding(foldr)
++#else
+ import GHC.Base
+-
++#endif
+
+ -- Unsafe coerce
+ unsafeCoerce :: a -> b
diff --git a/dev-haskell/syb/syb-0.4.3.ebuild b/dev-haskell/syb/syb-0.4.3.ebuild new file mode 100644 index 000000000000..ac6e27085a16 --- /dev/null +++ b/dev-haskell/syb/syb-0.4.3.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/syb/syb-0.4.3.ebuild,v 1.1 2015/01/02 02:42:13 gienah Exp $ + +EAPI=5 + +# ebuild generated by hackport 0.4.4.9999 + +CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" +inherit base haskell-cabal + +DESCRIPTION="Scrap Your Boilerplate" +HOMEPAGE="http://www.cs.uu.nl/wiki/GenericProgramming/SYB" +SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0/${PV}" +KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux" +IUSE="" + +RDEPEND=">=dev-lang/ghc-7.4.1:= +" +DEPEND="${RDEPEND} + >=dev-haskell/cabal-1.8 + test? ( dev-haskell/hunit + dev-haskell/mtl ) +" + +PATCHES=("${FILESDIR}/${PN}-0.4.3-ghc-7.10.patch") |