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

[James Le Cuirot]

commit:     87aeca88e4df13149b752c496b004d15ee7b32e7
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 23 22:20:54 2017 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Mon Jan 23 22:52:22 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87aeca88

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

Package-Manager: Portage-2.3.3, Repoman-2.3.1

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

diff --git a/dev-java/oracle-jre-bin/files/oracle-jre-bin.env.sh 
b/dev-java/oracle-jre-bin/files/oracle-jre-bin.env.sh
new file mode 100644
index 00000000..3803977
--- /dev/null
+++ b/dev-java/oracle-jre-bin/files/oracle-jre-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 JRE ${PV}"
+JAVA_HOME="${EPREFIX}/opt/${P}"
+JDK_HOME="${EPREFIX}/opt/${P}"
+JAVAC="\${JAVA_HOME}/bin/javac"
+PATH="\${JAVA_HOME}/bin:\${JAVA_HOME}/bin"
+ROOTPATH="\${JAVA_HOME}/bin:\${JAVA_HOME}/bin"
+LDPATH="\${JAVA_HOME}/lib/$(get_system_arch)/:\${JAVA_HOME}/lib/$(get_system_arch)/server/"
+MANPATH="${EPREFIX}/opt/${P}/man"
+PROVIDES_TYPE="JRE"
+PROVIDES_VERSION="${SLOT}"
+BOOTCLASSPATH="\${JAVA_HOME}/lib/resources.jar:\${JAVA_HOME}/lib/rt.jar:\${JAVA_HOME}/lib/sunrsasign.jar:\${JAVA_HOME}/lib/jsse.jar:\${JAVA_HOME}/lib/jce.jar:\${JAVA_HOME}/lib/charsets.jar:\${JAVA_HOME}/classes"
+GENERATION="2"
+ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH"

diff --git a/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.121.ebuild 
b/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.121.ebuild
index d980bd7..9c546f1 100644
--- a/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.121.ebuild
+++ b/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.121.ebuild
@@ -234,7 +234,7 @@ src_install() {
        # Remove empty dirs we might have copied.
        find "${D}" -type d -empty -exec rmdir -v {} + || die
 
-       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
 }