summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Trofimovich <slyfox@gentoo.org>2014-05-10 11:52:49 +0000
committerSergei Trofimovich <slyfox@gentoo.org>2014-05-10 11:52:49 +0000
commitc05f4668d82b3e335f518047255f5936aa6dcde4 (patch)
treedc7bf5e5de31363d7f3cfcafd9d3e19cb4639d90 /dev-haskell/x11
parentAllow Cabal-1.20. (diff)
downloadhistorical-c05f4668d82b3e335f518047255f5936aa6dcde4.tar.gz
historical-c05f4668d82b3e335f518047255f5936aa6dcde4.tar.bz2
historical-c05f4668d82b3e335f518047255f5936aa6dcde4.zip
Version bump.
Package-Manager: portage-2.2.10_p15/cvs/Linux x86_64 Manifest-Sign-Key: 0x611FF3AA
Diffstat (limited to 'dev-haskell/x11')
-rw-r--r--dev-haskell/x11/ChangeLog10
-rw-r--r--dev-haskell/x11/Manifest21
-rw-r--r--dev-haskell/x11/files/x11-1.4.2-with-xinerama.patch21
-rw-r--r--dev-haskell/x11/x11-1.4.6.1.ebuild31
-rw-r--r--dev-haskell/x11/x11-1.5.0.0-r1.ebuild35
-rw-r--r--dev-haskell/x11/x11-1.5.0.0.ebuild35
-rw-r--r--dev-haskell/x11/x11-1.5.0.1.ebuild35
-rw-r--r--dev-haskell/x11/x11-1.6.0.2-r1.ebuild37
-rw-r--r--dev-haskell/x11/x11-1.6.0.2.ebuild37
-rw-r--r--dev-haskell/x11/x11-1.6.1.2.ebuild42
10 files changed, 57 insertions, 247 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/Manifest b/dev-haskell/x11/Manifest
index e02675c3f4d1..d9b87582e42f 100644
--- a/dev-haskell/x11/Manifest
+++ b/dev-haskell/x11/Manifest
@@ -1,25 +1,16 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
-AUX x11-1.4.2-with-xinerama.patch 800 SHA256 8132b3074e80d45c913a6ceafdd601cd569e5a69f10fc00e1eada40f8d460243 SHA512 a2787f3f39807a14e55d7dc38d8a6b412f1c01fde7572f9e0705c8d044af150d6776ee3e95e1c0a22ebe4521d87280ff5e0d435217b8792e00144e4320c086e0 WHIRLPOOL c4c43b06a2cb8e66b6b8acc6a73750815984bf15ea17a61136bb48e77688ed77188d26db8fadf7b506459ce927ea2ac40d930cd1b857df54e1ca936abfcd1a18
-DIST X11-1.4.6.1.tar.gz 175567 SHA256 3e1375d4e53a8366fa2ea12bd9c3033ffe2f7dd00443acd84f722cf0dfff0fa9 SHA512 9dc4c8c2a3d38fa70a297758fc8cb6e711dd33b1ce6f4bd4263dd7fcb36a09f2012ff7a3ac80476ca77357f1648f08b9dfa93928a968192e2175d7b72b04aec5 WHIRLPOOL 40f40b53075f1a7cc5b09b7221a5ec595b7198960cb2e263565262203c7552d11ccb5ddda3ac15b93ae96a7b3515d4c4851b04d86e0a15fbfba6f0c8f70bf8ee
-DIST X11-1.5.0.0.tar.gz 178211 SHA256 653ff8aa4053574a36dbb1729459df6e5a1a87a223bc3eeced8e40c6e3a5406f SHA512 dc097012c09c19a7dbb42711fd0cd54c84e98cb3bc150d77a7470c63912908d3241079a87ca3797cae36b00fa2d52c9e6db33287e9d44dc58a43f1b85ee33518 WHIRLPOOL 18ad7d3d657614f88b579721487b187c99435e68023ab830c4beed5894cf741625a8548b8c148ffc5c6aea7af7d36082b77bf23a408747b27c676303928b93a8
-DIST X11-1.5.0.1.tar.gz 176346 SHA256 29c07a609cc4943e743ce68a99b8d4c089e66a74a55ac76b88464fba211d1369 SHA512 de3e32543fcdcf86aa14443aea02a6862ed39cdbaaf732cee325155af2e84570a9cbdbb9da69ab247bfcdc8e475b9d3b7c678f9e7b3e996370bbbb9b1aacabce WHIRLPOOL 5f21733990e2ab9737d9d92b2824b0d0d6187088956c1b44b13a691632be29fd663b2c03c78a8bdf026f8695ab2e5d6f9e4ffb1fee0d59c3616c5b215941e12a
-DIST X11-1.6.0.2.tar.gz 179112 SHA256 1c6a7823155bf251c4676981a1370b61af112e77d7f82f744c6bae2fe6482f7c SHA512 753bf147b1933e4c52f087d52ec90d3f2fb8764947abec4908b4fb0ff817f67395f174983054312d67e7175d34a73ff84661343a25a0eb71082391a16b9bceab WHIRLPOOL b0e3ba7211d0591b5ae8060c1e88078736c123ab3c700ec833139e860267e8c0746242fba61e64ae538069dc6b49c9c5d253eb97af64cff758818bc1d5c90b10
DIST X11-1.6.1.1.tar.gz 188628 SHA256 7ce575c613786c73efb20d5680a9e572aa1f1c91c3963e285011235759b76eae SHA512 d5f58a7ab2450e145e890187e8dc7b43e286d2a95414a605e549cbf48568ef0d89f662870b2010eecba3b8fdd2a3a57214d33fc8775426e7e23ffad727b4e144 WHIRLPOOL 30027638eb419052d8497594a64fdbcb2bc6d90de95d6ae869a03ee8a1ce3d8aa8d5064c1d10636c203f5e992c6389cfde67865d402d00beb532b9bf94b9d98b
-EBUILD x11-1.4.6.1.ebuild 846 SHA256 4e9b6900f8cc320b8f1c645202035de5bdb528400e04ea0f701cf8f15ab6ba37 SHA512 5cfd8088095578119baeaa062b1c7cce1157b5c5af67f5f3ff6ef73f02d513d66500761324e7a3cc364cb590e185f7fe8f8c0d6cf13c1c5e17c55905705cb731 WHIRLPOOL 49170e992558cd892cd99d60ae4a2bdd9f59a1d949cbda5beb94ff053043f0829bd38b56c76fe6f27308a4c35eeb8f83635be37139357798feb20ecd2eca24c8
-EBUILD x11-1.5.0.0-r1.ebuild 918 SHA256 aa9ff39f4f497455ff7a12eb9ae26d3c780a000d0b5f1061813005bf28f42be8 SHA512 30cf437627791ecae122f86520647e87e8a05ad93dd9128d4121aff5009287864b137a1a4db950197a8695e5b5dabb10ec9747e2c91132dc0e041b9e47fc4071 WHIRLPOOL d8abe85bc24be5d4a19832a5ed8d94bcec1f788d9db619e081d3258ebffe47dab4b174d86db93342c871487e8b8095f64b89eb51c3e6945a469e3cef6a16bd0d
-EBUILD x11-1.5.0.0.ebuild 914 SHA256 f61dcd86f56a0b7549965bb8a98ff0089f2622d62cad4d919382d2ef3521be63 SHA512 5183a26728db184603dcb61fafacc0605a5e9f3b8b8685a2e93d414963b39c1c1076d5b3e9d72108140ccae22566d1d8f28100f634269e6c4e12460325c727a0 WHIRLPOOL 5da06f06b067762365379492f49ddc80baf4af6272f9eb3c193a834e64763a7c56ce16fb3f34f40ee546d5e2e1b16cbc7c6bbab1fd9299408ca741d9cf0be30a
-EBUILD x11-1.5.0.1.ebuild 932 SHA256 fe03fca4572d13aad63f7dde586f127cd054ad956901ec8f19101b91fb403e09 SHA512 20bcc41cbc960f89816134c08534e742017b677417fb26a98b469ac8a0edfdc27794605c773f0acc609ee04142c41feec2dad8023aab0e53233908c08f6753cc WHIRLPOOL c59766e1a83af9edb5395e15a657e30b2fb8faad1aea4778a6be41051779e8a45d2e5f638e4d9d79f989f048410d5a1dadae8d49571ff19d720a863584835fec
-EBUILD x11-1.6.0.2-r1.ebuild 986 SHA256 1dabfad37dc8c3f1db6200cf5d7b94e32a8c9641ce49bc93ee7256980f10d051 SHA512 dcf516a89be76724ff04ce712b3b74de4099652882dad2afdf4bc1fd1c198d7ca417133aecbd9aeab1cb0d1cf04be45f52cb69c7051cc6042d0ae27328309f83 WHIRLPOOL 5dfd88a2a12eda89d940cd8e9e23c88ff4e13b60c14594196cb4ec679f1db713c6d871ae12c66bb479b92ad3f849bf637663c27e03b6689351a113874b4dfc36
-EBUILD x11-1.6.0.2.ebuild 980 SHA256 bfcc21aaebf06cd1e73bff9a0f1d371322f95a34e3f0d2951bf69897c9a6d1f9 SHA512 02325a059ad7a394f97b9a654289b9b8b196536a4b6dd285d3813fde827232863c35b02239aa87719daec60784a1238cd1ea5d8373a1a031d931f3f003e0c668 WHIRLPOOL 8deec9922d9803794583ff92693f48689f84ce5ef9d5593c9ae6ba3ee820e06cd2312cb09c29cdd555c7c26d18eac2102029cb7b733f5f3e26469bc896067f0f
+DIST X11-1.6.1.2.tar.gz 188612 SHA256 5216d485f807bd53bf34fba170896a8930290a6ac28b8e611c28e751ad67f2cf SHA512 f8d01c806f59a20ad6d6632367b80ca972ebc2df9ba65fe23338d5fa1b933049c08609d25be690d87ba6dbe9cd1ba0f5a95e491c8abaca9eaec078ca03e0e01b WHIRLPOOL 03a22e04df736590336cb805e23505b9dd1c64e9bb8171af3e1b9ce82648a39b3f4f288475c680b11732af54eedf1671c17b0d5fab91bcdd7c3202198c0130e0
EBUILD x11-1.6.1.1.ebuild 1120 SHA256 f892badbf6553c76524b16240882ec68b93e11b1c0fdd1a6b5a09d9070bd0f9d SHA512 afa494afe5b43caa5f5a6f3193ba3468e4a5c792b16f7ab5088ad34de5fb1e3d36e9a3ba22c1efbf05dff977c161ef83ebdb94de9e4c8a6e37f0874b69400042 WHIRLPOOL 62f63a39a7d4e5faa34d34488989f12945c55c9d427ddccde137b41a965e067938f87f227721553bb49a98d2d3804a09432430ad2ec30e06967adf6158df06b2
-MISC ChangeLog 4938 SHA256 e67955aae4a8e72be0702687a2e651f435e755a4f6e829b367bba51c55bdd082 SHA512 2af4b337a0ae0334130e439130569210c97cc86ef2265cbb61c86654fc22717f995a7fd7194c74aa77369c5b2df6fe541f90f26e8cb2726dacc817bb9198d34c WHIRLPOOL 3f98de1f2bd949f9f88eda8ef90d81fb602f7f355aa925f9b00c6da9225ff1dac998e246858f04c505721bc3921cbef778820c7071b4580a0e1abcd99c57e4d2
+EBUILD x11-1.6.1.2.ebuild 1121 SHA256 3b95aed278e208f881adb0e8a44824914cdfe71e0b464b0c30aa244b8a536def SHA512 503adccee97d73b7718cd6c324ffc9230c84032f5f831cde8c9e4eae045c4a47dc8062cb5182184b5c1c1add9b4a63078bc8208a6210a438f6cca4b111fd409d WHIRLPOOL f76b8582468723a2cd964350c54c1af2902a3663264f7c35770670effd6c2347180b0c7e239e35137c79eccc15221f493c6e76a28aefb22958da90796edc35be
+MISC ChangeLog 5234 SHA256 7ba5f4bce92372328ffd09240e109bba3677814344819a1a5782b3d562f58107 SHA512 85f5c934dd9a23cd63ee63af26f47cd5ca37353457cfb2c5f210dca214c1fa999aeb0d9b79c542af8135ce485ceb75fd5ecfd365de3124a20ebc3959897c5285 WHIRLPOOL 6796cea63d201c185734cbd01350f34f4f5ec07ed05dca6bd48291853f676bee77f855ebe072c23b0c4563d89890ca0d3bfcb69de320b186f1cd4ab5927e56af
MISC metadata.xml 598 SHA256 2362e07d8f53d6ba483405b53da33a25096639d7591af39e2eeb064ebad832a9 SHA512 a8fc460e86723cb8cb7320dcf2e04ab5bd0a3737fa5527003ef527879eab7322a0014159d043589a5228d312291c62a905d1610eff3f8032826e209aaf84c57c WHIRLPOOL 010dd533613ca2180e473e60aefc8b854a0dd7a4c96196412e9dee442dd56b469938f3f043d8ba4087a7e1a60d9d09ca723b9d9906ab7ebf30dbcd1d076d5244
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)
-iEYEAREIAAYFAlLRX/EACgkQcaHudmEf86oioACdGhNMxzGGK8v7fd7rUO5UXOe0
-SacAniiu3Z0XBxrz44MhLBtt4E9ByZzF
-=3Il8
+iEYEAREIAAYFAlNuEoUACgkQcaHudmEf86rNOACfa/wC5Uwwmd+rlCFTI6emvaGj
+eSUAniprDCdy+CdnahA3GG9c8ZCQx+lO
+=AHLD
-----END PGP SIGNATURE-----
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)
+}