summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndres Loeh <kosmikus@gentoo.org>2005-03-24 15:05:31 +0000
committerAndres Loeh <kosmikus@gentoo.org>2005-03-24 15:05:31 +0000
commit38c9de57ae6ada9589c81232953eff1a9482e2a8 (patch)
treeca5ffcde33cc5118c668239aa4513a3dbf9ea3e9 /dev-haskell
parentFix a silly error (diff)
downloadgentoo-2-38c9de57ae6ada9589c81232953eff1a9482e2a8.tar.gz
gentoo-2-38c9de57ae6ada9589c81232953eff1a9482e2a8.tar.bz2
gentoo-2-38c9de57ae6ada9589c81232953eff1a9482e2a8.zip
Use a safer check to test the ghc version used to compile the package.
(Portage version: 2.0.51.19)
Diffstat (limited to 'dev-haskell')
-rw-r--r--dev-haskell/happy/ChangeLog5
-rw-r--r--dev-haskell/happy/happy-1.15.ebuild6
2 files changed, 7 insertions, 4 deletions
diff --git a/dev-haskell/happy/ChangeLog b/dev-haskell/happy/ChangeLog
index b9e2801ad165..7169055ec5e3 100644
--- a/dev-haskell/happy/ChangeLog
+++ b/dev-haskell/happy/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-haskell/happy
# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/happy/ChangeLog,v 1.10 2005/03/19 13:12:49 kosmikus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/happy/ChangeLog,v 1.11 2005/03/24 15:05:31 kosmikus Exp $
+
+ 24 Mar 2005; Andres Loeh <kosmikus@gentoo.org> happy-1.15.ebuild:
+ Use ghc-package.eclass to check for ghc-6.4.
19 Mar 2005; Andres Loeh <kosmikus@gentoo.org> happy-1.14.ebuild,
happy-1.15.ebuild:
diff --git a/dev-haskell/happy/happy-1.15.ebuild b/dev-haskell/happy/happy-1.15.ebuild
index b2c1894d19cb..1f86efba0b47 100644
--- a/dev-haskell/happy/happy-1.15.ebuild
+++ b/dev-haskell/happy/happy-1.15.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/happy/happy-1.15.ebuild,v 1.3 2005/03/19 13:12:49 kosmikus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/happy/happy-1.15.ebuild,v 1.4 2005/03/24 15:05:31 kosmikus Exp $
-inherit base eutils
+inherit base eutils ghc-package
DESCRIPTION="A yacc-like parser generator for Haskell"
HOMEPAGE="http://haskell.org/happy/"
@@ -24,7 +24,7 @@ src_unpack() {
src_compile() {
econf || die "configure failed"
- if has_version '>=dev-lang/ghc-6.4'; then
+ if $(ghc-cabal); then
echo "SRC_HC_OPTS += -ignore-package util" >> mk/build.mk
fi
emake -j1 || die "make failed"