commit: e9af79d286cb13ce56783b56ac043091718e46a6
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 10 10:25:18 2016 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Wed Feb 10 10:25:28 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9af79d2
app-emulation/ganeti-htools: tweak for ghc-7.10
Package-Manager: portage-2.2.27
.../files/ganeti-htools-0.3.1-ghc-7.10.patch | 29 ++++++++++++++++++++++
.../ganeti-htools/ganeti-htools-0.3.1.ebuild | 1 +
2 files changed, 30 insertions(+)
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 0000000..51c39fe
--- /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
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 251b669..68482c2 100644
--- a/app-emulation/ganeti-htools/ganeti-htools-0.3.1.ebuild
+++ b/app-emulation/ganeti-htools/ganeti-htools-0.3.1.ebuild
@@ -33,6 +33,7 @@ src_prepare() {
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
+ epatch "${FILESDIR}"/${PN}-0.3.1-ghc-7.10.patch
}
src_compile() {
