Remove dev-java

The hdfview changes were accepted upstream in the science overlay:

  commit 709daeff6aa4a3691d83f26a2fb837748cb21478
  Author: Sébastien Fabbro <sebfabbro@gmail.com>
  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/netcdf/ChangeLog b/dev-java/netcdf/ChangeLog
deleted file mode 100644 (file)
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 <wking@drexel.edu>
-  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 <wking@drexel.edu> +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 (file)
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 (file)
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 @@
-   <property name="bdb.jar" value="je-4.0.71.jar"/>\r
-   <property name="bounce.jar" value="bounce-0.14.jar"/>\r
-   <property name="bufr.jar" value="bufr-4.3.jar"/>\r
--  <property name="ehcache.jar" value="ehcache-1.6.0.jar"/>\r
-+  <property name="ehcache.jar" value="ehcache.jar"/>\r
-   <property name="grib.jar" value="grib-4.3.jar"/>\r
--  <property name="httpclient3.jar" value="commons-httpclient-3.1.jar"/>\r
--  <property name="commons-logging.jar" value="jcl-over-slf4j-1.6.4.jar"/>\r
--  <property name="http-codec.jar" value="commons-codec-1.3.jar"/>\r
--  <property name="joda.jar" value="joda-time-2.0.jar"/>\r
-+  <property name="httpclient3.jar" value="commons-httpclient.jar"/>\r
-+  <property name="commons-logging.jar" value="commons-logging.jar"/>\r
-+  <property name="http-codec.jar" value="commons-codec.jar"/>\r
-+  <property name="joda-time.jar" value="joda-time.jar"/>\r
-+  <property name="joda-convert.jar" value="joda-convert.jar"/>\r
-   <property name="jdom.jar" value="jdom.jar"/>\r
--  <property name="jfreechart.jar" value="jfreechart-1.0.12.jar"/>\r
--  <property name="jcommon.jar" value="jcommon-1.0.15.jar"/>\r
-+  <property name="jfreechart.jar" value="jfreechart.jar"/>\r
-+  <property name="jcommon.jar" value="jcommon.jar"/>\r
-   <property name="guiBuilder.jar" value="forms_rt.jar"/>\r
--  <property name="jgoodies.jar" value="forms-1.0.7.jar"/>\r
--  <property name="junit.jar" value="junit-4.5.jar"/>\r
-+  <property name="jgoodies.jar" value="jgoodies-forms.jar"/>\r
-+  <property name="junit.jar" value="junit.jar"/>\r
-   <property name="easymock.jar" value="easymock-2.5.2.jar"/>\r
--  <property name="loggingAPI.jar" value="slf4j-api-1.6.4.jar"/>\r
-+  <property name="loggingAPI.jar" value="slf4j-api.jar"/>\r
-   <property name="logging-minimal.jar" value="slf4j-jdk14-1.6.4.jar"/>\r
-   <property name="logging-maximal.jar" value="slf4j-log4j12-1.6.4.jar"/>\r
--  <property name="log4j.jar" value="log4j-1.2.16.jar"/>\r
-+  <property name="log4j.jar" value="log4j.jar"/>\r
-   <!-- property name="lucene.jar" value="lucene.jar"/ -->\r
-   <property name="opendap.jar" value="opendap-4.3.jar"/>\r
--  <property name="protobuf.jar" value="protobuf-java-2.4.1.jar"/>\r
-+  <property name="protobuf.jar" value="protobuf.jar"/>\r
-   <property name="quartz.jar" value="quartz-2.1.1.jar"/>\r
-   <property name="resourcesOptional.jar" value="resourcesOptional.jar"/>\r
-   <property name="spring-aop.jar" value="org.springframework.aop-3.0.5.RELEASE.jar"/>\r
-@@ -91,8 +92,10 @@
-     <include name="external/${bdb.jar}"/>\r
-     <include name="external/${ehcache.jar}"/>\r
-     <include name="external/${httpclient3.jar}"/>\r
-+    <include name="external/${commons-logging.jar}"/>\r
-     <include name="external/${jdom.jar}"/>\r
--    <include name="external/${joda.jar}"/>\r
-+    <include name="external/${joda-time.jar}"/>\r
-+    <include name="external/${joda-convert.jar}"/>\r
-     <include name="external/${loggingAPI.jar}"/>\r
-     <include name="external/${protobuf.jar}"/>\r
-     <include name="external/${quartz.jar}"/>\r
-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 @@
- \r
-   <property name="cdm.jar" value="netcdf-4.3.jar"/>\r
-   <property name="jdom.jar" value="jdom.jar"/>\r
--  <property name="joda.jar" value="joda-time-2.0.jar"/>\r
-+  <property name="joda-time.jar" value="joda-time.jar"/>\r
-+  <property name="joda-convert.jar" value="joda-convert.jar"/>\r
-   <property name="jsoup.jar" value="jsoup-1.6.1.jar"/>\r
--  <property name="loggingAPI.jar" value="slf4j-api-1.6.4.jar"/>\r
--  <property name="protobuf.jar" value="protobuf-java-2.4.1.jar"/>\r
-+  <property name="loggingAPI.jar" value="slf4j-api.jar"/>\r
-+  <property name="protobuf.jar" value="protobuf.jar"/>\r
- \r
-   <!-- source -->\r
-   <path id="sourcepath">\r
-@@ -45,7 +46,8 @@
-     <fileset id="compile.libraries" dir="${lib.dir}">\r
-       <include name="release/${cdm.jar}"/>\r
-       <include name="external/${jdom.jar}"/>\r
--      <include name="external/${joda.jar}"/>\r
-+      <include name="external/${joda-time.jar}"/>\r
-+      <include name="external/${joda-convert.jar}"/>\r
-       <include name="external/${jsoup.jar}"/>\r
-       <include name="external/${loggingAPI.jar}"/>\r
-       <include name="external/${protobuf.jar}"/>\r

diff --git a/dev-java/netcdf/metadata.xml b/dev-java/netcdf/metadata.xml
deleted file mode 100644 (file)
index d124928..0000000
--- a/dev-java/netcdf/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-       <herd></herd>
-       <maintainer>
-               <email>wking@drexel.edu</email>
-               <name>W. Trevor King</name>
-       </maintainer>
-</pkgmetadata>

diff --git a/dev-java/netcdf/netcdf-9999.ebuild b/dev-java/netcdf/netcdf-9999.ebuild
deleted file mode 100644 (file)
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
-}