From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0F3AE158090 for ; Sun, 1 May 2022 19:04:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 341BEE09E4; Sun, 1 May 2022 19:04:52 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 11B37E09E4 for ; Sun, 1 May 2022 19:04:52 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D7FDA341261 for ; Sun, 1 May 2022 19:04:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B711D34C for ; Sun, 1 May 2022 19:04:48 +0000 (UTC) From: "Florian Schmaus" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Florian Schmaus" Message-ID: <1651431829.82750a31b643c6c6c26c5262b418f3b6e33e46dd.flow@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/bazel/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/bazel/bazel-3.7.2-r1.ebuild dev-util/bazel/bazel-4.2.2.ebuild dev-util/bazel/bazel-5.0.0.ebuild X-VCS-Directories: dev-util/bazel/ X-VCS-Committer: flow X-VCS-Committer-Name: Florian Schmaus X-VCS-Revision: 82750a31b643c6c6c26c5262b418f3b6e33e46dd X-VCS-Branch: master Date: Sun, 1 May 2022 19:04:48 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d7d58eec-30d3-4e95-ad64-fe46ea7dc450 X-Archives-Hash: f9197ce948b65e1e824ab9422f44e3fc commit: 82750a31b643c6c6c26c5262b418f3b6e33e46dd Author: Florian Schmaus gentoo org> AuthorDate: Sun May 1 18:58:42 2022 +0000 Commit: Florian Schmaus gentoo 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 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"