From 7378685aa4f34c5a0d2f95b03264565cc640c277 Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wking@drexel.edu>
Date: Mon, 27 Feb 2012 21:12:55 -0500
Subject: [PATCH] Update netcdf-9999 build-xml.patch and remove netcdf-4.3
 ebuild.

There's no way to get a stable bundle of the "4.3" source, so I
removed that ebuild.  I also updated my build-xml patch so it applys
cleanly to the current Git source, which should fix 405923.
---
 dev-java/netcdf/ChangeLog                  | 29 ++++++--
 dev-java/netcdf/Manifest                   |  9 +--
 dev-java/netcdf/files/4.3-build-xml.patch  | 81 ----------------------
 dev-java/netcdf/files/9999-build-xml.patch | 65 ++++++++---------
 dev-java/netcdf/netcdf-4.3.ebuild          |  1 -
 dev-java/netcdf/netcdf-9999.ebuild         |  5 +-
 6 files changed, 64 insertions(+), 126 deletions(-)
 delete mode 100644 dev-java/netcdf/files/4.3-build-xml.patch
 delete mode 120000 dev-java/netcdf/netcdf-4.3.ebuild

diff --git a/dev-java/netcdf/ChangeLog b/dev-java/netcdf/ChangeLog
index a60512c..3168ce8 100644
--- a/dev-java/netcdf/ChangeLog
+++ b/dev-java/netcdf/ChangeLog
@@ -1,11 +1,32 @@
 # ChangeLog for dev-java/netcdf
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
-*netcdf-9999 (07 Oct 2011)
+*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:
-  Initial import. Ebuild initially submitted by Guillaume Horel, bug #301049
-
+  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
index 1bfe6fd..0fb5ff7 100644
--- a/dev-java/netcdf/Manifest
+++ b/dev-java/netcdf/Manifest
@@ -1,7 +1,4 @@
-AUX 4.3-build-xml.patch 4152 RMD160 498d36e77806fe26707937b9e7f95aa689539598 SHA1 5d1fa49abbae77cedcc529fb7f58ca99bf3d7435 SHA256 bede88d2305219b77d90f0587df7299487070897c58709f936fbb47f4dbef3c6
-AUX 9999-build-xml.patch 4271 RMD160 5eb806cd61cc8a18215147a91b603b7230b08357 SHA1 c79a69911cf4ca5124754a8461ba4cc5f9b30a2d SHA256 d98ea8ec1c782971f49e3eaf42c0550ea7484f24ae1e90bfb699c3bbee905ec5
-DIST ncSrc-4.3.zip 71799168 RMD160 b4e50a1a5d126baf74f53dbb77d645323973b239 SHA1 3c31fccd0d8a8868e2399f8273de1e5f7ab22e03 SHA256 8ec39cbb1c1521645d68b5ecf33d7b2a8e5d43cd958a7575e9f613f1c5beae8f
-EBUILD netcdf-4.3.ebuild 2793 RMD160 eb2f41b7ac75843cfadfd42bfb2c98abfe643dff SHA1 23a09b7edeb7514b5f278a0bde5a1287285f61aa SHA256 5a4f9accbcebc727ff2501e0e6b4d455f8fff6aac95fd051697455a9f1592c0f
-EBUILD netcdf-9999.ebuild 2793 RMD160 eb2f41b7ac75843cfadfd42bfb2c98abfe643dff SHA1 23a09b7edeb7514b5f278a0bde5a1287285f61aa SHA256 5a4f9accbcebc727ff2501e0e6b4d455f8fff6aac95fd051697455a9f1592c0f
-MISC ChangeLog 388 RMD160 5ad154887f827a8a0d2dbc1024025e799cb0c137 SHA1 d39983a5fb98ae930515a39efdfc49b31f41b9e2 SHA256 2bb7f92709b41425891dd348fdeedbcc62f76ed8dc383e278a01284e54e736b6
+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/4.3-build-xml.patch b/dev-java/netcdf/files/4.3-build-xml.patch
deleted file mode 100644
index 8b5b6ec..0000000
--- a/dev-java/netcdf/files/4.3-build-xml.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-diff --git a/cdm/build.xml b/cdm/build.xml
-index f50befa..061a9d6 100644
---- a/cdm/build.xml
-+++ b/cdm/build.xml
-@@ -29,7 +29,6 @@
-   <property name="src.dir" location="${root.dir}/src/main/java"/>
-   <property name="timingSrc.dir" location="${root.dir}/src/timing/java"/>
-   <property name="commonSrc.dir" location="${root.dir}/../common/src/main/java"/>
--  <property name="timeSrc.dir" location="${root.dir}/../time/src/main/java"/>
-   <property name="resources.dir" location="${root.dir}/src/main/resources"/>
-   <property name="doc.dir" location="${root.dir}/doc"/>
-   <property name="lib.dir" location="${root.dir}/../lib"/>
-@@ -50,26 +49,27 @@
-   <property name="bdb.jar" value="je-4.0.71.jar"/>
-   <property name="bounce.jar" value="bounce-0.14.jar"/>
-   <property name="bufr.jar" value="bufr-4.3.jar"/>
--  <property name="ehcache.jar" value="ehcache-1.6.0.jar"/>
--  <property name="grib.jar" value="grib-4.3.jar"/>
--  <property name="httpclient3.jar" value="commons-httpclient-3.1.jar"/>
--  <property name="commons-logging.jar" value="jcl-over-slf4j-1.6.1.jar"/>
--  <property name="http-codec.jar" value="commons-codec-1.3.jar"/>
--  <property name="joda.jar" value="joda-time-2.0.jar"/>
-+  <property name="ehcache.jar" value="ehcache.jar"/>
-+  <property name="grib.jar" value="grib.jar"/>
-+  <property name="httpclient3.jar" value="commons-httpclient.jar"/>
-+  <property name="commons-logging.jar" value="commons-logging.jar.jar"/>
-+  <property name="http-codec.jar" value="commons-codec.jar"/>
-+  <property name="joda-time.jar" value="joda-time.jar"/>
-+  <property name="joda-convert.jar" value="joda-convert.jar"/>
-   <property name="jdom.jar" value="jdom.jar"/>
--  <property name="jfreechart.jar" value="jfreechart-1.0.12.jar"/>
--  <property name="jcommon.jar" value="jcommon-1.0.15.jar"/>
-+  <property name="jfreechart.jar" value="jfreechart.jar"/>
-+  <property name="jcommon.jar" value="jcommon.jar"/>
-   <property name="guiBuilder.jar" value="forms_rt.jar"/>
--  <property name="jgoodies.jar" value="forms-1.0.7.jar"/>
--  <property name="junit.jar" value="junit-4.5.jar"/>
-+  <property name="jgoodies.jar" value="jgoodies-forms.jar"/>
-+  <property name="junit.jar" value="junit.jar"/>
-   <property name="easymock.jar" value="easymock-2.5.2.jar"/>
--  <property name="loggingAPI.jar" value="slf4j-api-1.6.1.jar"/>
-+  <property name="loggingAPI.jar" value="slf4j-api.jar"/>
-   <property name="logging-minimal.jar" value="slf4j-jdk14-1.6.1.jar"/>
-   <property name="logging-maximal.jar" value="slf4j-log4j12-1.6.1.jar"/>
--  <property name="log4j.jar" value="log4j-1.2.16.jar"/>
-+  <property name="log4j.jar" value="log4j.jar"/>
-   <!-- property name="lucene.jar" value="lucene.jar"/ -->
-   <property name="opendap.jar" value="opendap-2.2.jar"/>
--  <property name="protobuf.jar" value="protobuf-java-2.4.0a.jar"/>
-+  <property name="protobuf.jar" value="protobuf.jar"/>
-   <property name="quartz.jar" value="quartz-1.7.3.jar"/>
-   <property name="resourcesOptional.jar" value="resourcesOptional.jar"/>
-   <property name="spring-aop.jar" value="org.springframework.aop-3.0.5.RELEASE.jar"/>
-@@ -85,7 +85,6 @@
-   <path id="sourcepath">
-     <pathelement location="${src.dir}"/>
-     <pathelement location="${commonSrc.dir}"/>
--    <pathelement location="${timeSrc.dir}"/>
-   </path>
- 
-   <!-- Libraries -->
-@@ -94,8 +93,10 @@
-     <include name="external/${ehcache.jar}"/>
-     <include name="release/${opendap.jar}"/>
-     <include name="external/${httpclient3.jar}"/>
-+    <include name="external/${commons-logging.jar.jar}"/>
-     <include name="external/${jdom.jar}"/>
--    <include name="external/${joda.jar}"/>
-+    <include name="external/${joda-time.jar}"/>
-+    <include name="external/${joda-convert.jar}"/>
-     <include name="external/${loggingAPI.jar}"/>
-     <include name="external/${protobuf.jar}"/>
-     <include name="external/${quartz.jar}"/>
-@@ -597,7 +598,6 @@
-   <path id="sourcepathUI">
-     <pathelement location="${src.dir}"/>
-     <pathelement location="${srcUI.dir}"/>
--    <pathelement location="${timeSrc.dir}"/>
-   </path>
- 
-   <target name="compileUI" depends="init, release-settings" description="toolsUI compile">
diff --git a/dev-java/netcdf/files/9999-build-xml.patch b/dev-java/netcdf/files/9999-build-xml.patch
index 100af20..3e584b2 100644
--- a/dev-java/netcdf/files/9999-build-xml.patch
+++ b/dev-java/netcdf/files/9999-build-xml.patch
@@ -1,5 +1,5 @@
 diff --git a/cdm/build.xml b/cdm/build.xml
