From 56bd759df1d0c750a065b8c845e93d5dfa6b549d Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" Date: Sat, 8 Aug 2015 13:49:04 -0700 Subject: proj/gentoo: Initial commit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson X-Thanks: Alec Warner - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring - wrote much python to improve cvs2svn X-Thanks: Rich Freeman - validation scripts X-Thanks: Patrick Lauer - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed --- .../files/haskeline-0.6.4.7-ghc-6.12.patch | 22 +++++++++++ .../files/haskeline-0.6.4.7-ghc-7.5.patch | 45 ++++++++++++++++++++++ .../files/haskeline-0.6.4.7-ghc-7.6.patch | 22 +++++++++++ 3 files changed, 89 insertions(+) create mode 100644 dev-haskell/haskeline/files/haskeline-0.6.4.7-ghc-6.12.patch create mode 100644 dev-haskell/haskeline/files/haskeline-0.6.4.7-ghc-7.5.patch create mode 100644 dev-haskell/haskeline/files/haskeline-0.6.4.7-ghc-7.6.patch (limited to 'dev-haskell/haskeline/files') diff --git a/dev-haskell/haskeline/files/haskeline-0.6.4.7-ghc-6.12.patch b/dev-haskell/haskeline/files/haskeline-0.6.4.7-ghc-6.12.patch new file mode 100644 index 00000000000..3e9adc61f61 --- /dev/null +++ b/dev-haskell/haskeline/files/haskeline-0.6.4.7-ghc-6.12.patch @@ -0,0 +1,22 @@ +Workarounds build failure for ghc-6.12 + +[18 of 27] Compiling System.Console.Haskeline.Backend.Terminfo ( System/Console/Haskeline/Backend/Terminfo.hs, dist/build/System/Console/Haskeline/Backend/Terminfo.o ) + +System/Console/Haskeline/Backend/Terminfo.hs:200:9: + Inferred type is less polymorphic than expected + Quantified type variable `m' escapes + In the expression: Writer.tell + In the definition of `output': output = Writer.tell +diff --git a/System/Console/Haskeline/Backend/Terminfo.hs b/System/Console/Haskeline/Backend/Terminfo.hs +index 1bd0373..d01e9ba 100644 +--- a/System/Console/Haskeline/Backend/Terminfo.hs ++++ b/System/Console/Haskeline/Backend/Terminfo.hs +@@ -197,7 +197,7 @@ runActionT m = do + return x + + output :: TermAction -> ActionM () +-output = Writer.tell ++output = \x -> Writer.tell x + + outputText :: String -> ActionM () + outputText str = posixEncode str >>= output . const . termText . B.unpack diff --git a/dev-haskell/haskeline/files/haskeline-0.6.4.7-ghc-7.5.patch b/dev-haskell/haskeline/files/haskeline-0.6.4.7-ghc-7.5.patch new file mode 100644 index 00000000000..086f05ba833 --- /dev/null +++ b/dev-haskell/haskeline/files/haskeline-0.6.4.7-ghc-7.5.patch @@ -0,0 +1,45 @@ +--- haskeline-0.6.4.7-orig/haskeline.cabal 2012-05-14 04:29:12.000000000 +1000 ++++ haskeline-0.6.4.7/haskeline.cabal 2012-06-30 22:20:29.154377863 +1000 +@@ -50,7 +50,7 @@ + } + else { + if impl(ghc>=6.11) { +- Build-depends: base >=4.1 && < 4.6, containers>=0.1 && < 0.6, directory>=1.0 && < 1.2, ++ Build-depends: base >=4.1 && < 4.7, containers>=0.1 && < 0.6, directory>=1.0 && < 1.2, + bytestring>=0.9 && < 0.11 + } + else { +--- haskeline-0.6.4.7-orig/System/Console/Haskeline/Monads.hs 2012-05-14 04:29:12.000000000 +1000 ++++ haskeline-0.6.4.7/System/Console/Haskeline/Monads.hs 2012-06-30 22:21:34.478861860 +1000 +@@ -1,3 +1,4 @@ ++{-# LANGUAGE CPP #-} + module System.Console.Haskeline.Monads( + module Control.Monad.Trans, + module System.Console.Haskeline.MonadException, +@@ -18,7 +19,9 @@ + + import Control.Monad.Trans + import System.Console.Haskeline.MonadException ++#if !MIN_VERSION_base(4,6,0) + import Prelude hiding (catch) ++#endif + + import Control.Monad.Reader hiding (MonadReader,ask,asks,local) + import qualified Control.Monad.Reader as Reader +--- haskeline-0.6.4.7-orig/System/Console/Haskeline/MonadException.hs 2012-05-14 04:29:12.000000000 +1000 ++++ haskeline-0.6.4.7/System/Console/Haskeline/MonadException.hs 2012-06-30 22:21:29.657752340 +1000 +@@ -1,3 +1,4 @@ ++{-# LANGUAGE CPP #-} + {- | This module redefines some of the functions in "Control.Exception.Extensible" to + work for more general monads than only 'IO'. + -} +@@ -18,7 +19,9 @@ + + import qualified Control.Exception.Extensible as E + import Control.Exception.Extensible(Exception,SomeException) ++#if !MIN_VERSION_base(4,6,0) + import Prelude hiding (catch) ++#endif + import Control.Monad.Reader + import Control.Monad.State + import Control.Concurrent(ThreadId) diff --git a/dev-haskell/haskeline/files/haskeline-0.6.4.7-ghc-7.6.patch b/dev-haskell/haskeline/files/haskeline-0.6.4.7-ghc-7.6.patch new file mode 100644 index 00000000000..f09a30ad5f5 --- /dev/null +++ b/dev-haskell/haskeline/files/haskeline-0.6.4.7-ghc-7.6.patch @@ -0,0 +1,22 @@ +diff --git a/haskeline.cabal b/haskeline.cabal +index 2fa8d2e..0f43bfe 100644 +--- a/haskeline.cabal ++++ b/haskeline.cabal +@@ -50,7 +50,7 @@ Library + } + else { + if impl(ghc>=6.11) { +- Build-depends: base >=4.1 && < 4.7, containers>=0.1 && < 0.6, directory>=1.0 && < 1.2, ++ Build-depends: base >=4.1 && < 4.7, containers>=0.1 && < 0.6, directory>=1.0 && < 1.3, + bytestring>=0.9 && < 0.11 + } + else { +@@ -102,7 +102,7 @@ Library + install-includes: win_console.h + cpp-options: -DMINGW + } else { +- Build-depends: unix>=2.0 && < 2.6 ++ Build-depends: unix>=2.0 && < 2.7 + -- unix-2.3 doesn't build on ghc-6.8.1 or earlier + c-sources: cbits/h_iconv.c + cbits/h_wcwidth.c -- cgit v1.2.1