Add USE="xinerama" to most recent dev-haskell/x11 versions. This fixes bug #223377.

Package-Manager: portage-2.1.4.4

5 files changed, 67 insertions, 21 deletions

diff --git a/dev-haskell/x11/ChangeLog b/dev-haskell/x11/ChangeLog
index b299414d1c43..b393f84c1d42 100644
--- a/dev-haskell/x11/ChangeLog
+++ b/dev-haskell/x11/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-haskell/x11
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/x11/ChangeLog,v 1.6 2007/12/15 23:11:47 kolmodin Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/x11/ChangeLog,v 1.7 2008/05/25 11:14:18 kolmodin Exp $
+
+  25 May 2008; Lennart Kolmodin <kolmodin@gentoo.org> x11-1.2.1.ebuild,
+  x11-1.4.0.ebuild, x11-1.4.1.ebuild:
+  Add IUSE="xinerama" and add missing dependency on libXinerama.
+  This requires >=cabal-1.2.3.0.
+  Reported by Prashanth Mundkur <prashanth.mundkur@gmail.com>.
+  This fixes bug #223377.
+  Fix minor repoman issue with x11-1.2.1.
 
 *x11-1.4.1 (16 Dec 2007)
 
diff --git a/dev-haskell/x11/Manifest b/dev-haskell/x11/Manifest
index 28d0df6905ea..bdb3b86a5f16 100644
--- a/dev-haskell/x11/Manifest
+++ b/dev-haskell/x11/Manifest
@@ -1,13 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST X11-1.2.2.tar.gz 72793 RMD160 f04a7f05d850294fb77d1b5ebb13e3361d0729ad SHA1 f206cebbef7e2d6245670f8795a84f1acb556413 SHA256 67450351a44955966a29e282e2b8a9888ad337add432adec43f0f370b0835ed8
 DIST X11-1.4.0.tar.gz 85583 RMD160 95f9147f3fee68bdd0c393851b9bd16e3ce3745d SHA1 8bd26e814519d980c334351151604103f012f9e7 SHA256 11cd8d4c9d81a420bb4cc4400a57f760497a7a4f0899b1369b95a454063b9560
 DIST X11-1.4.1.tar.gz 88934 RMD160 79bcde642e2628ca9723bf20c3e121fb662a4eac SHA1 f060f28bf2f060be4f38ed0a6df42da0097fa1e5 SHA256 e51038541415686f0e278ccdbc0b2373cd11f212de99023b7b8f8e776aa09f79
 DIST ghc-6.6-src-extralibs.tar.bz2 2015443 RMD160 63d87d02f42efc032c20de7394f3b29431fd8eed SHA1 b94974e255165703d882bb522ec44c5bdc4b0aec SHA256 1c811695d074c7560ca9bd7773523f817ccb57390044392a1ad92cf0079bea29
 DIST ghc-6.6.1-src-extralibs.tar.bz2 1928527 RMD160 1c18c85d978c4b3369132e247c823aaa90ea8530 SHA1 1398f6c35191d52410a2e066b382635dff0d8d6d SHA256 d162a82fc388fdd48c327b09bb6d778f2313d12d5282f3b120ac08a5d4e78902
 EBUILD x11-1.1.ebuild 831 RMD160 c20a53f125be3ec58354075f9853082ede46adbe SHA1 7705ab6724909a7de0564b0da850569dd1fcbfc7 SHA256 01139b34b17348b92cbd9f0fe6363c4a626fb06ebe861b7dec883f277f3d7aca
-EBUILD x11-1.2.1.ebuild 794 RMD160 f1a5bc7ddd606f3a4ab58a3e3795e462741a1811 SHA1 46a44354ccb34fb791ce9c76039f0a1a6ea909ae SHA256 6eb54912d69abbcd9836087f89278137a8958de51cc53c67a970dcb36931cf90
+EBUILD x11-1.2.1.ebuild 793 RMD160 0ab8d85829d6624ae3d115d310bf9c6b7a701ef3 SHA1 43ae435c7a4989aebe7ad9b0890a3b9ce2dd9b08 SHA256 1d1deca768250abda2ec6a58294653d0165c7366895e4faa83c3ee11e51e1795
 EBUILD x11-1.2.2.ebuild 688 RMD160 3297402aa916e22b5595765755e526aee810c4ad SHA1 6f8a1cf9602307890bbb0fabf33c89ae546bd443 SHA256 3b0221f9a97f57a93ac8435cfcf651842673853a153181939914d38017f8d71b
 EBUILD x11-1.2.ebuild 609 RMD160 328f7068e69610a6bce10b9d3808f5642d970b46 SHA1 1fe2655e8d5f0965356b77522a97260d6bc96bda SHA256 e4146cb0b12032a2c160ef51802c3fd526c6dc22a030a49a3e1639c90952c1da
