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

Package-Manager: portage-2.1.4.4

4 files changed, 87 insertions, 4 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/Manifest b/x11-wm/xmonad/Manifest
index febb6779654b..46cad782291e 100644
--- a/x11-wm/xmonad/Manifest
+++ b/x11-wm/xmonad/Manifest
@@ -1,8 +1,20 @@
-AUX xmonad.desktop 145 RMD160 7f7566aaa0f717699783c19d18a18d57dca0297e SHA1 77a500f054dcd8c6de66fa5bb15e5edc8026193e SHA256 4a3548cfe88229fa31dacc2c757faec7d9948ad68180f4e943428bccd8819526
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX xmonad.desktop 148 RMD160 90d2f6277535b1a6b2ad0270d5b2361e9c5ffe78 SHA1 b9f2e9f62c170617bfd0cada24bea7a975118b86 SHA256 744132aa4ba84064d3f542ebe6199df1018f7110a9ceb55b943d6a8f57bb4d08
 DIST xmonad-0.5.tar.gz 48853 RMD160 8e39d8a2ad8e8d16006bdcd1f645d6a31be721f8 SHA1 acea831a6da485ad996c8bda7a67f1acbd70d3fa SHA256 cfcc4501b000fa740ed35a5be87dc01216e036219551630dcf71d9c3cf57e4c4
 DIST xmonad-0.6.tar.gz 49635 RMD160 53513fceedd7979ea2dbfa882e737a0ddd9bbe80 SHA1 e2221b80e03cd0997cb841e85ac893d6daf6dfb0 SHA256 e107c5dbc659b2342e0e736d9baee0ee88a1404fa5161481b1924f23d3367c21
+DIST xmonad-0.7.tar.gz 52740 RMD160 790f8ce7a3975fc385a267706a3c19fdec1f3c32 SHA1 cf3fb7662c92cadb9ea7bfdc916bbe5cc587ac86 SHA256 d5ee338eb6d0680082e20eaafa0b23b32358fffe69e2ec4ad7bdf6e03c751d67
 EBUILD xmonad-0.5-r1.ebuild 1892 RMD160 780e2eae863198038f5f4a1c97800a9bdcffdcbc SHA1 d51f35c053e33ea2273690d8b48bcef38e1624e7 SHA256 35d26ae34b5e263c5fae9c412fcaf7f6201155f29ccac654459f7d790080ec03
 EBUILD xmonad-0.5.ebuild 1019 RMD160 85cce6c109a936760b9a78618a9d90661463bc47 SHA1 5836a9b9a47921d6f7b030f0a9832a1265c994ad SHA256 e359a81789bf7cf76b24e515c1571793c5e3c5c07990a6b67727216550994849
 EBUILD xmonad-0.6.ebuild 1844 RMD160 9ec41f53e4f9004b67cead579907648e6503d050 SHA1 965e805bd807144cf596d39f831677976f208be4 SHA256 4aab94d950a75f0f322d9a44bc79d125bccded0c17083f570ff9dae7edd77a3b
-MISC ChangeLog 956 RMD160 ee0da3590882d23eec492492ff76135552038cf9 SHA1 dd5232ef6f28e44767b052909ee6d0de5ad9975c SHA256 46c04451e2f284424d78aa004a5b1b90ea219e8f7b53f6083c8063a487b6f4b4
+EBUILD xmonad-0.7.ebuild 1851 RMD160 7d3ac11f5efded2e1922daddb1243606e2485848 SHA1 d9acee7b9cc93bf5ae387eccaac77cf981b6768c SHA256 c1e509329c6a0cd65d3e172096847e44e765f0a4d7be5f13e622d5b11deef8b1
+MISC ChangeLog 1153 RMD160 1c5bfb5d8070310d2d38c1b6af6524804ecf0187 SHA1 e0565b9359f6e87c98adef0c82956a57a6eec80f SHA256 64d45098c1abf586fcd64cc2270965051414eb2ef5b9a5d304527e8662f0f95f
 MISC metadata.xml 223 RMD160 7783e6057effb8b8f0b79cffe8b557b32c633839 SHA1 7b962c77f2e38479a9d1621ec8d307ca9f761753 SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFH/4Hg1n/CYbXjntIRAoG1AJ41Z0ahGARtLbXwTda4N/vGenZ6UQCglZiL
+zKbxzEng6O2jPqg3bDWpzvQ=
+=oYS6
+-----END PGP SIGNATURE-----
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."
+}
+