Bump x11 to 1.6.1.1

Package-Manager: portage-2.2.0_alpha171/cvs/Linux x86_64
Manifest-Sign-Key: 0x618E971F

4 files changed, 68 insertions, 10 deletions

diff --git a/dev-haskell/x11/ChangeLog b/dev-haskell/x11/ChangeLog
index 9160a1807a5e..ece4b572bbcf 100644
--- a/dev-haskell/x11/ChangeLog
+++ b/dev-haskell/x11/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-haskell/x11
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/x11/ChangeLog,v 1.29 2013/02/09 19:07:22 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/x11/ChangeLog,v 1.30 2013/04/03 11:34:17 gienah Exp $
+
+*x11-1.6.1.1 (03 Apr 2013)
+
+  03 Apr 2013; Mark Wright <gienah@gentoo.org> +x11-1.6.1.1.ebuild,
+  metadata.xml:
+  Bump x11 to 1.6.1.1
 
 *x11-1.6.0.2-r1 (09 Feb 2013)
 
diff --git a/dev-haskell/x11/Manifest b/dev-haskell/x11/Manifest
index 069504274fbe..4207811d6a6e 100644
--- a/dev-haskell/x11/Manifest
+++ b/dev-haskell/x11/Manifest
@@ -6,18 +6,20 @@ DIST X11-1.4.6.1.tar.gz 175567 SHA256 3e1375d4e53a8366fa2ea12bd9c3033ffe2f7dd004
 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
-MISC ChangeLog 4418 SHA256 a9dbc4a52e6348f729b92c4c1cf5e1d5f533ae773ec9a46e95bfb5a598c5d662 SHA512 16c51f5477bc4031dfd6a4dec608600bd8d65457c8f44308944ce63ec1c1b64931a3f9fef06988b10a3ba1ce1fdb4098812915cc3cafeb14317f67a60c6604a8 WHIRLPOOL 7b7fac5710a39fcddce6e59a30e81e3cc0f0b4947e41a2b92bfc3722fe51dc4150b0f35b2cc7f329eb5c32e7b07af32caf501c707bda67554fcadc680b873f9d
-MISC metadata.xml 223 SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508 SHA512 24765bbf1cb187cd262aa7fb3824c1cec65e2bf3f2198099de688916d96401a26458265b15408f22b1fbd6d6a2842df814a57ceda80dfa00d130b24423b7544f WHIRLPOOL 8fd6700f6198db6540eb51edf11372faeb6eb8a542a692e515badf236f62444f2c180f7d08e0f98e9fdfa23de14631b31af50543469aaa27084d6b637e2644c7
+EBUILD x11-1.6.1.1.ebuild 1123 SHA256 9a938966a751315ae6b6c2f52f7f89ba858374abbfc21ee1397d1fcb5eaf8cac SHA512 6eb623b5500db3f0a30ddc9b15410d57706b1c476dd5400fc665134ff4b7184f1e1958ff6d32902135369aae1b2f9c883603e694e7a4fc89ad7576673147a6e7 WHIRLPOOL f52cc170543ac63ba292f5b59d45bb0b4c4cb67e406e2cc257aec9358c6d87eded9db368307e6ad6e59b3b7bb6c1f624c45ff199a22667d13786626ef646fe2f
+MISC ChangeLog 4553 SHA256 e1326a1f9348e52524c96fa8ec6ad84be627fa82cc7bbc8c1b0ce3e03b2f3566 SHA512 9db8e748bcedab0f1a24b39c79fe214a158373fd116265f12d2ce5448948aa91ce02e76f41205b534bbced9afcfea3e683f3b4e6adddd8e6b5b12e5c94c87e36 WHIRLPOOL e634821addb8426fc2fff5aeced8236929ab7a4947325e22d99b9a3e6bda61a93e816e462b9f042326ca1dec4200ecddb82ba5f7f57ad9f9e1bfa79e35cac605
+MISC metadata.xml 598 SHA256 2362e07d8f53d6ba483405b53da33a25096639d7591af39e2eeb064ebad832a9 SHA512 a8fc460e86723cb8cb7320dcf2e04ab5bd0a3737fa5527003ef527879eab7322a0014159d043589a5228d312291c62a905d1610eff3f8032826e209aaf84c57c WHIRLPOOL 010dd533613ca2180e473e60aefc8b854a0dd7a4c96196412e9dee442dd56b469938f3f043d8ba4087a7e1a60d9d09ca723b9d9906ab7ebf30dbcd1d076d5244
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlEWnkwACgkQcaHudmEf86pRoQCgg5ecI7R9glCB86SxWw/Bvs1P
-5w8An1qk8s5lctLGEY5KluwZ9mzlV927
-=tnr1
+iF4EAREIAAYFAlFcE5UACgkQoBEVQmGOlx8gvAEAihAs7c5UBO7LQlFM7m7q9b5a
+j+pDmvdPdSwKjNn9mmoA+wcOrxagzuwpdAnfXb8gVZGMM+eyg+HNEliYs7J5aGJc
+=mX4N
 -----END PGP SIGNATURE-----
diff --git a/dev-haskell/x11/metadata.xml b/dev-haskell/x11/metadata.xml
index 8c66906af531..002d0b7f2c67 100644
--- a/dev-haskell/x11/metadata.xml
+++ b/dev-haskell/x11/metadata.xml
@@ -1,8 +1,17 @@
 <?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>
+		A Haskell binding to the X11 graphics library.
+		The binding is a direct translation of the C binding; for
+		documentation of these calls, refer to &quot;The Xlib Programming
+		Manual&quot;, available online at &lt;http://tronche.com/gui/x/xlib/&gt;.
+	</longdescription>
+	<use>
+		<flag name="screensaver">whether to build XScreenSaver.</flag>
+	</use>
 </pkgmetadata>
diff --git a/dev-haskell/x11/x11-1.6.1.1.ebuild b/dev-haskell/x11/x11-1.6.1.1.ebuild
new file mode 100644
index 000000000000..8acc09d88aec
--- /dev/null
+++ b/dev-haskell/x11/x11-1.6.1.1.ebuild
@@ -0,0 +1,41 @@
+# 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.1.1.ebuild,v 1.1 2013/04/03 11:34:17 gienah Exp $
+
+EAPI=5
+
+# ebuild generated by hackport 0.3.2
+
+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="+screensaver +xinerama"
+
+RDEPEND="dev-haskell/data-default:=[profile?]
+		>=dev-lang/ghc-6.10.4:=
+		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)
+}