-EBUILD x11-1.4.0.ebuild 646 RMD160 29827f2266924e24e24855decb2134d735fa2ac0 SHA1 8af3d9cef65cc96cfd94f699d987f83e998c43fd SHA256 df537cb6a172bc1f2904245450304f6464360cfcd751e145a6c5d980bb9e9de3
-EBUILD x11-1.4.1.ebuild 647 RMD160 3eca8222a3e5db071387fd62c7e08df327d85d21 SHA1 81880cb61346e6247814a93704a35afe6786fd0c SHA256 283a230af69bac934c42ea38c4c2a719094df923bd0711c2464dea7e70fa50a9
-MISC ChangeLog 1088 RMD160 4e4c388c43b996cb533c67d835f58191a3c48453 SHA1 fe4773168db9318c9437cb24c29624db9efd349b SHA256 cb7234e970d2372998033d063b7eddcab964f8e05b82036011c069bcc197df37
+EBUILD x11-1.4.0.ebuild 922 RMD160 3d683a7a4bc2044f02bd6f11e20dd1e64387578d SHA1 813993b2596c492ca7df0f92e432a34b4eb052b7 SHA256 0d36b8dabe4be7a6e5365a1715722240513284416a35df86381c09018d006410
+EBUILD x11-1.4.1.ebuild 922 RMD160 6b7004b8a5cc68fc2df65fc5f3643e66898aff95 SHA1 5ef337b2b81c63d1cd0c37ede4ac9be9fb41857a SHA256 a0ccb00befae128b2cc6ff8f2864f6a93895b90c26ebbf71a53839232e196f26
+MISC ChangeLog 1428 RMD160 0515053cfdd43e895f7fa061bd76803e5293c1b3 SHA1 a9458c14469f4d19a24f47f8dfc71a741192944a SHA256 3e7d161c4855a6aead30b70d0f3f865043d09cada7fdef02a8216a5898824734
 MISC metadata.xml 223 RMD160 7783e6057effb8b8f0b79cffe8b557b32c633839 SHA1 7b962c77f2e38479a9d1621ec8d307ca9f761753 SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkg5UQYACgkQ1n/CYbXjntJY+ACgqJ/3WY0aKtMLXUrvZ/cSsvjn
+9QsAn2Ff2BYkOurh7QhdbEtnOu6wB6qY
+=UTcP
+-----END PGP SIGNATURE-----
diff --git a/dev-haskell/x11/x11-1.2.1.ebuild b/dev-haskell/x11/x11-1.2.1.ebuild
index c226a1745a6d..141613c8d422 100644
--- a/dev-haskell/x11/x11-1.2.1.ebuild
+++ b/dev-haskell/x11/x11-1.2.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# 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.3 2007/12/13 17:34:10 dcoutts Exp $
+# $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
@@ -24,6 +24,6 @@ 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}"
+	unpack ${A}
 	sed -i -e "/type Hook/ s/UserHooks/Maybe UserHooks/" "${S}/Setup.hs"
 }
diff --git a/dev-haskell/x11/x11-1.4.0.ebuild b/dev-haskell/x11/x11-1.4.0.ebuild
index 473014deebca..eb868cbe1ee2 100644
--- a/dev-haskell/x11/x11-1.4.0.ebuild
+++ b/dev-haskell/x11/x11-1.4.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2007 Gentoo Foundation
+# 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.2 2007/12/15 16:38:04 dcoutts Exp $
+# $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.1.6
-inherit haskell-cabal
+CABAL_MIN_VERSION=1.2.3.0
+inherit haskell-cabal eutils autotools
 
 MY_PN="X11"
 MY_P="${MY_PN}-${PV}"
@@ -16,9 +16,23 @@ SRC_URI="http://hackage.haskell.org/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~sparc ~x86"
-IUSE=""
+IUSE="xinerama"
 
 DEPEND=">=dev-lang/ghc-6.4.2
-		x11-libs/libX11"
+		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
index 831cd4a147d2..09aebf0597b9 100644
--- a/dev-haskell/x11/x11-1.4.1.ebuild
+++ b/dev-haskell/x11/x11-1.4.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2007 Gentoo Foundation
+# 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.1 2007/12/15 23:11:47 kolmodin Exp $
+# $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.1.6
-inherit haskell-cabal
+CABAL_MIN_VERSION=1.2.3.0
+inherit haskell-cabal eutils autotools
 
 MY_PN="X11"
 MY_P="${MY_PN}-${PV}"
@@ -16,9 +16,23 @@ SRC_URI="http://hackage.haskell.org/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~sparc ~x86"
-IUSE=""
+IUSE="xinerama"
 
 DEPEND=">=dev-lang/ghc-6.4.2
-		x11-libs/libX11"
+		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
+}