Bump stat{cvs,svn}

svn path=/java-overlay/; revision=7001

14 files changed, 79 insertions, 259 deletions

diff --git a/dev-util/statcvs/ChangeLog b/dev-util/statcvs/ChangeLog
index 1a826a0d..76c5c81c 100644
--- a/dev-util/statcvs/ChangeLog
+++ b/dev-util/statcvs/ChangeLog
@@ -1,7 +1,13 @@
 # ChangeLog for dev-util/statcvs
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  19 Sep 2008; Serkan Kaba <serkan@gentoo.org> -statcvs-0.2.4a.ebuild,
+  -files/statcvs-0.2.4a-build.xml.patch, -statcvs-0.3.ebuild,
+  -files/statcvs-0.3-build.xml.patch, +statcvs-0.4.0.ebuild,
+  +files/statcvs-0.4.0-build.xml.patch:
+  Version bump.
+
   16 Mar 2007; Miroslav Šulc <fordfrog@gentoo.org> +statcvs-0.3.ebuild,
   +files/statcvs-0.3-build.xml.patch:
   Version bump.
diff --git a/dev-util/statcvs/Manifest b/dev-util/statcvs/Manifest
index 9e8ec5bc..0e5b7721 100644
--- a/dev-util/statcvs/Manifest
+++ b/dev-util/statcvs/Manifest
@@ -1,32 +1,5 @@
-AUX statcvs-0.2.4a-build.xml.patch 519 RMD160 a2f103533245e516f2dc03c81dae07830c02f1dc SHA1 d98bf5c7f6b1694c3dd63ef950fb05c94a0e07e2 SHA256 f06a11d7e6621e0ea27b3d9981d58bb6b099fdd9b9f583cc36c60d0c1e75b33d
-MD5 478a4d6b173218f480ad4039658605fe files/statcvs-0.2.4a-build.xml.patch 519
-RMD160 a2f103533245e516f2dc03c81dae07830c02f1dc files/statcvs-0.2.4a-build.xml.patch 519
-SHA256 f06a11d7e6621e0ea27b3d9981d58bb6b099fdd9b9f583cc36c60d0c1e75b33d files/statcvs-0.2.4a-build.xml.patch 519
-AUX statcvs-0.3-build.xml.patch 519 RMD160 a2f103533245e516f2dc03c81dae07830c02f1dc SHA1 d98bf5c7f6b1694c3dd63ef950fb05c94a0e07e2 SHA256 f06a11d7e6621e0ea27b3d9981d58bb6b099fdd9b9f583cc36c60d0c1e75b33d
-MD5 478a4d6b173218f480ad4039658605fe files/statcvs-0.3-build.xml.patch 519
-RMD160 a2f103533245e516f2dc03c81dae07830c02f1dc files/statcvs-0.3-build.xml.patch 519
-SHA256 f06a11d7e6621e0ea27b3d9981d58bb6b099fdd9b9f583cc36c60d0c1e75b33d files/statcvs-0.3-build.xml.patch 519
-DIST statcvs-0.2.4a-source.zip 2588679 RMD160 e9af92ae560d6f1dbca5ff608440922433efb053 SHA1 6d8bfa8700484fee10049fd57c79fe384e2293bb SHA256 34441c0373e3d55f705fc2d149ee7789cbd00f16de247dbefe57fb8f615f111c
-DIST statcvs-0.3-source.zip 2663954 RMD160 95f183f789b8aefd0de92220c6f5a95ab43b8f0f SHA1 5c616ed0446b2b5ee62e9123913cd89e5da49528 SHA256 55ba28a9fd984abddaf6ed1d5201403f9995e8e5f47a887206395eebb7460a78
-EBUILD statcvs-0.2.4a.ebuild 1290 RMD160 f928c1776ff3f997fc446142dbae9c833acb7abc SHA1 5ea15d4ac8b234febba891c6db1a007241a8642c SHA256 f1cf1fd58ad8e71b71d2788f81f3c38b9c9f147589f1bd4ccb6af35ca77b42a4
-MD5 71e9e9fcc80202c40bb7918597ebef1a statcvs-0.2.4a.ebuild 1290
-RMD160 f928c1776ff3f997fc446142dbae9c833acb7abc statcvs-0.2.4a.ebuild 1290
-SHA256 f1cf1fd58ad8e71b71d2788f81f3c38b9c9f147589f1bd4ccb6af35ca77b42a4 statcvs-0.2.4a.ebuild 1290
-EBUILD statcvs-0.3.ebuild 1312 RMD160 fb0783a6fa60176b071562d082efc29d7c7e5725 SHA1 89cb9d39bc30dcb2162322d13cb06ee7cbcde3cc SHA256 f8bcf8e88f77caf5697048e111b5885e03cc2dccbfb98c87ce6ba438319c4dde
-MD5 23a2fdba36f6e4d0246b4f365c93604c statcvs-0.3.ebuild 1312
-RMD160 fb0783a6fa60176b071562d082efc29d7c7e5725 statcvs-0.3.ebuild 1312
-SHA256 f8bcf8e88f77caf5697048e111b5885e03cc2dccbfb98c87ce6ba438319c4dde statcvs-0.3.ebuild 1312
+AUX statcvs-0.4.0-build.xml.patch 627 RMD160 0e11729ed187dd2fd6bf57df8efb8a16c8a29c28 SHA1 f7c0f41a5637b1601cf63cdc21ecbbc867d33516 SHA256 d5696370a6653ecee35f6553ef94fbff4b833731ceaf9e38a892eb0685a7fe24
+DIST statcvs-0.4.0-source.zip 8745997 RMD160 6eb0ed26a673c210edda543248e593d3ec3c0a41 SHA1 b5c0395bd51685ee0999d8105a2562de7d82329f SHA256 05b046a3dbb7a4846b8bd7ab37ed72ccf168ebb7ef6289ba8551ed85418cab00
+EBUILD statcvs-0.4.0.ebuild 1331 RMD160 546354b9137c34b39d5fd2e06b77c983038486d8 SHA1 4b9e3dbf27978e6f98cf2eead7d648a27651ce80 SHA256 7d1149840aea38e1dc8cfebd0749a30132998c801440cef90f96131acf7ab2fe
 MISC ChangeLog 618 RMD160 2c436f3728d434c17ab3c1861f623f811945fe17 SHA1 c74916807fefbbba97e54659d9f54f426a1c0e44 SHA256 53b0063f46336a527b71915502f3f52c8899b97852c1da54e5a0592bfd45f9f8
