1 |
commit: 1dadcd01829b64f07b6edbb4a1c38cba700f482f |
2 |
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> |
3 |
AuthorDate: Mon Sep 5 04:59:56 2022 +0000 |
4 |
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Sep 5 08:00:30 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1dadcd01 |
7 |
|
8 |
dev-java/jffi: drop 1.2.9-r1, 1.3.6 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/736838 |
11 |
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> |
12 |
Closes: https://github.com/gentoo/gentoo/pull/27148 |
13 |
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org> |
14 |
|
15 |
dev-java/jffi/Manifest | 2 - |
16 |
dev-java/jffi/files/jffi-1.2.8-junit-4.11.patch | 14 --- |
17 |
dev-java/jffi/files/jffi-1.2.8-makefile.patch | 52 --------- |
18 |
dev-java/jffi/files/jffi-1.3.6-GNUmakefile.patch | 26 ----- |
19 |
dev-java/jffi/jffi-1.2.9-r1.ebuild | 131 ----------------------- |
20 |
dev-java/jffi/jffi-1.3.6.ebuild | 98 ----------------- |
21 |
6 files changed, 323 deletions(-) |
22 |
|
23 |
diff --git a/dev-java/jffi/Manifest b/dev-java/jffi/Manifest |
24 |
index 46f96ebc4d8b..1417241bf1c7 100644 |
25 |
--- a/dev-java/jffi/Manifest |
26 |
+++ b/dev-java/jffi/Manifest |
27 |
@@ -1,3 +1 @@ |
28 |
-DIST jffi-1.2.9.tar.gz 1952668 BLAKE2B 320329b02ee9e93153fc334b73a6216da74ac2d924a64c8a1569f1f1507e1196d0b922f7d158ea91f6bc7164979b2ac12de239adbe98664a3708dd29c8d40f96 SHA512 2fd9a95cce9a3406a09856761d1318d4c6b976b1f9b66c7c5b0b5e95d44b19ba654ab8288f396782c7bb53e6d9949e7cfa9c46763f2a0761c6e86f102cd202e4 |
29 |
-DIST jffi-1.3.6.tar.gz 3187269 BLAKE2B 87a98c752440e336948923e73e2756cb0f88cbb111775f7fcc176152c60a050dad2b8d312bf0e6cda9e499b06fa64f6eda0659a6635010cb2da6ade4471225b9 SHA512 0259e59daa438572e94737efc126ab631be5f92e9ac2bf2bfdcdf92bcf9709ef930d68250b7fcaee3126a97c705c112d02bdfb0a800e8eb3b3f2fde6381f7a9f |
30 |
DIST jffi-1.3.9.tar.gz 3193992 BLAKE2B bcd2dba3f9528c293aebb13a8fbd0b2fd7afcbae0cc5fa231f7e8ab190b834adc9e3f40bfc1211d0019a34a9edbaf8810f44b88f3c44b1e3b8065b2b80ccc6dc SHA512 21bf6997c64c0764c1fe86c9ab9b854037241489789f443a3337253ecc95100c94723a57165c85eed7a6c3837b8c04751af4a1fb5873a9c9fcd9a4535b68fc10 |
31 |
|
32 |
diff --git a/dev-java/jffi/files/jffi-1.2.8-junit-4.11.patch b/dev-java/jffi/files/jffi-1.2.8-junit-4.11.patch |
33 |
deleted file mode 100644 |
34 |
index ac3843a0053a..000000000000 |
35 |
--- a/dev-java/jffi/files/jffi-1.2.8-junit-4.11.patch |
36 |
+++ /dev/null |
37 |
@@ -1,14 +0,0 @@ |
38 |
---- a/src/test/java/com/kenai/jffi/NumberTest.java |
39 |
-+++ b/src/test/java/com/kenai/jffi/NumberTest.java |
40 |
-@@ -234,9 +234,8 @@ |
41 |
- private void returnF32(InvokerType type) { |
42 |
- LibNumberTest lib = UnitHelper.loadTestLibrary(LibNumberTest.class, type); |
43 |
- float[] values = { 0f, 1.0f, -2.0f }; |
44 |
-- for (int i = 0; i < values.length; ++i) { |
45 |
-- assertEquals("Value not returned correctly", values[i], lib.ret_float(values[i]), 0.1f); |
46 |
-- } |
47 |
-+ float[] lib_values = { lib.ret_float(0f), lib.ret_float(1.0f), lib.ret_float(-2.0f) }; |
48 |
-+ assertArrayEquals("Value not returned correctly", values, lib_values, 0.1f); |
49 |
- } |
50 |
- |
51 |
- @Test public void returnDefaultF64() { |
52 |
|
53 |
diff --git a/dev-java/jffi/files/jffi-1.2.8-makefile.patch b/dev-java/jffi/files/jffi-1.2.8-makefile.patch |
54 |
deleted file mode 100644 |
55 |
index cdc28a662b51..000000000000 |
56 |
--- a/dev-java/jffi/files/jffi-1.2.8-makefile.patch |
57 |
+++ /dev/null |
58 |
@@ -1,52 +0,0 @@ |
59 |
---- a/jni/GNUmakefile |
60 |
-+++ b/jni/GNUmakefile |
61 |
-@@ -41,6 +41,7 @@ |
62 |
- JFFI_BUILD_DIR = $(BUILD_DIR)/jffi |
63 |
- |
64 |
- ifeq ($(USE_SYSTEM_LIBFFI),1) |
65 |
-+ LIBFFI = |
66 |
- LIBFFI_LIBS ?= $(shell pkg-config --libs libffi) |
67 |
- LIBFFI_CFLAGS ?= $(shell pkg-config --cflags libffi) |
68 |
- else |
69 |
-@@ -64,9 +65,8 @@ |
70 |
- OFLAGS = -O2 $(JFLAGS) |
71 |
- |
72 |
- # MacOS headers aren't completely warning free, so turn them off |
73 |
--WERROR = -Werror |
74 |
- ifneq ($(OS),darwin) |
75 |
-- WFLAGS += -Wundef $(WERROR) |
76 |
-+ WFLAGS += -Wundef |
77 |
- endif |
78 |
- WFLAGS += -W -Wall -Wno-unused -Wno-parentheses -Wno-unused-parameter |
79 |
- PICFLAGS = -fPIC |
80 |
-@@ -279,7 +279,7 @@ |
81 |
- @echo "JFFI_BUILD_DIR=$(JFFI_BUILD_DIR)" |
82 |
- @echo "OBJS=$(OBJS)" |
83 |
- |
84 |
--$(LIBJFFI): $(OBJS) $(LIBFFI_LIBS) |
85 |
-+$(LIBJFFI): $(OBJS) $(LIBFFI) |
86 |
- $(CC) -o $@ $(LDFLAGS) $(SOFLAGS) $(OBJS) $(LIBFFI_LIBS) $(LIBS) |
87 |
- $(STRIP) $@ |
88 |
- |
89 |
-@@ -291,7 +291,7 @@ |
90 |
- @mkdir -p $(@D) |
91 |
- @$(CC) $(CFLAGS) -o $@ -c $< |
92 |
- |
93 |
--$(OBJS) : $(LIBFFI_LIBS) |
94 |
-+$(OBJS) : $(LIBFFI) |
95 |
- |
96 |
- ifeq ($(OS), darwin) |
97 |
- build_ffi = \ |
98 |
---- a/libtest/GNUmakefile |
99 |
-+++ b/libtest/GNUmakefile |
100 |
-@@ -44,8 +44,8 @@ |
101 |
- # Compiler/linker flags from: |
102 |
- # http://weblogs.java.net/blog/kellyohair/archive/2006/01/compilation_of_1.html |
103 |
- JFLAGS = -fno-omit-frame-pointer -fno-strict-aliasing |
104 |
--OFLAGS = -O2 $(JFLAGS) |
105 |
--WFLAGS = -W -Werror -Wall -Wno-unused -Wno-unused-parameter -Wno-parentheses |
106 |
-+OFLAGS = $(JFLAGS) |
107 |
-+WFLAGS = -W -Wall -Wno-unused -Wno-unused-parameter -Wno-parentheses |
108 |
- PICFLAGS = -fPIC |
109 |
- SOFLAGS = -shared -Wl,-O1 |
110 |
- LDFLAGS += $(SOFLAGS) |
111 |
|
112 |
diff --git a/dev-java/jffi/files/jffi-1.3.6-GNUmakefile.patch b/dev-java/jffi/files/jffi-1.3.6-GNUmakefile.patch |
113 |
deleted file mode 100644 |
114 |
index 2dd5e9d8791a..000000000000 |
115 |
--- a/dev-java/jffi/files/jffi-1.3.6-GNUmakefile.patch |
116 |
+++ /dev/null |
117 |
@@ -1,26 +0,0 @@ |
118 |
-diff --git a/jni/GNUmakefile b/jni/GNUmakefile |
119 |
-index c0f298c..457626f 100755 |
120 |
---- a/jni/GNUmakefile |
121 |
-+++ b/jni/GNUmakefile |
122 |
-@@ -278,16 +278,16 @@ debug: |
123 |
- @echo "OBJS=$(OBJS)" |
124 |
- |
125 |
- $(LIBJFFI): $(OBJS) $(LIBFFI_LIBS) |
126 |
-- $(CC) -o $@ $(LDFLAGS) $(SOFLAGS) $(OBJS) $(LIBFFI) $(LIBS) |
127 |
-+ $(CC) -o $@ $(LDFLAGS) $(SOFLAGS) $(OBJS) $(LIBFFI) $(LIBS) $(LIBFFI_LIBS) |
128 |
- $(STRIP) $@ |
129 |
- |
130 |
- $(BUILD_DIR)/%.o : $(SRC_DIR)/%.c $(wildcard $(JFFI_SRC_DIR)/*.h) |
131 |
-- @mkdir -p $(@D) |
132 |
-- @$(CCACHE) $(CC) $(CFLAGS) -c $< -o $@ |
133 |
-+ mkdir -p $(@D) |
134 |
-+ $(CCACHE) $(CC) $(CFLAGS) -c $< -o $@ |
135 |
- |
136 |
- $(BUILD_DIR)/%.o : $(SRC_DIR)/%.S $(wildcard $(JFFI_SRC_DIR)/*.h) |
137 |
-- @mkdir -p $(@D) |
138 |
-- @$(CC) $(CFLAGS) -o $@ -c $< |
139 |
-+ mkdir -p $(@D) |
140 |
-+ $(CC) $(CFLAGS) -o $@ -c $< |
141 |
- |
142 |
- $(OBJS) : $(LIBFFI) |
143 |
- |
144 |
|
145 |
diff --git a/dev-java/jffi/jffi-1.2.9-r1.ebuild b/dev-java/jffi/jffi-1.2.9-r1.ebuild |
146 |
deleted file mode 100644 |
147 |
index ef103551c7d9..000000000000 |
148 |
--- a/dev-java/jffi/jffi-1.2.9-r1.ebuild |
149 |
+++ /dev/null |
150 |
@@ -1,131 +0,0 @@ |
151 |
-# Copyright 1999-2021 Gentoo Authors |
152 |
-# Distributed under the terms of the GNU General Public License v2 |
153 |
- |
154 |
-EAPI=7 |
155 |
- |
156 |
-JAVA_PKG_IUSE="doc source test" |
157 |
- |
158 |
-inherit java-pkg-2 java-ant-2 |
159 |
- |
160 |
-DESCRIPTION="An optimized Java interface to libffi" |
161 |
-HOMEPAGE="https://github.com/jnr/jffi" |
162 |
-SRC_URI="https://github.com/jnr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" |
163 |
- |
164 |
-LICENSE="|| ( Apache-2.0 LGPL-3 )" |
165 |
-SLOT="1.2" |
166 |
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~ppc-macos ~x64-macos" |
167 |
- |
168 |
-CDEPEND="dev-libs/libffi:0=" |
169 |
- |
170 |
-RDEPEND="${CDEPEND} |
171 |
- >=virtual/jre-1.8:*" |
172 |
- |
173 |
-# java 1.8 is needed because javah is called which is not in newer jdks |
174 |
-DEPEND="${CDEPEND} |
175 |
- virtual/jdk:1.8 |
176 |
- test? ( |
177 |
- dev-java/ant-junit4:0 |
178 |
- dev-java/junit:4 |
179 |
- )" |
180 |
- |
181 |
-BDEPEND="virtual/pkgconfig" |
182 |
- |
183 |
-PATCHES=( |
184 |
- "${FILESDIR}"/${PN}-1.2.8-makefile.patch |
185 |
- "${FILESDIR}"/${PN}-1.2.8-junit-4.11.patch |
186 |
-) |
187 |
- |
188 |
-RESTRICT="test" |
189 |
- |
190 |
-src_prepare() { |
191 |
- default |
192 |
- |
193 |
- cp "${FILESDIR}"/${PN}_maven-build.xml build.xml || die |
194 |
- |
195 |
- # misc fixes for Darwin |
196 |
- if [[ ${CHOST} == *-darwin* ]] ; then |
197 |
- local uarch |
198 |
- # don't do multiarch |
199 |
- # avoid using Xcode stuff |
200 |
- # use Prefix' headers |
201 |
- # don't mess with deployment target |
202 |
- # set install_name |
203 |
- use x64-macos && uarch=x86_64 |
204 |
- use ppc-macos && uarch=ppc |
205 |
- sed -i \ |
206 |
- -e "/ARCHES +=/s/=.*$/= ${uarch}/" \ |
207 |
- -e "/XCODE=/s:=.*$:=${EPREFIX}:" \ |
208 |
- -e "/MACSDK/s/^/#/" \ |
209 |
- -e "/MACOSX_DEPLOYMENT_TARGET=/s/MAC/NOMAC/" \ |
210 |
- -e "/SOFLAGS =/s:=.*:= -install_name ${EPREFIX}/usr/lib/jffi-${SLOT}/libjffi-${SLOT}.jnilib:" \ |
211 |
- jni/GNUmakefile || die |
212 |
- fi |
213 |
- |
214 |
- java-pkg_clean |
215 |
-} |
216 |
- |
217 |
-JAVA_ANT_REWRITE_CLASSPATH="yes" |
218 |
-EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}" |
219 |
- |
220 |
-src_compile() { |
221 |
- # generate Version.java |
222 |
- cat > src/main/java/com/kenai/jffi/Version.java <<-EOF |
223 |
- package com.kenai.jffi; |
224 |
- public final class Version { |
225 |
- private Version() {} |
226 |
- public static final int MAJOR = $(ver_cut 1); |
227 |
- public static final int MINOR = $(ver_cut 2); |
228 |
- public static final int MICRO = $(ver_cut 3); |
229 |
- } |
230 |
- EOF |
231 |
- |
232 |
- java-pkg-2_src_compile |
233 |
- |
234 |
- # generate headers |
235 |
- mkdir -p build/jni |
236 |
- javah -d build/jni -classpath target/classes \ |
237 |
- com.kenai.jffi.Foreign \ |
238 |
- com.kenai.jffi.ObjectBuffer \ |
239 |
- com.kenai.jffi.Version \ |
240 |
- || die |
241 |
- |
242 |
- #build native library. |
243 |
- local args=( |
244 |
- SRC_DIR=jni |
245 |
- JNI_DIR=jni |
246 |
- BUILD_DIR=build/jni |
247 |
- VERSION=$(ver_cut 1-2) |
248 |
- USE_SYSTEM_LIBFFI=1 |
249 |
- CCACHE= |
250 |
- -f jni/GNUmakefile |
251 |
- ) |
252 |
- emake "${args[@]}" |
253 |
-} |
254 |
- |
255 |
-EANT_TEST_GENTOO_CLASSPATH="ant-junit4,junit-4" |
256 |
- |
257 |
-src_test() { |
258 |
- # build native test library |
259 |
- emake BUILD_DIR=build -f libtest/GNUmakefile |
260 |
- |
261 |
- _JAVA_OPTIONS="-Djffi.boot.library.path=${S}/build/jni" \ |
262 |
- java-pkg-2_src_test |
263 |
-} |
264 |
- |
265 |
-src_install() { |
266 |
- local libname=".so" |
267 |
- |
268 |
- [[ ${CHOST} == *-darwin* ]] && libname=.jnilib |
269 |
- java-pkg_doso build/jni/lib${PN}-$(ver_cut 1-2)${libname} |
270 |
- |
271 |
- # must by after _doso to have JAVA_PKG_LIBDEST set |
272 |
- cat > boot.properties <<-EOF |
273 |
- jffi.boot.library.path = ${JAVA_PKG_LIBDEST} |
274 |
- EOF |
275 |
- jar -uf target/${PN}.jar boot.properties || die |
276 |
- |
277 |
- java-pkg_dojar target/${PN}.jar |
278 |
- |
279 |
- use doc && java-pkg_dojavadoc target/site/apidocs |
280 |
- use source && java-pkg_dosrc src/main/java/* |
281 |
-} |
282 |
|
283 |
diff --git a/dev-java/jffi/jffi-1.3.6.ebuild b/dev-java/jffi/jffi-1.3.6.ebuild |
284 |
deleted file mode 100644 |
285 |
index f34b51d92cc2..000000000000 |
286 |
--- a/dev-java/jffi/jffi-1.3.6.ebuild |
287 |
+++ /dev/null |
288 |
@@ -1,98 +0,0 @@ |
289 |
-# Copyright 1999-2021 Gentoo Authors |
290 |
-# Distributed under the terms of the GNU General Public License v2 |
291 |
- |
292 |
-# Skeleton command: |
293 |
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/jnr/jffi/archive/refs/tags/jffi-1.3.6.tar.gz --slot 1.3 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild jffi-1.3.6.ebuild |
294 |
- |
295 |
-EAPI=7 |
296 |
- |
297 |
-JAVA_PKG_IUSE="doc source test" |
298 |
-MAVEN_ID="com.github.jnr:jffi:1.3.6" |
299 |
-JAVA_TESTING_FRAMEWORKS="junit-4" |
300 |
- |
301 |
-inherit java-pkg-2 java-pkg-simple |
302 |
- |
303 |
-DESCRIPTION="Java Foreign Function Interface" |
304 |
-HOMEPAGE="https://github.com/jnr/jffi" |
305 |
-SRC_URI="https://github.com/jnr/${PN}/archive/refs/tags/${P}.tar.gz" |
306 |
- |
307 |
-LICENSE="Apache-2.0" |
308 |
-SLOT="1.2" |
309 |
-KEYWORDS="amd64 arm64 ~ppc64 x86" |
310 |
- |
311 |
-DEPEND=">=virtual/jdk-1.8:*" |
312 |
-RDEPEND=">=virtual/jre-1.8:*" |
313 |
- |
314 |
-PATCHES=( "${FILESDIR}"/jffi-1.3.6-GNUmakefile.patch ) |
315 |
-DOCS=( LICENSE README.md ) |
316 |
- |
317 |
-S="${WORKDIR}/${PN}-${P}" |
318 |
- |
319 |
-JAVA_SRC_DIR="src/main/java" |
320 |
- |
321 |
-# https://github.com/jnr/jffi/blob/eabdf09c3ec4fc8a54b684ff326e36b36b74e0da/build.xml#L26 |
322 |
-JAVA_TEST_EXTRA_ARGS="-Djffi.library.path=${S}/build/jni -Djffi.boot.library.path=${S}/build/jni" |
323 |
-JAVA_TEST_GENTOO_CLASSPATH="junit-4" |
324 |
-JAVA_TEST_SRC_DIR="src/test/java" |
325 |
- |
326 |
-src_prepare() { |
327 |
- default |
328 |
- cat > src/main/java/com/kenai/jffi/Version.java <<-EOF |
329 |
- package com.kenai.jffi; |
330 |
- import java.lang.annotation.Native; |
331 |
- public final class Version { |
332 |
- private Version() {} |
333 |
- @Native |
334 |
- public static final int MAJOR = $(ver_cut 1); |
335 |
- @Native |
336 |
- public static final int MINOR = $(ver_cut 2); |
337 |
- @Native |
338 |
- public static final int MICRO = $(ver_cut 3); |
339 |
- } |
340 |
- EOF |
341 |
-} |
342 |
- |
343 |
-src_compile() { |
344 |
- java-pkg-simple_src_compile |
345 |
- |
346 |
- # generate headers |
347 |
- mkdir -p build/jni |
348 |
- javac -h build/jni -classpath target/classes \ |
349 |
- ${JAVA_SRC_DIR}/com/kenai/jffi/{Foreign,ObjectBuffer,Version}.java \ |
350 |
- || die |
351 |
- |
352 |
- #build native library. |
353 |
- local args=( |
354 |
- SRC_DIR=jni |
355 |
- JNI_DIR=jni |
356 |
- BUILD_DIR=build/jni |
357 |
- VERSION=$(ver_cut 1-2) |
358 |
- USE_SYSTEM_LIBFFI=1 |
359 |
- CCACHE= |
360 |
- -f jni/GNUmakefile |
361 |
- ) |
362 |
- emake "${args[@]}" |
363 |
-} |
364 |
- |
365 |
-src_test() { |
366 |
- # build native test library |
367 |
- emake BUILD_DIR=build -f libtest/GNUmakefile |
368 |
- |
369 |
- # https://github.com/jnr/jffi/issues/60 |
370 |
- LC_ALL=C java-pkg-simple_src_test |
371 |
-} |
372 |
- |
373 |
-src_install() { |
374 |
- default |
375 |
- |
376 |
- local libname=".so" |
377 |
- java-pkg_doso build/jni/lib${PN}-$(ver_cut 1-2)${libname} |
378 |
- |
379 |
- # must be after _doso to have JAVA_PKG_LIBDEST set |
380 |
- cat > boot.properties <<-EOF |
381 |
- jffi.boot.library.path = ${JAVA_PKG_LIBDEST} |
382 |
- EOF |
383 |
- jar -uf ${PN}.jar boot.properties || die |
384 |
- |
385 |
- java-pkg-simple_src_install |
386 |
-} |