diff options
author | Mark Wright <gienah@gentoo.org> | 2015-06-01 08:44:55 +0000 |
---|---|---|
committer | Mark Wright <gienah@gentoo.org> | 2015-06-01 08:44:55 +0000 |
commit | 0439e7538dd522afaf7fdbdf81cdbaaf64b3033c (patch) | |
tree | 9c9a1f4ff29f59141e1ef907c9f11a66a3ce6756 /dev-haskell/asn1-data | |
parent | version bump (diff) | |
download | gentoo-2-0439e7538dd522afaf7fdbdf81cdbaaf64b3033c.tar.gz gentoo-2-0439e7538dd522afaf7fdbdf81cdbaaf64b3033c.tar.bz2 gentoo-2-0439e7538dd522afaf7fdbdf81cdbaaf64b3033c.zip |
Thanks to Sergei Trofimovich (slyfox) for patching asn1-data-0.7.1-r1 for ghc 7.10.1
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 618E971F)
Diffstat (limited to 'dev-haskell/asn1-data')
-rw-r--r-- | dev-haskell/asn1-data/ChangeLog | 11 | ||||
-rw-r--r-- | dev-haskell/asn1-data/asn1-data-0.7.1-r1.ebuild | 32 | ||||
-rw-r--r-- | dev-haskell/asn1-data/files/asn1-data-0.7.1-ghc-7.10.patch | 16 |
3 files changed, 57 insertions, 2 deletions
diff --git a/dev-haskell/asn1-data/ChangeLog b/dev-haskell/asn1-data/ChangeLog index f3ffe5e2dfc1..aeab715a1efc 100644 --- a/dev-haskell/asn1-data/ChangeLog +++ b/dev-haskell/asn1-data/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-haskell/asn1-data -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/asn1-data/ChangeLog,v 1.4 2014/07/25 08:58:13 slyfox Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/asn1-data/ChangeLog,v 1.5 2015/06/01 08:44:55 gienah Exp $ + +*asn1-data-0.7.1-r1 (01 Jun 2015) + + 01 Jun 2015; Mark Wright <gienah@gentoo.org> +asn1-data-0.7.1-r1.ebuild, + +files/asn1-data-0.7.1-ghc-7.10.patch: + Thanks to Sergei Trofimovich (slyfox) for patching asn1-data-0.7.1-r1 for ghc + 7.10.1 25 Jul 2014; Sergei Trofimovich <slyfox@gentoo.org> metadata.xml: Drop redundant '<maintainer>' field, leave only '<herd>'. diff --git a/dev-haskell/asn1-data/asn1-data-0.7.1-r1.ebuild b/dev-haskell/asn1-data/asn1-data-0.7.1-r1.ebuild new file mode 100644 index 000000000000..1c04b3e1334d --- /dev/null +++ b/dev-haskell/asn1-data/asn1-data-0.7.1-r1.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/asn1-data/asn1-data-0.7.1-r1.ebuild,v 1.1 2015/06/01 08:44:55 gienah Exp $ + +EAPI=5 + +# ebuild generated by hackport 0.4.5.9999 + +CABAL_FEATURES="bin lib profile haddock hoogle hscolour" +inherit eutils haskell-cabal + +DESCRIPTION="ASN1 data reader and writer in RAW, BER and DER forms" +HOMEPAGE="http://github.com/vincenthz/hs-asn1-data" +SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND="dev-haskell/cereal:=[profile?] + dev-haskell/mtl:=[profile?] + >=dev-haskell/text-0.11:=[profile?] + >=dev-lang/ghc-7.4.1:= +" +DEPEND="${RDEPEND} + >=dev-haskell/cabal-1.6 +" + +src_prepare() { + epatch "${FILESDIR}"/${P}-ghc-7.10.patch +} diff --git a/dev-haskell/asn1-data/files/asn1-data-0.7.1-ghc-7.10.patch b/dev-haskell/asn1-data/files/asn1-data-0.7.1-ghc-7.10.patch new file mode 100644 index 000000000000..8bf958454bef --- /dev/null +++ b/dev-haskell/asn1-data/files/asn1-data-0.7.1-ghc-7.10.patch @@ -0,0 +1,16 @@ +diff --git a/Data/ASN1/Parse.hs b/Data/ASN1/Parse.hs +index eeea2be..83bc80e 100644 +--- a/Data/ASN1/Parse.hs ++++ b/Data/ASN1/Parse.hs +@@ -24 +24 @@ import Control.Monad.Error +-import Control.Applicative ((<$>)) ++import Control.Applicative ((<$>), Applicative) +@@ -25,7 +25,7 @@ import Control.Applicative ((<$>)) + + -- | Parse ASN1 Monad + newtype ParseASN1 a = P { runP :: ErrorT String (State [ASN1]) a } +- deriving (Functor, Monad, MonadError String) ++ deriving (Functor, Applicative, Monad, MonadError String) + + -- | run the parse monad over a stream and returns the result and the remaining ASN1 Stream. + runParseASN1State :: ParseASN1 a -> [ASN1] -> Either String (a,[ASN1]) |