From 03ea7fbb301555ffea5e4bdfb885d7535e86605d Mon Sep 17 00:00:00 2001
From: "Alex Xu (Hello71)" <alex_y_xu@yahoo.ca>
Date: Tue, 1 Oct 2024 15:32:51 -0400
Subject: virtual/{jdk,jre}: upgrade to 21

---
 virtual/jdk/jdk-17-r1.ebuild | 15 ---------------
 virtual/jdk/jdk-21-r1.ebuild | 15 +++++++++++++++
 virtual/jre/jre-11-r3.ebuild |  4 ++--
 virtual/jre/jre-17-r1.ebuild | 14 --------------
 virtual/jre/jre-21-r1.ebuild | 14 ++++++++++++++
 5 files changed, 31 insertions(+), 31 deletions(-)
 delete mode 100644 virtual/jdk/jdk-17-r1.ebuild
 create mode 100644 virtual/jdk/jdk-21-r1.ebuild
 delete mode 100644 virtual/jre/jre-17-r1.ebuild
 create mode 100644 virtual/jre/jre-21-r1.ebuild

diff --git a/virtual/jdk/jdk-17-r1.ebuild b/virtual/jdk/jdk-17-r1.ebuild
deleted file mode 100644
index a18c1a8..0000000
--- a/virtual/jdk/jdk-17-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual for Java Development Kit (JDK)"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
-
-RDEPEND="|| (
-		dev-java/openjdk-bin:${SLOT}[gentoo-vm(+)]
-		dev-java/openjdk:${SLOT}[gentoo-vm(+)]
-		dev-java/openj9-openjdk-bin:${SLOT}[gentoo-vm(+)]
-		dev-java/openj9-openjdk:${SLOT}[gentoo-vm(+)]
-)"
diff --git a/virtual/jdk/jdk-21-r1.ebuild b/virtual/jdk/jdk-21-r1.ebuild
new file mode 100644
index 0000000..a18c1a8
--- /dev/null
+++ b/virtual/jdk/jdk-21-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual for Java Development Kit (JDK)"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+
+RDEPEND="|| (
+		dev-java/openjdk-bin:${SLOT}[gentoo-vm(+)]
+		dev-java/openjdk:${SLOT}[gentoo-vm(+)]
+		dev-java/openj9-openjdk-bin:${SLOT}[gentoo-vm(+)]
+		dev-java/openj9-openjdk:${SLOT}[gentoo-vm(+)]
+)"
diff --git a/virtual/jre/jre-11-r3.ebuild b/virtual/jre/jre-11-r3.ebuild
index 510db0f..0986578 100644
--- a/virtual/jre/jre-11-r3.ebuild
+++ b/virtual/jre/jre-11-r3.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DESCRIPTION="Virtual for Java Runtime Environment (JRE)"
 SLOT="${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 
 RDEPEND="|| (
 		dev-java/openjdk-jre-bin:${SLOT}[gentoo-vm(+)]
diff --git a/virtual/jre/jre-17-r1.ebuild b/virtual/jre/jre-17-r1.ebuild
deleted file mode 100644
index 510db0f..0000000
--- a/virtual/jre/jre-17-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual for Java Runtime Environment (JRE)"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
-
-RDEPEND="|| (
-		dev-java/openjdk-jre-bin:${SLOT}[gentoo-vm(+)]
-		dev-java/openj9-openjdk-jre-bin:${SLOT}[gentoo-vm(+)]
-		virtual/jdk:${SLOT}
-)"
diff --git a/virtual/jre/jre-21-r1.ebuild b/virtual/jre/jre-21-r1.ebuild
new file mode 100644
index 0000000..08a3961
--- /dev/null
+++ b/virtual/jre/jre-21-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Virtual for Java Runtime Environment (JRE)"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="|| (
+		dev-java/openjdk-jre-bin:${SLOT}[gentoo-vm(+)]
+		dev-java/openj9-openjdk-jre-bin:${SLOT}[gentoo-vm(+)]
+		virtual/jdk:${SLOT}
+)"
-- 
cgit v1.2.3-70-g09d2