Version bump.

(Portage version: 2.2.10_p15/cvs/Linux x86_64, signed Manifest commit with key 611FF3AA)

9 files changed, 51 insertions, 232 deletions

diff --git a/dev-haskell/x11/ChangeLog b/dev-haskell/x11/ChangeLog
index b1e16da47841..fcee4601b9c6 100644
--- a/dev-haskell/x11/ChangeLog
+++ b/dev-haskell/x11/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-haskell/x11
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/x11/ChangeLog,v 1.33 2014/01/11 15:20:19 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/x11/ChangeLog,v 1.34 2014/05/10 11:51:03 slyfox Exp $
+
+*x11-1.6.1.2 (10 May 2014)
+
+  10 May 2014; Sergei Trofimovich <slyfox@gentoo.org> +x11-1.6.1.2.ebuild,
+  -files/x11-1.4.2-with-xinerama.patch, -x11-1.4.6.1.ebuild,
+  -x11-1.5.0.0-r1.ebuild, -x11-1.5.0.0.ebuild, -x11-1.5.0.1.ebuild,
+  -x11-1.6.0.2-r1.ebuild, -x11-1.6.0.2.ebuild:
+  Version bump.
 
   11 Jan 2014; Sergei Trofimovich <slyfox@gentoo.org> x11-1.6.1.1.ebuild:
   Raise lower bound up to ghc-7.4 (uses 'void' from Control.Monad). Bug #485200
