9 files changed, 44 insertions, 223 deletions
diff --git a/dev-haskell/x11/ChangeLog b/dev-haskell/x11/ChangeLog
index 66d2290bdfd2..315b72d8ab18 100644
--- a/dev-haskell/x11/ChangeLog
+++ b/dev-haskell/x11/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-haskell/x11
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/x11/ChangeLog,v 1.21 2010/07/01 19:59:30 jer Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/x11/ChangeLog,v 1.22 2011/05/11 21:07:29 slyfox Exp $
+
+*x11-1.5.0.0 (11 May 2011)
+
+  11 May 2011; Sergei Trofimovich <slyfox@gentoo.org> -x11-1.2.ebuild,
+  -x11-1.2.1.ebuild, -x11-1.2.2.ebuild, -x11-1.4.0.ebuild, -x11-1.4.1.ebuild,
+  -x11-1.4.2.ebuild, -x11-1.4.5.ebuild, +x11-1.5.0.0.ebuild:
+  Version bump. Removed ancient ones.
 
   01 Jul 2010; Jeroen Roovers <jer@gentoo.org> x11-1.4.2.ebuild,
   x11-1.4.5.ebuild, x11-1.4.6.1.ebuild:
diff --git a/dev-haskell/x11/x11-1.2.1.ebuild b/dev-haskell/x11/x11-1.2.1.ebuild
deleted file mode 100644
index 141613c8d422..000000000000
--- a/dev-haskell/x11/x11-1.2.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/x11/x11-1.2.1.ebuild,v 1.4 2008/05/25 11:14:18 kolmodin Exp $
-
-CABAL_FEATURES="lib profile haddock"
-inherit haskell-cabal
-
-MY_PN=X11
-GHC_PV=6.6.1
-
-DESCRIPTION="X11 bindings for haskell"
-HOMEPAGE="http://haskell.org/ghc/"
-SRC_URI="http://www.haskell.org/ghc/dist/${GHC_PV}/ghc-${GHC_PV}-src-extralibs.tar.bz2"
-LICENSE="BSD"
-SLOT="0"
-
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-DEPEND=">=dev-lang/ghc-6.4
-		x11-libs/libX11"
-
-S="${WORKDIR}/ghc-${GHC_PV}/libraries/${MY_PN}"
-
-# Sadly Setup.hs in the ghc-6.6.1 extralibs was not tested with Cabal-1.1.6.x
-src_unpack() {
-	unpack ${A}
-	sed -i -e "/type Hook/ s/UserHooks/Maybe UserHooks/" "${S}/Setup.hs"
-}
diff --git a/dev-haskell/x11/x11-1.2.2.ebuild b/dev-haskell/x11/x11-1.2.2.ebuild
deleted file mode 100644
index feadcc5d6c3e..000000000000
--- a/dev-haskell/x11/x11-1.2.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/x11/x11-1.2.2.ebuild,v 1.2 2007/07/25 18:38:18 dcoutts Exp $
-
-CABAL_FEATURES="lib profile haddock"
-inherit haskell-cabal
-
-MY_PN=X11
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="X11 bindings for haskell"
-HOMEPAGE="http://haskell.org/ghc/"
-SRC_URI="http://hackage.haskell.org/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-DEPEND=">=dev-lang/ghc-6.4
-		>=dev-haskell/cabal-1.1.6
-		x11-libs/libX11"
-# tested with ghc-6.6 and ghc-6.6.1. probably works with ghc-6.4 too
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/x11/x11-1.2.ebuild b/dev-haskell/x11/x11-1.2.ebuild
deleted file mode 100644
index 1aba8590f34d..000000000000
--- a/dev-haskell/x11/x11-1.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/x11/x11-1.2.ebuild,v 1.2 2007/07/25 18:38:18 dcoutts Exp $
-
-CABAL_FEATURES="lib profile haddock"
-inherit haskell-cabal
-
-MY_PN=X11
-GHC_PV=6.6
-
-DESCRIPTION="X11 bindings for haskell"
-HOMEPAGE="http://haskell.org/ghc/"
-SRC_URI="http://www.haskell.org/ghc/dist/${GHC_PV}/ghc-${GHC_PV}-src-extralibs.tar.bz2"
-LICENSE="BSD"
-SLOT="0"
-
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-DEPEND=">=dev-lang/ghc-6.4
-		x11-libs/libX11"
-
-S="${WORKDIR}/ghc-${GHC_PV}/libraries/${MY_PN}"
diff --git a/dev-haskell/x11/x11-1.4.0.ebuild b/dev-haskell/x11/x11-1.4.0.ebuild
deleted file mode 100644
index eb868cbe1ee2..000000000000
--- a/dev-haskell/x11/x11-1.4.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/x11/x11-1.4.0.ebuild,v 1.3 2008/05/25 11:14:18 kolmodin Exp $
-
-CABAL_FEATURES="lib profile haddock"
-CABAL_MIN_VERSION=1.2.3.0
-inherit haskell-cabal eutils autotools
-
-MY_PN="X11"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A binding to the X11 graphics library"
-HOMEPAGE="http://darcs.haskell.org/X11"
-SRC_URI="http://hackage.haskell.org/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
-IUSE="xinerama"
-
-DEPEND=">=dev-lang/ghc-6.4.2
-		x11-libs/libX11
-		xinerama? ( x11-libs/libXinerama )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack $A
-
-	cd "${S}"
-	epatch "${FILESDIR}/${PN}-1.4.2-with-xinerama.patch"
-	eautoreconf
-}
-
-src_compile() {
-	CABAL_CONFIGURE_FLAGS="--configure-option=$(use_with xinerama)"
-	cabal_src_compile
-}
diff --git a/dev-haskell/x11/x11-1.4.1.ebuild b/dev-haskell/x11/x11-1.4.1.ebuild
deleted file mode 100644
index 09aebf0597b9..000000000000
--- a/dev-haskell/x11/x11-1.4.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/x11/x11-1.4.1.ebuild,v 1.2 2008/05/25 11:14:18 kolmodin Exp $
-
-CABAL_FEATURES="lib profile haddock"
-CABAL_MIN_VERSION=1.2.3.0
-inherit haskell-cabal eutils autotools
-
-MY_PN="X11"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A binding to the X11 graphics library"
-HOMEPAGE="http://darcs.haskell.org/X11"
-SRC_URI="http://hackage.haskell.org/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
-IUSE="xinerama"
-
-DEPEND=">=dev-lang/ghc-6.4.2
-		x11-libs/libX11
-		xinerama? ( x11-libs/libXinerama )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack $A
-
-	cd "${S}"
-	epatch "${FILESDIR}/${PN}-1.4.2-with-xinerama.patch"
-	eautoreconf
-}
-
-src_compile() {
-	CABAL_CONFIGURE_FLAGS="--configure-option=$(use_with xinerama)"
-	cabal_src_compile
-}
diff --git a/dev-haskell/x11/x11-1.4.2.ebuild b/dev-haskell/x11/x11-1.4.2.ebuild
deleted file mode 100644
index 43fd099a3b6c..000000000000
--- a/dev-haskell/x11/x11-1.4.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/x11/x11-1.4.2.ebuild,v 1.7 2010/07/01 19:59:30 jer Exp $
-
-CABAL_FEATURES="lib profile haddock"
-inherit haskell-cabal eutils autotools
-
-MY_PN="X11"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A binding to the X11 graphics library"
-HOMEPAGE="http://darcs.haskell.org/X11"
-SRC_URI="http://hackage.haskell.org/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~sparc x86"
-IUSE="xinerama"
-
-DEPEND=">=dev-lang/ghc-6.4.2
-		>=dev-haskell/cabal-1.2.3.0
-		x11-libs/libX11
-		xinerama? ( x11-libs/libXinerama )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack $A
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-with-xinerama.patch"
-	eautoreconf
-}
-
-src_compile() {
-	CABAL_CONFIGURE_FLAGS="--configure-option=$(use_with xinerama)"
-	cabal_src_compile
-}
diff --git a/dev-haskell/x11/x11-1.4.5.ebuild b/dev-haskell/x11/x11-1.4.5.ebuild
deleted file mode 100644
index 7e8c89d70546..000000000000
--- a/dev-haskell/x11/x11-1.4.5.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/x11/x11-1.4.5.ebuild,v 1.3 2010/07/01 19:59:30 jer Exp $
-
-CABAL_FEATURES="lib profile haddock"
-inherit haskell-cabal eutils
-
-MY_PN="X11"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A binding to the X11 graphics library"
-HOMEPAGE="http://darcs.haskell.org/X11"
-SRC_URI="http://hackage.haskell.org/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
-IUSE="xinerama"
-
-RDEPEND=">=dev-lang/ghc-6.4.2
-		x11-libs/libX11
-		xinerama? ( x11-libs/libXinerama )"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.2.3.0"
-
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
-	CABAL_CONFIGURE_FLAGS="--configure-option=$(use_with xinerama)"
-	cabal_src_compile
-}
diff --git a/dev-haskell/x11/x11-1.5.0.0.ebuild b/dev-haskell/x11/x11-1.5.0.0.ebuild
new file mode 100644
index 000000000000..efcb6c8be06b
--- /dev/null
+++ b/dev-haskell/x11/x11-1.5.0.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/x11/x11-1.5.0.0.ebuild,v 1.1 2011/05/11 21:07:29 slyfox Exp $
+
+# ebuild generated by hackport 0.2.13
+
+EAPI="3"
+
+CABAL_FEATURES="lib profile haddock hscolour"
+inherit haskell-cabal
+
+MY_PN="X11"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A binding to the X11 graphics library"
+HOMEPAGE="http://code.haskell.org/X11"
+SRC_URI="http://hackage.haskell.org/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x86-linux"
+IUSE="xinerama"
+
+RDEPEND="dev-haskell/syb
+		>=dev-lang/ghc-6.8.2
+		x11-libs/libX11
+		xinerama? ( x11-libs/libXinerama )"
+DEPEND="${RDEPEND}
+		>=dev-haskell/cabal-1.2"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	cabal_src_configure --configure-option=$(use_with xinerama)
+}