-index c253180..5751f4a 100644
+index 149ea21..1c28eb8 100644
 --- a/cdm/build.xml
 +++ b/cdm/build.xml
 @@ -49,26 +49,27 @@
@@ -10,7 +10,7 @@ index c253180..5751f4a 100644
 +  <property name="ehcache.jar" value="ehcache.jar"/>
    <property name="grib.jar" value="grib-4.3.jar"/>
 -  <property name="httpclient3.jar" value="commons-httpclient-3.1.jar"/>
--  <property name="commons-logging.jar" value="jcl-over-slf4j-1.6.1.jar"/>
+-  <property name="commons-logging.jar" value="jcl-over-slf4j-1.6.4.jar"/>
 -  <property name="http-codec.jar" value="commons-codec-1.3.jar"/>
 -  <property name="joda.jar" value="joda-time-2.0.jar"/>
 +  <property name="httpclient3.jar" value="commons-httpclient.jar"/>
@@ -29,17 +29,17 @@ index c253180..5751f4a 100644
 +  <property name="jgoodies.jar" value="jgoodies-forms.jar"/>
 +  <property name="junit.jar" value="junit.jar"/>
    <property name="easymock.jar" value="easymock-2.5.2.jar"/>
--  <property name="loggingAPI.jar" value="slf4j-api-1.6.1.jar"/>
+-  <property name="loggingAPI.jar" value="slf4j-api-1.6.4.jar"/>
 +  <property name="loggingAPI.jar" value="slf4j-api.jar"/>
