Work on the x11-wm/xmonad ebuilds (bump and patch).

(Portage version: 2.1.6.13/cvs/Linux x86_64)

3 files changed, 73 insertions, 3 deletions

diff --git a/x11-wm/xmonad/ChangeLog b/x11-wm/xmonad/ChangeLog
index 8f73c1f5d200..56a3835b3ecf 100644
--- a/x11-wm/xmonad/ChangeLog
+++ b/x11-wm/xmonad/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-wm/xmonad
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/xmonad/ChangeLog,v 1.11 2009/07/21 16:43:58 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/xmonad/ChangeLog,v 1.12 2009/07/31 17:31:20 kolmodin Exp $
+
+  31 Jul 2009; Lennart Kolmodin <kolmodin@gentoo.org> xmonad-0.8.ebuild:
+  Patch 0.8 so it compiles with ghc 6.10.
+
+*xmonad-0.8.1 (31 Jul 2009)
+
+  31 Jul 2009; Lennart Kolmodin <kolmodin@gentoo.org> +xmonad-0.8.1.ebuild:
+  Version bump (compatibility with ghc-6.10).
 
   21 Jul 2009; <chainsaw@gentoo.org> xmonad-0.8.ebuild:
   Marked stable on AMD64 as requested by Lennart Kolmodin
diff --git a/x11-wm/xmonad/xmonad-0.8.1.ebuild b/x11-wm/xmonad/xmonad-0.8.1.ebuild
new file mode 100644
index 000000000000..fc8042b0d985
--- /dev/null
+++ b/x11-wm/xmonad/xmonad-0.8.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/xmonad/xmonad-0.8.1.ebuild,v 1.1 2009/07/31 17:31:20 kolmodin Exp $
+
+CABAL_FEATURES="bin lib profile haddock"
+inherit haskell-cabal eutils
+
+DESCRIPTION="A tiling window manager"
+HOMEPAGE="http://xmonad.org"
+SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~sparc ~x86"
+IUSE=""
+
+DEPEND=">=dev-lang/ghc-6.6.1
+		>=dev-haskell/cabal-1.2
+		dev-haskell/mtl
+		>=dev-haskell/x11-1.4.3"
+RDEPEND="${DEPEND}"
+
+SAMPLE_CONFIG="xmonad.hs"
+SAMPLE_CONFIG_LOC="man"
+
+src_install() {
+	cabal_src_install
+
+	echo -e "#!/bin/sh\n/usr/bin/xmonad" > "${T}/${PN}"
+	exeinto /etc/X11/Sessions
+	doexe "${T}/${PN}"
+
+	insinto /usr/share/xsessions
+	doins "${FILESDIR}/${PN}.desktop"
+
+	doman man/xmonad.1
+
+	dodoc CONFIG README "${SAMPLE_CONFIG_LOC}/${SAMPLE_CONFIG}"
+}
+
+pkg_postinst() {
+	ghc-package_pkg_postinst
+
+	elog "A sample ${SAMPLE_CONFIG} configuration file can be found here:"
+	elog "    /usr/share/doc/${PF}/${SAMPLE_CONFIG}"
+	elog "The parameters in this file are the defaults used by xmonad."
+	elog "To customize xmonad, copy this file to:"
+	elog "    ~/.xmonad/${SAMPLE_CONFIG}"
+	elog "After editing, use 'mod-q' to dynamically restart xmonad "
+	elog "(where the 'mod' key defaults to 'Alt')."
+	elog ""
+	elog "Read the README or man page for more information, and to see "
+	elog "other possible configurations go to:"
+	elog "    http://haskell.org/haskellwiki/Xmonad/Config_archive"
+	elog "Please note that many of these configurations will require the "
+	elog "x11-wm/xmonad-contrib package to be installed."
+}
diff --git a/x11-wm/xmonad/xmonad-0.8.ebuild b/x11-wm/xmonad/xmonad-0.8.ebuild
index 9c5b55dbb777..1ac3d26647c7 100644
--- a/x11-wm/xmonad/xmonad-0.8.ebuild
+++ b/x11-wm/xmonad/xmonad-0.8.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/xmonad/xmonad-0.8.ebuild,v 1.2 2009/07/21 16:43:58 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/xmonad/xmonad-0.8.ebuild,v 1.3 2009/07/31 17:31:20 kolmodin Exp $
 
 CABAL_FEATURES="bin lib profile haddock"
 
-inherit haskell-cabal eutils
+inherit base haskell-cabal eutils
 
 DESCRIPTION="A lightweight X11 window manager"
 HOMEPAGE="http://www.xmonad.org/"
@@ -24,6 +24,11 @@ RDEPEND="${DEPEND}"
 SAMPLE_CONFIG="xmonad.hs"
 SAMPLE_CONFIG_LOC="man"
 
+src_unpack() {
+	base_src_unpack
+	sed -e 's/base >= 3/base < 4 \&\& >= 3/' -i "${S}/${PN}.cabal"
+}
+
 src_install() {
 	cabal_src_install