commit: c070f1fbc1cf036100de3dbe51bca5bcfb99567a
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 5 20:39:01 2016 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Fri Aug 5 20:39:01 2016 +0000
URL: https://gitweb.gentoo.org/proj/java.git/commit/?id=c070f1fb
dev-java/icedtea: Switch from set_java_env to new java-vm_install-env
Package-Manager: portage-2.3.0
dev-java/icedtea/files/icedtea.env | 18 ------------------
dev-java/icedtea/files/icedtea.env.sh | 18 ++++++++++++++++++
dev-java/icedtea/icedtea-3.1.0.ebuild | 2 +-
dev-java/icedtea/icedtea-6.1.13.11.ebuild | 2 +-
dev-java/icedtea/icedtea-6.9999.ebuild | 2 +-
dev-java/icedtea/icedtea-7.2.6.7.ebuild | 2 +-
dev-java/icedtea/icedtea-7.2.7.0_pre05.ebuild | 2 +-
7 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/dev-java/icedtea/files/icedtea.env
b/dev-java/icedtea/files/icedtea.env
deleted file mode 100644
index 463add6..0000000
--- a/dev-java/icedtea/files/icedtea.env
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-VERSION="IcedTea JDK @PV@"
-JAVA_HOME="@GENTOO_PORTAGE_EPREFIX@/usr/@LIBDIR@/icedtea@SLOT@"
-JDK_HOME="@GENTOO_PORTAGE_EPREFIX@/usr/@LIBDIR@/icedtea@SLOT@"
-JAVAC="${JAVA_HOME}/bin/javac"
-PATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
-ROOTPATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
-LDPATH="${JAVA_HOME}/jre/lib/@PLATFORM@/:${JAVA_HOME}/jre/lib/@PLATFORM@/native_threads/:${JAVA_HOME}/jre/lib/@PLATFORM@/xawt/:${JAVA_HOME}/jre/lib/@PLATFORM@/server/"
-MANPATH="@GENTOO_PORTAGE_EPREFIX@/usr/@LIBDIR@/icedtea@SLOT@/man"
-PROVIDES_TYPE="JDK JRE"
-PROVIDES_VERSION="1.@SLOT@"
-# Taken from sun.boot.class.path property
-BOOTCLASSPATH="${JAVA_HOME}/jre/lib/resources.jar:${JAVA_HOME}/jre/lib/rt.jar:${JAVA_HOME}/jre/lib/jsse.jar:${JAVA_HOME}/jre/lib/jce.jar:${JAVA_HOME}/jre/lib/charsets.jar"
-GENERATION="2"
-ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH"
diff --git a/dev-java/icedtea/files/icedtea.env.sh
b/dev-java/icedtea/files/icedtea.env.sh
new file mode 100644
index 0000000..d24e1e6
--- /dev/null
+++ b/dev-java/icedtea/files/icedtea.env.sh
@@ -0,0 +1,18 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+VERSION="IcedTea JDK ${PV}"
+JAVA_HOME="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}"
+JDK_HOME="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}"
+JAVAC="\${JAVA_HOME}/bin/javac"
+PATH="\${JAVA_HOME}/bin:\${JAVA_HOME}/jre/bin"
+ROOTPATH="\${JAVA_HOME}/bin:\${JAVA_HOME}/jre/bin"
+LDPATH="\${JAVA_HOME}/jre/lib/$(get_system_arch)/:\${JAVA_HOME}/jre/lib/$(get_system_arch)/server/$([[
${SLOT} = [67] ]] && printf
:\${JAVA_HOME}/jre/lib/$(get_system_arch)/xawt/)$([[ ${SLOT} = 6 ]] && printf
:\${JAVA_HOME}/jre/lib/$(get_system_arch)/native_threads/)"
+MANPATH="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}/man"
+PROVIDES_TYPE="JDK JRE"
+PROVIDES_VERSION="1.${SLOT}"
+# Taken from sun.boot.class.path property
+BOOTCLASSPATH="\${JAVA_HOME}/jre/lib/resources.jar:\${JAVA_HOME}/jre/lib/rt.jar:\${JAVA_HOME}/jre/lib/sunrsasign.jar:\${JAVA_HOME}/jre/lib/jsse.jar:\${JAVA_HOME}/jre/lib/jce.jar:\${JAVA_HOME}/jre/lib/charsets.jar:\${JAVA_HOME}/jre/lib/jfr.jar"
+GENERATION="2"
+ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH"
diff --git a/dev-java/icedtea/icedtea-3.1.0.ebuild
b/dev-java/icedtea/icedtea-3.1.0.ebuild
index 321f773..3aeb583 100644
--- a/dev-java/icedtea/icedtea-3.1.0.ebuild
+++ b/dev-java/icedtea/icedtea-3.1.0.ebuild
@@ -360,7 +360,7 @@ src_install() {
cp -vRP cacerts "${ddest}/jre/lib/security/" || die
chmod 644 "${ddest}/jre/lib/security/cacerts" || die
- set_java_env "${FILESDIR}/icedtea.env"
+ java-vm_install-env "${FILESDIR}/icedtea.env.sh"
java-vm_sandbox-predict /proc/self/coredump_filter
}
diff --git a/dev-java/icedtea/icedtea-6.1.13.11.ebuild
b/dev-java/icedtea/icedtea-6.1.13.11.ebuild
index 4e90f1f..f1ef452 100644
--- a/dev-java/icedtea/icedtea-6.1.13.11.ebuild
+++ b/dev-java/icedtea/icedtea-6.1.13.11.ebuild
@@ -344,7 +344,7 @@ src_install() {
cp -vRP cacerts "${ddest}/jre/lib/security/" || die
chmod 644 "${ddest}/jre/lib/security/cacerts" || die
- set_java_env "${FILESDIR}/icedtea.env"
+ java-vm_install-env "${FILESDIR}/icedtea.env.sh"
java-vm_sandbox-predict /proc/self/coredump_filter
}
diff --git a/dev-java/icedtea/icedtea-6.9999.ebuild
b/dev-java/icedtea/icedtea-6.9999.ebuild
index 7bd3197..d60452f 100644
--- a/dev-java/icedtea/icedtea-6.9999.ebuild
+++ b/dev-java/icedtea/icedtea-6.9999.ebuild
@@ -344,7 +344,7 @@ src_install() {
cp -vRP cacerts "${ddest}/jre/lib/security/" || die
chmod 644 "${ddest}/jre/lib/security/cacerts" || die
- set_java_env "${FILESDIR}/icedtea.env"
+ java-vm_install-env "${FILESDIR}/icedtea.env.sh"
java-vm_sandbox-predict /proc/self/coredump_filter
}
diff --git a/dev-java/icedtea/icedtea-7.2.6.7.ebuild
b/dev-java/icedtea/icedtea-7.2.6.7.ebuild
index 19f400d..fe9ade9 100644
--- a/dev-java/icedtea/icedtea-7.2.6.7.ebuild
+++ b/dev-java/icedtea/icedtea-7.2.6.7.ebuild
@@ -370,7 +370,7 @@ src_install() {
cp -vRP cacerts "${ddest}/jre/lib/security/" || die
chmod 644 "${ddest}/jre/lib/security/cacerts" || die
- set_java_env "${FILESDIR}/icedtea.env"
+ java-vm_install-env "${FILESDIR}/icedtea.env.sh"
java-vm_sandbox-predict /proc/self/coredump_filter
}
diff --git a/dev-java/icedtea/icedtea-7.2.7.0_pre05.ebuild
b/dev-java/icedtea/icedtea-7.2.7.0_pre05.ebuild
index 2e80c20..a425040 100644
--- a/dev-java/icedtea/icedtea-7.2.7.0_pre05.ebuild
+++ b/dev-java/icedtea/icedtea-7.2.7.0_pre05.ebuild
@@ -373,7 +373,7 @@ src_install() {
cp -vRP cacerts "${ddest}/jre/lib/security/" || die
chmod 644 "${ddest}/jre/lib/security/cacerts" || die
- set_java_env "${FILESDIR}/icedtea.env"
+ java-vm_install-env "${FILESDIR}/icedtea.env.sh"
java-vm_sandbox-predict /proc/self/coredump_filter
}
