From 0fc499b75fbb9a5afd3d6ed318785ee899eb4240 Mon Sep 17 00:00:00 2001 From: "Alex Xu (Hello71)" Date: Sun, 31 Jan 2021 09:17:40 -0500 Subject: dev-java/openj9-openjdk-jre-bin: fixes --- .../files/openj9-openjdk-jre-bin-14.env.sh | 16 ---------------- .../files/openj9-openjdk-jre-bin-15.env.sh | 16 ++++++++++++++++ .../openj9-openjdk-jre-bin-11.0.10.9.0.24.0.ebuild | 2 +- .../openj9-openjdk-jre-bin-15.0.2.7.0.24.0.ebuild | 2 +- 4 files changed, 18 insertions(+), 18 deletions(-) delete mode 100644 dev-java/openj9-openjdk-jre-bin/files/openj9-openjdk-jre-bin-14.env.sh create mode 100644 dev-java/openj9-openjdk-jre-bin/files/openj9-openjdk-jre-bin-15.env.sh diff --git a/dev-java/openj9-openjdk-jre-bin/files/openj9-openjdk-jre-bin-14.env.sh b/dev-java/openj9-openjdk-jre-bin/files/openj9-openjdk-jre-bin-14.env.sh deleted file mode 100644 index 1ad9132..0000000 --- a/dev-java/openj9-openjdk-jre-bin/files/openj9-openjdk-jre-bin-14.env.sh +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -VERSION="AdoptOpenJDK JRE ${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="\${JAVA_HOME}/man" -PROVIDES_TYPE="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/openj9-openjdk-jre-bin-15.env.sh b/dev-java/openj9-openjdk-jre-bin/files/openj9-openjdk-jre-bin-15.env.sh new file mode 100644 index 0000000..1ad9132 --- /dev/null +++ b/dev-java/openj9-openjdk-jre-bin/files/openj9-openjdk-jre-bin-15.env.sh @@ -0,0 +1,16 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +VERSION="AdoptOpenJDK JRE ${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="\${JAVA_HOME}/man" +PROVIDES_TYPE="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/openj9-openjdk-jre-bin-11.0.10.9.0.24.0.ebuild b/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-11.0.10.9.0.24.0.ebuild index 4dee424..76ecdb8 100644 --- a/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-11.0.10.9.0.24.0.ebuild +++ b/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-11.0.10.9.0.24.0.ebuild @@ -53,7 +53,7 @@ RDEPEND=" RESTRICT="preserve-libs splitdebug" QA_PREBUILT="*" -S="${WORKDIR}/jdk-${MY_PV}-jre" +S="${WORKDIR}/jdk-${JDK_PV}-jre" src_install() { local dest="/opt/${P}" diff --git a/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-15.0.2.7.0.24.0.ebuild b/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-15.0.2.7.0.24.0.ebuild index 4dee424..76ecdb8 100644 --- a/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-15.0.2.7.0.24.0.ebuild +++ b/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-15.0.2.7.0.24.0.ebuild @@ -53,7 +53,7 @@ RDEPEND=" RESTRICT="preserve-libs splitdebug" QA_PREBUILT="*" -S="${WORKDIR}/jdk-${MY_PV}-jre" +S="${WORKDIR}/jdk-${JDK_PV}-jre" src_install() { local dest="/opt/${P}" -- cgit v1.2.3-54-g00ecf