Version bump to 1.0.14, contributed by Andreas Sturmlechner (genstorm). Fixes bug #460952.

(Portage version: 2.1.11.63/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D)

5 files changed, 157 insertions, 3 deletions

diff --git a/dev-java/jfreechart/ChangeLog b/dev-java/jfreechart/ChangeLog
index 4ec4170cdf81..3ca4ca30d327 100644
--- a/dev-java/jfreechart/ChangeLog
+++ b/dev-java/jfreechart/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-java/jfreechart
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jfreechart/ChangeLog,v 1.52 2010/01/16 10:47:56 betelgeuse Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jfreechart/ChangeLog,v 1.53 2013/05/22 13:10:16 tomwij Exp $
+
+*jfreechart-1.0.14 (22 May 2013)
+
+  22 May 2013; Tom Wijsman <TomWij@gentoo.org>
+  +files/jfreechart-1.0.14-build.xml.patch,
+  +files/jfreechart-1.0.14-fix-TimeSeriesCollectionTests.patch,
+  +jfreechart-1.0.14.ebuild, metadata.xml:
+  Version bump to 1.0.14, contributed by Andreas Sturmlechner (genstorm). Fixes
+  bug #460952.
 
   16 Jan 2010; Petteri Räty <betelgeuse@gentoo.org>
   -jfreechart-1.0.9-r1.ebuild, -jfreechart-1.0.10.ebuild:
@@ -227,4 +236,3 @@
   30 Jul 2004; Thomas Matthijs <axxo@gentoo.org> +metadata.xml,
   +jfreechart-0.9.19.ebuild:
   initial import, 48316
-
diff --git a/dev-java/jfreechart/files/jfreechart-1.0.14-build.xml.patch b/dev-java/jfreechart/files/jfreechart-1.0.14-build.xml.patch
new file mode 100644
index 000000000000..f07e5be5df41
--- /dev/null
+++ b/dev-java/jfreechart/files/jfreechart-1.0.14-build.xml.patch
@@ -0,0 +1,35 @@
+--- a/ant/build.xml	2011-11-20 22:40:13.000000000 +0100
++++ b/ant/build.xml	2013-03-09 14:10:53.987970148 +0100
+@@ -40,11 +40,9 @@
+         <available classname="java.lang.Annotation" property="src.version" value="1.5"/>
+         <available classname="java.lang.Annotation" property="target.version" value="1.5"/>
+         <path id="build.classpath">
+-            <fileset dir="${basedir}/lib/">
+-                <include name="${jcommon.name}-${jcommon.version}.jar"/>
+-                <include name="servlet.jar"/>
+-                <include name="gnujaxp.jar" unless="JDK1.4+"/>
+-            </fileset>
++            <pathelement location="${jcommon.jar}"/>
++            <pathelement location="${servlet.jar}"/>
++            <pathelement location="${gnujaxp.jar}"/>
+         </path>
+ 
+     </target>
+@@ -321,7 +319,7 @@
+ 
+     <!-- COMPILE THE JUNIT TESTS. -->
+     <target name="compile-tests"
+-            depends="compile,compile-experimental"
++            depends="initialise"
+             description="Compile the test code">
+ 
+         <mkdir dir="${basedir}/build-tests"/>
+@@ -354,7 +352,7 @@
+         <junit printSummary="yes"
+                haltonerror="true"
+                haltonfailure="true"
+-               fork="true"
++               fork="false"
+                dir=".">
+ 
+             <sysproperty key="basedir" value="."/>
diff --git a/dev-java/jfreechart/files/jfreechart-1.0.14-fix-TimeSeriesCollectionTests.patch b/dev-java/jfreechart/files/jfreechart-1.0.14-fix-TimeSeriesCollectionTests.patch
new file mode 100644
index 000000000000..b932d863bf83
--- /dev/null
+++ b/dev-java/jfreechart/files/jfreechart-1.0.14-fix-TimeSeriesCollectionTests.patch
@@ -0,0 +1,24 @@
+--- a/tests/org/jfree/data/time/junit/TimeSeriesCollectionTests.java	2011-11-20 22:40:13.000000000 +0100
++++ b/tests/org/jfree/data/time/junit/TimeSeriesCollectionTests.java	2013-05-21 00:18:03.840041846 +0200
+@@ -339,6 +339,10 @@
+      * java.util.List, boolean)} method.
+      */
+     public void testFindDomainBounds() {
++        // store the current time zone
++        TimeZone saved = TimeZone.getDefault();
++        TimeZone.setDefault(TimeZone.getTimeZone("Europe/Paris"));
++
+         TimeSeriesCollection dataset = new TimeSeriesCollection();
+         List visibleSeriesKeys = new java.util.ArrayList();
+         Range r = DatasetUtilities.findDomainBounds(dataset, visibleSeriesKeys,
+@@ -351,10 +355,6 @@
+         r = DatasetUtilities.findDomainBounds(dataset, visibleSeriesKeys, true);
+         assertNull(r);
+ 
+-        // store the current time zone
+-        TimeZone saved = TimeZone.getDefault();
+-        TimeZone.setDefault(TimeZone.getTimeZone("Europe/Paris"));
+-
+         s1.add(new Year(2008), 8.0);
+         r = DatasetUtilities.findDomainBounds(dataset, visibleSeriesKeys, true);
+         assertEquals(1199142000000.0, r.getLowerBound(), EPSILON);
diff --git a/dev-java/jfreechart/jfreechart-1.0.14.ebuild b/dev-java/jfreechart/jfreechart-1.0.14.ebuild
new file mode 100644
index 000000000000..33169ea439c0
--- /dev/null
+++ b/dev-java/jfreechart/jfreechart-1.0.14.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2013 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 $
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+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"
+
+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
+	servlet? ( java-virtuals/servlet-api:2.3 )"
+
+DEPEND=">=virtual/jdk-1.4
+	${COMMON_DEPEND}
+	test? ( dev-java/ant-junit:0 )"
+
+RDEPEND=">=virtual/jdk-1.4
+	${COMMON_DEPEND}"
+
+JAVA_PKG_FILTER_COMPILER="jikes"
+
+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() {
+	# Note that compile-experimental depends on compile so it is sufficient to run
+	# just compile-experimental
+	eant -f ant/build.xml compile-experimental $(use_doc) $(get_jars)
+}
+
+src_test() {
+	# X11 tests are disabled using java.awt.headless=true
+	ANT_TASKS="ant-junit" \
+	ANT_OPTS="-Djava.awt.headless=true -Duser.timezone=UTC" \
+		eant -f ant/build.xml test $(get_jars)
+}
+
+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
+
+	use doc && java-pkg_dojavadoc javadoc
+	use source && java-pkg_dosrc source/org
+}
+
+get_jars() {
+	local antflags="
+		-Ditext.jar=$(java-pkg_getjar itext iText.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)"
+
+	echo "${antflags}"
+}
diff --git a/dev-java/jfreechart/metadata.xml b/dev-java/jfreechart/metadata.xml
index 838c00a4a448..83759310c990 100644
--- a/dev-java/jfreechart/metadata.xml
+++ b/dev-java/jfreechart/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>java</herd>
+<use>
+  <flag name='servlet'>Build a servlet using the servlet API.</flag>
+</use>
 </pkgmetadata>