Bump xmonad-contrib to 0.11.4

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 618E971F)

3 files changed, 73 insertions, 2 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/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)
+}