summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRalph Sennhauser <sera@gentoo.org>2013-01-13 16:53:02 +0000
committerRalph Sennhauser <sera@gentoo.org>2013-01-13 16:53:02 +0000
commit8f1ae346bc25498dc09df12375b07e96b830ba73 (patch)
tree1c3366f993a0b6665e5b701569282fbcc5407af7 /dev-java
parentAdd dbus[X] to dependencies for tests, bug #402461. Does not really affect de... (diff)
downloadgentoo-2-8f1ae346bc25498dc09df12375b07e96b830ba73.tar.gz
gentoo-2-8f1ae346bc25498dc09df12375b07e96b830ba73.tar.bz2
gentoo-2-8f1ae346bc25498dc09df12375b07e96b830ba73.zip
Make vm env file Prefix aware. #445350
(Portage version: 2.1.11.31/cvs/Linux x86_64, signed Manifest commit with key 3C5CF75A)
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/gcj-jdk/ChangeLog7
-rw-r--r--dev-java/gcj-jdk/files/gcj-jdk.env10
2 files changed, 10 insertions, 7 deletions
diff --git a/dev-java/gcj-jdk/ChangeLog b/dev-java/gcj-jdk/ChangeLog
index 379296b071ae..f0e4a32a1923 100644
--- a/dev-java/gcj-jdk/ChangeLog
+++ b/dev-java/gcj-jdk/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-java/gcj-jdk
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gcj-jdk/ChangeLog,v 1.9 2012/10/23 19:28:58 sera Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gcj-jdk/ChangeLog,v 1.10 2013/01/13 16:53:02 sera Exp $
+
+ 13 Jan 2013; Ralph Sennhauser <sera@gentoo.org> files/gcj-jdk.env:
+ Make vm env file Prefix aware. #445350
*gcj-jdk-4.6.3-r2 (23 Oct 2012)
*gcj-jdk-4.5.4 (23 Oct 2012)
diff --git a/dev-java/gcj-jdk/files/gcj-jdk.env b/dev-java/gcj-jdk/files/gcj-jdk.env
index 96a0367ff6de..e8dfec7b067b 100644
--- a/dev-java/gcj-jdk/files/gcj-jdk.env
+++ b/dev-java/gcj-jdk/files/gcj-jdk.env
@@ -1,11 +1,11 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gcj-jdk/files/gcj-jdk.env,v 1.1 2010/11/14 01:04:18 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gcj-jdk/files/gcj-jdk.env,v 1.2 2013/01/13 16:53:02 sera Exp $
VERSION="GCJ @PV@"
-JAVA_HOME=/usr/lib/@P@
-JDK_HOME=/usr/lib/@P@
-JAVAC=${JAVA_HOME}/bin/javac
+JAVA_HOME="@GENTOO_PORTAGE_EPREFIX@/usr/lib/@P@"
+JDK_HOME="@GENTOO_PORTAGE_EPREFIX@/usr/lib/@P@"
+JAVAC="${JAVA_HOME}/bin/javac"
PATH="${JAVA_HOME}/bin"
ROOTPATH="${JAVA_HOME}/bin"
LDPATH="${JAVA_HOME}/lib"