Restricted tests (broken due to Cabal bug). Fixes bug #436604 by Olivier Huber.

Package-Manager: portage-2.2.0_alpha142_p1/cvs/Linux x86_64
Manifest-Sign-Key: 0x611FF3AA

3 files changed, 25 insertions, 22 deletions

diff --git a/dev-haskell/text/ChangeLog b/dev-haskell/text/ChangeLog
index 5122e51e4d4b..75f6691e2346 100644
--- a/dev-haskell/text/ChangeLog
+++ b/dev-haskell/text/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-haskell/text
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/text/ChangeLog,v 1.16 2012/09/25 14:16:31 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/text/ChangeLog,v 1.17 2012/10/28 16:00:55 slyfox Exp $
+
+  28 Oct 2012; Sergei Trofimovich <slyfox@gentoo.org> text-0.11.2.3.ebuild:
+  Restricted tests (broken due to Cabal bug). Fixes bug #436604 by Olivier
+  Huber.
 
   25 Sep 2012; Andreas Schuerch <nativemad@gentoo.org> text-0.11.2.2.ebuild:
   x86 stable, see bug 421351
diff --git a/dev-haskell/text/Manifest b/dev-haskell/text/Manifest
index d4aa0715288d..944915c9dbad 100644
--- a/dev-haskell/text/Manifest
+++ b/dev-haskell/text/Manifest
@@ -15,13 +15,13 @@ EBUILD text-0.11.1.13-r1.ebuild 1358 SHA256 239cc52445ca790f0fb0ac61ca9a9a71d6ce
 EBUILD text-0.11.2.0.ebuild 1172 SHA256 5aee16211b59ee4559071dcebc02c8d2b870be47875ea10c586e83adb9df5e2e SHA512 ecc6bfb2233efe9c6fc0c16cedb64060ab14ed28a97bd67a937e90f0fbc8ec128c7f80a18746d5ba579ff06391d3598ba965c2857ab95a81ba51a6860dc1e079 WHIRLPOOL fe01f16ee3acbec7f91a79ef831364c29dd81baa6568035010817e0fa9d3a871dc2c8c7cacf6c4784860deaa2fd65798e4df17984bbc383ded9e676cbd931169
 EBUILD text-0.11.2.1.ebuild 1172 SHA256 f78fd4315f16a72dbe36fcd14b794097f28610dad29c3ccbb21f7af955d6a90a SHA512 e009abb78758192d939b4daf2706791847ba70211a53cb48b959d2bc3ff2e291d14624113bc7873033cf9b2881d5f23b1904b2a1ad390199e9f342df9302ecea WHIRLPOOL 174ef053a35032c36279cd6b8d41846e4ee1fa79443a6b839f7f0c6bf687a248c2ad058c9f864a6b0f98a145f26c0213c802b2481c84e365f99841fa0ac7c813
 EBUILD text-0.11.2.2.ebuild 1173 SHA256 b493c4e1e9d72b836407018c77836ebb933278227c5ec3563b46d56998b01a74 SHA512 b532dbbb16c0995e19bfdcd4f9254546aeb26fe675839baf5b973a6af9ceef283ef28640c81a8db00612375b94a932e6a4c7621a69e0ff7abd03fa5efb3c4b85 WHIRLPOOL 44c0704e75f8c286bae968b5722469d75ad5046ccf071dade2ffa12f90490f3394a73b04b78718c40e8806a7137aa01599b6900dd8ed145fbaa013a027f6142f
