Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/prefix:master commit in: dev-java/jna/, dev-java/jna/files/
Date: Sat, 10 Apr 2021 07:20:21
Message-Id: 1618039091.078836bfbd49e4d4010caa913829f588624b266e.sam@gentoo
1 commit: 078836bfbd49e4d4010caa913829f588624b266e
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Sat Apr 10 07:18:11 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Sat Apr 10 07:18:11 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=078836bf
7
8 dev-java/jna: drop outdated, EAPI 2/4 package
9
10 Signed-off-by: Sam James <sam <AT> gentoo.org>
11
12 dev-java/jna/Manifest | 3 -
13 dev-java/jna/files/3.2.4-makefile-flags.patch | 68 ----------------
14 dev-java/jna/files/3.2.7-build.xml.patch | 31 --------
15 dev-java/jna/files/3.2.7-makefile-flags.patch | 60 --------------
16 dev-java/jna/files/3.4.0-build.xml.patch | 31 --------
17 dev-java/jna/files/jna-3.4.0-makefile-flags.patch | 62 ---------------
18 dev-java/jna/files/makefile-flags.patch | 21 -----
19 dev-java/jna/jna-3.0.3-r1.ebuild | 70 -----------------
20 dev-java/jna/jna-3.2.4.ebuild | 84 --------------------
21 dev-java/jna/jna-3.4.0-r1.ebuild | 96 -----------------------
22 dev-java/jna/metadata.xml | 15 ----
23 11 files changed, 541 deletions(-)
24
25 diff --git a/dev-java/jna/Manifest b/dev-java/jna/Manifest
26 deleted file mode 100644
27 index 36d4fd7512..0000000000
28 --- a/dev-java/jna/Manifest
29 +++ /dev/null
30 @@ -1,3 +0,0 @@
31 -DIST jna-3.0.3.tar.bz2 647451 BLAKE2B a72dd1ef1ae6cc3d8f6a65918266c251b208d0058b3991b0a0164adc15caee02b49b579981bed669c5749b42c45100d5149a5b0f8c49c84dba9cea6b25cfaa76 SHA512 d3ab5c36bb8b5abb39134bbba05f6ab28fa4b2a81732f28d2738148920d6878352f5afabf57931cc5342c2a131c6be138ffc3feae8c27944f7401e863115bf8a
32 -DIST jna-3.2.4.tar.bz2 191082 BLAKE2B e04d560494a3a757f50a0275cf509513c90e2abf70ebeae4cfd47ac2ee30bc1ff0a41e08f05072d65a63e7992051e4f62f0645dc201b59cdfae6accd9294cc12 SHA512 25efbe90887f8871b94c297e647822a0b12d6b97c5aede080e0cf2708a94292c8358ca796261488a452672cfb7b459cfe041321aff92606e0b52db12fd00db80
33 -DIST jna-3.4.0.tar.gz 34547165 BLAKE2B 65773069e870c33f883c4e829c92985eacaacb0505a6033f9748de3aee5fb010246c2eedf6556e7730fdba0b88eb06436add5179d453a338dcdb27380e599897 SHA512 30c4e6a3a5ac133095248d3eb7d4983a91e11a267a581268a91316927ac75c5a133a58625d321276ac0b229c42c502f85492672d99713c90de98a648bd008b35
34
35 diff --git a/dev-java/jna/files/3.2.4-makefile-flags.patch b/dev-java/jna/files/3.2.4-makefile-flags.patch
36 deleted file mode 100644
37 index 7690ebe551..0000000000
38 --- a/dev-java/jna/files/3.2.4-makefile-flags.patch
39 +++ /dev/null
40 @@ -1,68 +0,0 @@
41 ---- native/Makefile.orig 2009-12-30 20:13:34.000000000 +1300
42 -+++ native/Makefile 2009-12-30 20:21:39.000000000 +1300
43 -@@ -54,7 +54,6 @@
44 - LIBSFX=.so
45 - ARSFX=.a
46 - JNISFX=$(LIBSFX)
47 --CC=gcc
48 - LD=gcc
49 - LIBS=
50 - # Default to Sun recommendations for JNI compilation
51 -@@ -67,10 +65,10 @@
52 - COUT=-o $@
53 - CINCLUDES=$(JAVA_INCLUDES) -I"$(JAVAH)" -I$(FFI_BUILD)/include
54 - CDEFINES=-D_REENTRANT
55 --PCFLAGS=-W -Wall -Wno-unused -Wno-parentheses
56 --CFLAGS=$(PCFLAGS) $(CFLAGS_EXTRA) $(COPT) $(CDEBUG) $(CDEFINES) $(CINCLUDES) \
57 -+PCFLAGS=-Wall -Wno-unused -Wno-parentheses
58 -+CFLAGS+=$(PCFLAGS) $(CFLAGS_EXTRA) $(COPT) $(CDEBUG) $(CDEFINES) $(CINCLUDES) \
59 - -DVERSION='"$(VERSION)"' -DCHECKSUM='"$(CHECKSUM)"'
60 --LDFLAGS=-o $@ -shared
61 -+LDFLAGS+= -o $@ -shared
62 - ifeq ($(DYNAMIC_LIBFFI),true)
63 - CFLAGS += $(shell pkg-config --cflags libffi 2>/dev/null || echo)
64 - LIBS += $(shell pkg-config --libs libffi 2>/dev/null || echo -lffi)
65 -@@ -109,7 +107,7 @@
66 - ifneq ($(MINGW),)
67 - CC = $(MINGW) -m64 -mno-cygwin
68 - LD = $(CC)
69 --LDFLAGS=-o $@ -shared
70 -+LDFLAGS+= -o $@ -shared
71 - LIBS= -lmingwex -lpsapi -lkernel32 -lmsvcrt
72 - FFI_CONFIG += --host=x86_64-pc-mingw32
73 - else
74 -@@ -129,14 +127,14 @@
75 - ARCH=$(shell uname -m | sed 's/i.86/i386/g')
76 - PCFLAGS+=-fPIC
77 - CDEFINES+=-DHAVE_PROTECTION
78 --LDFLAGS+=-Wl,-soname,$@
79 -+LDFLAGS+= -Wl,-soname,$(shell basename $@)
80 - endif
81 -
82 - ifeq ($(OS),freebsd)
83 - ARCH=$(shell uname -m | sed 's/i.86/i386/g')
84 - PCFLAGS+=-fPIC
85 - CINCLUDES+=-I/usr/X11R6/include
86 --LDFLAGS=-o $@ -shared
87 -+LDFLAGS+=-o $@ -shared
88 - CDEFINES+=-DHAVE_PROTECTION -DFFI_MMAP_EXEC_WRIT
89 - endif
90 -
91 -@@ -144,7 +142,7 @@
92 - ARCH=$(shell uname -m | sed 's/i.86/i386/g')
93 - PCFLAGS+=-fPIC
94 - CINCLUDES+=-I/usr/X11R6/include
95 --LDFLAGS=-o $@ -shared
96 -+LDFLAGS+= -o $@ -shared
97 - CDEFINES+=-DHAVE_PROTECTION -DFFI_MMAP_EXEC_WRIT
98 - endif
99 -
100 -@@ -191,7 +189,7 @@
101 - endif
102 - PCFLAGS+=$(ISYSROOT) -x objective-c
103 - CDEFINES+=-DTARGET_RT_MAC_CFM=0 -DFFI_MMAP_EXEC_WRIT
104 --LDFLAGS=$(ARCHFLAGS) -dynamiclib -o $@ -framework JavaVM \
105 -+LDFLAGS+=$(ARCHFLAGS) -dynamiclib -o $@ -framework JavaVM \
106 - -compatibility_version $(shell echo ${VERSION}|sed 's/^\([0-9][0-9]*\).*/\1/g') \
107 - -current_version $(VERSION) \
108 - -mmacosx-version-min=10.3 \
109
110 diff --git a/dev-java/jna/files/3.2.7-build.xml.patch b/dev-java/jna/files/3.2.7-build.xml.patch
111 deleted file mode 100644
112 index c907b592b0..0000000000
113 --- a/dev-java/jna/files/3.2.7-build.xml.patch
114 +++ /dev/null
115 @@ -1,31 +0,0 @@
116 ---- build.xml.orig 2011-01-25 17:33:24.750473340 +0100
117 -+++ build.xml 2011-01-25 17:07:14.657410373 +0100
118 -@@ -176,7 +176,9 @@
119 - <path id="test.runpath">
120 - <pathelement path="${build}/${jar}"/>
121 - <pathelement path="${test.classes}"/>
122 -+ <!--
123 - <pathelement path="lib/clover.jar"/>
124 -+ -->
125 - <path refid="test.libs"/>
126 - </path>
127 - </target>
128 -@@ -433,13 +435,17 @@
129 - <copy todir="${build}/jws" file="${build}/${jar}"/>
130 - <copy todir="${build}/jws" file="${build}/${testjar}"/>
131 - <copy todir="${build}/jws" file="lib/junit.jar"/>
132 -+ <!--
133 - <copy todir="${build}/jws" file="lib/clover.jar"/>
134 -+ -->
135 - <jar jarfile="${build}/jws/jnidispatch.jar">
136 - <fileset dir="${build.native}" includes="*jnidispatch.*"/>
137 - </jar>
138 -+ <!--
139 - <signjar alias="jna" keystore="jna.keystore" storepass="jnadev" lazy="true">
140 -- <fileset dir="${build}/jws" includes="jna.jar,jna-test.jar,junit.jar,jnidispatch.jar,clover.jar"/>
141 -+ <fileset dir="${build}/jws" includes="jna.jar,jna-test.jar,junit.jar,jnidispatch.jar"/>
142 - </signjar>
143 -+ -->
144 - </target>
145 -
146 - <!-- When running tests from an IDE, be sure to set jna.library.path -->
147
148 diff --git a/dev-java/jna/files/3.2.7-makefile-flags.patch b/dev-java/jna/files/3.2.7-makefile-flags.patch
149 deleted file mode 100644
150 index 8004882849..0000000000
151 --- a/dev-java/jna/files/3.2.7-makefile-flags.patch
152 +++ /dev/null
153 @@ -1,60 +0,0 @@
154 ---- native/Makefile.orig 2011-01-25 16:42:02.341745978 +0100
155 -+++ native/Makefile 2011-01-25 16:45:57.500174283 +0100
156 -@@ -67,10 +66,10 @@
157 - COUT=-o $@
158 - CINCLUDES=$(JAVA_INCLUDES) -I"$(JAVAH)" -I$(FFI_BUILD)/include
159 - CDEFINES=-D_REENTRANT
160 --PCFLAGS=-W -Wall -Wno-unused -Wno-parentheses
161 --CFLAGS=$(PCFLAGS) $(CFLAGS_EXTRA) $(COPT) $(CDEBUG) $(CDEFINES) $(CINCLUDES) \
162 -+PCFLAGS=-Wall -Wno-unused -Wno-parentheses
163 -+CFLAGS+=$(PCFLAGS) $(CFLAGS_EXTRA) $(COPT) $(CDEBUG) $(CDEFINES) $(CINCLUDES) \
164 - -DJNA_JNI_VERSION='"$(JNA_JNI_VERSION)"' -DCHECKSUM='"$(CHECKSUM)"'
165 --LDFLAGS=-o $@ -shared
166 -+LDFLAGS+=-o $@ -shared
167 - ifeq ($(DYNAMIC_LIBFFI),true)
168 - CFLAGS += $(shell pkg-config --cflags libffi 2>/dev/null || echo)
169 - LIBS += $(shell pkg-config --libs libffi 2>/dev/null || echo -lffi)
170 -@@ -109,7 +108,7 @@
171 - ifneq ($(MINGW),)
172 - CC = $(MINGW) -m64 -mno-cygwin
173 - LD = $(CC)
174 --LDFLAGS=-o $@ -shared
175 -+LDFLAGS+=-o $@ -shared
176 - LIBS= -lmingwex -lpsapi -lkernel32 -lmsvcrt
177 - FFI_CONFIG += --host=x86_64-pc-mingw32
178 - else
179 -@@ -129,14 +128,14 @@
180 - ARCH=$(shell uname -m | sed 's/i.86/i386/g')
181 - PCFLAGS+=-fPIC
182 - CDEFINES+=-DHAVE_PROTECTION
183 --LDFLAGS+=-Wl,-soname,$@
184 -+LDFLAGS+= -Wl,-soname,$(shell basename $@)
185 - endif
186 -
187 - ifeq ($(OS),freebsd)
188 - ARCH=$(shell uname -m | sed 's/i.86/i386/g')
189 - PCFLAGS+=-fPIC
190 - CINCLUDES+=-I/usr/X11R6/include
191 --LDFLAGS=-o $@ -shared
192 -+LDFLAGS+=-o $@ -shared
193 - CDEFINES+=-DHAVE_PROTECTION -DFFI_MMAP_EXEC_WRIT
194 - endif
195 -
196 -@@ -144,7 +143,7 @@
197 - ARCH=$(shell uname -m | sed 's/i.86/i386/g')
198 - PCFLAGS+=-fPIC
199 - CINCLUDES+=-I/usr/X11R6/include
200 --LDFLAGS=-o $@ -shared
201 -+LDFLAGS+= -o $@ -shared
202 - CDEFINES+=-DHAVE_PROTECTION -DFFI_MMAP_EXEC_WRIT
203 - endif
204 -
205 -@@ -191,7 +190,7 @@
206 - endif
207 - PCFLAGS+=$(ISYSROOT) -x objective-c
208 - CDEFINES+=-DTARGET_RT_MAC_CFM=0 -DFFI_MMAP_EXEC_WRIT
209 --LDFLAGS=$(ARCHFLAGS) -dynamiclib -o $@ -framework JavaVM \
210 -+LDFLAGS+=$(ARCHFLAGS) -dynamiclib -o $@ -framework JavaVM \
211 - -compatibility_version $(shell echo ${JNA_JNI_VERSION}|sed 's/^\([0-9][0-9]*\).*/\1/g') \
212 - -current_version $(JNA_JNI_VERSION) \
213 - -mmacosx-version-min=10.3 \
214
215 diff --git a/dev-java/jna/files/3.4.0-build.xml.patch b/dev-java/jna/files/3.4.0-build.xml.patch
216 deleted file mode 100644
217 index c907b592b0..0000000000
218 --- a/dev-java/jna/files/3.4.0-build.xml.patch
219 +++ /dev/null
220 @@ -1,31 +0,0 @@
221 ---- build.xml.orig 2011-01-25 17:33:24.750473340 +0100
222 -+++ build.xml 2011-01-25 17:07:14.657410373 +0100
223 -@@ -176,7 +176,9 @@
224 - <path id="test.runpath">
225 - <pathelement path="${build}/${jar}"/>
226 - <pathelement path="${test.classes}"/>
227 -+ <!--
228 - <pathelement path="lib/clover.jar"/>
229 -+ -->
230 - <path refid="test.libs"/>
231 - </path>
232 - </target>
233 -@@ -433,13 +435,17 @@
234 - <copy todir="${build}/jws" file="${build}/${jar}"/>
235 - <copy todir="${build}/jws" file="${build}/${testjar}"/>
236 - <copy todir="${build}/jws" file="lib/junit.jar"/>
237 -+ <!--
238 - <copy todir="${build}/jws" file="lib/clover.jar"/>
239 -+ -->
240 - <jar jarfile="${build}/jws/jnidispatch.jar">
241 - <fileset dir="${build.native}" includes="*jnidispatch.*"/>
242 - </jar>
243 -+ <!--
244 - <signjar alias="jna" keystore="jna.keystore" storepass="jnadev" lazy="true">
245 -- <fileset dir="${build}/jws" includes="jna.jar,jna-test.jar,junit.jar,jnidispatch.jar,clover.jar"/>
246 -+ <fileset dir="${build}/jws" includes="jna.jar,jna-test.jar,junit.jar,jnidispatch.jar"/>
247 - </signjar>
248 -+ -->
249 - </target>
250 -
251 - <!-- When running tests from an IDE, be sure to set jna.library.path -->
252
253 diff --git a/dev-java/jna/files/jna-3.4.0-makefile-flags.patch b/dev-java/jna/files/jna-3.4.0-makefile-flags.patch
254 deleted file mode 100644
255 index e4ff00bf69..0000000000
256 --- a/dev-java/jna/files/jna-3.4.0-makefile-flags.patch
257 +++ /dev/null
258 @@ -1,62 +0,0 @@
259 -diff --git a/native/Makefile b/native/Makefile
260 -index 75246a8..a1c3e66 100644
261 ---- a/native/Makefile
262 -+++ b/native/Makefile
263 -@@ -70,7 +70,7 @@ LIBPFX=lib
264 - LIBSFX=.so
265 - ARSFX=.a
266 - JNISFX=$(LIBSFX)
267 --CC=gcc
268 -+CC?=gcc
269 - LD=$(CC)
270 - LIBS=
271 - # Default to Sun recommendations for JNI compilation
272 -@@ -83,10 +83,10 @@ CFLAGS_EXTRA=
273 - COUT=-o $@
274 - CINCLUDES=$(JAVA_INCLUDES) -I"$(JAVAH)" -I$(FFI_BUILD)/include
275 - CDEFINES=-D_REENTRANT
276 --PCFLAGS=-W -Wall -Wno-unused -Wno-parentheses
277 --CFLAGS=$(PCFLAGS) $(CFLAGS_EXTRA) $(COPT) $(CDEBUG) $(CDEFINES) $(CINCLUDES) \
278 -+PCFLAGS=-Wall -Wno-unused -Wno-parentheses
279 -+CFLAGS+=$(PCFLAGS) $(CFLAGS_EXTRA) $(COPT) $(CDEBUG) $(CDEFINES) $(CINCLUDES) \
280 - -DJNA_JNI_VERSION='"$(JNA_JNI_VERSION)"' -DCHECKSUM='"$(CHECKSUM)"'
281 --LDFLAGS=-o $@ -shared
282 -+LDFLAGS+=-o $@ -shared
283 - ifeq ($(DYNAMIC_LIBFFI),true)
284 - CFLAGS += $(shell pkg-config --cflags libffi 2>/dev/null || echo)
285 - LIBS += $(shell pkg-config --libs libffi 2>/dev/null || echo -lffi)
286 -@@ -149,7 +149,7 @@ ifneq ($(MINGW),)
287 - CDEFINES=-DPSAPI_VERSION=1
288 - CC = $(MINGW) -m64 -mno-cygwin
289 - LD = $(CC)
290 --LDFLAGS=-o $@ -shared
291 -+LDFLAGS+=-o $@ -shared
292 - LIBS= -lmingwex -lpsapi -lkernel32 -lmsvcrt
293 - FFI_CONFIG += --host=x86_64-pc-mingw32
294 - else
295 -@@ -169,14 +169,14 @@ ifeq ($(OS),linux)
296 - ARCH=$(shell uname -m | sed 's/i.86/i386/g')
297 - PCFLAGS+=-fPIC
298 - CDEFINES+=-DHAVE_PROTECTION
299 --LDFLAGS+=-Wl,-soname,$@
300 -+LDFLAGS+= -Wl,-soname,$(shell basename $@)
301 - endif
302 -
303 - ifneq (,$(findstring bsd,$(OS)))
304 - ARCH=$(shell uname -m | sed 's/i.86/i386/g')
305 - PCFLAGS+=-fPIC
306 - CINCLUDES+=-I/usr/X11R6/include
307 --LDFLAGS=-o $@ -shared
308 -+LDFLAGS+= -o $@ -shared
309 - CDEFINES+=-DHAVE_PROTECTION -DFFI_MMAP_EXEC_WRIT
310 - endif
311 -
312 -@@ -239,7 +239,7 @@ endif
313 -
314 - PCFLAGS+=$(ISYSROOT) -x objective-c
315 - CDEFINES+=-DTARGET_RT_MAC_CFM=0 -DFFI_MMAP_EXEC_WRIT
316 --LDFLAGS=$(ARCHFLAGS) -dynamiclib -o $@ -framework JavaVM \
317 -+LDFLAGS+=$(ARCHFLAGS) -dynamiclib -o $@ -framework JavaVM \
318 - -compatibility_version $(shell echo ${JNA_JNI_VERSION}|sed 's/^\([0-9][0-9]*\).*/\1/g') \
319 - -current_version $(JNA_JNI_VERSION) \
320 - -mmacosx-version-min=10.3 \
321
322 diff --git a/dev-java/jna/files/makefile-flags.patch b/dev-java/jna/files/makefile-flags.patch
323 deleted file mode 100644
324 index 8ac141d570..0000000000
325 --- a/dev-java/jna/files/makefile-flags.patch
326 +++ /dev/null
327 @@ -1,21 +0,0 @@
328 ---- native/Makefile.orig 2009-06-03 22:09:02.000000000 +0200
329 -+++ native/Makefile 2009-06-03 22:14:56.000000000 +0200
330 -@@ -49,7 +49,6 @@
331 - LIBPFX=lib
332 - LIBSFX=.so
333 - JNISFX=$(LIBSFX)
334 --CC=gcc
335 - LD=gcc
336 - # Default to Sun recommendations for JNI compilation
337 - #COPT=-O2 -fomit-frame-pointer
338 -@@ -61,8 +60,8 @@
339 - COUT=-o $@
340 - CINCLUDES=$(JAVA_INCLUDES) -I"$(JAVAH)" -I$(FFI_BUILD)/include
341 - CDEFINES=-D_REENTRANT
342 --PCFLAGS=-W -Wall -Wno-unused -Wno-parentheses
343 --CFLAGS=$(PCFLAGS) $(COPT) $(CDEBUG) $(CDEFINES) $(CINCLUDES) \
344 -+PCFLAGS=-Wall -Wno-unused -Wno-parentheses
345 -+CFLAGS+=$(PCFLAGS) $(COPT) $(CDEBUG) $(CDEFINES) $(CINCLUDES) \
346 - -DVERSION='"$(VERSION)"' -DCHECKSUM='"$(CHECKSUM)"'
347 - # -static-libgcc avoids gcc library incompatibilities across linux systems
348 - LDFLAGS=-o $@ -shared -static-libgcc
349
350 diff --git a/dev-java/jna/jna-3.0.3-r1.ebuild b/dev-java/jna/jna-3.0.3-r1.ebuild
351 deleted file mode 100644
352 index 0ce84d1beb..0000000000
353 --- a/dev-java/jna/jna-3.0.3-r1.ebuild
354 +++ /dev/null
355 @@ -1,70 +0,0 @@
356 -# Copyright 1999-2012 Gentoo Foundation
357 -# Distributed under the terms of the GNU General Public License v2
358 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jna/jna-3.0.3-r1.ebuild,v 1.4 2012/05/03 07:42:50 jdhore Exp $
359 -
360 -EAPI=2
361 -
362 -JAVA_PKG_IUSE="test doc source"
363 -WANT_ANT_TASKS="ant-nodeps"
364 -
365 -inherit java-pkg-2 java-ant-2 toolchain-funcs flag-o-matic multilib
366 -
367 -DESCRIPTION="Java Native Access (JNA)"
368 -HOMEPAGE="https://jna.dev.java.net/"
369 -# repack and mirror
370 -#SRC_URI="http://jna.dev.java.net/source/browse/*checkout*/jna/tags/${PV}/jnalib/dist/src.zip"
371 -SRC_URI="mirror://gentoo/${P}.tar.bz2"
372 -LICENSE="LGPL-2.1"
373 -SLOT="0"
374 -KEYWORDS="~amd64-linux ~x86-linux ~x86-solaris"
375 -IUSE=""
376 -
377 -RDEPEND="virtual/libffi
378 - >=virtual/jre-1.4"
379 -
380 -DEPEND="virtual/libffi
381 - virtual/pkgconfig
382 - !test? ( >=virtual/jdk-1.4 )
383 - test? (
384 - dev-java/ant-junit
385 - dev-java/ant-trax
386 - >=virtual/jdk-1.5
387 - )"
388 -
389 -JAVA_ANT_REWRITE_CLASSPATH="true"
390 -
391 -java_prepare() {
392 - # remove bundled libffi
393 - rm -rf native/libffi || die
394 -
395 - # respect CFLAGS, don't inhibit warnings, honour CC
396 - epatch "${FILESDIR}/makefile-flags.patch"
397 -
398 - # ... and also on Solaris platforms
399 - sed -i -e '100,$s/SunOS/SunOSWithoutPrefix/g' build.xml || die
400 - # ... and Darwin
401 - sed -i -e 's:/Developer:/no-way/dont/do/this:g' build.xml || die
402 -
403 - # bug #272054
404 - append-cflags $(pkg-config --cflags-only-I libffi)
405 -
406 - # Fetch our own prebuilt libffi.
407 - mkdir -p build/native/libffi/.libs || die
408 - ln -snf "${EPREFIX}/usr/$(get_libdir)/libffi$(get_libname)" \
409 - build/native/libffi/.libs/libffi_convenience.a || die
410 -
411 - # Build to same directory on 64-bit archs.
412 - ln -snf build build-d64 || die
413 -}
414 -
415 -src_install() {
416 - java-pkg_dojar build/${PN}.jar
417 - java-pkg_doso build/native/libjnidispatch.so # this will break on osx
418 - use source && java-pkg_dosrc src/com
419 - use doc && java-pkg_dojavadoc doc/javadoc
420 -}
421 -
422 -src_test() {
423 - unset DISPLAY
424 - ANT_TASKS="ant-junit ant-nodeps ant-trax" ANT_OPTS="-Djava.awt.headless=true" eant test
425 -}
426
427 diff --git a/dev-java/jna/jna-3.2.4.ebuild b/dev-java/jna/jna-3.2.4.ebuild
428 deleted file mode 100644
429 index 35fa02f2c1..0000000000
430 --- a/dev-java/jna/jna-3.2.4.ebuild
431 +++ /dev/null
432 @@ -1,84 +0,0 @@
433 -# Copyright 1999-2012 Gentoo Foundation
434 -# Distributed under the terms of the GNU General Public License v2
435 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jna/jna-3.2.4.ebuild,v 1.6 2012/05/03 07:42:50 jdhore Exp $
436 -
437 -EAPI=2
438 -
439 -JAVA_PKG_IUSE="test doc source"
440 -WANT_ANT_TASKS="ant-nodeps"
441 -
442 -inherit java-pkg-2 java-ant-2 toolchain-funcs flag-o-matic multilib
443 -
444 -DESCRIPTION="Java Native Access (JNA)"
445 -HOMEPAGE="https://jna.dev.java.net/"
446 -# repack and mirror
447 -#SRC_URI="http://jna.dev.java.net/source/browse/*checkout*/jna/tags/${PV}/jnalib/dist/src.zip"
448 -SRC_URI="mirror://gentoo/${P}.tar.bz2"
449 -LICENSE="LGPL-2.1"
450 -SLOT="0"
451 -KEYWORDS="~amd64-linux ~x86-linux ~x86-solaris"
452 -IUSE=""
453 -
454 -RDEPEND="virtual/libffi
455 - >=virtual/jre-1.4"
456 -
457 -DEPEND="virtual/libffi
458 - virtual/pkgconfig
459 - !test? ( >=virtual/jdk-1.4 )
460 - test? (
461 - dev-java/junit:0
462 - dev-java/ant-junit:0
463 - dev-java/ant-trax:0
464 - >=virtual/jdk-1.5
465 - )"
466 -
467 -JAVA_ANT_REWRITE_CLASSPATH="true"
468 -
469 -java_prepare() {
470 - # remove bundled libffi
471 - rm -rf native/libffi || die
472 -
473 - # respect CFLAGS, don't inhibit warnings, honour CC
474 - epatch "${FILESDIR}/${PV}-makefile-flags.patch"
475 -
476 - # ... and also on Solaris platforms
477 - sed -i -e '100,$s/SunOS/SunOSWithoutPrefix/g' build.xml || die
478 - # ... and Darwin
479 - sed -i -e 's:/Developer:/no-way/dont/do/this:g' build.xml || die
480 -
481 - sed -i -e '/profiler-build-impl.xml/d' build.xml || die
482 - sed -i -e '/clover.jar"/d' build.xml || die
483 - sed -i -e 's:,clover.jar::' build.xml || die
484 - sed -i -e '/signjar/d' build.xml || die
485 -
486 - # bug #272054
487 - append-cflags $(pkg-config --cflags-only-I libffi)
488 -
489 - # Fetch our own prebuilt libffi.
490 - mkdir -p build/native/libffi/.libs || die
491 - ln -snf "${EPREFIX}/usr/$(get_libdir)/libffi$(get_libname)" \
492 - build/native/libffi/.libs/libffi_convenience.a || die
493 -
494 - # Build to same directory on 64-bit archs.
495 - ln -snf build build-d64 || die
496 -}
497 -
498 -EANT_EXTRA_ARGS="-Ddynlink.native=true"
499 -
500 -src_install() {
501 - java-pkg_dojar build/${PN}.jar
502 - java-pkg_doso build/native/libjnidispatch.so # this will break on osx
503 - use source && java-pkg_dosrc src/com
504 - use doc && java-pkg_dojavadoc doc/javadoc
505 -}
506 -
507 -src_test() {
508 - unset DISPLAY
509 -
510 - mkdir -p lib
511 - java-pkg_jar-from --into lib --build-only junit
512 -
513 - ANT_TASKS="ant-junit ant-nodeps ant-trax" \
514 - ANT_OPTS="-Djava.awt.headless=true" eant \
515 - ${EANT_EXTRA_ARGS} test
516 -}
517
518 diff --git a/dev-java/jna/jna-3.4.0-r1.ebuild b/dev-java/jna/jna-3.4.0-r1.ebuild
519 deleted file mode 100644
520 index 02e8f4d878..0000000000
521 --- a/dev-java/jna/jna-3.4.0-r1.ebuild
522 +++ /dev/null
523 @@ -1,96 +0,0 @@
524 -# Copyright 1999-2012 Gentoo Foundation
525 -# Distributed under the terms of the GNU General Public License v2
526 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jna/jna-3.4.0-r1.ebuild,v 1.2 2012/06/11 14:05:33 mgorny Exp $
527 -
528 -EAPI="4"
529 -
530 -JAVA_PKG_IUSE="doc source test"
531 -
532 -inherit eutils java-pkg-2 java-ant-2 toolchain-funcs vcs-snapshot
533 -
534 -DESCRIPTION="Java Native Access (JNA)"
535 -HOMEPAGE="https://github.com/twall/jna#readme"
536 -SRC_URI="https://github.com/twall/jna/tarball/3.4.0 -> ${P}.tar.gz"
537 -
538 -LICENSE="LGPL-2.1"
539 -SLOT="0"
540 -KEYWORDS="~amd64-linux ~x86-linux ~x86-solaris"
541 -IUSE="+awt +nio-buffers"
542 -REQUIRED_USE="test? ( awt nio-buffers )"
543 -
544 -COMMON_DEP="
545 - virtual/libffi"
546 -RDEPEND="${COMMON_DEP}
547 - >=virtual/jre-1.6"
548 -DEPEND="${COMMON_DEP}
549 - >=virtual/jdk-1.6
550 - dev-java/ant-nodeps:0
551 - virtual/pkgconfig
552 - test? (
553 - dev-java/ant-junit:0
554 - dev-java/ant-trax:0
555 - )"
556 -
557 -java_prepare() {
558 - # delete bundled jars and copy of libffi
559 - find -name "*.jar" -exec rm -v {} + || die
560 - rm -r native/libffi || die
561 -
562 - # fix builx.xml file on Solaris platforms
563 - sed -i -e '150,$s/SunOS/SunOSWithoutPrefix/g' build.xml || die
564 - # ... and Darwin
565 - sed -i -e 's:/Developer:/no-way/dont/do/this:g' build.xml || die
566 -
567 - epatch "${FILESDIR}/${PV}-build.xml.patch"
568 - # respect CFLAGS, don't inhibit warnings, honour CC
569 - epatch "${FILESDIR}/${P}-makefile-flags.patch"
570 - tc-export CC
571 -
572 - # Build to same directory on 64-bit archs.
573 - mkdir build || die
574 - ln -snf build build-d64 || die
575 -
576 - if ! use awt ; then
577 - sed -i -E "s/^(CDEFINES=.*)/\1 -DNO_JAWT/g" native/Makefile || die
578 - fi
579 -
580 - if ! use nio-buffers ; then
581 - sed -i -E "s/^(CDEFINES=.*)/\1 -DNO_NIO_BUFFERS/g" native/Makefile || die
582 - fi
583 -}
584 -
585 -EANT_BUILD_TARGET="jar contrib-jars"
586 -EANT_ANT_TASKS="ant-nodeps"
587 -EANT_EXTRA_ARGS="-Ddynlink.native=true"
588 -
589 -EANT_TEST_ANT_TASKS="ant-junit ant-nodeps ant-trax"
590 -src_test() {
591 - local sysprops=""
592 -
593 - # crashes vm (segfault)
594 - sed -i -e 's|testRegisterMethods|no&|' test/com/sun/jna/DirectTest.java || die
595 -
596 - # crashes vm, java 7 only (icedtea-7, oracle-jdk-bin-1.7)
597 - sed -i -e 's|testGCCallbackOnFinalize|no&|' test/com/sun/jna/CallbacksTest.java || die
598 -
599 - sysprops+=" -Djava.awt.headless=true"
600 - sysprops+=" -Djava.io.tmpdir=${T}" #to ensure exec mount
601 -
602 - mkdir -p lib || die
603 - java-pkg_jar-from --into lib --build-only junit
604 -
605 - # need to use _JAVA_OPTIONS or add them to the build.xml. ANT_OPTS won't
606 - # survive the junit task.
607 - _JAVA_OPTIONS="${sysprops}" java-pkg-2_src_test
608 -}
609 -
610 -src_install() {
611 - java-pkg_dojar build/${PN}.jar
612 - java-pkg_dojar contrib/platform/dist/platform.jar
613 - java-pkg_doso build/native/libjnidispatch.so # this will break on osx
614 -
615 - java-pkg_register-optional-dependency emul-linux-x86-jna #313209
616 -
617 - use source && java-pkg_dosrc src/com
618 - use doc && java-pkg_dojavadoc doc/javadoc
619 -}
620
621 diff --git a/dev-java/jna/metadata.xml b/dev-java/jna/metadata.xml
622 deleted file mode 100644
623 index ceb3d23251..0000000000
624 --- a/dev-java/jna/metadata.xml
625 +++ /dev/null
626 @@ -1,15 +0,0 @@
627 -<?xml version="1.0" encoding="UTF-8"?>
628 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
629 -<pkgmetadata>
630 - <maintainer type="project">
631 - <email>java@g.o</email>
632 - <name>Java</name>
633 - </maintainer>
634 - <use>
635 - <flag name="awt">Enables support for Java AWT</flag>
636 - <flag name="nio-buffers">Enables support for NIO buffers</flag>
637 - </use>
638 - <upstream>
639 - <remote-id type="github">twall/jna</remote-id>
640 - </upstream>
641 -</pkgmetadata>