Add ghc-7.8 support.

Package-Manager: portage-2.2.8_p51/cvs/Linux x86_64
Manifest-Sign-Key: 0x611FF3AA

4 files changed, 42 insertions, 22 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/Manifest b/x11-wm/xmonad-contrib/Manifest
index e19a9b6759aa..c49abf712de7 100644
--- a/x11-wm/xmonad-contrib/Manifest
+++ b/x11-wm/xmonad-contrib/Manifest
@@ -1,30 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
+AUX xmonad-contrib-0.11.2-ghc-7.8.patch 1094 SHA256 31bf9319b6822badda94a039e23d444bcc71f2d73279c079658832d259c1e8ff SHA512 f4eff1596ef91e8b53a8cd9d31a315f83f3b2a0cb3d23bb9e045b7b38c9159583e3ea0a75c22557031bfafe72656cc01263c89bc5b83a41a76b03ae6b380e8f8 WHIRLPOOL 4fa126c55564410f6d733ec71afd113f285b5c34cf0f78ebeeef40acb5f3d470739b1a34299ae6841af6772af97884ab248039645180db0388f9c842c702257a
 DIST xmonad-contrib-0.10.tar.gz 364522 SHA256 d8c1a37d88270a45b68e347c056e0f487f739780af413b87265ede9c4cc6e752 SHA512 b2cf743319c9bdf22074b71d28035781b44d60c70794cf5497abd51fb52e8dee569818f37bf9c05330630ab97927fe217b9e0733844a244396d3214b0bf32937 WHIRLPOOL bd5eb5b1c88e930a622c476dcf435d7cd5ba448ea411deda13fd620c92410cd9501ec594fae4434950856c2b11cae5ad01882909ccdabb17e6372e646202772b
 DIST xmonad-contrib-0.11.1.tar.gz 401391 SHA256 347f805fa1b5aed59bc589afce9e19ef13e392b1f7cad8857deef01b916da68c SHA512 d989af7c1006593e950580e253aef918edf3c48885a6c329b1faad0394cfbb60008eebba81eff3edba54f4db49bc78d2389fed4bde64a9f04deb98295ef1e6c7 WHIRLPOOL 8b2bd91428f97b637b1ec225f91c426e3a2b226d1556cbdda5ae16f85d5f79e13c47436c376e23861446cb8c8233bb8600e4a5e6bab6926362dddac74dc0d3c3
 DIST xmonad-contrib-0.11.2.tar.gz 401758 SHA256 515d87838ad1f9622d0b491390c5961318d2cb84c96410dee91b5653c5388c62 SHA512 373e1ed1744cbdf26902402d74b4efafa043a4ccf1953c26ec55a03ef8de31818b0c4cfced08b43e664e5f052e52923c6dfb08d68be86726e9f0ed1d96ad7910 WHIRLPOOL 8356462938d9565ee010335c90646d5f23adf3b830bbf7727ef8fa89ff6c027ff94be44b99260ae3c57f9773b6cf985029ba2f183cc7b8c9e18d18fd260f90a9
 DIST xmonad-contrib-0.11.tar.gz 402567 SHA256 40cf6f0b895d609165a0ddc9d6e34255ab6b39418248215aaf7c2c13b4cf0ba1 SHA512 ed6c72de3aa5ca652cc8f0c1d69799c9d77f38b37c2763e8a07b0cbc6bd0d18ad57a3f4914a9e7084668a8901df0e98820900f057bb1e42ce224541e56a2b748 WHIRLPOOL 48be07f0a0c97c3bab726cbd500f0169c58531be7dcc3547cddb5d38158892ff43b09c37bc7adbef43f5152eea0c5d1cbe2644f4924b193aedf64a8f3ac1c6d3
 EBUILD xmonad-contrib-0.10.ebuild 940 SHA256 f0b9c30db202a98dce5b24f9464ab1c6de065c9bba9227ef3be1ec6b21e55fad SHA512 295beed298dfab98346b413a5b2727824042b12ef84c1cb006e3a6f067393e56668ae2743c32c7611b6fdb56896bb1e2c6179af9629cb66d180c2fc24e3d355b WHIRLPOOL cfbd464eb2b5e6e7eadbb08ec06d8bf75a0fb51a6b3b5ce87704f9d14963acf50d3a7c1e289e6ac5e5d43bb9648c892a8ccfd9f9af54388a04bfb1dd39e64cdd
 EBUILD xmonad-contrib-0.11.1.ebuild 1149 SHA256 67c81f4a9d881abfba5e14732a6aa2647fb26e74e05fb5d0f62b93990012a830 SHA512 3c43825590322e4c706b83f682ba5ce72dfd3fd1d9330919625805894df4878f135f8e3858f73217932e62aec8e9bcbee5df5c4970169c6d7c5e9e7cf7f39514 WHIRLPOOL 72ab556188a7f2a10334c1c95ffa995e9a54a486f0e7591c6593184f72900431374895dc8964bfcecf52d413e4a705adf27103b9ee3ca1a441f7fbdd43efff1a
