gentoo auto-resync : 17:12:2024 - 02:02:19

19 files changed, 457 insertions, 22 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 36a70a7d665c..ee21507126f5 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/byte-buddy/Manifest b/dev-java/byte-buddy/Manifest
index 1f58093aa02a..9eb072e4c792 100644
--- a/dev-java/byte-buddy/Manifest
+++ b/dev-java/byte-buddy/Manifest
@@ -1,6 +1,8 @@
 AUX byte-buddy-1.15.10-Skip-testIgnoreExistingField.patch 1409 BLAKE2B f327cbb42bd8cd2a39a1cda15e4307a9a366f8350c51bd98af2d70e6f9b36e06e21a6a82a2c3a30abe6b8abb5c8e40da4d5601b6b2061625a750de297e4744b3 SHA512 c4d4aa9a0e4719241ead17bf8bf8a04f06055a9985127e892eec000ef02c0d9ee88e76190d8c19e544e1ac99ec87b01a3d00332d5caca842d2e95b1edf608c8c
 DIST byte-buddy-1.14.0.tar.gz 1989303 BLAKE2B c284f54ebc6bf67e4706380f0876f403fcf5ae172a690888d13d6b3399cf41bf1fd8890bf15059f71a9457ec6343254ad1f421f8e4975aa70dd9a2103ab59610 SHA512 e6ccda287935b5ff7104d5c0e4904b0595918a21bcc90c6ac5b2358cc0371b22a4fcac2a95dde9e377c5d1e43077c8b57ea9520a9093b2380ab53c830f107ced
 DIST byte-buddy-1.15.10.tar.gz 2057524 BLAKE2B 7f5e178b3ea31fb30379e49d69f34ba1b9953d705a54c3609bb771f66962af776dee95ea10ab7049e50351362ff87c164782bc4b1b782985ac8f122e5833cb4e SHA512 3b7a02475433193efe8a8e20378369ec18f10c81dd90b428d5393c45fe261f678b1707c92923381b8a3030f8a2e8525fe95e3337ca7e5455cdc5fc2647416d2a
+DIST byte-buddy-1.15.11.tar.gz 2059994 BLAKE2B b5b11de938d2b96518c01cf1bcebb0f34ca6ccdb81e519e0177fa371f438da9ca5aba5749d1a7af0f42a2359c55228f3cbfbfe32f158d4a18fe7f02a5d5bf4f2 SHA512 9e663dfee80e6ae9e4983a39177a94f160e52e3ef1dec54b8f6a90e32c18ae5b36c9e791fd605b43754b2667f6efd7e15a1f7b0ce6c5034945567aef8a6b8aa8
 EBUILD byte-buddy-1.14.0.ebuild 4836 BLAKE2B 157a0deb79c6011aa6facdf995e5cbcac333cfcb7a6bf23cf1d4aef045f30860dd1e1fadd783ee9c98745e369ab0b84a717a2dfea0f281d2e51305686c1dd134 SHA512 cbdba61c44c69f52f8327857618d8238ff131df0463190d4dcd6985cc58cee5691749a20f7208b0fb091fb405dc4a4af52e1b1608729abd18a2bd5ef4af8c1ca
 EBUILD byte-buddy-1.15.10.ebuild 4173 BLAKE2B 02c21435e490f8e44c9bf97af9abdfd3c1855c250812bb0b8538ea9402575e3567eeb6967f9842ec58df64811b9a857147d8cac42d7be26624a5619645ef5ce0 SHA512 84677f6f5159309821e427779a7033d0829bef426ae46ce388736dba575443b9f27bfcdc73a964a9b20b1ff452f28b530ebb2b3504ad11a14f1c611ae79d6925
+EBUILD byte-buddy-1.15.11.ebuild 4173 BLAKE2B 02c21435e490f8e44c9bf97af9abdfd3c1855c250812bb0b8538ea9402575e3567eeb6967f9842ec58df64811b9a857147d8cac42d7be26624a5619645ef5ce0 SHA512 84677f6f5159309821e427779a7033d0829bef426ae46ce388736dba575443b9f27bfcdc73a964a9b20b1ff452f28b530ebb2b3504ad11a14f1c611ae79d6925
 MISC metadata.xml 440 BLAKE2B ef73e69de33dc6bbea38c81b8744fad5ce4764644d9cc6168d7c0f175856e30c3a577ffc597f25f8caf26bacfd80663b55eddde047a346fcb582d883269233b9 SHA512 b27c92e768c2783c90c8b4693c3265a9533a09abe76b2b3bd54e3865d270eed91414fcd89513bc30feb0243ea21f63d354b907b74eb18e98f899811101a6c956
