Bump xmonad-contrib to 0.11.4

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x618E971F

4 files changed, 81 insertions, 7 deletions

diff --git a/x11-wm/xmonad-contrib/ChangeLog b/x11-wm/xmonad-contrib/ChangeLog
index a523bf153e2a..33cf8a6f453b 100644
--- a/x11-wm/xmonad-contrib/ChangeLog
+++ b/x11-wm/xmonad-contrib/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-wm/xmonad-contrib
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/xmonad-contrib/ChangeLog,v 1.27 2014/05/11 07:03:45 slyfox Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/xmonad-contrib/ChangeLog,v 1.28 2015/04/03 04:45:25 gienah Exp $
+
+*xmonad-contrib-0.11.4 (03 Apr 2015)
+
+  03 Apr 2015; Mark Wright <gienah@gentoo.org>
+  +files/xmonad-contrib-0.11.4-import-Applicative.patch,
+  +xmonad-contrib-0.11.4.ebuild:
+  Bump xmonad-contrib to 0.11.4
 
   11 May 2014; Sergei Trofimovich <slyfox@gentoo.org>
   -xmonad-contrib-0.10.ebuild, -xmonad-contrib-0.11.1.ebuild,
diff --git a/x11-wm/xmonad-contrib/Manifest b/x11-wm/xmonad-contrib/Manifest
index c3a579d45101..03a8548afea1 100644
--- a/x11-wm/xmonad-contrib/Manifest
+++ b/x11-wm/xmonad-contrib/Manifest
@@ -2,14 +2,17 @@
 Hash: SHA256
 
 AUX xmonad-contrib-0.11.2-ghc-7.8.patch 1094 SHA256 31bf9319b6822badda94a039e23d444bcc71f2d73279c079658832d259c1e8ff SHA512 f4eff1596ef91e8b53a8cd9d31a315f83f3b2a0cb3d23bb9e045b7b38c9159583e3ea0a75c22557031bfafe72656cc01263c89bc5b83a41a76b03ae6b380e8f8 WHIRLPOOL 4fa126c55564410f6d733ec71afd113f285b5c34cf0f78ebeeef40acb5f3d470739b1a34299ae6841af6772af97884ab248039645180db0388f9c842c702257a
+AUX xmonad-contrib-0.11.4-import-Applicative.patch 918 SHA256 74d52d32c3cc04b1a9bbc22b7a651423713165f1dde484f0ed9f8b6480fcac13 SHA512 a1ebc7a6d6fa5f04242e966b2894ea128cbd4ef32f6c6d3339695a11836b09650edc0624ea587e227f71423f9794decfec54bf56d135636a5518640305cb8f4b WHIRLPOOL 3187996d4e88793474db1f008184559501d948c9ebfb01e537be2d5f0945e5f0b7128f62c1f26c6d0cf3220e185fe2fc74d0703e4cdce618997d0234ec34b067
 DIST xmonad-contrib-0.11.2.tar.gz 401758 SHA256 515d87838ad1f9622d0b491390c5961318d2cb84c96410dee91b5653c5388c62 SHA512 373e1ed1744cbdf26902402d74b4efafa043a4ccf1953c26ec55a03ef8de31818b0c4cfced08b43e664e5f052e52923c6dfb08d68be86726e9f0ed1d96ad7910 WHIRLPOOL 8356462938d9565ee010335c90646d5f23adf3b830bbf7727ef8fa89ff6c027ff94be44b99260ae3c57f9773b6cf985029ba2f183cc7b8c9e18d18fd260f90a9
+DIST xmonad-contrib-0.11.4.tar.gz 401743 SHA256 a379b3d4f2d3d8793d6c76812e90cbb055fa0598cfba944af47139bb77e2acbc SHA512 3d747988baa497475255be4cc96f7eba5cf6fc81658f8f877ca92148fb9a154423ee98ebeb23690de00b186d2e34ad13d94cf1fe332d4ca4f1f4a64790e46ed7 WHIRLPOOL 1f25fff0088f15942bddd6a8e285fcf283f723527cc10b120c81cbb9a74a56106d5f7c5f676cf6b3fcd118bc3843e510169161898267f160c73b35c0fba458df
 EBUILD xmonad-contrib-0.11.2.ebuild 1197 SHA256 a57735bbf6aa9ca1d4bf94af375ad9df73718d224c3ff6969a89eca16f8d70e8 SHA512 1d34e7e249729ae1d4dbff7ccbd8a27e6a0f38fe919e437ead6d697f2e38d977fcec1f26f0478494ba269dd4d21940f830da2ead215adcdc456d0540b8a6dc38 WHIRLPOOL e055b3f1702a61795e2d9b7455fec9ae0d4847f7a704d368985c4f44f47db06d357475a681dc636a7620e36b87a48089a3480afe7a701b326aed67b2772259c9
