1 |
commit: a012412817c78955a681866a704b5967c1492af4 |
2 |
Author: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net> |
3 |
AuthorDate: Wed Dec 30 11:33:49 2020 +0000 |
4 |
Commit: Aisha Tammy <gentoo <AT> aisha <DOT> cc> |
5 |
CommitDate: Wed Dec 30 13:00:20 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=a0124128 |
7 |
|
8 |
dev-java/fits: version bump 1.15.1, EAPI bump |
9 |
|
10 |
can't get the PN-src to compile, the build.xml |
11 |
probably needs to be updated. This now installs |
12 |
the pre-compiled version instead, maybe later we |
13 |
can switch back to the -src version |
14 |
|
15 |
Package-Manager: Portage-3.0.12, Repoman-3.0.2 |
16 |
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net> |
17 |
Closes: https://github.com/gentoo/sci/pull/1004 |
18 |
Signed-off-by: Aisha Tammy <gentoo <AT> aisha.cc> |
19 |
|
20 |
...urce-to-access-CompressTest-data-for-unit.patch | 137 ------------- |
21 |
.../02-Update-ArrayFuncsTest.java-to-JUnit-4.patch | 223 --------------------- |
22 |
dev-java/fits/files/README.Gentoo | 44 ---- |
23 |
dev-java/fits/files/build.xml | 84 -------- |
24 |
dev-java/fits/fits-1.11.0-r1.ebuild | 68 ------- |
25 |
dev-java/fits/fits-1.15.1.ebuild | 27 +++ |
26 |
6 files changed, 27 insertions(+), 556 deletions(-) |
27 |
|
28 |
diff --git a/dev-java/fits/files/01-Use-getResource-to-access-CompressTest-data-for-unit.patch b/dev-java/fits/files/01-Use-getResource-to-access-CompressTest-data-for-unit.patch |
29 |
deleted file mode 100644 |
30 |
index 389c233d1..000000000 |
31 |
--- a/dev-java/fits/files/01-Use-getResource-to-access-CompressTest-data-for-unit.patch |
32 |
+++ /dev/null |
33 |
@@ -1,137 +0,0 @@ |
34 |
-diff --git a/src/nom/tam/fits/test/CompressTest.java b/src/nom/tam/fits/test/CompressTest.java |
35 |
-index dd3aad0..c6d953e 100644 |
36 |
---- a/src/nom/tam/fits/test/CompressTest.java |
37 |
-+++ b/src/nom/tam/fits/test/CompressTest.java |
38 |
-@@ -54,58 +54,57 @@ public class CompressTest { |
39 |
- |
40 |
- @Test |
41 |
- public void testStream() throws Exception { |
42 |
-- InputStream is; |
43 |
-+ String is; |
44 |
- |
45 |
-- is = new FileInputStream("test.fits"); |
46 |
-+ is = "test.fits"; |
47 |
- assertEquals("Stream1", 300, streamRead(is, false, false)); |
48 |
- |
49 |
-- is = new FileInputStream("test.fits.Z"); |
50 |
-+ is = "test.fits.Z"; |
51 |
- assertEquals("Stream2", 300, streamRead(is, false, false)); |
52 |
- |
53 |
-- is = new FileInputStream("test.fits.gz"); |
54 |
-+ is = "test.fits.gz"; |
55 |
- assertEquals("Stream3", 300, streamRead(is, false, false)); |
56 |
- |
57 |
-- is = new FileInputStream("test.fits"); |
58 |
-+ is = "test.fits"; |
59 |
- assertEquals("Stream4", 300, streamRead(is, false, true)); |
60 |
- |
61 |
-- is = new FileInputStream("test.fits.Z"); |
62 |
-+ is = "test.fits.Z"; |
63 |
- assertEquals("Stream5", 300, streamRead(is, false, true)); |
64 |
- |
65 |
-- is = new FileInputStream("test.fits.gz"); |
66 |
-+ is = "test.fits.gz"; |
67 |
- assertEquals("Stream6", 300, streamRead(is, false, true)); |
68 |
- |
69 |
-- |
70 |
-- is = new FileInputStream("test.fits.Z"); |
71 |
-+ is = "test.fits.Z"; |
72 |
- assertEquals("Stream7", 300, streamRead(is, true, true)); |
73 |
- |
74 |
-- is = new FileInputStream("test.fits.gz"); |
75 |
-+ is = "test.fits.gz"; |
76 |
- assertEquals("Stream8", 300, streamRead(is, true, true)); |
77 |
- |
78 |
-- is = new FileInputStream("test.fits.bz2"); |
79 |
-+ is = "test.fits.bz2"; |
80 |
- assertEquals("Stream9", 300, streamRead(is, true, true)); |
81 |
- } |
82 |
- |
83 |
- @Test |
84 |
- public void testFile() throws Exception { |
85 |
-- File is = new File("test.fits"); |
86 |
-+ String is = "test.fits"; |
87 |
- assertEquals("File1", 300, fileRead(is, false, false)); |
88 |
- |
89 |
-- is = new File("test.fits.Z"); |
90 |
-+ is = "test.fits.Z"; |
91 |
- assertEquals("File2", 300, fileRead(is, false, false)); |
92 |
- |
93 |
-- is = new File("test.fits.gz"); |
94 |
-+ is = "test.fits.gz"; |
95 |
- assertEquals("File3", 300, fileRead(is, false, false)); |
96 |
- |
97 |
-- is = new File("test.fits"); |
98 |
-+ is = "test.fits"; |
99 |
- assertEquals("File4", 300, fileRead(is, false, true)); |
100 |
- |
101 |
-- is = new File("test.fits.Z"); |
102 |
-+ is = "test.fits.Z"; |
103 |
- assertEquals("File7", 300, fileRead(is, true, true)); |
104 |
- |
105 |
-- is = new File("test.fits.gz"); |
106 |
-+ is = "test.fits.gz"; |
107 |
- assertEquals("File8", 300, fileRead(is, true, true)); |
108 |
- |
109 |
-- is = new File("test.fits.bz2"); |
110 |
-+ is = "test.fits.bz2"; |
111 |
- assertEquals("File9", 300, fileRead(is, true, true)); |
112 |
- } |
113 |
- |
114 |
-@@ -131,7 +130,6 @@ public class CompressTest { |
115 |
- |
116 |
- is = "test.fits.bz2"; |
117 |
- assertEquals("String8", 300, stringRead(is, true, true)); |
118 |
-- |
119 |
- } |
120 |
- |
121 |
- @Test |
122 |
-@@ -158,13 +156,9 @@ public class CompressTest { |
123 |
- assertEquals("String8", 300, urlRead(is, true, true)); |
124 |
- } |
125 |
- |
126 |
-- int urlRead(String is, boolean comp, boolean useComp) |
127 |
-+ int urlRead(String filename, boolean comp, boolean useComp) |
128 |
- throws Exception { |
129 |
-- File fil = new File(is); |
130 |
-- |
131 |
-- String path = fil.getCanonicalPath(); |
132 |
-- URL u = new URL("file://" + path); |
133 |
-- |
134 |
-+ URL u = CompressTest.class.getResource(filename); |
135 |
- Fits f; |
136 |
- if (useComp) { |
137 |
- f = new Fits(u, comp); |
138 |
-@@ -176,8 +170,9 @@ public class CompressTest { |
139 |
- return total(data); |
140 |
- } |
141 |
- |
142 |
-- int streamRead(InputStream is, boolean comp, boolean useComp) |
143 |
-+ int streamRead(String filename, boolean comp, boolean useComp) |
144 |
- throws Exception { |
145 |
-+ InputStream is = CompressTest.class.getResourceAsStream(filename); |
146 |
- Fits f; |
147 |
- if (useComp) { |
148 |
- f = new Fits(is, comp); |
149 |
-@@ -190,8 +185,9 @@ public class CompressTest { |
150 |
- return total(data); |
151 |
- } |
152 |
- |
153 |
-- int fileRead(File is, boolean comp, boolean useComp) |
154 |
-+ int fileRead(String filename, boolean comp, boolean useComp) |
155 |
- throws Exception { |
156 |
-+ File is = new File(CompressTest.class.getResource(filename).getPath()); |
157 |
- Fits f; |
158 |
- if (useComp) { |
159 |
- f = new Fits(is, comp); |
160 |
-@@ -203,8 +199,9 @@ public class CompressTest { |
161 |
- return total(data); |
162 |
- } |
163 |
- |
164 |
-- int stringRead(String is, boolean comp, boolean useComp) |
165 |
-+ int stringRead(String filename, boolean comp, boolean useComp) |
166 |
- throws Exception { |
167 |
-+ String is = CompressTest.class.getResource(filename).getPath(); |
168 |
- Fits f; |
169 |
- if (useComp) { |
170 |
- f = new Fits(is, comp); |
171 |
|
172 |
diff --git a/dev-java/fits/files/02-Update-ArrayFuncsTest.java-to-JUnit-4.patch b/dev-java/fits/files/02-Update-ArrayFuncsTest.java-to-JUnit-4.patch |
173 |
deleted file mode 100644 |
174 |
index c9cd02d55..000000000 |
175 |
--- a/dev-java/fits/files/02-Update-ArrayFuncsTest.java-to-JUnit-4.patch |
176 |
+++ /dev/null |
177 |
@@ -1,223 +0,0 @@ |
178 |
-From b9edd6a86e66d354b0c1d010125246d8359cbb37 Mon Sep 17 00:00:00 2001 |
179 |
-From: W. Trevor King <wking@××××××.edu> |
180 |
-Date: Fri, 7 Oct 2011 03:44:18 -0400 |
181 |
-Subject: [PATCH 7/8] Update ArrayFuncsTest.java to JUnit-4. |
182 |
- |
183 |
---- |
184 |
- src/nom/tam/util/test/ArrayFuncsTest.java | 44 +++++++++++++++++++--------- |
185 |
- 1 files changed, 30 insertions(+), 14 deletions(-) |
186 |
- |
187 |
-diff --git a/src/nom/tam/util/test/ArrayFuncsTest.java b/src/nom/tam/util/test/ArrayFuncsTest.java |
188 |
-index df5efb0..7ad8e51 100644 |
189 |
---- a/src/nom/tam/util/test/ArrayFuncsTest.java |
190 |
-+++ b/src/nom/tam/util/test/ArrayFuncsTest.java |
191 |
-@@ -6,6 +6,12 @@ |
192 |
- */ |
193 |
- package nom.tam.util.test; |
194 |
- |
195 |
-+import org.junit.Test; |
196 |
-+import static org.junit.Assert.assertEquals; |
197 |
-+import static org.junit.Assert.assertTrue; |
198 |
-+import static org.junit.Assert.assertFalse; |
199 |
-+import static org.junit.Assert.assertSame; |
200 |
-+import static org.junit.Assert.assertNotSame; |
201 |
- import junit.framework.*; |
202 |
- import java.lang.reflect.*; |
203 |
- import java.util.Arrays; |
204 |
-@@ -15,21 +21,12 @@ import nom.tam.util.ArrayFuncs; |
205 |
- * |
206 |
- * @author Thomas McGlynn |
207 |
- */ |
208 |
--public class ArrayFuncsTest extends TestCase { |
209 |
-- |
210 |
-- public ArrayFuncsTest(String testName) { |
211 |
-- super(testName); |
212 |
-- } |
213 |
-- |
214 |
-- protected void setUp() throws Exception { |
215 |
-- } |
216 |
-- |
217 |
-- protected void tearDown() throws Exception { |
218 |
-- } |
219 |
-+public class ArrayFuncsTest { |
220 |
- |
221 |
- /** |
222 |
- * Test of computeSize method, of class nom.tam.util.ArrayFuncs. |
223 |
- */ |
224 |
-+ @Test |
225 |
- public void testComputeSize() { |
226 |
- System.out.println("computeSize"); |
227 |
- |
228 |
-@@ -58,6 +55,7 @@ public class ArrayFuncsTest extends TestCase { |
229 |
- /** |
230 |
- * Test of nElements method, of class nom.tam.util.ArrayFuncs. |
231 |
- */ |
232 |
-+ @Test |
233 |
- public void testNElements() { |
234 |
- System.out.println("nElements"); |
235 |
- |
236 |
-@@ -72,6 +70,7 @@ public class ArrayFuncsTest extends TestCase { |
237 |
- /** |
238 |
- * Test of deepClone method, of class nom.tam.util.ArrayFuncs. |
239 |
- */ |
240 |
-+ @Test |
241 |
- public void testDeepClone() { |
242 |
- int[][] test = {{0, 1}, {2, 3}, {4, 5}}; |
243 |
- int[][] result = (int[][]) nom.tam.util.ArrayFuncs.deepClone(test); |
244 |
-@@ -96,6 +95,7 @@ public class ArrayFuncsTest extends TestCase { |
245 |
- } |
246 |
- |
247 |
- public boolean equals(Object x) { |
248 |
-+ System.out.println("checking equality"); |
249 |
- return (x instanceof CloneTest) |
250 |
- && (((CloneTest) x).value == this.value); |
251 |
- } |
252 |
-@@ -104,6 +104,7 @@ public class ArrayFuncsTest extends TestCase { |
253 |
- /** |
254 |
- * Test of genericClone method, of class nom.tam.util.ArrayFuncs. |
255 |
- */ |
256 |
-+ @Test |
257 |
- public void testGenericClone() { |
258 |
- System.out.println("genericClone"); |
259 |
- |
260 |
-@@ -126,6 +127,7 @@ public class ArrayFuncsTest extends TestCase { |
261 |
- /** |
262 |
- * Test of copyArray method, of class nom.tam.util.ArrayFuncs. |
263 |
- */ |
264 |
-+ @Test |
265 |
- public void testCopyArray() { |
266 |
- System.out.println("copyArray"); |
267 |
- |
268 |
-@@ -138,6 +140,7 @@ public class ArrayFuncsTest extends TestCase { |
269 |
- /** |
270 |
- * Test of getDimensions method, of class nom.tam.util.ArrayFuncs. |
271 |
- */ |
272 |
-+ @Test |
273 |
- public void testGetDimensions() { |
274 |
- System.out.println("getDimensions"); |
275 |
- |
276 |
-@@ -157,6 +160,7 @@ public class ArrayFuncsTest extends TestCase { |
277 |
- /** |
278 |
- * Test of getBaseArray method, of class nom.tam.util.ArrayFuncs. |
279 |
- */ |
280 |
-+ @Test |
281 |
- public void testGetBaseArray() { |
282 |
- |
283 |
- int[][][] test = new int[2][3][4]; |
284 |
-@@ -169,6 +173,7 @@ public class ArrayFuncsTest extends TestCase { |
285 |
- /** |
286 |
- * Test of getBaseClass method, of class nom.tam.util.ArrayFuncs. |
287 |
- */ |
288 |
-+ @Test |
289 |
- public void testGetBaseClass() { |
290 |
- System.out.println("getBaseClass"); |
291 |
- |
292 |
-@@ -179,6 +184,7 @@ public class ArrayFuncsTest extends TestCase { |
293 |
- /** |
294 |
- * Test of getBaseLength method, of class nom.tam.util.ArrayFuncs. |
295 |
- */ |
296 |
-+ @Test |
297 |
- public void testGetBaseLength() { |
298 |
- |
299 |
- assertEquals(ArrayFuncs.getBaseLength(new int[2][3]), 4); |
300 |
-@@ -195,6 +201,7 @@ public class ArrayFuncsTest extends TestCase { |
301 |
- /** |
302 |
- * Test of generateArray method, of class nom.tam.util.ArrayFuncs. |
303 |
- */ |
304 |
-+ @Test |
305 |
- public void testGenerateArray() { |
306 |
- System.out.println("generateArray"); |
307 |
- |
308 |
-@@ -213,6 +220,7 @@ public class ArrayFuncsTest extends TestCase { |
309 |
- /** |
310 |
- * Test of testPattern method, of class nom.tam.util.ArrayFuncs. |
311 |
- */ |
312 |
-+ @Test |
313 |
- public void testTestPattern() { |
314 |
- System.out.println("testPattern"); |
315 |
- |
316 |
-@@ -229,6 +237,7 @@ public class ArrayFuncsTest extends TestCase { |
317 |
- /** |
318 |
- * Test of flatten method, of class nom.tam.util.ArrayFuncs. |
319 |
- */ |
320 |
-+ @Test |
321 |
- public void testFlatten() { |
322 |
- System.out.println("flatten"); |
323 |
- |
324 |
-@@ -241,6 +250,7 @@ public class ArrayFuncsTest extends TestCase { |
325 |
- /** |
326 |
- * Test of curl method, of class nom.tam.util.ArrayFuncs. |
327 |
- */ |
328 |
-+ @Test |
329 |
- public void testCurl() { |
330 |
- System.out.println("curl"); |
331 |
- |
332 |
-@@ -259,6 +269,7 @@ public class ArrayFuncsTest extends TestCase { |
333 |
- /** |
334 |
- * Test of mimicArray method, of class nom.tam.util.ArrayFuncs. |
335 |
- */ |
336 |
-+ @Test |
337 |
- public void testMimicArray() { |
338 |
- System.out.println("mimicArray"); |
339 |
- |
340 |
-@@ -273,6 +284,7 @@ public class ArrayFuncsTest extends TestCase { |
341 |
- /** |
342 |
- * Test of convertArray method, of class nom.tam.util.ArrayFuncs. |
343 |
- */ |
344 |
-+ @Test |
345 |
- public void testConvertArray() { |
346 |
- System.out.println("convertArray"); |
347 |
- |
348 |
-@@ -286,7 +298,7 @@ public class ArrayFuncsTest extends TestCase { |
349 |
- |
350 |
- newType = int.class; |
351 |
- int[][] ires = (int[][]) ArrayFuncs.convertArray(array, newType, true); |
352 |
-- assertEquals(array, ires); |
353 |
-+ assertSame(array, ires); |
354 |
- |
355 |
- ires = (int[][]) ArrayFuncs.convertArray(array, newType, false); |
356 |
- assertNotSame(array, ires); |
357 |
-@@ -296,6 +308,7 @@ public class ArrayFuncsTest extends TestCase { |
358 |
- /** |
359 |
- * Test of copyInto method, of class nom.tam.util.ArrayFuncs. |
360 |
- */ |
361 |
-+ @Test |
362 |
- public void testCopyInto() { |
363 |
- System.out.println("copyInto"); |
364 |
- |
365 |
-@@ -304,13 +317,14 @@ public class ArrayFuncsTest extends TestCase { |
366 |
- |
367 |
- ArrayFuncs.copyInto(x, y); |
368 |
- |
369 |
-- assertEquals((double) x[0][0], y[0][0]); |
370 |
-- assertEquals((double) x[1][2], y[1][2]); |
371 |
-+ assertEquals((double) x[0][0], y[0][0], 0.01); |
372 |
-+ assertEquals((double) x[1][2], y[1][2], 0.01); |
373 |
- } |
374 |
- |
375 |
- /** |
376 |
- * Test of arrayEquals method, of class nom.tam.util.ArrayFuncs. |
377 |
- */ |
378 |
-+ @Test |
379 |
- public void testArrayEquals() { |
380 |
- System.out.println("arrayEquals"); |
381 |
- |
382 |
-@@ -331,6 +345,7 @@ public class ArrayFuncsTest extends TestCase { |
383 |
- /** |
384 |
- * Test of doubleArrayEquals method, of class nom.tam.util.ArrayFuncs. |
385 |
- */ |
386 |
-+ @Test |
387 |
- public void testDoubleArrayEquals() { |
388 |
- |
389 |
- double x[] = {1, 2, 3}; |
390 |
-@@ -349,6 +364,7 @@ public class ArrayFuncsTest extends TestCase { |
391 |
- /** |
392 |
- * Test of floatArrayEquals method, of class nom.tam.util.ArrayFuncs. |
393 |
- */ |
394 |
-+ @Test |
395 |
- public void testFloatArrayEquals() { |
396 |
- float x[] = {1f, 2f, 3f}; |
397 |
- float y[] = {1f, 2f, 3f}; |
398 |
--- |
399 |
-1.7.3.1.104.gc752e |
400 |
- |
401 |
|
402 |
diff --git a/dev-java/fits/files/README.Gentoo b/dev-java/fits/files/README.Gentoo |
403 |
deleted file mode 100644 |
404 |
index 62c238cdd..000000000 |
405 |
--- a/dev-java/fits/files/README.Gentoo |
406 |
+++ /dev/null |
407 |
@@ -1,44 +0,0 @@ |
408 |
-I have been unable to track down a source repository for fits, so this |
409 |
-ebuild straps a build system onto source unpacked from a source JAR. |
410 |
-Not the greatest solution, but it's the best I can come up with. I've |
411 |
-also had trouble figuring out who holds copyright and what the |
412 |
-licensing terms are. If you find more authoritative information, let |
413 |
-me know! |
414 |
- |
415 |
-Authors (listed with the first release note to mention them): |
416 |
- Tom McGlynn <thomas.a.mcglynn@××××.gov> [1,12] |
417 |
- Jens Knudstrup [2] |
418 |
- Alan Brighton [2] |
419 |
- R.J. Mathar [3] |
420 |
- Jorgo Bakker [3] |
421 |
- Laurent Michel [3] |
422 |
- R. Mathar [4] |
423 |
- Guillame Belanger [4] |
424 |
- A. Kovacs [5] |
425 |
- Javier Diaz [6] |
426 |
- Juan Carlos Segovia [7] |
427 |
- Thomas Granzer [7] |
428 |
- L. Michel [8] |
429 |
- Mark Taylor [9] |
430 |
- Laurent Bourges [10] |
431 |
- V. Forchi [11] |
432 |
- |
433 |
-From [11]: |
434 |
- |
435 |
-> [The] build procedure for FITS library has been changed. The library |
436 |
-> is now stored as a NetBeans project and the standard NetBeans build |
437 |
-> script has been modified to generate the fits.jar and fits_src.jar. |
438 |
- |
439 |
- |
440 |
-[1]: http://heasarc.gsfc.nasa.gov/docs/heasarc/fits/java/v0.9/NOTES/NOTE.v091 |
441 |
-[2]: http://heasarc.gsfc.nasa.gov/docs/heasarc/fits/java/v0.9/NOTES/NOTE.v093 |
442 |
-[3]: http://heasarc.gsfc.nasa.gov/docs/heasarc/fits/java/v0.9/NOTES/NOTE.v099 |
443 |
-[4]: http://heasarc.gsfc.nasa.gov/docs/heasarc/fits/java/v0.9/NOTES/NOTE.v099.1 |
444 |
-[5]: http://heasarc.gsfc.nasa.gov/docs/heasarc/fits/java/v0.9/NOTES/NOTE.v099.5 |
445 |
-[6]: http://heasarc.gsfc.nasa.gov/docs/heasarc/fits/java/v1.0/NOTE.v100.1 |
446 |
-[7]: http://heasarc.gsfc.nasa.gov/docs/heasarc/fits/java/v1.0/NOTE.v101.0 |
447 |
-[8]: http://heasarc.gsfc.nasa.gov/docs/heasarc/fits/java/v1.0/NOTE.v102.0 |
448 |
-[9]: http://heasarc.gsfc.nasa.gov/docs/heasarc/fits/java/v1.0/NOTE.v104.0 |
449 |
-[10]: http://heasarc.gsfc.nasa.gov/docs/heasarc/fits/java/v1.0/NOTE.v105.0 |
450 |
-[11]: http://heasarc.gsfc.nasa.gov/docs/heasarc/fits/java/v1.0/NOTE.v105.1 |
451 |
-[12]: http://asd.gsfc.nasa.gov/Thomas.McGlynn/ |
452 |
|
453 |
diff --git a/dev-java/fits/files/build.xml b/dev-java/fits/files/build.xml |
454 |
deleted file mode 100644 |
455 |
index d8aa41b85..000000000 |
456 |
--- a/dev-java/fits/files/build.xml |
457 |
+++ /dev/null |
458 |
@@ -1,84 +0,0 @@ |
459 |
-<?xml version="1.0"?> |
460 |
-<project name="fits" default="all" basedir="."> |
461 |
- <target name="init" description="Sets build properties"> |
462 |
- <!-- package configuration --> |
463 |
- <property name="package.version" value="devel"/> |
464 |
- <!-- directory locations --> |
465 |
- <property name="src" value="${basedir}/src"/> |
466 |
- <property name="build" value="${basedir}/build"/> |
467 |
- <property name="doc" value="${basedir}/doc"/> |
468 |
- <property name="doc.api" value="${doc}/api"/> |
469 |
- <!-- external dependencies --> |
470 |
- <property name="junit.jar" value="junit.jar"/> |
471 |
- <!-- classpaths --> |
472 |
- <path id="project.class.path"> |
473 |
- </path> |
474 |
- <path id="build.class.path"> |
475 |
- <pathelement location="${junit.jar}"/> |
476 |
- </path> |
477 |
- <path id="test.class.path"> |
478 |
- <pathelement location="${build}"/> |
479 |
- </path> |
480 |
- </target> |
481 |
- <target name="all" depends="jar,javadoc" |
482 |
- description="Pseudo-target that builds JAR and Javadoc"> |
483 |
- </target> |
484 |
- <target name="build" depends="init" |
485 |
- description="Compiles the classes"> |
486 |
- <mkdir dir="${build}"/> |
487 |
- <javac destdir="${build}" srcdir="${src}" debug="true" |
488 |
- deprecation="true" includeantruntime="false"> |
489 |
- <classpath refid="project.class.path"/> |
490 |
- <classpath refid="build.class.path"/> |
491 |
- <!--compilerarg line="-Xlint:unchecked"/--> |
492 |
- </javac> |
493 |
- <copy todir="${build}"> |
494 |
- <mappedresources> |
495 |
- <fileset dir="${src}" includes="**/test/test.fits*"/> |
496 |
- <globmapper from="*" to="*"/> |
497 |
- </mappedresources> |
498 |
- </copy> |
499 |
- </target> |
500 |
- <target name="test" depends="build"> |
501 |
- <junit> |
502 |
- <classpath refid="project.class.path" /> |
503 |
- <classpath refid="test.class.path"/> |
504 |
- <formatter type="brief" usefile="false" /> |
505 |
- <batchtest> |
506 |
- <fileset dir="${build}"> |
507 |
- <include name="**/test/*.class" /> |
508 |
- <exclude name="**/*$*.class" /> |
509 |
- </fileset> |
510 |
- </batchtest> |
511 |
- </junit> |
512 |
- </target> |
513 |
- <target name="javadoc" depends="init" |
514 |
- description="Generates Javadoc API documentation"> |
515 |
- <mkdir dir="${doc.api}"/> |
516 |
- <javadoc packagenames="*" |
517 |
- sourcepath="${src}" destdir="${doc.api}" |
518 |
- author="true" version="true" |
519 |
- use="true" private="true"> |
520 |
- <classpath refid="project.class.path" /> |
521 |
- <classpath refid="build.class.path"/> |
522 |
- </javadoc> |
523 |
- </target> |
524 |
- <target name="jar" depends="build" |
525 |
- description="Builds a project JAR file"> |
526 |
- <jar basedir="${build}" jarfile="${build}/fits.jar"> |
527 |
- <manifest> |
528 |
- <attribute name="Version" value="${package.version}"/> |
529 |
- </manifest> |
530 |
- </jar> |
531 |
- </target> |
532 |
- <target name="clean" depends="init" |
533 |
- description="Erase all generated files and dirs"> |
534 |
- <delete dir="${build}" verbose="true"/> |
535 |
- <delete dir="${doc}/api" verbose="true"/> |
536 |
- <delete verbose="true"> |
537 |
- <fileset dir="${basedir}" includes="*.fits"/> |
538 |
- <fileset dir="${basedir}" includes="*.fil"/> |
539 |
- <fileset dir="${basedir}" includes="*.hdr"/> |
540 |
- </delete> |
541 |
- </target> |
542 |
-</project> |
543 |
|
544 |
diff --git a/dev-java/fits/fits-1.11.0-r1.ebuild b/dev-java/fits/fits-1.11.0-r1.ebuild |
545 |
deleted file mode 100644 |
546 |
index 18daa2e84..000000000 |
547 |
--- a/dev-java/fits/fits-1.11.0-r1.ebuild |
548 |
+++ /dev/null |
549 |
@@ -1,68 +0,0 @@ |
550 |
-# Copyright 1999-2014 Gentoo Foundation |
551 |
-# Distributed under the terms of the GNU General Public License v2 |
552 |
- |
553 |
-EAPI=5 |
554 |
- |
555 |
-JAVA_PKG_IUSE="doc source test" |
556 |
- |
557 |
-inherit java-pkg-2 java-ant-2 |
558 |
- |
559 |
-DESCRIPTION="Java library for FITS input/output" |
560 |
-HOMEPAGE="http://fits.gsfc.nasa.gov/fits_libraries.html#java_tam" |
561 |
-SRC_URI="http://heasarc.gsfc.nasa.gov/docs/heasarc/${PN}/java/v1.0/v${PV}/${PN}_src.jar -> ${P}-src.jar" |
562 |
- |
563 |
-LICENSE="public-domain" |
564 |
-SLOT="0" |
565 |
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
566 |
-IUSE="" |
567 |
- |
568 |
-CDEPEND="dev-java/junit:4" |
569 |
-RDEPEND="${CDEPEND} |
570 |
- >=virtual/jre-1.5" |
571 |
-DEPEND="${CDEPEND} |
572 |
- >=virtual/jdk-1.5 |
573 |
- test? ( dev-java/ant-junit4:0 )" |
574 |
- |
575 |
-EANT_EXTRA_ARGS="-Dpackage.version=${PV}" |
576 |
-JAVA_ANT_REWRITE_CLASSPATH="true" |
577 |
-EANT_GENTOO_CLASSPATH="junit-4" |
578 |
- |
579 |
-src_unpack() { |
580 |
- mkdir -p ${P}/src && cd ${P}/src || die |
581 |
- unpack ${A} |
582 |
-} |
583 |
- |
584 |
-java_prepare() { |
585 |
- cd "${S}" || die |
586 |
- cp "${FILESDIR}"/README.Gentoo "${FILESDIR}"/build.xml . || die |
587 |
- epatch \ |
588 |
- "${FILESDIR}"/01-Use-getResource-to-access-CompressTest-data-for-unit.patch \ |
589 |
- "${FILESDIR}"/02-Update-ArrayFuncsTest.java-to-JUnit-4.patch |
590 |
- |
591 |
- if ! use test; then |
592 |
- find "${S}" \( -name "*Test.java" -o -name "*Tester.java" \) -print -delete || die |
593 |
- fi |
594 |
- |
595 |
- # from http://heasarc.gsfc.nasa.gov/docs/heasarc/fits/java/v1.0/NOTE.v111.0: |
596 |
- # The source code JAR (fits_src.jar) includes a number of new classes for |
597 |
- # which the corresponding class files are not included in fits.jar. These |
598 |
- # classes are pre-alpha versions of support for tile compressed data that |
599 |
- # is being developed. Interested Users may take a look at these, but they |
600 |
- # definitely are not expected to work today. |
601 |
- rm src/nom/tam/image/comp/Quantizer.java \ |
602 |
- src/nom/tam/image/comp/RealStats.java \ |
603 |
- src/nom/tam/image/comp/TiledImageHDU.java \ |
604 |
- src/nom/tam/image/QuantizeRandoms.java \ |
605 |
- src/nom/tam/image/TileDescriptor.java \ |
606 |
- src/nom/tam/image/TileLooper.java || die |
607 |
-} |
608 |
- |
609 |
-src_test() { |
610 |
- ANT_TASKS="ant-junit4" java-pkg-2_src_test |
611 |
-} |
612 |
- |
613 |
-src_install() { |
614 |
- java-pkg_dojar build/${PN}.jar |
615 |
- use doc && java-pkg_dojavadoc doc/api |
616 |
- use source && java-pkg_dosrc src/* |
617 |
-} |
618 |
|
619 |
diff --git a/dev-java/fits/fits-1.15.1.ebuild b/dev-java/fits/fits-1.15.1.ebuild |
620 |
new file mode 100644 |
621 |
index 000000000..59a0801df |
622 |
--- /dev/null |
623 |
+++ b/dev-java/fits/fits-1.15.1.ebuild |
624 |
@@ -0,0 +1,27 @@ |
625 |
+# Copyright 1999-2020 Gentoo Authors |
626 |
+# Distributed under the terms of the GNU General Public License v2 |
627 |
+ |
628 |
+EAPI=7 |
629 |
+ |
630 |
+inherit java-utils-2 |
631 |
+ |
632 |
+DESCRIPTION="Java library for FITS input/output" |
633 |
+HOMEPAGE="http://fits.gsfc.nasa.gov/fits_libraries.html#java_tam" |
634 |
+SRC_URI="http://heasarc.gsfc.nasa.gov/docs/heasarc/${PN}/java/v1.0/v${PV}/${PN}.jar -> ${P}.jar" |
635 |
+ |
636 |
+LICENSE="public-domain" |
637 |
+SLOT="0" |
638 |
+KEYWORDS="~amd64 ~x86" |
639 |
+ |
640 |
+RDEPEND=">=virtual/jre-1.5" |
641 |
+ |
642 |
+S="${WORKDIR}" |
643 |
+ |
644 |
+src_unpack() { |
645 |
+ # nothing to do here |
646 |
+ return |
647 |
+} |
648 |
+ |
649 |
+src_install() { |
650 |
+ java-pkg_newjar "${DISTDIR}/${P}.jar" "${PN}.jar" |
651 |
+} |