Tuned tests depends by explicitely requiring set of needed packages.

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

4 files changed, 15 insertions, 28 deletions

diff --git a/dev-haskell/happy/ChangeLog b/dev-haskell/happy/ChangeLog
index 5ed3ee4ec58c..a1b6c738c557 100644
--- a/dev-haskell/happy/ChangeLog
+++ b/dev-haskell/happy/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-haskell/happy
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/happy/ChangeLog,v 1.64 2012/12/27 05:11:09 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/happy/ChangeLog,v 1.65 2012/12/27 20:57:45 slyfox Exp $
+
+  27 Dec 2012; Sergei Trofimovich <slyfox@gentoo.org>
+  files/happy-1.18.6-man.patch, files/happy-1.18.9-missing-tests.patch,
+  happy-1.18.10.ebuild:
+  Tuned tests depends by explicitely requiring set of needed packages.
 
   27 Dec 2012; Rick Farina <zerochaos@gentoo.org> +files/happy-1.18.6-man.patch:
   re-add missing file that was removed but still in use, reported by iamben
diff --git a/dev-haskell/happy/Manifest b/dev-haskell/happy/Manifest
index 454f5368b429..472e9b1efd20 100644
--- a/dev-haskell/happy/Manifest
+++ b/dev-haskell/happy/Manifest
@@ -1,30 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX happy-1.18.6-man.patch 469 SHA256 7892274f9f0a8a0b884c4a80b852a7f41e43597efc3251613bdab36442dfd791 SHA512 1376e16e8c0bb6b9abca763bfbb8572d9640044a82aad951ff9d46dfb2436b6a95bded693696ab84e49fec1d259453444fcb36403db63d0c69f89a64bb3c4800 WHIRLPOOL 100abdf2fd341b7a3861305dc7d1608a9dca8819667579cb134a0f1e485f23501631cb1a7f9cc4c9b14b3b2a56ec22d837f8cdddb8e86f6b01a90ccf1446896c
 AUX happy-1.18.6-missing-tests.patch 4051 SHA256 ba9de7d686e05e070639303862869c70c08b6d1d4d6b89749fa972b86a4ada08 SHA512 f792fb513352ebf1f6634a0019de058ce91a57978b7e6dd6b4c94cc9d42dc09b51c23ea2bd6ad72b807d7dd64aa1b42348df217079216c2d5fc00f6750d381d8 WHIRLPOOL 4b58c08070e00c19f29271efcfd6b9b333b5b53296af89de1781ea6da3a9271553a5f2a75b5eaf762cab5f7010adebbac5cbf550260cb64d093cdd108653b980
 AUX happy-1.18.9-ghc-7.5.patch 792 SHA256 d1d3f5c04e4f7821095b286498f3eb636c920675f2d799a15f2e58641021b9cb SHA512 c0868648d4519d5107360398673e81158edabdfae3e38493bdc3472ad14ca91b4f981e4b92a31f8b43147e9579e487e009211d2eac02160f150b717bf3f08b23 WHIRLPOOL 274dfdad3875a45a99bf9058846a05663e2113a88d10d60c4b5d44fe002b1831b2ec23805a0780f2ee48fb8a3e18e1e81fc98e397b421b17d13eb19f74288b60
-AUX happy-1.18.9-missing-tests.patch 5952 SHA256 165240b4862df981d8f96018d43bb9c3c651369cf4c4824d08b0cbbfb616da2a SHA512 cf8a9d725218eb9a0bfd5ace8701e8a67eef4c75bfce88bcf77ffb22a78fae31e53e27105bdec0c5ef3fce8fab005f8526cd1bb2a9f7f92031c6550816170959 WHIRLPOOL 4e44c9fa68374fa33ed282d37513f578c6f01f2b3bb6f1bf850eb8b2b46fac5b6511678189b37ec103e9d8ac87f0d6e064cfb42850dcc11ed6f00db61c099263
+AUX happy-1.18.9-missing-tests.patch 5985 SHA256 c9c72278e049a616b340e91919f1c29949aef85d12c3c24aeaeaa5ca65367b3a SHA512 3d9279c3d4e55d05c0bd8da596297e64d200796febe871764af97874f7eac46f2b11d04bfb41b9aa923e3b30580095a47dc483422e08e503a5ba078de99b6552 WHIRLPOOL 1745fa3b5479c4399f16c8048fa21803274c186a6ff197966002e8d03a7c40ec07d33d17d57e1aa7295fe2495bb8b26760fc3fab09eafc7e2038c548278f467e
 DIST happy-1.18.10.tar.gz 159994 SHA256 c1c920f77906740252e261e2baec5b7519e584344d6080aa5a9cc0b677b9064b SHA512 e052b016bae9f255a9dfa7e4970a015cc5abfdd5216e6e4d4317c63890f154dd68da75aac1ac9bb5a8c84854e59066d0daed09c6ac4d4928ce93ecf4c8bcfb80 WHIRLPOOL ec97a2d7011af0dfd2e099b19bc6dda1df9a128b2a1c50bc82c010b7504c0a5682533b032b9f51386fd37935c17fee5aa38f7bd27e6dbb920664d964dcbbe637
 DIST happy-1.18.9.tar.gz 158476 SHA256 7d34c512b8aecbc135f6b4c43bc18044ff50ae6d5afdd0d2570228dccecb618a SHA512 eaf601e6d78546947b475dd5d396d9086af070f2fc6c49c04a7c373e233bda330702454b8f08650bca8493f7bad04b1ef6ee59d47fadc0b5fcbd68ad07f6d79b WHIRLPOOL 1b1f7071add76dc3b2daee61106887cd6bbea66abe6364b33ed7ec7b2162ee4a47ffc0ffb6c6c5a25344a6bccc1e88f98f8b9f707c9f8310935186a37ba6ae5d
