Version bump. Corrected runtime dependencies (they were only build time dependencies before) and added tests.

Package-Manager: portage-2.1.2.2

5 files changed, 134 insertions, 5 deletions

diff --git a/dev-java/commons-fileupload/ChangeLog b/dev-java/commons-fileupload/ChangeLog
index 875bd15dd018..b9d6e0844f1a 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-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-fileupload/ChangeLog,v 1.31 2007/01/21 02:12:50 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-fileupload/ChangeLog,v 1.32 2007/03/16 20:15:15 fordfrog Exp $
+
+*commons-fileupload-1.2 (16 Mar 2007)
+
+  16 Mar 2007; Miroslav Šulc <fordfrog@gentoo.org>
+  +files/commons-fileupload-1.2-gentoo.patch,
+  +commons-fileupload-1.2.ebuild:
+  Version bump. Corrected runtime dependencies (they were only build time
+  dependencies before) and added tests.
 
   21 Jan 2007; Vlastimil Babka <caster@gentoo.org> -files/build.xml.patch,
   -commons-fileupload-1.0.ebuild, -commons-fileupload-1.0-r1.ebuild,
diff --git a/dev-java/commons-fileupload/Manifest b/dev-java/commons-fileupload/Manifest
index 721c1df3c30d..6fa09d3739c4 100644
--- a/dev-java/commons-fileupload/Manifest
+++ b/dev-java/commons-fileupload/Manifest
@@ -2,15 +2,24 @@ AUX commons-fileupload-1.1.1-gentoo.patch 2307 RMD160 61fa5207927582c182736eb5ca
 MD5 74654a1e2d0c599583e25ade8a1d4491 files/commons-fileupload-1.1.1-gentoo.patch 2307
 RMD160 61fa5207927582c182736eb5ca220f9587587159 files/commons-fileupload-1.1.1-gentoo.patch 2307
 SHA256 495e1ea886e2d10abfffbd6f04ba38abf3754ed22f980fd8157c7f5a743e0874 files/commons-fileupload-1.1.1-gentoo.patch 2307
+AUX commons-fileupload-1.2-gentoo.patch 2567 RMD160 b68ddad4e9e4ed4b024fb2c62bd4d214f8ad9d82 SHA1 6ebbc21736bfeb3a263ff91fbd1ee52156ab4841 SHA256 23e41d04a40243ab2926016c01b74907a522b54f5aa21945eb7caa9cdf9822d0
+MD5 0124e49d45683ee9c1413f79db99e5b6 files/commons-fileupload-1.2-gentoo.patch 2567
+RMD160 b68ddad4e9e4ed4b024fb2c62bd4d214f8ad9d82 files/commons-fileupload-1.2-gentoo.patch 2567
+SHA256 23e41d04a40243ab2926016c01b74907a522b54f5aa21945eb7caa9cdf9822d0 files/commons-fileupload-1.2-gentoo.patch 2567
 DIST commons-fileupload-1.1.1-src.tar.gz 97848 RMD160 d1b25e025d70cf9e879f76fd36c439d1fb755ad2 SHA1 68f50c0313667d076905423687fa0cc26fa74529 SHA256 0165ed4c84299196d98047f054ee5f1d5da9cceedba2652597cd06615a4cf102
+DIST commons-fileupload-1.2-src.tar.gz 121294 RMD160 839522ae96c1dccd15f8b67c53df75905053b844 SHA1 c5d7744f6d6bb6e13631071797936f7e2505f6fd SHA256 9018336f668ceb319d46ffd2ab1a8debfe174fccc0e0553e53d00a3aa75de999
 EBUILD commons-fileupload-1.1.1.ebuild 1559 RMD160 f590acdd01c5c9ea744bd550a9a3fce8643f9631 SHA1 be23c12b06bee8c9e9dbe70565f4490bcaa21383 SHA256 54dd8178b75ffd30a14174b9ef989867a8271babed042b7ae676351689aeafb4
 MD5 41e563177d0071d7cc3814e2502c1aa3 commons-fileupload-1.1.1.ebuild 1559
 RMD160 f590acdd01c5c9ea744bd550a9a3fce8643f9631 commons-fileupload-1.1.1.ebuild 1559
 SHA256 54dd8178b75ffd30a14174b9ef989867a8271babed042b7ae676351689aeafb4 commons-fileupload-1.1.1.ebuild 1559
