From: W. Trevor King Date: Fri, 22 Jun 2012 03:02:36 +0000 (-0400) Subject: Remove dev-java X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5199af4f19886b8df37ebdfc3db1459545b49a55;p=wtk-overlay.git Remove dev-java 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 ;). --- 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 - - diff --git a/dev-java/hdf-java/ChangeLog b/dev-java/hdf-java/ChangeLog deleted file mode 100644 index 9ac0978..0000000 --- a/dev-java/hdf-java/ChangeLog +++ /dev/null @@ -1,34 +0,0 @@ -# ChangeLog for dev-java/hdf-java -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: $ - -*hdf-java-2.7 (07 Jun 2011) - - 07 Jun 2011; Kacper Kowalik -hdf-java-2.6.1.ebuild, - -files/hdf-java-2.6.1-shared.patch, +hdf-java-2.7.ebuild, - +files/hdf-java-2.7-shared.patch: - Version bump wrt #301049 by Guillaume Horel - - 14 Mar 2011; Justin Lecher hdf-java-2.6.1.ebuild: - Moved media-libs/jpeg -> virtual/jpeg - -*hdf-java-2.6.1 (24 Mar 2010) - - 24 Mar 2010; Sébastien Fabbro -hdf-java-2.6.ebuild, - +hdf-java-2.6.1.ebuild, +files/hdf-java-2.6.1-shared.patch, - -files/hdf-java-2.6-shared.patch: - Version bump - - 12 Feb 2010; Sébastien Fabbro hdf-java-2.6.ebuild: - Removed mpi use flag in favor of checking if hdf5 was built with mpi, see - bug #302621 - - 04 Feb 2010; Sébastien Fabbro hdf-java-2.6.ebuild: - Added mpi support - -*hdf-java-2.6 (22 Jan 2010) - - 22 Jan 2010; Sébastien Fabbro +hdf-java-2.6.ebuild, - +files/hdf-java-2.6-shared.patch, +metadata.xml: - Initial import. Ebuild initially submitted by Guillaume Horel, bug #301049 - diff --git a/dev-java/hdf-java/Manifest b/dev-java/hdf-java/Manifest deleted file mode 100644 index 72fb875..0000000 --- a/dev-java/hdf-java/Manifest +++ /dev/null @@ -1,6 +0,0 @@ -AUX 2.7-hdfview.sh 234 RMD160 f6640b9a799b257c71602450bb242a3a2465e93e SHA1 9eb3103dc3cbe9e371e277fedf3a22edaf1f3e8c SHA256 8ac80c7a060230f731e87602dbadb3429b11391ae9b19e36cca926d023c89f65 -AUX 2.7-shared.patch 3399 RMD160 ef3f3ed007d981bc9b364984f6b7b0acb245fcc9 SHA1 69ae21acaa761d884a947a139a3c6548f846ae21 SHA256 a7ab3aac334602eb18cb2d5f21d020727d4ba5452ce121e8c1bac550c816ce3b -DIST hdf-java-2.7-src.tar 13209600 RMD160 1f0957d6f9e57a6e2e237fab68753d214d60e177 SHA1 d85fc993b8631b1b8da80e3f217e2baa58e78add SHA256 091c999cf53266ba113bef45a83912b12444624cfe0253d5eb565b95e0832706 -EBUILD hdf-java-2.7-r1.ebuild 2787 RMD160 b73d1931464c8ba754d0c4c50cacf714b56c1a41 SHA1 254d67d286b0c644e9f1ed1a5a1f28f263a26119 SHA256 daa79183c59d16d9d2fb3590ec846f3f3a9935bdd71cf65c4152dbacb9b804e1 -MISC ChangeLog 1228 RMD160 6de27fb7bf57b95c298422c9cb0e707d4d81cadf SHA1 579a25bba7cf2dc73c0009cbd76b372d1fb1d753 SHA256 e40f7488a5738e794d7499ca04533d61c2f83a43a10d50ca59064d55b886830e -MISC metadata.xml 695 RMD160 ba84297087b26c64b36a4a5c269187ddbfe0563f SHA1 bc11c02484fab4059dd22881d4714d7b77caed37 SHA256 97a459b5696f58666686ad9722dd445459352350eef1d568097ac420de4a4954 diff --git a/dev-java/hdf-java/files/2.7-hdfview.sh b/dev-java/hdf-java/files/2.7-hdfview.sh deleted file mode 100755 index 8f72174..0000000 --- a/dev-java/hdf-java/files/2.7-hdfview.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -JAVA=$(java-config --java) -LIBRARY=$(java-config --library hdf-java) -HDFJAVA=/ -export CLASSPATH=$(java-config --classpath hdf-java) -"$JAVA" -Xmx1000m "-Djava.library.path=$LIBRARY" ncsa.hdf.view.HDFView -root "$HDFJAVA" $* diff --git a/dev-java/hdf-java/files/2.7-shared.patch b/dev-java/hdf-java/files/2.7-shared.patch deleted file mode 100644 index 3b863a2..0000000 --- a/dev-java/hdf-java/files/2.7-shared.patch +++ /dev/null @@ -1,112 +0,0 @@ -Respect LDFLAGS, properly use shared libraries - -http://bugs.gentoo.org/show_bug.cgi?id=301049 - -Patch written by Guillaume Horel ---- a/configure.in -+++ b/configure.in -@@ -177,7 +177,7 @@ - *) - if test -n "$withval" ; then - z_lib="`echo $withval |cut -f2 -d, -s`" -- ZLIB=$z_lib"/libz."$LLEXT -+ ZLIB="-L$z_lib -lz" - HAVE_ZLIB="yes" - else - ZLIB="" -@@ -211,7 +211,7 @@ - *) - if test -n "$withval" ; then - jpeg_lib="`echo $withval |cut -f2 -d, -s`" -- JPEGLIB=$jpeg_lib"/libjpeg."$LLEXT -+ JPEGLIB="-L$jpeg_lib -ljpeg" - dnl AC_MSG_RESULT([jpeg found: $JPEGLIB]); - HAVE_JPEG="yes" - else -@@ -246,7 +246,7 @@ - *) - if test -n "$withval" ; then - sz_lib="`echo $withval |cut -f2 -d, -s`" -- SZLIB=$sz_lib"/libsz."$LLEXT -+ SZLIB="-L$sz_lib -lsz" - dnl AC_MSG_RESULT([szlib found: $SZLIB]); - HAVE_SZIP="yes" - else -@@ -302,7 +302,7 @@ - ;; - esac - if test -n "$HDF4LIB"; then -- LIBS="$HDF4LIB/libdf.$LLEXT $HDF4LIB/libmfhdf.$LLEXT $LIBS" -+ LIBS="-L$HDF4LIB -ldf -lmhdf $LIBS" - HAVE_HDF4="yes" - fi - AC_MSG_RESULT([$HAVE_HDF4]) -@@ -363,7 +363,7 @@ - *) - if test -n "$withval" ; then - hdf5_lib="`echo $withval |cut -f2 -d, -s`" -- HDF5LIB=$hdf5_lib"/libhdf.$LLEXT" -+ HDF5LIB="-L$hdf5_lib -lhdf" - hdf5_inc="`echo $withval |cut -f1 -d,`" - if test -n "$hdf5_inc"; then - HDF5INC="$hdf5_inc" -@@ -380,7 +380,7 @@ - ;; - esac - if test -n "$HDF5LIB"; then -- LIBS="$HDF5LIB/libhdf5.$LLEXT $LIBS" -+ LIBS="-L$HDF5LIB -lhdf5 $LIBS" - HAVE_HDF5="yes" - fi - AC_MSG_RESULT([$HAVE_HDF5]) -@@ -628,10 +628,6 @@ - if test \( ! -d "$JH45INST" \); then - JH45INST_FOUND=0 - fi -- if test \( ! -w "$JH45INST" \); then -- AC_MSG_ERROR( [ $JAVINST : not writable ]) -- JH45INST_FOUND=0 -- fi - fi - until test $JH45INST_FOUND -eq 1; do - echo "Please type the directory in which to install the JH45" ---- a/native/hdf5lib/Makefile.in -+++ b/native/hdf5lib/Makefile.in -@@ -35,7 +35,7 @@ - - CFLAGS = -D_FILE_OFFSET_BITS=64 $(DEFS) -I. -I$(HDF5INC) -I$(JAVAINC1) -I$(JAVAINC2) - --LIBS = $(HDF5LIB)/libhdf5.$(LLEXT) $(ZLIB) $(SZLIB) -lm -+LIBS = -L$(HDF5LIB) -lhdf5 $(ZLIB) $(SZLIB) -lm - - # Macro def: object filename used - OBJECTS = exceptionImp.o h5Constants.o h5Imp.o h5aImp.o h5dImp.o h5eImp.o h5fImp.o h5gImp.o h5iImp.o h5lImp.o h5oImp.o h5pImp.o h5rImp.o h5sImp.o h5tImp.o nativeData.o h5util.o h5zImp.o -@@ -47,7 +47,7 @@ - - libjhdf5: $(OBJECTS) - -mkdir -p $(LIBDIR); -- $(LD) $(LDOPT) -o $(LIBDIR)/libjhdf5.$(JSLEXT) $(LDOPT2) $(OBJECTS) $(LIBS) -+ $(LD) $(LDOPT) $(LDFLAGS) -o $(LIBDIR)/libjhdf5.$(JSLEXT) $(LDOPT2) $(OBJECTS) $(LIBS) - - clean: - $(RM) -f *.o so_locations $(LIBDIR)/libjhdf5.$(JSLEXT) ---- a/native/hdflib/Makefile.in -+++ b/native/hdflib/Makefile.in -@@ -41,7 +41,7 @@ - CFLAGS = $(DEFS) -I. -I$(JAVAINC1) -I$(JAVAINC2) -I$(HDFINC) - - # Be sure to add -lbsd if compiling in a SYSV environment --LIBS = $(HDFLIB)/libmfhdf.$(LLEXT) $(HDFLIB)/libdf.$(LLEXT) $(SZLIB) $(ZLIB) $(JPEGLIB) -lm -+LIBS = -L$(HDFLIB) -lmfhdf -ldf $(SZLIB) $(ZLIB) $(JPEGLIB) -lm - - # Macro def: object filename used - OBJECTS = hdfstructsutil.o \ -@@ -60,7 +60,7 @@ - - libjhdf: $(OBJECTS) - -mkdir -p $(LIBDIR); -- $(LD) $(LDOPT) -o $(LIBDIR)/libjhdf.$(JSLEXT) $(LDOPT2) $(OBJECTS) $(LIBS) -+ $(LD) $(LDOPT) $(LDFLAGS) -o $(LIBDIR)/libjhdf.$(JSLEXT) $(LDOPT2) $(OBJECTS) $(LIBS) - - clean: - $(RM) -f *.o so_locations $(LIBDIR)/libjhdf.$(JSLEXT) diff --git a/dev-java/hdf-java/hdf-java-2.7-r1.ebuild b/dev-java/hdf-java/hdf-java-2.7-r1.ebuild deleted file mode 100644 index de721e4..0000000 --- a/dev-java/hdf-java/hdf-java-2.7-r1.ebuild +++ /dev/null @@ -1,114 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=2 -JAVA_PKG_IUSE="doc examples" -inherit eutils java-pkg-2 autotools - -# We may add a trailing "-rX" to ebuild versions to denote ebuild -# revisions. This addition, if present, needs to be stripped of to -# get the upstream version number. -#MY_PV="${PV%-r[0-9]}" # "2.7-r1" -> "2.7", "2.7" -> "2.7", "3-r1" -> "3" -#MY_P="${PN}-${MY_PV}" - -DESCRIPTION="Java interface to the HDF5 library" -HOMEPAGE="http://www.hdfgroup.org/hdf-java-html/index.html" -SRC_URI="http://www.hdfgroup.org/ftp/HDF5/hdf-java/src/${P}-src.tar" - -LICENSE="NCSA-HDF" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="hdf szip zlib test hdfview" - -CDEPEND=">=sci-libs/hdf5-1.8[szip?,zlib?] - dev-java/fits - >=dev-java/junit-4 - dev-java/netcdf - hdf? ( - sci-libs/hdf - virtual/jpeg - )" - -RDEPEND="${CDEPEND} - >=virtual/jre-1.5" - -DEPEND=">=virtual/jdk-1.5 - ${CDEPEND}" - -S=${WORKDIR}/${PN} - -src_prepare() { - epatch "${FILESDIR}/${PV}-shared.patch" - eautoreconf - rm lib/*.jar - java-pkg_jar-from --into lib fits fits.jar - java-pkg_jar-from --into lib netcdf netcdf.jar - java-pkg_jar-from --into lib junit-4 junit.jar - if use hdfview; then - cp "${FILESDIR}/${PV}-hdfview.sh" bin/hdfview - fi -} - -src_configure() { - local stdpath="/usr/include,/usr/$(get_libdir)" - local myconf="--with-hdf4=no --with-libjpeg=no" - use hdf && \ - myconf="--with-libjpeg=${stdpath} --with-hdf4=${stdpath}" - use zlib && myconf="${myconf} --with-libz="${stdpath}"" - use szip && myconf="${myconf} --with-libsz="${stdpath}"" - - econf \ - ${myconf} \ - --with-hdf5="${stdpath}" \ - --with-jdk="$(java-config -o)/include,$(java-config -o)/jre/lib" -} - -src_compile() { - # parallel needs work. anyone? - emake -j1 just-hdf5 || die - - if use hdf; then - sed -i "s/MAX_VAR_DIMS/H4_MAX_VAR_DIMS/" \ - native/hdflib/hdfstructsutil.c || die - sed -i "s/MAX_NC_NAME/H4_MAX_NC_NAME/" \ - native/hdflib/hdfvdataImp.c || die - sed -i "s/MAX_NC_NAME/H4_MAX_NC_NAME/" \ - native/hdflib/hdfsdsImp.c || die - emake -j1 just-hdf4|| die - fi - - if use examples; then - emake -j1 do-examples || die - fi - - if use doc; then - emake -j1 javadocs || die - fi - - if use hdfview; then - #emake -j1 ncsa.hdf.view || die - emake -j1 || die - fi -} - -src_install() { - java-pkg_dojar "lib/jhdf5.jar" - java-pkg_doso "lib/linux/libjhdf5.so" - - if use hdf; then - java-pkg_dojar "lib/jhdf.jar" - java-pkg_doso "lib/linux/libjhdf.so" - fi - use doc && java-pkg_dojavadoc "docs/javadocs" - use examples && java-pkg_doexamples "examples" - if use hdfview; then - dobin bin/hdfview - java-pkg_dojar lib/jhdf5.jar - java-pkg_dojar lib/jhdf5obj.jar - java-pkg_dojar lib/jhdfobj.jar - java-pkg_dojar lib/jhdfview.jar - java-pkg_dojar lib/ext/fitsobj.jar - java-pkg_dojar lib/ext/nc2obj.jar - fi -} diff --git a/dev-java/hdf-java/metadata.xml b/dev-java/hdf-java/metadata.xml deleted file mode 100644 index 3792527..0000000 --- a/dev-java/hdf-java/metadata.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - -sci - - HDF is a versatile data model that can represent very complex data - objects and a wide variety of metadata. It is a completely portable - file format with no limit on the number or size of data objects in - the collection. - 1;2202;0c This Java package implements HDF4/HDF5 data objects in an object-oriented - form. It provides a common Java API for accessing HDF files. - - - Add support for the Hierarchical Data Format v.4 - (sci-libs/hdf) - - diff --git a/dev-java/joda-convert/Manifest b/dev-java/joda-convert/Manifest deleted file mode 100644 index 066aec7..0000000 --- a/dev-java/joda-convert/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -AUX 1.1-build.xml 3819 RMD160 a6be19d47be61f5d2019cfb93d85318b56bcfc61 SHA1 d258b44e22445f77422567e660e04fc3f66f3426 SHA256 57571f3abdd51f9048acf47104a732aa4d6a3bbf7ae74221991dc5b64c335e59 -DIST joda-convert-1.1.tar.gz 24233 RMD160 f343caf5354f03c52e0e63d674db41af689a17ef SHA1 c0175fd89088e50a31e7ab46e6e36b45f9f81dde SHA256 dba2096aeffe59aa9268bddfb5102111f52f30b14a120118b5fd14f338af6657 -EBUILD joda-convert-1.1.ebuild 1402 RMD160 f1fe8912a13b5e6ecf87b0f9ebdb045559772fc7 SHA1 d6d02573474ab5e2744540698d53a5a07f69e124 SHA256 68daf2f92e236f62b99f93c4c51257eb6a7e8ee7a70901e9ed246b4b400af455 -EBUILD joda-convert-9999.ebuild 1402 RMD160 f1fe8912a13b5e6ecf87b0f9ebdb045559772fc7 SHA1 d6d02573474ab5e2744540698d53a5a07f69e124 SHA256 68daf2f92e236f62b99f93c4c51257eb6a7e8ee7a70901e9ed246b4b400af455 diff --git a/dev-java/joda-convert/files/1.1-build.xml b/dev-java/joda-convert/files/1.1-build.xml deleted file mode 100644 index 07fe6e0..0000000 --- a/dev-java/joda-convert/files/1.1-build.xml +++ /dev/null @@ -1,99 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/dev-java/joda-convert/joda-convert-1.1.ebuild b/dev-java/joda-convert/joda-convert-1.1.ebuild deleted file mode 120000 index 861c2b0..0000000 --- a/dev-java/joda-convert/joda-convert-1.1.ebuild +++ /dev/null @@ -1 +0,0 @@ -joda-convert-9999.ebuild \ No newline at end of file diff --git a/dev-java/joda-convert/joda-convert-9999.ebuild b/dev-java/joda-convert/joda-convert-9999.ebuild deleted file mode 100644 index 61fb4ef..0000000 --- a/dev-java/joda-convert/joda-convert-9999.ebuild +++ /dev/null @@ -1,66 +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 java-pkg-2 java-ant-2 - -if [[ "${PV}" == "9999" ]]; then - inherit git-2 - EGIT_REPO_URI="git://github.com/JodaOrg/${PN}.git" - SRC_URI="" - MY_P="${P}" -else - #MY_P="${P}-src" - #SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz" - #S="${WORKDIR}/${MY_P}" - SRC_URI="http://github.com/JodaOrg/${PN}/tarball/v${PV} -> ${P}.tar.gz" -fi - -DESCRIPTION="A Java library for Object <-> String conversion." -HOMEPAGE="http://${PN}.sourceforge.net/" -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~x86" -IUSE="" - -DEPEND=" - >=virtual/jdk-1.5 - test? ( - dev-java/ant-junit4 - dev-java/hamcrest-core - )" -RDEPEND=">=virtual/jre-1.5" - -JAVA_PKG_WANT_SOURCE="5" -EANT_EXTRA_ARGS="-Dpacakge.version=${PV}" -EANT_GENTOO_CLASSPATH="junit-4" -JAVA_ANT_REWRITE_CLASSPATH="true" - -src_unpack() { - # Work around GitHub's "${PN}-" directory name - if [[ "${PV}" == "9999" ]]; then - git-2_src_unpack - else - unpack "${A}" - mv *-"${PN}"-*/* "${S}" - fi -} - -src_prepare() { - cp "${FILESDIR}/1.1-build.xml" build.xml -} - -src_test() { - ANT_TASKS="ant-junit4" eant test -} - -src_install() { - java-pkg_newjar "build/${PN}.jar" "${PN}.jar" - - dodoc LICENSE.txt NOTICE.txt RELEASE-NOTES.txt || die - use doc && java-pkg_dojavadoc doc/api - use source && java-pkg_dosrc src/main/java/* -} diff --git a/dev-java/joda-time/Manifest b/dev-java/joda-time/Manifest deleted file mode 100644 index b4f2ac9..0000000 --- a/dev-java/joda-time/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST joda-time-2.0.tar.gz 888688 RMD160 c0a54698dbf505e3f11fba736da460d0f1b184e9 SHA1 ad3694b9797368f6aff3234bbfd0e7f69dcf9f71 SHA256 ae80c4cb3bcd86885739ec066ef16b0fe98668dceac61c5093bc5497fcfed1f0 -EBUILD joda-time-2.0.ebuild 1962 RMD160 13f2a1f4b9d80ad51e09ab62454b79fac789c89a SHA1 abfb87f5066e2e9937e932518c88f13125c506f3 SHA256 d2d4ba34f023c64c6db29f5a47fb1a0a5e83dc49b2bf3ae30356d778bc806c3e -EBUILD joda-time-9999.ebuild 1962 RMD160 13f2a1f4b9d80ad51e09ab62454b79fac789c89a SHA1 abfb87f5066e2e9937e932518c88f13125c506f3 SHA256 d2d4ba34f023c64c6db29f5a47fb1a0a5e83dc49b2bf3ae30356d778bc806c3e diff --git a/dev-java/joda-time/joda-time-2.0.ebuild b/dev-java/joda-time/joda-time-2.0.ebuild deleted file mode 120000 index 303da72..0000000 --- a/dev-java/joda-time/joda-time-2.0.ebuild +++ /dev/null @@ -1 +0,0 @@ -joda-time-9999.ebuild \ No newline at end of file diff --git a/dev-java/joda-time/joda-time-9999.ebuild b/dev-java/joda-time/joda-time-9999.ebuild deleted file mode 100644 index 4f84529..0000000 --- a/dev-java/joda-time/joda-time-9999.ebuild +++ /dev/null @@ -1,74 +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 examples source test" - -inherit java-pkg-2 java-ant-2 - -if [[ "${PV}" == "9999" ]]; then - inherit git-2 - EGIT_REPO_URI="git://github.com/JodaOrg/${PN}.git" - SRC_URI="" - MY_P="${P}" -else - #MY_P="${P}-src" - #SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz" - #S="${WORKDIR}/${MY_P}" - SRC_URI="http://github.com/JodaOrg/${PN}/tarball/v${PV} -> ${P}.tar.gz" -fi - -DESCRIPTION="A quality open-source replacement for the Java Date and Time classes." -HOMEPAGE="http://joda-time.sourceforge.net/" -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" -IUSE="" - -COMMON_DEP="dev-java/joda-convert" -DEPEND=" - >=virtual/jdk-1.5 - test? ( dev-java/ant-junit4 ) - ${COMMON_DEP}" -RDEPEND=" - >=virtual/jre-1.5 - ${COMMON_DEP}" - -JAVA_PKG_WANT_SOURCE="5" -# chokes on static inner class making instance of non-static inner class -EANT_FILTER_COMPILER="jikes" -# Keep ant from trying to use maven internally -EANT_EXTRA_ARGS="-Djunit.ant=1 -Djunit.present=1 -Djodaconvert.present=1" -EANT_GENTOO_CLASSPATH="joda-convert" -JAVA_ANT_REWRITE_CLASSPATH="true" - -src_unpack() { - # Work around GitHub's "${PN}-" directory name - if [[ "${PV}" == "9999" ]]; then - git-2_src_unpack - else - unpack "${A}" - mv *-"${PN}"-* "${S}" - fi -} - -src_test() { - ANT_TASKS="ant-junit" eant \ - -Djunit.jar="$(java-pkg_getjar junit-4 junit.jar)" \ - -Djodaconvert.jar="$(java-pkg_getjar joda-convert joda-convert.jar)" \ - test -} - -src_install() { - if [[ "${PV}" == "9999" ]]; then - java-pkg_newjar build/${PN}-*.jar ${PN}.jar - else - java-pkg_newjar build/${P}.jar ${PN}.jar - fi - - dodoc LICENSE.txt NOTICE.txt RELEASE-NOTES.txt ToDo.txt || die - use doc && java-pkg_dojavadoc build/docs - use examples && java-pkg_doexamples src/example - use source && java-pkg_dosrc src/java/org -} diff --git a/dev-java/netcdf/ChangeLog b/dev-java/netcdf/ChangeLog deleted file mode 100644 index 3168ce8..0000000 --- a/dev-java/netcdf/ChangeLog +++ /dev/null @@ -1,32 +0,0 @@ -# ChangeLog for dev-java/netcdf -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: $ - -*netcdf-9999 (27 Feb 2012) - 27 Feb 2012; W. Trevor King - netcdf-9999.ebuild, -netcdf-4.3.ebuild, -4.3-build.xml.patch: - Fix bug #405923, reported by Darek, about the build-xml patch no - longer applying to the source and the source zip no longer being - available. Darek suggests using `netcdfAll-${PV}.zip`, but that - contains pre-compiled jars, not the source code. - - I removed the 4.3 ebuild, because Unidata no longer distributes the - source code bundles: - http://www.unidata.ucar.edu/software/netcdf-java/documentation.htm - "CDM/TDS source is now hosted on GitHub, and the source jar is no - longer available. To build version 4.3 from source with maven: git - clone ..." - I would use Git for 4.3, but there are no tags in the Git repository - to show which commit is considered "4.3". I suppose 4.3 is just - their name for the development branch, so it doesn't make sense to - maintain a 4.3 ebuild alongside 9999. - -*netcdf-9999 (07 Oct 2011) - 07 Oct 2011; W. Trevor King +netcdf-4.3.ebuild, - +netcdf-9999.ebuild, +files/9999-build-xml.patch, +files/4.3-build.xml.patch, - +metadata.xml: - I originally (07 Oct 2011) listed this ebuild as submitted by - Guillaume Horel for bug #301049, but now (27 Feb 2012) I don't see - any mention of such an email in that bug. This ebuild also doesn't - look much like `netcdf-4.1.3.ebuild` in the main Portage tree, so I - imagine I wrote it myself from browsing other Java ebuilds. diff --git a/dev-java/netcdf/Manifest b/dev-java/netcdf/Manifest deleted file mode 100644 index 0fb5ff7..0000000 --- a/dev-java/netcdf/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -AUX 9999-build-xml.patch 4380 RMD160 8fbd4330a7f73a7b8c0c1c9ffece806f2807b748 SHA1 57c47820e8bfa28a37d38daac5a94b86a1083b0c SHA256 ce91c07400232d4555d06e2f91bb7a21c2f4ca617a9b168d0fa8ba7933d29887 -EBUILD netcdf-9999.ebuild 2854 RMD160 b2dab8a813d6d41dab207c0d3be1971094dff937 SHA1 e50216b557a565e99ea8704fb9241653165cac9a SHA256 752af7962a053dbcf4e6619b035ad17d93f18988f04ca7459b94feb99e543fcc -MISC ChangeLog 1605 RMD160 b0de198456e534547d5348864726242a2729f7b0 SHA1 7efd33a6bfd788106b7dc50c46f75ba6eebd4d96 SHA256 7b4564db6d89d829c2dfce47cf487513bebd35d5ec5ad3334db20299608e8b11 -MISC metadata.xml 247 RMD160 6735f3a5dd2d7a2b70589d1693f35d54291b7147 SHA1 c015969fe50967340dd050a44cb9f8a30b5e34a5 SHA256 9e65060e5f9d0a50d28c7a69d9c27fed6c3037fdd3e420cc276627fde2794f72 diff --git a/dev-java/netcdf/files/9999-build-xml.patch b/dev-java/netcdf/files/9999-build-xml.patch deleted file mode 100644 index 3e584b2..0000000 --- a/dev-java/netcdf/files/9999-build-xml.patch +++ /dev/null @@ -1,85 +0,0 @@ -diff --git a/cdm/build.xml b/cdm/build.xml -index 149ea21..1c28eb8 100644 ---- a/cdm/build.xml -+++ b/cdm/build.xml -@@ -49,26 +49,27 @@ - - - -- -+ - -- -- -- -- -+ -+ -+ -+ -+ - -- -- -+ -+ - -- -- -+ -+ - -- -+ - - -- -+ - - -- -+ - - - -@@ -91,8 +92,10 @@ - - - -+ - -- -+ -+ - - - -diff --git a/grib/build.xml b/grib/build.xml -index 2094669..6a5084e 100644 ---- a/grib/build.xml -+++ b/grib/build.xml -@@ -30,10 +30,11 @@ - - - -- -+ -+ - -- -- -+ -+ - - - -@@ -45,7 +46,8 @@ - - - -- -+ -+ - - - diff --git a/dev-java/netcdf/metadata.xml b/dev-java/netcdf/metadata.xml deleted file mode 100644 index d124928..0000000 --- a/dev-java/netcdf/metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - wking@drexel.edu - W. Trevor King - - diff --git a/dev-java/netcdf/netcdf-9999.ebuild b/dev-java/netcdf/netcdf-9999.ebuild deleted file mode 100644 index 0e2cf36..0000000 --- a/dev-java/netcdf/netcdf-9999.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="4" -JAVA_PKG_IUSE="doc examples source test" -inherit eutils java-pkg-2 java-ant-2 git-2 - -if [[ "${PV}" == "9999" ]]; then - inherit git-2 - EGIT_REPO_URI="git://github.com/Unidata/thredds.git" - SRC_URI="" -else - die "Unidata no longer publishes 4.3 source bundles." - SRC_URI="ftp://ftp.unidata.ucar.edu/pub/${PN}-java/v${PV}/ncSrc-${PV}.zip" -fi - -DESCRIPTION="Java Common Data Model (CDM) interface to to netCDF files" -HOMEPAGE="http://www.unidata.ucar.edu/software/netcdf-java/" -LICENSE="netCDF" -SLOT="0" -KEYWORDS="~x86" -IUSE="" - -COMMON_DEP="dev-java/commons-codec - dev-java/commons-httpclient - dev-java/commons-logging - dev-java/ehcache - dev-java/jcommon - dev-java/jdom - dev-java/jfreechart - dev-java/jgoodies-forms - >=dev-java/joda-time-2.0 - dev-java/log4j - dev-java/slf4j-api - dev-libs/protobuf[java]" - -RDEPEND=">=virtual/jre-1.5 - ${COMMON_DEP}" - -DEPEND=">=virtual/jdk-1.5 - test? ( - dev-java/ant-junit4 - dev-java/hamcrest-core - ) - ${COMMON_DEP}" -# There is a from-source maven package in java-overlay, but it hasn't -# been merged into the Portage trunk yet. - -S="${WORKDIR}/${PN}" - -src_unpack() { - if [[ "${PV}" == "9999" ]]; then - git-2_src_unpack - else - # The zipped source doesn't fall in a single directory - mkdir "${S}" - cd "${S}" - unpack "${A}" - fi -} - -src_prepare() { - cd "${S}" - #rm -v lib/*/*.jar || die - - epatch "${FILESDIR}/${PV}-build-xml.patch" - - java-pkg_jar-from --into lib/external commons-codec commons-codec.jar - java-pkg_jar-from --into lib/external commons-httpclient-3 commons-httpclient.jar - java-pkg_jar-from --into lib/external commons-logging commons-logging.jar - java-pkg_jar-from --into lib/external ehcache-1.2 ehcache.jar - java-pkg_jar-from --into lib/external jcommon-1.0 jcommon.jar - rm -f lib/external/jdom.jar || die - java-pkg_jar-from --into lib/external jdom-1.0 jdom.jar - java-pkg_jar-from --into lib/external jfreechart-1.0 jfreechart.jar - java-pkg_jar-from --into lib/external jgoodies-forms forms.jar jgoodies-forms.jar - java-pkg_jar-from --into lib/external joda-time joda-time.jar - java-pkg_jar-from --into lib/external junit-4 junit.jar - java-pkg_jar-from --into lib/external log4j log4j.jar - java-pkg_jar-from --into lib/external protobuf protobuf.jar - java-pkg_jar-from --into lib/external slf4j-api slf4j-api.jar -} - -src_compile() { - if [[ "${PV}" == "9999" ]]; then - cd "${S}/grib" - eant - fi - cd "${S}/cdm" - eant - use doc && eant javadoc -} - -src_install() { - if [[ "${PV}" == "9999" ]]; then - java-pkg_newjar "cdm/target/${PN}"-*.jar "${PN}.jar" - else - java-pkg_newjar "cdm/target/${P}.jar" "${PN}.jar" - fi - use doc && java-pkg_dojavadoc cdm/target/javadoc - use source && java-pkg_dosrc cdm/src/main/java/* - use examples && java-pkg_doexamples cdm/src/test/java/examples -}