dev-java/openj9-openjdk-*: fix env

6 files changed, 38 insertions, 6 deletions

diff --git a/dev-java/openj9-openjdk-bin/files/openjdk-bin-14.env.sh b/dev-java/openj9-openjdk-bin/files/openj9-openjdk-bin-11.env.sh
index 9e9c5ec..2e200d9 100644
--- a/dev-java/openj9-openjdk-bin/files/openjdk-bin-14.env.sh
+++ b/dev-java/openj9-openjdk-bin/files/openj9-openjdk-bin-11.env.sh
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-VERSION="AdoptOpenJDK ${PV}"
+VERSION="AdoptOpenJDK ${DL_PV}"
 JAVA_HOME="${EPREFIX}/opt/${P}"
 JDK_HOME="${EPREFIX}/opt/${P}"
 JAVAC="\${JAVA_HOME}/bin/javac"
diff --git a/dev-java/openj9-openjdk-bin/files/openj9-openjdk-bin-14.env.sh b/dev-java/openj9-openjdk-bin/files/openj9-openjdk-bin-14.env.sh
new file mode 100644
index 0000000..2e200d9
--- /dev/null
+++ b/dev-java/openj9-openjdk-bin/files/openj9-openjdk-bin-14.env.sh
@@ -0,0 +1,16 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+VERSION="AdoptOpenJDK ${DL_PV}"
+JAVA_HOME="${EPREFIX}/opt/${P}"
+JDK_HOME="${EPREFIX}/opt/${P}"
+JAVAC="\${JAVA_HOME}/bin/javac"
+PATH="\${JAVA_HOME}/bin"
+ROOTPATH="\${JAVA_HOME}/bin"
+LDPATH="\${JAVA_HOME}/lib/:\${JAVA_HOME}/lib/server/"
+MANPATH=""
+PROVIDES_TYPE="JDK JRE"
+PROVIDES_VERSION="${SLOT}"
+BOOTCLASSPATH=""
+GENERATION="2"
+ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH"
diff --git a/dev-java/openj9-openjdk-jre-bin/files/openjdk-jre-bin-11.env.sh b/dev-java/openj9-openjdk-jre-bin/files/openj9-openjdk-jre-bin-11.env.sh
index ec0dca4..1ad9132 100644
--- a/dev-java/openj9-openjdk-jre-bin/files/openjdk-jre-bin-11.env.sh
+++ b/dev-java/openj9-openjdk-jre-bin/files/openj9-openjdk-jre-bin-11.env.sh
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-VERSION="AdoptOpenJDK JRE ${PV}"
+VERSION="AdoptOpenJDK JRE ${DL_PV}"
 JAVA_HOME="${EPREFIX}/opt/${P}"
 JDK_HOME="${EPREFIX}/opt/${P}"
 JAVAC="\${JAVA_HOME}/bin/javac"
diff --git a/dev-java/openj9-openjdk-jre-bin/files/openjdk-jre-bin-8.env.sh b/dev-java/openj9-openjdk-jre-bin/files/openj9-openjdk-jre-bin-14.env.sh
index fabc13c..1ad9132 100644
--- a/dev-java/openj9-openjdk-jre-bin/files/openjdk-jre-bin-8.env.sh
+++ b/dev-java/openj9-openjdk-jre-bin/files/openj9-openjdk-jre-bin-14.env.sh
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-VERSION="AdoptOpenJDK JRE ${PV}"
+VERSION="AdoptOpenJDK JRE ${DL_PV}"
 JAVA_HOME="${EPREFIX}/opt/${P}"
 JDK_HOME="${EPREFIX}/opt/${P}"
 JAVAC="\${JAVA_HOME}/bin/javac"
@@ -10,7 +10,7 @@ ROOTPATH="\${JAVA_HOME}/bin"
 LDPATH="\${JAVA_HOME}/lib/:\${JAVA_HOME}/lib/server/"
 MANPATH="\${JAVA_HOME}/man"
 PROVIDES_TYPE="JRE"
-PROVIDES_VERSION="1.${SLOT}"
-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"
+PROVIDES_VERSION="${SLOT}"
+BOOTCLASSPATH=""
 GENERATION="2"
 ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH"
diff --git a/dev-java/openj9-openjdk/files/openjdk-14.env.sh b/dev-java/openj9-openjdk/files/openj9-openjdk-11.env.sh
index 96c4be7..5aac9c7 100644
--- a/dev-java/openj9-openjdk/files/openjdk-14.env.sh
+++ b/dev-java/openj9-openjdk/files/openj9-openjdk-11.env.sh
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-VERSION="OpenJDK ${PV}"
+VERSION="OpenJDK ${SLOT} with OpenJ9 ${OPENJ9_PV}"
 JAVA_HOME="${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}"
 JDK_HOME="${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}"
 JAVAC="\${JAVA_HOME}/bin/javac"
diff --git a/dev-java/openj9-openjdk/files/openj9-openjdk-14.env.sh b/dev-java/openj9-openjdk/files/openj9-openjdk-14.env.sh
new file mode 100644
index 0000000..5aac9c7
--- /dev/null
+++ b/dev-java/openj9-openjdk/files/openj9-openjdk-14.env.sh
@@ -0,0 +1,16 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+VERSION="OpenJDK ${SLOT} with OpenJ9 ${OPENJ9_PV}"
+JAVA_HOME="${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}"
+JDK_HOME="${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}"
+JAVAC="\${JAVA_HOME}/bin/javac"
+PATH="\${JAVA_HOME}/bin"
+ROOTPATH="\${JAVA_HOME}/bin"
+LDPATH="\${JAVA_HOME}/lib/:\${JAVA_HOME}/lib/server/"
+MANPATH=""
+PROVIDES_TYPE="JDK JRE"
+PROVIDES_VERSION="${SLOT}"
+BOOTCLASSPATH=""
+GENERATION="2"
+ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH"