Version bump. Corrected runtime dependencies (they were only build time dependencies...

Package-Manager: portage-2.1.2.2

diff --git a/dev-java/commons-fileupload/ChangeLog b/dev-java/commons-fileupload/ChangeLog
index 875bd15dd018616febfea1b2b68c3c9442858785..b9d6e0844f1ac71ffed012a77e6e6f10d2ac28a9 100644 (file)
--- 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 721c1df3c30ddd7b5d795892152edceefb2fb386..6fa09d3739c4c4968f88be475106941d187c987f 100644 (file)
--- 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 (file)
index 0000000..15640c9
--- /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 (file)
index 0000000..4a09f63
--- /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 (file)
index 0000000..cb7fea0
--- /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

diff --git a/dev-java/commons-io/Manifest b/dev-java/commons-io/Manifest
index 3d356c6d7661c0587105cb3fed385e00a9d9b097..f04d0a31d80c5b75ec2cab96aa0c5d0dcc818138 100644 (file)
--- a/dev-java/commons-io/Manifest
+++ b/dev-java/commons-io/Manifest
@@ -6,20 +6,29 @@ AUX commons-io-1.3-build.xml.patch 1026 RMD160 f8fdd740aea41e8e54dd09f0a2585da43
 MD5 57e860da0874edeb8492e4df9dcf81b9 files/commons-io-1.3-build.xml.patch 1026
 RMD160 f8fdd740aea41e8e54dd09f0a2585da43e2dc9b2 files/commons-io-1.3-build.xml.patch 1026
 SHA256 e4c6b2738d4b8e4a269153cc8d20ecbcc5c0fd03340dfc7d5538ab094c552fd1 files/commons-io-1.3-build.xml.patch 1026
+AUX commons-io-1.3.1-build.xml.patch 1026 RMD160 f8fdd740aea41e8e54dd09f0a2585da43e2dc9b2 SHA1 f5bdd83e997dfd49329895eb21d18efa73f431b4 SHA256 e4c6b2738d4b8e4a269153cc8d20ecbcc5c0fd03340dfc7d5538ab094c552fd1
+MD5 57e860da0874edeb8492e4df9dcf81b9 files/commons-io-1.3.1-build.xml.patch 1026
+RMD160 f8fdd740aea41e8e54dd09f0a2585da43e2dc9b2 files/commons-io-1.3.1-build.xml.patch 1026
+SHA256 e4c6b2738d4b8e4a269153cc8d20ecbcc5c0fd03340dfc7d5538ab094c552fd1 files/commons-io-1.3.1-build.xml.patch 1026
 DIST commons-io-1.1-src.tar.gz 197922 RMD160 ad7be482ee4eebcdc193fe78497ed17394309ab1 SHA1 25a9302eaee611655ead3cd7e1a087e8ab745a99 SHA256 375983a026c86afee9b07405a616b3614de3f844b2530d54a5f12c06a666b92c
 DIST commons-io-1.3-src.tar.gz 691864 RMD160 37422ddcff592f45a6fc9e90312d349a6410993b SHA1 06f9922ab64968b5e9e40aba8e7976bc480f8ba8 SHA256 80b6b207f062a65d891f6db453f4b25ad7704a83e75cd8184d4a7d3166aa6035
+DIST commons-io-1.3.1-src.tar.gz 689667 RMD160 0b063b148c75b35667756bca0ad62401fb5819df SHA1 b2c7c38b64092d450abfb03a96b340859aa81f77 SHA256 879c22591694bfee6e4d74f613c7369f8f030362e5e7a8f4c20975fc773e3acc
 EBUILD commons-io-1.1-r1.ebuild 1463 RMD160 27915fdce8cb9578e050bfdb5b905b21e862ae5b SHA1 d208026d68a329bdab4f6d754ae92e5d94f66b18 SHA256 3f59ee7665a3bbad9cdb3f3b5d0f26f5c4b93b3fd74be4786c0484bbb4b6afb7
 MD5 cbc392b291fd139551a58db7017918be commons-io-1.1-r1.ebuild 1463
 RMD160 27915fdce8cb9578e050bfdb5b905b21e862ae5b commons-io-1.1-r1.ebuild 1463
 SHA256 3f59ee7665a3bbad9cdb3f3b5d0f26f5c4b93b3fd74be4786c0484bbb4b6afb7 commons-io-1.1-r1.ebuild 1463
+EBUILD commons-io-1.3.1.ebuild 1532 RMD160 d0889bf0a5a58b995c6f3684908670addae6d813 SHA1 e343bcb81f999fa932f6ac609eccc780abe4aee1 SHA256 01a12ceb88fbdf54a574d41b3a78c86b93388a3bb38b5f081f1cd978d1c60ff3
+MD5 555ecdcfb9e18bdb549e7e3e98071159 commons-io-1.3.1.ebuild 1532
+RMD160 d0889bf0a5a58b995c6f3684908670addae6d813 commons-io-1.3.1.ebuild 1532
+SHA256 01a12ceb88fbdf54a574d41b3a78c86b93388a3bb38b5f081f1cd978d1c60ff3 commons-io-1.3.1.ebuild 1532
 EBUILD commons-io-1.3.ebuild 1526 RMD160 ea538540a707a358eb42b4d11db4ff95ea74be0d SHA1 e90262e86ac83d112291a2e9aa55801ad47916d3 SHA256 62d5e47d2aafcad1ffbb515d2d99a9cba37870249ddde4d1db6e8b438a41e85a
 MD5 0e15b7984cd742ab3fe259027d528f8e commons-io-1.3.ebuild 1526
 RMD160 ea538540a707a358eb42b4d11db4ff95ea74be0d commons-io-1.3.ebuild 1526
 SHA256 62d5e47d2aafcad1ffbb515d2d99a9cba37870249ddde4d1db6e8b438a41e85a commons-io-1.3.ebuild 1526
-MISC ChangeLog 3338 RMD160 29d0c387017c9770a4393c687704386d5feea423 SHA1 51acbeecc1775a700aa95ef5db908fa9e3ccb3f0 SHA256 8de22184c085d6ef8a0534f4342537cafd4b999451721fc6d44556cb88164f1b
-MD5 973615237bd4b885293bf867263a2de6 ChangeLog 3338
-RMD160 29d0c387017c9770a4393c687704386d5feea423 ChangeLog 3338
-SHA256 8de22184c085d6ef8a0534f4342537cafd4b999451721fc6d44556cb88164f1b ChangeLog 3338
+MISC ChangeLog 3510 RMD160 ac42ff0f8b62d5444bc1e03c133802a1d8fbe7db SHA1 f2d3a4fb0470080ea4d26a1d51df76496d01a22a SHA256 da442f02939324f2d9ddcb6b0efcb190be9eaeed6326682e364b018ee5a64d6e
+MD5 1bf190fbc806104f1449c465fdc15a5f ChangeLog 3510
+RMD160 ac42ff0f8b62d5444bc1e03c133802a1d8fbe7db ChangeLog 3510
+SHA256 da442f02939324f2d9ddcb6b0efcb190be9eaeed6326682e364b018ee5a64d6e ChangeLog 3510
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -30,3 +39,6 @@ SHA256 e61a0c2ef412f92221612ef4339403b97a7251b950e4e0216f383b6a193dad47 files/di
 MD5 d3ef03f7921f2288f07998a5006fde68 files/digest-commons-io-1.3 256
 RMD160 a35204a059bb4edff2ae1a39b260750b10bf0476 files/digest-commons-io-1.3 256
 SHA256 4bcd7435807c9a7ffa3bf85d7d51db35051a537c3f53a504300c1aa128cea212 files/digest-commons-io-1.3 256
+MD5 b2c1bcef906a782cde0e1b0b6d4d1ee4 files/digest-commons-io-1.3.1 262
+RMD160 34b8af7b2708c91cc15a70b02793317436abb3a5 files/digest-commons-io-1.3.1 262
+SHA256 a6f7ca7a29e0f9708c47f0ddf7e9717eb4c72e3f30255b7deae4bb1f95a76045 files/digest-commons-io-1.3.1 262