Fix build failure against ghc-7.4 (bug #424299 by Diego Elio Pettenò and slightly tuned fix by Alexander Vershilov).

Package-Manager: portage-2.2.0_alpha149_p11/cvs/Linux x86_64
Manifest-Sign-Key: 0x611FF3AA

4 files changed, 185 insertions, 7 deletions

diff --git a/app-emulation/ganeti-htools/ChangeLog b/app-emulation/ganeti-htools/ChangeLog
index b2cf6d9f19bc..7d98820dcbe8 100644
--- a/app-emulation/ganeti-htools/ChangeLog
+++ b/app-emulation/ganeti-htools/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/ganeti-htools
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti-htools/ChangeLog,v 1.12 2012/08/11 12:42:36 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti-htools/ChangeLog,v 1.13 2012/12/26 21:09:43 slyfox Exp $
+
+  26 Dec 2012; Sergei Trofimovich <slyfox@gentoo.org>
+  +files/ganeti-htools-0.3.1-base-4.patch, ganeti-htools-0.3.1.ebuild:
+  Fix build failure against ghc-7.4 (bug #424299 by Diego Elio Pettenò and
+  slightly tuned fix by Alexander Vershilov).
 
   11 Aug 2012; Markus Meier <maekke@gentoo.org> ganeti-htools-0.3.1.ebuild:
   x86 stable, bug #418575
diff --git a/app-emulation/ganeti-htools/Manifest b/app-emulation/ganeti-htools/Manifest
index f87697934ca5..2de8d1e35144 100644
--- a/app-emulation/ganeti-htools/Manifest
+++ b/app-emulation/ganeti-htools/Manifest
@@ -2,18 +2,19 @@
 Hash: SHA256
 
 AUX ganeti-htools-0.2.8-use-QC-1.patch 526 SHA256 58710cc2db801194efa59ad34995584177a4476ee89b6efa51a3e5a34dfbf33c SHA512 5f14ef6f045a8bb381203b6d9bc68e995992649b910658df210c4db427b8faa76bf48afc2df0513ee26d072011c8b85abaf6d77b3b6a71ff9bd1154d355a0c47 WHIRLPOOL adf910b2378baedf62bfd95f95182a889920cfe3d205a469295b9618481d11cc9d377c125dd9374b0cd424ddc0f6ace10841c58bc82f6c9b8b3611b0a4849fea
+AUX ganeti-htools-0.3.1-base-4.patch 4511 SHA256 c6b6837322c5baa19560e2aa038b0aa7674721bb74701a68f0c8301cb16efe27 SHA512 e0ec8a7bcd15e047f3d61640f8fab946560e035776f455019fc825809a19ca24a06a265c08e9e469c613a5ad7014ec910a080ce36b674d08f439ec9ce5caad14 WHIRLPOOL 451a0dbc117d4f324626752f4e49604d37aacb932ae211010de2f06b0bfbca7c7802d9de945689d77dd7b703e0737e8fb36edd79c62573e84019fb4ea31d60f5
 DIST ganeti-htools-0.2.8.tar.gz 236904 SHA256 40574419e07353144e75211b5b524c38cd8e5335589a60ef774851f8e028596d SHA512 a01f29c684456a9fe9023e061892e713c4e89a6e4f9ece01da62cea0eb8ce8fc95a936ba2be351b5dcc0026989054eb4471563475f1c4001f9282d28b996eadc WHIRLPOOL c56fab535149412411301923c936c61f830ecbe4007a3560d5f05de5158d7f90f8b84ab49c3bf3f26e621661e06038893703cb3446c150d54b26130705231500
 DIST ganeti-htools-0.3.0.tar.gz 284839 SHA256 80fcd138cd21f662db226cd30b1efcc08fdaa197c56822809c1c2b58be04a32c SHA512 aa73fed2a99e2fe96f1660b0dd718e9ac3afc6924a25182f5e1ee1eafdccfe43b99986a2f2eefa6bb87b3543565d1fefdf1ef7c9c68ab36dfa9ca677c507945a WHIRLPOOL 0c47f1d330b5cebe69da4598de0a035fdf6e9c7fa65b6cdbe435b1d240d44ef61e2fa9a2ea77f5c1968f61aef5f5885319fef812d32edf934b1bf79b309abc8d
 DIST ganeti-htools-0.3.1.tar.gz 300261 SHA256 c28f3f78594e9dddd8fdc21bc37ce1f1b697d7e9d5d29f1de212705eadea1d7b SHA512 76acc476dc5b3add808db41b7aad4be6ee4b62d31e81eaefa17fbf010daa817bcc920b4e290727ebeddebbe6015017b19d2b7643dbc6d529f158b9746b7a4b43 WHIRLPOOL 1a9c8b4782c1b6265ec647b63c445735a8c2b56dda618aa3a699f1d4ee80838c0e9db51ae84644ade6ef39466cf7dc5aa92687176718c964a1441306e028681c
 EBUILD ganeti-htools-0.2.8.ebuild 1117 SHA256 8047cd23787751da744a14ef49688d8fcb1a7e0629e0c8569a36b7957c2418a3 SHA512 b2f68827f6abe3396a07ad7db8d820de5a77c796839201448c7ba72463f230fcb8bef1e6c165a3384369ef26994eb199d8a5cfcefb1f9ee786df4c781d9b8fd2 WHIRLPOOL 0764c55fae83c033c3a337b9d8c2e5860d6a3aa56b5cb6306e30892a698f1fd576dd9f759deece7f57833c5b06c7cbb2e4831830e86004d1fe19bf953ab5a68f
 EBUILD ganeti-htools-0.3.0.ebuild 1213 SHA256 b74eed07c864f9fb8b19bede1e737edaacd88e861e419ae3e1d84d453aceb429 SHA512 e5d65d5a674a2b7fc9b8e9824355989c5e5043c6ddf99b7ffb044a2bdbb5ba2339cf0a58b412d19dc9dca8015f3fe598e092ed456eab65676c6f0ee0e4885e5a WHIRLPOOL 1d6042aac2ac7878ed857e8aecd52159b93511a491128f10225064494e97a2e59165d9962a5acfc54b3c44c98b8272d0f54f8f8c972141954f2c0d65740f3005
-EBUILD ganeti-htools-0.3.1.ebuild 1211 SHA256 cd1ea7615bf0ec378324703784a2e7b533cfff0e8b8c0d6cb02f4652c76b5a99 SHA512 5f043fc723a68d2e4b7c63aa6e7a34eeccb747f3d489e9433aecbbd7ba7aceb6f035a47fb365518486a74dd5aee1c9b3208b353b04fe78f2a4c84b3b9e3158fc WHIRLPOOL 708e6d520699a1f42e5366f696b96f47ef9c48092864cb5f60ea489de488a5b442f8eafc9c4c2b1d74ab6e40a9746bbe819e2d3ce94be4a6767020786b5ced59
-MISC ChangeLog 2173 SHA256 2820be9687bd351182055697bee2116b2c44c68d5c19eedd448356b44db1e041 SHA512 986ba4a66398b0a55b502140d8c159d4515919b8cce9c2c5919327bd113787d7e246eeff06aebe2b4d0d5bceb839e1de9f72c439acfefe475e434b595c1ffbd7 WHIRLPOOL e3bd8bc3ba7afd7cba4604b9d124d1076bdcbb8afdd590c12dd3d18f4e71ca2303db5e56c5429f52a7dc5bdb338af2238a442e6835eea6688f040e4100770376
+EBUILD ganeti-htools-0.3.1.ebuild 1266 SHA256 d3f3651e4aafa0bbea72a11a2c7fcdf94fa1e866a76f78d85dbac37c8fef22aa SHA512 29b63319ff5c6af27e57d25395dec7808978306974bcaadefb1358bf413494c6b87523a9e972e6b91a72b9d75749b3cf4eb7e08eb0863a52029bf30dadf36765 WHIRLPOOL ce0f4e962ccfebdc0f0ca6b28ba0445d7d3e75b7b050e470a78becf58a4f6ad4a9f0810e3e1b197b5002a5ec3caea52b23d934321ddf972ed9a7d81b70a4c450
+MISC ChangeLog 2421 SHA256 c5b842d5fb5033c3494afcda86e7aef521f5d06b1ef0e25ab7c1be5621d767a0 SHA512 a2ebe0bfd8c0fa9a260e3440f9e9ea7e5f5036875d054b96b0d73cf8d6e0683dccb1f1b818462c4298d94bc643fdcb7a90dd8ef65dfac90ccbb00f8a5f9bc765 WHIRLPOOL 0c827744fae101a0c86bb305ec3b44e46feb29c5b5e4c413c7cbdb0ec8bc2485d70545ef73beec50fc2cefdc6e8c2d39de523e83de84bafa493070ff624c3b1d
 MISC metadata.xml 998 SHA256 4948fc22330f83a8f58fa9e857b6aa6c8ece9d45d7e96c7758dc41050f3df095 SHA512 e455d501de3cbe9789f161632829ab456b0dbd751fbf6613d348690382ff72f388d254dfe44131ff7bcb4c958e1b3d650d294f42a0c954bb645273662a907ec2 WHIRLPOOL 50c7cedba9eb325ef4eeee2e4f238dcaeffcb0260092e914c65c5a7678e4ac6773eaf5aec2b95f1124d3540c025dd20dcacacecbd97375dd86b7eb2c76e8f5f4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlAmVHAACgkQkKaRLQcq0GLtQQCgrsII5+wjArUabWa6oqi3AeUt
-c+AAoLXysuFnAYT8wI6MWSTRx1+3fxqC
-=V9g7
+iEYEAREIAAYFAlDbZ4UACgkQcaHudmEf86qBuQCfU/rYsPJgArzNReRJOv8rWImw
+50oAn1YMnrFdxRBf4udM6IBql7JWrWI8
+=4F/x
 -----END PGP SIGNATURE-----
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/ganeti-htools-0.3.1.ebuild b/app-emulation/ganeti-htools/ganeti-htools-0.3.1.ebuild
index a7391f41def3..81a053991cab 100644
--- a/app-emulation/ganeti-htools/ganeti-htools-0.3.1.ebuild
+++ b/app-emulation/ganeti-htools/ganeti-htools-0.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti-htools/ganeti-htools-0.3.1.ebuild,v 1.4 2012/08/11 12:42:36 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti-htools/ganeti-htools-0.3.1.ebuild,v 1.5 2012/12/26 21:09:43 slyfox Exp $
 
 EAPI="2"
 
@@ -32,6 +32,7 @@ src_prepare() {
 	# Workaround to skip pandoc
 	sed -i -e "s:) man:):" Makefile
 	epatch "${FILESDIR}"/${PN}-0.2.8-use-QC-1.patch #316629
+	epatch "${FILESDIR}"/${PN}-0.3.1-base-4.patch #424299
 }
 
 src_compile() {