commit:     0d27cfb7da7fdd62b72a34998eca57c164afedfd
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 28 11:11:07 2022 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Tue Jun 28 11:11:46 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d27cfb7

www-client/chromium: fix java detection

Older java versions, e.g., from Java 8, have only '-version', not
'--version'. Commited as requested by sam.

Closes: https://bugs.gentoo.org/854822
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 www-client/chromium/chromium-103.0.5060.53.ebuild | 2 +-
 www-client/chromium/chromium-104.0.5112.12.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/www-client/chromium/chromium-103.0.5060.53.ebuild 
b/www-client/chromium/chromium-103.0.5060.53.ebuild
index 6912dfb1e8af..5b22ba929a25 100644
--- a/www-client/chromium/chromium-103.0.5060.53.ebuild
+++ b/www-client/chromium/chromium-103.0.5060.53.ebuild
@@ -247,7 +247,7 @@ pre_build_checks() {
                        fi
                fi
                if use js-type-check; then
-                       "${EPREFIX}"/usr/bin/java --version 2>1 > /dev/null || 
die "Java VM not setup correctly"
+                       "${EPREFIX}"/usr/bin/java -version 2>1 > /dev/null || 
die "Java VM not setup correctly"
                fi
        fi
 

diff --git a/www-client/chromium/chromium-104.0.5112.12.ebuild 
b/www-client/chromium/chromium-104.0.5112.12.ebuild
index 82f9045bb733..2e826d7e3f0a 100644
--- a/www-client/chromium/chromium-104.0.5112.12.ebuild
+++ b/www-client/chromium/chromium-104.0.5112.12.ebuild
@@ -257,7 +257,7 @@ pre_build_checks() {
                        fi
                fi
                if use js-type-check; then
-                       "${EPREFIX}"/usr/bin/java --version 2>1 > /dev/null || 
die "Java VM not setup correctly"
+                       "${EPREFIX}"/usr/bin/java -version 2>1 > /dev/null || 
die "Java VM not setup correctly"
                fi
        fi
 

Reply via email to