[gentoo-commits] gentoo-x86 commit in x11-wm/xmonad: xmonad-0.8.1.ebuild ChangeLog xmonad-0.8.ebuild

[Lennart Kolmodin (kolmodin)]

kolmodin    09/07/31 17:31:20

  Modified:             ChangeLog xmonad-0.8.ebuild
  Added:                xmonad-0.8.1.ebuild
  Log:
  Work on the x11-wm/xmonad ebuilds (bump and patch).
  (Portage version: 2.1.6.13/cvs/Linux x86_64)

Revision  Changes    Path
1.12                 x11-wm/xmonad/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/xmonad/ChangeLog?rev=1.12&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/xmonad/ChangeLog?rev=1.12&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/xmonad/ChangeLog?r1=1.11&r2=1.12

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-wm/xmonad/ChangeLog,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ChangeLog	21 Jul 2009 16:43:58 -0000	1.11
+++ ChangeLog	31 Jul 2009 17:31:20 -0000	1.12
@@ -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@g.o> 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@g.o> +xmonad-0.8.1.ebuild:
+  Version bump (compatibility with ghc-6.10).
 
   21 Jul 2009; <chainsaw@g.o> xmonad-0.8.ebuild:
   Marked stable on AMD64 as requested by Lennart Kolmodin



1.3                  x11-wm/xmonad/xmonad-0.8.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/xmonad/xmonad-0.8.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/xmonad/xmonad-0.8.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/xmonad/xmonad-0.8.ebuild?r1=1.2&r2=1.3

Index: xmonad-0.8.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-wm/xmonad/xmonad-0.8.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xmonad-0.8.ebuild	21 Jul 2009 16:43:58 -0000	1.2
+++ xmonad-0.8.ebuild	31 Jul 2009 17:31:20 -0000	1.3
@@ -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 @@
 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
 



1.1                  x11-wm/xmonad/xmonad-0.8.1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/xmonad/xmonad-0.8.1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/xmonad/xmonad-0.8.1.ebuild?rev=1.1&content-type=text/plain

Index: xmonad-0.8.1.ebuild
===================================================================
# 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."
}