From c8a6827fbbab9410d6b24757205dd159c46d4fd4 Mon Sep 17 00:00:00 2001
From: Anton Bolshakov <blshkv@gmail.com>
Date: Fri, 14 Jun 2024 19:46:34 +0800
Subject: [PATCH] jd-cli: cleanup 2

---
 dev-java/jd-core/jd-core-1.1.3.ebuild | 7 ++++---
 dev-java/jd-lib/jd-lib-1.2.1.ebuild   | 7 ++++---
 dev-util/jd-cli/jd-cli-1.2.1.ebuild   | 5 ++---
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/dev-java/jd-core/jd-core-1.1.3.ebuild b/dev-java/jd-core/jd-core-1.1.3.ebuild
index 8e99f10b8..438d638da 100644
--- a/dev-java/jd-core/jd-core-1.1.3.ebuild
+++ b/dev-java/jd-core/jd-core-1.1.3.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=8
 
-inherit java-pkg-2 java-pkg-simple
+inherit java-pkg-2
+# java-pkg-simple
 
 DESCRIPTION="JD-Core is a JAVA decompiler written in JAVA"
 HOMEPAGE="http://jd.benow.ca/"
@@ -15,9 +16,9 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 
 #java-pkg-2 sets java based on RDEPEND so the java slot in rdepend is used to build
-RDEPEND="virtual/jre:11"
+RDEPEND=">=virtual/jre-11:*"
 DEPEND="${RDEPEND}
-	virtual/jdk:11"
+	>=virtual/jdk-11:*"
 
 JAVA_SRC_DIR="src/main/java/org/jd/core/v1"
 
diff --git a/dev-java/jd-lib/jd-lib-1.2.1.ebuild b/dev-java/jd-lib/jd-lib-1.2.1.ebuild
index df9ce3b4b..c34edd656 100644
--- a/dev-java/jd-lib/jd-lib-1.2.1.ebuild
+++ b/dev-java/jd-lib/jd-lib-1.2.1.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=8
 
-inherit java-pkg-2 java-pkg-simple
+inherit java-pkg-2
+# java-pkg-simple
 
 DESCRIPTION="Command line Java Decompiler"
 HOMEPAGE="https://github.com/kwart/jd-cli"
@@ -21,9 +22,9 @@ CDEPEND="dev-java/jcommander:0
 	"
 
 RDEPEND="${CDEPEND}
-	virtual/jre:11"
+	>=virtual/jre-11:*"
 DEPEND="${CDEPEND}
-	virtual/jdk:11"
+	>=virtual/jdk-11:*"
 
 JAVA_GENTOO_CLASSPATH="jcommander,slf4j-api,logback-core,jd-core"
 
diff --git a/dev-util/jd-cli/jd-cli-1.2.1.ebuild b/dev-util/jd-cli/jd-cli-1.2.1.ebuild
index f6cf46f62..de3f9e320 100644
--- a/dev-util/jd-cli/jd-cli-1.2.1.ebuild
+++ b/dev-util/jd-cli/jd-cli-1.2.1.ebuild
@@ -4,7 +4,6 @@
 EAPI=8
 
 inherit java-pkg-2
-# java-pkg-simple
 
 DESCRIPTION="Command line Java Decompiler"
 HOMEPAGE="https://github.com/kwart/jd-cli"
@@ -26,9 +25,9 @@ CDEPEND="!dev-util/jd-cli-bin
 	"
 
 RDEPEND="${CDEPEND}
-	virtual/jre:11"
+	>=virtual/jre-11:*"
 DEPEND="${CDEPEND}
-	virtual/jdk:11"
+	>=virtual/jdk-11:*"
 
 JAVA_GENTOO_CLASSPATH="jcommander,slf4j-api,logback-core,logback-classic,jd-lib"