commit: 3586e009d595162f554b22eee043d8ed73ad57b8 Author: Florian Schmaus <flow <AT> gentoo <DOT> org> AuthorDate: Mon Apr 25 06:50:41 2022 +0000 Commit: Florian Schmaus <flow <AT> gentoo <DOT> org> CommitDate: Mon Apr 25 06:50:41 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3586e009
dev-java/openjdk-jre-bin: fix JAVA_HOME in vm env file Closes: https://bugs.gentoo.org/833796 Signed-off-by: Florian Schmaus <flow <AT> gentoo.org> dev-java/openjdk-jre-bin/files/openjdk-jre-bin-11.env.sh | 6 +++--- ...e-bin-11.0.14_p9.ebuild => openjdk-jre-bin-11.0.14_p9-r1.ebuild} | 0 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-11.env.sh b/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-11.env.sh index fced31b2be32..258f0d499fc0 100644 --- a/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-11.env.sh +++ b/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-11.env.sh @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 VERSION="Eclipse Temurin JRE ${PV}" -JAVA_HOME="${EPREFIX}/opt/${P}" -JDK_HOME="${EPREFIX}/opt/${P}" +JAVA_HOME="${EPREFIX}/opt/${PN}-${SLOT}" +JDK_HOME="${JAVA_HOME}" JAVAC="\${JAVA_HOME}/bin/javac" PATH="\${JAVA_HOME}/bin" ROOTPATH="\${JAVA_HOME}/bin" diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.14_p9.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.14_p9-r1.ebuild similarity index 100% rename from dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.14_p9.ebuild rename to dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.14_p9-r1.ebuild
