Added missing 'random' depend found by Nick Bowler in bug #410709.

Package-Manager: portage-2.2.0_alpha96_p5/cvs/Linux x86_64

6 files changed, 84 insertions, 18 deletions

diff --git a/dev-haskell/quickcheck/ChangeLog b/dev-haskell/quickcheck/ChangeLog
index f15c8815d7fe..fa2dfb152417 100644
--- a/dev-haskell/quickcheck/ChangeLog
+++ b/dev-haskell/quickcheck/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-haskell/quickcheck
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/quickcheck/ChangeLog,v 1.51 2012/01/22 14:05:49 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/quickcheck/ChangeLog,v 1.52 2012/04/03 21:34:48 slyfox Exp $
+
+*quickcheck-2.4.2-r1 (03 Apr 2012)
+
+  03 Apr 2012; Sergei Trofimovich <slyfox@gentoo.org>
+  +quickcheck-2.4.2-r1.ebuild, metadata.xml, quickcheck-1.2.0.0.ebuild,
+  quickcheck-2.4.2.ebuild:
+  Added missing 'random' depend found by Nick Bowler in bug #410709.
 
 *quickcheck-2.4.2 (22 Jan 2012)
 
diff --git a/dev-haskell/quickcheck/Manifest b/dev-haskell/quickcheck/Manifest
index 49bbf7f57772..c3bc9f437148 100644
--- a/dev-haskell/quickcheck/Manifest
+++ b/dev-haskell/quickcheck/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+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
@@ -10,17 +10,18 @@ DIST QuickCheck-2.1.1.1.tar.gz 19486 RMD160 74730c80f83435dec7f03f1bf783e8797cef
 DIST QuickCheck-2.4.1.1.tar.gz 25068 RMD160 aa207e1d927605672824c58cabfd2cb8016a7bb4 SHA1 c898f5f90ab9382cf950ee87de2813d8f8806a0b SHA256 92a711d613bf0ce61b5843386923abf112bf509fa37931a893222a2324b0791b
 DIST QuickCheck-2.4.2.tar.gz 25373 RMD160 e87ece5bab2f3582265160734b3be50a596ec19e SHA1 e49f2f664b301af78d7a0745ff596c44c1f3e090 SHA256 6f05c399ae7b70c09ab21337caf1211f43fd76d6ad9b3814a4009ddbf438179f
 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-1.2.0.0.ebuild 795 RMD160 8ac9663057f68e90dec7c49b15fc0a3b12c40d69 SHA1 386aa3f1cb2fcf836b27aeb3ce6cea3f904dec12 SHA256 9c989cb5e8cfc91d217b9714a9f176b039143d5e2ac1cf1ba86bcb7108454f62
 EBUILD quickcheck-2.1.0.3.ebuild 1070 RMD160 4b1eba50d057cbc098669df119b88741ebdc76ec SHA1 7d6cb8fb4126dae494ed4081a5fea4e3bbaaa6d1 SHA256 54493adaecb7817a550a427c7c9c309c55166b8cd9a208d2ab2fca2db4347764
 EBUILD quickcheck-2.1.1.1.ebuild 844 RMD160 0525480779f631a84633475ae228f5d9eb3c0ab0 SHA1 ed733aacb1cb9508cb264a30bded1cb6e2b74c7e SHA256 a70596ffa2ef222264a174c44193d13b24fd95a758cce0d8be3b3520f7747347
 EBUILD quickcheck-2.4.1.1.ebuild 1105 RMD160 77e3a662ab33009bbd79ec3fbe141b278cb82026 SHA1 c63353273b7d6808062dd8b4ea305135de521366 SHA256 b38a323d91052b328a7459c4b84d453ec57ee3c8defa388c3ac0dba3e129eece
-EBUILD quickcheck-2.4.2.ebuild 1103 RMD160 9d51f93a0997fd8898b671b922a200190fe9d348 SHA1 316e3306d0fe5e4ac176074fa2f0928cbf7a6de0 SHA256 46c9d15fc5f70baac24b686ee236191eb9e974579a17052ac05063085ed6cc71
-MISC ChangeLog 6784 RMD160 558e47fe1f4e10e357f6a99ee366eb8faf7ddc3d SHA1 c23a41e7675bd0b0e5d0ca5db63c5c27873106cf SHA256 5ea62a3dbdac9d68ac4dc1250238e7c2b0216180359638ca118b6403597d92d1
-MISC metadata.xml 223 RMD160 7783e6057effb8b8f0b79cffe8b557b32c633839 SHA1 7b962c77f2e38479a9d1621ec8d307ca9f761753 SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508
+EBUILD quickcheck-2.4.2-r1.ebuild 1287 RMD160 762da6d4f3eb1a57152d9589de1d41a7e06ec20c SHA1 5f7593ef1e616296f53f03fd51b93b55a8e5cc5c SHA256 43ea2b04ab80a7f665ee3ab005167d093d967f0571850f405338971c06e4af87
+EBUILD quickcheck-2.4.2.ebuild 1123 RMD160 96aa24f9cbd6bc0f39f1f858cafd1a0be5721d12 SHA1 1b4acb0cdf85272f4a58f111e489a18f1410df57 SHA256 aa800b3f42c475849bbe6cb1f02eadd752db1063a1e7d8abaa43f1745952218c
+MISC ChangeLog 7043 RMD160 d24b54e334b4c3edc18ee2794369eda471d81c89 SHA1 e1731f01f4540f1a3e95de010a301ae3833ce1e2 SHA256 3f40caebd0643de0f23e014944170c41fb684f2766e426ac779b23cb08b6f4cd
+MISC metadata.xml 910 RMD160 77f6a09b6a60bf38a814a4a7b20a9561a1fb433a SHA1 41e58c6f5526d0e9daa95b7e43a5f3d82757894b SHA256 fc774f6b84d75fce9db146400373f56b8c7cdf2b7ba94b2445ee66bf8cc1f377
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk8cF/QACgkQoBEVQmGOlx+XYQEAgBimyE39kjFVuyZ+UbqWNau0
-a9HiYuUEYEEcpQtHMJUA/Rss4vF0ARI9NuO8t2KyM1rcUcUUKX4HEVEWWIj0wfV0
-=9U7e
+iEYEARECAAYFAk97bh4ACgkQcaHudmEf86pEdQCfXpGQcKmlp24uvbxuLUgN6J+2
+Rr0An0HbLgM6oSPPWlrqI1hpvMiHD3Ji
+=2+uG
 -----END PGP SIGNATURE-----
