[gentoo-commits] repo/gentoo:master commit in: dev-java/openjdk/

[Georgy Yakovlev]

commit:     ffdb83c648b4e646d9b59ed4001d9133d2a5c491
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 26 17:18:47 2022 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Mon Jul  4 10:44:31 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffdb83c6

dev-java/openjdk: use BROOT instead of EPREFIX where appropriate

Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 dev-java/openjdk/openjdk-11.0.15_p10.ebuild | 2 +-
 dev-java/openjdk/openjdk-17.0.3_p7.ebuild   | 8 ++++----
 dev-java/openjdk/openjdk-8.332_p09.ebuild   | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dev-java/openjdk/openjdk-11.0.15_p10.ebuild 
b/dev-java/openjdk/openjdk-11.0.15_p10.ebuild
index 6ead86475351..13011a1a1744 100644
--- a/dev-java/openjdk/openjdk-11.0.15_p10.ebuild
+++ b/dev-java/openjdk/openjdk-11.0.15_p10.ebuild
@@ -138,7 +138,7 @@ pkg_setup() {
 
        if use system-bootstrap; then
                for vm in ${JAVA_PKG_WANT_BUILD_VM}; do
-                       if [[ -d ${EPREFIX}/usr/lib/jvm/${vm} ]]; then
+                       if [[ -d ${BROOT}/usr/lib/jvm/${vm} ]]; then
                                java-pkg-2_pkg_setup
                                return
                        fi

diff --git a/dev-java/openjdk/openjdk-17.0.3_p7.ebuild 
b/dev-java/openjdk/openjdk-17.0.3_p7.ebuild
index d420e8418f31..801109e4f4f2 100644
--- a/dev-java/openjdk/openjdk-17.0.3_p7.ebuild
+++ b/dev-java/openjdk/openjdk-17.0.3_p7.ebuild
@@ -147,7 +147,7 @@ pkg_setup() {
 
        local vm
        for vm in ${JAVA_PKG_WANT_BUILD_VM}; do
-               if [[ -d ${EPREFIX}/usr/lib/jvm/${vm} ]]; then
+               if [[ -d ${BROOT}/usr/lib/jvm/${vm} ]]; then
                        java-pkg-2_pkg_setup
                        return
                fi
@@ -162,15 +162,15 @@ src_prepare() {
 
 src_configure() {
        if has_version dev-java/openjdk:${SLOT}; then
-               export JDK_HOME=${EPREFIX}/usr/$(get_libdir)/openjdk-${SLOT}
+               export JDK_HOME=${BROOT}/usr/$(get_libdir)/openjdk-${SLOT}
        elif use !system-bootstrap ; then
                local xpakvar="${ARCH^^}_XPAK"
                export JDK_HOME="${WORKDIR}/openjdk-bootstrap-${!xpakvar}"
        else
-               JDK_HOME=$(best_version dev-java/openjdk-bin:${SLOT})
+               JDK_HOME=$(best_version -b dev-java/openjdk-bin:${SLOT})
                [[ -n ${JDK_HOME} ]] || die "Build VM not found!"
                JDK_HOME=${JDK_HOME#*/}
-               JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*}
+               JDK_HOME=${BROOT}/opt/${JDK_HOME%-r*}
                export JDK_HOME
        fi
 

diff --git a/dev-java/openjdk/openjdk-8.332_p09.ebuild 
b/dev-java/openjdk/openjdk-8.332_p09.ebuild
index 56ae18e26e00..a375e49ff167 100644
--- a/dev-java/openjdk/openjdk-8.332_p09.ebuild
+++ b/dev-java/openjdk/openjdk-8.332_p09.ebuild
@@ -161,7 +161,7 @@ src_configure() {
                unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC MAKE XARGS
                CFLAGS= CXXFLAGS= LDFLAGS= \
                CONFIG_SITE=/dev/null \
-               CONFIG_SHELL="${EPREFIX}/bin/bash"
+               CONFIG_SHELL="${BROOT}/bin/bash"
                econf "${myconf[@]}"
        )
 }