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

Gentoo Archives: gentoo-commits

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