--- jfreechart-1.0.14.ebuild	2013-05-22 15:10:16.000000000 +0200
+++ jfreechart-1.0.19.ebuild	2015-04-12 18:47:50.426284575 +0200
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jfreechart/jfreechart-1.0.14.ebuild,v 1.1 2013/05/22 13:10:16 tomwij Exp $
+# $Header: $
 
-EAPI="5"
+EAPI=5
 
 JAVA_PKG_IUSE="doc source"
 
@@ -10,36 +10,42 @@
 
 DESCRIPTION="JFreeChart is a free Java class library for generating charts"
 HOMEPAGE="http://www.jfree.org/jfreechart"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
 
 LICENSE="LGPL-2.1"
 SLOT="1.0"
 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-
 IUSE="+servlet test"
 
 COMMON_DEPEND="
-	>=dev-java/itext-2.1.5:0
-	>=dev-java/jcommon-1.0.17:1.0
+	>=dev-java/jcommon-1.0.23:1.0
+	>=dev-java/jfreesvg-2.0
 	servlet? ( java-virtuals/servlet-api:2.3 )"
 
-DEPEND=">=virtual/jdk-1.4
-	${COMMON_DEPEND}
-	test? ( dev-java/ant-junit:0 )"
+DEPEND="${COMMON_DEPEND}
+	app-arch/unzip
+	>=virtual/jdk-1.6
+	test? (
+		dev-java/ant-junit:0
+		dev-java/junit:4
+	)"
 
-RDEPEND=">=virtual/jdk-1.4
-	${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	>=virtual/jre-1.6"
 
 JAVA_PKG_FILTER_COMPILER="jikes"
 
 src_prepare() {
-	epatch "${FILESDIR}/${P}-build.xml.patch"
+	epatch "${FILESDIR}/${PN}-1.0.19-build.xml.patch"
 
 	# Fix test failure, obtained from
 	# http://sourceforge.net/p/jfreechart/bugs/1100/
-	epatch "${FILESDIR}/${P}-fix-TimeSeriesCollectionTests.patch"
+	epatch "${FILESDIR}/${PN}-1.0.19-fix-TimeSeriesCollectionTest.patch"
+
+	rm -v lib/*.jar || die
 
-	rm -v *.jar lib/*.jar || die
+	# links to orsonpdf which is only available for purchase under a commercial license
+	rm -v "${P}-demo.jar" || die
 
 	if ! use servlet; then
 		rm -rf source/org/jfree/chart/servlet || die
@@ -71,14 +77,14 @@
 
 get_jars() {
 	local antflags="
-		-Ditext.jar=$(java-pkg_getjar itext iText.jar) \
-		-Djcommon.jar=$(java-pkg_getjar jcommon-1.0 jcommon.jar)"
+		-Djcommon.jar=$(java-pkg_getjar jcommon-1.0 jcommon.jar) \
+		-Djfreesvg.jar=$(java-pkg_getjar jfreesvg-2.0 jfreesvg.jar)"
 
 	use servlet && antflags="${antflags} \
 		-Dservlet.jar=$(java-pkg_getjars servlet-api-2.3)"
 
 	use test && antflags="${antflags} \
-		-Djunit.jar=$(java-pkg_getjars --build-only junit)"
+		-Djunit.jar=$(java-pkg_getjars --build-only junit-4)"
 
 	echo "${antflags}"
 }