-   <property name="logging-minimal.jar" value="slf4j-jdk14-1.6.1.jar"/>
-   <property name="logging-maximal.jar" value="slf4j-log4j12-1.6.1.jar"/>
+   <property name="logging-minimal.jar" value="slf4j-jdk14-1.6.4.jar"/>
+   <property name="logging-maximal.jar" value="slf4j-log4j12-1.6.4.jar"/>
 -  <property name="log4j.jar" value="log4j-1.2.16.jar"/>
 +  <property name="log4j.jar" value="log4j.jar"/>
    <!-- property name="lucene.jar" value="lucene.jar"/ -->
    <property name="opendap.jar" value="opendap-4.3.jar"/>
--  <property name="protobuf.jar" value="protobuf-java-2.4.0a.jar"/>
+-  <property name="protobuf.jar" value="protobuf-java-2.4.1.jar"/>
 +  <property name="protobuf.jar" value="protobuf.jar"/>
-   <property name="quartz.jar" value="quartz-1.7.3.jar"/>
+   <property name="quartz.jar" value="quartz-2.1.1.jar"/>
    <property name="resourcesOptional.jar" value="resourcesOptional.jar"/>
    <property name="spring-aop.jar" value="org.springframework.aop-3.0.5.RELEASE.jar"/>
 @@ -91,8 +92,10 @@
