Version bump to support ghc-7. Fixes bug #378887 by Thomas Kahle.

Package-Manager: portage-2.1.10.10/cvs/Linux x86_64

4 files changed, 57 insertions, 5 deletions

diff --git a/dev-haskell/quickcheck/ChangeLog b/dev-haskell/quickcheck/ChangeLog
index 8aec6884b6af..c7a5c14b8096 100644
--- a/dev-haskell/quickcheck/ChangeLog
+++ b/dev-haskell/quickcheck/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-haskell/quickcheck
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/quickcheck/ChangeLog,v 1.48 2011/06/05 16:11:42 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/quickcheck/ChangeLog,v 1.49 2011/08/12 11:12:13 slyfox Exp $
+
+*quickcheck-2.1.1.1 (12 Aug 2011)
+
+  12 Aug 2011; Sergei Trofimovich <slyfox@gentoo.org>
+  +quickcheck-2.1.1.1.ebuild, +files/quickcheck-2.1.1.1-ghc-7.patch:
+  Version bump to support ghc-7. Fixes bug #378887 by Thomas Kahle.
 
   05 Jun 2011; Sergei Trofimovich <slyfox@gentoo.org> -quickcheck-1.0.ebuild,
   -quickcheck-1.0.1.ebuild:
diff --git a/dev-haskell/quickcheck/Manifest b/dev-haskell/quickcheck/Manifest
index 41948d256073..cee2d4558398 100644
--- a/dev-haskell/quickcheck/Manifest
+++ b/dev-haskell/quickcheck/Manifest
@@ -2,18 +2,21 @@
 Hash: SHA1
 
 AUX quickcheck-1.1.0.0-ghc-6.10-build-fix.patch 374 RMD160 25618e79db06289eb9ca70c78df6a04e7e2f2b92 SHA1 38a1d5ed6a080ed7c87ff43ebe7cc02f883f2587 SHA256 12b5df332b34fd5b9f50fabd7fe4b3b6d7c7f3c9257be4d3ebba45771e923e6c
+AUX quickcheck-2.1.1.1-ghc-7.patch 382 RMD160 59809efccce9c5d3be2eb8a4cab7b20aa544b7fb SHA1 eb75ad340298df2b5bf570e5ce082d4f98ce9e63 SHA256 35ff575ab1f7f824b4b0e3c196eaac76d9cff39a9a99760b8c44cb21f100d6f7
 DIST QuickCheck-1.1.0.0.tar.gz 8672 RMD160 c66dce748ba9f6df7a542e446aeebbe06f584f30 SHA1 1bdb7f630ddb35d6ed966ceaf39c3f89e3f7ed75 SHA256 e32e19c1a4f86171c9d00582e3f0394f39c88a3d8cc6d65e64da85822f22ead6
 DIST QuickCheck-1.2.0.0.tar.gz 9012 RMD160 9183bd1551e93eadd64da6b298055085bdfc4d27 SHA1 012d080008cbbd955a0e7a785958e7bf66f1213b SHA256 21672d817913ac7ab6d3fd7f102dd5d0f115a0826c95b9604c8c0b0171e8d4ed
 DIST QuickCheck-2.1.0.3.tar.gz 18992 RMD160 2aada609094f946ff8c2b25a32508ace303f8d17 SHA1 e1c6c4741d042580bffcf6d586a16406b22d5e9c SHA256 91a861233fe0a37a032d092dd5e8ec40c2c99fbbf0701081394eb244f23757b1
+DIST QuickCheck-2.1.1.1.tar.gz 19486 RMD160 74730c80f83435dec7f03f1bf783e8797cefd347 SHA1 5b3aa51d62a4406b454612b12fd3d5c7d49a3df0 SHA256 626a6f7a69e2bea3b4fe7c573d0bc8da8c77f97035cb2d3a5e1c9fca382b59c9
 EBUILD quickcheck-1.1.0.0.ebuild 742 RMD160 67666896896cb3dfa4e7524568f9217973762f1f SHA1 36f84853dfdbae4027459587cb4f8f0af980251d SHA256 fde2bd7cf83c4c772d79a5f7dfa2dc88de1772512a02ba8aaaa65b920d68e835
 EBUILD quickcheck-1.2.0.0.ebuild 771 RMD160 19b0cb07b40b2583f12fcba41dd4a61d54bde431 SHA1 cfc62193b7b330fbafbc71f679e0e081a09dcb82 SHA256 3a4cc54b14517a7344c192928198d7cab8346cf638bb03beaaf26cd1e6ff5590
 EBUILD quickcheck-2.1.0.3.ebuild 1070 RMD160 4b1eba50d057cbc098669df119b88741ebdc76ec SHA1 7d6cb8fb4126dae494ed4081a5fea4e3bbaaa6d1 SHA256 54493adaecb7817a550a427c7c9c309c55166b8cd9a208d2ab2fca2db4347764
