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

3 files changed, 81 insertions, 3 deletions

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
+}