diff --git a/dev-haskell/x11/files/x11-1.4.2-with-xinerama.patch b/dev-haskell/x11/files/x11-1.4.2-with-xinerama.patch
deleted file mode 100644
index 97efd70c60d7..000000000000
--- a/dev-haskell/x11/files/x11-1.4.2-with-xinerama.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-This makes both --with-xinerama and --without-xinerama work.
-
---- old-X11-1.4.2/configure.ac	2008-05-24 13:25:52.000000000 +0200
-+++ new-X11-1.4.2/configure.ac	2008-05-24 13:25:52.000000000 +0200
-@@ -56,11 +56,11 @@
- AC_MSG_CHECKING([whether to build Xinerama])
- AC_ARG_WITH(xinerama,
-             AS_HELP_STRING([--without-xinerama], [do not build Xinerama support]),
--            want_xinerama=no,
--            want_xinerama=yes)
--AC_MSG_RESULT([$want_xinerama])
-+            [],
-+            [with_xinerama=yes])
-+AC_MSG_RESULT([$with_xinerama])
- 
--if test "$want_xinerama" = yes; then
-+if test "$with_xinerama" = yes; then
-     AC_CHECK_HEADERS([X11/extensions/Xinerama.h], [have_xinerama=yes])
-     if test "$have_xinerama" = yes; then
-         EXTRA_LIBRARIES="extra-libraries: Xinerama Xext"
-
diff --git a/dev-haskell/x11/x11-1.4.6.1.ebuild b/dev-haskell/x11/x11-1.4.6.1.ebuild
deleted file mode 100644
index 46cebf26bb22..000000000000
--- a/dev-haskell/x11/x11-1.4.6.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/x11/x11-1.4.6.1.ebuild,v 1.8 2012/09/12 14:44:14 qnikst 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="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="xinerama"
-
-RDEPEND=">=dev-lang/ghc-6.8
-		x11-libs/libX11
-		xinerama? ( x11-libs/libXinerama )"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.2"
-
-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-r1.ebuild b/dev-haskell/x11/x11-1.5.0.0-r1.ebuild
deleted file mode 100644
index 0297428b32d4..000000000000
--- a/dev-haskell/x11/x11-1.5.0.0-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2012 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-r1.ebuild,v 1.3 2012/09/12 14:44:14 qnikst 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="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86 ~amd64-linux ~ppc64 ~ppc-macos ~x86-linux"
-IUSE="+xinerama"
-
-RDEPEND="dev-haskell/syb[profile?]
-		>=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)
-}
diff --git a/dev-haskell/x11/x11-1.5.0.0.ebuild b/dev-haskell/x11/x11-1.5.0.0.ebuild
deleted file mode 100644
index a7f777499869..000000000000
--- a/dev-haskell/x11/x11-1.5.0.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2012 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.3 2012/09/12 14:44:14 qnikst 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="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86 ~amd64-linux ~ppc64 ~ppc-macos ~x86-linux"
-IUSE="xinerama"
-
-RDEPEND="dev-haskell/syb[profile?]
-		>=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)
-}
diff --git a/dev-haskell/x11/x11-1.5.0.1.ebuild b/dev-haskell/x11/x11-1.5.0.1.ebuild
deleted file mode 100644
index f99aa1038730..000000000000
--- a/dev-haskell/x11/x11-1.5.0.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2012 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.1.ebuild,v 1.4 2012/12/16 18:51:52 ago Exp $
-
-# ebuild generated by hackport 0.2.13
-
-EAPI="4"
-
-CABAL_FEATURES="lib profile haddock hscolour hoogle"
-inherit haskell-cabal
-
-MY_PN="X11"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A binding to the X11 graphics library"
-HOMEPAGE="https://github.com/haskell-pkg-janitors/X11"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="xinerama"
-
-RDEPEND="dev-haskell/syb[profile?]
-		>=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)
-}
diff --git a/dev-haskell/x11/x11-1.6.0.2-r1.ebuild b/dev-haskell/x11/x11-1.6.0.2-r1.ebuild
deleted file mode 100644
index 972bd7a654ce..000000000000
--- a/dev-haskell/x11/x11-1.6.0.2-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/x11/x11-1.6.0.2-r1.ebuild,v 1.1 2013/02/09 19:07:22 slyfox Exp $
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.1
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="X11"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A binding to the X11 graphics library"
-HOMEPAGE="https://github.com/haskell-pkg-janitors/X11"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~sparc ~x86 ~amd64-linux ~ppc64 ~ppc-macos ~x86-linux"
-IUSE="xinerama"
-
-RDEPEND="dev-haskell/syb[profile?]
-		>=dev-lang/ghc-6.10.4:=
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXrandr
-		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)
-}
diff --git a/dev-haskell/x11/x11-1.6.0.2.ebuild b/dev-haskell/x11/x11-1.6.0.2.ebuild
deleted file mode 100644
index ef3f7ce70d52..000000000000
--- a/dev-haskell/x11/x11-1.6.0.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/x11/x11-1.6.0.2.ebuild,v 1.1 2013/01/01 08:15:43 qnikst Exp $
-
-EAPI=4
-
-# ebuild generated by hackport 0.2.18.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="X11"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A binding to the X11 graphics library"
-HOMEPAGE="https://github.com/haskell-pkg-janitors/X11"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86 ~amd64-linux ~ppc64 ~ppc-macos ~x86-linux"
-IUSE="xinerama"
-
-RDEPEND="dev-haskell/syb[profile?]
-		>=dev-lang/ghc-6.8.2
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXrandr
-		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)
-}
diff --git a/dev-haskell/x11/x11-1.6.1.2.ebuild b/dev-haskell/x11/x11-1.6.1.2.ebuild
new file mode 100644
index 000000000000..7fb034d924a5
--- /dev/null
+++ b/dev-haskell/x11/x11-1.6.1.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/x11/x11-1.6.1.2.ebuild,v 1.1 2014/05/10 11:51:03 slyfox Exp $
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+MY_PN="X11"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A binding to the X11 graphics library"
+HOMEPAGE="https://github.com/haskell-pkg-janitors/X11"
+SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="+screensaver +xinerama"
+
+RDEPEND="dev-haskell/data-default:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrandr
+		screensaver? ( x11-libs/libXScrnSaver )
+		xinerama? ( x11-libs/libXinerama )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.2
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--configure-option=$(use_with xinerama) \
+		--configure-option=$(use_with screensaver xscreensaver)
+}