[gentoo-commits] repo/gentoo:master commit in: dev-java/oracle-jdk-bin/, dev-java/oracle-jdk-bin/files/

[James Le Cuirot]

commit:     0cf038536759e588cf2d1e25539fb6d62c169d23
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 21 23:12:34 2017 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Mon Jan 23 22:52:07 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cf03853

dev-java/oracle-jdk-bin: Migrate to java-vm_install-env

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 dev-java/oracle-jdk-bin/files/oracle-jdk-bin.env.sh     | 17 +++++++++++++++++
 dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.121.ebuild |  2 +-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/dev-java/oracle-jdk-bin/files/oracle-jdk-bin.env.sh 
b/dev-java/oracle-jdk-bin/files/oracle-jdk-bin.env.sh
new file mode 100644
index 00000000..86e7a6b
--- /dev/null
+++ b/dev-java/oracle-jdk-bin/files/oracle-jdk-bin.env.sh
@@ -0,0 +1,17 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+VERSION="Oracle JDK ${PV}"
+JAVA_HOME="${EPREFIX}/opt/${P}"
+JDK_HOME="${EPREFIX}/opt/${P}"
+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/"
+MANPATH="${EPREFIX}/opt/${P}/man"
+PROVIDES_TYPE="JDK JRE"
+PROVIDES_VERSION="${SLOT}"
+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/classes"
+GENERATION="2"
+ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH"

diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.121.ebuild 
b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.121.ebuild
index ad9f0f7..82fc8b6 100644
--- a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.121.ebuild
+++ b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.121.ebuild
@@ -351,7 +351,7 @@ src_install() {
                done
        fi
 
-       set_java_env
+       java-vm_install-env "${FILESDIR}"/${PN}.env.sh
        java-vm_revdep-mask
        java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
 }