Add ghc-7.8 support.

(Portage version: 2.2.8_p51/cvs/Linux x86_64, signed Manifest commit with key 611FF3AA)

3 files changed, 34 insertions, 5 deletions

diff --git a/x11-wm/xmonad-contrib/ChangeLog b/x11-wm/xmonad-contrib/ChangeLog
index 219cc39210b1..ecdf15e0a194 100644
--- a/x11-wm/xmonad-contrib/ChangeLog
+++ b/x11-wm/xmonad-contrib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-wm/xmonad-contrib
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/xmonad-contrib/ChangeLog,v 1.25 2013/07/29 05:26:13 ago Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/xmonad-contrib/ChangeLog,v 1.26 2014/02/21 19:29:34 slyfox Exp $
+
+  21 Feb 2014; Sergei Trofimovich <slyfox@gentoo.org>
+  +files/xmonad-contrib-0.11.2-ghc-7.8.patch, xmonad-contrib-0.11.2.ebuild:
+  Add ghc-7.8 support.
 
   29 Jul 2013; Agostino Sarubbo <ago@gentoo.org> xmonad-contrib-0.11.2.ebuild:
   Stable for x86, wrt bug #478288
diff --git a/x11-wm/xmonad-contrib/files/xmonad-contrib-0.11.2-ghc-7.8.patch b/x11-wm/xmonad-contrib/files/xmonad-contrib-0.11.2-ghc-7.8.patch
new file mode 100644
index 000000000000..67e1f8cd8def
--- /dev/null
+++ b/x11-wm/xmonad-contrib/files/xmonad-contrib-0.11.2-ghc-7.8.patch
@@ -0,0 +1,23 @@
+Sun Feb 17 19:33:56 FET 2013  Adam Vogt <vogt.adam@gmail.com>
+  * Remove unnecessary contexts from L.MultiToggle
+diff -rN -u old-XMonadContrib/XMonad/Layout/MultiToggle.hs new-XMonadContrib/XMonad/Layout/MultiToggle.hs
+--- old-XMonadContrib/XMonad/Layout/MultiToggle.hs	2014-02-06 00:58:32.422844682 +0300
++++ new-XMonadContrib/XMonad/Layout/MultiToggle.hs	2014-02-06 00:58:32.462844684 +0300
+@@ -99,7 +99,7 @@
+     transform :: (LayoutClass l a) => t -> l a ->
+         (forall l'. (LayoutClass l' a) => l' a -> (l' a -> l a) -> b) -> b
+ 
+-data (LayoutClass l a) => EL l a = forall l'. (LayoutClass l' a) => EL (l' a) (l' a -> l a)
++data  EL l a = forall l'. (LayoutClass l' a) => EL (l' a) (l' a -> l a)
+ 
+ unEL :: (LayoutClass l a) => EL l a -> (forall l'. (LayoutClass l' a) => l' a -> b) -> b
+ unEL (EL x _) k = k x
+@@ -159,7 +159,7 @@
+ infixr 0 ??
+ -- | Prepend an element to a heterogeneous list. Used to build transformer
+ -- tables for 'mkToggle'.
+-(??) :: (HList b w) => a -> b -> HCons a b
++(??) ::  a -> b -> HCons a b
+ (??) = HCons
+ 
+ -- | Construct a singleton transformer table.
diff --git a/x11-wm/xmonad-contrib/xmonad-contrib-0.11.2.ebuild b/x11-wm/xmonad-contrib/xmonad-contrib-0.11.2.ebuild
index 9b943b09fdd0..83ad9cab04a1 100644
--- a/x11-wm/xmonad-contrib/xmonad-contrib-0.11.2.ebuild
+++ b/x11-wm/xmonad-contrib/xmonad-contrib-0.11.2.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/xmonad-contrib/xmonad-contrib-0.11.2.ebuild,v 1.3 2013/07/29 05:26:13 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/xmonad-contrib/xmonad-contrib-0.11.2.ebuild,v 1.4 2014/02/21 19:29:34 slyfox Exp $
 
 EAPI=5
 
 # ebuild generated by hackport 0.3.2.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
+inherit base haskell-cabal
 
 DESCRIPTION="Third party extensions for xmonad"
 HOMEPAGE="http://xmonad.org/"
@@ -33,6 +33,8 @@ RDEPEND="dev-haskell/extensible-exceptions:=[profile?]
 DEPEND="${RDEPEND}
 		>=dev-haskell/cabal-1.6"
 
+PATCHES=("${FILESDIR}"/${P}-ghc-7.8.patch)
+
 src_configure() {
 	haskell-cabal_src_configure \
 		--flags=-testing \