summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeri Harris <keri@gentoo.org>2010-02-18 08:33:30 +0000
committerKeri Harris <keri@gentoo.org>2010-02-18 08:33:30 +0000
commit11e368a4fbee493031eee9972c06cc01f68bdf2e (patch)
tree288642372dca3a9065497adff5689a171245c1e6 /dev-lang/mercury
parentVersion bump for security bug #303725 (diff)
downloadgentoo-2-11e368a4fbee493031eee9972c06cc01f68bdf2e.tar.gz
gentoo-2-11e368a4fbee493031eee9972c06cc01f68bdf2e.tar.bz2
gentoo-2-11e368a4fbee493031eee9972c06cc01f68bdf2e.zip
Add WORKSPACE slice to PATH
(Portage version: 2.1.7.16/cvs/Linux x86_64)
Diffstat (limited to 'dev-lang/mercury')
-rw-r--r--dev-lang/mercury/ChangeLog5
-rw-r--r--dev-lang/mercury/mercury-10.04_beta1.ebuild7
2 files changed, 7 insertions, 5 deletions
diff --git a/dev-lang/mercury/ChangeLog b/dev-lang/mercury/ChangeLog
index 56db122cd2a0..ca62473777cc 100644
--- a/dev-lang/mercury/ChangeLog
+++ b/dev-lang/mercury/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-lang/mercury
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.100 2010/02/16 06:13:34 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.101 2010/02/18 08:33:30 keri Exp $
+
+ 18 Feb 2010; <keri@gentoo.org> mercury-10.04_beta1.ebuild:
+ Add WORKSPACE slice to PATH
16 Feb 2010; <keri@gentoo.org> ChangeLog:
Do not run install_config mmake rule
diff --git a/dev-lang/mercury/mercury-10.04_beta1.ebuild b/dev-lang/mercury/mercury-10.04_beta1.ebuild
index 5bfb33809297..d589e57ff6ee 100644
--- a/dev-lang/mercury/mercury-10.04_beta1.ebuild
+++ b/dev-lang/mercury/mercury-10.04_beta1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-10.04_beta1.ebuild,v 1.4 2010/02/15 18:30:25 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-10.04_beta1.ebuild,v 1.5 2010/02/18 08:33:30 keri Exp $
inherit elisp-common eutils flag-o-matic java-pkg-opt-2 multilib
@@ -64,8 +64,7 @@ src_compile() {
$(use_enable debug debug-grades) \
$(use_enable threads par-grades) \
$(use_enable !minimal most-grades) \
- $(use_with readline) \
- PACKAGE_VERSION=${PV}"
+ $(use_with readline)"
econf \
${myconf} \
@@ -83,7 +82,7 @@ src_test() {
cd "${TESTDIR}"
sed -i -e "s:@WORKSPACE@:${TWS}:" WS_FLAGS.ws
- PATH="${TWS}"/scripts:"${TWS}"/util:"${PATH}" \
+ PATH="${TWS}"/scripts:"${TWS}"/util:"${TWS}"/slice:"${PATH}" \
TERM="" \
WORKSPACE="${TWS}" \
MERCURY_COMPILER="${TWS}"/compiler/mercury_compile \