Version bump. Drop old.

Package-Manager: portage-2.1.9.48/cvs/Linux x86_64

9 files changed, 66 insertions, 331 deletions

diff --git a/x11-wm/xmonad/ChangeLog b/x11-wm/xmonad/ChangeLog
index a84524de7f8c..00f025d545cb 100644
--- a/x11-wm/xmonad/ChangeLog
+++ b/x11-wm/xmonad/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-wm/xmonad
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/xmonad/ChangeLog,v 1.19 2011/04/19 13:21:48 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/xmonad/ChangeLog,v 1.20 2011/05/11 21:26:16 slyfox Exp $
+
+*xmonad-0.9.2 (11 May 2011)
+
+  11 May 2011; Sergei Trofimovich <slyfox@gentoo.org> -xmonad-0.5.ebuild,
+  -xmonad-0.5-r1.ebuild, -xmonad-0.6.ebuild, -xmonad-0.7.ebuild,
+  -xmonad-0.8.ebuild, -xmonad-0.8.1.ebuild, +xmonad-0.9.2.ebuild,
+  +files/xmonad-0.9.2-unbreak-haddock.patch:
+  Version bump. Drop old.
 
   19 Apr 2011; Thomas Kahle <tomka@gentoo.org> xmonad-0.9.ebuild:
   x86 stable per bug 359843
diff --git a/x11-wm/xmonad/Manifest b/x11-wm/xmonad/Manifest
index 29dd6abf58f6..4ef4cc200283 100644
--- a/x11-wm/xmonad/Manifest
+++ b/x11-wm/xmonad/Manifest
@@ -1,26 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
+AUX xmonad-0.9.2-unbreak-haddock.patch 1381 RMD160 66b2d9b6c4c4a633f022dcc414a180394c4ff750 SHA1 aaa99ec04e6cbb7adee195a74ff54371d8385008 SHA256 2da7bbf88eaa72febf98fde0eb67d35e0ef11ef25940b889a9db0a6b72df8f3c
 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
-DIST xmonad-0.8.1.tar.gz 52878 RMD160 e4020e5870faea1ffded5f9fb748441c8b1f8066 SHA1 ea9ef82b6921131e356caf996aa97e977731dcb6 SHA256 9d58789a0bc08d40b9d14097b079822c7b8290d60efc6aa79144abf47d5db32c
-DIST xmonad-0.8.tar.gz 52896 RMD160 50d203af66e80de469a12f6261e40451f00de227 SHA1 26eb5e80ba83da43cec963435daec6b925e3b1a7 SHA256 982a3189e6815dc7e1a9dfc5200a1d746490abe1a8a953f093ea9597a0d40681
+DIST xmonad-0.9.2.tar.gz 56974 RMD160 4d8e6f0057833695a876ead876bebc4e1878f17b SHA1 6f05248225f5e6ffd77780ce1c2c2a11300e0b7b SHA256 adcda3f5b7a59fb1fa4f7f48e8c4eb0599642e7d215b013fb072f98aef98851f
 DIST xmonad-0.9.tar.gz 55977 RMD160 c781d2bd69e4ed164f7eb8d0514747b0ad6abdb2 SHA1 c319229fb6d3ef4864a6b177d96368bd9d978283 SHA256 51670f83de211a8ea24ce2724c71ac5c3e4782f25422319d8b5e43f3ae7bf9e8
-EBUILD xmonad-0.5-r1.ebuild 1900 RMD160 a48ca0ef96e00a3512cdfb4624b1ecee5ab7ed99 SHA1 e975895d46a3f266cee386239e1b67388a2ed322 SHA256 d7bc4e2c49e22a18d1a1446714d09f8c509b97f8a842461971315b44f4166dd3
-EBUILD xmonad-0.5.ebuild 1028 RMD160 980151538779955ddbe1c421c63612450a4778c3 SHA1 2c0bb6288e80d58d258a03a6e594ce62a9ee85b3 SHA256 e1d98e6e77412c36d455c0543604d68d7d391050a256292b76a0433f753629b3
-EBUILD xmonad-0.6.ebuild 1852 RMD160 c1257eabe011efd8b9202c287a84b31f5d7ddd89 SHA1 af0324c74aaaeb1f9cbb7644c4eb70e52af5a7db SHA256 56903e135a754b456abe9c2e218ee94282cc90f4f25eb83dc4205437a18c718f
-EBUILD xmonad-0.7.ebuild 1853 RMD160 5e3d9c1cf1c7dbbccfe0328551c5da0658dc4097 SHA1 3453ce30ede05ee045d5c5dbbb8511a3dcdbb807 SHA256 bc2d6ddb67564c5946d2b720c5b661bb038a92565758bbf5398c1c6e132980b3
-EBUILD xmonad-0.8.1.ebuild 1705 RMD160 d289191762ee718cfa0c652a3c85742ccc4f352f SHA1 fb34c54d2422dc2ae29723e58b6845255f0bf581 SHA256 e95a87b9f31ebf3bb53ef22bfa9800eb120c6b32368b6405427ab6a496d8dd15
-EBUILD xmonad-0.8.ebuild 1817 RMD160 ec22e6e3b458bc67f005636511f4cf55494ff763 SHA1 514d754dcc61ec49c4c0dd273a365411af390936 SHA256 989eb99471d86b9caa756a33750106a27bd0874f287043af2eabeb14a36fdbbc
+EBUILD xmonad-0.9.2.ebuild 1802 RMD160 a0e8e9f153ed1036f32dddd6f817826b2a9a5575 SHA1 712415bdbd5fa26cc50c9183120710a09743d97c SHA256 b4edba23c46d1493719f2c408815086fcf318dcfd8a65d3755425d695dbb16e6
 EBUILD xmonad-0.9.ebuild 1730 RMD160 8d9dfdff20cf3a752ee8a6cdafe23da307548a25 SHA1 8c1876203f5b69c284f0ae8ed105e70ca7c6530d SHA256 fe83cac6577daf4c93325071cf32328c073a51a342d4493995abcdb38d4cbc7c
