Version bump. Contributed by Miroslav Sulc <miroslav.sulc@startnet.cz>, bug #143433.

(Portage version: 2.1.2_pre2-r6)

4 files changed, 118 insertions, 1 deletions

diff --git a/dev-java/commons-fileupload/ChangeLog b/dev-java/commons-fileupload/ChangeLog
index 356530d0f4a6..d1aaed2b10a6 100644
--- a/dev-java/commons-fileupload/ChangeLog
+++ b/dev-java/commons-fileupload/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-java/commons-fileupload
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-fileupload/ChangeLog,v 1.23 2006/10/05 15:25:36 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-fileupload/ChangeLog,v 1.24 2006/10/09 02:28:15 nichoj Exp $
+
+*commons-fileupload-1.1.1 (09 Oct 2006)
+
+  09 Oct 2006; Joshua Nichols <nichoj@gentoo.org>
+  +files/commons-fileupload-1.1.1-gentoo.patch,
+  +commons-fileupload-1.1.1.ebuild:
+  Version bump. Contributed by Miroslav Sulc <miroslav.sulc@startnet.cz>, bug
+  #143433.
 
   05 Oct 2006; Gustavo Zacarias <gustavoz@gentoo.org>
   commons-fileupload-1.0.ebuild, commons-fileupload-1.0-r1.ebuild:
diff --git a/dev-java/commons-fileupload/commons-fileupload-1.1.1.ebuild b/dev-java/commons-fileupload/commons-fileupload-1.1.1.ebuild
new file mode 100644
index 000000000000..f517c2c2bb1b
--- /dev/null
+++ b/dev-java/commons-fileupload/commons-fileupload-1.1.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-fileupload/commons-fileupload-1.1.1.ebuild,v 1.1 2006/10/09 02:28:15 nichoj Exp $
+
+inherit eutils java-pkg-2 java-ant-2
+
+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/"
+SRC_URI="mirror://apache/jakarta/commons/fileupload/source/${P}-src.tar.gz"
+DEPEND=">=virtual/jdk-1.3
+	>=dev-java/ant-core-1.5
+	~dev-java/servletapi-2.3
+	=dev-java/commons-io-1*
+	=dev-java/portletapi-1*
+	source? ( app-arch/unzip )"
+RDEPEND=">=virtual/jre-1.3"
+LICENSE="Apache-2.0"
+SLOT="0"
+# Missing dependencies: need package for javax.portlet.
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="doc source"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	# Tweak build classpath and don't automatically run tests
+	epatch "${FILESDIR}/${P}-gentoo.patch"
+	local libdir="target/lib"
+	mkdir -p ${libdir}/commons-io/jars -p  ${libdir}/javax.servlet/jars -p  ${libdir}/javax.portlet/jars
+	cd ${libdir}/commons-io/jars
+	java-pkg_jar-from commons-io-1
+	cd "${S}"/${libdir}/javax.servlet/jars
+	java-pkg_jar-from servletapi-2.3
+	cd "${S}"/${libdir}/javax.portlet/jars
+	java-pkg_jar-from portletapi-1
+}
+
+src_compile() {
+	eant -Dlibdir="${S}"/target/lib jar -Dnoget=true $(use_doc)
+}
+
+src_install() {
+	java-pkg_newjar target/${PN}-1.2-SNAPSHOT.jar ${PN}.jar
+	use doc && java-pkg_dohtml -r dist/docs/
+	use source && java-pkg_dosrc src/java/*
+}
diff --git a/dev-java/commons-fileupload/files/commons-fileupload-1.1.1-gentoo.patch b/dev-java/commons-fileupload/files/commons-fileupload-1.1.1-gentoo.patch
new file mode 100644
index 000000000000..f9fa2fb47ba5
--- /dev/null
+++ b/dev-java/commons-fileupload/files/commons-fileupload-1.1.1-gentoo.patch
@@ -0,0 +1,60 @@
+--- build.xml.original	2006-09-23 00:11:00.000000000 +0200
++++ build.xml	2006-09-23 00:24:15.000000000 +0200
+@@ -14,7 +14,7 @@
+ 
+   <property name="defaulttargetdir" value="${basedir}/target">
+   </property>
+-  <property name="libdir" value="${user.home}/.maven/repository">
++  <property name="libdir" value="${basedir}/target/lib">
+   </property>
+   <property name="classesdir" value="${basedir}/target/classes">
+   </property>
+@@ -37,11 +37,11 @@
+   <property name="proxy.password" value="">
+   </property>
+   <path id="build.classpath">
+-    <pathelement location="${libdir}/commons-io/jars/commons-io-1.1.jar">
++    <pathelement location="${libdir}/commons-io/jars/commons-io.jar">
+     </pathelement>
+-    <pathelement location="${libdir}/javax.servlet/jars/servlet-api-2.3.jar">
++    <pathelement location="${libdir}/javax.servlet/jars/servlet.jar">
+     </pathelement>
+-    <pathelement location="${libdir}/javax.portlet/jars/portlet-api-1.0.jar">
++    <pathelement location="${libdir}/javax.portlet/jars/portletapi.jar">
+     </pathelement>
+     <pathelement location="${libdir}/junit/jars/junit-3.8.1.jar">
+     </pathelement>
+@@ -70,7 +70,7 @@
+       </and>
+     </condition>
+   </target>
+-  <target name="compile" description="o Compile the code" depends="get-deps">
++  <target name="compile" description="o Compile the code" depends="">
+     <mkdir dir="${classesdir}">
+     </mkdir>
+     <javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
+@@ -90,7 +90,7 @@
+       </fileset>
+     </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="**/package.html" basedir="${classesdir}">
+     </jar>
+   </target>
+@@ -167,7 +167,7 @@
+       </fileset>
+     </copy>
+   </target>
+-  <target name="javadoc" description="o Generate javadoc" depends="get-deps">
++  <target name="javadoc" description="o Generate javadoc" depends="">
+     <mkdir dir="${javadocdir}">
+     </mkdir>
+     <tstamp>
+@@ -254,4 +254,4 @@
+     <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar">
+     </unjar>
+   </target>
+-</project>
+\ No newline at end of file
++</project>
diff --git a/dev-java/commons-fileupload/files/digest-commons-fileupload-1.1.1 b/dev-java/commons-fileupload/files/digest-commons-fileupload-1.1.1
new file mode 100644
index 000000000000..3fa031826041
--- /dev/null
+++ b/dev-java/commons-fileupload/files/digest-commons-fileupload-1.1.1
@@ -0,0 +1,3 @@
+MD5 d003445638bc272512112ace08d63bbb commons-fileupload-1.1.1-src.tar.gz 97848
+RMD160 d1b25e025d70cf9e879f76fd36c439d1fb755ad2 commons-fileupload-1.1.1-src.tar.gz 97848
+SHA256 0165ed4c84299196d98047f054ee5f1d5da9cceedba2652597cd06615a4cf102 commons-fileupload-1.1.1-src.tar.gz 97848