-EBUILD xmonad-contrib-0.11.2.ebuild 1145 SHA256 9e9e53f6ee2b10bebb79e05ecc2a070bd1638dd7dc8bb8c68e334c01b98c624b SHA512 2658ad237251df07bd8b37924378f97a2548249060045e2c6a3497b351dcee1c1fce2a650001acb317e2d7880d7c904fa520a10316fe636cb6e0e05e38461655 WHIRLPOOL 82dc31faa9d83ddf68516ad244b0085bc6ed61f52d9a27fd5fb91de6e2835ea1b7e66a956c608983682ecfc945109eb60fb7e479a80f97287ee152b2326f704d
+EBUILD xmonad-contrib-0.11.2.ebuild 1197 SHA256 a57735bbf6aa9ca1d4bf94af375ad9df73718d224c3ff6969a89eca16f8d70e8 SHA512 1d34e7e249729ae1d4dbff7ccbd8a27e6a0f38fe919e437ead6d697f2e38d977fcec1f26f0478494ba269dd4d21940f830da2ead215adcdc456d0540b8a6dc38 WHIRLPOOL e055b3f1702a61795e2d9b7455fec9ae0d4847f7a704d368985c4f44f47db06d357475a681dc636a7620e36b87a48089a3480afe7a701b326aed67b2772259c9
 EBUILD xmonad-contrib-0.11.ebuild 945 SHA256 138522212f238adae07bfca131cfdf41effc98c7a80fb483534dd185b47c89f8 SHA512 cb3f6080d319afbcbd1dd35bf4d60eb2e9e234bf63d1a992e82b7af45190ba4b030ae52332d673582abf9cc8c4d82ab9d2c7e92c444768adb2c9533ac2f3bc3e WHIRLPOOL b9392e953421e56e5efdfa398843b80a3a2b397a7e0404d01d3d44e11d7e410afa4414298becdad658fff2e2564920cf201b2423eb7676ebd5cecb00b142c173
-MISC ChangeLog 4001 SHA256 0760fd15a3967e420eb3d638638d59d65d35a906501ec9cdf0aa6f74e0c42699 SHA512 f791b7495c30527af30f49b7f8ba24b14f37887b67ac5c038142583c2f7eb9c5e7360f51a146feb229bcc91e49331e0419042e16313ad8b8d090aed2271ecf3a WHIRLPOOL 9a56b3e41b77df88641a7ca349b1c02cae8d9749bfc1228abd98cd0fc770d1422b37e0dc4ddc4b8e0c39c53549e227719b3f83632776e0a86d8ff8f9a2107401
+MISC ChangeLog 4158 SHA256 dfc3b4fcea4834ebe26d5b1a47e46fa5cad1a7833fbdbf5e27d7ae8886db8d84 SHA512 36fb85cdbe978b30d891c058e3ffdcbbec9ae21b99763bee255718d4f09b181269a46e7c680982cf06a2523d3ff22d99d502c68a59c5dfddfeaeb796546960c4 WHIRLPOOL 7bdcf507b17abd71c8cd8082804332b6b8f69c37b8548ca1b6940b301ee5abd2990a93d2cdace9ae527810ae0b6ca6ec609b5c1321e4fe5be6f58e007ec84461
 MISC metadata.xml 755 SHA256 c6c5a001521c857493242290a2f8e79ef7dfc340c30f77aef78c98619a0db7e3 SHA512 360cf018afd3fe798df18ffb4d5f612b3f12534b904f3e6c07dcca732bce12c90db06a7490b83e15b7035da7d03ad2670661a674dc7929dd59216e1a09b438c1 WHIRLPOOL c6b0d59ecf9a81af4e90bf8073007c1f036ecad6776ae48f2e555f6d5625307593b570a85a4f19bd8dc75ddefa87da2f51b19e0d7c9974d6cc4c4b4f1273a0ff
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJR9fzvAAoJELp701BxlEWfGREQAMaYt5C14UN/UtYhMU8HOBn9
-K2w3jMBZ7nnQzegaVm00t34HxqdvYgptKpUx8LsunjvvzZBmDrcBCn5Al16nGAod
-nE3j3Bu5C+uBf3zj8XkJ3uoXLXWF5ZCYYKw0JKYhIh7WePSKJTSPt5BteMHv7UJm
-Ad7UDJyEm0nUa+Q9x/yACth7QcOvnJk3SMOJo9wzNJBuLHwpFRu+8cQirECNwFzQ
-JQ6mIbEQZZZR/rzpGSVumXUzeNW1W+zJ+B+UPmTjsz11M8WqbHKKoQzOHVZxB+Fd
-JAOLFMVOCiDO43+lh5+ozJiYYY/p4fDjHPmfDsE8mN1d0ovgt+54hK4EihQwKpsi
-f7jf47b0CjTv/Sp5kxoxTD5acAZo0e4w5UOFztzGCWHSFrLbQIXsfOxKF9+PPbkU
-MSZ03qu+0PSw2KCYrAzt1m+dAjiOdnNbI10hSGGsThSjoyDBCnYHP176xntoqy67
-kOJn6CszJ86wt90QtDeVKSj+/nU+PAxITgUdboAevdXF9qtfsYmUzbK0oGPq+vmG
-HHKyf2wQDgNxPuoqL1HinQoTD9YK3Mr01YV3uRisl3wCx2No4hd7kVLB/oB9RsE0
-wsF4K5RO3NCxOhyfDdAoYfZ9i4NSZWfOGiXdnJk/yMXBi8ydsNEtEJrBnRZcSkOr
-zTr8SBiAX3iOkx6CVObu
-=Sodq
+iEYEAREIAAYFAlMHqRIACgkQcaHudmEf86pmnwCfSek0UTGnjS3yEn7K5Ux21vkT
+qpgAn0hcTzMQGw8s1kfgCjrpkJuF5ea6
+=KS2a
 -----END PGP SIGNATURE-----
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 \