3 files changed, 25 insertions, 7 deletions
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
index a77c7edbcdca..bfe8e1184dc6 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
diff --git a/dev-java/bnd/bnd-7.1.0-r1.ebuild b/dev-java/bnd/bnd-7.1.0-r2.ebuild
index b7a5ea224d45..cddf68c90f4d 100644
--- a/dev-java/bnd/bnd-7.1.0-r1.ebuild
+++ b/dev-java/bnd/bnd-7.1.0-r2.ebuild
@@ -38,13 +38,16 @@ DEPEND="${CP_DEPEND}
 	dev-java/commons-lang:3.6
 	dev-java/eclipse-jdt-annotation:0
 	dev-java/felix-gogo-runtime:0
-	dev-java/slf4j-api:0
 	dev-java/jtwig-reflection:0
 	dev-java/osgi-service-log:0
 	dev-java/osgi-service-subsystem:0
 	>=virtual/jdk-17:*"
 
 RDEPEND="${CP_DEPEND}
+	~dev-java/bnd-annotation-${PV}:0
+	~dev-java/bnd-util-${PV}:0
+	~dev-java/libg-${PV}:0
+	dev-java/slf4j-api:0
 	>=virtual/jre-17:*"
 
 PATCHES=(
@@ -58,7 +61,6 @@ JAVA_CLASSPATH_EXTRA="
 	jtwig-reflection
 	felix-gogo-runtime
 	osgi-service-subsystem
-	slf4j-api
 "
 JAVA_MAIN_CLASS="aQute.bnd.main.bnd"
 JAVA_RESOURCE_DIRS="res"
@@ -98,3 +100,11 @@ src_compile() {
 		"*/remote/test/*" \
 		|| die
 }
+
+src_install() {
+	java-pkg-simple_src_install
+	java-pkg_register-dependency libg
+	java-pkg_register-dependency bnd-annotation
+	java-pkg_register-dependency bnd-util
+	java-pkg_register-dependency slf4j-api
+}
diff --git a/dev-java/libg/libg-7.1.0.ebuild b/dev-java/libg/libg-7.1.0-r1.ebuild
index 4085cb221b2f..8491d48c546f 100644
--- a/dev-java/libg/libg-7.1.0.ebuild
+++ b/dev-java/libg/libg-7.1.0-r1.ebuild
@@ -21,6 +21,7 @@ KEYWORDS="amd64 ~arm64"
 RESTRICT="test" #839681
 
 CP_DEPEND="
+	dev-java/osgi-cmpn:8
 	dev-java/slf4j-api:0
 "
 
@@ -28,7 +29,6 @@ DEPEND="
 	${CP_DEPEND}
 	~dev-java/bnd-annotation-${PV}:0
 	dev-java/eclipse-jdt-annotation:0
-	dev-java/osgi-cmpn:8
 	>=virtual/jdk-17:*
 "
 
@@ -36,6 +36,8 @@ DEPEND="
 # error: switch expressions are not supported in -source 11
 RDEPEND="
 	${CP_DEPEND}
+	dev-java/osgi-annotation:0
+	dev-java/osgi-core:0
 	>=virtual/jre-17:*
 "
 
@@ -43,6 +45,11 @@ JAVA_AUTOMATIC_MODULE_NAME="aQute.libg"
 JAVA_CLASSPATH_EXTRA="
 	bnd-annotation
 	eclipse-jdt-annotation
-	osgi-cmpn-8
 "
 JAVA_SRC_DIR="aQute.libg/src"
+
+src_install() {
+	java-pkg-simple_src_install
+	java-pkg_register-dependency osgi-core
+	java-pkg_register-dependency osgi-annotation
+}