From 2929788def9a92c1eb237eed93fbdb0c02838bbf Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 13 Oct 2019 22:11:03 +0100 Subject: Revert "gentoo resync : 13.10.2019" This reverts commit ab499d7cfb9ad23e83cf7a4f5052bdf1b4c42030. --- dev-haskell/uuagc/Manifest | 3 + dev-haskell/uuagc/files/uuagc-0.9.24-ghc-7.8.patch | 193 +++++++++++++++++++++ dev-haskell/uuagc/uuagc-0.9.24.ebuild | 33 ++++ 3 files changed, 229 insertions(+) create mode 100644 dev-haskell/uuagc/files/uuagc-0.9.24-ghc-7.8.patch create mode 100644 dev-haskell/uuagc/uuagc-0.9.24.ebuild (limited to 'dev-haskell/uuagc') diff --git a/dev-haskell/uuagc/Manifest b/dev-haskell/uuagc/Manifest index 87d11eea63ef..027aecfff888 100644 --- a/dev-haskell/uuagc/Manifest +++ b/dev-haskell/uuagc/Manifest @@ -1,3 +1,6 @@ +AUX uuagc-0.9.24-ghc-7.8.patch 8165 BLAKE2B bcb064455e27d2de42f64ebe54bbbd5f25fe47befc573a5a2c4a1fb1adc4f1fb74ca94c5e90d22c54414c47a7c22978c619c6db08aaa4277c541993c1c3e6489 SHA512 692d8dc68fae40ade8cf1308d2bc7733ff7e1e9f94988b8f901f45a983d9c506283eb1b839617776bd8e12ff23c8855c9edcaa1afe41288ff16add278ac85a17 +DIST uuagc-0.9.24.tar.gz 253310 BLAKE2B 6272ffe87bc2a661262d3a43344bbe24c50d1e577ae75cba550233c88bafee30876a171b32512315ef7025d1db3193d0b126822338b99c44d26585b01b37f14f SHA512 9fac31311c1e3983c42b013dd934893b2347755c1b49295a0d82093aa53dadc36bad1d6c996a20526099bcef6b71c4e5ad17c37e550aa1b6ad84de79b1186494 DIST uuagc-0.9.52.1.tar.gz 795294 BLAKE2B 58dddafabd99d4b2a2d1adde26691f419a07c1882619258c2e327066d20d16640c00bfdf124fc5d245a2c39fb719580e0c3ea3c35279fd2ba39c5bcef075d456 SHA512 f5de27bb06a9453f1d9f4105f10b98636c0bebf351f69f122c420efdcff3dc0c25cbc9a69c8a804b8618f2ff1cb216acea8119b333a130a30a840cc00b268c8c +EBUILD uuagc-0.9.24.ebuild 746 BLAKE2B adf83c30258e720000c9ead3779c0d46cd0e58ae54034c9b712b3f8596688bc84760179f6b9357c38e4a17c6961cdf610b1fb77c528e4b2292b3c8a295ab8fe1 SHA512 d5d5e97b607c302e2f22d0f221e979808feef317605e1cdc451a75993b0a3f4d3108e0277bcf93b39e1f7a171e1cece88a57ede145d6d032a4fd52069bf85f4a EBUILD uuagc-0.9.52.1.ebuild 947 BLAKE2B 154f3f4f0e2042443decb604694d772dd8e328910116747ff1eb716b2820639fe2bc2cd546c7710a7d95cca13c6fcedb35272d279ce9945338646aca42046be7 SHA512 3eaace822fdb242ef19f7d717dadf4e25cced792f60cd0935ad30e0f06a4b999baf7a537862f4bf5d4655c3f5d3b49800d507268a6070355707c3aa38409be69 MISC metadata.xml 492 BLAKE2B db8ee582b4cdfb1cd0edff60db39ee07aa10bd4c420f65db58646d176a61092670cdf12702e4805e8967e9e0347df340b116d2a355903f694e770396e9314c82 SHA512 1b7216608f305a53ecfdd08a0bcd9d63d6d80e5850afc12bb73d11af034db28439bdb39cf11df470c91911622ce532cabdb0d94904a1a494400fd9f14a624fb1 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 new file mode 100644 index 000000000000..a4a892de6b0b --- /dev/null +++ b/dev-haskell/uuagc/uuagc-0.9.24.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=0 + +CABAL_FEATURES="bin lib profile haddock" +inherit eutils haskell-cabal + +DESCRIPTION="Attribute Grammar System of Universiteit Utrecht" +HOMEPAGE="http://www.cs.uu.nl/wiki/HUT/WebHome" +SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ppc ppc64 sparc x86" +IUSE="" + +HASKELLDEPS="dev-haskell/cabal + >=dev-haskell/uulib-0.9.12" +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 +} -- cgit v1.2.3