Version bump + closes #37923

5 files changed, 329 insertions, 5 deletions

diff --git a/dev-java/commons-fileupload/ChangeLog b/dev-java/commons-fileupload/ChangeLog
index be2b0f9e4c46..79f077787561 100644
--- a/dev-java/commons-fileupload/ChangeLog
+++ b/dev-java/commons-fileupload/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/commons-fileupload
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-fileupload/ChangeLog,v 1.3 2003/04/26 05:36:58 strider Exp $
+# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-fileupload/ChangeLog,v 1.4 2004/02/25 23:21:27 zx Exp $
+
+*commons-fileupload-1.0 (25 Feb 2004)
+
+  25 Feb 2004; Chris Aniszczyk <zx@gentoo.org> commons-fileupload-1.0.ebuild,
+  files/build.xml.patch:
+  Version bump. Closes #37923
 
 *commons-fileupload-1.0_beta (22 Mar 2003)
 
diff --git a/dev-java/commons-fileupload/Manifest b/dev-java/commons-fileupload/Manifest
index cd33bf7dd790..1d398562f1b5 100644
--- a/dev-java/commons-fileupload/Manifest
+++ b/dev-java/commons-fileupload/Manifest
@@ -1,4 +1,7 @@
-MD5 24a485cc04c188fe07cc4cdf98fbcece files/digest-commons-fileupload-1.0_beta 161
-MD5 47cefd1e89cff0a421f35baca95c3b5d commons-fileupload-1.0_beta.ebuild 836
-MD5 fe8c833aa5d859d6a31f8a29db9f8f99 ChangeLog 651
+MD5 554601cf428ffeb2d6ecf86fc07a86c4 commons-fileupload-1.0_beta.ebuild 835
+MD5 4a3328751b828cebb664349a6028944d commons-fileupload-1.0.ebuild 1113
+MD5 28beff2dc607f26695991af85384da45 ChangeLog 818
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
+MD5 1ab08806d26c8cd29147b1971335d43b files/build.xml.patch 10532
+MD5 aee8a592019aad96d13006121ef476dc files/digest-commons-fileupload-1.0 77
+MD5 24a485cc04c188fe07cc4cdf98fbcece files/digest-commons-fileupload-1.0_beta 161
diff --git a/dev-java/commons-fileupload/commons-fileupload-1.0.ebuild b/dev-java/commons-fileupload/commons-fileupload-1.0.ebuild
new file mode 100644
index 000000000000..203411514355
--- /dev/null
+++ b/dev-java/commons-fileupload/commons-fileupload-1.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-fileupload/commons-fileupload-1.0.ebuild,v 1.1 2004/02/25 23:21:27 zx Exp $
+
+inherit eutils java-pkg
+
+DESCRIPTION="The Commons FileUpload package makes it easy to add robust, high-performance, file upload capability to your servlets and web applications."
+HOMEPAGE="http://jakarta.apache.org/commons/fileupload/index.html"
+SRC_URI="mirror://apache/jakarta/commons/fileupload/source/${P}-src.tar.gz"
+DEPEND=">=virtual/jdk-1.3
+		>=dev-java/ant-1.5
+		>=dev-java/servletapi-2.4
+		jikes? ( dev-java/jikes )"
+RDEPEND=">=virtual/jdk-1.3"
+LICENSE="Apache-1.1"
+SLOT="0"
+KEYWORDS="~x86 ~sparc"
+IUSE="jikes"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/build.xml.patch
+	local SAPI="`java-config -p servletapi-2.4`"
+	echo "servlet-api.jar = ${SAPI/*:/}" >> build.properties
+}
+
+src_compile() {
+	local antflags="jar"
+	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
+	ant ${antflags}
+}
+
+src_install() {
+	java-pkg_dojar target/${P}.jar
+}
diff --git a/dev-java/commons-fileupload/files/build.xml.patch b/dev-java/commons-fileupload/files/build.xml.patch
new file mode 100644
index 000000000000..59bc74b9e092
--- /dev/null
+++ b/dev-java/commons-fileupload/files/build.xml.patch
@@ -0,0 +1,278 @@
+--- build.xml	2003-06-26 01:12:13.000000000 -0500
++++ build.xml.fixed	2004-02-25 18:06:28.836148792 -0500
+@@ -1,159 +1,115 @@
+-<?xml version="1.0" encoding="UTF-8"?>

+-

+-<!--

+-  build.xml generated by maven from project.xml version 1.0

+-  on date June 24 2003, time 2141

+--->

+-

+-<project default="jar" name="commons-fileupload" basedir=".">

+-  <property name="defaulttargetdir" value="target">

+-  </property>

+-  <property name="libdir" value="target/lib">

+-  </property>

+-  <property name="classesdir" value="target/classes">

+-  </property>

+-  <property name="testclassesdir" value="target/test-classes">

+-  </property>

+-  <property name="testreportdir" value="target/test-reports">

+-  </property>

+-  <property name="distdir" value="dist">

+-  </property>

+-  <property name="javadocdir" value="dist/docs/api">