@@ -55,30 +55,31 @@ index c253180..5751f4a 100644
      <include name="external/${protobuf.jar}"/>
      <include name="external/${quartz.jar}"/>
 diff --git a/grib/build.xml b/grib/build.xml
-index e5c0803..002ac46 100644
+index 2094669..6a5084e 100644
 --- a/grib/build.xml
 +++ b/grib/build.xml
-@@ -30,9 +30,10 @@
- 
-   <property name="cdm.jar" value="netcdf-4.3.jar"/>
-   <property name="jdom.jar" value="jdom.jar"/>
--  <property name="joda.jar" value="joda-time-2.0.jar"/>
--  <property name="loggingAPI.jar" value="slf4j-api-1.6.1.jar"/>
--  <property name="protobuf.jar" value="protobuf-java-2.4.0a.jar"/>
-+  <property name="joda-time.jar" value="joda-time.jar"/>
-+  <property name="joda-convert.jar" value="joda-convert.jar"/>
-+  <property name="loggingAPI.jar" value="slf4j-api.jar"/>
-+  <property name="protobuf.jar" value="protobuf.jar"/>
- 
-   <!-- source -->
-   <path id="sourcepath">
-@@ -44,7 +45,8 @@
-     <fileset id="compile.libraries" dir="${lib.dir}">
-       <include name="release/${cdm.jar}"/>
-       <include name="external/${jdom.jar}"/>
--      <include name="external/${joda.jar}"/>
-+      <include name="external/${joda-time.jar}"/>
-+      <include name="external/${joda-convert.jar}"/>
-       <include name="external/${loggingAPI.jar}"/>
-       <include name="external/${protobuf.jar}"/>
-     </fileset>
+@@ -30,10 +30,11 @@
+ 
+   <property name="cdm.jar" value="netcdf-4.3.jar"/>
+   <property name="jdom.jar" value="jdom.jar"/>
+-  <property name="joda.jar" value="joda-time-2.0.jar"/>
++  <property name="joda-time.jar" value="joda-time.jar"/>
++  <property name="joda-convert.jar" value="joda-convert.jar"/>
+   <property name="jsoup.jar" value="jsoup-1.6.1.jar"/>
+-  <property name="loggingAPI.jar" value="slf4j-api-1.6.4.jar"/>
+-  <property name="protobuf.jar" value="protobuf-java-2.4.1.jar"/>
++  <property name="loggingAPI.jar" value="slf4j-api.jar"/>
++  <property name="protobuf.jar" value="protobuf.jar"/>
+ 
+   <!-- source -->
+   <path id="sourcepath">
+@@ -45,7 +46,8 @@
+     <fileset id="compile.libraries" dir="${lib.dir}">
+       <include name="release/${cdm.jar}"/>
+       <include name="external/${jdom.jar}"/>
+-      <include name="external/${joda.jar}"/>
++      <include name="external/${joda-time.jar}"/>
++      <include name="external/${joda-convert.jar}"/>
+       <include name="external/${jsoup.jar}"/>
+       <include name="external/${loggingAPI.jar}"/>
+       <include name="external/${protobuf.jar}"/>
diff --git a/dev-java/netcdf/netcdf-4.3.ebuild b/dev-java/netcdf/netcdf-4.3.ebuild
deleted file mode 120000
index f0c35e4..0000000
--- a/dev-java/netcdf/netcdf-4.3.ebuild
+++ /dev/null
@@ -1 +0,0 @@
-netcdf-9999.ebuild
\ No newline at end of file
diff --git a/dev-java/netcdf/netcdf-9999.ebuild b/dev-java/netcdf/netcdf-9999.ebuild
index 03f2acf..0e2cf36 100644
--- a/dev-java/netcdf/netcdf-9999.ebuild
+++ b/dev-java/netcdf/netcdf-9999.ebuild
@@ -1,16 +1,17 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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
+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
 
-- 
2.26.2