Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Arthur Zamarin <arthurzam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/jnr-ffi/files/, dev-java/jnr-ffi/
Date: Fri, 02 Sep 2022 17:58:03
Message-Id: 1662141443.23395279aeae6a9d207580347637914653bec69f.arthurzam@gentoo
1 commit: 23395279aeae6a9d207580347637914653bec69f
2 Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
3 AuthorDate: Fri Sep 2 17:43:52 2022 +0000
4 Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
5 CommitDate: Fri Sep 2 17:57:23 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23395279
7
8 dev-java/jnr-ffi: drop 2.0.2-r1
9
10 Closes: https://bugs.gentoo.org/736830
11 Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
12 Closes: https://github.com/gentoo/gentoo/pull/27115
13 Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
14
15 dev-java/jnr-ffi/Manifest | 1 -
16 dev-java/jnr-ffi/files/jnr-ffi-2.0.2-junit48.patch | 11 -
17 dev-java/jnr-ffi/files/jnr-ffi_maven-build.xml | 250 ---------------------
18 dev-java/jnr-ffi/jnr-ffi-2.0.2-r1.ebuild | 64 ------
19 4 files changed, 326 deletions(-)
20
21 diff --git a/dev-java/jnr-ffi/Manifest b/dev-java/jnr-ffi/Manifest
22 index ea0315a2f0c8..cfbd2c1ca16d 100644
23 --- a/dev-java/jnr-ffi/Manifest
24 +++ b/dev-java/jnr-ffi/Manifest
25 @@ -1,2 +1 @@
26 -DIST jnr-ffi-2.0.2.tar.gz 170707 BLAKE2B fc4f1dcea51939b6098b980b4962380e58ba590ea9d4cdba7823c1372bd645d985ae25d8ebf1f0b575a0e4b5c192e5595094076d3cd44e4bb3c077dd838c170f SHA512 80a932408f5ceaf19fd7a399b786aa0d7b9251ea144bc2755bcf3cdc3aea85615a1faa001bbcd3072bc0eead2aaa30d0bbead5f96c82c4b9e455c1ed1379b4c0
27 DIST jnr-ffi-2.2.12.tar.gz 285324 BLAKE2B 32e866654b901ded7cdc82999d79873d49bd9d3599d265e9d029e7cf8ce1895f9e830a1af75b8c149c3debc5f3d256f6241d706ecbd94277ce1fa49a2868885c SHA512 420adb647c5d0547f0b18e4f8a21096da9aaebbdf0e50761ec1fd6be64ad29649c7af4d6daf0a8c4c38e02a05e0df836de6fdb7776f10c02d8bfd447a11882b3
28
29 diff --git a/dev-java/jnr-ffi/files/jnr-ffi-2.0.2-junit48.patch b/dev-java/jnr-ffi/files/jnr-ffi-2.0.2-junit48.patch
30 deleted file mode 100644
31 index 92b4cb2bcfc3..000000000000
32 --- a/dev-java/jnr-ffi/files/jnr-ffi-2.0.2-junit48.patch
33 +++ /dev/null
34 @@ -1,11 +0,0 @@
35 ---- a/src/test/java/jnr/ffi/ObjectReferenceManagerTest.java
36 -+++ b/src/test/java/jnr/ffi/ObjectReferenceManagerTest.java
37 -@@ -35,7 +35,7 @@
38 - Pointer ptr = referenceManager.add(bar);
39 - Pointer ptr2 = referenceManager.add(bar2);
40 - assertNotSame(ptr, ptr2);
41 -- assertNotEquals(ptr, ptr2);
42 -+ assertTrue(!ptr.equals(ptr2));
43 - assertSame(bar, referenceManager.get(ptr));
44 - assertSame(bar2, referenceManager.get(ptr2));
45 - }
46
47 diff --git a/dev-java/jnr-ffi/files/jnr-ffi_maven-build.xml b/dev-java/jnr-ffi/files/jnr-ffi_maven-build.xml
48 deleted file mode 100644
49 index 0337f347bec0..000000000000
50 --- a/dev-java/jnr-ffi/files/jnr-ffi_maven-build.xml
51 +++ /dev/null
52 @@ -1,250 +0,0 @@
53 -<?xml version="1.0" encoding="UTF-8"?>
54 -
55 -<!-- ====================================================================== -->
56 -<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above. -->
57 -<!-- ====================================================================== -->
58 -
59 -<!-- ====================================================================== -->
60 -<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
61 -<!-- ====================================================================== -->
62 -<!-- -->
63 -<!-- Any modifications will be overwritten. -->
64 -<!-- -->
65 -<!-- Generated by Maven Ant Plugin on 1/9/12 11:18 AM -->
66 -<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/ -->
67 -<!-- -->
68 -<!-- ====================================================================== -->
69 -
70 -<project name="jnr-ffi-from-maven" default="package" basedir=".">
71 -
72 - <!-- ====================================================================== -->
73 - <!-- Build environment properties -->
74 - <!-- ====================================================================== -->
75 -
76 - <property file="${user.home}/.m2/maven.properties"/>
77 - <property file="maven-build.properties"/>
78 -
79 - <property name="maven.build.finalName" value="jnr-ffi-0.6.0"/>
80 - <property name="maven.build.dir" value="target"/>
81 - <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
82 - <property name="maven.build.srcDir.0" value="src/main/java"/>
83 - <property name="maven.build.resourceDir.0" value="src/main/resources"/>
84 - <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
85 - <property name="maven.build.testDir.0" value="src/test/java"/>
86 - <property name="maven.build.testResourceDir.0" value="src/test/resources"/>
87 - <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
88 - <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
89 -
90 - <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
91 - <property name="maven.settings.offline" value="false"/>
92 - <property name="maven.settings.interactiveMode" value="true"/>
93 -
94 - <!-- ====================================================================== -->
95 - <!-- Defining classpaths -->
96 - <!-- ====================================================================== -->
97 -
98 - <path id="build.classpath">
99 - <pathelement location="${maven.repo.local}/com/github/jnr/jffi/1.0.11/jffi-1.0.11.jar"/>
100 - <pathelement location="${maven.repo.local}/asm/asm/3.2/asm-3.2.jar"/>
101 - <pathelement location="${maven.repo.local}/asm/asm-commons/3.2/asm-commons-3.2.jar"/>
102 - <pathelement location="${maven.repo.local}/asm/asm-analysis/3.2/asm-analysis-3.2.jar"/>
103 - <pathelement location="${maven.repo.local}/asm/asm-tree/3.2/asm-tree-3.2.jar"/>
104 - <pathelement location="${maven.repo.local}/asm/asm-util/3.2/asm-util-3.2.jar"/>
105 - <pathelement location="${maven.repo.local}/com/github/jnr/jnr-x86asm/1.0.1/jnr-x86asm-1.0.1.jar"/>
106 - </path>
107 - <path id="build.test.classpath">
108 - <pathelement location="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.jar"/>
109 - <pathelement location="${maven.repo.local}/com/github/jnr/jffi/1.0.11/jffi-1.0.11.jar"/>
110 - <pathelement location="${maven.repo.local}/com/github/jnr/jffi/1.0.11/jffi-1.0.11-native.jar"/>
111 - <pathelement location="${maven.repo.local}/asm/asm/3.2/asm-3.2.jar"/>
112 - <pathelement location="${maven.repo.local}/asm/asm-commons/3.2/asm-commons-3.2.jar"/>
113 - <pathelement location="${maven.repo.local}/asm/asm-analysis/3.2/asm-analysis-3.2.jar"/>
114 - <pathelement location="${maven.repo.local}/asm/asm-tree/3.2/asm-tree-3.2.jar"/>
115 - <pathelement location="${maven.repo.local}/asm/asm-util/3.2/asm-util-3.2.jar"/>
116 - <pathelement location="${maven.repo.local}/com/github/jnr/jnr-x86asm/1.0.1/jnr-x86asm-1.0.1.jar"/>
117 - </path>
118 -
119 - <!-- ====================================================================== -->
120 - <!-- Cleaning up target -->
121 - <!-- ====================================================================== -->
122 -
123 - <target name="clean" description="Clean the output directory">
124 - <delete dir="${maven.build.dir}"/>
125 - </target>
126 -
127 - <!-- ====================================================================== -->
128 - <!-- Compilation target -->
129 - <!-- ====================================================================== -->
130 -
131 - <target name="compile" depends="get-deps" description="Compile the code">
132 - <mkdir dir="${maven.build.outputDir}"/>
133 - <javac destdir="${maven.build.outputDir}"
134 - nowarn="false"
135 - debug="true"
136 - optimize="false"
137 - deprecation="true"
138 - target="1.1"
139 - verbose="false"
140 - fork="false"
141 - source="1.3">
142 - <src>
143 - <pathelement location="${maven.build.srcDir.0}"/>
144 - </src>
145 - <classpath refid="build.classpath"/>
146 - </javac>
147 - </target>
148 -
149 - <!-- ====================================================================== -->
150 - <!-- Test-compilation target -->
151 - <!-- ====================================================================== -->
152 -
153 - <target name="compile-tests"
154 - depends="compile"
155 - description="Compile the test code"
156 - unless="maven.test.skip">
157 - <mkdir dir="${maven.build.testOutputDir}"/>
158 - <javac destdir="${maven.build.testOutputDir}"
159 - nowarn="false"
160 - debug="true"
161 - optimize="false"
162 - deprecation="true"
163 - target="1.1"
164 - verbose="false"
165 - fork="false"
166 - source="1.3">
167 - <src>
168 - <pathelement location="${maven.build.testDir.0}"/>
169 - </src>
170 - <classpath>
171 - <path refid="build.test.classpath"/>
172 - <pathelement location="${maven.build.outputDir}"/>
173 - </classpath>
174 - </javac>
175 - </target>
176 -
177 - <!-- ====================================================================== -->
178 - <!-- Run all tests -->
179 - <!-- ====================================================================== -->
180 -
181 - <target name="test"
182 - depends="compile-tests, junit-missing"
183 - unless="junit.skipped"
184 - description="Run the test cases">
185 - <mkdir dir="${maven.test.reports}"/>
186 - <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
187 - <sysproperty key="basedir" value="."/>
188 - <formatter type="xml"/>
189 - <formatter type="plain" usefile="false"/>
190 - <classpath>
191 - <path refid="build.test.classpath"/>
192 - <pathelement location="${maven.build.outputDir}"/>
193 - <pathelement location="${maven.build.testOutputDir}"/>
194 - </classpath>
195 - <batchtest todir="${maven.test.reports}" unless="test">
196 - <fileset dir="${maven.build.testDir.0}">
197 - <include name="**/Test*.java"/>
198 - <include name="**/*Test.java"/>
199 - <include name="**/*TestCase.java"/>
200 - <exclude name="**/*Abstract*Test.java"/>
201 - </fileset>
202 - </batchtest>
203 - <batchtest todir="${maven.test.reports}" if="test">
204 - <fileset dir="${maven.build.testDir.0}">
205 - <include name="**/${test}.java"/>
206 - <exclude name="**/*Abstract*Test.java"/>
207 - </fileset>
208 - </batchtest>
209 - </junit>
210 - </target>
211 -
212 - <target name="test-junit-present">
213 - <available classname="junit.framework.Test" property="junit.present"/>
214 - </target>
215 -
216 - <target name="test-junit-status"
217 - depends="test-junit-present">
218 - <condition property="junit.missing">
219 - <and>
220 - <isfalse value="${junit.present}"/>
221 - <isfalse value="${maven.test.skip}"/>
222 - </and>
223 - </condition>
224 - <condition property="junit.skipped">
225 - <or>
226 - <isfalse value="${junit.present}"/>
227 - <istrue value="${maven.test.skip}"/>
228 - </or>
229 - </condition>
230 - </target>
231 -
232 - <target name="junit-missing"
233 - depends="test-junit-status"
234 - if="junit.missing">
235 - <echo>=================================== WARNING ===================================</echo>
236 - <echo> JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.</echo>
237 - <echo>===============================================================================</echo>
238 - </target>
239 -
240 - <!-- ====================================================================== -->
241 - <!-- Javadoc target -->
242 - <!-- ====================================================================== -->
243 -
244 - <target name="javadoc" description="Generates the Javadoc of the application">
245 - <javadoc sourcepath="${maven.build.srcDir.0}"
246 - packagenames="*"
247 - destdir="${maven.reporting.outputDirectory}/apidocs"
248 - access="protected"
249 - old="false"
250 - verbose="false"
251 - version="true"
252 - use="true"
253 - author="true"
254 - splitindex="false"
255 - nodeprecated="false"
256 - nodeprecatedlist="false"
257 - notree="false"
258 - noindex="false"
259 - nohelp="false"
260 - nonavbar="false"
261 - serialwarn="false"
262 - charset="ISO-8859-1"
263 - linksource="false"
264 - breakiterator="false"/>
265 - </target>
266 -
267 - <!-- ====================================================================== -->
268 - <!-- Package target -->
269 - <!-- ====================================================================== -->
270 -
271 - <target name="package" depends="compile,test" description="Package the application">
272 - <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar"
273 - compress="true"
274 - index="false"
275 - basedir="${maven.build.outputDir}"
276 - excludes="**/package.html"/>
277 - </target>
278 -
279 - <!-- ====================================================================== -->
280 - <!-- A dummy target for the package named after the type it creates -->
281 - <!-- ====================================================================== -->
282 -
283 - <target name="jar" depends="package" description="Builds the jar for the application"/>
284 -
285 - <!-- ====================================================================== -->
286 - <!-- Download dependencies target -->
287 - <!-- ====================================================================== -->
288 -
289 - <target name="test-offline">
290 - <condition property="maven.mode.offline">
291 - <equals arg1="${maven.settings.offline}" arg2="true"/>
292 - </condition>
293 - </target>
294 -
295 - <target name="get-deps"
296 - depends="test-offline"
297 - description="Download all dependencies"
298 - unless="maven.mode.offline">
299 - <!-- removed -->
300 - </target>
301 -
302 -</project>
303
304 diff --git a/dev-java/jnr-ffi/jnr-ffi-2.0.2-r1.ebuild b/dev-java/jnr-ffi/jnr-ffi-2.0.2-r1.ebuild
305 deleted file mode 100644
306 index 2c4a9a83197d..000000000000
307 --- a/dev-java/jnr-ffi/jnr-ffi-2.0.2-r1.ebuild
308 +++ /dev/null
309 @@ -1,64 +0,0 @@
310 -# Copyright 1999-2021 Gentoo Authors
311 -# Distributed under the terms of the GNU General Public License v2
312 -
313 -EAPI=7
314 -
315 -JAVA_PKG_IUSE="doc source test"
316 -
317 -inherit java-pkg-2 java-ant-2
318 -
319 -DESCRIPTION="An abstracted interface to invoking native functions from java"
320 -HOMEPAGE="https://github.com/jnr/jnr-ffi"
321 -SRC_URI="https://github.com/jnr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
322 -
323 -LICENSE="|| ( Apache-2.0 LGPL-3 )"
324 -SLOT="2"
325 -KEYWORDS="~arm ppc64"
326 -
327 -# Fixing https://bugs.gentoo.org/736830 would cost too much time.
328 -RESTRICT="test"
329 -
330 -COMMON_DEP="
331 - ~dev-java/jffi-1.2.9:1.2
332 - dev-java/jnr-x86asm:1.0
333 - dev-java/asm:4"
334 -
335 -RDEPEND="${COMMON_DEP}
336 - >=virtual/jre-1.8:*"
337 -
338 -DEPEND="${COMMON_DEP}
339 - >=virtual/jdk-1.8:*
340 - test? (
341 - dev-java/ant-junit:0
342 - >=dev-java/junit-4.8:4
343 - )"
344 -
345 -src_prepare() {
346 - default
347 - cp "${FILESDIR}"/${PN}_maven-build.xml build.xml || die
348 - eapply "${FILESDIR}"/${P}-junit48.patch
349 -}
350 -
351 -JAVA_ANT_REWRITE_CLASSPATH="yes"
352 -JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} javadoc"
353 -JAVA_ANT_ENCODING="UTF-8"
354 -
355 -EANT_GENTOO_CLASSPATH="asm-4,jffi-1.2,jnr-x86asm-1.0"
356 -EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}"
357 -
358 -EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
359 -
360 -src_test() {
361 - # build native test library
362 - emake BUILD_DIR=build -f libtest/GNUmakefile
363 -
364 - _JAVA_OPTIONS="-Djnr.ffi.library.path=build" \
365 - java-pkg-2_src_test
366 -}
367 -
368 -src_install() {
369 - java-pkg_dojar target/${PN}.jar
370 -
371 - use doc && java-pkg_dojavadoc target/site/apidocs
372 - use source && java-pkg_dosrc src/main/java/*
373 -}
Report Message
Find on MARC Find on Google Groups