-EBUILD happy-1.18.10.ebuild 1660 SHA256 aa3da1e5ecfa83a51c5c141aa44e620d3e6c37dca20f3dfe71571ebc155f66cf SHA512 e291d910ec9e50d9ace3a03f285fc755b32e7ddb0c7b199c56691f06c65293fbad5401be09662a89d5d1a19b75adeba70a8b5753712f1d052b2b6025afe17874 WHIRLPOOL 71a100e13a0c9d751085deb8c666949f6a612547bebae10a4d66702a043196336bd32712cbe35c56a295175598d407fb177db97d461ba195283a86b0aef9aa20
+EBUILD happy-1.18.10.ebuild 1316 SHA256 09b6cce7491f813268c18d429647b19be5abfb7df6e099e59bc707d51c4c0eb4 SHA512 6a9cd74015cf24007bb1521a2f312f9b9cb33c4e7c99ae90b0c6f87c227e3bfc2018111177ae13b9a208b07eab59fca4899d8c692bafdba3fe03f3cedcd3b6e8 WHIRLPOOL 66f1007cabfa2029617f4e9b32008f2b03aaaf5d5fb313fc679219edb1a71c30afa30a4e0dbe12324a54cb01c5c3a21d82d2b950f458cb6c26962c848ce95191
 EBUILD happy-1.18.9.ebuild 2015 SHA256 b693f9e8f653a36630cd8436415210077cd992b070bc733832fc10e77a005a4b SHA512 87f76db74c57738eb3b4055a7fd12b7b4ec3f962301825b70937e036f47c3235bed313a1e35ab00d772aa58f14feaa3a70cea5643c1c41bd0aede116905aef97 WHIRLPOOL f355c65e3fa8d8a7fa82332d58252f9dbca9ab27f9cf633e746dcbca409d0883417427a7992c3acc41d87ccb9ccf92e2194c82ef3aa30c05def874df771002fa
