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

Package-Manager: portage-2.1.11.63/cvs/Linux x86_64
Manifest-Sign-Key: 0x6D34E57D

6 files changed, 177 insertions, 5 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/Manifest b/dev-java/jfreechart/Manifest
index 9eb1797478c7..ae87b44eb5c8 100644
--- a/dev-java/jfreechart/Manifest
+++ b/dev-java/jfreechart/Manifest
@@ -1,6 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX jfreechart-1.0.13-build.xml.patch 2919 SHA256 4969addf776a91c81f853d830fb3fc12fe6bb255610b3fb2ad07c043dbad9f2f SHA512 e8c9c2ba3bad8dfb7dded05a14c8166cd9af5733ee630f5e556011fbbb106b8ede19d20ad43aa34d2e6bd0a32dbcf3606e0ee5bcee49ea9303f63cbd405bf720 WHIRLPOOL 524fa81a1bdd859de21958325277985a93e5b625d1bb9384ad37e156d019d38350717c84eb702072aff65c028eac2a39868b5dbd3dc48e4888f20d1ebe2abff5
+AUX jfreechart-1.0.14-build.xml.patch 1344 SHA256 6e3cbbf4e20d7bb875918d770e6e5c74fa8464e7c02eb7f9e282b3ed30ddd655 SHA512 e72381bc3fae04c4943adad94e1ce810d2752e4ba5eba81f3cfe400ccadddb2a10c904629c01854677c6030ff8a6fe7ca146a28b324b06c0d2d2f262de2bc29e WHIRLPOOL f3a846f50163362d3f8a19977eda33ea35de57c15fd344096aaf87f354d815478326dc88ef93b23368b4c12549f7d2bb63d84d45f7cc281fe6c993439a20b15e
+AUX jfreechart-1.0.14-fix-TimeSeriesCollectionTests.patch 1169 SHA256 b417b3bbc1cb26a023e2c318eca05dd52aead8ff740d4d5bb97e784298c23671 SHA512 5bfd978a90d94dafa1c8c8c8f8c58fe8a85ca25b530f49fd1c9940d9ee191cb2bf90606db569e70043bc54c0ca6d25d0825d276b45fb8c0f47030a17e42df30f WHIRLPOOL 66346b7e0658d9087466ec4300aaecb33a9a38fffd792afe4a6e4f5a2cc09c41916797c1c002c3a297de6cf345f4a42162bd66ed1d5b51cabba3b090e8f02a73
 AUX jfreechart-1.0.4-build.xml.patch 396 SHA256 2f94895138b874ac2e5023e17eb6bb4daccb3e9eb709c81c5e908ef20fdd57d9 SHA512 6634f89711ec650eda5f94f6353081db2fab99137deaf105258a68121e8bdc0be37c3060caa021712eae7692ebb96029c3b14f05cff2e1ad1192d0e8ac4bcbd3 WHIRLPOOL 081e550aa0d593dd6e956cc86ed204b63279e485eed529b23741799321be6c2f2d89471c7bbc3f930c6443a3c766423b5da8e01e045ef0bc092837ee5a959dd4
 DIST jfreechart-1.0.13.tar.gz 6306139 SHA256 8b8286cc86d898961f307bcba1f8b6f6471bd0e921562adf573f2758b090c175 SHA512 6b4e2079fa4eb4cebec709a95e7b1bff4d7233dbdd26c7e3173e75fc29facc9accc64039a62e5d89c83c3aedbd9cd9bc42d5de79f77de08d7027dba8ba9a4d68 WHIRLPOOL 0dbf55f4b53687eb31116c9ba6ab556296a7f915ffc859ddda739ca2bf633e31da6c692289a08859a315e7cb53e571c54fa117d666ed9ca3f789c891597444b6
+DIST jfreechart-1.0.14.tar.gz 6376551 SHA256 9250d0ab465fed67aa6f48090854258d9d0053f519ca534e267a8bb84a6727f2 SHA512 4d2344553032aa138143d88ad91942ffc66385d90b3d8f279f4257ef2273012580e99a60107baffefa3ea4e33cb0bad9e656a42747a4d0132642d5b9cb27da7b WHIRLPOOL 13cd39d4f287291eed725ba0229f44187b63466348c347c7acb0e6137d3c638136d1d973e8fdac31c7aec32793bf3864cc339df01abf0588763a77052a351e4d
 EBUILD jfreechart-1.0.13.ebuild 1843 SHA256 5f6a1a7e98fbfd2e44b37d07c35e50eb15637ecadb12ac164fd06b5a3d07c8fb SHA512 5c6dc360bb22f4fd00dacb17b820bdace08c41da967543c5678216f3ec256ea2ecd7e65de091179c6a8be60e48e6b6bf875a14e46476eb1c02877c3cf53936c9 WHIRLPOOL 5afe9fce735b198c431bafd5b620d9b3d448ba958efc71a5ade13b011e6549b5f3eccad549d1c1a43059a4bc7344fe25d2eaa0f96be69ab1968715f2d2f1ac28
