summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeri Harris <keri@gentoo.org>2006-06-09 09:37:15 +0000
committerKeri Harris <keri@gentoo.org>2006-06-09 09:37:15 +0000
commit2669ac32ecca5a046de165813acde67f9114237f (patch)
treea437eec811e14e50e60f381160bcea5b88eb730d /dev-lang/mercury-extras
parentAdd debug support to libgrades. (diff)
downloadgentoo-2-2669ac32ecca5a046de165813acde67f9114237f.tar.gz
gentoo-2-2669ac32ecca5a046de165813acde67f9114237f.tar.bz2
gentoo-2-2669ac32ecca5a046de165813acde67f9114237f.zip
Do not build trailed grades with a minimal mercury compiler.
(Portage version: 2.1_rc4-r3)
Diffstat (limited to 'dev-lang/mercury-extras')
-rw-r--r--dev-lang/mercury-extras/ChangeLog6
-rw-r--r--dev-lang/mercury-extras/mercury-extras-0.13.0_beta20060601.ebuild15
2 files changed, 15 insertions, 6 deletions
diff --git a/dev-lang/mercury-extras/ChangeLog b/dev-lang/mercury-extras/ChangeLog
index 11f763ec1719..22e35600bb9d 100644
--- a/dev-lang/mercury-extras/ChangeLog
+++ b/dev-lang/mercury-extras/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-lang/mercury-extras
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/ChangeLog,v 1.29 2006/06/09 09:05:40 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/ChangeLog,v 1.30 2006/06/09 09:37:15 keri Exp $
+
+ 09 Jun 2006; Keri Harris <keri@gentoo.org>
+ mercury-extras-0.13.0_beta20060601.ebuild:
+ Do not build trailed grades with a minimal mercury compiler.
*mercury-extras-0.12.2-r1 (09 Jun 2006)
diff --git a/dev-lang/mercury-extras/mercury-extras-0.13.0_beta20060601.ebuild b/dev-lang/mercury-extras/mercury-extras-0.13.0_beta20060601.ebuild
index 1e2862eaa697..613a2e512a0a 100644
--- a/dev-lang/mercury-extras/mercury-extras-0.13.0_beta20060601.ebuild
+++ b/dev-lang/mercury-extras/mercury-extras-0.13.0_beta20060601.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/mercury-extras-0.13.0_beta20060601.ebuild,v 1.2 2006/06/08 18:52:38 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/mercury-extras-0.13.0_beta20060601.ebuild,v 1.3 2006/06/09 09:37:15 keri Exp $
inherit eutils versionator
@@ -22,13 +22,12 @@ KEYWORDS="~ppc ~x86"
IUSE="doc glut iodbc odbc opengl tcltk"
DEPEND="~dev-lang/mercury-${PV}
- !<dev-lang/mercury-extras-0.13.0_beta
sys-libs/ncurses
glut? ( virtual/glut )
odbc? ( dev-db/unixODBC )
iodbc? ( !odbc? ( dev-db/libiodbc ) )
opengl? ( virtual/opengl )
- tcltk? ( =dev-lang/tk-8.4*
+ tcktk? ( =dev-lang/tk-8.4*
|| ( (
x11-libs/libX11
x11-libs/libXmu )
@@ -52,8 +51,14 @@ src_unpack() {
sed -i -e "s:curs:concurrency curs:" \
-e "s:posix:posix quickcheck:" \
- -e "s:windows_installer_generator ::" \
- -e "s:xml:trailed_update xml:" Mmakefile
+ -e "s:windows_installer_generator ::" Mmakefile
+ sed -i -e "s:lib/mercury:lib/mercury-${PV}:" posix/Mmakefile
+
+ if built_with_use dev-lang/mercury minimal; then
+ sed -i -e "s:references::" Mmakefile
+ else
+ sed -i -e "s:xml:trailed_update xml:" Mmakefile
+ fi
use glut && sed -i -e "s: lex : graphics/mercury_glut lex :" Mmakefile
use tcltk && sed -i -e "s: lex : graphics/mercury_tcltk lex :" Mmakefile