[patch] jfreechart-1.0.14.diff against 1.0.13 (v4)

jfreechart-1.0.14.ebuild_v4.diff (text/plain), 2.01 KB, created by Andreas Sturmlechner on 2013-05-20 22:46:03 UTC

--- dev-java/jfreechart/jfreechart-1.0.13.ebuild	2010-01-03 21:59:30.000000000 +0100
+++ dev-java/jfreechart/jfreechart-1.0.14.ebuild	2013-05-21 00:27:28.725979800 +0200
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-java/jfreechart/jfreechart-1.0.13.ebuild,v 1.5 2010/01/03 20:59:30 fauli Exp $
 
-EAPI=2
+EAPI=5
 JAVA_PKG_IUSE="doc source"
 
 inherit java-pkg-2 java-ant-2
@@ -12,12 +12,12 @@
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="1.0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-IUSE="test"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="+servlet test"
 COMMON_DEPEND="
-	>=dev-java/itext-1.4.6:0
-	dev-java/jcommon:1.0
-	java-virtuals/servlet-api:2.3"
+	>=dev-java/itext-2.1.5:0
+	>=dev-java/jcommon-1.0.17:1.0
+	servlet? ( java-virtuals/servlet-api:2.3 )"
 DEPEND=">=virtual/jdk-1.4
 	${COMMON_DEPEND}
 	test? ( dev-java/ant-junit:0 )"
@@ -29,7 +29,15 @@
 src_prepare() {
 	epatch "${FILESDIR}/${P}-build.xml.patch"
 
+	# Fix test failure, obtained from
+	# http://sourceforge.net/p/jfreechart/bugs/1100/
+	epatch "${FILESDIR}/${P}-fix-TimeSeriesCollectionTests.patch"
+
 	rm -v *.jar lib/*.jar || die
+
+	if ! use servlet; then
+		rm -rf source/org/jfree/chart/servlet || die
+	fi
 }
 
 src_compile() {
@@ -48,7 +56,7 @@
 src_install() {
 	java-pkg_newjar lib/${P}.jar ${PN}.jar
 	java-pkg_newjar lib/${P}-experimental.jar ${PN}-experimental.jar
-	dodoc README.txt ChangeLog NEWS || die
+	dodoc README.txt ChangeLog NEWS
 	use doc && java-pkg_dojavadoc javadoc
 	use source && java-pkg_dosrc source/org
 }
@@ -56,7 +64,8 @@
 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)"
+	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)"