From 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 21:03:06 +0100 Subject: gentoo resync : 14.07.2018 --- .../files/ganeti-htools-0.2.8-use-QC-1.patch | 14 ++ .../files/ganeti-htools-0.3.1-base-4.patch | 171 +++++++++++++++++++++ .../files/ganeti-htools-0.3.1-containers.patch | 9 ++ .../files/ganeti-htools-0.3.1-ghc-7.10.patch | 29 ++++ 4 files changed, 223 insertions(+) create mode 100644 app-emulation/ganeti-htools/files/ganeti-htools-0.2.8-use-QC-1.patch create mode 100644 app-emulation/ganeti-htools/files/ganeti-htools-0.3.1-base-4.patch create mode 100644 app-emulation/ganeti-htools/files/ganeti-htools-0.3.1-containers.patch create mode 100644 app-emulation/ganeti-htools/files/ganeti-htools-0.3.1-ghc-7.10.patch (limited to 'app-emulation/ganeti-htools/files') diff --git a/app-emulation/ganeti-htools/files/ganeti-htools-0.2.8-use-QC-1.patch b/app-emulation/ganeti-htools/files/ganeti-htools-0.2.8-use-QC-1.patch new file mode 100644 index 000000000000..fd7943fe7057 --- /dev/null +++ b/app-emulation/ganeti-htools/files/ganeti-htools-0.2.8-use-QC-1.patch @@ -0,0 +1,14 @@ +diff --git a/Makefile b/Makefile +index 5e189fc..bfdf175 100644 +--- a/Makefile ++++ b/Makefile +@@ -20,7 +20,8 @@ $(HALLPROGS): %: %.hs Ganeti/HTools/Version.hs $(HSRCS) Makefile + + test live-test: HEXTRA=-fhpc -Wwarn -fno-warn-missing-signatures \ + -fno-warn-monomorphism-restriction -fno-warn-orphans \ +- -fno-warn-missing-methods -fno-warn-unused-imports ++ -fno-warn-missing-methods -fno-warn-unused-imports \ ++ -package $(shell ghc-pkg list | sed -n '/ QuickCheck-1./p') + + $(DOCS) : %.html : % + rst2html -v --strict $< $@ diff --git a/app-emulation/ganeti-htools/files/ganeti-htools-0.3.1-base-4.patch b/app-emulation/ganeti-htools/files/ganeti-htools-0.3.1-base-4.patch new file mode 100644 index 000000000000..aa0d973a9e40 --- /dev/null +++ b/app-emulation/ganeti-htools/files/ganeti-htools-0.3.1-base-4.patch @@ -0,0 +1,171 @@ +diff --git a/Ganeti/HTools/CLI.hs b/Ganeti/HTools/CLI.hs +index b000a00..d9177c6 100644 +--- a/Ganeti/HTools/CLI.hs ++++ b/Ganeti/HTools/CLI.hs +@@ -74,11 +74,11 @@ module Ganeti.HTools.CLI + + import Data.Maybe (fromMaybe) + import qualified Data.Version +-import Monad ++import Control.Monad + import System.Console.GetOpt + import System.IO + import System.Info +-import System ++import System.Exit + import Text.Printf (printf) + + import qualified Ganeti.HTools.Version as Version(version) +diff --git a/Ganeti/HTools/ExtLoader.hs b/Ganeti/HTools/ExtLoader.hs +index 0412c1b..17b8449 100644 +--- a/Ganeti/HTools/ExtLoader.hs ++++ b/Ganeti/HTools/ExtLoader.hs +@@ -36,10 +36,11 @@ module Ganeti.HTools.ExtLoader + ) where + + import Data.Maybe (isJust, fromJust) +-import Monad ++import Control.Monad ++import qualified Control.Exception as E + import System.FilePath + import System.IO +-import System ++import System.Exit + import Text.Printf (printf, hPrintf) + + import qualified Ganeti.HTools.Luxi as Luxi +@@ -56,8 +57,8 @@ import Ganeti.HTools.CLI + import Ganeti.HTools.Utils (sepSplit, tryRead) + + -- | Error beautifier +-wrapIO :: IO (Result a) -> IO (Result a) +-wrapIO = flip catch (return . Bad . show) ++wrapIO :: (Show a) => IO (Result a) -> IO (Result a) ++wrapIO = flip (E.catch :: IO a -> (E.IOException -> IO a) -> IO a) (return . Bad . show ) + + parseUtilisation :: String -> Result (String, DynUtil) + parseUtilisation line = +diff --git a/hail.hs b/hail.hs +index 541e1a9..68f4488 100644 +--- a/hail.hs ++++ b/hail.hs +@@ -27,10 +27,10 @@ module Main (main) where + + import Data.List + import Data.Maybe (isJust, fromJust) +-import Monad +-import System (exitWith, ExitCode(..)) ++import Control.Monad ++import System.Environment ++import System.Exit + import System.IO +-import qualified System + + import qualified Ganeti.HTools.Cluster as Cluster + +@@ -99,7 +99,7 @@ readRequest opts args = do + -- | Main function. + main :: IO () + main = do +- cmd_args <- System.getArgs ++ cmd_args <- getArgs + (opts, args) <- parseOpts cmd_args "hail" options + + let shownodes = optShowNodes opts +diff --git a/hbal.hs b/hbal.hs +index 46cccf8..0254008 100644 +--- a/hbal.hs ++++ b/hbal.hs +@@ -30,12 +30,12 @@ import Control.Exception (bracket) + import Data.List + import Data.Maybe (isJust, isNothing, fromJust) + import Data.IORef +-import Monad +-import System (exitWith, ExitCode(..)) ++import Control.Monad + import System.IO ++import System.Exit + import System.Posix.Process + import System.Posix.Signals +-import qualified System ++import System.Environment + + import Text.Printf (printf, hPrintf) + +@@ -223,7 +223,7 @@ runJobSet master fin_nl il cmd_jobs = do + -- | Main function. + main :: IO () + main = do +- cmd_args <- System.getArgs ++ cmd_args <- getArgs + (opts, args) <- parseOpts cmd_args "hbal" options + + unless (null args) $ do +diff --git a/hscan.hs b/hscan.hs +index c14846f..d613f83 100644 +--- a/hscan.hs ++++ b/hscan.hs +@@ -28,11 +28,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + module Main (main) where + + import Data.Maybe (isJust, fromJust, fromMaybe) +-import Monad +-import System (exitWith, ExitCode(..)) ++import Control.Monad ++import System.Environment ++import System.Exit + import System.IO + import System.FilePath +-import qualified System + + import Text.Printf (printf) + +@@ -135,7 +135,7 @@ writeDataInner nlen name opts cdata fixdata = do + -- | Main function. + main :: IO () + main = do +- cmd_args <- System.getArgs ++ cmd_args <- getArgs + (opts, clusters) <- parseOpts cmd_args "hscan" options + let local = "LOCAL" + +diff --git a/hspace.hs b/hspace.hs +index 57d0302..f207c67 100644 +--- a/hspace.hs ++++ b/hspace.hs +@@ -29,10 +29,10 @@ import Data.Char (toUpper, isAlphaNum) + import Data.List + import Data.Maybe (isJust, fromJust) + import Data.Ord (comparing) +-import Monad +-import System (exitWith, ExitCode(..)) ++import Control.Monad ++import System.Exit ++import System.Environment + import System.IO +-import qualified System + + import Text.Printf (printf, hPrintf) + +@@ -207,7 +207,7 @@ printAllocationMap verbose msg nl ixes = + -- | Main function. + main :: IO () + main = do +- cmd_args <- System.getArgs ++ cmd_args <- getArgs + (opts, args) <- parseOpts cmd_args "hspace" options + + unless (null args) $ do +diff --git a/test.hs b/test.hs +index 12aa50d..81838eb 100644 +--- a/test.hs ++++ b/test.hs +@@ -29,7 +29,7 @@ import Data.IORef + import Test.QuickCheck.Batch + import System.IO + import System.Exit +-import System (getArgs) ++import System.Environment (getArgs) + + import Ganeti.HTools.QC + diff --git a/app-emulation/ganeti-htools/files/ganeti-htools-0.3.1-containers.patch b/app-emulation/ganeti-htools/files/ganeti-htools-0.3.1-containers.patch new file mode 100644 index 000000000000..2305aa5c6547 --- /dev/null +++ b/app-emulation/ganeti-htools/files/ganeti-htools-0.3.1-containers.patch @@ -0,0 +1,9 @@ +diff --git a/Ganeti/HTools/QC.hs b/Ganeti/HTools/QC.hs +index 534a7b1..6f99a96 100644 +--- a/Ganeti/HTools/QC.hs ++++ b/Ganeti/HTools/QC.hs +@@ -753,3 +753,3 @@ prop_ClusterAllocBalance node = + let nl = makeSmallCluster node count +- (hnode, nl') = IntMap.deleteFindMax nl ++ ((_k, hnode), nl') = IntMap.deleteFindMax nl + il = Container.empty diff --git a/app-emulation/ganeti-htools/files/ganeti-htools-0.3.1-ghc-7.10.patch b/app-emulation/ganeti-htools/files/ganeti-htools-0.3.1-ghc-7.10.patch new file mode 100644 index 000000000000..51c39fe5fce5 --- /dev/null +++ b/app-emulation/ganeti-htools/files/ganeti-htools-0.3.1-ghc-7.10.patch @@ -0,0 +1,29 @@ +diff --git a/Ganeti/HTools/Types.hs b/Ganeti/HTools/Types.hs +index 104bf64..8146870 100644 +--- a/Ganeti/HTools/Types.hs ++++ b/Ganeti/HTools/Types.hs +@@ -65,2 +65,4 @@ import qualified Data.Map as M + import qualified Text.JSON as JSON ++import Control.Applicative ++import Control.Monad + +@@ -221,2 +223,9 @@ data Result a + ++instance Functor Result where ++ fmap = liftM ++ ++instance Applicative Result where ++ pure = return ++ (<*>) = ap -- defined in Control.Monad ++ + instance Monad Result where +@@ -252,2 +261,9 @@ data OpResult a = OpFail FailMode -- ^ Failed operation + ++instance Functor OpResult where ++ fmap = liftM ++ ++instance Applicative OpResult where ++ pure = return ++ (<*>) = ap -- defined in Control.Monad ++ + instance Monad OpResult where -- cgit v1.2.3