+-  </property>

+-  <property name="final.name" value="commons-fileupload-1.0">

+-  </property>

+-  <target name="init" description="o Initializes some properties">

+-    <mkdir dir="${libdir}">

+-    </mkdir>

+-    <condition property="noget">

+-      <equals arg2="only" arg1="${build.sysclasspath}">

+-      </equals>

+-    </condition>

+-  </target>

+-  <target name="compile" description="o Compile the code" depends="get-deps">

+-    <mkdir dir="${classesdir}">

+-    </mkdir>

+-    <javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">

+-      <src>

+-        <pathelement location="src/java">

+-        </pathelement>

+-      </src>

+-      <classpath>

+-        <fileset dir="${libdir}">

+-          <include name="*.jar">

+-          </include>

+-        </fileset>

+-      </classpath>

+-    </javac>

+-  </target>

+-  <target name="jar" description="o Create the jar" depends="compile,test">

+-    <jar jarfile="target/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}">

+-    </jar>

+-  </target>

+-  <target name="clean" description="o Clean up the generated directories">

+-    <delete dir="${defaulttargetdir}">

+-    </delete>

+-    <delete dir="${distdir}">

+-    </delete>

+-  </target>

+-  <target name="dist" description="o Create a distribution" depends="jar, javadoc">

+-    <mkdir dir="dist">

+-    </mkdir>

+-    <copy todir="dist">

+-      <fileset dir="${defaulttargetdir}" includes="*.jar">

+-      </fileset>

+-      <fileset dir="${basedir}" includes="LICENSE*, README*">

+-      </fileset>

+-    </copy>

+-  </target>

+-  <target name="test" description="o Run the test cases" if="test.failure" depends="internal-test">

+-    <fail message="There were test failures.">

+-    </fail>

+-  </target>

+-  <target name="internal-test" depends="compile-tests">

+-    <mkdir dir="${testreportdir}">

+-    </mkdir>

+-    <junit dir="./" failureproperty="test.failure" printSummary="yes" fork="true" haltonerror="true">

+-      <sysproperty key="basedir" value=".">

+-      </sysproperty>

+-      <formatter type="xml">

+-      </formatter>

+-      <formatter usefile="false" type="plain">

+-      </formatter>

+-      <classpath>

+-        <fileset dir="${libdir}">

+-          <include name="*.jar">

+-          </include>

+-        </fileset>

+-        <pathelement path="${testclassesdir}">

+-        </pathelement>

+-        <pathelement path="${classesdir}">

+-        </pathelement>

+-      </classpath>

+-      <batchtest todir="${testreportdir}">

+-        <fileset dir="src/test">

+-          <include name="**/Test*.java">

+-          </include>

+-        </fileset>

+-      </batchtest>

+-    </junit>

+-  </target>

+-  <target name="compile-tests" depends="compile">

+-    <mkdir dir="${testclassesdir}">

+-    </mkdir>

+-    <javac destdir="${testclassesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">

+-      <src>

+-        <pathelement location="src/test">

+-        </pathelement>

+-      </src>

+-      <classpath>

+-        <fileset dir="${libdir}">

+-          <include name="*.jar">

+-          </include>

+-        </fileset>

+-        <pathelement path="${classesdir}">

+-        </pathelement>

+-      </classpath>

+-    </javac>

+-  </target>

+-  <target name="javadoc" description="o Generate javadoc" depends="jar">

+-    <mkdir dir="${javadocdir}">

+-    </mkdir>

+-    <tstamp>

+-      <format pattern="2002-yyyy" property="year">

+-      </format>

+-    </tstamp>

+-    <property name="copyright" value="Copyright &amp;copy; 2002-2003 Apache Software Foundation. All Rights Reserved.">

+-    </property>

+-    <property name="title" value="FileUpload 1.0 API">

+-    </property>

+-    <javadoc bottom="Copyright &amp;copy; 2002-2003 Apache Software Foundation. All Rights Reserved." windowtitle="FileUpload 1.0 API" use="true" private="true" destdir="${javadocdir}" author="true" doctitle="FileUpload 1.0 API" version="true" sourcepath="src/java" packagenames="org.apache.commons.fileupload.*">

+-      <classpath>

+-        <fileset dir="${libdir}">

+-          <include name="*.jar">

+-          </include>

+-        </fileset>

+-        <pathelement location="target/${final.name}.jar">

+-        </pathelement>

+-      </classpath>

+-    </javadoc>

+-  </target>

+-  <target name="get-deps" unless="noget" depends="init">

+-    <get dest="${libdir}/servletapi-2.3.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/servletapi/jars/servletapi-2.3.jar">

+-    </get>

+-    <get dest="${libdir}/junit-3.8.1.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/junit/jars/junit-3.8.1.jar">

+-    </get>

+-    <get dest="${libdir}/junit-3.8.1.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/junit/jars/junit-3.8.1.jar">

+-    </get>

+-    <get dest="${libdir}/ant-1.5.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/ant/jars/ant-1.5.jar">

+-    </get>