-MISC ChangeLog 7795 SHA256 0512c4c884205dbb96a7b06db825e7c058048c16081407da33200fa6cdde818c SHA512 b86646c31cc1e895df658451dfb37f28affe2a20e61ac8274fe3d9bca56063866592e23eaf9db3dffd96b8a095274c16a9dc01974a1e5966bc887ff7d70af800 WHIRLPOOL 8244f22762bed22c466920948fbbc33c8627af6bc23c3dce88cf557abe07403cb1bf8a03f63c3369fec561f6bd9b1ac439e2e68628a596f2af5d1257084f94f0
-MISC metadata.xml 157 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 SHA512 bbae663e26f48fdc5e272adc2b06c14f77f34c53caf84acb53908ff036e7c12a3edbbc0929d2db56bee861a453381d979c7e0983a23716f629ed2135c22ffece WHIRLPOOL 887e153e2481e7d76f0f1b67a395f10f0328b93930185ecdb8fcb5fe3c50f839086a18831d61cf45b34657aaffca6c3b7900cf3c04b712846a05027a84602448
+EBUILD jfreechart-1.0.14.ebuild 2148 SHA256 94b674b7402ed0dda668ea9547c366b8afee54639549bfa425dccfc804487d5f SHA512 f377c028247e80134b6b03049874801808b10cc5633791420bf6c01291bc6b339d980c92bf6dd3dceaf6bc3035cd91f88e63f5e3f58531c949d16e5df85aedd2 WHIRLPOOL b0361e96951dae9d97af49ea4aacf4655bda1dc41ad596fd3331c0e0f6a643a7263277d7f40f4e1900e6bd57409e8b7b8d71f4cb8c097a5a2bcf250e4a2f132a
+MISC ChangeLog 8118 SHA256 a5e97a22efe565a962db605094150c20c8bd6c19ced07a3dfce2bb3cbf171cac SHA512 27dbe8be0955cc30b70b3a4a2f756646ae5937fb7e789d54654b87ab600160ed513bf151d467c1a1486912ff0e601988e7c78ac96a568b3feba7abb75b3cea63 WHIRLPOOL 97e2c5a73f25a28720f97fe4b320907456f89c13b9a2cfba91d5abd9d8daea94091f42ac5286d4d7badead96b554ff2b0d3c188fa04f061088122c155a1c0fc7
+MISC metadata.xml 239 SHA256 b2a6244ef3f3b6f51b8c4389815ea60713c6dd0758b8a64bf9b3c5a03bc06873 SHA512 06769efd2b3f33e77c910d4f3509f1657d90e772b0751c901697ec8044cf5b8a3c64c4c4d30e786c5939c17c72889e4885d9a36d97ac3e15c829f2a086b8f7c2 WHIRLPOOL e4f6f9c71b81271cba96f24bcfa107bc1d7492519e18d5bd42792e53bd70bc1387b479ac17ea9a993c4ad96fc2ea2fb81d367f7baf86dfc9cf19d94d5ea8f8c9
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJRnMNOAAoJEJWyH81tNOV9mHEH/0G8g59zjjbinP9EgmYjIIch
+84lddDOigVUWwbKg3F1ahvhvWoqp0VUV/rQ0sPcMLB+nziQkMSvTHN1vLYlqqKVC
+O53562rK5ITBUBeaF6VTfgD0/2V686+NTPqbv5jVoiwdFvubX/LqFLDGVdiP8sIN
+SeGVp6vc5A5B86wXhFdIZoJCRZw7Uk6u2CjrYeSL441gqdEJVr4SBhCIedO6HZh2
+QyrSAqB3xaUW6HlpXeQhgSCw9xBM/JS2hYFzWq1UelBCpspT8dxSXQMcLQXhfZF5
+Ao0ISUtf6vHDh4yo9wydDbyGqBfeB7CFQdrNnQBlZUXP37wDsvBbZUQ19ir7Dzw=
+=wgY+
+-----END PGP SIGNATURE-----
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>