Adding metadata

17 files changed, 446 insertions, 17 deletions

diff --git a/dev-java/byte-buddy/Manifest b/dev-java/byte-buddy/Manifest
index 2fee07df74f6..9fc8709af89a 100644
--- a/dev-java/byte-buddy/Manifest
+++ b/dev-java/byte-buddy/Manifest
@@ -1,2 +1,3 @@
 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
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 8a641aa1521d..1d5142066df4 100644
--- a/dev-java/jffi/Manifest
+++ b/dev-java/jffi/Manifest
@@ -1 +1,2 @@
 DIST jffi-1.3.10.tar.gz 3304571 BLAKE2B a2ce4901d05b31cffcbe750e9a9294413057ae26426ae381f08ab07a085507afe38d447a60d4698d0878760ba1fe18bfdc31ce9b737676a70c93689d2e4533a7 SHA512 9e7d9aa1c16d7fa2486c75b71fd23465a3069ea3f314bc1b536115c982333d7cffa93f75a06ec86b740b83f4fca3be0c32cf99222d90bf1e6b45a9744ead1268
+DIST jffi-1.3.13.tar.gz 3345405 BLAKE2B ebbab23ae220c9178f93ee668be70b5f18aa62258773d07e0b5f2c0da83fad59e4641d0b70aef417bcd5566c8a1cc1258db28c5e2883691e89104e18611ba6a9 SHA512 81f598e14d303c89bb35d0edba5ae0a17f8920bfbbded9583987ba58b22713681cf00965bc75a7d19597f9697fd20a08607801b9c677024bfc112080955f6443
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 cfbd2c1ca16d..3e7ad60f60a4 100644
--- a/dev-java/jnr-ffi/Manifest
+++ b/dev-java/jnr-ffi/Manifest
@@ -1 +1,2 @@
 DIST jnr-ffi-2.2.12.tar.gz 285324 BLAKE2B 32e866654b901ded7cdc82999d79873d49bd9d3599d265e9d029e7cf8ce1895f9e830a1af75b8c149c3debc5f3d256f6241d706ecbd94277ce1fa49a2868885c SHA512 420adb647c5d0547f0b18e4f8a21096da9aaebbdf0e50761ec1fd6be64ad29649c7af4d6daf0a8c4c38e02a05e0df836de6fdb7776f10c02d8bfd447a11882b3
+DIST jnr-ffi-2.2.17.tar.gz 286018 BLAKE2B cf0aad44e61ee07128e1baf78567cf99893a149489c13cde42f0b54bba2b804a97ec40144e36663fc217427c2a0aacdbd736854d7b058020beebdbd45643a7bf SHA512 a53de8029b25d5d2dc4e304145070ec292af666b6ae8ac6f88f955a49bca01c1294d9330390916c92c4a1b9116ef29340ed3854983811149c4a0962d0f43504c
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/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 b71b1747be9a..e31c342fd2c6 100644
--- a/dev-java/jnr-posix/Manifest
+++ b/dev-java/jnr-posix/Manifest
@@ -1 +1,2 @@
 DIST jnr-posix-3.1.16.tar.gz 120553 BLAKE2B b430d4699b84e9c4139291c34c328ade600adade68081167d3b47ce52caa6f96a818702dcb26652d186d7de825b32b00f2f1329b79f9c459cbbb6f6a4260d9f3 SHA512 988221a9a499db64c2bc3fe4e798fb77ce1bce44a31b51ace4f1e52b9a76a3af9a1521477a64413b44f36da9ab5446feb1b2ffd4e7dc50be055f6092d9e1f977
+DIST jnr-posix-3.1.20.tar.gz 121435 BLAKE2B 46e7bc5de4eef1473fb26805a3a0120d5138f0945cbbc9b9e5328859e5b73ee94dd8c5db6159a921ec33852ab0fcf218d584b57712797ab52048d8b88a7ba71c SHA512 7f64250a60f5f9d9c6331c44dc7933755f45482b6fd03f6154a38433e1706bc7cd69a3302c64b61c2209f8c129cc5d46a7a75ceba3d8e0dcdeb5eca1c935e765
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 e09ee53ded98..ef674657ef28 100644
--- a/dev-java/jtidy/Manifest
+++ b/dev-java/jtidy/Manifest
@@ -1 +1 @@
-DIST jtidy-1.0.zip 240642 BLAKE2B 96e312f2b938f75124a966ad6ecbae39a6822a0d362e98265226409b6c407cfbd1cf1eac2adac522cb02174159392c25bab3abb18c6dce591a0d398cef367306 SHA512 be73dfd2f65ec53a3c1a9b9014a62011f58f5f337bbd2b3939c5f8f54c225fa7718717bf84348bc07a37411c20b1e82f300ba4fc865d7019ada6b1f8d081440a
+DIST jtidy-r938-sources.zip 240642 BLAKE2B 96e312f2b938f75124a966ad6ecbae39a6822a0d362e98265226409b6c407cfbd1cf1eac2adac522cb02174159392c25bab3abb18c6dce591a0d398cef367306 SHA512 be73dfd2f65ec53a3c1a9b9014a62011f58f5f337bbd2b3939c5f8f54c225fa7718717bf84348bc07a37411c20b1e82f300ba4fc865d7019ada6b1f8d081440a
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 bedc97973b95..137ca4fe1303 100644
--- a/dev-java/lzma/Manifest
+++ b/dev-java/lzma/Manifest
@@ -1 +1,2 @@
 DIST lzma-22.01.7z 1261282 BLAKE2B 31bfa505626c6d22f84562d927cb8b7f0c6f9d7cfe9e38f49b33866957ad81f7bd1e6fb7b02a3e001edf9d64fc499b396e73738585e7d3a29fcd7d41dc65d1d7 SHA512 83e320242a51cb37caefd386a5768e64c6872101fd3c3cf4d3318bf834d27e84d8a92e3252987520a578b19ce3e2cddcbf9e10b909f5263c5cdc0710c2f26797
+DIST lzma-24.09.7z 1747679 BLAKE2B defb6e47a7f29a132ebed4bd71c00695708532670ef31de0917438b1b7a53e45144fa94f89e980af741d3c26862255a3d99c9b51cb06186bac20c5cdc272df97 SHA512 7d111668695da24061103f9287cd29f8f5dceca77d043a63ac1621d9f1c82e4e012efdcaa61ab24e56db33c5a70f04b426b71b3f224570a27b4e875fa38fdb0b
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"