-MISC ChangeLog 2570 RMD160 598d4290499afc513198187536d344c651671f0f SHA1 4ec84f9ba6c3a7e575534172df56db4f9766f4b4 SHA256 8b0216310b542cee8f839ae460e31cad2c0331edc13ad03e979cd7035aede383
+MISC ChangeLog 2877 RMD160 412a2696be27cc5f24dec5be902ebf024e30d0be SHA1 d3ef5acafc71e8192883d8db9e5d38985c1f1c6a SHA256 55026aab404b7371f47b57a66c4f4d2f783b59cfef69e3cef8ebfb01256848ec
 MISC metadata.xml 223 RMD160 7783e6057effb8b8f0b79cffe8b557b32c633839 SHA1 7b962c77f2e38479a9d1621ec8d307ca9f761753 SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk2tid4ACgkQodBTJSDyo65PZAD+OUNRYXBfgcQYALIgul31mXrQ
-W0O4V4yz3ikV6byAnC8A/A0qCfTuSg1P6DeUhXqLNHZ8hm/vZTu6Tq8eeuuOaph8
-=9Bu6
+iEYEARECAAYFAk3K/6gACgkQcaHudmEf86oR7wCgiP51OLaaEBCUM/sabyAQOXJC
+fogAn3M4iml/oWg1il95gAd3C3+hNa8C
+=vb3j
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/xmonad/files/xmonad-0.9.2-unbreak-haddock.patch b/x11-wm/xmonad/files/xmonad-0.9.2-unbreak-haddock.patch
new file mode 100644
index 000000000000..5ad394b19e28
--- /dev/null
+++ b/x11-wm/xmonad/files/xmonad-0.9.2-unbreak-haddock.patch
@@ -0,0 +1,33 @@
+diff --git a/XMonad/Core.hs b/XMonad/Core.hs
+index 0f5ab31..a12f63d 100644
+--- a/XMonad/Core.hs
++++ b/XMonad/Core.hs
+@@ -1,7 +1,6 @@
+ {-# LANGUAGE ExistentialQuantification, FlexibleInstances, GeneralizedNewtypeDeriving,
+              MultiParamTypeClasses, TypeSynonymInstances, CPP, DeriveDataTypeable #-}
+ -- required for deriving Typeable
+-{- # OPTIONS_GHC -fglasgow-exts #-}
+ 
+ -----------------------------------------------------------------------------
+ -- |
+diff --git a/XMonad/Layout.hs b/XMonad/Layout.hs
+index 992415e..3b0c3f9 100644
+--- a/XMonad/Layout.hs
++++ b/XMonad/Layout.hs
+@@ -1,4 +1,3 @@
+-{- # OPTIONS_GHC -fglasgow-exts    #-} -- For deriving Data/Typeable
+ {-# LANGUAGE FlexibleInstances, MultiParamTypeClasses, PatternGuards, TypeSynonymInstances, DeriveDataTypeable #-}
+ 
+ -- --------------------------------------------------------------------------
+diff --git a/XMonad/Operations.hs b/XMonad/Operations.hs
+index 07a2f70..a5b2b66 100644
+--- a/XMonad/Operations.hs
++++ b/XMonad/Operations.hs
+@@ -1,7 +1,6 @@
+ {-# OPTIONS_GHC -fno-warn-orphans #-}
+ {-# LANGUAGE FlexibleInstances, MultiParamTypeClasses, PatternGuards, TypeSynonymInstances, DeriveDataTypeable #-}
+ 
+-{- # OPTIONS_GHC -fglasgow-exts    #-} -- For deriving Data/Typeable
+ -- --------------------------------------------------------------------------
+ -- |
+ -- Module      :  XMonad.Operations
diff --git a/x11-wm/xmonad/xmonad-0.5-r1.ebuild b/x11-wm/xmonad/xmonad-0.5-r1.ebuild
deleted file mode 100644
index b1a786016a8e..000000000000
--- a/x11-wm/xmonad/xmonad-0.5-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# 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.5-r1.ebuild,v 1.4 2009/08/03 10:35:43 ssuominen Exp $
-
-CABAL_FEATURES="bin lib profile haddock"
-CABAL_MIN_VERSION=1.2
-
-inherit haskell-cabal
-
-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"
-IUSE=""
-
-DEPEND="dev-haskell/mtl
-	>=dev-haskell/x11-1.4
-	>=dev-lang/ghc-6.6"
-RDEPEND="${DEPEND}"
-
-SAMPLE_CONFIG="xmonad.hs"
-SAMPLE_CONFIG_LOC="man"
-
-src_unpack() {
-	unpack ${A}
-
-	# -Wall -Werror is really fragile.
-	# portage strips, packages should not do it themselves.
-	sed -i -e 's/-Wall -Werror -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."
-}
diff --git a/x11-wm/xmonad/xmonad-0.5.ebuild b/x11-wm/xmonad/xmonad-0.5.ebuild
deleted file mode 100644
index eb1dd930994c..000000000000
--- a/x11-wm/xmonad/xmonad-0.5.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# 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.5.ebuild,v 1.2 2009/08/03 10:35:43 ssuominen Exp $
-
-CABAL_FEATURES="bin lib profile haddock"
-CABAL_MIN_VERSION=1.2
-
-inherit haskell-cabal
-
-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"
-IUSE=""
-
-DEPEND="dev-haskell/mtl
-	>=dev-haskell/x11-1.4
-	>=dev-lang/ghc-6.6"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-
-	# -Wall -Werror is really fragile.
-	# portage strips, packages should not do it themselves.
-	sed -i -e 's/-Wall -Werror -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
-}
diff --git a/x11-wm/xmonad/xmonad-0.6.ebuild b/x11-wm/xmonad/xmonad-0.6.ebuild
deleted file mode 100644
index 2cdb799a4fc3..000000000000
--- a/x11-wm/xmonad/xmonad-0.6.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# 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.6.ebuild,v 1.3 2009/08/03 10:35:43 ssuominen Exp $
-
-CABAL_FEATURES="bin lib profile haddock"
-
-inherit haskell-cabal
-
-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"
-IUSE=""
-
-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."
-}
diff --git a/x11-wm/xmonad/xmonad-0.7.ebuild b/x11-wm/xmonad/xmonad-0.7.ebuild
deleted file mode 100644
index 6977b343de12..000000000000
--- a/x11-wm/xmonad/xmonad-0.7.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2010 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.5 2010/07/01 19:10:06 jer 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"
-IUSE=""
-
-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."
-}
diff --git a/x11-wm/xmonad/xmonad-0.8.ebuild b/x11-wm/xmonad/xmonad-0.8.ebuild
deleted file mode 100644
index e59d78095f72..000000000000
--- a/x11-wm/xmonad/xmonad-0.8.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2010 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.5 2010/07/01 19:10:06 jer Exp $
-
-CABAL_FEATURES="bin lib profile haddock"
-
-inherit base 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"
-IUSE=""
-
-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() {
-	base_src_unpack
-	sed -e 's/base >= 3/base < 4 \&\& >= 3/' -i "${S}/${PN}.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."
-}
diff --git a/x11-wm/xmonad/xmonad-0.8.1.ebuild b/x11-wm/xmonad/xmonad-0.9.2.ebuild
index 1bd1dd478084..1cd8d907dc0f 100644
--- a/x11-wm/xmonad/xmonad-0.8.1.ebuild
+++ b/x11-wm/xmonad/xmonad-0.9.2.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 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.4 2010/07/01 19:10:06 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/xmonad/xmonad-0.9.2.ebuild,v 1.1 2011/05/11 21:26:16 slyfox Exp $
 
-CABAL_FEATURES="bin lib profile haddock"
-inherit haskell-cabal eutils
+EAPI="3"
+
+CABAL_FEATURES="bin lib profile haddock hscolour"
+inherit base haskell-cabal
 
 DESCRIPTION="A tiling window manager"
 HOMEPAGE="http://xmonad.org"
@@ -11,18 +13,20 @@ SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~sparc x86"
+KEYWORDS="~amd64 ~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}"
+RDEPEND=">=dev-lang/ghc-6.6.1
+		dev-haskell/mtl[profile?]
+		>=dev-haskell/x11-1.5[profile?]"
+DEPEND="${RDEPEND}
+		>=dev-haskell/cabal-1.2"
 
 SAMPLE_CONFIG="xmonad.hs"
 SAMPLE_CONFIG_LOC="man"
 
+PATCHES=("${FILESDIR}/xmonad-0.9.2-unbreak-haddock.patch")
+
 src_install() {
 	cabal_src_install
 
@@ -35,14 +39,14 @@ src_install() {
 
 	doman man/xmonad.1
 
-	dodoc CONFIG README "${SAMPLE_CONFIG_LOC}/${SAMPLE_CONFIG}"
+	dodoc CONFIG README
 }
 
 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 "    /usr/share/${PF}/ghc-$(ghc-version)/${SAMPLE_CONFIG_LOC}/${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}"