diff --git a/dev-java/bnd-util/bnd-util-7.1.0.ebuild b/dev-java/bnd-util/bnd-util-7.1.0-r1.ebuild
similarity index 95%
rename from dev-java/bnd-util/bnd-util-7.1.0.ebuild
rename to dev-java/bnd-util/bnd-util-7.1.0-r1.ebuild
index a77c7edbcdca4..bfe8e1184dc6c 100644
--- a/dev-java/bnd-util/bnd-util-7.1.0.ebuild
+++ b/dev-java/bnd-util/bnd-util-7.1.0-r1.ebuild
@@ -17,11 +17,13 @@ LICENSE="Apache-2.0 EPL-2.0"
 SLOT="0"
 KEYWORDS="amd64 ~arm64"
 
-CP_DEPEND="dev-java/osgi-annotation:0"
+CP_DEPEND="
+	dev-java/osgi-annotation:0
+	~dev-java/libg-${PV}:0
+"
 
 DEPEND="${CP_DEPEND}
 	~dev-java/bnd-annotation-${PV}:0
-	~dev-java/libg-${PV}:0
 	dev-java/osgi-cmpn:8
 	dev-java/osgi-core:0
 	dev-java/slf4j-api:0
@@ -35,7 +37,6 @@ RDEPEND="${CP_DEPEND}
 JAVA_AUTOMATIC_MODULE_NAME="biz.aQute.bnd.util"
 JAVA_CLASSPATH_EXTRA="
 	bnd-annotation
-	libg
 	osgi-cmpn-8
 	osgi-core
 	slf4j-api