7 files changed, 144 insertions, 8 deletions
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 87f69e51d021..a96c55a0e5d4 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/bndlib/Manifest b/dev-java/bndlib/Manifest
index ba02a60603a9..f38297656a6b 100644
--- a/dev-java/bndlib/Manifest
+++ b/dev-java/bndlib/Manifest
@@ -1,3 +1,5 @@
+DIST aQute.bnd-7.0.0.tar.gz 172496438 BLAKE2B a2e443b0e4a2eb278a8e1df86456fea22ffb8147adc00c9f300cbd32b226218bb64ccca3da3bcd0d79b07567a7b4cf4456b96224d6abf59486fa08ca6170d0ba SHA512 11d34a7d1a9b2fb2e8c112d414a06c281ccde9a7b06c62043e19d83e85ea64fdf022dd4493a14dd2dcf6adee392a1e9bf1ab05a6d690a328f29d7019045bca8c
 DIST bndlib-2.1.0.tar.gz 123217291 BLAKE2B ab8e6876b13db538746f77aa1fe7800e5a3b5e539e1980da78f69c64344f4964bf0a21f2329f7684b055d0de39a10c8df36e030922e9933b29fccb9a35aa669a SHA512 6965143ced45c15fc2316716de32e80506cc411d52309b24313fff37e0713a45ad200d5b3701f0d47a131a3163ec266ed8acb4544884cd1c59c9716c7a2b285e
 EBUILD bndlib-2.1.0-r1.ebuild 1642 BLAKE2B 948acbc0eb4e1057bb3194eb752f130075f8ab4c0f028a2bf539278c8541418da0e334ee1a200adc22c54253a7f381fbfb5ae1afff63d7659a00816e73dd0c86 SHA512 a0482c53b21aa4739c484228b7497f84530c619777aa158386f7896daa046be3cd3ab3dc2248b1efc0ca51d3e01d5537dc66e4e2e69819603aa1fa6b4412be0a