diff --git a/dev-java/byte-buddy/byte-buddy-1.15.11.ebuild b/dev-java/byte-buddy/byte-buddy-1.15.11.ebuild
new file mode 100644
index 000000000000..a1021afe6a00
--- /dev/null
+++ b/dev-java/byte-buddy/byte-buddy-1.15.11.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_PROVIDES="net.bytebuddy:byte-buddy-agent:${PV} net.bytebuddy:byte-buddy:${PV}"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Offers convenience for attaching an agent to the local or a remote VM"
+HOMEPAGE="https://bytebuddy.net"
+SRC_URI="https://github.com/raphw/byte-buddy/archive/${P}.tar.gz"
+S="${WORKDIR}/byte-buddy-${P}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
+
+DEPEND="
+	>=dev-java/asm-9.7.1:9
+	dev-java/findbugs-annotations:0
+	dev-java/jna:4
+	dev-java/jsr305:0
+	>=virtual/jdk-11:*
+	test? (
+		>=dev-java/mockito-2.28.2-r1:2
+	)
+"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+PATCHES=( "${FILESDIR}/byte-buddy-1.15.10-Skip-testIgnoreExistingField.patch" )
+
+JAVA_CLASSPATH_EXTRA="
+	asm-9
+	findbugs-annotations
+	jna-4
+	jsr305
+"
+JAVADOC_CLASSPATH="${JAVA_CLASSPATH_EXTRA}"
+JAVADOC_SRC_DIRS=(
+	"byte-buddy-agent/src/main/java"
+	"byte-buddy/src/main/java"
+)
+
+src_prepare() {
+	default #780585
+	java-pkg_clean ! -path "./byte-buddy-dep/src/test/*"	# Keep test-classes
+	java-pkg-2_src_prepare
+	# https://github.com/raphw/byte-buddy/blob/byte-buddy-1.12.20/byte-buddy-agent/pom.xml#L142-L176
+	cat > byte-buddy-agent/src/main/java/module-info.java <<-EOF || die
+		module net.bytebuddy.agent {
+			requires java.instrument;
+			requires static jdk.attach;
+			requires static com.sun.jna;
+			requires static com.sun.jna.platform;
+			requires java.base;
+			exports net.bytebuddy.agent;
+			exports net.bytebuddy.agent.utility.nullability;
+		}
+	EOF
+
+	# instead of shading byte-buddy-dep we move it into byte-buddy.
+	mv byte-buddy{-dep,}/src/main/java || die "cannot move sources"
+
+	# https://github.com/raphw/byte-buddy/blob/byte-buddy-1.12.20/byte-buddy/pom.xml#L159-L195
+	local exports="$( \
+		sed -n '/<packages.list.external>/,/<\/packages.list.external/p' \
+		byte-buddy/pom.xml \
+		| sed -e 's:^:exports :' -e 's:,:;:' \
+		| grep -v 'packages.list.external\|shade' | tr -s '[:space:]' \
+		)" || die
+	cat > byte-buddy/src/main/java/module-info.java <<-EOF || die
+		module net.bytebuddy {
+			requires static java.instrument;
+			requires static java.management;
+			requires static jdk.unsupported;
+			requires static net.bytebuddy.agent;
+			requires static com.sun.jna;
+			requires static com.sun.jna.platform;
+			requires java.base;
+			${exports}
+		}
+	EOF
+}
+
+src_compile() {
+	einfo "Compiling byte-buddy-agent.jar"
+	JAVA_JAR_FILENAME="byte-buddy-agent.jar"
+	JAVA_RESOURCE_DIRS="byte-buddy-agent/src/main/resources"
+	JAVA_SRC_DIR="byte-buddy-agent/src/main/java"
+	java-pkg-simple_src_compile
+	JAVA_GENTOO_CLASSPATH_EXTRA+=":byte-buddy-agent.jar"
+	rm -r target || die
+
+	einfo "Compiling byte-buddy.jar"
+	JAVA_JAR_FILENAME="byte-buddy.jar"
+	JAVA_MAIN_CLASS="net.bytebuddy.build.Plugin\$Engine\$Default"
+	JAVA_RESOURCE_DIRS=()
+	JAVA_SRC_DIR="byte-buddy/src/main/java"
+	java-pkg-simple_src_compile
+	JAVA_GENTOO_CLASSPATH_EXTRA+=":byte-buddy.jar"
+	rm -r target || die
+
+	einfo "Building javadocs"
+	rm byte-buddy{,-agent}/src/main/java/module-info.java || die
+	use doc && ejavadoc
+}
+
+src_test() {
+	# instead of shading byte-buddy-dep we move it into byte-buddy.
+	mv byte-buddy{-dep,}/src/test || die "cannot move tests"
+
+	JAVAC_ARGS="-g"
+	JAVA_TEST_GENTOO_CLASSPATH="junit-4,mockito-2"
+
+	einfo "Testing byte-buddy-agent"
+	# https://github.com/raphw/byte-buddy/issues/1321#issuecomment-1252776459
+	JAVA_TEST_EXTRA_ARGS=( -Dnet.bytebuddy.test.jnapath="${EPREFIX}/usr/$(get_libdir)/jna-4/" )
+	JAVA_TEST_SRC_DIR="byte-buddy-agent/src/test/java"
+	java-pkg-simple_src_test
+
+	einfo "Testing byte-buddy"
+	JAVA_TEST_RESOURCE_DIRS=( byte-buddy/src/test/{resources,precompiled*} )
+	JAVA_TEST_SRC_DIR="byte-buddy/src/test/java"
+
+	JAVA_TEST_EXCLUDES=(
+		# all tests in this class fail, https://bugs.gentoo.org/863386
+		net.bytebuddy.build.CachedReturnPluginTest
+	)
+	java-pkg-simple_src_test
+}
+
+src_install() {
+	java-pkg_dojar "byte-buddy-agent.jar"
+	java-pkg-simple_src_install
+
+	if use source; then
+		java-pkg_dosrc "byte-buddy-agent/src/main/java/*"
+		java-pkg_dosrc "byte-buddy/src/main/java/*"
+	fi
+}
diff --git a/dev-java/jffi/Manifest b/dev-java/jffi/Manifest
index c182de1f2529..5deb02cb62ea 100644
--- a/dev-java/jffi/Manifest
+++ b/dev-java/jffi/Manifest
@@ -1,4 +1,7 @@
+AUX jffi-1.3.13-GNUmakefile.patch 1131 BLAKE2B 0a7bf486bb9bb7c86c02c9c7e57d5852918bc8a22eaf388b6f5c682f2c50b1b5decfeeb786b59cb5e5290ada3d3f75f3bc33dc90305d7df041d19f2af337c193 SHA512 73bc8b6c83ea6186ae457605e03bc01a10a6ab07e7f832b47bd48b3894c659ac909eb7ec70d6150ac972293516723d52c2a865815d3b01d2ff9113bcb572a7b5
 AUX jffi-1.3.8-GNUmakefile.patch 1052 BLAKE2B 724db39c11184668d0380ba0a6ba2079b5036d1b79121b024678dca30152916fddbb0c23955446bd7998b0cf8fc8a148fb6b8a62a7f1880e706053c6b601c7c1 SHA512 60f0647d5b16f3e1e736bbab47ea9b5e95b84cd052aae3bc67300cf2a6455b4f063296101723367a69d36ac83cfd0b98ce5d1b9b9a4a627c9c84adc014e0caf4
 DIST jffi-1.3.10.tar.gz 3304571 BLAKE2B a2ce4901d05b31cffcbe750e9a9294413057ae26426ae381f08ab07a085507afe38d447a60d4698d0878760ba1fe18bfdc31ce9b737676a70c93689d2e4533a7 SHA512 9e7d9aa1c16d7fa2486c75b71fd23465a3069ea3f314bc1b536115c982333d7cffa93f75a06ec86b740b83f4fca3be0c32cf99222d90bf1e6b45a9744ead1268