+-    <get dest="${libdir}/ant-optional-1.5.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/ant/jars/ant-optional-1.5.jar">

+-    </get>

+-  </target>

+-  <target name="install-maven">

+-    <get dest="${user.home}/maven-install-latest.jar" usetimestamp="true" src="${repo}/maven/maven-install-latest.jar">

+-    </get>

+-    <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar">

+-    </unjar>

+-  </target>

+-</project>
+\ No newline at end of file
++<?xml version="1.0" encoding="UTF-8"?>
++
++<!--
++  build.xml generated by maven from project.xml version 1.0
++  on date June 24 2003, time 2141
++-->
++
++<project default="jar" name="commons-fileupload" basedir=".">
++
++ <property file="build.properties"/>   
++ <path id="compile.classpath">
++    <pathelement location="target/classes"/>
++    <pathelement location="target/test-classes"/>
++    <pathelement location="target/test-reports"/>
++    <pathelement location="${servlet-api.jar}"/>
++    <pathelement location="${junit.jar}"/>
++  </path>
++  <property name="defaulttargetdir" value="target">
++  </property>
++  <property name="libdir" value="target/lib">
++  </property>
++  <property name="classesdir" value="target/classes">
++  </property>
++  <property name="testclassesdir" value="target/test-classes">
++  </property>
++  <property name="testreportdir" value="target/test-reports">
++  </property>
++  <property name="distdir" value="dist">
++  </property>
++  <property name="javadocdir" value="dist/docs/api">
++  </property>
++  <property name="final.name" value="commons-fileupload-1.0">
++  </property>
++  <target name="init" description="o Initializes some properties">
++    <mkdir dir="${libdir}">
++    </mkdir>
++  </target>
++  <target name="compile" description="o Compile the code">
++    <mkdir dir="${classesdir}">
++    </mkdir>
++    <javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
++      <src>
++        <pathelement location="src/java">
++        </pathelement>
++      </src>
++	  <classpath refid="compile.classpath"/>
++    </javac>
++  </target>
++  <target name="jar" description="o Create the jar" depends="compile">
++    <jar jarfile="target/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}">
++    </jar>
++  </target>
++  <target name="clean" description="o Clean up the generated directories">
++    <delete dir="${defaulttargetdir}">
++    </delete>
++    <delete dir="${distdir}">
++    </delete>
++  </target>
++  <target name="dist" description="o Create a distribution" depends="jar, javadoc">
++    <mkdir dir="dist">
++    </mkdir>
++    <copy todir="dist">
++      <fileset dir="${defaulttargetdir}" includes="*.jar">
++      </fileset>
++      <fileset dir="${basedir}" includes="LICENSE*, README*">
++      </fileset>
++    </copy>
++  </target>
++  <target name="compile-tests" depends="compile">
++    <mkdir dir="${testclassesdir}">
++    </mkdir>
++    <javac destdir="${testclassesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
++      <src>
++        <pathelement location="src/test">
++        </pathelement>
++      </src>
++      <classpath>
++        <fileset dir="${libdir}">
++          <include name="*.jar">
++          </include>
++        </fileset>
++        <pathelement path="${classesdir}">
++        </pathelement>
++      </classpath>
++    </javac>
++  </target>
++  <target name="javadoc" description="o Generate javadoc" depends="jar">
++    <mkdir dir="${javadocdir}">
++    </mkdir>
++    <tstamp>
++      <format pattern="2002-yyyy" property="year">
++      </format>
++    </tstamp>
++    <property name="copyright" value="Copyright &amp;copy; 2002-2003 Apache Software Foundation. All Rights Reserved.">
++    </property>
++    <property name="title" value="FileUpload 1.0 API">
++    </property>
++    <javadoc bottom="Copyright &amp;copy; 2002-2003 Apache Software Foundation. All Rights Reserved." windowtitle="FileUpload 1.0 API" use="true" private="true" destdir="${javadocdir}" author="true" doctitle="FileUpload 1.0 API" version="true" sourcepath="src/java" packagenames="org.apache.commons.fileupload.*">
++      <classpath>
++        <fileset dir="${libdir}">
++          <include name="*.jar">
++          </include>
++        </fileset>
++        <pathelement location="target/${final.name}.jar">
++        </pathelement>
++      </classpath>
++    </javadoc>
++  </target>
++  <target name="install-maven">
++    <get dest="${user.home}/maven-install-latest.jar" usetimestamp="true" src="${repo}/maven/maven-install-latest.jar">
++    </get>
++    <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar">
++    </unjar>
++  </target>
++</project>
diff --git a/dev-java/commons-fileupload/files/digest-commons-fileupload-1.0 b/dev-java/commons-fileupload/files/digest-commons-fileupload-1.0
new file mode 100644
index 000000000000..76e12dbc3556
--- /dev/null
+++ b/dev-java/commons-fileupload/files/digest-commons-fileupload-1.0
@@ -0,0 +1 @@
+MD5 c6fa0cc10e18cffa8c479c6cb61914b8 commons-fileupload-1.0-src.tar.gz 29737