From 4206fbbf36ca75b2b096df9d35f99fccaab77243 Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Thu, 21 Jun 2012 23:02:36 -0400 Subject: [PATCH] Remove dev-java MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The hdfview changes were accepted upstream in the science overlay: commit 709daeff6aa4a3691d83f26a2fb837748cb21478 Author: Sébastien Fabbro Date: Mon May 14 23:26:29 2012 +0100 dev-java/hdf-java: Version bump. Added use flag hdfview. Adapted from the wtk overlay (Portage version: 2.1.10.56/git/Linux x86_64, unsigned Manifest commit) At the same time Sébastien pulled in the other dependencies. I hope I never have to package any Java for Gentoo again ;). --- dev-java/fits/ChangeLog | 12 - dev-java/fits/Manifest | 8 - ...to-access-CompressTest-data-for-unit.patch | 137 ----------- ...pdate-ArrayFuncsTest.java-to-JUnit-4.patch | 223 ------------------ dev-java/fits/files/README.Gentoo | 44 ---- dev-java/fits/files/build.xml | 84 ------- dev-java/fits/fits-1.06.0.ebuild | 58 ----- dev-java/fits/metadata.xml | 9 - 8 files changed, 575 deletions(-) delete mode 100644 dev-java/fits/ChangeLog delete mode 100644 dev-java/fits/Manifest delete mode 100644 dev-java/fits/files/01-Use-getResource-to-access-CompressTest-data-for-unit.patch delete mode 100644 dev-java/fits/files/02-Update-ArrayFuncsTest.java-to-JUnit-4.patch delete mode 100644 dev-java/fits/files/README.Gentoo delete mode 100644 dev-java/fits/files/build.xml delete mode 100644 dev-java/fits/fits-1.06.0.ebuild delete mode 100644 dev-java/fits/metadata.xml diff --git a/dev-java/fits/ChangeLog b/dev-java/fits/ChangeLog deleted file mode 100644 index 496b48e..0000000 --- a/dev-java/fits/ChangeLog +++ /dev/null @@ -1,12 +0,0 @@ -# ChangeLog for dev-java/fits -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: $ - -*fits-1.06.0 (06 Oct 2011) - - 06 Oct 2011; W. Trevor King +fits-1.06.0.ebuild, - +files/build.xml, +files/README.Gentoo, - +files/01-Use-getResource-to-access-CompressTest-data-for-unit.patch, - +files/02-Update-ArrayFuncsTest.java-to-JUnit-4.patch, - +metadata.xml: - Initial ebuild. diff --git a/dev-java/fits/Manifest b/dev-java/fits/Manifest deleted file mode 100644 index 137c3a4..0000000 --- a/dev-java/fits/Manifest +++ /dev/null @@ -1,8 +0,0 @@ -AUX 01-Use-getResource-to-access-CompressTest-data-for-unit.patch 4661 RMD160 aaa090107ab67588ad0e13de7c43c2a4588441b4 SHA1 48b310f6e10c1e091b02ef94026f0bf4e31a75b5 SHA256 eb121342dfba55ec3bb7988c0b91074b581e89be87262aee3ced25ffd3d97cff -AUX 02-Update-ArrayFuncsTest.java-to-JUnit-4.patch 7206 RMD160 96a7f0b30a8f215e5895d9c4c6f7c6ed9ad61602 SHA1 5edfe76d0abb7f91335a953239ad4016c21a1f84 SHA256 3d62e65233b4893b96e806afb6a9141402ffacbd134c9766e80c8a3f5e66d6d3 -AUX README.Gentoo 1872 RMD160 d1dd74e452a146eda2a7cbd2a77ebb56a553306e SHA1 a808f13153d79e45312981bdd1b70db9831cfecf SHA256 eff5ce2b235af399f751566aa395ca7b803b7314e3adb652f7ae395653ac8628 -AUX build.xml 3002 RMD160 ff42a54d09cbe083f0b4c13a334831daee87f439 SHA1 f6a6c3842255e3f1c372e42b2b669855028fc2c6 SHA256 a8a7fcee54ea0f2ac49f3c3503b310711b811afbb639e8f96c9a0b5010b06ada -DIST fits-1.06.0-src.jar 174797 RMD160 af8bfea7039bc5ab9b3ad32be6d67f9145066005 SHA1 763c81042b8586ddba96e44a94fbd0d9e68217e4 SHA256 924c39f98114720917f2914e886d9f87050632a48769c289b0dffbbb646b7fcf -EBUILD fits-1.06.0.ebuild 1392 RMD160 82941a2f83bbbc9afc300631db2151beafc29144 SHA1 c185d4a3ba44e19423fdbafb60c96bd14c3ae267 SHA256 801f403c0b72b027838f6d140d72cde9a8dd8d62225dd403636ba8e805caa01e -MISC ChangeLog 418 RMD160 97fe025c39bcfc9da3c7a4697fc241ffa2135fc8 SHA1 12b1fa785671ced034b7107bc61da6861f665e4f SHA256 0246d12afba4f365370399c6d360fa1344a73dd20c1ef03dbf15395b32a053a6 -MISC metadata.xml 247 RMD160 6735f3a5dd2d7a2b70589d1693f35d54291b7147 SHA1 c015969fe50967340dd050a44cb9f8a30b5e34a5 SHA256 9e65060e5f9d0a50d28c7a69d9c27fed6c3037fdd3e420cc276627fde2794f72 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 deleted file mode 100644 index 389c233..0000000 --- a/dev-java/fits/files/01-Use-getResource-to-access-CompressTest-data-for-unit.patch +++ /dev/null @@ -1,137 +0,0 @@ -diff --git a/src/nom/tam/fits/test/CompressTest.java b/src/nom/tam/fits/test/CompressTest.java -index dd3aad0..c6d953e 100644 ---- a/src/nom/tam/fits/test/CompressTest.java -+++ b/src/nom/tam/fits/test/CompressTest.java -@@ -54,58 +54,57 @@ public class CompressTest { - - @Test - public void testStream() throws Exception { -- InputStream is; -+ String is; - -- is = new FileInputStream("test.fits"); -+ is = "test.fits"; - assertEquals("Stream1", 300, streamRead(is, false, false)); - -- is = new FileInputStream("test.fits.Z"); -+ is = "test.fits.Z"; - assertEquals("Stream2", 300, streamRead(is, false, false)); - -- is = new FileInputStream("test.fits.gz"); -+ is = "test.fits.gz"; - assertEquals("Stream3", 300, streamRead(is, false, false)); - -- is = new FileInputStream("test.fits"); -+ is = "test.fits"; - assertEquals("Stream4", 300, streamRead(is, false, true)); - -- is = new FileInputStream("test.fits.Z"); -+ is = "test.fits.Z"; - assertEquals("Stream5", 300, streamRead(is, false, true)); - -- is = new FileInputStream("test.fits.gz"); -+ is = "test.fits.gz"; - assertEquals("Stream6", 300, streamRead(is, false, true)); - -- -- is = new FileInputStream("test.fits.Z"); -+ is = "test.fits.Z"; - assertEquals("Stream7", 300, streamRead(is, true, true)); - -- is = new FileInputStream("test.fits.gz"); -+ is = "test.fits.gz"; - assertEquals("Stream8", 300, streamRead(is, true, true)); - -- is = new FileInputStream("test.fits.bz2"); -+ is = "test.fits.bz2"; - assertEquals("Stream9", 300, streamRead(is, true, true)); - } - - @Test - public void testFile() throws Exception { -- File is = new File("test.fits"); -+ String is = "test.fits"; - assertEquals("File1", 300, fileRead(is, false, false)); - -- is = new File("test.fits.Z"); -+ is = "test.fits.Z"; - assertEquals("File2", 300, fileRead(is, false, false)); - -- is = new File("test.fits.gz"); -+ is = "test.fits.gz"; - assertEquals("File3", 300, fileRead(is, false, false)); - -- is = new File("test.fits"); -+ is = "test.fits"; - assertEquals("File4", 300, fileRead(is, false, true)); - -- is = new File("test.fits.Z"); -+ is = "test.fits.Z"; - assertEquals("File7", 300, fileRead(is, true, true)); - -- is = new File("test.fits.gz"); -+ is = "test.fits.gz"; - assertEquals("File8", 300, fileRead(is, true, true)); - -- is = new File("test.fits.bz2"); -+ is = "test.fits.bz2"; - assertEquals("File9", 300, fileRead(is, true, true)); - } - -@@ -131,7 +130,6 @@ public class CompressTest { - - is = "test.fits.bz2"; - assertEquals("String8", 300, stringRead(is, true, true)); -- - } - - @Test -@@ -158,13 +156,9 @@ public class CompressTest { - assertEquals("String8", 300, urlRead(is, true, true)); - } - -- int urlRead(String is, boolean comp, boolean useComp) -+ int urlRead(String filename, boolean comp, boolean useComp) - throws Exception { -- File fil = new File(is); -- -- String path = fil.getCanonicalPath(); -- URL u = new URL("file://" + path); -- -+ URL u = CompressTest.class.getResource(filename); - Fits f; - if (useComp) { - f = new Fits(u, comp); -@@ -176,8 +170,9 @@ public class CompressTest { - return total(data); - } - -- int streamRead(InputStream is, boolean comp, boolean useComp) -+ int streamRead(String filename, boolean comp, boolean useComp) - throws Exception { -+ InputStream is = CompressTest.class.getResourceAsStream(filename); - Fits f; - if (useComp) { - f = new Fits(is, comp); -@@ -190,8 +185,9 @@ public class CompressTest { - return total(data); - } - -- int fileRead(File is, boolean comp, boolean useComp) -+ int fileRead(String filename, boolean comp, boolean useComp) - throws Exception { -+ File is = new File(CompressTest.class.getResource(filename).getPath()); - Fits f; - if (useComp) { - f = new Fits(is, comp); -@@ -203,8 +199,9 @@ public class CompressTest { - return total(data); - } - -- int stringRead(String is, boolean comp, boolean useComp) -+ int stringRead(String filename, boolean comp, boolean useComp) - throws Exception { -+ String is = CompressTest.class.getResource(filename).getPath(); - Fits f; - if (useComp) { - f = new Fits(is, comp); 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 deleted file mode 100644 index c9cd02d..0000000 --- a/dev-java/fits/files/02-Update-ArrayFuncsTest.java-to-JUnit-4.patch +++ /dev/null @@ -1,223 +0,0 @@ -From b9edd6a86e66d354b0c1d010125246d8359cbb37 Mon Sep 17 00:00:00 2001 -From: W. Trevor King -Date: Fri, 7 Oct 2011 03:44:18 -0400 -Subject: [PATCH 7/8] Update ArrayFuncsTest.java to JUnit-4. - ---- - src/nom/tam/util/test/ArrayFuncsTest.java | 44 +++++++++++++++++++--------- - 1 files changed, 30 insertions(+), 14 deletions(-) - -diff --git a/src/nom/tam/util/test/ArrayFuncsTest.java b/src/nom/tam/util/test/ArrayFuncsTest.java -index df5efb0..7ad8e51 100644 ---- a/src/nom/tam/util/test/ArrayFuncsTest.java -+++ b/src/nom/tam/util/test/ArrayFuncsTest.java -@@ -6,6 +6,12 @@ - */ - package nom.tam.util.test; - -+import org.junit.Test; -+import static org.junit.Assert.assertEquals; -+import static org.junit.Assert.assertTrue; -+import static org.junit.Assert.assertFalse; -+import static org.junit.Assert.assertSame; -+import static org.junit.Assert.assertNotSame; - import junit.framework.*; - import java.lang.reflect.*; - import java.util.Arrays; -@@ -15,21 +21,12 @@ import nom.tam.util.ArrayFuncs; - * - * @author Thomas McGlynn - */ --public class ArrayFuncsTest extends TestCase { -- -- public ArrayFuncsTest(String testName) { -- super(testName); -- } -- -- protected void setUp() throws Exception { -- } -- -- protected void tearDown() throws Exception { -- } -+public class ArrayFuncsTest { - - /** - * Test of computeSize method, of class nom.tam.util.ArrayFuncs. - */ -+ @Test - public void testComputeSize() { - System.out.println("computeSize"); - -@@ -58,6 +55,7 @@ public class ArrayFuncsTest extends TestCase { - /** - * Test of nElements method, of class nom.tam.util.ArrayFuncs. - */ -+ @Test - public void testNElements() { - System.out.println("nElements"); - -@@ -72,6 +70,7 @@ public class ArrayFuncsTest extends TestCase { - /** - * Test of deepClone method, of class nom.tam.util.ArrayFuncs. - */ -+ @Test - public void testDeepClone() { - int[][] test = {{0, 1}, {2, 3}, {4, 5}}; - int[][] result = (int[][]) nom.tam.util.ArrayFuncs.deepClone(test); -@@ -96,6 +95,7 @@ public class ArrayFuncsTest extends TestCase { - } - - public boolean equals(Object x) { -+ System.out.println("checking equality"); - return (x instanceof CloneTest) - && (((CloneTest) x).value == this.value); - } -@@ -104,6 +104,7 @@ public class ArrayFuncsTest extends TestCase { - /** - * Test of genericClone method, of class nom.tam.util.ArrayFuncs. - */ -+ @Test - public void testGenericClone() { - System.out.println("genericClone"); - -@@ -126,6 +127,7 @@ public class ArrayFuncsTest extends TestCase { - /** - * Test of copyArray method, of class nom.tam.util.ArrayFuncs. - */ -+ @Test - public void testCopyArray() { - System.out.println("copyArray"); - -@@ -138,6 +140,7 @@ public class ArrayFuncsTest extends TestCase { - /** - * Test of getDimensions method, of class nom.tam.util.ArrayFuncs. - */ -+ @Test - public void testGetDimensions() { - System.out.println("getDimensions"); - -@@ -157,6 +160,7 @@ public class ArrayFuncsTest extends TestCase { - /** - * Test of getBaseArray method, of class nom.tam.util.ArrayFuncs. - */ -+ @Test - public void testGetBaseArray() { - - int[][][] test = new int[2][3][4]; -@@ -169,6 +173,7 @@ public class ArrayFuncsTest extends TestCase { - /** - * Test of getBaseClass method, of class nom.tam.util.ArrayFuncs. - */ -+ @Test - public void testGetBaseClass() { - System.out.println("getBaseClass"); - -@@ -179,6 +184,7 @@ public class ArrayFuncsTest extends TestCase { - /** - * Test of getBaseLength method, of class nom.tam.util.ArrayFuncs. - */ -+ @Test - public void testGetBaseLength() { - - assertEquals(ArrayFuncs.getBaseLength(new int[2][3]), 4); -@@ -195,6 +201,7 @@ public class ArrayFuncsTest extends TestCase { - /** - * Test of generateArray method, of class nom.tam.util.ArrayFuncs. - */ -+ @Test - public void testGenerateArray() { - System.out.println("generateArray"); - -@@ -213,6 +220,7 @@ public class ArrayFuncsTest extends TestCase { - /** - * Test of testPattern method, of class nom.tam.util.ArrayFuncs. - */ -+ @Test - public void testTestPattern() { - System.out.println("testPattern"); - -@@ -229,6 +237,7 @@ public class ArrayFuncsTest extends TestCase { - /** - * Test of flatten method, of class nom.tam.util.ArrayFuncs. - */ -+ @Test - public void testFlatten() { - System.out.println("flatten"); - -@@ -241,6 +250,7 @@ public class ArrayFuncsTest extends TestCase { - /** - * Test of curl method, of class nom.tam.util.ArrayFuncs. - */ -+ @Test - public void testCurl() { - System.out.println("curl"); - -@@ -259,6 +269,7 @@ public class ArrayFuncsTest extends TestCase { - /** - * Test of mimicArray method, of class nom.tam.util.ArrayFuncs. - */ -+ @Test - public void testMimicArray() { - System.out.println("mimicArray"); - -@@ -273,6 +284,7 @@ public class ArrayFuncsTest extends TestCase { - /** - * Test of convertArray method, of class nom.tam.util.ArrayFuncs. - */ -+ @Test - public void testConvertArray() { - System.out.println("convertArray"); - -@@ -286,7 +298,7 @@ public class ArrayFuncsTest extends TestCase { - - newType = int.class; - int[][] ires = (int[][]) ArrayFuncs.convertArray(array, newType, true); -- assertEquals(array, ires); -+ assertSame(array, ires); - - ires = (int[][]) ArrayFuncs.convertArray(array, newType, false); - assertNotSame(array, ires); -@@ -296,6 +308,7 @@ public class ArrayFuncsTest extends TestCase { - /** - * Test of copyInto method, of class nom.tam.util.ArrayFuncs. - */ -+ @Test - public void testCopyInto() { - System.out.println("copyInto"); - -@@ -304,13 +317,14 @@ public class ArrayFuncsTest extends TestCase { - - ArrayFuncs.copyInto(x, y); - -- assertEquals((double) x[0][0], y[0][0]); -- assertEquals((double) x[1][2], y[1][2]); -+ assertEquals((double) x[0][0], y[0][0], 0.01); -+ assertEquals((double) x[1][2], y[1][2], 0.01); - } - - /** - * Test of arrayEquals method, of class nom.tam.util.ArrayFuncs. - */ -+ @Test - public void testArrayEquals() { - System.out.println("arrayEquals"); - -@@ -331,6 +345,7 @@ public class ArrayFuncsTest extends TestCase { - /** - * Test of doubleArrayEquals method, of class nom.tam.util.ArrayFuncs. - */ -+ @Test - public void testDoubleArrayEquals() { - - double x[] = {1, 2, 3}; -@@ -349,6 +364,7 @@ public class ArrayFuncsTest extends TestCase { - /** - * Test of floatArrayEquals method, of class nom.tam.util.ArrayFuncs. - */ -+ @Test - public void testFloatArrayEquals() { - float x[] = {1f, 2f, 3f}; - float y[] = {1f, 2f, 3f}; --- -1.7.3.1.104.gc752e - diff --git a/dev-java/fits/files/README.Gentoo b/dev-java/fits/files/README.Gentoo deleted file mode 100644 index 62c238c..0000000 --- a/dev-java/fits/files/README.Gentoo +++ /dev/null @@ -1,44 +0,0 @@ -I have been unable to track down a source repository for fits, so this -ebuild straps a build system onto source unpacked from a source JAR. -Not the greatest solution, but it's the best I can come up with. I've -also had trouble figuring out who holds copyright and what the -licensing terms are. If you find more authoritative information, let -me know! - -Authors (listed with the first release note to mention them): - Tom McGlynn [1,12] - Jens Knudstrup [2] - Alan Brighton [2] - R.J. Mathar [3] - Jorgo Bakker [3] - Laurent Michel [3] - R. Mathar [4] - Guillame Belanger [4] - A. Kovacs [5] - Javier Diaz [6] - Juan Carlos Segovia [7] - Thomas Granzer [7] - L. Michel [8] - Mark Taylor [9] - Laurent Bourges [10] - V. Forchi [11] - -From [11]: - -> [The] build procedure for FITS library has been changed. The library -> is now stored as a NetBeans project and the standard NetBeans build -> script has been modified to generate the fits.jar and fits_src.jar. - - -[1]: http://heasarc.gsfc.nasa.gov/docs/heasarc/fits/java/v0.9/NOTES/NOTE.v091 -[2]: http://heasarc.gsfc.nasa.gov/docs/heasarc/fits/java/v0.9/NOTES/NOTE.v093 -[3]: http://heasarc.gsfc.nasa.gov/docs/heasarc/fits/java/v0.9/NOTES/NOTE.v099 -[4]: http://heasarc.gsfc.nasa.gov/docs/heasarc/fits/java/v0.9/NOTES/NOTE.v099.1 -[5]: http://heasarc.gsfc.nasa.gov/docs/heasarc/fits/java/v0.9/NOTES/NOTE.v099.5 -[6]: http://heasarc.gsfc.nasa.gov/docs/heasarc/fits/java/v1.0/NOTE.v100.1 -[7]: http://heasarc.gsfc.nasa.gov/docs/heasarc/fits/java/v1.0/NOTE.v101.0 -[8]: http://heasarc.gsfc.nasa.gov/docs/heasarc/fits/java/v1.0/NOTE.v102.0 -[9]: http://heasarc.gsfc.nasa.gov/docs/heasarc/fits/java/v1.0/NOTE.v104.0 -[10]: http://heasarc.gsfc.nasa.gov/docs/heasarc/fits/java/v1.0/NOTE.v105.0 -[11]: http://heasarc.gsfc.nasa.gov/docs/heasarc/fits/java/v1.0/NOTE.v105.1 -[12]: http://asd.gsfc.nasa.gov/Thomas.McGlynn/ diff --git a/dev-java/fits/files/build.xml b/dev-java/fits/files/build.xml deleted file mode 100644 index d8aa41b..0000000 --- a/dev-java/fits/files/build.xml +++ /dev/null @@ -1,84 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/dev-java/fits/fits-1.06.0.ebuild b/dev-java/fits/fits-1.06.0.ebuild deleted file mode 100644 index b61f089..0000000 --- a/dev-java/fits/fits-1.06.0.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=4 -JAVA_PKG_IUSE="doc source test" -inherit eutils java-pkg-2 java-ant-2 - -DESCRIPTION="Java library for FITS (image format) input/output" -HOMEPAGE="http://fits.gsfc.nasa.gov/fits_libraries.html#java_tam" -SRC_URI="http://heasarc.gsfc.nasa.gov/docs/heasarc/${PN}/java/v1.0/v${PV}/fits_src.jar -> ${P}-src.jar" - -LICENSE="public-domain" -SLOT="0" -KEYWORDS="~x86" -IUSE="" - -COMMON_DEP="dev-java/junit:4" - -RDEPEND=">=virtual/jre-1.5 - ${COMMON_DEP}" - -DEPEND=">=virtual/jdk-1.5 - test? ( - dev-java/ant-junit4 - dev-java/hamcrest-core - ) - ${COMMON_DEP}" - -EANT_EXTRA_ARGS="-Dpacakge.version=${PV}" -EANT_GENTOO_CLASSPATH="junit-4" -JAVA_ANT_REWRITE_CLASSPATH="true" - -src_unpack() { - mkdir -p "${P}/src" - cd "${P}/src" - unpack "${A}" -} - -java_prepare() { - cd "${WORKDIR}/${P}" || die - cp "${FILESDIR}"/README.Gentoo . || die - cp "${FILESDIR}"/build.xml . || die - epatch "${FILESDIR}"/01-Use-getResource-to-access-CompressTest-data-for-unit.patch - epatch "${FILESDIR}"/02-Update-ArrayFuncsTest.java-to-JUnit-4.patch - #rm -rf lib -} - -src_test() { - ANT_TASKS="ant-junit4" eant test || die -} - -src_install() { - java-pkg_newjar "build/${PN}.jar" "${PN}.jar" - use doc && java-pkg_dojavadoc doc/api - use source && java-pkg_dosrc src/* - #use examples && java-pkg_doexamples src/java/examples -} diff --git a/dev-java/fits/metadata.xml b/dev-java/fits/metadata.xml deleted file mode 100644 index d124928..0000000 --- a/dev-java/fits/metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - wking@drexel.edu - W. Trevor King - - -- 2.26.2