-EBUILD jffi-1.3.10.ebuild 3102 BLAKE2B b13e1af61b3f90f9a9fdd7a888ddfbf217b8f5a651840641b0709a59c6f37a91c1ef4726487ef6f7867067628f90a4dae4b34410775a1bb21db03201ba9cde8b SHA512 8e795599eb776aa09073026862b38a27630263301ba02da3d9a7b38cd9997fdf3a955f3fb22874304bc0a335ccb9affe72beb6ef3d91fdf5181be78d0f0b9f78
+DIST jffi-1.3.13.tar.gz 3345405 BLAKE2B ebbab23ae220c9178f93ee668be70b5f18aa62258773d07e0b5f2c0da83fad59e4641d0b70aef417bcd5566c8a1cc1258db28c5e2883691e89104e18611ba6a9 SHA512 81f598e14d303c89bb35d0edba5ae0a17f8920bfbbded9583987ba58b22713681cf00965bc75a7d19597f9697fd20a08607801b9c677024bfc112080955f6443
+EBUILD jffi-1.3.10-r1.ebuild 3100 BLAKE2B f2d6ad01e43e1aa805a30a7dfea97e5232bf06319434f6e9913b12aba81935c54b73ec9c1a6784fa9ca1754f9749ad680234dcf7faaa7c398c20408ba7965320 SHA512 cb0af27b818818893b1ccc5ce9ab0284c617505d40774b979fc92a5636d411eb64d3f04fa0c204494280b89c73261cfe84c7e7ea5439e8c51c03230410b955c9
+EBUILD jffi-1.3.13.ebuild 2307 BLAKE2B cadf217eb13e0eb3d8e783ce7f9ec55378092f09416a0e2bb0779713ebc29d1235046ddcedea81570192e1b1ef693db68198bff0fade6ff7e00a73ca8afd09b0 SHA512 9bdba7bb26b7b7a4a9243a8eccabe80e7ceeb3c809b0f3ac0562405c57b68c9a0b30ec16e0a520fd1303955634c7465ed301750e0f509825d4a650668b3702f6
 MISC metadata.xml 320 BLAKE2B 4b1ac90322eb9faf01b397b7b4eea9167648abf3a89693a3bb28b27f5015b03c20c3b1b7843509686c8a827be8d4ea37f40fdf6ddaae418eec2dfa3b1797ffae SHA512 0daa4f9c85c906fdbd2fb652257c4d8ff52d88738e8e37e6bed49fdee6bb8aecefcd06e39fbe1262a3a0af73d2e1f4cfc8d0fc56b109bc686975ed41e54a68c9
