diff options
| author |   Florian Schmaus <flow@gentoo.org> | 2022-04-25 08:50:41 +0200 |
|---|---|---|
| committer | Florian Schmaus <flow@gentoo.org> | 2022-04-25 08:50:41 +0200 |
| commit | 3586e009d595162f554b22eee043d8ed73ad57b8 (patch) | |
| tree | 644c78ce254b2e56cf5784c8e86903d03510f216 /dev-java | |
| parent | sci-misc/boinc: fix dependencies (diff) | |
| download | gentoo-3586e009d595162f554b22eee043d8ed73ad57b8.tar.gz gentoo-3586e009d595162f554b22eee043d8ed73ad57b8.tar.bz2 gentoo-3586e009d595162f554b22eee043d8ed73ad57b8.zip | |
dev-java/openjdk-jre-bin: fix JAVA_HOME in vm env file
Closes: https://bugs.gentoo.org/833796
Signed-off-by: Florian Schmaus <flow@gentoo.org>
Diffstat (limited to 'dev-java')
| -rw-r--r-- | dev-java/openjdk-jre-bin/files/openjdk-jre-bin-11.env.sh | 6 | ||||
| -rw-r--r-- | dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.14_p9-r1.ebuild (renamed from dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.14_p9.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 index d7a2d14be024..d7a2d14be024 100644 --- 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 |