-MISC ChangeLog 4358 SHA256 5cb861f57cdbd6dea66ac03da676aeef5d68a07c7e5453ba56f88d88641743cb SHA512 068d0166b2cf8b41a2fbe53937501501d21c0b5b520235abfd55fbd218fd5f59de7ace19d712183db451317c0bd0ad2a4501764acd8eb3cce90e9fd46830ede0 WHIRLPOOL e2ff37afd85a31495be60f910befc80a479d2167cd5a1d0b507f381c64dd23a60e28130cd155e347deb6eb523b8a653979f3e9d3cd0d555d7499304756798e4a
+EBUILD xmonad-contrib-0.11.4.ebuild 1336 SHA256 a7652ee18ea6acb3237c1076c0ead24fca0783c06a24f9cae11d4b7fd7bc7a65 SHA512 d94187088486f45495fd26c03f776f51e3d72c344a605d6d011536fb97004c5d5bd2556e8f7aad32e1a7a75755a5ebb53088b5697a3df668d31dc3c8a599e961 WHIRLPOOL 1ab2e97fe9195e85df164001dd7240ed9507777c489924e8c7454cc70378991334eccc8ae6dcfe9f158bd108fc30f53d00a086d5a4ee7c648f92ba493baa1254
+MISC ChangeLog 4566 SHA256 1dc6fb507cd5face0275a45d536cbc718565a30f6ba0dfc77993508437f91569 SHA512 8d671dc42e9f600da737d66cf1e14d8e31fed4b8ab1858e6ac57c4f01a8463ce898f9819dedc2efd4579fdce99d0e698de2c5b8df4ff56b73a58e1bcfd613db3 WHIRLPOOL 719f4a8877eb72630ffccb39746a011111a869563111cb16f7c4ecb25d0ea780beadcf1f1fd9956c9c87fdbc1cf7921c6cf44fefdb5a587851fb0a3079f8680e
 MISC metadata.xml 755 SHA256 c6c5a001521c857493242290a2f8e79ef7dfc340c30f77aef78c98619a0db7e3 SHA512 360cf018afd3fe798df18ffb4d5f612b3f12534b904f3e6c07dcca732bce12c90db06a7490b83e15b7035da7d03ad2670661a674dc7929dd59216e1a09b438c1 WHIRLPOOL c6b0d59ecf9a81af4e90bf8073007c1f036ecad6776ae48f2e555f6d5625307593b570a85a4f19bd8dc75ddefa87da2f51b19e0d7c9974d6cc4c4b4f1273a0ff
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlNvIK8ACgkQcaHudmEf86r4pQCfeePRThOSl8dsgzSCrQo9+fau
-OF0An335CZThjD8Y+Fc16siLaDXzpjiL
-=47Zz
+iF0EAREIAAYFAlUeGusACgkQoBEVQmGOlx/ooAD+NkEkYFELgrBU7/hPM690yJB7
+GJti8y6GgCrS6RCr/N4A930qgpMWHl/XUezR7RRXnY0s5n34xXtumh/TB2eDsTg=
+=q3uE
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/xmonad-contrib/files/xmonad-contrib-0.11.4-import-Applicative.patch b/x11-wm/xmonad-contrib/files/xmonad-contrib-0.11.4-import-Applicative.patch
new file mode 100644
index 000000000000..d887e857da03
--- /dev/null
+++ b/x11-wm/xmonad-contrib/files/xmonad-contrib-0.11.4-import-Applicative.patch
@@ -0,0 +1,21 @@
+--- xmonad-contrib-0.11.4-orig/XMonad/Util/Invisible.hs	2015-03-28 05:00:21.000000000 +1100
++++ xmonad-contrib-0.11.4/XMonad/Util/Invisible.hs	2015-04-03 15:12:17.485143018 +1100
+@@ -22,6 +22,8 @@
+                             , fromIMaybe
+                             ) where
+ 
++import Control.Applicative
++
+ -- $usage
+ -- A wrapper data type to store layout state that shouldn't be persisted across
+ -- restarts. A common wrapped type to use is @Maybe a@.
+--- xmonad-contrib-0.11.4-orig/XMonad/Hooks/DebugEvents.hs	2015-03-28 05:00:21.000000000 +1100
++++ xmonad-contrib-0.11.4/XMonad/Hooks/DebugEvents.hs	2015-04-03 15:17:02.207816322 +1100
+@@ -30,6 +30,7 @@
+ 
+ -- import           Graphics.X11.Xlib.Extras.GetAtomName        (getAtomName)
+ 
++import           Control.Applicative
+ import           Control.Exception.Extensible         as E
+ import           Control.Monad.State
+ import           Control.Monad.Reader
diff --git a/x11-wm/xmonad-contrib/xmonad-contrib-0.11.4.ebuild b/x11-wm/xmonad-contrib/xmonad-contrib-0.11.4.ebuild
new file mode 100644
index 000000000000..7d12b7d0a407
--- /dev/null
+++ b/x11-wm/xmonad-contrib/xmonad-contrib-0.11.4.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 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.4.ebuild,v 1.1 2015/04/03 04:45:25 gienah Exp $
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.4.9999
+#hackport: flags: -testing,use_xft:xft
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit base haskell-cabal
+
+DESCRIPTION="Third party extensions for xmonad"
+HOMEPAGE="http://xmonad.org/"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="+xft"
+
+RDEPEND="dev-haskell/extensible-exceptions:=[profile?]
+	>=dev-haskell/mtl-1:=[profile?] <dev-haskell/mtl-3:=[profile?]
+	dev-haskell/random:=[profile?]
+	dev-haskell/utf8-string:=[profile?]
+	>=dev-haskell/x11-1.6.1:=[profile?] <dev-haskell/x11-1.7:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+	>=x11-wm/xmonad-0.11:=[profile?] <x11-wm/xmonad-0.12:=[profile?]
+	xft? ( >=dev-haskell/x11-xft-0.2:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6
+"
+
+# Upstream bug 597 xmonad-contrib-0.11.4 does not compile
+# https://code.google.com/p/xmonad/issues/detail?id=597
+PATCHES=("${FILESDIR}/${P}-import-Applicative.patch")
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-testing \
+		$(cabal_flag xft use_xft)
+}