-MD5 268ed661686d12197fff7000433455db ChangeLog 618
-RMD160 2c436f3728d434c17ab3c1861f623f811945fe17 ChangeLog 618
-SHA256 53b0063f46336a527b71915502f3f52c8899b97852c1da54e5a0592bfd45f9f8 ChangeLog 618
 MISC metadata.xml 217 RMD160 6a03b58e975ef9766c1ba359b8cf73372aae1409 SHA1 9661e29f710f8b88d1ebad0d7cfa2716ae869b51 SHA256 00a5772b0da0819b665dba21d321e4e2393c818907d38678d179cafd5036c7f2
-MD5 a28ef1dbcd9ec5d985e36f5b538891b5 metadata.xml 217
-RMD160 6a03b58e975ef9766c1ba359b8cf73372aae1409 metadata.xml 217
-SHA256 00a5772b0da0819b665dba21d321e4e2393c818907d38678d179cafd5036c7f2 metadata.xml 217
-MD5 1a56b7824c6f536ff54dc6ff5374f9de files/digest-statcvs-0.2.4a 259
-RMD160 5f2a1bf2108047560fb521b3a4bb105d839058a9 files/digest-statcvs-0.2.4a 259
-SHA256 17c9db6436dc5cbc5f551d7e10681ada0b3ee63bdd3dc21177d0f422551f54f9 files/digest-statcvs-0.2.4a 259
-MD5 8d7f51f88b6467f3ba346fa5d1edc379 files/digest-statcvs-0.3 250
-RMD160 a8051115878d8de1becbbdece913f748f0aed33f files/digest-statcvs-0.3 250
-SHA256 1864034c66d0ec56584f330c9bfcf433b18330da60abab955607f3db30625955 files/digest-statcvs-0.3 250
diff --git a/dev-util/statcvs/files/statcvs-0.2.4a-build.xml.patch b/dev-util/statcvs/files/statcvs-0.2.4a-build.xml.patch
deleted file mode 100644
index ea57cb87..00000000
--- a/dev-util/statcvs/files/statcvs-0.2.4a-build.xml.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- build.xml.original	2006-12-01 23:03:56.000000000 +0100
-+++ build.xml	2006-12-01 23:36:09.000000000 +0100
-@@ -125,10 +125,8 @@
- 		</java>
- 	</target>
- 	
--	<target name="jar" depends="test">
-+	<target name="jar" depends="compile,copyfiles">
- 		<!-- Creates an executable jar file for the project -->
--		<unjar src="${lib}/${jfreechart.jar}" dest="${build}"/>
--		<unjar src="${lib}/${jcommon.jar}" dest="${build}"/>
- 		<mkdir dir="${dist}"/>
- 		<jar jarfile="${dist}/${project.jar}" basedir="${build}">
- 			<manifest>
diff --git a/dev-util/statcvs/files/statcvs-0.3-build.xml.patch b/dev-util/statcvs/files/statcvs-0.3-build.xml.patch
deleted file mode 100644
index ea57cb87..00000000
--- a/dev-util/statcvs/files/statcvs-0.3-build.xml.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- build.xml.original	2006-12-01 23:03:56.000000000 +0100
-+++ build.xml	2006-12-01 23:36:09.000000000 +0100
-@@ -125,10 +125,8 @@
- 		</java>
- 	</target>
- 	
--	<target name="jar" depends="test">
-+	<target name="jar" depends="compile,copyfiles">
- 		<!-- Creates an executable jar file for the project -->
--		<unjar src="${lib}/${jfreechart.jar}" dest="${build}"/>
--		<unjar src="${lib}/${jcommon.jar}" dest="${build}"/>
- 		<mkdir dir="${dist}"/>
- 		<jar jarfile="${dist}/${project.jar}" basedir="${build}">
- 			<manifest>
diff --git a/dev-util/statcvs/files/statcvs-0.4.0-build.xml.patch b/dev-util/statcvs/files/statcvs-0.4.0-build.xml.patch
new file mode 100644
index 00000000..6abd9c7f
--- /dev/null
+++ b/dev-util/statcvs/files/statcvs-0.4.0-build.xml.patch
@@ -0,0 +1,13 @@
+diff -Nur statcvs-0.4.0/build.xml statcvs-0.4.0_patched/build.xml
+--- statcvs-0.4.0/build.xml	2008-04-21 18:33:32.000000000 +0300
++++ statcvs-0.4.0_patched/build.xml	2008-09-19 05:27:41.000000000 +0300
+@@ -150,9 +150,6 @@
+   </target>