-EBUILD text-0.11.2.3.ebuild 1441 SHA256 1eba884f1828f4cb99cff5144893088899451503b2dd1bc85a13dcda839b7f9a SHA512 81f626004adcd1911725abaaa0de71327ccd0cef6e6168f5625fe9ed137432e78b35dd6a0e231e90ce5845a3e5ef8116057eb8065b6f445e4ad2a082ddf875d8 WHIRLPOOL b4d4d63199e67da6175d6e4b593e25e70ff3ea5ec8444c03a732fdbd33b6dfc08cd1381895114fce64e2ffd71cb6548e1ff62b9eec08344f8d4d8179548590c0
-MISC ChangeLog 2582 SHA256 d9b9af1a8acdacff830bc835ac1dac4cafa135b8cb867c1c98412e1b0638e3b0 SHA512 8b27d7def1bd70229bb5184e9eceae9a25400b88a38b8e8ff878a6a0fa06a1596693e765eef968f15db058fa2c365a334a1532161642451e52de89e848cb6444 WHIRLPOOL 72e932577d629601531e53a4b66424eed51c7c5aa84389017a73a6d39553a42eccf013810389f033fd6263d740dc2863eff52507d6085ce4330126c4076073a6
+EBUILD text-0.11.2.3.ebuild 1370 SHA256 c25568d3f48fb9de71936c8d8f7ed835273d845e2cfedda81e3ed729ae14b4d1 SHA512 69307c25bdc8705cade082d84051d8af76b526c6b62ddbfaf598afca311883ec91d508cfafa4a51490a262cd14fd62810a6b875b3669c1bc6f67d55ee4e0f9fc WHIRLPOOL 17f9b6fff93db913708c9056ef65438d0dde4da751b7e9a6fddf519457d196886aff709862146f5f9b81e05e46b2303a6754d8da10dc4db60268875fa3aaf2d2
+MISC ChangeLog 2740 SHA256 8a8dd4b5b90b0b9541185e3591aacd37cfd3d22112bff223717325be9a2e5ed1 SHA512 708a28626258cf33faccd38091d1a9a68f0968e478b1790f82f4603b4ba9551e371dabeca06cf3572d767b09854278f56606ed1384656e2b0d372143bc256f6e WHIRLPOOL 0f5559322cfb44b478eb6379939870ea8f951aaee7237376425f365bf97ff1529008d41cd36bb9b4507ba949492bfa1d5f298da216a950937b9963c689621349
 MISC metadata.xml 520 SHA256 e3bf0d075f352985752e7369f845fc21465b3cfcc897c81aa027218ccc243e03 SHA512 9aa5e688cb4ec291363e605746aabbee27c39ebae7bd31a1f4c113e2366a4116a070f194351ac6ad8762dfa35d1552e854cbc4e5ec5a7a968dc9ecc616b4b863 WHIRLPOOL 872eeb868e9aff1816d40f82224ab02d2c199da5a7882fb81c8316cdaf556286276a4a7255b44a0cccc3eed7953e1ec43d39b16335eb759a0b418e345486ac81
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlBhu2kACgkQakKUmsHeVLKnYgCeJpwaBCCoBJ/43hY1niRrZZ1W
-B1QAnRqmT/XmYiy/O4pU2lmuXzNSOp1f
-=Ie9z
+iEYEAREIAAYFAlCNVrEACgkQcaHudmEf86o4EQCbBfhrAqrkNZaguFQ2OgHWiSCX
+5BYAninGsRevqmTwB8oyVfzNHIT0ptTL
+=2U+i
 -----END PGP SIGNATURE-----
diff --git a/dev-haskell/text/text-0.11.2.3.ebuild b/dev-haskell/text/text-0.11.2.3.ebuild
index ba67533bfe8b..6dd763035a7a 100644
--- a/dev-haskell/text/text-0.11.2.3.ebuild
+++ b/dev-haskell/text/text-0.11.2.3.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/text/text-0.11.2.3.ebuild,v 1.1 2012/09/14 13:14:16 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/text/text-0.11.2.3.ebuild,v 1.2 2012/10/28 16:00:55 slyfox Exp $
 
-EAPI=4
+EAPI=5
 
-# ebuild generated by hackport 0.2.18.9999
+# ebuild generated by hackport 0.3.9999
 
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
 
 DESCRIPTION="An efficient packed Unicode text type."
@@ -14,27 +14,26 @@ HOMEPAGE="https://github.com/bos/text"
 SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
-SLOT="0"
+SLOT="0/${PV}"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 # tests fail to build:
 # <command line>: cannot satisfy -package-id text-0.11.2.3-inplace:
 #    text-0.11.2.3-inplace is shadowed by package text-0.11.2.3-db61832d0c4660614c4ceff234ed4abb
 # http://hackage.haskell.org/trac/hackage/ticket/807
-IUSE="test"
+RESTRICT="test"
 
-RDEPEND=">=dev-haskell/deepseq-1.1.0.0[profile?]
-		>=dev-lang/ghc-6.10.1"
+RDEPEND=">=dev-haskell/deepseq-1.1.0.0:=[profile?]
+		>=dev-lang/ghc-6.10.4:="
 DEPEND="${RDEPEND}
-		test? ( >=dev-haskell/hunit-1.2[profile?]
-			>=dev-haskell/quickcheck-2.4[profile?]
-			dev-haskell/random[profile?]
-			>=dev-haskell/test-framework-0.4[profile?]
-			>=dev-haskell/test-framework-hunit-0.2[profile?]
-			>=dev-haskell/test-framework-quickcheck2-0.2[profile?]
+		test? ( >=dev-haskell/hunit-1.2
+			>=dev-haskell/quickcheck-2.4
+			dev-haskell/random
+			>=dev-haskell/test-framework-0.4
+			>=dev-haskell/test-framework-hunit-0.2
+			>=dev-haskell/test-framework-quickcheck2-0.2
 		)
 		>=dev-haskell/cabal-1.8"
 
 src_configure() {
-	# the tests need a utf-8 locale
-	cabal_src_configure $(use test && use_enable test tests) #395351
+	haskell-cabal_src_configure --disable-tests # they fail to build
 }