10 files changed, 33 insertions, 71 deletions
diff --git a/virtual/7z/7z-0.ebuild b/virtual/7z/7z-0.ebuild
deleted file mode 100644
index 89a6b32..0000000
--- a/virtual/7z/7z-0.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Virtual for /usr/bin/7z"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="|| ( app-arch/7-zip app-arch/p7zip )"
diff --git a/virtual/7z/metadata.xml b/virtual/7z/metadata.xml
deleted file mode 100644
index 004555a..0000000
--- a/virtual/7z/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>alex_y_xu@yahoo.ca</email>
-		<name>Alex Xu (Hello71)</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/virtual/jdk/jdk-11-r3.ebuild b/virtual/jdk/jdk-11-r3.ebuild
index a18c1a8..f8520d5 100644
--- a/virtual/jdk/jdk-11-r3.ebuild
+++ b/virtual/jdk/jdk-11-r3.ebuild
@@ -6,10 +6,11 @@ EAPI=7
 DESCRIPTION="Virtual for Java Development Kit (JDK)"
 SLOT="${PV}"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+IUSE="headless-awt"
 
 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(+)]
+		dev-java/openjdk-bin:${SLOT}[gentoo-vm(+),headless-awt=]
+		dev-java/openjdk:${SLOT}[gentoo-vm(+),headless-awt=]
+		dev-java/openj9-openjdk-bin:${SLOT}[gentoo-vm(+),headless-awt=]
+		dev-java/openj9-openjdk:${SLOT}[gentoo-vm(+),headless-awt=]
 )"
diff --git a/virtual/jdk/jdk-16.ebuild b/virtual/jdk/jdk-16.ebuild
deleted file mode 100644
index 5a08766..0000000
--- a/virtual/jdk/jdk-16.ebuild
+++ /dev/null
@@ -1,12 +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 ~arm64 ~ppc64"
-
-RDEPEND="|| (
-		dev-java/openj9-openjdk-bin:${SLOT}[gentoo-vm(+)]
-)"
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..d6c5915
--- /dev/null
+++ b/virtual/jdk/jdk-21-r1.ebuild
@@ -0,0 +1,16 @@
+# 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 ~arm64 ~ppc64"
+IUSE="headless-awt"
+
+RDEPEND="|| (
+		dev-java/openjdk-bin:${SLOT}[gentoo-vm(+),headless-awt=]
+		dev-java/openjdk:${SLOT}[gentoo-vm(+),headless-awt=]
+		dev-java/openj9-openjdk-bin:${SLOT}[gentoo-vm(+),headless-awt=]
+		dev-java/openj9-openjdk:${SLOT}[gentoo-vm(+),headless-awt=]
+)"
diff --git a/virtual/jdk/metadata.xml b/virtual/jdk/metadata.xml
index 097975e..a3cf1d2 100644
--- a/virtual/jdk/metadata.xml
+++ b/virtual/jdk/metadata.xml
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<use>
+		<flag name="headless-awt">Don't install the X backend for AWT, needed by some GUIs</flag>
+	</use>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/virtual/jre/jre-17.ebuild b/virtual/jre/jre-11-r3.ebuild
index faeb554..0986578 100644
--- a/virtual/jre/jre-17.ebuild
+++ b/virtual/jre/jre-11-r3.ebuild
@@ -1,14 +1,14 @@
-# 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(+)]
 		dev-java/openj9-openjdk-jre-bin:${SLOT}[gentoo-vm(+)]
 		virtual/jdk:${SLOT}
-	)"
+)"
diff --git a/virtual/jre/jre-16.ebuild b/virtual/jre/jre-16.ebuild
deleted file mode 100644
index ede6623..0000000
--- a/virtual/jre/jre-16.ebuild
+++ /dev/null
@@ -1,13 +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 ~arm64 ~ppc64"
-
-RDEPEND="|| (
-		dev-java/openj9-openjdk-jre-bin:${SLOT}[gentoo-vm(+)]
-		virtual/jdk:${SLOT}
-	)"
diff --git a/virtual/jre/jre-11-r2.ebuild b/virtual/jre/jre-21-r1.ebuild
index faeb554..08a3961 100644
--- a/virtual/jre/jre-11-r2.ebuild
+++ b/virtual/jre/jre-21-r1.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DESCRIPTION="Virtual for Java Runtime Environment (JRE)"
 SLOT="${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+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}
-	)"
+)"