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 (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9E4BD15802C for ; Fri, 20 Dec 2024 10:58:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 11904E08F0; Fri, 20 Dec 2024 10:58:41 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 0489EE08E8 for ; Fri, 20 Dec 2024 10:58:38 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 D6E9833BED4 for ; Fri, 20 Dec 2024 10:58:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 134891AB5 for ; Fri, 20 Dec 2024 10:58:36 +0000 (UTC) From: "Miroslav Šulc" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Miroslav Šulc" Message-ID: <1734691010.3092c3c82ecf4770c8e8f8c7ada35327ec6f706c.fordfrog@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: virtual/jdk/ X-VCS-Repository: repo/gentoo X-VCS-Files: virtual/jdk/jdk-24-r1.ebuild virtual/jdk/jdk-24.ebuild X-VCS-Directories: virtual/jdk/ X-VCS-Committer: fordfrog X-VCS-Committer-Name: Miroslav Šulc X-VCS-Revision: 3092c3c82ecf4770c8e8f8c7ada35327ec6f706c X-VCS-Branch: master Date: Fri, 20 Dec 2024 10:58:36 +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: e8dcb366-0c32-43f4-b872-f9f06155e2e0 X-Archives-Hash: 6cfc3791148bdb56cbdbd4c410267890 commit: 3092c3c82ecf4770c8e8f8c7ada35327ec6f706c Author: Volkmar W. Pogatzki pogatzki net> AuthorDate: Fri Dec 13 08:53:22 2024 +0000 Commit: Miroslav Šulc gentoo org> CommitDate: Fri Dec 20 10:36:50 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3092c3c8 virtual/jdk: slot 24 adjust RDEPEND This allows to uninstall openjdk-bin after installing the non-bin. Signed-off-by: Volkmar W. Pogatzki pogatzki.net> Signed-off-by: Miroslav Šulc gentoo.org> virtual/jdk/{jdk-24.ebuild => jdk-24-r1.ebuild} | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/virtual/jdk/jdk-24.ebuild b/virtual/jdk/jdk-24-r1.ebuild similarity index 64% rename from virtual/jdk/jdk-24.ebuild rename to virtual/jdk/jdk-24-r1.ebuild index fa432422ec6c..5a23aeed9722 100644 --- a/virtual/jdk/jdk-24.ebuild +++ b/virtual/jdk/jdk-24-r1.ebuild @@ -8,4 +8,7 @@ SLOT="${PV}" # KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" IUSE="headless-awt" -RDEPEND="dev-java/openjdk-bin:${SLOT}[gentoo-vm(+),headless-awt=]" +RDEPEND="|| ( + dev-java/openjdk-bin:${SLOT}[gentoo-vm(+),headless-awt=] + dev-java/openjdk:${SLOT}[gentoo-vm(+),headless-awt=] +)"