7 files changed, 48 insertions, 53 deletions
diff --git a/dev-java/commons-io/ChangeLog b/dev-java/commons-io/ChangeLog
index f16a2d2870ad..9fc1923efa09 100644
--- a/dev-java/commons-io/ChangeLog
+++ b/dev-java/commons-io/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-java/commons-io
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-io/ChangeLog,v 1.15 2007/01/22 12:39:23 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-io/ChangeLog,v 1.16 2007/02/09 21:27:01 fordfrog Exp $
+
+*commons-io-1.3 (09 Feb 2007)
+
+  09 Feb 2007; Miroslav Šulc <fordfrog@gentoo.org>
+  -files/commons-io-1.0-gentoo.diff, -files/commons-io-1.2-gentoo.diff,
+  +files/commons-io-1.3-build.xml.patch, -commons-io-1.2.ebuild,
+  +commons-io-1.3.ebuild:
+  Removed commons-io-1.2 because a test was failing (problem in ebuild and
+  access rights), and replaced with commons-io-1.3 version bump.
 
   22 Jan 2007; Vlastimil Babka <caster@gentoo.org> commons-io-1.2.ebuild:
   Fix dojavadoc call, thanks to Martin von Gagern <Martin.vGagern@gmx.net> in
diff --git a/dev-java/commons-io/commons-io-1.2.ebuild b/dev-java/commons-io/commons-io-1.3.ebuild
index 9694cedbfbfb..1665d2f759b3 100644
--- a/dev-java/commons-io/commons-io-1.2.ebuild
+++ b/dev-java/commons-io/commons-io-1.3.ebuild
@@ -1,23 +1,28 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-io/commons-io-1.2.ebuild,v 1.4 2007/01/22 12:39:23 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-io/commons-io-1.3.ebuild,v 1.1 2007/02/09 21:27:01 fordfrog Exp $
+
+JAVA_PKG_IUSE="doc source"
 
 inherit java-pkg-2 java-ant-2 eutils
 
 MY_P="${P}-src"
-DESCRIPTION="Commons-IO contains utility classes  , stream implementations, file filters  , and endian classes."
+DESCRIPTION="Commons-IO contains utility classes, stream implementations, file filters, and endian classes."
 HOMEPAGE="http://jakarta.apache.org/commons/io"
 SRC_URI="mirror://apache/jakarta/commons/io/source/${MY_P}.tar.gz"
 
 LICENSE="Apache-1.1"
 SLOT="1"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="doc source test"
+IUSE="test"
 
-DEPEND="dev-java/ant-core
+DEPEND=">=virtual/jdk-1.4
 	source? ( app-arch/zip )
-	test? ( dev-java/junit dev-java/ant-tasks )
-	>=virtual/jdk-1.4"
+	test? (
+		=dev-java/junit-3.8*
+		dev-java/ant
+	)
+	!test? ( dev-java/ant-core )"
 RDEPEND=">=virtual/jre-1.4"
 
 S="${WORKDIR}/${MY_P}"
@@ -26,18 +31,15 @@ src_unpack() {
 	unpack ${A}
 
 	cd "${S}"
-	rm -v *.jar
-	epatch ${FILESDIR}/${P}-gentoo.diff
+	rm *.jar
+	epatch ${FILESDIR}/${P}-build.xml.patch
 	java-ant_ignore-system-classes
 	java-ant_rewrite-classpath
 }
 