diff --git a/dev-java/jffi/files/jffi-1.3.13-GNUmakefile.patch b/dev-java/jffi/files/jffi-1.3.13-GNUmakefile.patch
new file mode 100644
index 000000000000..67e528cd15be
--- /dev/null
+++ b/dev-java/jffi/files/jffi-1.3.13-GNUmakefile.patch
@@ -0,0 +1,40 @@
+diff --git a/jni/GNUmakefile b/jni/GNUmakefile
+index 8ac84a6..3ac3091 100755
+--- a/jni/GNUmakefile
++++ b/jni/GNUmakefile
+@@ -66,9 +66,11 @@ OFLAGS = -O2 $(JFLAGS)
+ WERROR = -Werror
+ ifneq ($(OS),darwin)
+ ifneq ($(OS),aix)
++ifneq ($(OS),linux)
+   WFLAGS += -Wundef $(WERROR)
+ endif
+ endif
++endif
+ WFLAGS += -W -Wall -Wno-unused -Wno-parentheses -Wno-unused-parameter
+ PICFLAGS = -fPIC
+ SOFLAGS = # Filled in for each OS specifically
+@@ -263,7 +265,7 @@ debug:
+ 	@echo "OBJS=$(OBJS)"
+ 
+ $(LIBJFFI):  $(OBJS) $(LIBFFI_LIBS)
+-	$(CC) -o $@ $(LDFLAGS) $(SOFLAGS) $(OBJS) $(LIBFFI_LIBS) $(LIBS)
++	$(CC) -o $@ $(LDFLAGS) $(SOFLAGS) $(OBJS) $(LIBFFI_LIBS) $(LIBS) $(LIBFFI_LIBS)
+ 	$(STRIP) $@
+ ifeq ($(OS), darwin)
+ 	codesign -s - $@
+@@ -272,10 +274,14 @@ endif
+ $(BUILD_DIR)/%.o : $(SRC_DIR)/%.c $(wildcard $(JFFI_SRC_DIR)/*.h)
+ 	@mkdir -p $(@D)
+ 	@$(CCACHE) $(CC) $(CFLAGS) -c $< -o $@
++	mkdir -p $(@D)
++	$(CCACHE) $(CC) $(CFLAGS) -c $< -o $@
+ 
+ $(BUILD_DIR)/%.o : $(SRC_DIR)/%.S $(wildcard $(JFFI_SRC_DIR)/*.h)
+ 	@mkdir -p $(@D)
+ 	@$(CC) $(CFLAGS) -o $@ -c $<
++	mkdir -p $(@D)
++	$(CC) $(CFLAGS) -o $@ -c $<
+ 
+ $(OBJS) : $(LIBFFI_LIBS)
+ 
diff --git a/dev-java/jffi/jffi-1.3.10.ebuild b/dev-java/jffi/jffi-1.3.10-r1.ebuild
index 3c62e8a2a78c..5090e03de74f 100644
--- a/dev-java/jffi/jffi-1.3.10.ebuild
+++ b/dev-java/jffi/jffi-1.3.10-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/jnr/${PN}/archive/${P}.tar.gz"
 S="${WORKDIR}/${PN}-${P}"
 
 LICENSE="Apache-2.0"
-SLOT="1.3"
+SLOT="0"
 KEYWORDS="amd64 arm64 ppc64"
 
 DEPEND=">=virtual/jdk-1.8:*
diff --git a/dev-java/jffi/jffi-1.3.13.ebuild b/dev-java/jffi/jffi-1.3.13.ebuild
new file mode 100644
index 000000000000..e9553b95cccf
--- /dev/null
+++ b/dev-java/jffi/jffi-1.3.13.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 test"
+MAVEN_ID="com.github.jnr:jffi:1.3.13"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java Foreign Function Interface"
+HOMEPAGE="https://github.com/jnr/jffi"
+SRC_URI="https://github.com/jnr/${PN}/archive/${P}.tar.gz"
+S="${WORKDIR}/${PN}-${P}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	>=dev-libs/libffi-3.4.2-r2:=
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	>=dev-libs/libffi-3.4.2-r2:=
+"
+
+PATCHES=( "${FILESDIR}"/jffi-1.3.13-GNUmakefile.patch )
+
+JAVA_AUTOMATIC_MODULE_NAME="org.jnrproject.jffi"
+JAVA_SRC_DIR="src/main/java"
+
+# https://github.com/jnr/jffi/blob/b6ad5c066a6346072ea04f8ffa8177204aadcb13/build.xml#L26
+JAVA_TEST_EXTRA_ARGS="-Djffi.library.path=${S}/build/jni -Djffi.boot.library.path=${S}/build/jni"
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+src_prepare() {
+	java-pkg-2_src_prepare
+	default
+	cat > src/main/java/com/kenai/jffi/Version.java <<-EOF
+		package com.kenai.jffi;
+		import java.lang.annotation.Native;
+		public final class Version {
+			private Version() {}
+			@Native
+			public static final int MAJOR = $(ver_cut 1);
+			@Native
+			public static final int MINOR = $(ver_cut 2);
+			@Native
+			public static final int MICRO = $(ver_cut 3);
+		}
+	EOF
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+
+	# generate headers
+	mkdir -p build/jni
+	javac -h build/jni -classpath target/classes \
+		${JAVA_SRC_DIR}/com/kenai/jffi/{Foreign,ObjectBuffer,Version}.java \
+		|| die
+
+	#build native library.
+	local args=(
+		SRC_DIR=jni
+		JNI_DIR=jni
+		BUILD_DIR=build/jni
+		VERSION=$(ver_cut 1-2)
+		USE_SYSTEM_LIBFFI=1
+		CCACHE=
+		-f jni/GNUmakefile
+	)
+	emake "${args[@]}"
+}
+
+src_test() {
+	# build native test library
+	emake BUILD_DIR=build -f libtest/GNUmakefile
+
+	# https://github.com/jnr/jffi/issues/60
+	LC_ALL=C java-pkg-simple_src_test
+}
+
+src_install() {
+	local libname=".so"
+	java-pkg_doso build/jni/lib${PN}-$(ver_cut 1-2)${libname}
+
+	# must be after _doso to have JAVA_PKG_LIBDEST set
+	cat > boot.properties <<-EOF
+		jffi.boot.library.path = ${JAVA_PKG_LIBDEST}
+	EOF
+	jar -uf ${PN}.jar boot.properties || die
+
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/jnr-ffi/Manifest b/dev-java/jnr-ffi/Manifest
index 1362cf68a9c4..a0a92219dc7b 100644
--- a/dev-java/jnr-ffi/Manifest
+++ b/dev-java/jnr-ffi/Manifest
@@ -1,3 +1,5 @@
 DIST jnr-ffi-2.2.12.tar.gz 285324 BLAKE2B 32e866654b901ded7cdc82999d79873d49bd9d3599d265e9d029e7cf8ce1895f9e830a1af75b8c149c3debc5f3d256f6241d706ecbd94277ce1fa49a2868885c SHA512 420adb647c5d0547f0b18e4f8a21096da9aaebbdf0e50761ec1fd6be64ad29649c7af4d6daf0a8c4c38e02a05e0df836de6fdb7776f10c02d8bfd447a11882b3
-EBUILD jnr-ffi-2.2.12.ebuild 1189 BLAKE2B 80265a2b13bc5a777f67284261a6af770e2c09290930e37735c53b9d86086cbd95a74eb446325f046b84ef70671b18326077e49a1945d02aa55a8040020b3eb2 SHA512 dcf04651419a178f1dc395b1b6e5a55c6fb1429cd05d6dc6fd34e72f1b9fbbabbab34cf72f27b752fc5ce669caf13de31e3ca5d2139331e2da6bb3d74cad624c
+DIST jnr-ffi-2.2.17.tar.gz 286018 BLAKE2B cf0aad44e61ee07128e1baf78567cf99893a149489c13cde42f0b54bba2b804a97ec40144e36663fc217427c2a0aacdbd736854d7b058020beebdbd45643a7bf SHA512 a53de8029b25d5d2dc4e304145070ec292af666b6ae8ac6f88f955a49bca01c1294d9330390916c92c4a1b9116ef29340ed3854983811149c4a0962d0f43504c
+EBUILD jnr-ffi-2.2.12-r1.ebuild 1191 BLAKE2B 15076288eb5fb18f99c3ba324a3f14c2029c4bbe46f739fe14fcbeac64824cce6795439b0c2644611d1ff34eb88a2d50dc576cfe9eec901eed6aaaaf1999e8ce SHA512 219775d842fe40669cf20d4ecb344126ec55d7d253c1d7eceeebca2b471a147692ab3b757ec779ede524b6bb2af81fe7b52f84af8d1f1917db608b6cf4219c67
+EBUILD jnr-ffi-2.2.17.ebuild 778 BLAKE2B f55efb43c5ba71f78bc8ace7c9abd7644fb003788e95e7aa2c64f27c5909f1759029cd89f1f8fb2626575a8cd63bdb8206b0f5a0ccf998da711e76907e573728 SHA512 ce4fbafc0793c088500d84c2a477ffe34bd180a959d382ec6035e770c21bfd6672102a09091d465b2162f667104a1ade454b5ac2ada6c969893165a989c4dc41
 MISC metadata.xml 323 BLAKE2B 377b6cae0335bb1d1160c22d684541576023a02984183c468689418ea3a1b2c6520a95ec7d18e86ea1b6c426d44d40bf6debea926c03c9c321d82dfc8874ee6e SHA512 f7503b3bbfc40eeda0e00cacd5a84723f17fdae5657594b8f44c9b7e7e059b6eeb23d034baab20aaeb554e35721a73ad1c0cac30aa67845a4e842f30348b79d6
diff --git a/dev-java/jnr-ffi/jnr-ffi-2.2.12.ebuild b/dev-java/jnr-ffi/jnr-ffi-2.2.12-r1.ebuild
index 1bcbaea776f3..08f94f164b1c 100644
--- a/dev-java/jnr-ffi/jnr-ffi-2.2.12.ebuild
+++ b/dev-java/jnr-ffi/jnr-ffi-2.2.12-r1.ebuild
@@ -18,12 +18,12 @@ HOMEPAGE="https://github.com/jnr/jnr-ffi"
 SRC_URI="https://github.com/jnr/${PN}/archive/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
-SLOT="2"
+SLOT="0"
 KEYWORDS="amd64 arm64 ppc64"
 
 CP_DEPEND="
 	dev-java/asm:9
-	>=dev-java/jffi-1.3.8:1.3
+	>=dev-java/jffi-1.3.10-r1:0
 	dev-java/jnr-a64asm:2
 	dev-java/jnr-x86asm:1.0
 "
diff --git a/dev-java/jnr-ffi/jnr-ffi-2.2.17.ebuild b/dev-java/jnr-ffi/jnr-ffi-2.2.17.ebuild
new file mode 100644
index 000000000000..4e5829ed8171
--- /dev/null
+++ b/dev-java/jnr-ffi/jnr-ffi-2.2.17.ebuild
@@ -0,0 +1,39 @@
+# 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="com.github.jnr:jnr-ffi:2.2.17"
+# We don't have junit-jupiter yet
+# JAVA_TESTING_FRAMEWORKS="junit-jupiter"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A library for invoking native functions from java"
+HOMEPAGE="https://github.com/jnr/jnr-ffi"
+SRC_URI="https://github.com/jnr/${PN}/archive/${P}.tar.gz"
+S="${WORKDIR}/${PN}-${P}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
+
+CP_DEPEND="
+	dev-java/asm:9
+	>=dev-java/jffi-1.3.13:0
+	dev-java/jnr-a64asm:2
+	dev-java/jnr-x86asm:1.0
+"
+
+DEPEND="
+	${CP_DEPEND}
+	>=virtual/jdk-1.8:*
+"
+
+RDEPEND="
+	${CP_DEPEND}
+	>=virtual/jre-1.8:*
+"
+
+JAVA_SRC_DIR="src/main/java"
diff --git a/dev-java/jnr-netdb/Manifest b/dev-java/jnr-netdb/Manifest
index a34ad0e20b36..6b66420bc244 100644
--- a/dev-java/jnr-netdb/Manifest
+++ b/dev-java/jnr-netdb/Manifest
@@ -1,3 +1,3 @@
 DIST jnr-netdb-1.2.0.tar.gz 649059 BLAKE2B 660074d3a0d201784bddb259796ee4bb87a3579d6ffffcb5c3bf171d34e525c768c8c9282d8a99c250282d108011c0cf4bc9b8cf32dc7f3edc7e0a2b1cbaf9d4 SHA512 6eeb21d42b1eb7c0beed4f263c3440c7e5ae15f76365fb189fc8727c824e01d92662564ae641e1233ec0df68f6761c3c31a8a61891de59a524c213959bd32856
-EBUILD jnr-netdb-1.2.0.ebuild 838 BLAKE2B 1bb63617f9dca97999914eae61674631b0200f6eda8cc1cbcffcbea7dccc9ea031ea05ee1c4b923e854558b06d341db6b3ccc5e5ee13ebda89f07c8313430631 SHA512 8c3b3915704e52dfab500a9be97629a50f261c6c6ccf453054ea7ad23cf7b10fd01f5004be453e8843823f719da0178d5de997c8ea0f0ded9458ba4064ce2d3d
+EBUILD jnr-netdb-1.2.0-r1.ebuild 848 BLAKE2B 9a4e1702423207a397609fccadf2de9877b947b83e33fa52a22c561f4115256d29ec681294960738fa3af64f3b2d1b4aed7f67258580b8383a008254b6e5856e SHA512 c0c4c2a976f056a72de8cd4930d6826e5ce8ecfcca44b5166058a6cce6080c14181813bc6b0ab5806c98e15a9b0c68a175cbd63d9fb7ead450169b8d16892128
 MISC metadata.xml 662 BLAKE2B 64087950d504c3f16ef8466aaae35c567e2fdb1547346e99e537dd9ac1535c4ad209af80425993dce4a52287ad9960dfac6dbc923faa66e5ebc3328b9ccaae70 SHA512 458c722c132eb5b69a970dffe25ab6bc3e71f7d9fc77639d5b46dcb37aff851a2cffed0a62fdce6ce2192fb3da52d6781597367fb95d1fd794935a4e469b86f6
diff --git a/dev-java/jnr-netdb/jnr-netdb-1.2.0.ebuild b/dev-java/jnr-netdb/jnr-netdb-1.2.0-r1.ebuild
index 4ce95b456a3a..a114ba16bc0f 100644
--- a/dev-java/jnr-netdb/jnr-netdb-1.2.0.ebuild
+++ b/dev-java/jnr-netdb/jnr-netdb-1.2.0-r1.ebuild
@@ -13,11 +13,11 @@ HOMEPAGE="https://github.com/jnr/jnr-netdb"
 SRC_URI="https://github.com/jnr/jnr-netdb/archive/jnr-netdb-${PV}.tar.gz"
 
 LICENSE="Apache-2.0"
-SLOT="1.0"
+SLOT="0"
 KEYWORDS="amd64 arm64 ppc64"
 
 CP_DEPEND="
-	dev-java/jnr-ffi:2"
+	>=dev-java/jnr-ffi-2.2.12-r1:0"
 
 RDEPEND="${CP_DEPEND}
 	>=virtual/jre-1.8:*"
diff --git a/dev-java/jnr-posix/Manifest b/dev-java/jnr-posix/Manifest
index e6193faa37cd..450538181aca 100644
--- a/dev-java/jnr-posix/Manifest
+++ b/dev-java/jnr-posix/Manifest
@@ -1,3 +1,5 @@
 DIST jnr-posix-3.1.16.tar.gz 120553 BLAKE2B b430d4699b84e9c4139291c34c328ade600adade68081167d3b47ce52caa6f96a818702dcb26652d186d7de825b32b00f2f1329b79f9c459cbbb6f6a4260d9f3 SHA512 988221a9a499db64c2bc3fe4e798fb77ce1bce44a31b51ace4f1e52b9a76a3af9a1521477a64413b44f36da9ab5446feb1b2ffd4e7dc50be055f6092d9e1f977
-EBUILD jnr-posix-3.1.16.ebuild 2853 BLAKE2B 79e99037c9e49e73a0d4d0eede6b2f5b8e7b4b29b93481a7a92d79c350e62e1cd56019eef860118d6a359c9ada27de8ff803035200fbdc3808a432247be1974d SHA512 055d5e2ee66a5837ea25603a19963d07eb57e04b6c4b5c488b4e38fbe8f0ed8876c24c0f928777823756e1b42b8d5b0b7b8f443033e95172e2d783c7a0c4c8d0
+DIST jnr-posix-3.1.20.tar.gz 121435 BLAKE2B 46e7bc5de4eef1473fb26805a3a0120d5138f0945cbbc9b9e5328859e5b73ee94dd8c5db6159a921ec33852ab0fcf218d584b57712797ab52048d8b88a7ba71c SHA512 7f64250a60f5f9d9c6331c44dc7933755f45482b6fd03f6154a38433e1706bc7cd69a3302c64b61c2209f8c129cc5d46a7a75ceba3d8e0dcdeb5eca1c935e765
+EBUILD jnr-posix-3.1.16-r1.ebuild 2854 BLAKE2B 01798f63e18ff228c00eef6b3fca709cab7762a520beaec662a47b3ad5afda9bddd2fd2ca01c5c06b6c831af9dc804bab52cc9125e592053badcf21469a7ea72 SHA512 63239e77acbeaee86b6ceab6675d7d8890271ecd028cbeb04553cd8d39c8a5f38fab74141f772d9a4e113ddb730d6652c55980cc56732b6ad65d77735893d4c1
+EBUILD jnr-posix-3.1.20.ebuild 2043 BLAKE2B 6d9faf29099fb5dca7b917084180acdf7fa47d8229f169925e53b1ed43bc82fdaf9091ef2530b51c8850aefff924154a236dbf7218100776373fe84a95bc5d23 SHA512 f86c7c0b3eb6966d2cf603de3939d9b782d431989c4ac57ecf9696a852dc68e19152277cdd33c5de9c7a64815048a7cf6486feb1c32be0ce26156774c23f26e2
 MISC metadata.xml 325 BLAKE2B f40ca825a92205c1ef0e0be2e72c859b680593c0f852aec73c3d84356a9927f5f536ffcec7b7a365353ac56489677d7881f9f27431abc56cdf9cc24550493097 SHA512 ff2bae0526d5ae082ad290411e7d3cd95a197918e4d834a531cab016ff9a718197a27fb2c7a4f7426bb44a5b295e164a72dd36f5fac800bc20388fde0f52e0a4
diff --git a/dev-java/jnr-posix/jnr-posix-3.1.16.ebuild b/dev-java/jnr-posix/jnr-posix-3.1.16-r1.ebuild
index 2d4d881cc2cf..87431a445012 100644
--- a/dev-java/jnr-posix/jnr-posix-3.1.16.ebuild
+++ b/dev-java/jnr-posix/jnr-posix-3.1.16-r1.ebuild
@@ -15,11 +15,11 @@ SRC_URI="https://github.com/jnr/${PN}/archive/${P}.tar.gz"
 S="${WORKDIR}/${PN}-${P}"
 
 LICENSE="EPL-2.0 GPL-2 LGPL-2.1"
-SLOT="3.0"
+SLOT="0"
 KEYWORDS="amd64 arm64 ppc64"
 
 CP_DEPEND="
-	>=dev-java/jnr-ffi-2.2.12:2
+	>=dev-java/jnr-ffi-2.2.12-r1:0
 	dev-java/jnr-constants:0
 "
 
diff --git a/dev-java/jnr-posix/jnr-posix-3.1.20.ebuild b/dev-java/jnr-posix/jnr-posix-3.1.20.ebuild
new file mode 100644
index 000000000000..ac22e303e9dc
--- /dev/null
+++ b/dev-java/jnr-posix/jnr-posix-3.1.20.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.github.jnr:jnr-posix:3.1.20"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Common cross-project/cross-platform POSIX APIs"
+HOMEPAGE="https://github.com/jnr/jnr-posix"
+SRC_URI="https://github.com/jnr/${PN}/archive/${P}.tar.gz"
+S="${WORKDIR}/${PN}-${P}"
+
+LICENSE="EPL-2.0 GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
+
+CP_DEPEND="
+	>=dev-java/jnr-ffi-2.2.17:0
+	dev-java/jnr-constants:0
+"
+
+DEPEND="
+	${CP_DEPEND}
+	>=virtual/jdk-11:*
+"
+
+RDEPEND="
+	${CP_DEPEND}
+	>=virtual/jre-1.8:*
+"
+
+JAVA_AUTOMATIC_MODULE_NAME="org.jnrproject.posix"
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+src_test() {
+	sed \
+		-e '/import org.junit.Test/a import org.junit.Ignore;' \
+		-i src/test/java/jnr/posix/FileTest.java || die
+
+	if use ppc64; then
+		# Ignore testMessageHdrMultipleControl
+		# https://bugs.gentoo.org/866199
+		# https://github.com/jnr/jnr-posix/issues/178
+		sed \
+			-e '/testMessageHdrMultipleControl/i @Ignore' \
+			-e '/import org.junit.Test/a import org.junit.Ignore;' \
+			-i src/test/java/jnr/posix/LinuxPOSIXTest.java || die
+	fi
+
+	JAVA_TEST_EXCLUDES=(
+		# https://github.com/jnr/jnr-posix/blob/jnr-posix-3.1.16/pom.xml#L185
+		# <exclude>**/windows/*Test.java</exclude>
+		"jnr.posix.windows.WindowsFileTest"
+		"jnr.posix.windows.WindowsHelpersTest"
+	)
+	local vm_version="$(java-config -g PROVIDES_VERSION)"
+	if [[ "${vm_version}" -ge "17" ]] ; then
+		JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.io=ALL-UNNAMED )
+		JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.util=ALL-UNNAMED )
+		# Some tests in jnr.posix.FileTest fail with jdk-17
+		sed \
+			-e '/flockTest()/i @Ignore' \
+			-e '/dupTest()/i @Ignore' \
+			-e '/closeTest()/i @Ignore' \
+			-e '/fcntlDupfdWithArgTest()/i @Ignore' \
+			-i src/test/java/jnr/posix/FileTest.java || die
+	fi
+	java-pkg-simple_src_test
+}
diff --git a/dev-java/jtidy/Manifest b/dev-java/jtidy/Manifest
index 129d9478b6c5..df9419282a2e 100644
--- a/dev-java/jtidy/Manifest
+++ b/dev-java/jtidy/Manifest
@@ -1,3 +1,3 @@
-DIST jtidy-1.0.zip 240642 BLAKE2B 96e312f2b938f75124a966ad6ecbae39a6822a0d362e98265226409b6c407cfbd1cf1eac2adac522cb02174159392c25bab3abb18c6dce591a0d398cef367306 SHA512 be73dfd2f65ec53a3c1a9b9014a62011f58f5f337bbd2b3939c5f8f54c225fa7718717bf84348bc07a37411c20b1e82f300ba4fc865d7019ada6b1f8d081440a
-EBUILD jtidy-1.0-r2.ebuild 810 BLAKE2B dadb4874c81dcc9ee39fad28cf00beca5fb6eaf1b3a41f1208469cc007ac44945b23dcf9f436e3b1066fbfbb5efed62ccef0c2c3759eb4f7cb199b81d0bb2a2e SHA512 65aa3ac2097299a8796b8b8fd41279cbbf36cf9cc228e1bfdcf6d639926ff35976aca4843e62edb766713c75bf2bdccfb40277c89c3e163889d00c7261605147
+DIST jtidy-r938-sources.zip 240642 BLAKE2B 96e312f2b938f75124a966ad6ecbae39a6822a0d362e98265226409b6c407cfbd1cf1eac2adac522cb02174159392c25bab3abb18c6dce591a0d398cef367306 SHA512 be73dfd2f65ec53a3c1a9b9014a62011f58f5f337bbd2b3939c5f8f54c225fa7718717bf84348bc07a37411c20b1e82f300ba4fc865d7019ada6b1f8d081440a
+EBUILD jtidy-938.ebuild 763 BLAKE2B da898e55ccd8f804266afaa3b052ab26632b7c91502735ad3c8d6deb27dbc5a718e20cf9a18fc3c675f6f6ff7b16ae7a0aff9660bf3ab3368adda042b2c92308 SHA512 47218fbdbd0506e046e5ec8c113138065834a74631a1be23d33c68f44d682d0f827ba4ebecc275d7b14585ee8e1ed6e91e51ed5b0d550f4eb1bf2eeeda8baabb
 MISC metadata.xml 312 BLAKE2B 0cefe0ab92f9a89c5728c2d7ceb5079e2942590955ebed76105c11ca6e25064fa5d74ad968bdb922be16ef01348ad9e015e68d501c7da3ee6a807cf3821e5380 SHA512 2f68badf7c7d98f60ca73b9fe7e5b5b12168aaec72605ca780e2478ba49f73f460dc3f8a7b4c6d28e334aac3e3e99d76573c4fb8eb40d92619ccbea845947bdd
diff --git a/dev-java/jtidy/jtidy-1.0-r2.ebuild b/dev-java/jtidy/jtidy-938.ebuild
index be5a440b99a8..cdc065b2b6bc 100644
--- a/dev-java/jtidy/jtidy-1.0-r2.ebuild
+++ b/dev-java/jtidy/jtidy-938.ebuild
@@ -8,23 +8,26 @@ MAVEN_ID="net.sf.jtidy:jtidy:r${PV}"
 
 inherit java-pkg-2 java-pkg-simple
 
-MY_PV="r938"
-MY_P="${PN}-${MY_PV}"
-
 DESCRIPTION="a Java port of HTML Tidy, a HTML syntax checker and pretty printer"
 HOMEPAGE="https://sourceforge.net/projects/jtidy/"
-SRC_URI="https://downloads.sourceforge.net/project/${PN}/JTidy/${MY_PV}/${PN}-${MY_PV}-sources.zip -> ${P}.zip"
+SRC_URI="https://downloads.sourceforge.net/project/jtidy/JTidy/r${PV}/jtidy-r${PV}-sources.zip"
 
 LICENSE="HTML-Tidy W3C"
 SLOT="0"
 KEYWORDS="amd64 ppc64"
 
 BDEPEND="app-arch/unzip"
-CP_DEPEND=">=dev-java/ant-1.10.14-r3:0"
-DEPEND="${CP_DEPEND}
-	>=virtual/jdk-1.8:*"
-RDEPEND="${CP_DEPEND}
-	>=virtual/jre-1.8:*"
+CP_DEPEND=">=dev-java/ant-1.10.15:0"
+
+DEPEND="
+	${CP_DEPEND}
+	>=virtual/jdk-1.8:*
+"
+
+RDEPEND="
+	${CP_DEPEND}
+	>=virtual/jre-1.8:*
+"
 
 JAVA_MAIN_CLASS="org.w3c.tidy.Tidy"
 JAVA_RESOURCE_DIRS="src/main/resources"
diff --git a/dev-java/lzma/Manifest b/dev-java/lzma/Manifest
index faf7075a387f..0037f49c4eca 100644
--- a/dev-java/lzma/Manifest
+++ b/dev-java/lzma/Manifest
@@ -1,3 +1,5 @@
 DIST lzma-22.01.7z 1261282 BLAKE2B 31bfa505626c6d22f84562d927cb8b7f0c6f9d7cfe9e38f49b33866957ad81f7bd1e6fb7b02a3e001edf9d64fc499b396e73738585e7d3a29fcd7d41dc65d1d7 SHA512 83e320242a51cb37caefd386a5768e64c6872101fd3c3cf4d3318bf834d27e84d8a92e3252987520a578b19ce3e2cddcbf9e10b909f5263c5cdc0710c2f26797
+DIST lzma-24.09.7z 1747679 BLAKE2B defb6e47a7f29a132ebed4bd71c00695708532670ef31de0917438b1b7a53e45144fa94f89e980af741d3c26862255a3d99c9b51cb06186bac20c5cdc272df97 SHA512 7d111668695da24061103f9287cd29f8f5dceca77d043a63ac1621d9f1c82e4e012efdcaa61ab24e56db33c5a70f04b426b71b3f224570a27b4e875fa38fdb0b
 EBUILD lzma-22.01.ebuild 537 BLAKE2B d23dce6a251c214e325d1c522a82721db619b5593ec01e38d5b4151467e7465ac1508e06da25fc661e0e8eca77aaf3b51df0ac39c36961d54c440e4dc5348fa8 SHA512 343957f1fac87972c45ed385d2f79530c1e8ce7aafd5d81498ab15c60d4e0c2f22e36ca2b994da64b32e1c303cb9a850efe3f0f56f13c24c7e84750f5c93f20c
+EBUILD lzma-24.09.ebuild 537 BLAKE2B ef1eb2bede19be21fbaf441a66756ab4cf13f834eafbe700b3876e153b16fe3f04260d4d71f7ca11c7be5e655f0cf0b7873ea9ee7f68deac636625afed150fb5 SHA512 0277e768c0fb957ca78c021ac0e7666fc23ccb32313d35af066699d3169a24a0eadc713fd0fb0a56c05a0e580b3c502e22d7264abd0b089e6a15973bd5404f76
 MISC metadata.xml 315 BLAKE2B 176efa41c8db8574008e4fdf3e274d2566bb83b3d25ec8fd252d83d6543debb91c9374c88fdca780e3716f349c98035596c097acd3b0c5aa5c636d610f0fd1d3 SHA512 d52bf7662f472446774c838101ad26ebee3653260f9c2765e9ece1ea87771c77b6d8eeeae0950bfec188dc800224ef46e01c3d223c8766d232bfd2d74a74c239
diff --git a/dev-java/lzma/lzma-24.09.ebuild b/dev-java/lzma/lzma-24.09.ebuild
new file mode 100644
index 000000000000..c5971d682334
--- /dev/null
+++ b/dev-java/lzma/lzma-24.09.ebuild
@@ -0,0 +1,22 @@
+# 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 unpacker
+
+DESCRIPTION="Java code for LZMA compression and decompression"
+HOMEPAGE="https://7-zip.org/"
+SRC_URI="https://7-zip.org/a/lzma${PV/./}.7z -> ${P}.7z"
+S="${WORKDIR}/Java"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+BDEPEND="$(unpacker_src_uri_depends)"
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+JAVA_SRC_DIR="SevenZip"