Version bump. x86-fbsd dropped for now as deps need to be keyworded.

(Portage version: 2.2_rc1/cvs/Linux 2.6.25-gentoo-r5 x86_64)

3 files changed, 108 insertions, 1 deletions

diff --git a/dev-java/commons-fileupload/ChangeLog b/dev-java/commons-fileupload/ChangeLog
index 54b282f582c7..721b36c9d840 100644
--- a/dev-java/commons-fileupload/ChangeLog
+++ b/dev-java/commons-fileupload/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/commons-fileupload
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-fileupload/ChangeLog,v 1.48 2008/05/03 19:33:08 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-fileupload/ChangeLog,v 1.49 2008/06/21 18:19:35 fordfrog Exp $
+
+*commons-fileupload-1.2.1 (21 Jun 2008)
+
+  21 Jun 2008; Miroslav Šulc <fordfrog@gentoo.org>
+  +files/commons-fileupload-1.2.1-gentoo.patch,
+  +commons-fileupload-1.2.1.ebuild:
+  Version bump.
 
   03 May 2008; Christian Faulhammer <opfer@gentoo.org>
   commons-fileupload-1.2-r1.ebuild:
diff --git a/dev-java/commons-fileupload/commons-fileupload-1.2.1.ebuild b/dev-java/commons-fileupload/commons-fileupload-1.2.1.ebuild
new file mode 100644
index 000000000000..72440bd27961
--- /dev/null
+++ b/dev-java/commons-fileupload/commons-fileupload-1.2.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2008 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.2.1.ebuild,v 1.1 2008/06/21 18:19:35 fordfrog Exp $
+
+JAVA_PKG_IUSE="doc source"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="A Java library for adding robust, high-performance, file upload capability to your servlets and web applications."
+HOMEPAGE="http://hc.apache.org"
+SRC_URI="mirror://apache/commons/fileupload/source/${P}-src.tar.gz"
+COMMON_DEPEND=">=dev-java/commons-io-1.3
+	=dev-java/portletapi-1*
+	~java-virtuals/servlet-api-2.4"
+DEPEND=">=virtual/jdk-1.4
+	test? (
+		dev-java/ant-junit
+		=dev-java/junit-3.8*
+	)
+	${COMMON_DEPEND}"
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEPEND}"
+LICENSE="Apache-2.0"
+JAVA_PKG_FILTER_COMPILER="jikes"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+S="${WORKDIR}/${P}-src"
+
+EANT_EXTRA_ARGS="-Dnoget=true -Dcommons-io.jar=true"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	# Tweak build classpath and don't automatically run tests
+	epatch "${FILESDIR}/${P}-gentoo.patch"
+	local libdir="${S}/target/lib"
+	mkdir -p ${libdir}/commons-io/jars -p  ${libdir}/javax.servlet/jars -p  ${libdir}/javax.portlet/jars
+	java-pkg_jar-from --into ${libdir}/commons-io/jars commons-io-1 commons-io.jar commons-io-1.3.2.jar
+	java-pkg_jar-from --into ${libdir}/javax.servlet/jars --virtual servlet-api-2.4 servlet-api.jar servlet-api-2.4.jar
+	java-pkg_jar-from --into ${libdir}/javax.portlet/jars portletapi-1 portletapi.jar portlet-api-1.0.jar
+}
+
+src_test() {
+	mkdir -p target/lib/junit/jars
+	java-pkg_jar-from --into "${S}"/target/lib/junit/jars junit junit.jar junit-3.8.1.jar
+	ANT_TASKS="ant-junit" eant test
+}
+
+src_install() {
+	java-pkg_newjar target/${P}.jar ${PN}.jar
+	use doc && java-pkg_dojavadoc dist/docs/api
+	use source && java-pkg_dosrc src/java/*
+}
diff --git a/dev-java/commons-fileupload/files/commons-fileupload-1.2.1-gentoo.patch b/dev-java/commons-fileupload/files/commons-fileupload-1.2.1-gentoo.patch
new file mode 100644
index 000000000000..852de25cd2a3
--- /dev/null
+++ b/dev-java/commons-fileupload/files/commons-fileupload-1.2.1-gentoo.patch
@@ -0,0 +1,45 @@
+--- build.xml.orig	2008-06-21 20:06:11.000000000 +0200
++++ build.xml	2008-06-21 20:07:03.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="target/lib">
+   </property>
+   <property name="classesdir" value="${basedir}/target/classes">
+   </property>
+@@ -74,7 +74,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">
+@@ -94,7 +94,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>
+@@ -172,7 +172,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>
+@@ -295,4 +295,4 @@
+     <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar">
+     </unjar>
+   </target>
+-</project>
+\ Chybí znak konce řádku na konci souboru
++</project>