--- /usr/portage/dev-java/jcommon/jcommon-1.0.18.ebuild	2014-10-05 13:01:05.000000000 +0200
+++ jcommon-1.0.23.ebuild	2014-11-05 03:13:06.832376271 +0100
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jcommon/jcommon-1.0.18.ebuild,v 1.5 2014/10/05 10:44:14 ago Exp $
+# $Header: $
 
 EAPI=5
 
@@ -11,17 +11,18 @@
 MY_P=${PN}-$(replace_version_separator 3 -)
 DESCRIPTION="JCommon is a collection of useful classes used by JFreeChart, JFreeReport and other projects"
 HOMEPAGE="http://www.jfree.org/jcommon"
-SRC_URI="mirror://sourceforge/jfreechart/${MY_P}.tar.gz"
+SRC_URI="mirror://sourceforge/jfreechart/${MY_P}.zip"
 
 LICENSE="LGPL-2"
 SLOT="1.0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 RDEPEND="
-	>=virtual/jdk-1.4"
+	>=virtual/jdk-1.5"
 DEPEND="
-	>=virtual/jdk-1.4
+	>=virtual/jdk-1.5
+	app-arch/unzip
 	test? ( dev-java/junit:4 )"
 
 S=${WORKDIR}/${MY_P}
@@ -40,13 +41,13 @@
 src_test() {
 	java-pkg_jar-from --into lib junit-4
 	eant -f ant/build.xml compile-junit-tests
-	ejunit4 -cp "./lib/jcommon-${PV}-junit.jar:$(java-pkg_getjars junit-4)" \
+	ejunit4 -cp "./lib/${P}-junit.jar:$(java-pkg_getjars junit-4)" \
 		org.jfree.junit.JCommonTestSuite
 }
 
 src_install() {
 	java-pkg_newjar ${P}.jar ${PN}.jar
-	dodoc README.txt
+	dodoc README.md
 	use doc && java-pkg_dojavadoc javadoc
-	use source && java-pkg_dosrc source/com source/org
+	use source && java-pkg_dosrc src/main/java/com src/main/java/org
 }