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

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25-gentoo-r5 x86_64

4 files changed, 112 insertions, 12 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/Manifest b/dev-java/commons-fileupload/Manifest
index 6f73bbeb2a5c..9accfb644e09 100644
--- a/dev-java/commons-fileupload/Manifest
+++ b/dev-java/commons-fileupload/Manifest
@@ -1,17 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX commons-fileupload-1.1.1-gentoo.patch 2307 RMD160 61fa5207927582c182736eb5ca220f9587587159 SHA1 886468e0debb117384e23352ccff6932078c7aa7 SHA256 495e1ea886e2d10abfffbd6f04ba38abf3754ed22f980fd8157c7f5a743e0874
 AUX commons-fileupload-1.2-gentoo.patch 2567 RMD160 b68ddad4e9e4ed4b024fb2c62bd4d214f8ad9d82 SHA1 6ebbc21736bfeb3a263ff91fbd1ee52156ab4841 SHA256 23e41d04a40243ab2926016c01b74907a522b54f5aa21945eb7caa9cdf9822d0
+AUX commons-fileupload-1.2.1-gentoo.patch 1602 RMD160 af861fa75cafd44497aea9a14f41d1096c98b976 SHA1 a12da51f4e1ee67f05649ef173fd4cc67e0fa1d8 SHA256 a01aaadf74351bbdc35cd5dad1d85ef0708c8d0b6c89d1db9c535a2d15067dd2
 DIST commons-fileupload-1.2-src.tar.gz 121294 RMD160 839522ae96c1dccd15f8b67c53df75905053b844 SHA1 c5d7744f6d6bb6e13631071797936f7e2505f6fd SHA256 9018336f668ceb319d46ffd2ab1a8debfe174fccc0e0553e53d00a3aa75de999
+DIST commons-fileupload-1.2.1-src.tar.gz 149613 RMD160 6025029680b33f8f440685b325e6a0313cfabc91 SHA1 339688282a2ad99c251f6341efbfef33c4bce527 SHA256 08905cb3a0db4f7fa67f3b579b2c481060334d50d7f913c6974c7513243152f5
 EBUILD commons-fileupload-1.2-r1.ebuild 1837 RMD160 670a1f74b627bcde2c248de7fb09b08a6009a6a2 SHA1 8f9dbd625e6bd8eed75cc2f56ba71eb5c8269dbb SHA256 739beb1da833cf01e2c10e822065e64ec4688863a1bbf3d114975cd0ccc20365
+EBUILD commons-fileupload-1.2.1.ebuild 1885 RMD160 88533d5d59c86bc5e3b21d3c5eae6671a4822385 SHA1 6bc7a456d27e8e7f6096830e41c92cd9d7e9464a SHA256 0e8d09d8aab92c3438bdaa6198fdaac84ba6d7e06eebcbb26eb17d77589f31ee
 EBUILD commons-fileupload-1.2.ebuild 1784 RMD160 11373698cb31e39cd9a99dc6cc14a4b898fcfb61 SHA1 8b3cba8541854a967a014631898d4a0d0113aefe SHA256 93e788bd21e3b9d2059197bb38564f3f9067180a13c4b5737e2a9e1f7248ce94
-MISC ChangeLog 6582 RMD160 fe2fb1d22741467d492bba00589dfa455a0d8bab SHA1 beb7d79f38a4257a86ad2a5799b97ab90c8957f2 SHA256 872dae7ed5f7aeea5fabd8bceefd7077d71694786e2f61b39f1669035c1c33a8
+MISC ChangeLog 6779 RMD160 c039cddea04d930066549d9cc1411bce1a82aa34 SHA1 fc9a4afe8ff0509911f6bf6e1e96b66956b60c9a SHA256 672c144bdabf4e8b454219b60bfa43f4afc04fb2302b3af10d63979dd30ba6e6
 MISC metadata.xml 671 RMD160 895cae12deb9c4ed95f4eaace3b0e3b7660319e8 SHA1 49752e593b3f67367fbaaa7bfab27f8085b6df3b SHA256 5e208644d6c279e798b5991dff81a225dbb4408ec4eda8b6720b7e8c39e82739
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkgcvfoACgkQNQqtfCuFnePcJgCfagV/qqFJl1T3dT/Rqk+vFkRf
-XUcAniUSIXzVCLn6QciYfBKi9XaKhrrf
-=fT2+
------END PGP SIGNATURE-----
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>