From 213b698248b328e0f1579f681ccc9a9496b4db65 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Tue, 5 May 2015 20:45:55 +0000 Subject: [PATCH] =?utf8?q?Fix=20build=20failure=20against=20modern=20ghc?= =?utf8?q?=20(bug=20#423949=20by=20Diego=20Elio=20Petten=C3=B2=20and=20by?= =?utf8?q?=20Toralf=20F=C3=B6rster)?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Package-Manager: portage-2.2.18/cvs/Linux x86_64 Manifest-Sign-Key: 0x611FF3AA --- dev-haskell/uuagc/ChangeLog | 9 +- dev-haskell/uuagc/Manifest | 13 +- .../uuagc/files/uuagc-0.9.24-ghc-7.8.patch | 193 ++++++++++++++++++ dev-haskell/uuagc/uuagc-0.9.24.ebuild | 16 +- 4 files changed, 220 insertions(+), 11 deletions(-) create mode 100644 dev-haskell/uuagc/files/uuagc-0.9.24-ghc-7.8.patch diff --git a/dev-haskell/uuagc/ChangeLog b/dev-haskell/uuagc/ChangeLog index cc7725ad8969..f5e74c6eec92 100644 --- a/dev-haskell/uuagc/ChangeLog +++ b/dev-haskell/uuagc/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-haskell/uuagc -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/uuagc/ChangeLog,v 1.22 2013/06/18 21:33:02 slyfox Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/uuagc/ChangeLog,v 1.23 2015/05/05 20:45:51 slyfox Exp $ + + 05 May 2015; Sergei Trofimovich + +files/uuagc-0.9.24-ghc-7.8.patch, uuagc-0.9.24.ebuild: + Fix build failure against modern ghc (bug #423949 by Diego Elio Pettenò and by + Toralf Förster) 18 Jun 2013; Sergei Trofimovich -files/uuagc-0.9.1-split-base.patch, -uuagc-0.9.1.ebuild, -uuagc-0.9.5.ebuild: diff --git a/dev-haskell/uuagc/Manifest b/dev-haskell/uuagc/Manifest index 283a99ed22fa..3558680a6000 100644 --- a/dev-haskell/uuagc/Manifest +++ b/dev-haskell/uuagc/Manifest @@ -1,14 +1,15 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 +AUX uuagc-0.9.24-ghc-7.8.patch 8165 SHA256 96aa4fc11eae8fd1e6939fce2a5b60ea1acb4559d31c8b90bd37bf53387cb12d SHA512 692d8dc68fae40ade8cf1308d2bc7733ff7e1e9f94988b8f901f45a983d9c506283eb1b839617776bd8e12ff23c8855c9edcaa1afe41288ff16add278ac85a17 WHIRLPOOL 05baf714d0d3db99940f49f277fa3bf35b33d745e8931a687a98ac39309952f907bf0253c386464c34beb53abd3349ea636b24c58f2f98c479d8b4540bc6c567 DIST uuagc-0.9.24.tar.gz 253310 SHA256 a183d10f83f944d09693c66736072168adca78518ae7776e0d2b3f5eff762a0f SHA512 9fac31311c1e3983c42b013dd934893b2347755c1b49295a0d82093aa53dadc36bad1d6c996a20526099bcef6b71c4e5ad17c37e550aa1b6ad84de79b1186494 WHIRLPOOL 54a978c6de51df04f7f185df713bf6b7d69422f1dff058c5b95d26b5bfa426ad4c3fed0fa0ee9f92bd1120fc8704eefab852c998d36ab0f6a229d40a8d6c7ac8 -EBUILD uuagc-0.9.24.ebuild 689 SHA256 7acf7dacf9df0683704f3dd92482b2ea7a555ef16cc7351b7c77b6a57f6bf1e1 SHA512 3b579b806b6af91c9f43d88e336c2fa96d47dadf613fa8f5471f314aecced74858ba97c6ec9fb1b530d0ea194d12644afc21857630d99ee1bb003fb68d629ebd WHIRLPOOL 85fcf72c6f3c5165d6040c76187aaca062960010aa2ab05cb3f7fbf19e1d9c3e71ec759d350909d207a552591330ec803a6f08df82a7178c858c742df71ece4c -MISC ChangeLog 2994 SHA256 c50d008d22f1c346c5ac89d7b8de6c016577dfdf600ee7ad0b2ac8960f4820df SHA512 dc1ba931a3992cb18508486758aba1abb477aaf04fa4823e4e1995530bb4029f055911a2b828556441c07d2a7080b0b84f2b36b4cda592674f97210673d94743 WHIRLPOOL 6577029cb8bf7338fc639db8f2406dde390c0c8e84dbecd6b088177db02554565abc30de8cb86c4a57652d4f2fe8d3263b0e44d96d866135131e37194ac22759 +EBUILD uuagc-0.9.24.ebuild 850 SHA256 3d305ff954bd199281fde84c35b69a619e5be60a67ef08e70c450d764538f4ee SHA512 ba006ab48a825b59eab40e59c33f973e0dddabbbdfeeea3a09d21e1e2bfd7f051af1a8fa2031f09f331e264a6cd4898b82bc309c8c33a9995462210e8c37df1b WHIRLPOOL 57d46a5c985838c226f272a6878b65374b6e4486a2409180d4b04b00ae1a88093d37d0a50d588834ec6656c25785249c5ec526156efc5b61c8bfc4784f3ff948 +MISC ChangeLog 3208 SHA256 94b750d9dd30e691da6f37d69c00e22b61de6e5f2b51ab5a1b89bb819c682f6b SHA512 c30407862e711a06fc18aed22f09b48de481e940f22f9d8cad84f6cb95375e1f75c5970b4c0c04257f1e41d8e8746e34e7fe621e787b65578c51324d0f720f01 WHIRLPOOL e0a8efa2b4e2bf4fec902033532e6c3a0fa7b113cfd4a5aa0eb161c184e86a05a8a136c03512c638c19f673299c1d95f5bc4260fac9f04f94f12c1a7a24abc7e MISC metadata.xml 223 SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508 SHA512 24765bbf1cb187cd262aa7fb3824c1cec65e2bf3f2198099de688916d96401a26458265b15408f22b1fbd6d6a2842df814a57ceda80dfa00d130b24423b7544f WHIRLPOOL 8fd6700f6198db6540eb51edf11372faeb6eb8a542a692e515badf236f62444f2c180f7d08e0f98e9fdfa23de14631b31af50543469aaa27084d6b637e2644c7 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.20 (GNU/Linux) +Version: GnuPG v2 -iEYEAREIAAYFAlHA0asACgkQcaHudmEf86pcaACeNUSrqTmXGENFO5sjEj8bwl0l -TpIAniUkGtpPF/pLLWSqo1FK7mKdDg+n -=oHTm +iEYEAREIAAYFAlVJK5EACgkQcaHudmEf86q6gwCggHNXCx9/ymvWLZ0jgjWWxkN7 +nhsAnjuPFOOL9nqBUgL5z1l8pXcNRRkh +=LlA9 -----END PGP SIGNATURE----- diff --git a/dev-haskell/uuagc/files/uuagc-0.9.24-ghc-7.8.patch b/dev-haskell/uuagc/files/uuagc-0.9.24-ghc-7.8.patch new file mode 100644 index 000000000000..bfe30c62da9f --- /dev/null +++ b/dev-haskell/uuagc/files/uuagc-0.9.24-ghc-7.8.patch @@ -0,0 +1,193 @@ +diff -uraN -U0 uuagc-0.9.24/work/uuagc-0.9.24/src/Ag.hs uuagc-0.9.24-r0/work/uuagc-0.9.24/src/Ag.hs +--- uuagc-0.9.24/work/uuagc-0.9.24/src/Ag.hs 2010-06-04 14:03:54.000000000 +0100 ++++ uuagc-0.9.24-r0/work/uuagc-0.9.24/src/Ag.hs 2015-05-05 09:05:06.300665157 +0100 +@@ -1,9 +1,10 @@ + module Main where + +-import System (getArgs, getProgName, exitFailure) ++import System.Environment (getArgs, getProgName) ++import System.Exit (exitFailure) + import System.Console.GetOpt (usageInfo) +-import List (isSuffixOf) +-import Monad (zipWithM_) ++import Data.List (isSuffixOf) ++import Control.Monad (zipWithM_) + import Data.Maybe + + import qualified Data.Set as Set +diff -uraN -U0 uuagc-0.9.24/work/uuagc-0.9.24/src/DepTypes.hs uuagc-0.9.24-r0/work/uuagc-0.9.24/src/DepTypes.hs +--- uuagc-0.9.24/work/uuagc-0.9.24/src/DepTypes.hs 2010-06-04 14:03:54.000000000 +0100 ++++ uuagc-0.9.24-r0/work/uuagc-0.9.24/src/DepTypes.hs 2015-05-05 09:07:11.471671524 +0100 +@@ -1,3 +1,4 @@ ++{-# LANGUAGE FlexibleInstances #-} + module DepTypes where + + import CommonTypes +diff -uraN -U0 uuagc-0.9.24/work/uuagc-0.9.24/src/HsTokenScanner.hs uuagc-0.9.24-r0/work/uuagc-0.9.24/src/HsTokenScanner.hs +--- uuagc-0.9.24/work/uuagc-0.9.24/src/HsTokenScanner.hs 2010-06-04 14:03:54.000000000 +0100 ++++ uuagc-0.9.24-r0/work/uuagc-0.9.24/src/HsTokenScanner.hs 2015-05-05 09:05:06.300665157 +0100 +@@ -2,11 +2,11 @@ + module HsTokenScanner where + import HsToken + import UU.Scanner.Position +-import List(sort) ++import Data.List(sort) + import UU.Util.BinaryTrees + import CommonTypes +-import Maybe +-import Char ++import Data.Maybe ++import Data.Char + isAGesc c = c == '@' + + lexTokens :: Pos -> String -> [HsToken] +diff -uraN -U0 uuagc-0.9.24/work/uuagc-0.9.24/src/Parser.hs uuagc-0.9.24-r0/work/uuagc-0.9.24/src/Parser.hs +--- uuagc-0.9.24/work/uuagc-0.9.24/src/Parser.hs 2010-06-04 14:03:54.000000000 +0100 ++++ uuagc-0.9.24-r0/work/uuagc-0.9.24/src/Parser.hs 2015-05-05 09:05:06.300665157 +0100 +@@ -8,10 +8,10 @@ + import Patterns + import UU.Pretty(text,PP_Doc,empty,(>-<)) + import TokenDef +-import List (intersperse) +-import Char ++import Data.List (intersperse) ++import Data.Char + import Scanner (Input(..),scanLit,input) +-import List ++import Data.List + import Expression + import UU.Scanner.Token + import UU.Scanner.TokenParser +diff -uraN -U0 uuagc-0.9.24/work/uuagc-0.9.24/src/Scanner.hs uuagc-0.9.24-r0/work/uuagc-0.9.24/src/Scanner.hs +--- uuagc-0.9.24/work/uuagc-0.9.24/src/Scanner.hs 2010-06-04 14:03:54.000000000 +0100 ++++ uuagc-0.9.24-r0/work/uuagc-0.9.24/src/Scanner.hs 2015-05-05 09:05:06.301665157 +0100 +@@ -6,9 +6,9 @@ + import UU.Scanner.Position + import UU.Scanner.Token + import UU.Parsing(InputState(..),Either'(..)) +-import Maybe +-import List +-import Char ++import Data.Maybe ++import Data.List ++import Data.Char + import UU.Scanner.GenToken + import Options + +diff -uraN -U0 uuagc-0.9.24/work/uuagc-0.9.24/src/TokenDef.hs uuagc-0.9.24-r0/work/uuagc-0.9.24/src/TokenDef.hs +--- uuagc-0.9.24/work/uuagc-0.9.24/src/TokenDef.hs 2010-06-04 14:03:54.000000000 +0100 ++++ uuagc-0.9.24-r0/work/uuagc-0.9.24/src/TokenDef.hs 2015-05-05 09:05:06.301665157 +0100 +@@ -7,7 +7,7 @@ + import UU.Scanner.GenTokenOrd + import UU.Scanner.Position + import UU.Parsing.MachineInterface(Symbol(..)) +-import Char(isPrint,ord) ++import Data.Char(isPrint,ord) + import HsToken + import CommonTypes + +diff -uraN -U0 uuagc-0.9.24/work/uuagc-0.9.24/src-derived/DefaultRules.hs uuagc-0.9.24-r0/work/uuagc-0.9.24/src-derived/DefaultRules.hs +--- uuagc-0.9.24/work/uuagc-0.9.24/src-derived/DefaultRules.hs 2010-06-04 14:03:54.000000000 +0100 ++++ uuagc-0.9.24-r0/work/uuagc-0.9.24/src-derived/DefaultRules.hs 2015-05-05 09:05:06.294665157 +0100 +@@ -4,7 +4,7 @@ + module DefaultRules where + {-# LINE 10 "DefaultRules.ag" #-} + +-import qualified List (delete,intersperse) ++import qualified Data.List as List (delete,intersperse) + + import qualified Data.Set as Set + import qualified Data.Map as Map +@@ -13,7 +13,7 @@ + import Data.Sequence(Seq,(><)) + import UU.Scanner.Position(noPos) + import Pretty +-import Maybe ++import Data.Maybe + import HsToken + import HsTokenScanner + import Data.List(intersperse) +diff -uraN -U0 uuagc-0.9.24/work/uuagc-0.9.24/src-derived/Desugar.hs uuagc-0.9.24-r0/work/uuagc-0.9.24/src-derived/Desugar.hs +--- uuagc-0.9.24/work/uuagc-0.9.24/src-derived/Desugar.hs 2010-06-04 14:03:54.000000000 +0100 ++++ uuagc-0.9.24-r0/work/uuagc-0.9.24/src-derived/Desugar.hs 2015-05-05 09:05:06.295665157 +0100 +@@ -10,7 +10,7 @@ + import qualified Data.Sequence as Seq + import Data.Sequence(Seq,(><)) + import UU.Scanner.Position(Pos(..)) +-import Maybe ++import Data.Maybe + import Data.List(intersperse) + + import AbstractSyntax +diff -uraN -U0 uuagc-0.9.24/work/uuagc-0.9.24/src-derived/GenerateCode.hs uuagc-0.9.24-r0/work/uuagc-0.9.24/src-derived/GenerateCode.hs +--- uuagc-0.9.24/work/uuagc-0.9.24/src-derived/GenerateCode.hs 2010-06-04 14:03:54.000000000 +0100 ++++ uuagc-0.9.24-r0/work/uuagc-0.9.24/src-derived/GenerateCode.hs 2015-05-05 09:05:06.296665157 +0100 +@@ -26,7 +26,7 @@ + import HsTokenScanner + + import Data.List(partition,intersperse,intersect,(\\)) +-import Maybe(fromJust,isJust) ++import Data.Maybe(fromJust,isJust) + {-# LINE 31 "../src-derived/GenerateCode.hs" #-} + + {-# LINE 2 "./CodeSyntax.ag" #-} +diff -uraN -U0 uuagc-0.9.24/work/uuagc-0.9.24/src-derived/Order.hs uuagc-0.9.24-r0/work/uuagc-0.9.24/src-derived/Order.hs +--- uuagc-0.9.24/work/uuagc-0.9.24/src-derived/Order.hs 2010-06-04 14:03:54.000000000 +0100 ++++ uuagc-0.9.24-r0/work/uuagc-0.9.24/src-derived/Order.hs 2015-05-05 09:05:06.297665157 +0100 +@@ -37,7 +37,7 @@ + import Data.Array((!),bounds,inRange) + import Data.List(elemIndex,partition,sort,mapAccumL,find,nubBy,intersperse,groupBy,transpose) + import qualified Data.Tree as Tree +-import Maybe ++import Data.Maybe + {-# LINE 42 "../src-derived/Order.hs" #-} + + {-# LINE 2 "./Patterns.ag" #-} +diff -uraN -U0 uuagc-0.9.24/work/uuagc-0.9.24/src-derived/PrintCode.hs uuagc-0.9.24-r0/work/uuagc-0.9.24/src-derived/PrintCode.hs +--- uuagc-0.9.24/work/uuagc-0.9.24/src-derived/PrintCode.hs 2010-06-04 14:03:54.000000000 +0100 ++++ uuagc-0.9.24-r0/work/uuagc-0.9.24/src-derived/PrintCode.hs 2015-05-05 09:05:06.298665157 +0100 +@@ -4,7 +4,7 @@ + module PrintCode where + {-# LINE 10 "PrintCode.ag" #-} + +-import Char (isAlphaNum) ++import Data.Char (isAlphaNum) + import Pretty + import Code + import Patterns +diff -uraN -U0 uuagc-0.9.24/work/uuagc-0.9.24/src-derived/PrintVisitCode.hs uuagc-0.9.24-r0/work/uuagc-0.9.24/src-derived/PrintVisitCode.hs +--- uuagc-0.9.24/work/uuagc-0.9.24/src-derived/PrintVisitCode.hs 2010-06-04 14:03:54.000000000 +0100 ++++ uuagc-0.9.24-r0/work/uuagc-0.9.24/src-derived/PrintVisitCode.hs 2015-05-05 09:05:06.299665157 +0100 +@@ -22,7 +22,7 @@ + import UU.Scanner.Position + + import Data.List(partition,intersperse,intersect,(\\)) +-import Maybe(fromJust,isJust) ++import Data.Maybe(fromJust,isJust) + {-# LINE 27 "../src-derived/PrintVisitCode.hs" #-} + + {-# LINE 2 "./CodeSyntax.ag" #-} +diff -uraN -U0 uuagc-0.9.24/work/uuagc-0.9.24/src-derived/Transform.hs uuagc-0.9.24-r0/work/uuagc-0.9.24/src-derived/Transform.hs +--- uuagc-0.9.24/work/uuagc-0.9.24/src-derived/Transform.hs 2010-06-04 14:03:54.000000000 +0100 ++++ uuagc-0.9.24-r0/work/uuagc-0.9.24/src-derived/Transform.hs 2015-05-05 09:05:06.300665157 +0100 +@@ -5,7 +5,7 @@ + {-# LINE 8 "Transform.ag" #-} + + import Control.Monad(mplus,mzero) +-import List (partition, elem, nub,intersperse) ++import Data.List as List (partition, elem, nub,intersperse) + import Data.Maybe + import qualified Data.Map as Map + import Data.Map (Map) +diff -uraN -U0 uuagc-0.9.24/work/uuagc-0.9.24/uuagc.cabal uuagc-0.9.24-r0/work/uuagc-0.9.24/uuagc.cabal +--- uuagc-0.9.24/work/uuagc-0.9.24/uuagc.cabal 2010-06-04 14:03:54.000000000 +0100 ++++ uuagc-0.9.24-r0/work/uuagc-0.9.24/uuagc.cabal 2015-05-05 09:05:06.301665157 +0100 +@@ -28,7 +28,7 @@ + else + build-depends: base < 3 + +- build-depends: haskell98, uulib>=0.9.12 ++ build-depends: uulib>=0.9.12 + main-is: Ag.hs + other-modules: Ag + , CommonTypes diff --git a/dev-haskell/uuagc/uuagc-0.9.24.ebuild b/dev-haskell/uuagc/uuagc-0.9.24.ebuild index edd215e390da..c2321520fccb 100644 --- a/dev-haskell/uuagc/uuagc-0.9.24.ebuild +++ b/dev-haskell/uuagc/uuagc-0.9.24.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2012 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/uuagc/uuagc-0.9.24.ebuild,v 1.5 2012/09/12 15:24:31 qnikst Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/uuagc/uuagc-0.9.24.ebuild,v 1.6 2015/05/05 20:45:51 slyfox Exp $ CABAL_FEATURES="bin lib profile haddock" -inherit haskell-cabal +inherit eutils haskell-cabal DESCRIPTION="Attribute Grammar System of Universiteit Utrecht" HOMEPAGE="http://www.cs.uu.nl/wiki/HUT/WebHome" @@ -20,3 +20,13 @@ RDEPEND=">=dev-lang/ghc-6.10 ${HASKELLDEPS}" DEPEND=">=dev-haskell/cabal-1.2 ${RDEPEND}" + +src_unpack() { + unpack "${A}" + cd "${S}" + epatch "${FILESDIR}"/${P}-ghc-7.8.patch + + sed \ + -e 's/{-# LINE/{- # LINE/g' \ + -i "${S}"/src-derived/*.hs +} -- 2.26.2