-MISC ChangeLog 6286 RMD160 9c0ab727b4cf0bc5df93a8bdca9964e541b02ac4 SHA1 da70e33229824282ff36effb3012c74c7d385878 SHA256 25f7bbfc02d0bccc9140baa59647dff0d9fd75d06fa91f2cc022df06f5eed452
+EBUILD quickcheck-2.1.1.1.ebuild 844 RMD160 0525480779f631a84633475ae228f5d9eb3c0ab0 SHA1 ed733aacb1cb9508cb264a30bded1cb6e2b74c7e SHA256 a70596ffa2ef222264a174c44193d13b24fd95a758cce0d8be3b3520f7747347
+MISC ChangeLog 6513 RMD160 6cd24a164545e326f8d2e14867174d1200e99692 SHA1 9d82ab8953d4756d4bd3d056af5de373f1d22621 SHA256 824c12cc02261a2ff9da8c962f22b1edfef1c7b8d0115c5a3b4d487906c23734
 MISC metadata.xml 223 RMD160 7783e6057effb8b8f0b79cffe8b557b32c633839 SHA1 7b962c77f2e38479a9d1621ec8d307ca9f761753 SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk3rq3YACgkQcaHudmEf86rgJgCfTACQQlGaYfq/geZQUzvb0bvT
-ZNMAoIiNwNkTXxSzLCsqjuoQba3e3rqF
-=GXn6
+iEYEARECAAYFAk5FC1kACgkQcaHudmEf86qzkwCgiB3XjMnIQLK6KTLMmirnDsVk
+eoIAni+AI3DP6GBzrT8G1SHJB2EMJcFZ
+=ELQS
 -----END PGP SIGNATURE-----
diff --git a/dev-haskell/quickcheck/files/quickcheck-2.1.1.1-ghc-7.patch b/dev-haskell/quickcheck/files/quickcheck-2.1.1.1-ghc-7.patch
new file mode 100644
index 000000000000..87abeeb51e34
--- /dev/null
+++ b/dev-haskell/quickcheck/files/quickcheck-2.1.1.1-ghc-7.patch
@@ -0,0 +1,12 @@
+diff --git a/Test/QuickCheck/Function.hs b/Test/QuickCheck/Function.hs
+index a1affaf..7c730bd 100644
+--- a/Test/QuickCheck/Function.hs
++++ b/Test/QuickCheck/Function.hs
+@@ -206,6 +206,7 @@ shrinkFun shr (p :+: q) =
+   [ p' .+. q  | p' <- shrinkFun shr p ] ++
+   [ p  .+. q' | q' <- shrinkFun shr q ]
+  where
++  isNil :: (a :-> b) -> Bool
+   isNil Nil = True
+   isNil _   = False
+  
diff --git a/dev-haskell/quickcheck/quickcheck-2.1.1.1.ebuild b/dev-haskell/quickcheck/quickcheck-2.1.1.1.ebuild
new file mode 100644
index 000000000000..9376e7ae26f8
--- /dev/null
+++ b/dev-haskell/quickcheck/quickcheck-2.1.1.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/quickcheck/quickcheck-2.1.1.1.ebuild,v 1.1 2011/08/12 11:12:13 slyfox Exp $
+
+# ebuild generated by hackport 0.2.13
+
+EAPI="3"
+
+CABAL_FEATURES="lib profile haddock hscolour"
+inherit base haskell-cabal
+
+MY_PN="QuickCheck"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Automatic testing of Haskell programs"
+HOMEPAGE="http://www.cse.chalmers.se/~koen"
+SRC_URI="http://hackage.haskell.org/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="dev-haskell/mtl
+		>=dev-lang/ghc-6.8.2"
+DEPEND="${RDEPEND}
+		>=dev-haskell/cabal-1.2"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=("${FILESDIR}/${PN}-2.1.1.1-ghc-7.patch")