-# one of the tests (FileUtilsCleanDirectoryTestCase) used to always fail
-# when run as root, but I could not get this behaviour any more.
-
 src_test() {
-	eant test -Dgentoo.classpath="$(java-pkg_getjars junit)" \
-		-DJunit.present=true
+	ANT_OPTS="-Djava.io.tmpdir=${T}" eant test \
+		-Dgentoo.classpath="$(java-pkg_getjars junit)" -DJunit.present=true
 }
 
 src_install() {
diff --git a/dev-java/commons-io/files/commons-io-1.0-gentoo.diff b/dev-java/commons-io/files/commons-io-1.0-gentoo.diff
deleted file mode 100644
index c6521a8649da..000000000000
--- a/dev-java/commons-io/files/commons-io-1.0-gentoo.diff
+++ /dev/null
@@ -1,25 +0,0 @@
---- build.xml.orig	2005-03-10 00:04:37.625655328 +0100
-+++ build.xml	2005-03-10 00:06:00.875999352 +0100
-@@ -23,10 +23,11 @@
-   <target name="init" description="o Initializes some properties">
-     <mkdir dir="${libdir}">
-     </mkdir>
--    <condition property="noget">
-+   <!-- <condition property="noget">
-       <equals arg2="only" arg1="${build.sysclasspath}">
-       </equals>
--    </condition>
-+    </condition>-->
-+    <property name="noget" value="true"></property>
-   </target>
-   <target name="compile" description="o Compile the code" depends="get-deps">
-     <mkdir dir="${classesdir}">
-@@ -50,7 +51,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="target/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}">
-     </jar>
-   </target>
diff --git a/dev-java/commons-io/files/commons-io-1.2-gentoo.diff b/dev-java/commons-io/files/commons-io-1.2-gentoo.diff
deleted file mode 100644
index 62a7c51550e9..000000000000
--- a/dev-java/commons-io/files/commons-io-1.2-gentoo.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- build.xml.orig	2005-11-25 19:53:06.000000000 +0000
-+++ build.xml	2005-11-25 19:54:39.000000000 +0000
-@@ -92,7 +94,7 @@
-     </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="**/*.html" basedir="${classesdir}" manifest="${basedir}/src/conf/MANIFEST.MF" />
-   </target>
-   <target name="dist-jar" depends="compile">
diff --git a/dev-java/commons-io/files/commons-io-1.3-build.xml.patch b/dev-java/commons-io/files/commons-io-1.3-build.xml.patch
new file mode 100644
index 000000000000..cf509dcd51df
--- /dev/null
+++ b/dev-java/commons-io/files/commons-io-1.3-build.xml.patch
@@ -0,0 +1,20 @@
+--- build.xml.original	2007-02-09 21:36:40.000000000 +0100
++++ build.xml	2007-02-09 21:38:25.000000000 +0100
+@@ -92,7 +92,7 @@
+     </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="**/*.html" basedir="${classesdir}" manifest="${basedir}/src/conf/MANIFEST.MF" />
+   </target>
+   <target name="dist-jar" depends="compile">
+@@ -196,7 +196,7 @@
+   <target name="internal-test" if="Junit.present" depends="junit-present,compile-tests">
+     <mkdir dir="${testreportdir}">
+     </mkdir>
+-    <junit dir="${basedir}" failureproperty="test.failure" printSummary="yes" fork="true" haltonerror="true">
++    <junit dir="${basedir}" failureproperty="test.failure" printSummary="yes" fork="false" haltonerror="true">
+       <sysproperty key="basedir" value="." />
+       <formatter type="plain" />
+       <formatter usefile="false" type="plain" />
diff --git a/dev-java/commons-io/files/digest-commons-io-1.2 b/dev-java/commons-io/files/digest-commons-io-1.2
deleted file mode 100644
index 4a5c828bb195..000000000000
--- a/dev-java/commons-io/files/digest-commons-io-1.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d45b0c7c0fae36c3be99df86354d4323 commons-io-1.2-src.tar.gz 205563
-RMD160 cd1914721f5c2d460f0fe4e7ba2e1e23099bff2a commons-io-1.2-src.tar.gz 205563
-SHA256 9c9983fed8b5c633b156e429eb7885e70d6268eb23b00c16366702158daf8a22 commons-io-1.2-src.tar.gz 205563
diff --git a/dev-java/commons-io/files/digest-commons-io-1.3 b/dev-java/commons-io/files/digest-commons-io-1.3
new file mode 100644
index 000000000000..f11835e756a8
--- /dev/null
+++ b/dev-java/commons-io/files/digest-commons-io-1.3
@@ -0,0 +1,3 @@
+MD5 1681b8e8bc96693b7fb7983458ed623a commons-io-1.3-src.tar.gz 691864
+RMD160 37422ddcff592f45a6fc9e90312d349a6410993b commons-io-1.3-src.tar.gz 691864
+SHA256 80b6b207f062a65d891f6db453f4b25ad7704a83e75cd8184d4a7d3166aa6035 commons-io-1.3-src.tar.gz 691864