From 84105f914e3b24d8ebceb8885c89d22c59283d9c Mon Sep 17 00:00:00 2001 From: Mark Wright Date: Fri, 2 Jan 2015 02:42:22 +0000 Subject: [PATCH] Bump syb to 0.4.3, with tests patched for ghc 7.10. Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0x618E971F --- dev-haskell/syb/ChangeLog | 10 +- dev-haskell/syb/Manifest | 13 +- .../syb/files/syb-0.4.3-ghc-7.10.patch | 152 ++++++++++++++++++ dev-haskell/syb/syb-0.4.3.ebuild | 29 ++++ 4 files changed, 197 insertions(+), 7 deletions(-) create mode 100644 dev-haskell/syb/files/syb-0.4.3-ghc-7.10.patch create mode 100644 dev-haskell/syb/syb-0.4.3.ebuild 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 +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 metadata.xml: Drop redundant '' field, leave only ''. diff --git a/dev-haskell/syb/Manifest b/dev-haskell/syb/Manifest index 7327a33b182e..7eca34dd4f91 100644 --- a/dev-haskell/syb/Manifest +++ b/dev-haskell/syb/Manifest @@ -2,6 +2,7 @@ Hash: SHA256 AUX syb-0.3.2-ghc-7.2.patch 434 SHA256 9a62154f93c1daf9c1e2ae1cea2014798f221f182ad7b17be74092479f14ab23 SHA512 327e83d1cd5a39008d7474b2e3968b50b93396a756491cc7c480569be0265f173091aaadacfb45650b36817013fedff45af5d574783403d37dbdab3c8c5d4562 WHIRLPOOL 1dc872fcad3efd7d881bae8337ab76726d46afec4ffa22cffebbb47dadbb33c091d6fc0c35289887160da823be61d5622b38cab72e9fa5224f7678e1a9da2aae +AUX syb-0.4.3-ghc-7.10.patch 3685 SHA256 68b6459779091fc4fe02ea02a236791a4873dd6ff639a86a9bbd505cd188ab94 SHA512 2518320db73ae06c160fa77516ccc66bc156b480d4fb723ae4927ad18704d60522f55d0d255154829bff8c637054fce54d7e9e15757cd1a78be4b75c0ad8c19a WHIRLPOOL d139d221ddf214eb01629c26d3a061e095a1e405519a9c6dc9dc8e4b278c3f3573e2c005930eea00a7331cf0c7c3ef56c6a399ed558dd8930d074b706f411893 DIST syb-0.3.2.tar.gz 38397 SHA256 6dbf7deeaf08919478f6b65714c60ded0f78cf0126fd957957e8d9b53fe5fb6b SHA512 4d412054b371202a518840fa2c47752727c6058b7be81fc07e1c2dd6bb8ca79fb8171ba6415740e19a5b5e45c3e2eb04d5b0165a36a97e3aac88e9458d63448f WHIRLPOOL c36dcb9865104b764c90453ba9ecc6b71720093940d54819d97d9dd7f7642f5fe9c9557b87da259318ae9961bffd015564b1a7a170c4540d591d58a8bd9e6eae DIST syb-0.3.6.1.tar.gz 38422 SHA256 646cfc8feaa2625bbac94675ee51256de69ebfcf35d760cbfa39aaeda132dff7 SHA512 514dcda360f8efd62321fd75544e60447adcd043f7527dd34772f452694d72c88afa72ef7b756cdb7860d6b1fe9887c8d62b5179edc70900eb6d1f6be792e0d5 WHIRLPOOL 18cd6c2fb0006e11df9885beb24538e21f7df9a1291600268500f89e866a5262d87ac5106d1732831b0b92ccc794f9c2726331e52ece173b87cebe7e5b13ca1e DIST syb-0.3.6.tar.gz 38402 SHA256 4568009068efbd6e1670b7ce54f7bafe62e172f2a19f057fa2c905fe082c0bce SHA512 346a786aba6ca531981dff3dd5fbf76721bbbb3a515fc4667b9328f65e5985e8011a6d68399f7700be0a051ebb2871de0d789dc07d0417fc8b6d8bf009d4e8f1 WHIRLPOOL 2317e154178a9d153a2889db93109e1ec9986b90b3905e54d87bacbf4701482df3ba54453f885dfde9682da101e32a3dbf48ad316b4c22bda8bd0112d3b4da67 @@ -9,6 +10,7 @@ DIST syb-0.3.7.tar.gz 39091 SHA256 59f4058a8182a472c0e0e35f8aca836470a5785d3dcd0 DIST syb-0.4.0.tar.gz 71729 SHA256 f201089aa7e74b6cbca7fc73a259596b2a9628e31a9b54e801844ad68447bff3 SHA512 72e4672bf2aaa68ff9ac32060bd342a0d0e0261313089d7b7a487a65bbff5c2dc15a7a2560b2cfc6618bda5cfc810af7f50ec800d393ee46101ebf5e7911a260 WHIRLPOOL 35423bdabfe0581e64c47d990a2bda3bf94f59048679e2eb826debc54cb2ec48609190a8c5a7f31add7198288ecbcff6bf274bfd58b2604f61d49f4fe2445eff DIST syb-0.4.1.tar.gz 38699 SHA256 aa32cb3d9a0cbcfb24ac1c5d567886e8908dd017fd009ffd446bff86732670d2 SHA512 86a0a9af0a63f8cee32ef7b6d7a3ed06993c5adfffc5bf1a81a0ac0824245963162ee22b747fa7a15774a5edf0f1c21564e6c0f221d67a24d58f5faa615bd37f WHIRLPOOL e94a3f9ac84274324743ff4e922c214a5eec7ce5224987b34c308605d1dd1460ecedb207618b865d084ba63342a277a5c8c8d66623e9128fbf24a40428e823cc DIST syb-0.4.2.tar.gz 38388 SHA256 142d71c9c655f9cd43d9e17f28232b95bccd1f36b1a77b39113732b69ee07ebf SHA512 3386f0913b0d5cfa43eddc0feec013302ccca45cff707bff1cd2951c95f1106a7e810cdf13a407889073a905d65852563a7b1bcc7fcf263d97db876fc2659e9f WHIRLPOOL 21869372bed9bbcfc0f67393484a22c5d31ee9f86ee8042067db6dfbc6971b10c22ac6fdc2d63ee504fe66dc14dc37b8ec21eafd8a75739167999d6b78ec7cd9 +DIST syb-0.4.3.tar.gz 38860 SHA256 749ff49197c75d3d182f9d5e6043c0ec2325476b7792245630f6578edf490e35 SHA512 d351eb020dba7c257904b81504cacc233b33864bcc54aad48267db313755243206a2dc4a89d473062d5ca4eff09dd57f0610e99f944717a8e3bbd724775fd6b3 WHIRLPOOL 31b64688fd65930331ec7adf7c6e01be063b4adffa48bf6abe41aaed0716ba71629880e7260b12a223e9c9198b558f8a8d8eb34db70f7951c043812400108056 EBUILD syb-0.3.2.ebuild 792 SHA256 118d94f8a9f1ba191d81cf03fdbceba30e2236a904f2ed1de76b62b16d6653ee SHA512 1c32c491bc996a62dd65325ef204795715ce777f273206206d393f7929be447712a14802cb390efbd9d136da3c6fd5673a17afffb5a41f475b1b576319a95d11 WHIRLPOOL fc20689c3d54330410d46b68b8229c1e28ae07dc74db1b7a4a533f1293a6be5780f47c8d9d890744c4361d63f4b721d9fed7cb05d580bc25394934d2c724109f EBUILD syb-0.3.6.1.ebuild 665 SHA256 6d632468a48ffc01c873531d363c0e6a268471c26355bdff58d03b179fbc8348 SHA512 eb29e2b3c80c74f5ecb859d6332ac56e827f1c9d96a7fc9bde963680b8b8dd0631d1649dd285c826f5148d51f8a9b64c7c17290b8ea8665a283b83387be05fca WHIRLPOOL f720d916a5c607375600e458a543c6f15461b55ab1105975afbcc069cf132f5087792e031e521bfda9b928c7fa05771add5b7d36caf1bfcb4ce8ca243b8ea46c EBUILD syb-0.3.6.ebuild 689 SHA256 d24f331ab1e861754174e3345080376152a2e2763aac81749768cd26197490c3 SHA512 27f86c2d037fe31a251db861377f6a1169d1b502bfe638c6c29b8a9110531ace58ccb0675d859a6da0ef0b9c116daa6edfdbb5910e9627c4da47b146fea5e61c WHIRLPOOL c907ee3b7edcd06fe0323f9eff6132e627996eb4f463076d5083037fdede2e5fa27b2be3d0641b16918c3e0ec69f322d929eaf439a429edd463962092b446b14 @@ -16,12 +18,13 @@ EBUILD syb-0.3.7.ebuild 653 SHA256 dace3188d27c4aed94e9c67d15480e7b59486d6edfa6c EBUILD syb-0.4.0.ebuild 755 SHA256 cfc09fb1510a8d803c30d37e7a5c438c6581b3765c9a3d0e44a76763a9e55820 SHA512 89108eb1170037bd8371b70b61d32fdf5e73a94b84096c019514f20d82c37e1954ddd1d93e967d009642c6f035f1df2b43b208aad56d9129ab8ce292fd5de2bd WHIRLPOOL 07fe011a78a7686ed864cb3f0a68d2b480db8962657b1cc810ed80d74634f09a3d643d4f2e1abe4957d54fe614da8187cbdcaf6d8b4c726fc0b5d54d5a4ef69a EBUILD syb-0.4.1.ebuild 942 SHA256 81c2c59e3e448ada69027ea2e8666cf348abab7e530a8971a0334e3345bd09e8 SHA512 45f41901efb564d8d3b4c27a82aa28ea0b9ac60dd0f29d5bfa47adf78e332bb438c25eced7988d068b8e6272e7ea97ed1dfba0a63b8ace32a877ca6b0d16a43a WHIRLPOOL 3a6956819edd72bdfbb402aad25a359b6662e1c7e796557db3cc200c5534db18d56f531bd8fe8cdda527f2cd577c70ae31a1fbc146779aa9343e42ecc0b92c47 EBUILD syb-0.4.2.ebuild 761 SHA256 2e7e0335fdab46b01e718d9ee3bc0bc5a4f0227cee869729197733226acc9e47 SHA512 de556db72dca391ed439a0b298461eaa79830cb7cfb8bede9a60068cf6769439df8090e246fa241018b0ce2f47ab29326f510439683ed34fd6de58fdc9af617c WHIRLPOOL b4f79562eb4fffd0b4f0ba6804978e7e05753057e6503b60fe6af211319869dd1dc86f6380d4775712bf24b32441bff4e1e394fa88e9b2365525ad8eaa2c268b -MISC ChangeLog 3750 SHA256 5c3fd8e880bfcd8627c970a90259d669c14d1a87fc28a403579da80b20be9c07 SHA512 01e097d543dcd6e98d9a52ba033dc07832c97bec21775c319d6ff96dabdafaa3dbaf10e4345b53d0217a244377573dc3e6ec695f69ce574bad04d9de9ba069c1 WHIRLPOOL 2cdd5b69b163ab075252cd672b632e7cb2f967c259079f4c4a8d38606953a3cc8f34278ea2a1f8e1c502446475f2586a84f963cb737fc279e0d946dfec20e268 +EBUILD syb-0.4.3.ebuild 818 SHA256 981493e0c1513d7ba84e3f3c4d1b3743ca397ded585562c1265eb421a0df4553 SHA512 0ebf6ee2f86cacfb742d04cf50f3c268076f388916b8b48d485606ff478df7d492da3f714b6c4401bc0497e47c4898921a1032196757ea417f3c37bd3d74ba06 WHIRLPOOL ebc2d7d7f212b6719f2e89d496948c8268a0793283559bc503b2b7873fafc626e54c397bda42df36dddbff82368da8692aa4ee4f90f0446325eeed390be5dd4f +MISC ChangeLog 3932 SHA256 165f8dde3bc0e68d1d0156661c461b3e0b3c10fcfa8b7e69d425391b5e1855da SHA512 2fefdeb7c61a49f37d72652252715b129c2b51ae849e6774af125cec87085c778bed98d4a78c514025029f06212a0465638f720d021fba5bb20d20959a88e2b5 WHIRLPOOL 7e8c3372fad9532a4fcc169966dec8bb11addc67239972110c2be2734c772bc3f670757781b89aa2b1af008e20646832609206fe13cc2ed384f436fd32e91c16 MISC metadata.xml 529 SHA256 f09eb7b682d87368c8d5102e006e34f77219a93f9b4319b871f4db4e1c2713af SHA512 7cdd1ba2574ab402299490bda6697d462cdb8d18f98b0ee8428a45784b53675f97043e410f4f690c5182680ebce8463e5aaddb8f0477f4ea95ddd4b6b56bbaa1 WHIRLPOOL e7aa5b8cb0574993bcc94b455b7b7642557c2e6ac1e8ce8f5a1f8a5f640a93ef1359821d9ca67f75ac915385912708b0bfa28fdffe73c85888c5721b0d7c10b3 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.22 (GNU/Linux) +Version: GnuPG v2 -iEYEAREIAAYFAlPSHJMACgkQcaHudmEf86r8rACdE5QLyhp0FOpEQQj+9LE8cYXr -ZzwAnR4upsgkO9CdGfPdvt8Rfjyo/jaP -=pa4f +iF4EAREIAAYFAlSmBYwACgkQoBEVQmGOlx/W2wD9FJkl9d9fWdRN34r0T6j1el15 +6m5vih4ntC0sV1LCvQ8A/2LEfWBXPmersRewx5yW1HlYsiobPes7mqI0M3DAqcOf +=jING -----END PGP SIGNATURE----- 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") -- 2.26.2