summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Trofimovich <slyfox@gentoo.org>2012-12-27 20:57:45 +0000
committerSergei Trofimovich <slyfox@gentoo.org>2012-12-27 20:57:45 +0000
commit0ce4193c608bd61fa2a8cf5d738f97f4a1438938 (patch)
treebfe14d783e5e62d62e00ddf9e77f574604553827 /dev-haskell/happy
parentRevert upstream commit causing problems with mouse connection (#431624 by cac... (diff)
downloadgentoo-2-0ce4193c608bd61fa2a8cf5d738f97f4a1438938.tar.gz
gentoo-2-0ce4193c608bd61fa2a8cf5d738f97f4a1438938.tar.bz2
gentoo-2-0ce4193c608bd61fa2a8cf5d738f97f4a1438938.zip
Tuned tests depends by explicitely requiring set of needed packages.
(Portage version: 2.2.0_alpha149_p11/cvs/Linux x86_64, signed Manifest commit with key 611FF3AA)
Diffstat (limited to 'dev-haskell/happy')
-rw-r--r--dev-haskell/happy/ChangeLog7
-rw-r--r--dev-haskell/happy/files/happy-1.18.9-missing-tests.patch2
-rw-r--r--dev-haskell/happy/happy-1.18.10.ebuild10
3 files changed, 8 insertions, 11 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/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"
}