commit: 2783d0d7e30cd6e107273828faa663d6365bdeb0 Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> AuthorDate: Sun Jan 2 15:22:12 2022 +0000 Commit: Florian Schmaus <flow <AT> gentoo <DOT> org> CommitDate: Wed Jun 8 08:12:10 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2783d0d7
dev-java/jnr-posix: add 3.1.15 Bug: https://bugs.gentoo.org/827224 Those 2 errors from #827224 no longer occur. Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> Signed-off-by: Florian Schmaus <flow <AT> gentoo.org> dev-java/jnr-posix/Manifest | 1 + .../files/jnr-posix-3.1.15-FileTest.patch | 48 ++++++++++++++++ dev-java/jnr-posix/jnr-posix-3.1.15.ebuild | 65 ++++++++++++++++++++++ 3 files changed, 114 insertions(+) diff --git a/dev-java/jnr-posix/Manifest b/dev-java/jnr-posix/Manifest index 8d1346b1a5b2..2e180c60d0a4 100644 --- a/dev-java/jnr-posix/Manifest +++ b/dev-java/jnr-posix/Manifest @@ -1 +1,2 @@ DIST jnr-posix-3.0.10.tar.gz 85912 BLAKE2B b87ff78ccf10718bd1faf9e308421ba3ab5e90dee5e244fb1b7f53592da8ad98973cc50e6469bcea59e1202ee82b3f77522eb95e23584ff70cc66099ef1c4266 SHA512 a282c164b0b9ace8aba508a48d08d53beb0ddcd4baf5389412941a1e1430d75df9bdd35935a6982d4bb1910c0fdad55910ba028b1b5388c55e19a6c4ed2ba6a1 +DIST jnr-posix-3.1.15.tar.gz 120573 BLAKE2B 8035308440e444876d8d955ec3dd0b9d41f770436b53f964795a183ed7bd676dda8787c37425c488af2aa0accc948b86d1773e7e97ee5bcdaf209383dfda24a6 SHA512 6c8cd6d43c509ef7c16901d02983b823464b3437019233021398b2a9dfc85923db87c585e2f8248f080447a990e308feff25bbbf2a7261019dcae66c22e14a91 diff --git a/dev-java/jnr-posix/files/jnr-posix-3.1.15-FileTest.patch b/dev-java/jnr-posix/files/jnr-posix-3.1.15-FileTest.patch new file mode 100644 index 000000000000..eba2a6fc450a --- /dev/null +++ b/dev-java/jnr-posix/files/jnr-posix-3.1.15-FileTest.patch @@ -0,0 +1,48 @@ +diff --git a/src/test/java/jnr/posix/FileTest.java b/src/test/java/jnr/posix/FileTest.java +index afadb07..7eb8af7 100644 +--- a/src/test/java/jnr/posix/FileTest.java ++++ b/src/test/java/jnr/posix/FileTest.java +@@ -8,6 +8,7 @@ import jnr.ffi.Pointer; + import jnr.posix.util.Platform; + import org.junit.BeforeClass; + import org.junit.Test; ++import org.junit.Ignore; + + import java.io.*; + import java.nio.ByteBuffer; +@@ -215,7 +216,7 @@ public class FileTest { + dir.delete(); + } + +- @Test ++ @Ignore @Test + public void flockTest() throws Throwable { + if (!Platform.IS_WINDOWS) { + File tmp = File.createTempFile("flockTest", "tmp"); +@@ -236,7 +237,7 @@ public class FileTest { + } + } + +- @Test ++ @Ignore @Test + public void dupTest() throws Throwable { + File tmp = File.createTempFile("dupTest", "tmp"); + RandomAccessFile raf = new RandomAccessFile(tmp, "rw"); +@@ -303,7 +304,7 @@ public class FileTest { + } + } + +- @Test ++ @Ignore @Test + public void fcntlDupfdWithArgTest() throws Throwable { + if (!Platform.IS_WINDOWS) { + File tmp = File.createTempFile("dupTest", "tmp"); +@@ -327,7 +328,7 @@ public class FileTest { + } + } + +- @Test ++ @Ignore @Test + public void closeTest() throws Throwable { + File tmp = File.createTempFile("closeTest", "tmp"); + int fd = getFdFromDescriptor(JavaLibCHelper.getDescriptorFromChannel(new RandomAccessFile(tmp, "rw").getChannel())); diff --git a/dev-java/jnr-posix/jnr-posix-3.1.15.ebuild b/dev-java/jnr-posix/jnr-posix-3.1.15.ebuild new file mode 100644 index 000000000000..5e4a34bbddea --- /dev/null +++ b/dev-java/jnr-posix/jnr-posix-3.1.15.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Skeleton command: +# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/jnr/jnr-posix/archive/jnr-posix-3.1.15.tar.gz --slot 3.0 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild jnr-posix-3.1.15.ebuild + +EAPI=8 + +JAVA_PKG_IUSE="doc source test" +MAVEN_ID="com.github.jnr:jnr-posix:3.1.15" +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"; + +LICENSE="EPL-2.0 GPL-2 LGPL-2.1" +SLOT="3.0" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" + +CP_DEPEND=" + >=dev-java/jnr-ffi-2.2.12:2 + dev-java/jnr-constants:0 +" + +DEPEND="${CP_DEPEND} + >=virtual/jdk-11:*" + +RDEPEND="${CP_DEPEND} + >=virtual/jre-1.8:*" + +S="${WORKDIR}/${PN}-${P}" + +JAVA_SRC_DIR="src/main/java" + +JAVA_TEST_GENTOO_CLASSPATH="junit-4" +JAVA_TEST_SRC_DIR="src/test/java" + +src_test() { + JAVA_TEST_EXCLUDES=( + # https://github.com/jnr/jnr-posix/blob/jnr-posix-3.1.15/pom.xml#L185 + # <exclude>**/windows/*Test.java</exclude> + "jnr.posix.windows.WindowsFileTest" + "jnr.posix.windows.WindowsHelpersTest" + # Next 3 tests need to run separately, otherwise would fail. + "jnr.posix.GroupTest" + "jnr.posix.NlLanginfoTest" + "jnr.posix.SpawnTest" + ) + 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 ) + # Some tests in jnr.posix.FileTest fail with jdk-17 + eapply "${FILESDIR}/jnr-posix-3.1.15-FileTest.patch" + fi + java-pkg-simple_src_test + JAVA_TEST_RUN_ONLY="jnr.posix.SpawnTest" + java-pkg-simple_src_test + JAVA_TEST_RUN_ONLY="jnr.posix.NlLanginfoTest" + java-pkg-simple_src_test + JAVA_TEST_RUN_ONLY="jnr.posix.GroupTest" + java-pkg-simple_src_test +}
