Bump haskell-platform to 2012.2.0.0 and include previous 2011.4.0.0 version for ghc 7.0.4

(Portage version: 2.1.10.64/cvs/Linux x86_64)

4 files changed, 145 insertions, 5 deletions

diff --git a/dev-haskell/haskell-platform/ChangeLog b/dev-haskell/haskell-platform/ChangeLog
index 99bda06a617b..7c4fab2724c5 100644
--- a/dev-haskell/haskell-platform/ChangeLog
+++ b/dev-haskell/haskell-platform/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-haskell/haskell-platform
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haskell-platform/ChangeLog,v 1.6 2012/04/11 20:37:49 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haskell-platform/ChangeLog,v 1.7 2012/06/03 04:40:19 gienah Exp $
+
+*haskell-platform-2011.4.0.0 (03 Jun 2012)
+*haskell-platform-2012.2.0.0 (03 Jun 2012)
+
+  03 Jun 2012; Mark Wright <gienah@gentoo.org>
+  +haskell-platform-2011.4.0.0.ebuild, +haskell-platform-2012.2.0.0.ebuild,
+  metadata.xml:
+  Bump haskell-platform to 2012.2.0.0 and include previous 2011.4.0.0 version
+  for ghc 7.0.4
 
 *haskell-platform-2011.2.0.1-r2 (11 Apr 2012)
 