-MISC metadata.xml 324 BLAKE2B 4abc17608a568a12af96dc0ddb7b82d55341ad891537e120633fd8517e09a339d805325988f3208050cde9b20aeb0a4dcab95e55ba13c66854a0d90b0e54551c SHA512 e9e23c794433024b0888c2d5859120c0ef39cd6b55df99035c3ea1761280bd4287fdeb4aaf8ff067bab1bea80dcdcc9060f74b43b1a6a004bad87eb69a9bd3c3
+EBUILD bndlib-7.0.0.ebuild 1253 BLAKE2B 2847c5c1e687e79efed39bb75a9fe2dad8fff8641bc6de8fae415c73b58a823ca33d47a29aebcbf2d7ecc833eb74a4cd54fce9a58d2850bbcddc541694e2e871 SHA512 a9dba8a76d92903bc985d5e67c30bc1d32f5cef038dc2ba3f8d2267ff2a0a0bef416f89424604413a893e74012ff8ea7143b249ccf18fd90c9adde46ac24696a
+MISC metadata.xml 294 BLAKE2B 66837ec99fde5f758bfca40e387481d9e99d8ea6c520b4ec74fd83cf51670aa2626277f231fb6e0159495da497d8c74725ec18fa2d09d4fc1223e0e84a13f58a SHA512 e79f2bc0d9b0e9981f3688d97299a4897f453695dbeebb6bd44e93706bb19e6b2542d3d89cc8f222cf353604bf47b6134ab8f67bb070650a558736a9ff5e6cc4
diff --git a/dev-java/bndlib/bndlib-7.0.0.ebuild b/dev-java/bndlib/bndlib-7.0.0.ebuild
new file mode 100644
index 000000000000..2e73c25414dd
--- /dev/null
+++ b/dev-java/bndlib/bndlib-7.0.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="biz.aQute.bnd:biz.aQute.bndlib:${PV}"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="bndlib: A Swiss Army Knife for OSGi"
+HOMEPAGE="https://bnd.bndtools.org/"
+SRC_URI="https://github.com/bndtools/bnd/archive/${PV}.tar.gz -> aQute.bnd-${PV}.tar.gz"
+S="${WORKDIR}/bnd-${PV}"
+
+LICENSE="Apache-2.0 EPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+CP_DEPEND="
+	~dev-java/bnd-annotation-${PV}:0
+	~dev-java/bnd-util-${PV}:0
+	~dev-java/libg-${PV}:0
+	dev-java/osgi-annotation:0
+	dev-java/osgi-cmpn:8
+	dev-java/osgi-core:0
+	dev-java/slf4j-api:0
+"
+
+DEPEND="${CP_DEPEND}
+	dev-java/osgi-service-log:0
+	>=virtual/jdk-17:*
+"
+
+RDEPEND="${CP_DEPEND}
+	>=virtual/jre-17:*
+"
+
+JAVA_AUTOMATIC_MODULE_NAME="biz.aQute.bndlib"
+JAVA_CLASSPATH_EXTRA="osgi-service-log"
+JAVA_RESOURCE_DIRS="res"
+JAVA_SRC_DIR="biz.aQute.bndlib/src"
+
+src_prepare() {
+	java-pkg-2_src_prepare
+	mkdir res || die
+
+	# java-pkg-simple wants resources in JAVA_RESOURCE_DIRS
+	mv biz.aQute.bndlib/img	res || die
+	pushd biz.aQute.bndlib/src > /dev/null || die
+		find -type f \
+			! -name '*.java' \
+			| xargs cp --parent -t ../../res || die
+	popd > /dev/null || die
+}
diff --git a/dev-java/bndlib/metadata.xml b/dev-java/bndlib/metadata.xml
index 94feb65b0b18..cb6317e530db 100644
--- a/dev-java/bndlib/metadata.xml
+++ b/dev-java/bndlib/metadata.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>java@gentoo.org</email>
-    <name>Java</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">bndtools/bnd</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">bndtools/bnd</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/jtwig-reflection/Manifest b/dev-java/jtwig-reflection/Manifest
new file mode 100644
index 000000000000..c49cbeb8a87c
--- /dev/null
+++ b/dev-java/jtwig-reflection/Manifest
@@ -0,0 +1,3 @@
+DIST jtwig-reflection-5.87.0.tar.gz 70500 BLAKE2B 526e009bfabd3ed5d9034285f28980a52fafeee635e07446f32533ea7f6e4546d164ddc577fa25aabdcd80f64b953752a8c48405858534739d52c19474273fcf SHA512 87e4129833951c5c2903d574a9c4986219c7eb61d7ca2c657ecdeb9890d79149ff610ad7ad0002119ba5db0953f342d648eb46d9553185794d7bb7cb0a79e3ab
+EBUILD jtwig-reflection-5.87.0.ebuild 1563 BLAKE2B 5b4570f410dbfcb9daee98a1278052b5f02564f9f050aad836ee1954332cfd9c40b80c52465b55dd8653b95c3e2a154b4853ea4551bfe9939f357dccf473a0b1 SHA512 5286e3b15c865e7e04dad051aeedc016f13927414db718fa038bb5da350969d13dee8aaf5d65d6e544702f3e184912607243386477ab72d8761b9f1fb98ecee9
+MISC metadata.xml 293 BLAKE2B d4f1eeb27182d1398b4b09e87c473fe48de269dc9a70203ec672f7270e7293865b7000403fb937fa4ebbb32ea3c9c9f13a809fffeb43d97d3159ffafe2f23e20 SHA512 cb06c4a8cda1e824c90544418bcfd231bde0633a2a9e0683a9bf9c7438c5e66cb5699441049f3bc7bcc9ad88ec03b38e9ae18f9244e5e498b6d89fa7847b1ab7
diff --git a/dev-java/jtwig-reflection/jtwig-reflection-5.87.0.ebuild b/dev-java/jtwig-reflection/jtwig-reflection-5.87.0.ebuild
new file mode 100644
index 000000000000..4ce9372091fa
--- /dev/null
+++ b/dev-java/jtwig-reflection/jtwig-reflection-5.87.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.jtwig:jtwig-reflection:${PV}.RELEASE"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Jtwig Reflection Library"
+HOMEPAGE="https://github.com/jtwig/jtwig-reflection"
+SRC_URI="https://github.com/jtwig/jtwig-reflection/archive/${PV}.RELEASE.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P}.RELEASE"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+	dev-java/commons-lang:3.6
+	dev-java/guava:0
+	dev-java/slf4j-api:0
+	>=virtual/jdk-1.8:*
+	test? (
+		dev-java/commons-io:1
+		dev-java/hamcrest:0
+		dev-java/mockito:0
+	)
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+"
+
+JAVA_CLASSPATH_EXTRA="
+	commons-lang-3.6
+	guava
+	slf4j-api
+"
+
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_TEST_EXCLUDES=(
+	# Invalid test class; No runnable methods
+	org.jtwig.reflection.integration.example.TestArgumentValueResolver
+	org.jtwig.reflection.integration.example.TestArgumentResolver
+	org.jtwig.reflection.integration.example.TestArgument
+)
+JAVA_TEST_GENTOO_CLASSPATH="
+	commons-io-1
+	hamcrest
+	junit-4
+	mockito
+"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+src_test() {
+	# Unable to make field private final byte[] java.lang.String.value accessible:
+	# module java.base does not "opens java.lang" to unnamed module @3bc9f433
+	local vm_version="$(java-config -g PROVIDES_VERSION)"
+	if ver_test "${vm_version}" -ge 17; then
+		JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.lang=ALL-UNNAMED )
+	fi
+	java-pkg-simple_src_test
+}
diff --git a/dev-java/jtwig-reflection/metadata.xml b/dev-java/jtwig-reflection/metadata.xml
new file mode 100644
index 000000000000..488c6bf7458e
--- /dev/null
+++ b/dev-java/jtwig-reflection/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">jtwig/jtwig</remote-id>
+	</upstream>
+</pkgmetadata>