Version bump x11-wm/xmonad to 0.7, and fix the xmonad.desktop Type.

(Portage version: 2.1.4.4)

3 files changed, 73 insertions, 2 deletions

diff --git a/x11-wm/xmonad/ChangeLog b/x11-wm/xmonad/ChangeLog
index cd9269c4cada..f1767e012242 100644
--- a/x11-wm/xmonad/ChangeLog
+++ b/x11-wm/xmonad/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-wm/xmonad
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/xmonad/ChangeLog,v 1.5 2008/02/02 19:06:13 kolmodin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/xmonad/ChangeLog,v 1.6 2008/04/11 15:20:51 kolmodin Exp $
+
+*xmonad-0.7 (11 Apr 2008)
+
+  11 Apr 2008; Lennart Kolmodin <kolmodin@gentoo.org> files/xmonad.desktop,
+  +xmonad-0.7.ebuild:
+  Version bump to 0.7, and set proper Type in the xmonad.desktop file.
 
 *xmonad-0.6 (02 Feb 2008)
 
diff --git a/x11-wm/xmonad/files/xmonad.desktop b/x11-wm/xmonad/files/xmonad.desktop
index 5f27900df08b..fdc128defabb 100644
--- a/x11-wm/xmonad/files/xmonad.desktop
+++ b/x11-wm/xmonad/files/xmonad.desktop
@@ -5,4 +5,4 @@ Comment=A lightweight window manager
 Exec=/etc/X11/Sessions/xmonad
 TryExec=xmonad
 Icon=
-Type=Xsession
+Type=Application
diff --git a/x11-wm/xmonad/xmonad-0.7.ebuild b/x11-wm/xmonad/xmonad-0.7.ebuild
new file mode 100644
index 000000000000..0a47126ea73d
--- /dev/null
+++ b/x11-wm/xmonad/xmonad-0.7.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/xmonad/xmonad-0.7.ebuild,v 1.1 2008/04/11 15:20:51 kolmodin Exp $
+
+CABAL_FEATURES="bin lib profile haddock"
+
+inherit haskell-cabal eutils
+
+DESCRIPTION="A lightweight X11 window manager"
+HOMEPAGE="http://www.xmonad.org/"
+SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86"
+
+DEPEND="dev-haskell/mtl
+	>=dev-haskell/x11-1.4.1
+	>=dev-lang/ghc-6.6
+	>=dev-haskell/cabal-1.2"
+RDEPEND="${DEPEND}"
+
+SAMPLE_CONFIG="xmonad.hs"
+SAMPLE_CONFIG_LOC="man"
+
+src_unpack() {
+	unpack ${A}
+
+	# portage strips, packages should not do it themselves.
+	sed -i -e 's/-optl-Wl,-s//' "${S}/xmonad.cabal"
+}
+
+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."
+}
+