diff --git a/dev-haskell/haskell-platform/haskell-platform-2011.4.0.0.ebuild b/dev-haskell/haskell-platform/haskell-platform-2011.4.0.0.ebuild
new file mode 100644
index 000000000000..a2d8e4c492d2
--- /dev/null
+++ b/dev-haskell/haskell-platform/haskell-platform-2011.4.0.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haskell-platform/haskell-platform-2011.4.0.0.ebuild,v 1.1 2012/06/03 04:40:19 gienah Exp $
+
+EAPI=4
+
+DESCRIPTION="The Haskell Platform"
+HOMEPAGE="http://haskell.org/platform"
+SRC_URI=""
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="profile X"
+
+RDEPEND=">=dev-haskell/cgi-3001.1.7.4[profile?]
+		>=dev-haskell/deepseq-1.1.0.2[profile?]
+		>=dev-haskell/fgl-5.4.2.4[profile?]
+		>=dev-haskell/haskell-src-1.0.1.4[profile?]
+		>=dev-haskell/html-1.0.1.2[profile?]
+		>=dev-haskell/http-4000.1.2[profile?]
+		>=dev-haskell/hunit-1.2.4.2[profile?]
+		>=dev-haskell/mtl-2.0.1.0[profile?]
+		>=dev-haskell/network-2.3.0.5[profile?]
+		>=dev-haskell/parallel-3.1.0.1[profile?]
+		>=dev-haskell/parsec-3.1.1[profile?]
+		>=dev-haskell/quickcheck-2.4.1.1[profile?]
+		>=dev-haskell/regex-base-0.93.2[profile?]
+		>=dev-haskell/regex-compat-0.95.1[profile?]
+		>=dev-haskell/regex-posix-0.95.1[profile?]
+		>=dev-haskell/stm-2.2.0.1[profile?]
+		>=dev-haskell/syb-0.3.3[profile?]
+		>=dev-haskell/text-0.11.1.5[profile?]
+		>=dev-haskell/transformers-0.2.2.0[profile?]
+		>=dev-haskell/xhtml-3000.2.0.4[profile?]
+		>=dev-haskell/zlib-0.5.3.1[profile?]
+		X? (
+			>=dev-haskell/opengl-2.2.3.0[profile?]
+			>=dev-haskell/glut-2.1.2.1[profile?]
+		)
+		>=dev-lang/ghc-7.0.4
+
+		>=dev-haskell/alex-2.3.5
+		>=dev-haskell/cabal-1.10.2.0
+		>=dev-haskell/happy-1.18.6
+		>=dev-haskell/cabal-install-0.10.2
+		>=dev-haskell/hscolour-1.17
+		>=dev-haskell/haddock-2.9.2"
+
+DEPEND="${RDEPEND}"
+
+pkg_postinst() {
+	if ! use X; then
+		elog "The haskell platform includes the 3D graphics libraries opengl and glut."
+		elog "To install opengl and glut requires the X use flag."
+	fi
+}
diff --git a/dev-haskell/haskell-platform/haskell-platform-2012.2.0.0.ebuild b/dev-haskell/haskell-platform/haskell-platform-2012.2.0.0.ebuild
new file mode 100644
index 000000000000..e0124f794504
--- /dev/null
+++ b/dev-haskell/haskell-platform/haskell-platform-2012.2.0.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haskell-platform/haskell-platform-2012.2.0.0.ebuild,v 1.1 2012/06/03 04:40:19 gienah Exp $
+
+EAPI=4
+
+DESCRIPTION="The Haskell Platform"
+HOMEPAGE="http://haskell.org/platform"
+SRC_URI=""
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="profile X"
+
+RDEPEND=">=dev-haskell/cgi-3001.1.7.4[profile?]
+		>=dev-haskell/deepseq-1.3.0.0[profile?]
+		>=dev-haskell/fgl-5.4.2.4[profile?]
+		>=dev-haskell/glut-2.1.2.1[profile?]
+		>=dev-haskell/haskell-src-1.0.1.5[profile?]
+		>=dev-haskell/html-1.0.1.2[profile?]
+		>=dev-haskell/http-4000.2.3[profile?]
+		>=dev-haskell/hunit-1.2.4.2[profile?]
+		>=dev-haskell/mtl-2.1.1[profile?]
+		>=dev-haskell/network-2.3.0.13[profile?]
+		>=dev-haskell/opengl-2.2.3.1[profile?]
+		>=dev-haskell/parallel-3.2.0.2[profile?]
+		>=dev-haskell/parsec-3.1.2[profile?]
+		>=dev-haskell/quickcheck-2.4.2[profile?]
+		>=dev-haskell/random-1.0.1.1[profile?]
+		>=dev-haskell/regex-base-0.93.2[profile?]
+		>=dev-haskell/regex-compat-0.95.1[profile?]
+		>=dev-haskell/regex-posix-0.95.1[profile?]
+		>=dev-haskell/stm-2.3[profile?]
+		>=dev-haskell/syb-0.3.6.1[profile?]
+		>=dev-haskell/text-0.11.2.0[profile?]
+		>=dev-haskell/transformers-0.3.0.0[profile?]
+		>=dev-haskell/xhtml-3000.2.1[profile?]
+		>=dev-haskell/zlib-0.5.3.3[profile?]
+		X? (
+			>=dev-haskell/opengl-2.2.3.1[profile?]
+			>=dev-haskell/glut-2.1.2.1[profile?]
+		)
+		>=dev-lang/ghc-7.4.1
+
+		>=dev-haskell/alex-3.0.1
+		>=dev-haskell/cabal-1.14.0
+		>=dev-haskell/happy-1.18.9
+		>=dev-haskell/cabal-install-0.14.0
+		>=dev-haskell/hscolour-1.19
+		>=dev-haskell/haddock-2.10.0"
+
+DEPEND="${RDEPEND}"
+
+pkg_postinst() {
+	if ! use X; then
+		elog "The haskell platform includes the 3D graphics libraries opengl and glut."
+		elog "To install opengl and glut requires the X use flag."
+	fi
+}
diff --git a/dev-haskell/haskell-platform/metadata.xml b/dev-haskell/haskell-platform/metadata.xml
index 8c66906af531..244c61dc3b88 100644
--- a/dev-haskell/haskell-platform/metadata.xml
+++ b/dev-haskell/haskell-platform/metadata.xml
@@ -1,8 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>haskell</herd>
-<maintainer>
-  <email>haskell@gentoo.org</email>
-</maintainer>
+	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+	</maintainer>
+	<longdescription>
+		The Haskell Platform (HP) is the blessed set of libraries and tools on
+		which to build further Haskell libraries and applications. It is
+		intended to provide a comprehensive, stable, and quality tested base for
+		Haskell projects to work from.
+		
+		This version specifies the following additional developer tools be
+		installed, for a system to be in full compliance:
+		
+		* cabal-install
+		* alex
+		* happy
+		* haddock
+	</longdescription>
 </pkgmetadata>