-MISC ChangeLog 8082 SHA256 961ae24026a195a3e1b30ce1765a039d18d13d5aa016363745493d0c0bd589c4 SHA512 f75778c6fbb6c05def11abc782f47967c4c00a40374cc2ace732d3f47b78ffefe5b9b5a69bc36317f0fc6b24eb525995417df6b8af8fed34cbd15c8a822c29bd WHIRLPOOL cedaca21d57219b003d0cedd13f38f171c248c2f9e0a63db339cda68bff4fb6a2dfb737cdc495dd104001fcb19b4a1b9db54a85c3ca0f995d216c190788fe2b2
+MISC ChangeLog 8301 SHA256 4d27e2ed51c9518ee1f26efff5adf1ce5d53caad805aa9feaf9a3914604d8515 SHA512 4bf644cbee4ec37e6ebafda5a97700ab309da0607856b50991e0f00d69de99e97def4bf505951f4c2a492fe9891198f508e26b19e448af740ac25c496913178e WHIRLPOOL 52510ac37b3c8db43884ec32b24509dad11847bb0ce86731cb163d96a65b5f44ea541fca97b9a159caafc49959dd600c23e98579bbbae067391793c5fc042be6
 MISC metadata.xml 307 SHA256 ce829be1fc42dd20b0fab8cfda883f3999b32dd93e237db97f5e099e5543828b SHA512 7542056774733c0525e655703f0955c80f5e43afdd34ca4b3154cb0dceb09981fe0ae60296bb198aa96b7f8b1d5edbf8ae65da550fd502733a73308d1306a1f5 WHIRLPOOL 746593885e41cd7b39950755c77b2eaba5a2d129cf891b0ab0a9f86f78a3b23d5304dcbd4523e9a9df171635ac59e2466084ec104ac0c2162c8d4e8dcf1a39ef
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJQ29iXAAoJEKXdFCfdEflKoKIP/2NZqiHgNYrmVFv3Fiq+K8+x
-CjuROC7W1a2CxqjOS/A2djdiaTHzim6fPxBTG/bSJYDurb8E97AQ2S08BTIsDA6+
-BTmDVxLYDKaxfszyja2TWvPR8rL9yMhthgo2eCJqRpkX85ZGDUmGRiDBcuTqZg7a
-dLKZbyzD3IspU1/Coga19CvncNCFg1cQvO5CLEraFGTcEXEaC3LWg7cTm3LLKNre
-WD9pgNNkMEfLgnEBd/6CagwB+0l1YYpUHdbCRae2m1kWPHzvuiusL6QEjW7TGvRN
-Jw6zwWj9oJfFCiIT+zWEHkSHsp/7nTHH1jDJgM6eHPcNOIsBlqSmo2+u9VTKqhl2
-uib98ek/3CAT+6phsjQq/sqjTLKeoY0UZYp1glvtSctU+vxAnyKRF0PvyJ9nNIGP
-ruOK09o1mx+8lWiqJkJ2G/gpR8lWxMgbtcvgpyIZWkY03R2GurECIvLx9lvhbU9I
-ofzgx0SLy4nnxr7BlnUv9DOE7AmbKbZqaG1cLKRyWQr3BOwHNwrscM4WtNm3avkW
-217KMCaUzmTVkw7pZOyM38Fm+o3Xrt0TnkCQ7HNapIBJYDBbchKPCuiK9/NXpfdM
-fn2fDTSiZXkNDqDJtbwT/4MMSSQj+L6M6ufHGpoHA5W2MDtvXyW2iZiFOMx9Vawo
-tSpfLZqKl77XdsXPcXOh
-=9VsK
+iEYEAREIAAYFAlDctjYACgkQcaHudmEf86rEfACfY1ZmNsShcyiMb7vg49TE0Xva
+o4YAniQUHoL1K6gmBYGzx4pwMXDC0Ync
+=Y5+k
 -----END PGP SIGNATURE-----
diff --git a/dev-haskell/happy/files/happy-1.18.9-missing-tests.patch b/dev-haskell/happy/files/happy-1.18.9-missing-tests.patch
index 5b2b9b2cb42c..eb993678723d 100644
--- a/dev-haskell/happy/files/happy-1.18.9-missing-tests.patch
+++ b/dev-haskell/happy/files/happy-1.18.9-missing-tests.patch
@@ -19,7 +19,7 @@
 @@ -1,5 +1,5 @@
  HAPPY=../dist/build/happy/happy
 -HC=ghc
-+HC=ghc -package array -package mtl
++HC=ghc -hide-all-packages -package base -package array -package mtl
  
  TESTS = Test.ly TestMulti.ly TestPrecedence.ly bug001.ly \
  	monad001.y monad002.ly precedence001.ly precedence002.y \
diff --git a/dev-haskell/happy/happy-1.18.10.ebuild b/dev-haskell/happy/happy-1.18.10.ebuild
index 2e152f13a497..3d55a933dd57 100644
--- a/dev-haskell/happy/happy-1.18.10.ebuild
+++ b/dev-haskell/happy/happy-1.18.10.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/happy/happy-1.18.10.ebuild,v 1.1 2012/11/18 14:00:29 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/happy/happy-1.18.10.ebuild,v 1.2 2012/12/27 20:57:45 slyfox Exp $
 
 EAPI="4"
 
@@ -50,14 +50,6 @@ src_compile() {
 }
 
 src_test() {
-	if has_version "dev-haskell/monads-fd"; then
-		sed -e 's@HC=ghc@HC=ghc -hide-package monads-fd@' \
-			-i "${S}/tests/Makefile" || die "Could not patch tests Makefile"
-	fi
-	if has_version "dev-haskell/monads-tf"; then
-		sed -e 's@HC=ghc@HC=ghc -hide-package monads-tf@' \
-			-i "${S}/tests/Makefile" || die "Could not patch tests Makefile"
-	fi
 	emake -C "${S}/tests/" || die "emake for tests failed"
 }