gentoo auto-resync : 17:03:2024 - 12:49:11

18 files changed, 399 insertions, 5 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index fc1c4f415565..e07735a8077d 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/bnd-ant/Manifest b/dev-java/bnd-ant/Manifest
new file mode 100644
index 000000000000..76c3df0e0043
--- /dev/null
+++ b/dev-java/bnd-ant/Manifest
@@ -0,0 +1,3 @@
+DIST aQute.bnd-7.0.0.tar.gz 172496438 BLAKE2B a2e443b0e4a2eb278a8e1df86456fea22ffb8147adc00c9f300cbd32b226218bb64ccca3da3bcd0d79b07567a7b4cf4456b96224d6abf59486fa08ca6170d0ba SHA512 11d34a7d1a9b2fb2e8c112d414a06c281ccde9a7b06c62043e19d83e85ea64fdf022dd4493a14dd2dcf6adee392a1e9bf1ab05a6d690a328f29d7019045bca8c
+EBUILD bnd-ant-7.0.0.ebuild 991 BLAKE2B bd0acfa071334d399dace3ba0708f6a8e4d0bc9cf007be9f2f904549fea56838e47cb7714115098d2c831321fdda3f904d304b6543b2fd8d0c554a5936e19ffa SHA512 393bcdbd96353f366ad2027ec8cecb5001b421d153571ff90072510c57ebb8bca8e9c63dfee7b1cee938daff7bcad9bbecb876caef899bdef588b9402bf94dd6
+MISC metadata.xml 294 BLAKE2B 66837ec99fde5f758bfca40e387481d9e99d8ea6c520b4ec74fd83cf51670aa2626277f231fb6e0159495da497d8c74725ec18fa2d09d4fc1223e0e84a13f58a SHA512 e79f2bc0d9b0e9981f3688d97299a4897f453695dbeebb6bd44e93706bb19e6b2542d3d89cc8f222cf353604bf47b6134ab8f67bb070650a558736a9ff5e6cc4
diff --git a/dev-java/bnd-ant/bnd-ant-7.0.0.ebuild b/dev-java/bnd-ant/bnd-ant-7.0.0.ebuild
new file mode 100644
index 000000000000..31d39dcbde50
--- /dev/null
+++ b/dev-java/bnd-ant/bnd-ant-7.0.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2024 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.bnd.ant:${PV}"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Bnd Ant Tasks"
+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"
+
+DEPEND="
+	dev-java/ant:0
+	dev-java/bnd:0
+	>=virtual/jdk-17:*"
+RDEPEND=">=virtual/jre-17:*"
+
+JAVA_AUTOMATIC_MODULE_NAME="biz.aQute.bnd.ant"
+JAVA_CLASSPATH_EXTRA="
+	ant
+	bnd
+"
+
+JAVA_RESOURCE_DIRS="res"
+JAVA_SRC_DIR="biz.aQute.bnd.ant/src"
+
+src_prepare() {
+	default #780585
+	java-pkg-2_src_prepare
+	mkdir res || die
+
+	# java-pkg-simple wants resources in JAVA_RESOURCE_DIRS
+	pushd biz.aQute.bnd.ant/src > /dev/null || die
+		find -type f \
+			! -name '*.java' \
+			| xargs cp --parent -t ../../res || die
+	popd > /dev/null || die
+}
diff --git a/dev-java/bnd-ant/metadata.xml b/dev-java/bnd-ant/metadata.xml
new file mode 100644
index 000000000000..cb6317e530db
--- /dev/null
+++ b/dev-java/bnd-ant/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">bndtools/bnd</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/bnd/Manifest b/dev-java/bnd/Manifest
new file mode 100644
index 000000000000..e001deb4ff33
--- /dev/null
+++ b/dev-java/bnd/Manifest
@@ -0,0 +1,4 @@
+AUX bnd-7.0.0-aQute.bnd.main.bnd.patch 1092 BLAKE2B 46df1673fb5e6a8e456aa7e66974333d0680bd7a8e2332e4d3d39c92d9f8fc2e3ffb0fa7fc6127f7d9747858f46f0f984a92ebed7beee9af9110d7df9c9c29ac SHA512 abd5bf36d6dc02562b9f209f85f96eb6e2a14797372a38d1e64aa76bb8e2c1b625707895e8ec9e05359de182d71e025d025bbaf00a372bbe29b9663a090d2588
+DIST aQute.bnd-7.0.0.tar.gz 172496438 BLAKE2B a2e443b0e4a2eb278a8e1df86456fea22ffb8147adc00c9f300cbd32b226218bb64ccca3da3bcd0d79b07567a7b4cf4456b96224d6abf59486fa08ca6170d0ba SHA512 11d34a7d1a9b2fb2e8c112d414a06c281ccde9a7b06c62043e19d83e85ea64fdf022dd4493a14dd2dcf6adee392a1e9bf1ab05a6d690a328f29d7019045bca8c
+EBUILD bnd-7.0.0.ebuild 2255 BLAKE2B 316ead526f7a92a2e9063d5ef0562db1f356cd7b7133ecbc5c1f3129b7a3c0f66889f497331dda77a09cefa098e792b11a70c96eda4c862414437cd3775ad12d SHA512 49524e9210ae66844c8dc5b7aeec69dbb03e39470cb9d28e9269994387b649f9c31100ec385aa8f49c5c94ae6abe2612e09a90c7e93289945b3d9ad393b2c20f
+MISC metadata.xml 294 BLAKE2B 66837ec99fde5f758bfca40e387481d9e99d8ea6c520b4ec74fd83cf51670aa2626277f231fb6e0159495da497d8c74725ec18fa2d09d4fc1223e0e84a13f58a SHA512 e79f2bc0d9b0e9981f3688d97299a4897f453695dbeebb6bd44e93706bb19e6b2542d3d89cc8f222cf353604bf47b6134ab8f67bb070650a558736a9ff5e6cc4
diff --git a/dev-java/bnd/bnd-7.0.0.ebuild b/dev-java/bnd/bnd-7.0.0.ebuild
new file mode 100644
index 000000000000..b847142719c7
--- /dev/null
+++ b/dev-java/bnd/bnd-7.0.0.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2024 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.bnd:${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}/${P}"
+
+LICENSE="Apache-2.0 EPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="app-arch/zip"
+
+CP_DEPEND="
+	~dev-java/bndlib-${PV}:0
+	dev-java/felix-resolver:0
+	dev-java/guava:0
+	dev-java/javaparser-core:0
+	dev-java/jline:2
+	dev-java/jtwig-core:0
+	dev-java/osgi-annotation:0
+	dev-java/osgi-cmpn:8
+	dev-java/osgi-core:0
+	dev-java/slf4j-simple:0
+	dev-java/snakeyaml:0
+	dev-java/xz-java:0
+"
+
+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}
+	>=virtual/jre-17:*"
+
+PATCHES=(
+	"${FILESDIR}/bnd-7.0.0-aQute.bnd.main.bnd.patch"
+)
+
+JAVA_AUTOMATIC_MODULE_NAME="biz.aQute.bnd"
+JAVA_CLASSPATH_EXTRA="
+	commons-lang-3.6
+	eclipse-jdt-annotation
+	jtwig-reflection
+	felix-gogo-runtime
+	osgi-service-subsystem
+	slf4j-api
+"
+JAVA_MAIN_CLASS="aQute.bnd.main.bnd"
+JAVA_RESOURCE_DIRS="res"
+JAVA_SRC_DIR=(
+	"biz.aQute.bnd.exporters/src"
+	"biz.aQute.bnd.reporter/src"
+	"biz.aQute.bnd/src"
+	"biz.aQute.remote/src"
+	"biz.aQute.repository/src"
+	"biz.aQute.resolve/src"
+)
+
+src_prepare() {
+	default #780585
+	java-pkg-2_src_prepare
+	mkdir res || die
+
+	# java-pkg-simple wants resources in JAVA_RESOURCE_DIRS
+	pushd biz.aQute.bnd/src > /dev/null || die
+		find -type f \
+			! -name '*.java' \
+			| xargs cp --parent -t ../../res || die
+	popd > /dev/null || die
+}
+
+src_compile() {
+	# There is another version of osgi-service-log in osgi-core-0
+	JAVA_GENTOO_CLASSPATH_EXTRA=":$(java-pkg_getjars --build-only osgi-service-log)"
+	java-pkg-simple_src_compile
+
+	# remove classes which are not in upstream's jar file
+	zip -d ${PN}.jar \
+		"*/remote/agent/*" \
+		"*/remote/embedded/*" \
+		"*/remote/main/*" \
+		"*/remote/plugin/*" \
+		"*/remote/test/*" \
+		|| die
+}
diff --git a/dev-java/bnd/files/bnd-7.0.0-aQute.bnd.main.bnd.patch b/dev-java/bnd/files/bnd-7.0.0-aQute.bnd.main.bnd.patch
new file mode 100644
index 000000000000..6d37cbc9f7d6
--- /dev/null
+++ b/dev-java/bnd/files/bnd-7.0.0-aQute.bnd.main.bnd.patch
@@ -0,0 +1,21 @@
+Upstream uses an older version of slf4j-simple
+--- a/biz.aQute.bnd/src/aQute/bnd/main/bnd.java
++++ b/biz.aQute.bnd/src/aQute/bnd/main/bnd.java
+@@ -486,14 +486,14 @@ public class bnd extends Processor {
+ 				System.setProperty(DEFAULT_LOG_LEVEL_KEY, "warn");
+ 				level = org.slf4j.spi.LocationAwareLogger.WARN_INT;
+ 			}
+-			Field field = org.slf4j.impl.SimpleLogger.class.getDeclaredField("CONFIG_PARAMS");
++			Field field = org.slf4j.simple.SimpleLogger.class.getDeclaredField("CONFIG_PARAMS");
+ 			field.setAccessible(true);
+ 			Object CONFIG_PARAMS = field.get(null);
+-			field = org.slf4j.impl.SimpleLoggerConfiguration.class.getDeclaredField("defaultLogLevel");
++			field = org.slf4j.simple.SimpleLoggerConfiguration.class.getDeclaredField("defaultLogLevel");
+ 			field.setAccessible(true);
+ 			field.set(CONFIG_PARAMS, level);
+ 
+-			field = org.slf4j.impl.SimpleLogger.class.getDeclaredField("currentLogLevel");
++			field = org.slf4j.simple.SimpleLogger.class.getDeclaredField("currentLogLevel");
+ 			field.setAccessible(true);
+ 			field.set(logger, level);
+ 		} catch (Exception e) {
diff --git a/dev-java/bnd/metadata.xml b/dev-java/bnd/metadata.xml
new file mode 100644
index 000000000000..cb6317e530db
--- /dev/null
+++ b/dev-java/bnd/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">bndtools/bnd</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/eclipse-ecj/Manifest b/dev-java/eclipse-ecj/Manifest
index 00700329e1e6..bb7e42e4cbe4 100644
--- a/dev-java/eclipse-ecj/Manifest
+++ b/dev-java/eclipse-ecj/Manifest
@@ -1,10 +1,13 @@
 AUX ecj-4.15 354 BLAKE2B e8ddbe928140e99fa36f0e4937cf1e9bf06bc3660ffdfba91099b35e4effaae3df1cb582a3cc8e9b26415d129d3c7e6b43f69e80f714ec1770ff593aebe4d5a8 SHA512 a8c159538a280ddc3616dce8fe6d1677ac45d7a72b27c23c85224a1d7e3acbb73912f2013be99b075f7b91e7ab52b4d871280246f1af56cf3718e3ce24b8ccc0
+AUX ecj-4.20 365 BLAKE2B a7fcb25e74cb19f1b61b940f63b2db0d54c34381a030d0c4e9ec825e3bdc2580d18bee1d9dbf9e3943f5ee8767aa17672cddae8a313201ac22c0d5256b8c2555 SHA512 4a1c4fe7640880ddc0735cec79873ee9e8cc2f430ddd8b4676974f669f5097e46cbcda9b50668df48cb0f3ce39a169934ece785aabfd59af697c44f255951dd9
 AUX ecj-4.26 390 BLAKE2B 42e06c8114370763caeee14aee4e4471ba5781f2257abab6ba69ff8657946681e06994804b5ba5d23547b066e8784bdda3bc2ba254ae357f98d234bd4da7a415 SHA512 9b29d5e650ec30e9d493d48c29820dbb2de79fa1cc897de3ccfc2558814a882e5ba0a35567d1fbcea11b050a2ced7b48f2c53a97a9f420ef81e715ab5156f9e0
 AUX ecj-4.30 402 BLAKE2B e95fd45bcd60440c8b11fc8f0e34eaf40674cd004939ffcaea392f3e899f9afaae7bf1dd21525099a93012338363a4a1450d69645aa9bb91153a41dc25985e6e SHA512 50623fe3dff25d0451e4dbb8e1ab14c7f5eb566adc999eeb1612b1d4e2672a5289f6a2383a40465884d26b702efc9cd7d099843c8ea4af5d23511dfa1cae5e67
 DIST ecjsrc-4.15.jar 2166228 BLAKE2B 794e0ba1a19b325e2dd8ad0b288ccbe04866627670b50d39dd327c13fe1fac56200eb3a6c1c3d1af043cad795508b9b714a5243049671414b5a62a97725d3297 SHA512 ada55b2522cf26570f0cd43f415eb5cf20e6840f83dadc72e1ae474ebf10eadca73f9fa3d1db51e13fd2762c38cd3e3567db3c7840d43ae3d8665ebe35e1889d
+DIST ecjsrc-4.20.jar 2255761 BLAKE2B 42e16e1bd3d90b8d9bf3e57f83b3e06f2857a20db3e3ac065ce39e95fc47e75de33186115c36dede691bc37fd55fa8123f2220d13f3d5819404f5de702b10fd2 SHA512 fb27c0a37ed5cdfdcdbc904d067bfdd0477ddfd873a6cd8477d3b473734fd0e37329f0e9ab85dc5f89994d68d9886a488bd88568bc00e25f54c1a5a468dc1384
 DIST ecjsrc-4.26.jar 2347137 BLAKE2B 22e627178fe35f34cee7ba63e740ef2699bca691d460c81e97c2f18c197042cc0d901eea988331b3fa2ac7daa87daef9ee90bc1e62901935a6f2f3fe5f1e8534 SHA512 e53534160e6a2cdc8c5db7caec617d5671eb59954a86b9dcb36a514024c3205167c8416560796ce61d1aa188f551660f3bfd8eab46fefe9111c8f0b7a977342f
 DIST ecjsrc-4.30.jar 2330181 BLAKE2B 7f3ba7f8dbfcaea9f8bbcdb8161ae8f164e2bf3469cf2242b6b7df5d375c98322f810b9c6de7209f622740a2cc61704915d255559bd376bf158b114e30a17d40 SHA512 ddc1569082fad0dcf91a9d41d5ef5f2f694f007e1378af5f5f28893aeb91e99acef91af59c762010eba071fa8b8b8a9d367b08e23f91b8c73ceacc6e6150bb23
 EBUILD eclipse-ecj-4.15-r1.ebuild 1469 BLAKE2B 53b1b66884af0137998d4ef9429dfc55fffbf25e524e0f3232326e101f79a92aae211598fc9325c0b68f97b6cef22d8034d9eee8f3c07f3fe8df3a32da32873f SHA512 9680872cc1a183d1e45eab18929ca211d1aa8f9174ea4a49ddef2ca5a2f042dba36fac7b74b36d47995d46525a2a83076cf0b4dae83c6f03d46a64464e95024f
+EBUILD eclipse-ecj-4.20.ebuild 1572 BLAKE2B 335c982e1e6411c9265f50b514578b24f1cf6363f4fc29cd97ebc680fe865c188c7e48d6c55da802654204a23ca6c1e0c1518f58baec0856ad2d66b03a4d5312 SHA512 eb6f302e8f996053ee56d181d88a433fe56508116e1d1dfb0c35245b1c110bb621c295cf3f4c3216e2ac459472980848b2bcb5c91d800391114877f0eecda693
 EBUILD eclipse-ecj-4.26-r2.ebuild 1799 BLAKE2B 6ddf7a6394b83267619cdc9124de4677e6537e38c86de05c3fb6521ebcd44ef39f81c85cafe303b4e8fa9b1a7e0e0389308d4dc0dc2d38a0fdfce8d8e17d2bc1 SHA512 b571687d63759b351388051bc1001fd12b506659035d73ef2c3af6b227408e1987f488d9540f6c4af82f5757e8bd5e9ee4b065c68a1022916544e0e5e14c574e
 EBUILD eclipse-ecj-4.30-r1.ebuild 2258 BLAKE2B 41ecb0bdf6ab8b3dd2539521561b7d9e9e4a660837bd5309a0c57409a03ccc7ba2c2a2648b92cb3d82c588a2ba092dde5d0e78ddb2fffdd969938bc2b13d7703 SHA512 807b63fcfcac8379f9605b2773f49778d6ee504f7950505bf45510eb1ca10b83f70bcccd5b893a87bbd5489b5fa7754b1a7f2995167709fc665d041b248112c5
-MISC metadata.xml 747 BLAKE2B 734d84847d4c2670a042e4636188d5c0e6f333a653933fa9365ae87477adc439a9a77362307b144c72077b68cfa6e9e8068989f021147ea9fa68a86a989f4c62 SHA512 22d6f55ee210dc62f7463692726b82b4ea30a67fe4debb6860fab53b227b7254874b8c3364add8ff9d9b62dc3e35b500b61faa7f999fa61460b2a94d56759cc0
+MISC metadata.xml 637 BLAKE2B fd8214d9377a8a4101b3fd5041e17fbed9c6f5ffc8586b328db92120fc780c16d4b1152d4137a2e5554f77f60e9fe24ea3d133fc3469a4e78da7e84244bcb951 SHA512 0a0f6d8bcac2bef3a74e6328a65ecab490fcd437e8107fd1087d17ca158da29d1044d9e06d05e2781e97df88e6aec30db185c97bb9b2bdbd9b257332ce0232e0
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.20.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.20.ebuild
new file mode 100644
index 000000000000..81da64f7b218
--- /dev/null
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.20.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple prefix
+
+DMF="R-${PV/_rc/RC}-202106111600"
+
+DESCRIPTION="Eclipse Compiler for Java"
+HOMEPAGE="https://www.eclipse.org/"
+SRC_URI="https://archive.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV/_rc/RC}.jar"
+
+LICENSE="EPL-1.0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+SLOT="4.20"
+
+BDEPEND="app-arch/unzip"
+COMMON_DEP="app-eselect/eselect-java"
+DEPEND="${COMMON_DEP}
+	dev-java/ant:0
+	>=virtual/jdk-11:*"
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.8:*"
+
+HTML_DOCS=( about.html )
+
+JAVA_AUTOMATIC_MODULE_NAME="org.eclipse.jdt.core.compiler.batch"
+JAVA_CLASSPATH_EXTRA="ant"
+JAVA_JAR_FILENAME="ecj.jar"
+JAVA_LAUNCHER_FILENAME="ecj-${SLOT}"
+JAVA_MAIN_CLASS="org.eclipse.jdt.internal.compiler.batch.Main"
+JAVA_RESOURCE_DIRS="res"
+
+src_prepare() {
+	java-pkg-2_src_prepare
+
+	# Exception in thread "main" java.lang.SecurityException: Invalid signature file digest for Manifest main attributes
+	rm META-INF/ECLIPSE_* || die
+	mkdir "${JAVA_RESOURCE_DIRS}" || die
+	find -type f \
+		! -name '*.java' \
+		| xargs cp --parent -t "${JAVA_RESOURCE_DIRS}" || die
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	insinto /usr/share/java-config-2/compiler
+	doins "${FILESDIR}/ecj-${SLOT}"
+	eprefixify "${ED}"/usr/share/java-config-2/compiler/ecj-${SLOT}
+}
+
+pkg_postinst() {
+	einfo "To select between slots of ECJ..."
+	einfo " # eselect ecj"
+
+	eselect ecj update ecj-${SLOT}
+}
+
+pkg_postrm() {
+	eselect ecj update
+}
diff --git a/dev-java/eclipse-ecj/files/ecj-4.20 b/dev-java/eclipse-ecj/files/ecj-4.20
new file mode 100644
index 000000000000..c6ecf2c0deeb
--- /dev/null
+++ b/dev-java/eclipse-ecj/files/ecj-4.20
@@ -0,0 +1,7 @@
+JAVAC="@GENTOO_PORTAGE_EPREFIX@/usr/bin/ecj-4.20"
+PACKAGE="=dev-java/eclipse-ecj-4.20*"
+SUPPORTED_TARGET="1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12 13 14 15 16 17 18 19"
+SUPPORTED_SOURCE="1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12 13 14 15 16 17 18 19"
+ANT_BUILD_COMPILER="org.eclipse.jdt.core.JDTCompilerAdapter"
+ANT_BUILD_COMPILER_DEPS="eclipse-ecj-4.20"
+GENERATION="2"
diff --git a/dev-java/eclipse-ecj/metadata.xml b/dev-java/eclipse-ecj/metadata.xml
index 218c1eb894a3..d59675e7a795 100644
--- a/dev-java/eclipse-ecj/metadata.xml
+++ b/dev-java/eclipse-ecj/metadata.xml
@@ -15,7 +15,4 @@ used with Ant by using the -lib option to and and setting
 <upstream>
 	<remote-id type="github">eclipse-jdt/eclipse.jdt.core</remote-id>
 </upstream>
-<use>
-	<flag name="ant">Support using ecj in Ant builds via <pkg>dev-java/ant-eclipse-ecj</pkg></flag>
-</use>
 </pkgmetadata>
diff --git a/dev-java/javacc/Manifest b/dev-java/javacc/Manifest
index b2cbfa9cc4c2..325188789c8c 100644
--- a/dev-java/javacc/Manifest
+++ b/dev-java/javacc/Manifest
@@ -1,6 +1,8 @@
 AUX javacc-4.0-javadoc.patch 420 BLAKE2B 8f26c37e26f8967cf527a6f7f4b6c5396bffb5cde4cf9aad292217d41e614800cac438b92971e0c942f71ace4f551db30bae873e83ecdcf2ee7940153fca50bf SHA512 e20554696a27137b7f9c086f7d8c4854742fa1e14ad84e2157cecebdc65f2fb6726a0eaaff7bf3f1113a6fade51c5825b86641b61b917a4fcdd96663a8830438
 DIST javacc-4.1.tar.gz 769476 BLAKE2B c2a22fa78ff4dcf1e36221a23ca1e3cd1eecb473a59ea94ce52e298673f6bd18c0ea0cf757dd68885696ebc8cc724d271c69c923a21ffa433d03c1062b1201ee SHA512 911e5e9f062561ade1748dcef3596e0f25c399c4d52dd174773783dadf24a4ceea8d3feab9ab08880370677959051d8557aed815d4c4184f5ecd5789ee8a5754
 DIST javacc-5.0src.tar.gz 810123 BLAKE2B 6833e79a33c7ae8b28902d1c372162a2f9e326629f0d4c1936a8c3638d3aa3f6bd5713aca8398ba5f1ff963fe585eb683fcd3009602ee592ba79692c8ba0f3d6 SHA512 91896a0affac1c4fd00a093a731dfd02bda548d1a4d83e1077ed36a67f4f9deab0ce9f2d0212fd4c08ab00065d3029533adbafbc026a22ca071285093bd3bba6
+DIST javacc-7.0.4.tar.gz 2842349 BLAKE2B e5a2e24c99e5e3883270cf0e3931d7667e5b5b49a11c1d9b79b98767f74f4addf2dc7d3d620550bc1b5bb0bfbef8bf07af48a40d250d0902d97c8215f6cb8e01 SHA512 b93c93e8490aae9a26b0de948896ec6d7a044c205d09584c3908988e24a3ea63a1147365115b17a15c6fb311c44f53ddff7c11f092731cbd05d3ec1950ef57f1
 EBUILD javacc-4.1.ebuild 1478 BLAKE2B 0a6e3b429e290a4371dd7df43e00022849f64fe5ce5a213973a9870da7422a531f6fa64b21859b81fa96a9dd8a9a78ce5a50ab1f897e64a38604c42c185e33a4 SHA512 7e3fc6bdecd437bcb75b07d0d08061bada5482a5c309e21323d9522a0c5e157e4bf7be81bde6dbc8f6aeb99cc778de365076b514cab7a7f2d0ed906301d5b541
 EBUILD javacc-5.0-r5.ebuild 1433 BLAKE2B 275060ccbf5ac28d7ca810d304461ea387dd6e6698cc178804a6b580d12fc9ddeb105f6d6cf385cd0b968b472cecfbdf800d30147c311bf66122df8e49fdfa60 SHA512 920a971a51aedcbbf34885d89657e3032078d5d61bb329db53b16e80a8ea0a8087ba715238b2c0acabfd8b1bd56aeed4d3a2d28e973db44731548ccf51ae3125
-MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
+EBUILD javacc-7.0.4.ebuild 1371 BLAKE2B f8dbbf0f3c7926eb586435a89eba3f8ed5ad1ba37ed5a4fdf1d74bd8164f8f266d4fb0f2c778a0ccdfe075335f995742f83a45345c239fa4880d245ece135945 SHA512 d59d3f14856a4ab8c804d941f5093995c1a06c6b5c2aeb489852fb0458c61a5e5a8a7abea6e98c9f188cb59525eff3c2ba62f39f57864b923f7c967db1992733
+MISC metadata.xml 308 BLAKE2B 421dc38149fa3d88a66071836b7b00e6218c44f3111bf9e99b3f35f5e6ae3e550290d03b9f4ac960828484c8993b1ae5fe5ba6b4b73e172ddf905127df96eb25 SHA512 d365ba4454a45f49ceadbb4f1700ca58de8b9e0715f02056cbff899507fe39bd64e5d388245d0458ec5be9a30f134a4bcc2d8e678745f0b79502741ae30aeaa0
diff --git a/dev-java/javacc/javacc-7.0.4.ebuild b/dev-java/javacc/javacc-7.0.4.ebuild
new file mode 100644
index 000000000000..12b83bfddd3d
--- /dev/null
+++ b/dev-java/javacc/javacc-7.0.4.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc examples source test"
+MAVAN_ID="net.java.dev.javacc:javacc:${PV}"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Java Compiler Compiler - The Java Parser Generator"
+HOMEPAGE="https://javacc.github.io/javacc/"
+SRC_URI="https://github.com/javacc/javacc/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="7.0.4"
+KEYWORDS="~amd64"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	test? (	>=dev-java/ant-1.10.14:0[junit] )"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+DOCS=(
+	README
+	javacc-releases.notes
+	jjdoc-releases.notes
+	jjtree-releases.notes
+	release.notes
+)
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+src_prepare() {
+	java-pkg-2_src_prepare
+	java-pkg_clean ! -path "./bootstrap/*"
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_dojar "target/${PN}.jar"
+
+	if use doc; then
+		java-pkg_dohtml -r www/*
+		java-pkg_dojavadoc target/javadoc
+	fi
+
+	use examples && java-pkg_doexamples examples
+	use source && java-pkg_dosrc src/*
+
+	echo "JAVACC_HOME=${EPREFIX}/usr/share/javacc/" > "${T}"/22javacc-${SLOT} || die
+	doenvd "${T}"/22javacc-${SLOT}
+
+	echo "export VERSION=${PV}" > "${T}"/pre || die
+
+	local launcher
+	for launcher in javacc jjdoc jjtree; do
+		java-pkg_dolauncher ${launcher}-${SLOT} -pre "${T}"/pre --main ${launcher}
+	done
+
+	einstalldocs
+}
diff --git a/dev-java/javacc/metadata.xml b/dev-java/javacc/metadata.xml
index 6021501589e0..ceba116c02a9 100644
--- a/dev-java/javacc/metadata.xml
+++ b/dev-java/javacc/metadata.xml
@@ -5,4 +5,7 @@
 	<email>java@gentoo.org</email>
 	<name>Java</name>
 </maintainer>
+<upstream>
+	<remote-id type="github">javacc/javacc</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/dev-java/javaparser-core/Manifest b/dev-java/javaparser-core/Manifest
new file mode 100644
index 000000000000..f11f855ebad1
--- /dev/null
+++ b/dev-java/javaparser-core/Manifest
@@ -0,0 +1,3 @@
+DIST javaparser-3.13.10.tar.gz 7043664 BLAKE2B 5d2e35cfa22dbcb425365e2e7806c46b989b92a84472fbd80d42716fbb2a5ddcad2daec6214be689b1dcc6541890527e422953c083e713e9f1d22ce5b3035e90 SHA512 b90a6b7b2fbb6a13cc36cdd17acd09a22adb9e62311862c2a67a9ea339b98e245c93ba371645e3c695e76966b21e3bc01accf040482e30b2b6882a5569db5806
+EBUILD javaparser-core-3.13.10.ebuild 1205 BLAKE2B 94410cf059ca8e61c0adfebe8c94f7d3e82a36eae434494c7a165056db53f6fb081d7b35d7310a02e1fa0e227c3901312618fc97b78282076594256bda8edc0d SHA512 c3d2ae5fbf5e586d07c57c5608b33b804d2ef6a1f7ec3b66d2f265438e39640c9303fd4d1d00cd9b021b66df6d904391a7fb2dcc1b51f8c182b1a04938d66287
+MISC metadata.xml 303 BLAKE2B ca2ecedcd6040bfd810f56a32a4134a24013fda0f6c4571db1b01e5549d8e677e02fce8569222532cbdf77ce9a59d770740fa9b604f19de439a9ebb10ce7f15a SHA512 61913597281b7b29a767d4ab04d31aa92b7645ca2cf631c8ca233d7b6293d678c3e8b937375518391c695fb1fa44a2546f7883352729c9b3b0751d687416ceae
diff --git a/dev-java/javaparser-core/javaparser-core-3.13.10.ebuild b/dev-java/javaparser-core/javaparser-core-3.13.10.ebuild
new file mode 100644
index 000000000000..a1b31fd5fcca
--- /dev/null
+++ b/dev-java/javaparser-core/javaparser-core-3.13.10.ebuild
@@ -0,0 +1,45 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="com.github.javaparser:javaparser-core:3.13.10"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java 1-17 Parser and Abstract Syntax Tree for Java"
+HOMEPAGE="https://javaparser.org/"
+SRC_URI="https://github.com/javaparser/javaparser/archive/v${PV}.tar.gz -> javaparser-${PV}.tar.gz"
+S="${WORKDIR}/javaparser-${PV}"
+
+LICENSE="Apache-2.0 LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+
+JAVACC_SLOT="7.0.4"
+
+BDEPEND="dev-java/javacc:7.0.4"
+# Does not compile with Java 21
+DEPEND="<=virtual/jdk-17:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+DOCS=( CONTRIBUTING.md changelog.md readme.md )
+
+JAVA_AUTOMATIC_MODULE_NAME="com.github.javaparser.core"
+JAVA_SRC_DIR=(
+	"${PN}/src/main/java"
+	"${PN}/src/main/java-templates"
+	"${PN}/src/main/javacc-support"
+)
+
+src_prepare() {
+	java-pkg-2_src_prepare
+
+	mkdir -p "${PN}/src/main/java/com/github/javaparser"
+	javacc-${JAVACC_SLOT} -GRAMMAR_ENCODING=UTF-8 \
+		-JDK_VERSION=1.8 \
+		-OUTPUT_DIRECTORY="${PN}/src/main/java/com/github/javaparser" \
+		"javaparser-core/src/main/javacc/java.jj" \
+		|| die "Code generation with java.jj failed"
+}
diff --git a/dev-java/javaparser-core/metadata.xml b/dev-java/javaparser-core/metadata.xml
new file mode 100644
index 000000000000..297067f408d2
--- /dev/null
+++ b/dev-java/javaparser-core/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">javaparser/javaparser</remote-id>
+	</upstream>
+</pkgmetadata>