Gentoo Archives: gentoo-commits

From: James Le Cuirot <chewi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/jnr-ffi/, dev-java/jnr-ffi/files/
Date: Sun, 30 Oct 2016 20:29:55
Message-Id: 1477859374.aa30827d77e1fd5a4eb3235b029a30a2b9e214d1.chewi@gentoo
1 commit: aa30827d77e1fd5a4eb3235b029a30a2b9e214d1
2 Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
3 AuthorDate: Sun Oct 30 20:17:16 2016 +0000
4 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
5 CommitDate: Sun Oct 30 20:29:34 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa30827d
7
8 dev-java/jnr-ffi: Remove old
9
10 Package-Manager: portage-2.3.2
11
12 dev-java/jnr-ffi/Manifest | 4 --
13 dev-java/jnr-ffi/files/jnr-ffi-0.7.11-flags.patch | 18 ------
14 dev-java/jnr-ffi/files/jnr-ffi-1.0.6-junit48.patch | 11 ----
15 dev-java/jnr-ffi/jnr-ffi-0.5.10.ebuild | 69 ----------------------
16 dev-java/jnr-ffi/jnr-ffi-0.6.0.ebuild | 65 --------------------
17 dev-java/jnr-ffi/jnr-ffi-0.7.11-r1.ebuild | 65 --------------------
18 dev-java/jnr-ffi/jnr-ffi-1.0.10.ebuild | 61 -------------------
19 7 files changed, 293 deletions(-)
20
21 diff --git a/dev-java/jnr-ffi/Manifest b/dev-java/jnr-ffi/Manifest
22 index e3a0316..5030b06 100644
23 --- a/dev-java/jnr-ffi/Manifest
24 +++ b/dev-java/jnr-ffi/Manifest
25 @@ -1,5 +1 @@
26 -DIST jnr-ffi-0.5.10.tar.gz 559174 SHA256 6d13ae0ca2a63bcee0fcdb81263d676925658b0b466769e893279b453b636c9a SHA512 dc1eff430ab87dcecb798466088cc81fd92d5c44dfe473673635c3dfd7ad7e3e416d2086377b5b93b134902e7e6c3a736ef235f17a358a5a7f541dbaea41b2e5 WHIRLPOOL cef64a4e2db33262c4864b03c95303394c937682ceb9f9fad821932099c1f6e4eb6de36ae655c564aebf69bd4a99a1753839e49396b1adf1c9399bd8a16ef53f
27 -DIST jnr-ffi-0.6.0.tar.gz 97712 SHA256 91f7a1c21020892332849b9edc5ab7ad98dd7fabe03756fe0a48189ab796a24a SHA512 ea5997de1201c4d326ecd4753ed2ac11ba288d029508891a38e8a8ee8929b3622865057f9276373585414f88b48389ef607fd00474998ca4ce372a2cfc1e9170 WHIRLPOOL b205ecbce04e65981dc890fc0494dac01f5d47090535a336efc980f8877b64ceaf930fd157dd0a5de97987da61a0bbdb4b9cdfce9547d000f4f7c299d7167d60
28 -DIST jnr-ffi-0.7.11.tar.gz 131566 SHA256 a7045b072762e0905161a7792f60ed66798f298d589ee87262bf1cd75af447b5 SHA512 ddfacafbb5c7764692ef40db082bccb7a635916db9c5ff90ba0720a141e4b61072baaf4b4f5b985ef74fc5e8cb59753b93f7ffddb6f89c8a8ebcd0067ee0178b WHIRLPOOL 41d3308df161db08708fd05b12d9b3c49aba884523c0f19d4eb4531edf4c54316f12255f72a2d45e5ed720a619b2df024c06c7bf96fd252184344af3f8887db0
29 -DIST jnr-ffi-1.0.10.tar.gz 169196 SHA256 8d37e264705551a0f6b0283046dcc1264b311925874d7f674a6abc1f1f85775b SHA512 a46899e6a71c6fc5ad8586eae8dd718998de1ab30fe7c4b396a6291a54a63057c229c86c195c59e790bff13daa628adcb0caaacb05b1d58683e493fd6aa7fc3b WHIRLPOOL 467b1730a6e6ad494a00063c85bd90c34019df8730ce3a74b60d635f6f574ca0542fa3e2769beb1cecbe0feba2356662f0a2f35021ae425be52cdf1e63d73a1c
30 DIST jnr-ffi-2.0.2.tar.gz 170707 SHA256 a79772f3c46cd5afaf272752bc9a8292c8fd53c8302f8dc825a3cf2444ee2ab8 SHA512 80a932408f5ceaf19fd7a399b786aa0d7b9251ea144bc2755bcf3cdc3aea85615a1faa001bbcd3072bc0eead2aaa30d0bbead5f96c82c4b9e455c1ed1379b4c0 WHIRLPOOL cdd7b4b27dd2018747d0a669f7237f30def64bbde18486e81ac99c538a8d0c4679237c2402f955cbada773558a54492cfdc9f0a127d3de4007472339215891e8
31
32 diff --git a/dev-java/jnr-ffi/files/jnr-ffi-0.7.11-flags.patch b/dev-java/jnr-ffi/files/jnr-ffi-0.7.11-flags.patch
33 deleted file mode 100644
34 index f47e8d2..00000000
35 --- a/dev-java/jnr-ffi/files/jnr-ffi-0.7.11-flags.patch
36 +++ /dev/null
37 @@ -1,18 +0,0 @@
38 -diff --git a/jnr-ffi-0.7.11/libtest/GNUmakefile b/jnr-ffi-0.7.11/libtest/GNUmakefile
39 -index 1906219..c9a9c11 100644
40 ---- a/jnr-ffi-0.7.11/libtest/GNUmakefile
41 -+++ b/jnr-ffi-0.7.11/libtest/GNUmakefile
42 -@@ -37,10 +37,10 @@ TEST_OBJS := $(patsubst $(SRC_DIR)/%.c, $(TEST_BUILD_DIR)/%.o, $(TEST_SRCS))
43 - # Compiler/linker flags from:
44 - # http://weblogs.java.net/blog/kellyohair/archive/2006/01/compilation_of_1.html
45 - JFLAGS = -fno-omit-frame-pointer -fno-strict-aliasing
46 --OFLAGS = -O2 $(JFLAGS)
47 --WFLAGS = -W -Werror -Wall -Wno-unused -Wno-parentheses
48 -+OFLAGS = $(JFLAGS)
49 -+WFLAGS = -W -Wall -Wno-unused -Wno-parentheses
50 - PICFLAGS = -fPIC
51 --SOFLAGS = -shared -Wl,-O1
52 -+SOFLAGS = -shared
53 - LDFLAGS += $(SOFLAGS)
54 -
55 - IFLAGS = -I"$(BUILD_DIR)"
56
57 diff --git a/dev-java/jnr-ffi/files/jnr-ffi-1.0.6-junit48.patch b/dev-java/jnr-ffi/files/jnr-ffi-1.0.6-junit48.patch
58 deleted file mode 100644
59 index 92b4cb2..00000000
60 --- a/dev-java/jnr-ffi/files/jnr-ffi-1.0.6-junit48.patch
61 +++ /dev/null
62 @@ -1,11 +0,0 @@
63 ---- a/src/test/java/jnr/ffi/ObjectReferenceManagerTest.java
64 -+++ b/src/test/java/jnr/ffi/ObjectReferenceManagerTest.java
65 -@@ -35,7 +35,7 @@
66 - Pointer ptr = referenceManager.add(bar);
67 - Pointer ptr2 = referenceManager.add(bar2);
68 - assertNotSame(ptr, ptr2);
69 -- assertNotEquals(ptr, ptr2);
70 -+ assertTrue(!ptr.equals(ptr2));
71 - assertSame(bar, referenceManager.get(ptr));
72 - assertSame(bar2, referenceManager.get(ptr2));
73 - }
74
75 diff --git a/dev-java/jnr-ffi/jnr-ffi-0.5.10.ebuild b/dev-java/jnr-ffi/jnr-ffi-0.5.10.ebuild
76 deleted file mode 100644
77 index b70da4a..00000000
78 --- a/dev-java/jnr-ffi/jnr-ffi-0.5.10.ebuild
79 +++ /dev/null
80 @@ -1,69 +0,0 @@
81 -# Copyright 1999-2013 Gentoo Foundation
82 -# Distributed under the terms of the GNU General Public License v2
83 -# $Id$
84 -
85 -EAPI="4"
86 -
87 -JAVA_PKG_IUSE="doc source test"
88 -
89 -inherit java-pkg-2 java-ant-2
90 -
91 -DESCRIPTION="An abstracted interface to invoking native functions from java"
92 -HOMEPAGE="https://github.com/jnr"
93 -SRC_URI="https://github.com/jnr/${PN}/tarball/${PV} -> ${P}.tar.gz"
94 -
95 -LICENSE="|| ( Apache-2.0 LGPL-3 )"
96 -SLOT="0.5"
97 -KEYWORDS="amd64 x86"
98 -IUSE=""
99 -
100 -COMMON_DEP="
101 - dev-java/jffi:1.0
102 - dev-java/jnr-x86asm:1.0
103 - dev-java/asm:3"
104 -RDEPEND="${COMMON_DEP}
105 - >=virtual/jre-1.5"
106 -DEPEND="${COMMON_DEP}
107 - >=virtual/jdk-1.5
108 - test? (
109 - dev-java/ant-junit:0
110 - >=dev-java/junit-4.8:4
111 - )"
112 -
113 -src_unpack() {
114 - unpack ${A}
115 - mv jnr-jnr-ffi-* "${P}" || die
116 -}
117 -
118 -java_prepare() {
119 - sed -i -e 's/-Werror //' libtest/GNUmakefile || die
120 - sed -i -e "s|-mimpure-text||g" libtest/GNUmakefile || die # Fix gcc-4.7
121 -
122 - cp "${FILESDIR}"/${PN}_maven-build.xml build.xml || die
123 -
124 - find "${WORKDIR}" -name '*.jar' -delete || die
125 -}
126 -
127 -JAVA_ANT_REWRITE_CLASSPATH="yes"
128 -JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} javadoc"
129 -JAVA_ANT_ENCODING="UTF-8"
130 -
131 -EANT_GENTOO_CLASSPATH="asm-3,jffi-1.0,jnr-x86asm-1.0"
132 -EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN} -Dmaven.build.srcDir.0=src"
133 -
134 -EANT_TEST_EXTRA_ARGS="-Dmaven.build.testDir.0=test"
135 -EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
136 -src_test() {
137 - # build native test library
138 - emake BUILD_DIR=build -f libtest/GNUmakefile
139 -
140 - _JAVA_OPTIONS="-Djna.library.path=build" \
141 - java-pkg-2_src_test
142 -}
143 -
144 -src_install() {
145 - java-pkg_dojar target/${PN}.jar
146 -
147 - use doc && java-pkg_dojavadoc target/site/apidocs
148 - use source && java-pkg_dosrc src/*
149 -}
150
151 diff --git a/dev-java/jnr-ffi/jnr-ffi-0.6.0.ebuild b/dev-java/jnr-ffi/jnr-ffi-0.6.0.ebuild
152 deleted file mode 100644
153 index 8f38ab6..00000000
154 --- a/dev-java/jnr-ffi/jnr-ffi-0.6.0.ebuild
155 +++ /dev/null
156 @@ -1,65 +0,0 @@
157 -# Copyright 1999-2012 Gentoo Foundation
158 -# Distributed under the terms of the GNU General Public License v2
159 -# $Id$
160 -
161 -EAPI="4"
162 -
163 -JAVA_PKG_IUSE="doc source test"
164 -
165 -inherit java-pkg-2 java-ant-2
166 -
167 -DESCRIPTION="An abstracted interface to invoking native functions from java"
168 -HOMEPAGE="https://github.com/jnr"
169 -SRC_URI="https://github.com/jnr/${PN}/tarball/${PV} -> ${P}.tar.gz"
170 -
171 -LICENSE="|| ( Apache-2.0 LGPL-3 )"
172 -SLOT="0.6"
173 -KEYWORDS="amd64 x86"
174 -IUSE=""
175 -# Fail, upstream pom has ignore test failures enabled.
176 -RESTRICT="test"
177 -
178 -COMMON_DEP="
179 - dev-java/jffi:1.0
180 - dev-java/jnr-x86asm:1.0
181 - dev-java/asm:3"
182 -RDEPEND="${COMMON_DEP}
183 - >=virtual/jre-1.5"
184 -DEPEND="${COMMON_DEP}
185 - >=virtual/jdk-1.5
186 - test? (
187 - dev-java/ant-junit:0
188 - >=dev-java/junit-4.8:4
189 - )"
190 -
191 -src_unpack() {
192 - unpack ${A}
193 - mv jnr-jnr-ffi-* "${P}" || die
194 -}
195 -
196 -java_prepare() {
197 - cp "${FILESDIR}"/${PN}_maven-build.xml build.xml || die
198 -}
199 -
200 -JAVA_ANT_REWRITE_CLASSPATH="yes"
201 -JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} javadoc"
202 -JAVA_ANT_ENCODING="UTF-8"
203 -
204 -EANT_GENTOO_CLASSPATH="asm-3,jffi-1.0,jnr-x86asm-1.0"
205 -EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}"
206 -
207 -EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
208 -src_test() {
209 - # build native test library
210 - emake BUILD_DIR=build -f libtest/GNUmakefile
211 -
212 - _JAVA_OPTIONS="-Djnr.ffi.library.path=build" \
213 - java-pkg-2_src_test
214 -}
215 -
216 -src_install() {
217 - java-pkg_dojar target/${PN}.jar
218 -
219 - use doc && java-pkg_dojavadoc target/site/apidocs
220 - use source && java-pkg_dosrc src/main/java/*
221 -}
222
223 diff --git a/dev-java/jnr-ffi/jnr-ffi-0.7.11-r1.ebuild b/dev-java/jnr-ffi/jnr-ffi-0.7.11-r1.ebuild
224 deleted file mode 100644
225 index 405c963..00000000
226 --- a/dev-java/jnr-ffi/jnr-ffi-0.7.11-r1.ebuild
227 +++ /dev/null
228 @@ -1,65 +0,0 @@
229 -# Copyright 1999-2015 Gentoo Foundation
230 -# Distributed under the terms of the GNU General Public License v2
231 -# $Id$
232 -
233 -EAPI="5"
234 -
235 -JAVA_PKG_IUSE="doc source test"
236 -
237 -inherit java-pkg-2 java-ant-2 vcs-snapshot
238 -
239 -DESCRIPTION="An abstracted interface to invoking native functions from java"
240 -HOMEPAGE="https://github.com/jnr/jnr-ffi"
241 -SRC_URI="https://github.com/jnr/${PN}/tarball/${PV} -> ${P}.tar.gz"
242 -
243 -LICENSE="|| ( Apache-2.0 LGPL-3 )"
244 -SLOT="0.7"
245 -KEYWORDS="amd64 x86"
246 -
247 -COMMON_DEP="
248 - >=dev-java/jffi-1.2.7-r1:1.2
249 - dev-java/jnr-x86asm:1.0
250 - dev-java/asm:4"
251 -
252 -RDEPEND="${COMMON_DEP}
253 - >=virtual/jre-1.5"
254 -
255 -DEPEND="${COMMON_DEP}
256 - >=virtual/jdk-1.5
257 - test? (
258 - dev-java/ant-junit:0
259 - >=dev-java/junit-4.8:4
260 - )"
261 -
262 -java_prepare() {
263 - cp "${FILESDIR}"/${PN}_maven-build.xml build.xml || die
264 - epatch "${FILESDIR}"/${P}-flags.patch
265 -}
266 -
267 -JAVA_ANT_REWRITE_CLASSPATH="yes"
268 -JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} javadoc"
269 -JAVA_ANT_ENCODING="UTF-8"
270 -
271 -EANT_GENTOO_CLASSPATH="asm-4,jffi-1.2,jnr-x86asm-1.0"
272 -EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}"
273 -
274 -EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
275 -
276 -src_test() {
277 - # Fails, upstream pom has ignore test failures enabled.
278 - rm -v src/test/java/jnr/ffi/StringArrayTest.java || die
279 -
280 - # build native test library
281 - emake BUILD_DIR=build -f libtest/GNUmakefile
282 -
283 -# _JAVA_OPTIONS="-Djffi.boot.library.path=${EPREFIX}/usr/$(get_libdir)/jffi-1.2 -Djffi.boot.library.path=${EPREFIX}/usr/$(get_libdir)/jffi -Djava.library.path=${EPREFIX}/usr/$(get_libdir)/jffi"
284 - _JAVA_OPTIONS="-Djnr.ffi.library.path=build" \
285 - java-pkg-2_src_test
286 -}
287 -
288 -src_install() {
289 - java-pkg_dojar target/${PN}.jar
290 -
291 - use doc && java-pkg_dojavadoc target/site/apidocs
292 - use source && java-pkg_dosrc src/main/java/*
293 -}
294
295 diff --git a/dev-java/jnr-ffi/jnr-ffi-1.0.10.ebuild b/dev-java/jnr-ffi/jnr-ffi-1.0.10.ebuild
296 deleted file mode 100644
297 index d36ed85..00000000
298 --- a/dev-java/jnr-ffi/jnr-ffi-1.0.10.ebuild
299 +++ /dev/null
300 @@ -1,61 +0,0 @@
301 -# Copyright 1999-2015 Gentoo Foundation
302 -# Distributed under the terms of the GNU General Public License v2
303 -# $Id$
304 -
305 -EAPI="5"
306 -
307 -JAVA_PKG_IUSE="doc source test"
308 -
309 -inherit java-pkg-2 java-ant-2
310 -
311 -DESCRIPTION="An abstracted interface to invoking native functions from java"
312 -HOMEPAGE="https://github.com/jnr/jnr-ffi"
313 -SRC_URI="https://github.com/jnr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
314 -
315 -LICENSE="|| ( Apache-2.0 LGPL-3 )"
316 -SLOT="1"
317 -KEYWORDS="amd64 x86"
318 -
319 -COMMON_DEP="
320 - dev-java/jffi:1.2
321 - dev-java/jnr-x86asm:1.0
322 - dev-java/asm:4"
323 -
324 -RDEPEND="${COMMON_DEP}
325 - >=virtual/jre-1.5"
326 -
327 -DEPEND="${COMMON_DEP}
328 - >=virtual/jdk-1.5
329 - test? (
330 - dev-java/ant-junit:0
331 - >=dev-java/junit-4.8:4
332 - )"
333 -
334 -java_prepare() {
335 - cp "${FILESDIR}"/${PN}_maven-build.xml build.xml || die
336 - epatch "${FILESDIR}"/${PN}-1.0.6-junit48.patch
337 -}
338 -
339 -JAVA_ANT_REWRITE_CLASSPATH="yes"
340 -JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} javadoc"
341 -JAVA_ANT_ENCODING="UTF-8"
342 -
343 -EANT_GENTOO_CLASSPATH="asm-4,jffi-1.2,jnr-x86asm-1.0"
344 -EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}"
345 -
346 -EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
347 -
348 -src_test() {
349 - # build native test library
350 - emake BUILD_DIR=build -f libtest/GNUmakefile
351 -
352 - _JAVA_OPTIONS="-Djnr.ffi.library.path=build" \
353 - java-pkg-2_src_test
354 -}
355 -
356 -src_install() {
357 - java-pkg_dojar target/${PN}.jar
358 -
359 - use doc && java-pkg_dojavadoc target/site/apidocs
360 - use source && java-pkg_dosrc src/main/java/*
361 -}