Work on the x11-wm/xmonad ebuilds (bump and patch).

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

4 files changed, 80 insertions, 8 deletions

diff --git a/x11-wm/xmonad/ChangeLog b/x11-wm/xmonad/ChangeLog
index 8f73c1f5d200..56a3835b3ecf 100644
--- a/x11-wm/xmonad/ChangeLog
+++ b/x11-wm/xmonad/ChangeLog
@@ -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@gentoo.org> 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@gentoo.org> +xmonad-0.8.1.ebuild:
+  Version bump (compatibility with ghc-6.10).
 
   21 Jul 2009; <chainsaw@gentoo.org> xmonad-0.8.ebuild:
   Marked stable on AMD64 as requested by Lennart Kolmodin
diff --git a/x11-wm/xmonad/Manifest b/x11-wm/xmonad/Manifest
index a07f525a69d4..b2977bf7067b 100644
--- a/x11-wm/xmonad/Manifest
+++ b/x11-wm/xmonad/Manifest
@@ -5,18 +5,20 @@ AUX xmonad.desktop 148 RMD160 90d2f6277535b1a6b2ad0270d5b2361e9c5ffe78 SHA1 b9f2
 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
 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
 EBUILD xmonad-0.7.ebuild 1851 RMD160 8e9f6e9318b741b14eead6cac524b9f8b096b2a0 SHA1 8b2d2921d725311f2f980836cd30b90e169806d4 SHA256 6243c60ed352fc7f5c1b5c36f65695d89c7e0a384b9d6264ac49900492d3caf6
-EBUILD xmonad-0.8.ebuild 1725 RMD160 553c8c979bcda5a002c336b0fc715c6daebb6e68 SHA1 3b0b3122b005066cf646920425c0fa294d71f98e SHA256 873188b8b8f27821d49d2b161a5cd1cbef0d5a61f20b7f13594f30b04bb809a3
-MISC ChangeLog 1537 RMD160 0dcc05ed152e31b0207908d99290f832b8b54382 SHA1 f4d1951f1a7a7f73dad6877793764ba4d3d71895 SHA256 9434fc2b083a9380ea3614278ff37ef1cb29f305dcd42c95e6cf7e9bc19dac0f
+EBUILD xmonad-0.8.1.ebuild 1718 RMD160 f977148fbe0974d8c50913129d3c161abcf3aaae SHA1 ca0105a3c74bfb2967e6f21e7c02b04af80462c2 SHA256 b0e2dbd8701f20d70de322d3e38e2c32cb08de87ce760b8720428022f28b29e7
+EBUILD xmonad-0.8.ebuild 1829 RMD160 40cf1f6f778727b548d2aef057d8ad5e055f4620 SHA1 ac570cc4262fcbdd36438b7cfdd4c566a6acdb51 SHA256 1811ebbf9906f0060408f867861e287230cd61ea7ff56b0acac3d1f8bf5fe70f
+MISC ChangeLog 1805 RMD160 6c0da09d274c0c91c03c0743be724d95a350d156 SHA1 ad3d075dadcb3bdbea38c96e8e36e624cdcc8a3c SHA256 4e90988ae9930cf080e3a4bc28d14af516fd73d35ff22c4f2a96f15de4127207
 MISC metadata.xml 223 RMD160 7783e6057effb8b8f0b79cffe8b557b32c633839 SHA1 7b962c77f2e38479a9d1621ec8d307ca9f761753 SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkpl8EYACgkQp5vW4rUFj5pL6gCfUimKtwepVq2SVqBYdGPCH1Rq
-YfUAoK4JmzE//XxxgBpnbLzVxm3j6os8
-=LKq2
+iEYEARECAAYFAkpzKmoACgkQ1n/CYbXjntI9owCfZbk5x6JkO6hi6ADfCNEllYzK
+eb8AniqUskKGzYUnzY9rL7xlWfvm9PlP
+=TFpy
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/xmonad/xmonad-0.8.1.ebuild b/x11-wm/xmonad/xmonad-0.8.1.ebuild
new file mode 100644
index 000000000000..fc8042b0d985
--- /dev/null
+++ b/x11-wm/xmonad/xmonad-0.8.1.ebuild
@@ -0,0 +1,57 @@
+# 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."
+}
diff --git a/x11-wm/xmonad/xmonad-0.8.ebuild b/x11-wm/xmonad/xmonad-0.8.ebuild
index 9c5b55dbb777..1ac3d26647c7 100644
--- a/x11-wm/xmonad/xmonad-0.8.ebuild
+++ b/x11-wm/xmonad/xmonad-0.8.ebuild
@@ -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 @@ 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