+   <target name="jar" depends="test">

+     <!-- Creates an executable jar file for the project -->

+-    <unjar src="${lib}/${jfreechart.jar}" dest="${build}" />

+-    <unjar src="${lib}/${jcommon.jar}" dest="${build}" />

+-    <unjar src="${lib}/jdom.jar" dest="${build}" />

+     <mkdir dir="${dist}" />

+     <jar jarfile="${dist}/${project.jar}" basedir="${build}">

+       <manifest>

diff --git a/dev-util/statcvs/statcvs-0.2.4a.ebuild b/dev-util/statcvs/statcvs-0.2.4a.ebuild
deleted file mode 100644
index 3fd8f739..00000000
--- a/dev-util/statcvs/statcvs-0.2.4a.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="StatCVS generates HTML reports from CVS repository logs."
-HOMEPAGE="http://statcvs.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-source.zip"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="doc source test"
-
-COMMON_DEPEND="
-	>=dev-java/jcommon-1.0.0
-	>=dev-java/jfreechart-1.0.1"
-
-DEPEND=">=virtual/jdk-1.4
-	dev-java/ant-core
-	app-arch/zip
-	test? ( =dev-java/junit-3.8* )
-	${COMMON_DEPEND}"
-
-RDEPEND=">=virtual/jre-1.4
-	dev-util/cvs
-	${COMMON_DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${P}-build.xml.patch
-
-	cd ${S}/lib
-	rm *.jar
-	java-pkg_jar-from jcommon-1.0 jcommon.jar jcommon-1.0.0.jar
-	java-pkg_jar-from jfreechart-1.0 jfreechart.jar jfreechart-1.0.1.jar
-	use test && java-pkg_jar-from --build-only junit
-}
-
-src_compile() {
-	eant jar $(use_doc)
-}
-
-src_install() {
-	java-pkg_dojar dist/${PN}.jar
-	java-pkg_dolauncher ${PN} --main net.sf.statcvs.Main
-
-	use doc && java-pkg_dohtml -r doc/*
-	use source && java-pkg_dosrc src/net
-}
-
-src_test() {
-	eant test
-}
-
-pkg_postinst() {
-	elog "For instractions on how to use StatCVS see"
-	elog "http://statcvs.sourceforge.net/manual/"
-}
diff --git a/dev-util/statcvs/statcvs-0.3.ebuild b/dev-util/statcvs/statcvs-0.4.0.ebuild
index de1afd85..13a0bc9c 100644
--- a/dev-util/statcvs/statcvs-0.3.ebuild
+++ b/dev-util/statcvs/statcvs-0.4.0.ebuild
@@ -1,24 +1,25 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit eutils java-ant-2 java-pkg-2
+JAVA_PKG_IUSE="doc source test"
+inherit eutils java-pkg-2 java-ant-2
 
 DESCRIPTION="StatCVS generates HTML reports from CVS repository logs."
 HOMEPAGE="http://statcvs.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}-source.zip"
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86"
-IUSE="doc source test"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
 
 COMMON_DEPEND="
 	>=dev-java/jcommon-1.0.6
-	>=dev-java/jfreechart-1.0.3"
+	>=dev-java/jfreechart-1.0.3
+	dev-java/jdom"
 
 DEPEND=">=virtual/jdk-1.4
-	dev-java/ant-core
-	app-arch/zip
+	app-arch/unzip
 	test? ( =dev-java/junit-3.8* )
 	${COMMON_DEPEND}"
 
@@ -36,13 +37,10 @@ src_unpack() {
 	rm *.jar
 	java-pkg_jar-from jcommon-1.0 jcommon.jar jcommon-1.0.6.jar
 	java-pkg_jar-from jfreechart-1.0 jfreechart.jar jfreechart-1.0.3.jar
+	java-pkg_jar-from jdom-1.0 jdom.jar
 	use test && java-pkg_jar-from --build-only junit
 }
 
-src_compile() {
-	eant jar $(use_doc)
-}
-
 src_install() {
 	java-pkg_dojar dist/${PN}.jar
 	java-pkg_dolauncher ${PN} --main net.sf.statcvs.Main
diff --git a/dev-util/statsvn/ChangeLog b/dev-util/statsvn/ChangeLog
index 9d932190..2179c72e 100644
--- a/dev-util/statsvn/ChangeLog
+++ b/dev-util/statsvn/ChangeLog
@@ -1,7 +1,14 @@
 # ChangeLog for dev-util/statsvn
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  19 Sep 2008; Serkan Kaba <serkan@gentoo.org> -statsvn-0.2.0.ebuild,
+  -files/statsvn-0.2.0-test.patch, -statsvn-0.3.1.ebuild,
+  -files/statsvn-0.3.1-build.xml.patch, +statsvn-0.4.1.ebuild,
+  +files/statsvn-0.4.1-build.xml.patch,
+  +files/statsvn-0.4.1-fixstatcvsusage.patch:
+  Version bump.
+
   16 Mar 2007; Miroslav Šulc <fordfrog@gentoo.org> +statsvn-0.3.1.ebuild,
   +files/statsvn-0.3.1-build.xml.patch:
   Version bump. Tests do not compile.
diff --git a/dev-util/statsvn/Manifest b/dev-util/statsvn/Manifest
index a2f6bb93..6e58052a 100644
--- a/dev-util/statsvn/Manifest
+++ b/dev-util/statsvn/Manifest
@@ -1,32 +1,6 @@
-AUX statsvn-0.2.0-test.patch 824 RMD160 9c7ba62e6df4a0ec42e2a15f9ad5b27318280ee3 SHA1 78d068bd43df30a75b795ea1ba19f072fd883d92 SHA256 3c0e77ab755a9ce6803ff1e6c5b5b95aecc751e0a240d2679b0cf52522ff9109
-MD5 12eac0c0d44c86f42d0617ca5640aff5 files/statsvn-0.2.0-test.patch 824
-RMD160 9c7ba62e6df4a0ec42e2a15f9ad5b27318280ee3 files/statsvn-0.2.0-test.patch 824
-SHA256 3c0e77ab755a9ce6803ff1e6c5b5b95aecc751e0a240d2679b0cf52522ff9109 files/statsvn-0.2.0-test.patch 824
-AUX statsvn-0.3.1-build.xml.patch 690 RMD160 86bf589ae264b231fc3ba2139d9428d0138aa598 SHA1 317fc01a9fec9c2da7ab0587efc36e3faf29c65d SHA256 b9c368e6a1c5a532209cc051870187f7e928272af6be96dd7997a4a35573b283
-MD5 8f4ddb93412fe686680084d3d83f5a3a files/statsvn-0.3.1-build.xml.patch 690
-RMD160 86bf589ae264b231fc3ba2139d9428d0138aa598 files/statsvn-0.3.1-build.xml.patch 690
-SHA256 b9c368e6a1c5a532209cc051870187f7e928272af6be96dd7997a4a35573b283 files/statsvn-0.3.1-build.xml.patch 690
-DIST statsvn-0.2.0-source.zip 6294558 RMD160 9fe76b487fb483b0db443086aa9225da8ad4c7d4 SHA1 63c76637792ffe092fff146633b78f00b83c57c7 SHA256 0debe5f76d07fda4e041634e1361b92b43b4bdaa05459c691aebfdf9d68ebc1e
-DIST statsvn-0.3.1-source.zip 8486831 RMD160 225e10b8e4625355d7465431bfde304053bce145 SHA1 2ab4703e8849c4fa856a3d6dbad6c117a2e222a4 SHA256 1a0dd852205957d0e6593d76dbb31e5a4517bf605454715cfd20435ec6cfe0d6
-EBUILD statsvn-0.2.0.ebuild 1979 RMD160 63fd04464027ca8486419cb3ce81c66f1cab5afb SHA1 02939a4898715178b3f963e806324edfc8ad5aa8 SHA256 4ec0304e36a291bb4cc409e1e5af10a6144d4132a528a197199e2f3b98aaf52b
-MD5 2c0f762449c92d49120afa8eb9ce381b statsvn-0.2.0.ebuild 1979
-RMD160 63fd04464027ca8486419cb3ce81c66f1cab5afb statsvn-0.2.0.ebuild 1979
-SHA256 4ec0304e36a291bb4cc409e1e5af10a6144d4132a528a197199e2f3b98aaf52b statsvn-0.2.0.ebuild 1979
-EBUILD statsvn-0.3.1.ebuild 2047 RMD160 c099b24d007676ac9a26d6ddb72b23eec968265e SHA1 4dd686dc30b4de18ffb04cbe007540d54b232247 SHA256 9801600578d7fac722fb4a5473545edaa1a94acf4f5f928ed9ebe581cb9d97a7
-MD5 51402289a6de55b59e00d70d4b1db357 statsvn-0.3.1.ebuild 2047
-RMD160 c099b24d007676ac9a26d6ddb72b23eec968265e statsvn-0.3.1.ebuild 2047
-SHA256 9801600578d7fac722fb4a5473545edaa1a94acf4f5f928ed9ebe581cb9d97a7 statsvn-0.3.1.ebuild 2047
+AUX statsvn-0.4.1-build.xml.patch 783 RMD160 683719fe92377fa841bd977e68875b17d82bf1d7 SHA1 51faf37e42a0e5a0a84abf7826ca298a878a4b63 SHA256 2d90851c44ceff1731965ebf696905d925e22477f0e2e5b9d9f11601d79a4c89
+AUX statsvn-0.4.1-fixstatcvsusage.patch 898 RMD160 0307da8206a7a8ac8edea7275326adf0ff418cdc SHA1 873f1aea1a70ec7fb0870c2b445cd7f6252b1b33 SHA256 53634da88168448e2f33248ff7cbb522efe01ec8c84768bea3e5bee0975e32f8
+DIST statsvn-0.4.1-source.zip 10061534 RMD160 12291695963c9e2993d3e737fb643bff667f7cdf SHA1 1ce3a921ad7d37a1a1d7d387f770bf89a026ed98 SHA256 8307003b8b609bd3b271a53c6c55d91947e220538e9b0c4c8925d272a2d05d07
+EBUILD statsvn-0.4.1.ebuild 2150 RMD160 b52bbfc00d8c84f99e1168fb734cef2fc356b99e SHA1 af7a328ea0ab04ae8a09a19dd2153ba36b947e00 SHA256 78171cb06d11329e89b6014b81e00dc48d87b18e57163ad686553fa634ecf402
 MISC ChangeLog 697 RMD160 172d70cbf3e6a5441e715a4747996da3ed991957 SHA1 7916eab40c06810aec236b7dd59676bf0acd57ee SHA256 92001a51588ced7a6a021b8e32e33274ae588f7f7036b3549a3c706308cba79b
-MD5 5f416ac79c1f10c113ef19e6c16b15bd ChangeLog 697
-RMD160 172d70cbf3e6a5441e715a4747996da3ed991957 ChangeLog 697
-SHA256 92001a51588ced7a6a021b8e32e33274ae588f7f7036b3549a3c706308cba79b ChangeLog 697
 MISC metadata.xml 217 RMD160 6a03b58e975ef9766c1ba359b8cf73372aae1409 SHA1 9661e29f710f8b88d1ebad0d7cfa2716ae869b51 SHA256 00a5772b0da0819b665dba21d321e4e2393c818907d38678d179cafd5036c7f2
-MD5 a28ef1dbcd9ec5d985e36f5b538891b5 metadata.xml 217
-RMD160 6a03b58e975ef9766c1ba359b8cf73372aae1409 metadata.xml 217
-SHA256 00a5772b0da0819b665dba21d321e4e2393c818907d38678d179cafd5036c7f2 metadata.xml 217
-MD5 83b8d9acca2edee5101378dbd36979a8 files/digest-statsvn-0.2.0 256
-RMD160 206d6be6d435cb408f6e63f4d50d8cb1d8bb6d9a files/digest-statsvn-0.2.0 256
-SHA256 abe697949318971fb8880900b486613797e291a5705a5d4ca3e623b014d99ff4 files/digest-statsvn-0.2.0 256
-MD5 2651d9d99cfb89f26be3b8aa2be5c8d0 files/digest-statsvn-0.3.1 256
-RMD160 9285eff9263664e6ab89071e6920585aa189dffe files/digest-statsvn-0.3.1 256
-SHA256 b2ac881df19314c7a06820e2544023d4526d1aff16956970998dec039ea2ac98 files/digest-statsvn-0.3.1 256
diff --git a/dev-util/statsvn/files/statsvn-0.2.0-test.patch b/dev-util/statsvn/files/statsvn-0.2.0-test.patch
deleted file mode 100644
index 42a43dd2..00000000
--- a/dev-util/statsvn/files/statsvn-0.2.0-test.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- SvnLogfileParserTest.java.original	2006-12-03 05:36:39.000000000 +0100
-+++ SvnLogfileParserTest.java	2006-12-03 05:37:05.000000000 +0100
-@@ -23,7 +23,7 @@
- 	protected RepositoryFileManager repFileMan;

- 

- 	public void testJUCMNav1() throws EmptyRepositoryException, ConfigurationException, IOException, LogSyntaxException {

--		final String args[] = { "-title", "jUCMNav", "-output-dir", sRoot + "stats", sRoot + "seg.jUCMNav.log", sRoot };

-+		final String args[] = { "-title", "jUCMNav", "-output-dir", sRoot + "stats", sRoot + "seg.jUCMNav.log", sRoot, "-cache-dir", sRoot };

- 		new SvnCommandLineParser(args).parse();

- 		repFileMan = new DummyRepositoryFileManager(ConfigurationOptions.getCheckedOutDirectory(), sRoot + "seg.jUCMNav.info", sRoot + "seg.jUCMNav.propget",

- 				sRoot + "seg.jUCMNav.linecounts");

diff --git a/dev-util/statsvn/files/statsvn-0.3.1-build.xml.patch b/dev-util/statsvn/files/statsvn-0.4.1-build.xml.patch
index 38e9f766..48c050eb 100644
--- a/dev-util/statsvn/files/statsvn-0.3.1-build.xml.patch
+++ b/dev-util/statsvn/files/statsvn-0.4.1-build.xml.patch
@@ -1,5 +1,6 @@
---- build.xml.original	2007-02-10 02:13:10.000000000 +0100
-+++ build.xml	2007-02-10 02:14:01.000000000 +0100
+diff -Nur statsvn-0.4.1/build.xml statsvn-0.4.1_patched/build.xml
+--- statsvn-0.4.1/build.xml	2007-03-14 03:33:20.000000000 +0200
++++ statsvn-0.4.1_patched/build.xml	2008-09-19 05:45:40.000000000 +0300
 @@ -130,15 +130,6 @@
  	</target>
  
diff --git a/dev-util/statsvn/files/statsvn-0.4.1-fixstatcvsusage.patch b/dev-util/statsvn/files/statsvn-0.4.1-fixstatcvsusage.patch
new file mode 100644
index 00000000..4bccd1d0
--- /dev/null
+++ b/dev-util/statsvn/files/statsvn-0.4.1-fixstatcvsusage.patch
@@ -0,0 +1,12 @@
+diff -Nur statsvn-0.4.1/src/net/sf/statsvn/Main.java statsvn-0.4.1_patched/src/net/sf/statsvn/Main.java
+--- statsvn-0.4.1/src/net/sf/statsvn/Main.java	2008-09-19 07:19:16.000000000 +0300
++++ statsvn-0.4.1_patched/src/net/sf/statsvn/Main.java	2008-09-19 07:19:42.000000000 +0300
+@@ -295,7 +295,7 @@
+ 		System.setProperty("java.awt.headless", "true");
+ 
+ 		final ReportConfig config = new ReportConfig(content, ConfigurationOptions.getProjectName(), ConfigurationOptions.getOutputDir(), ConfigurationOptions
+-		        .getMarkupSyntax(), ConfigurationOptions.getCssHandler(), ConfigurationOptions.getCharSet());
++		        .getMarkupSyntax(), ConfigurationOptions.getCssHandler());
+ 		config.setWebRepository(ConfigurationOptions.getWebRepository());
+ 		config.setWebBugtracker(ConfigurationOptions.getWebBugtracker());
+ 		config.setNonDeveloperLogins(ConfigurationOptions.getNonDeveloperLogins());
diff --git a/dev-util/statsvn/statsvn-0.2.0.ebuild b/dev-util/statsvn/statsvn-0.2.0.ebuild
deleted file mode 100644
index ab9b90a6..00000000
--- a/dev-util/statsvn/statsvn-0.2.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="StatSVN is a metrics-analysis tool for charting software evolution through analysis of Subversion source repositories."
-HOMEPAGE="http://www.statsvn.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-source.zip"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="doc source test"
-
-COMMON_DEPEND="
-	>=dev-util/statcvs-0.2.4
-	>=dev-java/jcommon-1.0.0
-	>=dev-java/jfreechart-1.0.1"
-
-DEPEND=">=virtual/jdk-1.4
-	dev-java/ant-core
-	app-arch/zip
-	test? ( =dev-java/junit-3.8* )
-	${COMMON_DEPEND}"
-
-RDEPEND=">=virtual/jre-1.4
-	>=dev-util/subversion-1.3.0
-	${COMMON_DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-
-	# patches tests so they do not attempt to create cache in /root/.statsvn
-	cd ${S}/tests-src/net/sf/statsvn/input
-	epatch ${FILESDIR}/${P}-test.patch
-
-	cd ${S}/lib
-	rm *.jar
-	java-pkg_jar-from statcvs statcvs.jar statcvs-0.2.4.jar
-	java-pkg_jar-from jcommon-1.0 jcommon.jar jcommon-1.0.0.jar
-	java-pkg_jar-from jfreechart-1.0 jfreechart.jar jfreechart-1.0.1.jar
-	use test && java-pkg_jar-from --build-only junit
-}
-
-src_compile() {
-	eant dist $(use_doc)
-}
-
-src_install() {
-	java-pkg_dojar dist/${PN}.jar
-
-	# jfreechart pulls in gnu-jaxp which doesn't work for statsvn so we need
-	# to force another SAXParserFactory and DocumentBuilderFactory
-	java-pkg_dolauncher statsvn --main net.sf.statsvn.Main \
-		--java_args '-Djavax.xml.parsers.SAXParserFactory=com.sun.org.apache.xerces.internal.jaxp.SAXParserFactoryImpl -Djavax.xml.parsers.DocumentBuilderFactory=com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl'
-
-	use doc && java-pkg_dohtml -r doc/*
-	use source && java-pkg_dosrc src/*
-}
-
-src_test() {
-	ewarn "Note that the tests require you to be online."
-	eant test
-}
-
-pkg_postinst() {
-	elog "For instractions on how to use StatSVN see"
-	elog "http://svn.statsvn.org/statsvnwiki/index.php/Main_Page"
-}
diff --git a/dev-util/statsvn/statsvn-0.3.1.ebuild b/dev-util/statsvn/statsvn-0.4.1.ebuild
index 1f50a6b2..290e7769 100644
--- a/dev-util/statsvn/statsvn-0.3.1.ebuild
+++ b/dev-util/statsvn/statsvn-0.4.1.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+JAVA_PKG_IUSE="doc source test"
 inherit eutils java-pkg-2 java-ant-2
 
 DESCRIPTION="StatSVN is a metrics-analysis tool for charting software evolution through analysis of Subversion source repositories."
@@ -9,25 +10,31 @@ HOMEPAGE="http://www.statsvn.org/"
 SRC_URI="mirror://sourceforge/${PN}/${P}-source.zip"
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86"
-IUSE="doc source test"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
 
 COMMON_DEPEND="
 	>=dev-util/statcvs-0.3
-	>=dev-java/backport-util-concurrent-3.0
-	>=dev-java/jcommon-1.0
-	>=dev-java/jfreechart-1.0"
+	>=dev-java/backport-util-concurrent-3.0"
 
 DEPEND=">=virtual/jdk-1.4
-	dev-java/ant-core
 	app-arch/zip
-	test? ( =dev-java/junit-3.8* )
+	test?
+	(
+		=dev-java/junit-3.8*
+		>=dev-java/jfreechart-1.0
+		>=dev-java/jcommon-1.0
+	)
 	${COMMON_DEPEND}"
 
 RDEPEND=">=virtual/jre-1.4
 	>=dev-util/subversion-1.3.0
 	${COMMON_DEPEND}"
 
+EANT_GENTOO_CLASSPATH="statcvs,backport-util-concurrent"
+EANT_BUILD_TARGET="dist"
+JAVA_ANT_CLASSPATH_TAGS="javac java"
+
 src_unpack() {
 	unpack ${A}
 
@@ -35,19 +42,17 @@ src_unpack() {
 	#cd ${S}/tests-src/net/sf/statsvn/input
 	cd ${S}
 	epatch ${FILESDIR}/${P}-build.xml.patch
+	epatch ${FILESDIR}/${P}-fixstatcvsusage.patch
 	java-ant_rewrite-classpath
 
-	rm ${S}/lib/*.jar
-}
-
-src_compile() {
-	eant -Dgentoo.classpath=$(java-pkg_getjars statcvs,backport-util-concurrent,jcommon-1.0,jfreechart-1.0) dist $(use_doc)
+	rm ${S}/lib/*.jar || die
+	rm -r ${S}/bin/*
 }
 
 src_test() {
 	ewarn "Note that the tests require you to be online."
-	java-pkg_jar-from --into lib junit
-	eant -Dgentoo.classpath=$(java-pkg_getjars statcvs,backport-util-concurrent,jcommon-1.0,jfreechart-1.0) test
+	#java-pkg_jar-from --into lib junit
+	eant -Dgentoo.classpath=$(java-pkg_getjars statcvs,backport-util-concurrent):$(java-pkg_getjars --build-only junit,jfreechart-1.0,jcommon-1.0) test
 }
 
 src_install() {