diff --git a/dev-haskell/quickcheck/metadata.xml b/dev-haskell/quickcheck/metadata.xml
index 8c66906af531..7256195592c0 100644
--- a/dev-haskell/quickcheck/metadata.xml
+++ b/dev-haskell/quickcheck/metadata.xml
@@ -1,8 +1,25 @@
 <?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>
+	<use>
+		<flag name="template_haskell">Enable additional test modules requiring Template Haskell support.</flag>
+	</use>
+	<longdescription>
+		QuickCheck is a library for random testing of program properties.
+		
+		The programmer provides a specification of the program, in
+		the form of properties which functions should satisfy, and
+		QuickCheck then tests that the properties hold in a large number
+		of randomly generated cases.
+		
+		Specifications are expressed in
+		Haskell, using combinators defined in the QuickCheck library.
+		QuickCheck provides combinators to define properties, observe
+		the distribution of test data, and define test
+		data generators.
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/quickcheck/quickcheck-1.2.0.0.ebuild b/dev-haskell/quickcheck/quickcheck-1.2.0.0.ebuild
index 6559e4c191d8..797ffac597ad 100644
--- a/dev-haskell/quickcheck/quickcheck-1.2.0.0.ebuild
+++ b/dev-haskell/quickcheck/quickcheck-1.2.0.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/quickcheck/quickcheck-1.2.0.0.ebuild,v 1.5 2010/07/01 19:58:21 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/quickcheck/quickcheck-1.2.0.0.ebuild,v 1.6 2012/04/03 21:34:48 slyfox Exp $
 
 CABAL_FEATURES="lib profile haddock"
 inherit haskell-cabal
@@ -17,7 +17,8 @@ SLOT="1"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
-RDEPEND=">=dev-lang/ghc-6.6.1"
+RDEPEND=">=dev-lang/ghc-6.6.1
+		dev-haskell/random"
 DEPEND="${RDEPEND}
 		>=dev-haskell/cabal-1.2"
 
diff --git a/dev-haskell/quickcheck/quickcheck-2.4.2-r1.ebuild b/dev-haskell/quickcheck/quickcheck-2.4.2-r1.ebuild
new file mode 100644
index 000000000000..0c8c1223875a
--- /dev/null
+++ b/dev-haskell/quickcheck/quickcheck-2.4.2-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/quickcheck/quickcheck-2.4.2-r1.ebuild,v 1.1 2012/04/03 21:34:48 slyfox Exp $
+
+EAPI="3"
+
+CABAL_FEATURES="lib profile haddock hscolour hoogle"
+inherit haskell-cabal
+
+MY_PN="QuickCheck"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Automatic testing of Haskell programs"
+HOMEPAGE="http://code.haskell.org/QuickCheck"
+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="+template_haskell"
+
+RDEPEND=">=dev-lang/ghc-6.10.1
+	dev-haskell/random"
+DEPEND="${RDEPEND}
+		>=dev-haskell/cabal-1.6"
+
+# would work with ghc 6.8 (6.6 too?) too if we added this dep
+# dev-haskell/extensible-exceptions. however, we'd prefer not to add more co$
+# packages, as we don't want them upgradeable (leads to trouble).
+#
+# this means that we can only support the architectures which has >=ghc-6.10
+# and unfortunately have to drop the other arches until we get proper ghc su$
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	# GHCi-less platforms do not support Template Haskell
+	cabal_src_configure $(cabal_flag template_haskell templateHaskell)
+}
diff --git a/dev-haskell/quickcheck/quickcheck-2.4.2.ebuild b/dev-haskell/quickcheck/quickcheck-2.4.2.ebuild
index fd61bd35f0e3..3dfddcf45eb9 100644
--- a/dev-haskell/quickcheck/quickcheck-2.4.2.ebuild
+++ b/dev-haskell/quickcheck/quickcheck-2.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/quickcheck/quickcheck-2.4.2.ebuild,v 1.1 2012/01/22 14:05:49 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/quickcheck/quickcheck-2.4.2.ebuild,v 1.2 2012/04/03 21:34:48 slyfox Exp $
 
 EAPI="3"
 
@@ -19,7 +19,8 @@ SLOT="2"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 
-RDEPEND=">=dev-lang/ghc-6.10.1"
+RDEPEND=">=dev-lang/ghc-6.10.1
+	dev-haskell/random"
 DEPEND="${RDEPEND}
 		>=dev-haskell/cabal-1.6"