diff --git a/app-text/languagetool/languagetool-6.3.ebuild b/app-text/languagetool/languagetool-6.3-r1.ebuild
similarity index 98%
rename from app-text/languagetool/languagetool-6.3.ebuild
rename to app-text/languagetool/languagetool-6.3-r1.ebuild
index ddcbe701a0a1e..81b4893840182 100644
--- a/app-text/languagetool/languagetool-6.3.ebuild
+++ b/app-text/languagetool/languagetool-6.3-r1.ebuild
@@ -18,7 +18,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
 
 CP_DEPEND="
-	dev-java/commons-cli:1
+	dev-java/commons-cli:0
 	dev-java/commons-collections:4
 	dev-java/commons-io:1
 	dev-java/commons-lang:3.6
diff --git a/dev-java/apache-rat/apache-rat-0.15-r1.ebuild b/dev-java/apache-rat/apache-rat-0.15-r2.ebuild
similarity index 99%
rename from dev-java/apache-rat/apache-rat-0.15-r1.ebuild
rename to dev-java/apache-rat/apache-rat-0.15-r2.ebuild
index 330f4023ee7ac..57fff834a4f4d 100644
--- a/dev-java/apache-rat/apache-rat-0.15-r1.ebuild
+++ b/dev-java/apache-rat/apache-rat-0.15-r2.ebuild
@@ -25,7 +25,7 @@ KEYWORDS="amd64 x86"
 
 CP_DEPEND="
 	>=dev-java/ant-1.10.14:0
-	dev-java/commons-cli:1
+	dev-java/commons-cli:0
 	dev-java/commons-collections:4
 	dev-java/commons-compress:0
 	dev-java/commons-io:1
diff --git a/dev-java/commons-cli/commons-cli-1.5.0.ebuild b/dev-java/commons-cli/commons-cli-1.5.0-r1.ebuild
similarity index 96%
rename from dev-java/commons-cli/commons-cli-1.5.0.ebuild
rename to dev-java/commons-cli/commons-cli-1.5.0-r1.ebuild
index 576a7661f0956..d3b9d7264d64e 100644
--- a/dev-java/commons-cli/commons-cli-1.5.0.ebuild
+++ b/dev-java/commons-cli/commons-cli-1.5.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ HOMEPAGE="https://commons.apache.org/proper/commons-cli/"
 SRC_URI="mirror://apache/commons/cli/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
-SLOT="1"
+SLOT="0"
 KEYWORDS="amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/java-dep-check/java-dep-check-0.5-r3.ebuild b/dev-java/java-dep-check/java-dep-check-0.5-r4.ebuild
similarity index 95%
rename from dev-java/java-dep-check/java-dep-check-0.5-r3.ebuild
rename to dev-java/java-dep-check/java-dep-check-0.5-r4.ebuild
index 0ab6c71728efd..4133d7e336dee 100644
--- a/dev-java/java-dep-check/java-dep-check-0.5-r3.ebuild
+++ b/dev-java/java-dep-check/java-dep-check-0.5-r4.ebuild
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 
 CP_DEPEND="
-	dev-java/commons-cli:1
+	dev-java/commons-cli:0
 	dev-java/asm:9"
 RDEPEND=">=virtual/jre-1.8:*
 	${CP_DEPEND}"
diff --git a/games-strategy/freecol/freecol-1.0.0.ebuild b/games-strategy/freecol/freecol-1.0.0-r1.ebuild
similarity index 98%
rename from games-strategy/freecol/freecol-1.0.0.ebuild
rename to games-strategy/freecol/freecol-1.0.0-r1.ebuild
index dee9cfdc77bcd..fc11a278a3277 100644
--- a/games-strategy/freecol/freecol-1.0.0.ebuild
+++ b/games-strategy/freecol/freecol-1.0.0-r1.ebuild
@@ -18,7 +18,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 CP_DEPEND="
-	dev-java/commons-cli:1
+	dev-java/commons-cli:0
 	dev-java/cortado:0
 	dev-java/findbugs-annotations:0
 	dev-java/miglayout:5
diff --git a/net-p2p/biglybt/biglybt-3.6.0.0-r1.ebuild b/net-p2p/biglybt/biglybt-3.6.0.0-r2.ebuild
similarity index 99%
rename from net-p2p/biglybt/biglybt-3.6.0.0-r1.ebuild
rename to net-p2p/biglybt/biglybt-3.6.0.0-r2.ebuild
index afbc9f0b3c8f2..3bd27ae401f8a 100644
--- a/net-p2p/biglybt/biglybt-3.6.0.0-r1.ebuild
+++ b/net-p2p/biglybt/biglybt-3.6.0.0-r2.ebuild
@@ -19,7 +19,7 @@ SLOT="0"
 KEYWORDS="amd64 arm64 ppc64"
 
 CP_DEPEND="
-	dev-java/commons-cli:1
+	dev-java/commons-cli:0
 	dev-java/swt:4.27[cairo]
 "