From 725f03497e6948b5ac4e7052d8efda921c7abf9d Mon Sep 17 00:00:00 2001
From: William Thomson <wltjr@gentoo.org>
Date: Wed, 15 Nov 2006 04:21:20 +0000
Subject: [PATCH] Forgot patch, oops Package-Manager: portage-2.1.2_rc1-r6

---
 dev-java/commons-httpclient/ChangeLog         |  6 ++-
 .../commons-httpclient-3.0.1-gentoo.patch     | 47 +++++++++++++++++++
 dev-java/commons-io/ChangeLog                 |  6 ++-
 .../files/commons-io-1.2-gentoo.diff          | 11 +++++
 4 files changed, 68 insertions(+), 2 deletions(-)
 create mode 100644 dev-java/commons-httpclient/files/commons-httpclient-3.0.1-gentoo.patch
 create mode 100644 dev-java/commons-io/files/commons-io-1.2-gentoo.diff

diff --git a/dev-java/commons-httpclient/ChangeLog b/dev-java/commons-httpclient/ChangeLog
index df39124937d2..4e18651c4a55 100644
--- a/dev-java/commons-httpclient/ChangeLog
+++ b/dev-java/commons-httpclient/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/commons-httpclient
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-httpclient/ChangeLog,v 1.31 2006/11/15 04:10:15 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-httpclient/ChangeLog,v 1.32 2006/11/15 04:18:29 wltjr Exp $
+
+  15 Nov 2006; William L. Thomson Jr. <wltjr@gentoo.org>
+  +files/commons-httpclient-3.0.1-gentoo.patch:
+  Forgot patch, oops
 
 *commons-httpclient-3.0.1 (15 Nov 2006)
 
diff --git a/dev-java/commons-httpclient/files/commons-httpclient-3.0.1-gentoo.patch b/dev-java/commons-httpclient/files/commons-httpclient-3.0.1-gentoo.patch
new file mode 100644
index 000000000000..cfb5355f5e1a
--- /dev/null
+++ b/dev-java/commons-httpclient/files/commons-httpclient-3.0.1-gentoo.patch
@@ -0,0 +1,47 @@
+--- build.xml.orig	2006-10-30 19:36:49.000000000 +0100
++++ build.xml	2006-10-30 19:49:01.000000000 +0100
+@@ -127,6 +127,7 @@
+     <mkdir dir="${build.home}/docs/api"/>
+     <mkdir dir="${build.home}/tests"/>
+     <mkdir dir="${build.home}/examples"/>
++    <mkdir dir="${build.home}/contrib"/>
+   </target>
+ 
+   <target name="static" depends="prepare"
+@@ -154,6 +155,13 @@
+         <include name="LICENSE.txt"/>
+       </metainf>
+     </jar>
++    <jar jarfile  ="${dist.home}/commons-${component.name}-contrib.jar"
++         basedir  ="${build.home}/contrib"
++         manifest ="${build.home}/conf/MANIFEST.MF">
++      <metainf dir="${dist.home}">
++        <include name="LICENSE.txt"/>
++      </metainf>
++    </jar>
+     <mkdir dir="${dist.home}/src"/>
+     <copy todir="${dist.home}/src" filtering="on">
+       <fileset dir="${source.home}"/>
+@@ -193,6 +201,13 @@
+            optimize    ="${compile.optimize}">
+       <classpath refid="compile.classpath"/>
+     </javac>
++    <javac srcdir      ="${source.home}/contrib"
++           destdir     ="${build.home}/contrib"
++           debug       ="${compile.debug}"
++           deprecation ="${compile.deprecation}"
++           optimize    ="${compile.optimize}">
++      <classpath refid="compile.classpath"/>
++    </javac>
+   </target>
+ 
+   <target name="compile.tests" depends="compile"
+@@ -239,7 +254,7 @@
+     <mkdir dir="${dist.home}"/>
+     <mkdir dir="${dist.home}/docs"/>
+     <mkdir dir="${dist.home}/docs/api"/>
+-    <javadoc sourcepath   ="${source.home}/java"
++    <javadoc sourcepath   ="${source.home}/java:${source.home}/contrib"
+              destdir      ="${dist.home}/docs/api"
+              packagenames ="org.apache.commons.*"
+              author       ="true"
diff --git a/dev-java/commons-io/ChangeLog b/dev-java/commons-io/ChangeLog
index ee2e0a687fb4..2ac18bc0ea69 100644
--- a/dev-java/commons-io/ChangeLog
+++ b/dev-java/commons-io/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/commons-io
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-io/ChangeLog,v 1.6 2006/11/15 04:03:54 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-io/ChangeLog,v 1.7 2006/11/15 04:21:20 wltjr Exp $
+
+  15 Nov 2006; William L. Thomson Jr. <wltjr@gentoo.org>
+  +files/commons-io-1.2-gentoo.diff:
+  Forgot patch, oops
 
 *commons-io-1.2 (15 Nov 2006)
 
diff --git a/dev-java/commons-io/files/commons-io-1.2-gentoo.diff b/dev-java/commons-io/files/commons-io-1.2-gentoo.diff
new file mode 100644
index 000000000000..62a7c51550e9
--- /dev/null
+++ b/dev-java/commons-io/files/commons-io-1.2-gentoo.diff
@@ -0,0 +1,11 @@
+--- build.xml.orig	2005-11-25 19:53:06.000000000 +0000
++++ build.xml	2005-11-25 19:54:39.000000000 +0000
+@@ -92,7 +94,7 @@
+     </copy>
+   </target>
+ 
+-  <target name="jar" description="o Create the jar" depends="compile,test">
++  <target name="jar" description="o Create the jar" depends="compile">
+     <jar jarfile="${defaulttargetdir}/${final.name}.jar" excludes="**/*.html" basedir="${classesdir}" manifest="${basedir}/src/conf/MANIFEST.MF" />
+   </target>
+   <target name="dist-jar" depends="compile">
-- 
2.26.2