-MISC ChangeLog 4248 RMD160 c1902820376d97303c9ca18628ad2f50362355f4 SHA1 f02237313124874c60b4e9fff97e87d929847bf2 SHA256 1a744c5647475d35a89bc5d7b97880ce48677f129e22e21546787b3d0a59d0dc
-MD5 76c837426933ce0080f7cf566370ffc4 ChangeLog 4248
-RMD160 c1902820376d97303c9ca18628ad2f50362355f4 ChangeLog 4248
-SHA256 1a744c5647475d35a89bc5d7b97880ce48677f129e22e21546787b3d0a59d0dc ChangeLog 4248
+EBUILD commons-fileupload-1.2.ebuild 1905 RMD160 1522bee71587f392b7bbb6ad6af9743c1bba1fd2 SHA1 71385ef2898f1044fa9520ad43ac2bb0df63dd8e SHA256 0b833ad71a55302d92965972ea40c2053adba987ad393d416d826d20e5d112e4
+MD5 ea9ba9e47e0a5560d93db38eb4c71da8 commons-fileupload-1.2.ebuild 1905
+RMD160 1522bee71587f392b7bbb6ad6af9743c1bba1fd2 commons-fileupload-1.2.ebuild 1905
+SHA256 0b833ad71a55302d92965972ea40c2053adba987ad393d416d826d20e5d112e4 commons-fileupload-1.2.ebuild 1905
+MISC ChangeLog 4536 RMD160 1b5eab766a8a11429240b891559838e93f44f154 SHA1 eca1c8304624bbc5f5660ae4bc1c88551f215d51 SHA256 414e8723a43164bdee719e552fbff900f028cd7cd89a1d4e5ecb11c555847503
+MD5 8c3b86c3b9ce3b1c353f3981061607ca ChangeLog 4536
+RMD160 1b5eab766a8a11429240b891559838e93f44f154 ChangeLog 4536
+SHA256 414e8723a43164bdee719e552fbff900f028cd7cd89a1d4e5ecb11c555847503 ChangeLog 4536
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -18,3 +27,6 @@ SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 metadata
 MD5 c280b78e96fd770091e553eebddc5066 files/digest-commons-fileupload-1.1.1 283
 RMD160 9774c415cf88484b1d6fc6b2f2cd669b24b212e4 files/digest-commons-fileupload-1.1.1 283
 SHA256 2c10a8208d9ccc1b94036d466fedb09309acf0ee557ae3291f06846776420f3d files/digest-commons-fileupload-1.1.1 283
