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
commit82b8d5001e8dc0fca8173a50086cd745c227f37c (patch)
treebd0b5aee41e4d58a41b31ca0e9e9487131d61b24 /dev-lang
parentVersion bump for security bug #303725 (diff)
downloadhistorical-82b8d5001e8dc0fca8173a50086cd745c227f37c.tar.gz
historical-82b8d5001e8dc0fca8173a50086cd745c227f37c.tar.bz2
historical-82b8d5001e8dc0fca8173a50086cd745c227f37c.zip
Add WORKSPACE slice to PATH
Package-Manager: portage-2.1.7.16/cvs/Linux x86_64
Diffstat (limited to 'dev-lang')
-rw-r--r--dev-lang/mercury/ChangeLog5
-rw-r--r--dev-lang/mercury/Manifest4
-rw-r--r--dev-lang/mercury/mercury-10.04_beta1.ebuild7
3 files changed, 9 insertions, 7 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/Manifest b/dev-lang/mercury/Manifest
index 59503e1d8bbf..0783f0e2b260 100644
--- a/dev-lang/mercury/Manifest
+++ b/dev-lang/mercury/Manifest
@@ -21,6 +21,6 @@ DIST mercury-compiler-10.04-beta.tar.gz 27795148 RMD160 3c3aeca9d96d2294d2dc7bd4
DIST mercury-tests-0.13.1.tar.gz 986644 RMD160 779609ba5c985e562b0962434c9281c07ddaa5cb SHA1 7f08467e6642daa4fce9136e12b4e5ca2ac41b9d SHA256 f6c8250b9996584d3c7cd6cc0609716027b127e54b2aedf5ebfcab98a44159dc
DIST mercury-tests-10.04-beta.tar.gz 5876463 RMD160 b29179ae78b1dcb0619684228abac0d6cd4471a8 SHA1 3fed8b5fbe840e844df725f386a08836825d48da SHA256 4c1bf8eece8f95fdf13eeaef8dc5ea4fee30646d20fed684fe6eb710d5234833
EBUILD mercury-0.13.1-r2.ebuild 3350 RMD160 8a1635d8c301751b2da7260785baaa788b81b620 SHA1 2aae241faf85518b6bb6d162939b2f293eb67649 SHA256 af0a034331b9a7acb0d0a7dea42fc84aafcf9e66de2b6fceddc623f975689c44
-EBUILD mercury-10.04_beta1.ebuild 3529 RMD160 e7c42ac3a71da0519527a33ac3b427c8ff28cdf2 SHA1 fa046772ed809bb8fdca6933c038867fa4cd1f69 SHA256 7344ddefeeb7237a4c700550b8f863d6430d2b4982e152de3c373bcb637bca15
-MISC ChangeLog 20464 RMD160 9610d9c0b7c0f0338157e7cd068b3dfd613543df SHA1 e2bdd151cb0669751ea0aee64df0a5da3ad9c359 SHA256 4cf2ea492528125b4365c87943806fe396a937178ec4a9b514d2d3972c216361
+EBUILD mercury-10.04_beta1.ebuild 3518 RMD160 30b2f94eacc181335408407657b647b0e361e1e6 SHA1 578cb02e049a88f96bf92737265df51afc3bdcfc SHA256 dc9651d2e82d9eef215446e51e1173454c9d9acbc271cae94c1d61d5f72f1025
+MISC ChangeLog 20556 RMD160 0bf3c18ff14083f1f9be7fd4548e05a2331b30ab SHA1 2814a691fc1ff165bb9064c9515e7504a6cf6021 SHA256 355f17ea5930830fe8def9bf78aa1e07309f7c09b1622f73ca968683c6bb30d8
MISC metadata.xml 247 RMD160 1b3df3c501d9a3b2e2651668be405677e8416397 SHA1 7b705a8a3368abab6ad31ea2fcb5e5db865d92b1 SHA256 2768d0688d443184194068497dcafb2e5d67521980cb46b7e8efc07d3900bcaa
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 \