Version bump. Drop old.

(Portage version: 2.1.9.48/cvs/Linux x86_64)

8 files changed, 58 insertions, 315 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/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}"