+MD5 298e96a56db6a66c3882543ea88b1098 files/digest-commons-fileupload-1.2 280
+RMD160 69f5f0c17d860ae0d24c63c17401bc64541a63d3 files/digest-commons-fileupload-1.2 280
+SHA256 f7fcb1097ecfe881606b3c1d780118310a0b056c1d8421ad31100bebf1739ef1 files/digest-commons-fileupload-1.2 280
diff --git a/dev-java/commons-fileupload/commons-fileupload-1.2.ebuild b/dev-java/commons-fileupload/commons-fileupload-1.2.ebuild
new file mode 100644
index 000000000000..15640c96b7c3
--- /dev/null
+++ b/dev-java/commons-fileupload/commons-fileupload-1.2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2007 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.ebuild,v 1.1 2007/03/16 20:15:15 fordfrog Exp $
+
+JAVA_PKG_IUSE="doc source"
+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"
+COMMON_DEPEND=">=dev-java/commons-io-1.1
+	=dev-java/portletapi-1*
+	~dev-java/servletapi-2.3"
+DEPEND=">=virtual/jdk-1.3
+	source? ( app-arch/unzip )
+	!test? ( >=dev-java/ant-core-1.5 )
+	test? (
+		>=dev-java/ant-1.5
+		=dev-java/junit-3.8*
+	)
+	${COMMON_DEPEND}"
+RDEPEND=">=virtual/jre-1.3
+	${COMMON_DEPEND}"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="test"
+
+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.jar
+	java-pkg_jar-from --into ${libdir}/javax.servlet/jars servletapi-2.3 servlet.jar servlet-api-2.3.jar
+	java-pkg_jar-from --into ${libdir}/javax.portlet/jars portletapi-1 portletapi.jar portlet-api-1.0.jar
+}
+
+EANT_BUILD_TARGET="jar"
+EANT_DOC_TARGET="javadoc"
+
+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
+	eant test
+}
+
+src_install() {
+	java-pkg_newjar target/${P}.jar ${PN}.jar
+	use doc && java-pkg_dojavadoc dist/docs
+	use source && java-pkg_dosrc src/java/*
+}
diff --git a/dev-java/commons-fileupload/files/commons-fileupload-1.2-gentoo.patch b/dev-java/commons-fileupload/files/commons-fileupload-1.2-gentoo.patch
new file mode 100644
index 000000000000..4a09f6372598
--- /dev/null
+++ b/dev-java/commons-fileupload/files/commons-fileupload-1.2-gentoo.patch
@@ -0,0 +1,52 @@
+--- build.xml.original	2007-03-16 20:05:51.000000000 +0100
++++ build.xml	2007-03-16 20:27:58.000000000 +0100
+@@ -8,13 +8,13 @@
+   <property file="${user.home}/build.properties"></property>
+   <!--Build properties-->
+   <property name="defaulttargetdir" value="${basedir}/target"></property>
+-  <property name="libdir" value="${user.home}/.maven/repository"></property>
++  <property name="libdir" value="target/lib"></property>
+   <property name="classesdir" value="${basedir}/target/classes"></property>
+   <property name="testclassesdir" value="${basedir}/target/test-classes"></property>
+   <property name="testreportdir" value="${basedir}/target/test-reports"></property>
+   <property name="distdir" value="${basedir}/dist"></property>
+   <property name="javadocdir" value="${basedir}/dist/docs/api"></property>
+-  <property name="final.name" value="commons-fileupload-1.2rc3"></property>
++  <property name="final.name" value="commons-fileupload-1.2"></property>
+   <property name="proxy.host" value=""></property>
+   <property name="proxy.port" value=""></property>
+   <property name="proxy.username" value=""></property>
+@@ -44,7 +44,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">
+       <src>
+@@ -59,7 +59,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>
+   <target name="clean" description="o Clean up the generated directories">
+@@ -116,7 +116,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>
+       <format pattern="2002-yyyy" property="year"></format>
+@@ -199,4 +199,4 @@
+     <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>
+\ Chybí znak konce řádku na konci souboru
++</project>
diff --git a/dev-java/commons-fileupload/files/digest-commons-fileupload-1.2 b/dev-java/commons-fileupload/files/digest-commons-fileupload-1.2
new file mode 100644
index 000000000000..cb7fea0cf056
--- /dev/null
+++ b/dev-java/commons-fileupload/files/digest-commons-fileupload-1.2
@@ -0,0 +1,3 @@
+MD5 fabdbef7de172cbcc45b2279a1840090 commons-fileupload-1.2-src.tar.gz 121294
+RMD160 839522ae96c1dccd15f8b67c53df75905053b844 commons-fileupload-1.2-src.tar.gz 121294
+SHA256 9018336f668ceb319d46ffd2ab1a8debfe174fccc0e0553e53d00a3aa75de999 commons-fileupload-1.2-src.tar.gz 121294