summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /x11-wm/xmonad-contrib
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'x11-wm/xmonad-contrib')
-rw-r--r--x11-wm/xmonad-contrib/Manifest2
-rw-r--r--x11-wm/xmonad-contrib/files/xmonad-contrib-0.11.2-ghc-7.8.patch23
-rw-r--r--x11-wm/xmonad-contrib/files/xmonad-contrib-0.11.4-import-Applicative.patch21
-rw-r--r--x11-wm/xmonad-contrib/metadata.xml23
-rw-r--r--x11-wm/xmonad-contrib/xmonad-contrib-0.11.2.ebuild42
-rw-r--r--x11-wm/xmonad-contrib/xmonad-contrib-0.11.4.ebuild51
6 files changed, 162 insertions, 0 deletions
diff --git a/x11-wm/xmonad-contrib/Manifest b/x11-wm/xmonad-contrib/Manifest
new file mode 100644
index 00000000000..655e92802a5
--- /dev/null
+++ b/x11-wm/xmonad-contrib/Manifest
@@ -0,0 +1,2 @@
+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
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 00000000000..67e1f8cd8de
--- /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/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 00000000000..d887e857da0
--- /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/metadata.xml b/x11-wm/xmonad-contrib/metadata.xml
new file mode 100644
index 00000000000..c1b67d9543c
--- /dev/null
+++ b/x11-wm/xmonad-contrib/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>haskell</herd>
+ <maintainer>
+ <email>haskell@gentoo.org</email>
+ </maintainer>
+ <longdescription>
+ Third party tiling algorithms, configurations and scripts to xmonad,
+ a tiling window manager for X.
+
+ For an introduction to building, configuring and using xmonad
+ extensions, see &quot;XMonad.Doc&quot;. In particular:
+
+ &quot;XMonad.Doc.Configuring&quot;, a guide to configuring xmonad
+
+ &quot;XMonad.Doc.Extending&quot;, using the contributed extensions library
+
+ &quot;XMonad.Doc.Developing&quot;, introduction to xmonad internals and writing
+ your own extensions.
+
+ </longdescription>
+</pkgmetadata>
diff --git a/x11-wm/xmonad-contrib/xmonad-contrib-0.11.2.ebuild b/x11-wm/xmonad-contrib/xmonad-contrib-0.11.2.ebuild
new file mode 100644
index 00000000000..721671882a7
--- /dev/null
+++ b/x11-wm/xmonad-contrib/xmonad-contrib-0.11.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.3.2.9999
+
+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"
+# hackport-args: --always-disabled='testing'
+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-6.10.4:=
+ =x11-wm/xmonad-0.11*:=[profile?]
+ xft? ( >=dev-haskell/x11-xft-0.2:=[profile?]
+ )"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.6"
+
+PATCHES=("${FILESDIR}"/${P}-ghc-7.8.patch)
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flags=-testing \
+ $(cabal_flag xft use_xft)
+}
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 00000000000..f25ae07f9fc
--- /dev/null
+++ b/x11-wm/xmonad-contrib/xmonad-contrib-0.11.4.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.4.9999
+#hackport: flags: -testing,use_xft:xft
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit eutils 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/old-locale:=[profile?]
+ dev-haskell/old-time:=[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
+"
+
+src_prepare() {
+ # Upstream bug 597 xmonad-contrib-0.11.4 does not compile
+ # https://code.google.com/p/xmonad/issues/detail?id=597
+ epatch "${FILESDIR}"/${P}-import-Applicative.patch
+
+ # https://ghc.haskell.org/trac/ghc/ticket/10667
+ [[ $(ghc-version) == 7.10.1.20150630 ]] && replace-hcflags -g ''
+ [[ $(ghc-version) == 7.10.2 ]] && replace-hcflags -g ''
+}
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=-testing \
+ $(cabal_flag xft use_xft)
+}