[gentoo-commits] repo/gentoo:master commit in: dev-util/bazel/

[Florian Schmaus]

commit:     82750a31b643c6c6c26c5262b418f3b6e33e46dd
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Sun May  1 18:58:42 2022 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Sun May  1 19:03:49 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82750a31

dev-util/bazel: fix JDK/JRE dependencies

The bazel versions in ::gentoo do not build with JDK 17. Restrict to
suitable JDKs. Also make RDEPEND a JRE dependency.

Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 dev-util/bazel/bazel-3.7.2-r1.ebuild | 10 +++++++---
 dev-util/bazel/bazel-4.2.2.ebuild    |  8 ++++++--
 dev-util/bazel/bazel-5.0.0.ebuild    |  5 +++--
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/dev-util/bazel/bazel-3.7.2-r1.ebuild 
b/dev-util/bazel/bazel-3.7.2-r1.ebuild
index db3f1fbbb8c0..1ab7cb5b1b1b 100644
--- a/dev-util/bazel/bazel-3.7.2-r1.ebuild
+++ b/dev-util/bazel/bazel-3.7.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,8 +17,12 @@ IUSE="examples tools"
 # strip corrupts the bazel binary
 # test fails with network-sandbox: An error occurred during the fetch of 
repository 'io_bazel_skydoc' (bug 690794)
 RESTRICT="strip test"
-RDEPEND=">=virtual/jdk-1.8:*"
-DEPEND="${RDEPEND}
+RDEPEND=">=virtual/jre-1.8:*"
+DEPEND="
+       || (
+          virtual/jdk:1.8
+          virtual/jdk:11
+       )
        app-arch/unzip
        app-arch/zip"
 

diff --git a/dev-util/bazel/bazel-4.2.2.ebuild 
b/dev-util/bazel/bazel-4.2.2.ebuild
index a8b93d4ab322..fb8928767133 100644
--- a/dev-util/bazel/bazel-4.2.2.ebuild
+++ b/dev-util/bazel/bazel-4.2.2.ebuild
@@ -17,8 +17,12 @@ IUSE="examples tools"
 # strip corrupts the bazel binary
 # test fails with network-sandbox: An error occurred during the fetch of 
repository 'io_bazel_skydoc' (bug 690794)
 RESTRICT="strip test"
-RDEPEND=">=virtual/jdk-1.8:*"
-DEPEND="${RDEPEND}
+RDEPEND=">=virtual/jre-1.8:*"
+DEPEND="
+       || (
+          virtual/jdk:1.8
+          virtual/jdk:11
+       )
        app-arch/unzip
        app-arch/zip"
 

diff --git a/dev-util/bazel/bazel-5.0.0.ebuild 
b/dev-util/bazel/bazel-5.0.0.ebuild
index 778608f34249..36ee3e954ac0 100644
--- a/dev-util/bazel/bazel-5.0.0.ebuild
+++ b/dev-util/bazel/bazel-5.0.0.ebuild
@@ -17,8 +17,9 @@ IUSE="examples tools"
 # strip corrupts the bazel binary
 # test fails with network-sandbox: An error occurred during the fetch of 
repository 'io_bazel_skydoc' (bug 690794)
 RESTRICT="strip test"
-RDEPEND=">=virtual/jdk-11:*"
-DEPEND="${RDEPEND}
+RDEPEND=">=virtual/jre-11:*"
+DEPEND="
+       virtual/jdk:11
        app-arch/unzip
        app-arch/zip"