* [gentoo-commits] repo/gentoo:master commit in: dev-java/jnr-posix/, dev-java/jnr-posix/files/
@ 2022-06-08 8:12 Florian Schmaus
0 siblings, 0 replies; 3+ messages in thread
From: Florian Schmaus @ 2022-06-08 8:12 UTC (permalink / raw
To: gentoo-commits
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
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/jnr-posix/, dev-java/jnr-posix/files/
@ 2022-09-02 17:57 Arthur Zamarin
0 siblings, 0 replies; 3+ messages in thread
From: Arthur Zamarin @ 2022-09-02 17:57 UTC (permalink / raw
To: gentoo-commits
commit: f5fc4bbbe17a489f4e629dc3a0cf3c4e17a67d1d
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Fri Sep 2 17:40:58 2022 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Sep 2 17:57:23 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5fc4bbb
dev-java/jnr-posix: drop 3.0.10-r1
Closes: https://bugs.gentoo.org/827224
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
dev-java/jnr-posix/Manifest | 1 -
dev-java/jnr-posix/files/jnr-posix_maven-build.xml | 256 ---------------------
dev-java/jnr-posix/jnr-posix-3.0.10-r1.ebuild | 54 -----
3 files changed, 311 deletions(-)
diff --git a/dev-java/jnr-posix/Manifest b/dev-java/jnr-posix/Manifest
index 2e180c60d0a4..99cac23713ca 100644
--- a/dev-java/jnr-posix/Manifest
+++ b/dev-java/jnr-posix/Manifest
@@ -1,2 +1 @@
-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_maven-build.xml b/dev-java/jnr-posix/files/jnr-posix_maven-build.xml
deleted file mode 100644
index 82260e156394..000000000000
--- a/dev-java/jnr-posix/files/jnr-posix_maven-build.xml
+++ /dev/null
@@ -1,256 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ====================================================================== -->
-<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above. -->
-<!-- ====================================================================== -->
-
-<!-- ====================================================================== -->
-<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
-<!-- ====================================================================== -->
-<!-- -->
-<!-- Any modifications will be overwritten. -->
-<!-- -->
-<!-- Generated by Maven Ant Plugin on 1/9/12 10:58 AM -->
-<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/ -->
-<!-- -->
-<!-- ====================================================================== -->
-
-<project name="jnr-posix-from-maven" default="package" basedir=".">
-
- <!-- ====================================================================== -->
- <!-- Build environment properties -->
- <!-- ====================================================================== -->
-
- <property file="${user.home}/.m2/maven.properties"/>
- <property file="maven-build.properties"/>
-
- <property name="maven.build.finalName" value="jnr-posix-2.0"/>
- <property name="maven.build.dir" value="target"/>
- <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
- <property name="maven.build.srcDir.0" value="src/main/java"/>
- <property name="maven.build.resourceDir.0" value="src/main/resources"/>
- <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
- <property name="maven.build.testDir.0" value="src/test/java"/>
- <property name="maven.build.testResourceDir.0" value="src/test/resources"/>
- <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
- <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
-
- <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
- <property name="maven.settings.offline" value="false"/>
- <property name="maven.settings.interactiveMode" value="true"/>
-
- <!-- ====================================================================== -->
- <!-- Defining classpaths -->
- <!-- ====================================================================== -->
-
- <path id="build.classpath">
- <pathelement location="${maven.repo.local}/com/github/jnr/jnr-ffi/0.6.0/jnr-ffi-0.6.0.jar"/>
- <pathelement location="${maven.repo.local}/com/github/jnr/jffi/1.0.11/jffi-1.0.11.jar"/>
- <pathelement location="${maven.repo.local}/com/github/jnr/jffi/1.0.11/jffi-1.0.11-native.jar"/>
- <pathelement location="${maven.repo.local}/asm/asm/3.2/asm-3.2.jar"/>
- <pathelement location="${maven.repo.local}/asm/asm-commons/3.2/asm-commons-3.2.jar"/>
- <pathelement location="${maven.repo.local}/asm/asm-analysis/3.2/asm-analysis-3.2.jar"/>
- <pathelement location="${maven.repo.local}/asm/asm-tree/3.2/asm-tree-3.2.jar"/>
- <pathelement location="${maven.repo.local}/asm/asm-util/3.2/asm-util-3.2.jar"/>
- <pathelement location="${maven.repo.local}/com/github/jnr/jnr-x86asm/1.0.1/jnr-x86asm-1.0.1.jar"/>
- <pathelement location="${maven.repo.local}/com/github/jnr/jnr-constants/0.8.2/jnr-constants-0.8.2.jar"/>
- </path>
- <path id="build.test.classpath">
- <pathelement location="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.jar"/>
- <pathelement location="${maven.repo.local}/com/github/jnr/jnr-ffi/0.6.0/jnr-ffi-0.6.0.jar"/>
- <pathelement location="${maven.repo.local}/com/github/jnr/jffi/1.0.11/jffi-1.0.11.jar"/>
- <pathelement location="${maven.repo.local}/com/github/jnr/jffi/1.0.11/jffi-1.0.11-native.jar"/>
- <pathelement location="${maven.repo.local}/asm/asm/3.2/asm-3.2.jar"/>
- <pathelement location="${maven.repo.local}/asm/asm-commons/3.2/asm-commons-3.2.jar"/>
- <pathelement location="${maven.repo.local}/asm/asm-analysis/3.2/asm-analysis-3.2.jar"/>
- <pathelement location="${maven.repo.local}/asm/asm-tree/3.2/asm-tree-3.2.jar"/>
- <pathelement location="${maven.repo.local}/asm/asm-util/3.2/asm-util-3.2.jar"/>
- <pathelement location="${maven.repo.local}/com/github/jnr/jnr-x86asm/1.0.1/jnr-x86asm-1.0.1.jar"/>
- <pathelement location="${maven.repo.local}/com/github/jnr/jnr-constants/0.8.2/jnr-constants-0.8.2.jar"/>
- </path>
-
- <!-- ====================================================================== -->
- <!-- Cleaning up target -->
- <!-- ====================================================================== -->
-
- <target name="clean" description="Clean the output directory">
- <delete dir="${maven.build.dir}"/>
- </target>
-
- <!-- ====================================================================== -->
- <!-- Compilation target -->
- <!-- ====================================================================== -->
-
- <target name="compile" depends="get-deps" description="Compile the code">
- <mkdir dir="${maven.build.outputDir}"/>
- <javac destdir="${maven.build.outputDir}"
- nowarn="false"
- debug="true"
- optimize="false"
- deprecation="true"
- target="1.1"
- verbose="false"
- fork="false"
- source="1.3">
- <src>
- <pathelement location="${maven.build.srcDir.0}"/>
- </src>
- <classpath refid="build.classpath"/>
- </javac>
- </target>
-
- <!-- ====================================================================== -->
- <!-- Test-compilation target -->
- <!-- ====================================================================== -->
-
- <target name="compile-tests"
- depends="compile"
- description="Compile the test code"
- unless="maven.test.skip">
- <mkdir dir="${maven.build.testOutputDir}"/>
- <javac destdir="${maven.build.testOutputDir}"
- nowarn="false"
- debug="true"
- optimize="false"
- deprecation="true"
- target="1.1"
- verbose="false"
- fork="false"
- source="1.3">
- <src>
- <pathelement location="${maven.build.testDir.0}"/>
- </src>
- <classpath>
- <path refid="build.test.classpath"/>
- <pathelement location="${maven.build.outputDir}"/>
- </classpath>
- </javac>
- </target>
-
- <!-- ====================================================================== -->
- <!-- Run all tests -->
- <!-- ====================================================================== -->
-
- <target name="test"
- depends="compile-tests, junit-missing"
- unless="junit.skipped"
- description="Run the test cases">
- <mkdir dir="${maven.test.reports}"/>
- <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
- <sysproperty key="basedir" value="."/>
- <formatter type="xml"/>
- <formatter type="plain" usefile="false"/>
- <classpath>
- <path refid="build.test.classpath"/>
- <pathelement location="${maven.build.outputDir}"/>
- <pathelement location="${maven.build.testOutputDir}"/>
- </classpath>
- <batchtest todir="${maven.test.reports}" unless="test">
- <fileset dir="${maven.build.testDir.0}">
- <include name="**/Test*.java"/>
- <include name="**/*Test.java"/>
- <include name="**/*TestCase.java"/>
- <exclude name="**/*Abstract*Test.java"/>
- </fileset>
- </batchtest>
- <batchtest todir="${maven.test.reports}" if="test">
- <fileset dir="${maven.build.testDir.0}">
- <include name="**/${test}.java"/>
- <exclude name="**/*Abstract*Test.java"/>
- </fileset>
- </batchtest>
- </junit>
- </target>
-
- <target name="test-junit-present">
- <available classname="junit.framework.Test" property="junit.present"/>
- </target>
-
- <target name="test-junit-status"
- depends="test-junit-present">
- <condition property="junit.missing">
- <and>
- <isfalse value="${junit.present}"/>
- <isfalse value="${maven.test.skip}"/>
- </and>
- </condition>
- <condition property="junit.skipped">
- <or>
- <isfalse value="${junit.present}"/>
- <istrue value="${maven.test.skip}"/>
- </or>
- </condition>
- </target>
-
- <target name="junit-missing"
- depends="test-junit-status"
- if="junit.missing">
- <echo>=================================== WARNING ===================================</echo>
- <echo> JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.</echo>
- <echo>===============================================================================</echo>
- </target>
-
- <!-- ====================================================================== -->
- <!-- Javadoc target -->
- <!-- ====================================================================== -->
-
- <target name="javadoc" description="Generates the Javadoc of the application">
- <javadoc sourcepath="${maven.build.srcDir.0}"
- packagenames="*"
- destdir="${maven.reporting.outputDirectory}/apidocs"
- access="protected"
- old="false"
- verbose="false"
- version="true"
- use="true"
- author="true"
- splitindex="false"
- nodeprecated="false"
- nodeprecatedlist="false"
- notree="false"
- noindex="false"
- nohelp="false"
- nonavbar="false"
- serialwarn="false"
- charset="ISO-8859-1"
- linksource="false"
- breakiterator="false"/>
- </target>
-
- <!-- ====================================================================== -->
- <!-- Package target -->
- <!-- ====================================================================== -->
-
- <target name="package" depends="compile,test" description="Package the application">
- <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar"
- compress="true"
- index="false"
- manifest="MANIFEST.MF"
- basedir="${maven.build.outputDir}"
- excludes="**/package.html"/>
- </target>
-
- <!-- ====================================================================== -->
- <!-- A dummy target for the package named after the type it creates -->
- <!-- ====================================================================== -->
-
- <target name="jar" depends="package" description="Builds the jar for the application"/>
-
- <!-- ====================================================================== -->
- <!-- Download dependencies target -->
- <!-- ====================================================================== -->
-
- <target name="test-offline">
- <condition property="maven.mode.offline">
- <equals arg1="${maven.settings.offline}" arg2="true"/>
- </condition>
- </target>
-
- <target name="get-deps"
- depends="test-offline"
- description="Download all dependencies"
- unless="maven.mode.offline">
- <!-- removed -->
- </target>
-
-</project>
diff --git a/dev-java/jnr-posix/jnr-posix-3.0.10-r1.ebuild b/dev-java/jnr-posix/jnr-posix-3.0.10-r1.ebuild
deleted file mode 100644
index 8e1f57eabfc9..000000000000
--- a/dev-java/jnr-posix/jnr-posix-3.0.10-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} javadoc"
-JAVA_ANT_ENCODING="UTF-8"
-
-EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}"
-EANT_GENTOO_CLASSPATH="jnr-constants,jnr-ffi-2"
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Lightweight cross-platform POSIX emulation layer for Java"
-HOMEPAGE="https://github.com/jnr/jnr-posix"
-SRC_URI="https://github.com/jnr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( CPL-1.0 GPL-2 LGPL-2.1 )"
-SLOT="3.0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
-
-CDEPEND="dev-java/jnr-constants:0
- dev-java/jnr-ffi:2"
-
-RDEPEND="${CDEPEND}
- >=virtual/jre-1.8:*"
-
-DEPEND="${CDEPEND}
- >=virtual/jdk-1.8:*
- test? (
- dev-java/ant-junit4:0
- dev-java/junit:4
- )"
-
-src_prepare() {
- default
-
- cp "${FILESDIR}"/${PN}_maven-build.xml build.xml || die
-}
-
-src_test() {
- ANT_TASKS="ant-junit4" eant test -DJunit.present=true
-}
-
-src_install() {
- java-pkg_dojar target/${PN}.jar
- dodoc README.txt
-
- use doc && java-pkg_dojavadoc target/site/apidocs
- use source && java-pkg_dosrc src/main/java/*
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/jnr-posix/, dev-java/jnr-posix/files/
@ 2023-04-10 6:53 Miroslav Šulc
0 siblings, 0 replies; 3+ messages in thread
From: Miroslav Šulc @ 2023-04-10 6:53 UTC (permalink / raw
To: gentoo-commits
commit: 2cda747c4803bb70de88983ea181a54bbc178a1e
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Sun Apr 9 19:37:27 2023 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Apr 10 06:53:05 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2cda747c
dev-java/jnr-posix: drop 3.1.15
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
dev-java/jnr-posix/Manifest | 1 -
.../files/jnr-posix-3.1.15-FileTest.patch | 38 --------
dev-java/jnr-posix/jnr-posix-3.1.15.ebuild | 102 ---------------------
3 files changed, 141 deletions(-)
diff --git a/dev-java/jnr-posix/Manifest b/dev-java/jnr-posix/Manifest
index 144578a163ba..b71b1747be9a 100644
--- a/dev-java/jnr-posix/Manifest
+++ b/dev-java/jnr-posix/Manifest
@@ -1,2 +1 @@
-DIST jnr-posix-3.1.15.tar.gz 120573 BLAKE2B 8035308440e444876d8d955ec3dd0b9d41f770436b53f964795a183ed7bd676dda8787c37425c488af2aa0accc948b86d1773e7e97ee5bcdaf209383dfda24a6 SHA512 6c8cd6d43c509ef7c16901d02983b823464b3437019233021398b2a9dfc85923db87c585e2f8248f080447a990e308feff25bbbf2a7261019dcae66c22e14a91
DIST jnr-posix-3.1.16.tar.gz 120553 BLAKE2B b430d4699b84e9c4139291c34c328ade600adade68081167d3b47ce52caa6f96a818702dcb26652d186d7de825b32b00f2f1329b79f9c459cbbb6f6a4260d9f3 SHA512 988221a9a499db64c2bc3fe4e798fb77ce1bce44a31b51ace4f1e52b9a76a3af9a1521477a64413b44f36da9ab5446feb1b2ffd4e7dc50be055f6092d9e1f977
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
deleted file mode 100644
index a186087c626d..000000000000
--- a/dev-java/jnr-posix/files/jnr-posix-3.1.15-FileTest.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- a/src/test/java/jnr/posix/FileTest.java
-+++ b/src/test/java/jnr/posix/FileTest.java
-@@ -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
deleted file mode 100644
index 0fd709bffe6a..000000000000
--- a/dev-java/jnr-posix/jnr-posix-3.1.15.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# 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 ~arm 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() {
- 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
-
- if use arm; then
- # https://bugs.gentoo.org/866692
- sed \
- -e '/utimensatRelativePath()/i @Ignore' \
- -e '/utimesDefaultValuesTest()/i @Ignore' \
- -e '/futimeTest()/i @Ignore' \
- -e '/utimesTest()/i @Ignore' \
- -e '/utimesPointerTest()/i @Ignore' \
- -e '/utimensatAbsolutePath()/i @Ignore' \
- -e '/futimens()/i @Ignore' \
- -i src/test/java/jnr/posix/FileTest.java || die
- sed \
- -e '/import org.junit.Test/a import org.junit.Ignore;' \
- -e '/ioprioThreadedTest()/i @Ignore' \
- -e '/testPosixFadvise()/i @Ignore' \
- -i src/test/java/jnr/posix/LinuxPOSIXTest.java || die
- sed \
- -e '/import org.junit.Test/a import org.junit.Ignore;' \
- -e '/testSetRlimitPointerLinux()/i @Ignore' \
- -e '/testGetRLimitPointer()/i @Ignore' \
- -i src/test/java/jnr/posix/ProcessTest.java || die
- fi
-
- 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
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-04-10 6:53 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-09-02 17:57 [gentoo-commits] repo/gentoo:master commit in: dev-java/jnr-posix/, dev-java/jnr-posix/files/ Arthur Zamarin
-- strict thread matches above, loose matches on Subject: below --
2023-04-10 6:53 Miroslav Šulc
2022-06-08 8:12 Florian Schmaus
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox