Fix javadoc for sun-jdk-1.4. Fixes bug #217102. Update patch for bug #262511 to work with 1.4 JDKs. Thanks to Martin von Gagern <Martin.vGagern@gmx.net>.

Package-Manager: portage-2.2_rc25/cvs/Linux i686

5 files changed, 145 insertions, 91 deletions

diff --git a/dev-java/ant-core/ChangeLog b/dev-java/ant-core/ChangeLog
index 0025cf60c3e5..fb6d77678e27 100644
--- a/dev-java/ant-core/ChangeLog
+++ b/dev-java/ant-core/ChangeLog
@@ -1,11 +1,20 @@
 # ChangeLog for dev-java/ant-core
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ChangeLog,v 1.92 2009/03/15 12:18:36 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ChangeLog,v 1.93 2009/03/17 12:54:49 betelgeuse Exp $
 
 # Ant-core blocks lower/older versions of ant-tasks, 
 # since it will not run when there is a version mismatch betwean the 2 packages
 # Please unemerge ant-tasks when updating ant-core.
 
+*ant-core-1.7.1-r4 (17 Mar 2009)
+
+  17 Mar 2009; Petteri Räty <betelgeuse@gentoo.org>
+  +files/1.7.1-jdk4-javadoc.patch, files/1.7.1-pkg-info.patch,
+  -ant-core-1.7.1-r3.ebuild, +ant-core-1.7.1-r4.ebuild:
+  Fix javadoc for sun-jdk-1.4. Fixes bug #217102. Update patch for bug
+  #262511 to work with 1.4 JDKs. Thanks to Martin von Gagern
+  <Martin.vGagern@gmx.net>.
+
 *ant-core-1.7.1-r3 (15 Mar 2009)
 
   15 Mar 2009; Petteri Räty <betelgeuse@gentoo.org>
diff --git a/dev-java/ant-core/Manifest b/dev-java/ant-core/Manifest
index 0526cc99d995..ccb87ed1ba89 100644
--- a/dev-java/ant-core/Manifest
+++ b/dev-java/ant-core/Manifest
@@ -4,7 +4,8 @@ Hash: SHA1
 AUX 1.7.0-ant 5996 RMD160 d523fc2f9cef31e77980de4d367265e205856a0e SHA1 356bc5bfe466969d292b3b6fae4b3f4d97239945 SHA256 d90dac639da2564d16b11f02dad6327bce40082ca00d671c77826a4cda6a1537
 AUX 1.7.1-ant 5996 RMD160 131664c910a23f3ee4136fb60733eef699e0b6aa SHA1 0adeb2f78824eac0c5bca84446f4853f2be1f42e SHA256 3a162dfb297eadaa30feed4b130819b5acd50aec00417a9129d1e856cf844bfb
 AUX 1.7.1-ant-r1 6239 RMD160 f942c93807c332ad348a3e7d4c234940f3e02c5a SHA1 5b1c278727f06a0a7f5a17cf33b832890f388e0e SHA256 b356287d56db9c72e39ccb9785bfaf8db06b67a601c939db7f48014428ccea4d
-AUX 1.7.1-pkg-info.patch 10193 RMD160 c0f1d9682b3fdd7b18dd2cd0e1e1a246bc569ba8 SHA1 87f158f661654c8e374e55604cdadc9a6d61799a SHA256 3e2171dd478410ce36700075c94939f582d64a442979d766db23e596317649ec
+AUX 1.7.1-jdk4-javadoc.patch 2026 RMD160 4354a94c8af1e139b343711db51c3d9cf49c00d4 SHA1 9ab01272af7e5edd0d57f385334a95ed238d66c4 SHA256 ef26b648797b6da33fa08c5110a2d7e1377c716349a38922e63638ba4cb6e096
+AUX 1.7.1-pkg-info.patch 9325 RMD160 1ea5ce708bbb5dd3815f1eadc7cba3b3d0dc5db4 SHA1 ac8d14e9090a02060f44999673888c1431b203b2 SHA256 43041836e2ed4e883e6878649f4e43f6cc8399f9bae79b8de49c48b773ec7b06
 AUX ant-core-1.7.0-services.patch 792 RMD160 d9d5e69860428301f3e27475835781938f1abb14 SHA1 c7502fa3e1481a68d3b8533d4673fce5831fd225 SHA256 fa45cd934948dd3b2df5cd56fba3be54eb54d8476b9a2bc3289fd2fe28a1f357
 DIST ant-1.7.0-gentoo.tar.bz2 11720 RMD160 51d24f2c0c98195ed6ef1852045201a567a5d9ea SHA1 41acb8398a5ac9713dec30d6305b5abc6c014fff SHA256 7b1e0c63bec193c010c3fcca7a3524e2e35cc4ca56b86e4571737ac1e169e35c
 DIST ant-1.7.1-gentoo.tar.bz2 11836 RMD160 9194996b5b04113d2a6542221890e1ef3f7953d0 SHA1 ef848268ec2b7ecd9aca2f8a3d6705ec8386a621 SHA256 4bacd711cc4981272b8377335dafcb8841dd1fac177c0c349f3faf78b0354fe5
@@ -15,13 +16,13 @@ EBUILD ant-core-1.7.0-r2.ebuild 2647 RMD160 91738c8636b2c3f78792eac2f2837fc7308d
 EBUILD ant-core-1.7.0.ebuild 2552 RMD160 418c8d927107524c849e1d0ff12861448ef77309 SHA1 2f8509ec164c3d70d9bd5482dbdc2c7038ea9f24 SHA256 607185bb6d56d749d32b38dc740db00f498bafe04656127a582d329304995e4a
 EBUILD ant-core-1.7.1-r1.ebuild 2784 RMD160 27a9ffe314536c812577b73312178df543ec0a9f SHA1 5076398f0441cfd93ef00a105037954c06f1212b SHA256 8633fd7d974677e923b062e23a36fab61a7d30acdbaf7783dd13b51279da3319
 EBUILD ant-core-1.7.1-r2.ebuild 2813 RMD160 b8985f4e847b8ea55b006b376775795604159231 SHA1 b63d7ad4746a2e1ce63845a6e8c3693a60f1cd72 SHA256 9d71fbb261df38216c2bd7a91ab37ce6caba77e9eaa1ee248e92efc74ace7176
-EBUILD ant-core-1.7.1-r3.ebuild 2875 RMD160 6a4d5677f333fb51e8663c6174d29f350c8e66ad SHA1 fa5f932992c16ffe5f628880753d6e144b06e12f SHA256 8bf8e3f5efc688d1b3eca97ca1d9366f99aefc5d8def9774e559f329186fee2b
-MISC ChangeLog 27232 RMD160 4b9c630fb3234077adda4b934d4aad95ed58a8ab SHA1 87d25b59252b747aa14f3141eb5d13633e0fe7a0 SHA256 469d54da12c9da86d3c8ff952210eb5265cb4eb7e54752ce78764f96e367ee30
+EBUILD ant-core-1.7.1-r4.ebuild 2922 RMD160 01ac3a5297e4bcf6e8bbda2e7843be9060e55ce1 SHA1 4ac5b9235338064d480ee0cd26e27cb1eb36b7ca SHA256 88bd9309e08b91f6aaa3e5d592e22968bc8dd7711bb7aa5a3029e59db55ec591
+MISC ChangeLog 27599 RMD160 cbc3727d784b1f50c328efffa3655c3d7dec09b0 SHA1 8b33a2e2905d2cb1f64b6787662a0727d0488d80 SHA256 c6fd0798953d44af42d1cf875096669c80cdd9e02dd91f515617dc9f02be7ab7
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.10 (GNU/Linux)
 
-iEYEARECAAYFAkm88kAACgkQcxLzpIGCsLRa5wCeMbmt7IbyGpMxZoePzcB+exSW
-tRQAnRn7RxYxDZ7kDGGVPrj6+P7L1KKj
-=3mZV
+iEYEARECAAYFAkm/ncUACgkQcxLzpIGCsLR9WgCfQcfdgE5h0jQjFd1JxLhKqh5i
+BpIAn0/kcxL4BraSNg/bFZvs7gByKLF8
+=jZ+O
 -----END PGP SIGNATURE-----
diff --git a/dev-java/ant-core/ant-core-1.7.1-r3.ebuild b/dev-java/ant-core/ant-core-1.7.1-r4.ebuild
index fa52e59ccc48..4ad6a6c1a4ad 100644
--- a/dev-java/ant-core/ant-core-1.7.1-r3.ebuild
+++ b/dev-java/ant-core/ant-core-1.7.1-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ant-core-1.7.1-r3.ebuild,v 1.1 2009/03/15 12:18:36 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ant-core-1.7.1-r4.ebuild,v 1.1 2009/03/17 12:54:49 betelgeuse Exp $
 
 EAPI="2"
 
@@ -35,6 +35,7 @@ src_prepare() {
 	rm -v lib/*.jar || die
 
 	epatch "${FILESDIR}/1.7.1-pkg-info.patch"
+	epatch "${FILESDIR}/1.7.1-jdk4-javadoc.patch"
 
 	# use our split-ant build.xml
 	mv -f "${WORKDIR}/build.xml" . || die
diff --git a/dev-java/ant-core/files/1.7.1-jdk4-javadoc.patch b/dev-java/ant-core/files/1.7.1-jdk4-javadoc.patch
new file mode 100644
index 000000000000..27dfebd7b660
--- /dev/null
+++ b/dev-java/ant-core/files/1.7.1-jdk4-javadoc.patch
@@ -0,0 +1,60 @@
+The javadoc from Sun JDK 1.4.x fails for @value lines after @since
+with a NullPointerException in ValueTaglet.toString.
+This patch switches the lines in question.
+It also ensures that javadoc errors won't go unnoticed but cause the build
+to fail instead.
+
+2009-02-18 Martin von Gagern
+
+References: https://bugs.gentoo.org/217102
+
+Index: apache-ant-1.7.1/src/main/org/apache/tools/ant/MagicNames.java
+===================================================================
+--- apache-ant-1.7.1.orig/src/main/org/apache/tools/ant/MagicNames.java
++++ apache-ant-1.7.1/src/main/org/apache/tools/ant/MagicNames.java
+@@ -143,22 +143,22 @@ public final class MagicNames {
+     /**
+      * property that provides the default value for javac's and
+      * javadoc's source attribute.
+-     * @since Ant 1.7
+      * Value: {@value}
++     * @since Ant 1.7
+      */
+     public static final String BUILD_JAVAC_SOURCE = "ant.build.javac.source";
+ 
+     /**
+      * property that provides the default value for javac's target attribute.
+-     * @since Ant 1.7
+      * Value: {@value}
++     * @since Ant 1.7
+      */
+     public static final String BUILD_JAVAC_TARGET = "ant.build.javac.target";
+ 
+     /**
+      * Name of the magic property that controls classloader reuse.
+-     * @since Ant 1.4.
+      * Value: {@value}
++     * @since Ant 1.4.
+      */
+     public static final String REFID_CLASSPATH_REUSE_LOADER = "ant.reuse.loader";
+ 
+Index: apache-ant-1.7.1/build.xml
+===================================================================
+--- apache-ant-1.7.1.orig/build.xml
++++ apache-ant-1.7.1/build.xml
+@@ -1483,6 +1483,7 @@
+       locale="en"
+       windowtitle="${Name} API"
+       doctitle="${Name}"
++      failonerror="true"
+       verbose="${javadoc.verbose}">
+ 
+       <packageset dir="${java.dir}"/>
+@@ -1510,6 +1511,7 @@
+     <mkdir dir="${build.tests.javadocs}"/>
+     <javadoc useexternalfile="yes"
+       destdir="${build.tests.javadocs}"
++      failonerror="true"
+       author="true"
+       version="true"
+       locale="en"
diff --git a/dev-java/ant-core/files/1.7.1-pkg-info.patch b/dev-java/ant-core/files/1.7.1-pkg-info.patch
index 2531aeef6150..da4f7c73b684 100644
--- a/dev-java/ant-core/files/1.7.1-pkg-info.patch
+++ b/dev-java/ant-core/files/1.7.1-pkg-info.patch
@@ -1,7 +1,24 @@
-Index: Javac.java
-===================================================================
---- src/main/org/apache/tools/ant/taskdefs/Javac.java	(revision 672109)
-+++ src/main/org/apache/tools/ant/taskdefs/Javac.java	(revision 743910)
+Backported changeset ensuring that package-info.class is
+created/touched when package-info.java is compiled.
+
+Originally derived from these changesets:
+r743910 #43114: ensuring that package-info.class is created/touched
+        when package-info.java is compiled.
+r744132 JDK 1.4 - unfortunately
+
+svn diff -r 738761:744132 http://svn.apache.org/repos/asf/ant/core/\
+trunk/src/main/org/apache/tools/ant/taskdefs/Javac.java
+
+2009-03-15 John W. Eckhart
+2009-03-17 Martin von Gagern
+
+References:
+https://bugs.gentoo.org/262511
+https://jira.jboss.org/jira/browse/JBSEAM-3386
+https://issues.apache.org/bugzilla/show_bug.cgi?id=43114
+
+--- apache-ant-1.7.1.orig/src/main/org/apache/tools/ant/taskdefs/Javac.java
++++ apache-ant-1.7.1/src/main/org/apache/tools/ant/taskdefs/Javac.java
 @@ -19,10 +19,12 @@
  package org.apache.tools.ant.taskdefs;
  
@@ -18,25 +35,17 @@ Index: Javac.java
  
  import org.apache.tools.ant.BuildException;
  import org.apache.tools.ant.DirectoryScanner;
-@@ -32,6 +34,7 @@
- import org.apache.tools.ant.taskdefs.compilers.CompilerAdapterFactory;
- import org.apache.tools.ant.types.Path;
- import org.apache.tools.ant.types.Reference;
-+import org.apache.tools.ant.util.FileUtils;
- import org.apache.tools.ant.util.GlobPatternMapper;
- import org.apache.tools.ant.util.JavaEnvUtils;
- import org.apache.tools.ant.util.SourceFileScanner;
-@@ -86,8 +89,7 @@
+@@ -86,9 +88,6 @@
      private static final String CLASSIC = "classic";
      private static final String EXTJAVAC = "extJavac";
  
 -    private static final String PACKAGE_INFO_JAVA = "package-info.java";
 -    private static final String PACKAGE_INFO_CLASS = "package-info.class";
-+    private static final FileUtils FILE_UTILS = FileUtils.getFileUtils();
- 
+-
      private Path src;
      private File destDir;
-@@ -115,6 +117,7 @@
+     private Path compileClasspath;
+@@ -115,6 +114,7 @@
      protected boolean failOnError = true;
      protected boolean listFiles = false;
      protected File[] compileList = new File[0];
@@ -44,7 +53,7 @@ Index: Javac.java
      // CheckStyle:VisibilityModifier ON
  
      private String source;
-@@ -124,7 +127,6 @@
+@@ -124,7 +124,6 @@
      private String errorProperty;
      private boolean taskSuccess = true; // assume the best
      private boolean includeDestClasses = true;
@@ -52,30 +61,7 @@ Index: Javac.java
  
      /**
       * Javac task for compilation of Java files.
-@@ -183,13 +185,16 @@
-     }
- 
-     /**
--     * Value of the -source command-line switch; will be ignored
--     * by all implementations except modern and jikes.
-+     * Value of the -source command-line switch; will be ignored by
-+     * all implementations except modern, jikes and gcj (gcj uses
-+     * -fsource).
-+     *
-+     * <p>If you use this attribute together with jikes or gcj, you
-+     * must make sure that your version of jikes supports the -source
-+     * switch.</p>
-      *
--     * If you use this attribute together with jikes, you must make
--     * sure that your version of jikes supports the -source switch.
--     * Legal values are 1.3, 1.4, 1.5, and 5 - by default, no
--     * -source argument will be used at all.
-+     * <p>Legal values are 1.3, 1.4, 1.5, and 5 - by default, no
-+     * -source argument will be used at all.</p>
-      *
-      * @param v  Value to assign to source.
-      */
-@@ -892,6 +897,7 @@
+@@ -892,6 +891,7 @@
       */
      protected void resetFileLists() {
          compileList = new File[0];
@@ -83,7 +69,7 @@ Index: Javac.java
      }
  
      /**
-@@ -909,8 +915,8 @@
+@@ -909,8 +909,8 @@
          SourceFileScanner sfs = new SourceFileScanner(this);
          File[] newFiles = sfs.restrictAsFiles(files, srcDir, destDir, m);
  
@@ -93,7 +79,7 @@ Index: Javac.java
              File[] newCompileList
                  = new File[compileList.length + newFiles.length];
              System.arraycopy(compileList, 0, newCompileList, 0,
-@@ -1063,10 +1069,12 @@
+@@ -1063,10 +1063,12 @@
  
              // finally, lets execute the compiler!!
              if (adapter.execute()) {
@@ -110,7 +96,7 @@ Index: Javac.java
                  }
              } else {
                  // Fail path
-@@ -1100,75 +1108,68 @@
+@@ -1100,72 +1102,69 @@
          }
      }
  
@@ -147,8 +133,16 @@ Index: Javac.java
 +            File f = newFiles[i];
 +            if (!f.getName().equals("package-info.java")) {
 +                continue;
-+            }
-+            String path = FILE_UTILS.removeLeadingPath(srcDir, f).
+             }
+-        }
+-        return (File[]) ret.toArray(new File[0]);
+-    }
+-
+-    private boolean hasPackageInfo(File[] newFiles) {
+-        for (int i = 0; i < newFiles.length; ++i) {
+-            if (newFiles[i].getName().equals(PACKAGE_INFO_JAVA)) {
+-                return true;
++            String path = relativePath(srcDir, f).
 +                    replace(File.separatorChar, '/');
 +            String suffix = "/package-info.java";
 +            if (!path.endsWith(suffix)) {
@@ -156,15 +150,32 @@ Index: Javac.java
 +                continue;
              }
 +            String pkg = path.substring(0, path.length() - suffix.length());
-+            packageInfos.put(pkg, Long.valueOf(f.lastModified()));
++            packageInfos.put(pkg, new Long(f.lastModified()));
          }
--        return (File[]) ret.toArray(new File[0]);
+-        return false;
      }
  
--    private boolean hasPackageInfo(File[] newFiles) {
--        for (int i = 0; i < newFiles.length; ++i) {
--            if (newFiles[i].getName().equals(PACKAGE_INFO_JAVA)) {
--                return true;
+-    private boolean needsCompilePackageFile(
+-        File file, File srcDir, File destDir) {
+-        if (!file.getName().equals(PACKAGE_INFO_JAVA)) {
+-            return true;
+-        }
+-        // return true if destDir contains the file
+-        String rel = relativePath(srcDir, file);
+-        File destFile = new File(destDir, rel);
+-        File parent = destFile.getParentFile();
+-        destFile = new File(parent, PACKAGE_INFO_CLASS);
+-        File sourceFile = new File(srcDir, rel);
+-        if (destFile.exists()) {
+-            return true;
+-        }
+-        // Dest file does not exist
+-        // Compile Source file if sourceFile is newer that destDir
+-        // TODO - use fs
+-        if (sourceFile.lastModified()
+-            > destFile.getParentFile().lastModified()) {
+-            updateDirList.add(destFile.getParentFile());
+-            return true;
 +    /**
 +     * Ensure that every {@code package-info.java} produced a {@code package-info.class}.
 +     * Otherwise this task's up-to-date tracking mechanisms do not work.
@@ -193,7 +204,7 @@ Index: Javac.java
 +                os.write(PACKAGE_INFO_CLASS_FOOTER);
 +            } finally {
 +                os.close();
-             }
++            }
          }
 -        return false;
      }
@@ -212,33 +223,5 @@ Index: Javac.java
 +        0x00, 0x00, 0x00, 0x02, 0x00, 0x04
 +    };
  
--    private boolean needsCompilePackageFile(
--        File file, File srcDir, File destDir) {
--        if (!file.getName().equals(PACKAGE_INFO_JAVA)) {
--            return true;
--        }
--        // return true if destDir contains the file
--        String rel = relativePath(srcDir, file);
--        File destFile = new File(destDir, rel);
--        File parent = destFile.getParentFile();
--        destFile = new File(parent, PACKAGE_INFO_CLASS);
--        File sourceFile = new File(srcDir, rel);
--        if (destFile.exists()) {
--            return true;
--        }
--        // Dest file does not exist
--        // Compile Source file if sourceFile is newer that destDir
--        // TODO - use fs
--        if (sourceFile.lastModified()
--            > destFile.getParentFile().lastModified()) {
--            updateDirList.add(destFile.getParentFile());
--            return true;
--        }
--        return false;
--    }
--
--    private String relativePath(File src, File file) {
--        return file.getAbsolutePath().substring(
--            src.getAbsolutePath().length() + 1);
--    }
- }
+     private String relativePath(File src, File file) {
+         return file.getAbsolutePath().substring(