Version bump. Fix bug 528402.

Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x93491BB8

5 files changed, 168 insertions, 19 deletions

diff --git a/dev-java/jfreechart/ChangeLog b/dev-java/jfreechart/ChangeLog
index c10d69840674..c26a193c5822 100644
--- a/dev-java/jfreechart/ChangeLog
+++ b/dev-java/jfreechart/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-java/jfreechart
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jfreechart/ChangeLog,v 1.54 2015/06/09 13:45:26 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jfreechart/ChangeLog,v 1.55 2015/06/09 16:45:10 monsieurp Exp $
+
+*jfreechart-1.0.19 (09 Jun 2015)
+
+  09 Jun 2015; Patrice Clement <monsieurp@gentoo.org>
+  +files/jfreechart-1.0.19-build.xml.patch,
+  +files/jfreechart-1.0.19-fix-TimeSeriesCollectionTest.patch,
+  +jfreechart-1.0.19.ebuild:
+  Version bump. Fix bug 528402.
 
   09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Updating remote-id in metadata.xml
diff --git a/dev-java/jfreechart/Manifest b/dev-java/jfreechart/Manifest
index b643a88f02a0..de8b1fbad5ac 100644
--- a/dev-java/jfreechart/Manifest
+++ b/dev-java/jfreechart/Manifest
@@ -1,32 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+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.19-build.xml.patch 1017 SHA256 4506fb16f04f78cd297b4f377c364b3c8c50a0d00cc511839a7dd972378fc3a3 SHA512 e48ce320ea75e95ba099bc39b98b32841925128fbbcf3790496030df7270b671a2b0cb681db017e7c7d3eb73269911f6ec51d6c18b0813af7e86acb194be736a WHIRLPOOL a20a43474326a7349c4130cd219753d0d06126b9811d9e25f2b3c7e12f8d63e9d3722fc9650c7755107ba1c61648ed1948fad8916ba7c20dab95ce02229b0ea5
+AUX jfreechart-1.0.19-fix-TimeSeriesCollectionTest.patch 1155 SHA256 8e857a1673b31efe737e1eaf1fa80871eae0a0861226acb73a1056106110380b SHA512 013941c364512e576ba10f3227b4d5ea57c31fcb22290a62b9bdcfeb3636b638f7be7653399bab026c69dc456cb66eb13b03d6cb580aaf5d4e1212a2640a3cad WHIRLPOOL 5c79e8431d645cac3c84c465fe944c266b32a1c5a6fe9c5f21cb0726b0db93ba0a25fa74f6eb4eda5c8393ca82b6af9c06bc65b5490bf9949b7d262b12d4b5e6
 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
+DIST jfreechart-1.0.19.zip 8050676 SHA256 bfe8d38fd48250dc04a3ff1aff477f2d226f49ba1ec2732ded981a3fccfc66f2 SHA512 6345e6a6b4a82862f3908794efb70a6f5413f313ba5bcff1dfb713d21948034d80c743a0cea61be81921c62736b07209ed4b942fedca0c76226b1202a4596b31 WHIRLPOOL 69a5d4c1851fd613a70cdc49904671f22cd7edd25b956c67cdcda5f5960228bfa0932907f0f4432685d4310851ffcd4e1e7283d2f2187a06666b296e84606cc0
 EBUILD jfreechart-1.0.13.ebuild 1843 SHA256 5f6a1a7e98fbfd2e44b37d07c35e50eb15637ecadb12ac164fd06b5a3d07c8fb SHA512 5c6dc360bb22f4fd00dacb17b820bdace08c41da967543c5678216f3ec256ea2ecd7e65de091179c6a8be60e48e6b6bf875a14e46476eb1c02877c3cf53936c9 WHIRLPOOL 5afe9fce735b198c431bafd5b620d9b3d448ba958efc71a5ade13b011e6549b5f3eccad549d1c1a43059a4bc7344fe25d2eaa0f96be69ab1968715f2d2f1ac28
 EBUILD jfreechart-1.0.14.ebuild 2148 SHA256 94b674b7402ed0dda668ea9547c366b8afee54639549bfa425dccfc804487d5f SHA512 f377c028247e80134b6b03049874801808b10cc5633791420bf6c01291bc6b339d980c92bf6dd3dceaf6bc3035cd91f88e63f5e3f58531c949d16e5df85aedd2 WHIRLPOOL b0361e96951dae9d97af49ea4aacf4655bda1dc41ad596fd3331c0e0f6a643a7263277d7f40f4e1900e6bd57409e8b7b8d71f4cb8c097a5a2bcf250e4a2f132a
-MISC ChangeLog 8215 SHA256 6b737b458534b0d5b213f48b45442c0459066b2ff988be8ed14a1f2ccf7fd69c SHA512 3865502afc289628a41c1f4216eaf04d9358e26cdfabe6a723ea23e33d016ca65b61a8a7ef280e5fb83bf6aa1af977744aad47b817e9bd925939722e28efe825 WHIRLPOOL 1c172548e082a8d59c810ed637c81df8ba71e08622d2364336997d935712b256ac5ba79188835d987f9b01cbf2c9fcb087455dd66ac2bf85c941ab4d49781ac7
+EBUILD jfreechart-1.0.19.ebuild 2557 SHA256 375393f3f130c0cabce1e54064cc985d0261c1d8961c896d074dcf25912ef2cf SHA512 f63add1d8b3640bb9a07c1febd107620a2244779be924601f4290acb20fdf0ce1300fe11dc81aa428414a1b54bde49cddbd5825e91f9684155af866b564a6c4e WHIRLPOOL 153fbf35235c2b10760b750b39c02d9c81992ccb68c6d8c3e939509d760009d1e2966eee7fb860708acab29f7b41e0ed8aae5d1a3a711382ecb96bd6ae3d9a27
+MISC ChangeLog 8477 SHA256 816d5058a4dbf4824054af7dfa24d6c298a2367eafed91e553ad42927b883eb0 SHA512 529e82be4a21045e95c6189411327f4c4702e493acfe703268eb4d964d4477aa4e39e8d6ceb8b7f2512e10d0ce362e954f25a663b0ed04bc77886a997da7c429 WHIRLPOOL 3f38d9f161ef2f37ff5367ffd52edc6f657e5609bb735b3c2476f73a4c928d762adda44f8c7603aa59f7d45f0e997a0728ab86679282d188fa05dd3f6e54de90
 MISC metadata.xml 322 SHA256 1aaa26802eab1e8d23ae75680befa7057e6decee28c7ed7ffbf87e806b0a2638 SHA512 8f92a811831d0d51c4b6f99461aa35e3ed94aa672c551a6fbc4cc2671f495cd81314d7b8d2f6143292f93f71c20bd37aba61165828cc7fe7a7fc30ce0800e2fa WHIRLPOOL f91f59aa2bffbcb56f994e93e34542dcbac7e6c485f80b95ace8ebaaaec41c984880d6b0b605d37dbf2d7078cc000e11c402349fbd6e96621dd617d318472927
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJVdu33XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiLF8P/RlYYcKrwZz2PRxXh0LtOOHS
-XmiaGxQbaQreL6BW2y016w3nd53rK2uwjyc/l4D2Gg4JSTdAukhbsBvCPDogxwLC
-ioJWiX4Jgq+3W+ybr7oVwKbxu8oa+e2aDKMnfEaf4ygtpPuxgb2JtTlLyWPH3nyF
-t7ZGJUmQa59F+odMscjA8cNfBywU77kHPviWU9k4m52NeFtJ/R07jK7+HEPwCil/
-3OvLo7oxjuP7qTP4GtwXFtwtInt4yllR6SM2mFQUZGxNYVdEVAyx3Nfff2hNQP5g
-5Azi+CrghYDVDVHMcCxjMOR3tLLiVmU7okTCI7ZTM65FOJ6mldn40P758eyJmHgf
-1ou5Qx9a8zV0qzeil/DPxjErOcTHy0xeBvXvebW/dgU1GM4ql1thX2pIx7QFYphR
-RJbLKjsZQYIYdkp7qDLecDX635xFnSGW+iG4wAGItRFce0+cTLFVEURGh/b1AlV+
-6W1tfiqD2C4bn3ZAzodkkn8ociLYDzg6Oi5F77xyqI5DnlXgyCxqr6cQclg7n3AM
-a9Pn9j0wWcLBDAd02Qpuqt6el67yBcK8Saj5nlm5muVfPQg4M2u9aBu6yCMP8u3t
-prlk1EgvWGY8IE9SB4Cvoqv/L3rlStzvnTVPWlOBFQsVoxAINCD/X+/R6Fon1uvu
-/bYJH+O3N6pw3kG1ezrK
-=fhna
+iQEcBAEBCAAGBQJVdxeaAAoJEJGRpfGTSRu4wXAH/i8UWpMROzpEAUkn91gXiDdI
+Wp5fzcTGzWcQ8pOuEDs5pULd3WnTBHzc/IGTPX7/+kq/lDDVo1+yqOHXXZDgNqjB
+gKlvo9SWU/NyoJWTTkJLMUD/9qBKW1EnHOyl/y5cazpt9UW4dtpGy7HBoPc3v0de
+FPDmw7earxN9cZLbHcQYiOkM5uD05en3zjYDvVVNornR4xsxullMukzZshVDraVF
+SyTcPlnWghekQR8nph98jc7mE2E8iKcbCBXaLI2PhxVj8ewqBqPTNaafMAW7cNNQ
+CmXW3rB+WECvNi2gvlhX0pojMo+OvikVpikQtXzIkmYhwW8TaCgpZEzWxsBYpns=
+=RNp2
 -----END PGP SIGNATURE-----
diff --git a/dev-java/jfreechart/files/jfreechart-1.0.19-build.xml.patch b/dev-java/jfreechart/files/jfreechart-1.0.19-build.xml.patch
new file mode 100644
index 000000000000..ffe657b89c9d
--- /dev/null
+++ b/dev-java/jfreechart/files/jfreechart-1.0.19-build.xml.patch
@@ -0,0 +1,25 @@
+--- 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,10 +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"/>
+-            </fileset>
++            <pathelement location="${jcommon.jar}"/>
++            <pathelement location="${servlet.jar}"/>
++            <pathelement location="${gnujaxp.jar}"/>
+         </path>
+ 
+     </target>
+@@ -321,7 +320,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"/>
diff --git a/dev-java/jfreechart/files/jfreechart-1.0.19-fix-TimeSeriesCollectionTest.patch b/dev-java/jfreechart/files/jfreechart-1.0.19-fix-TimeSeriesCollectionTest.patch
new file mode 100644
index 000000000000..ebb6c4aeffa0
--- /dev/null
+++ b/dev-java/jfreechart/files/jfreechart-1.0.19-fix-TimeSeriesCollectionTest.patch
@@ -0,0 +1,24 @@
+--- a/tests/org/jfree/data/time/TimeSeriesCollectionTest.java	2011-11-20 22:40:13.000000000 +0100
++++ b/tests/org/jfree/data/time/TimeSeriesCollectionTest.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.19.ebuild b/dev-java/jfreechart/jfreechart-1.0.19.ebuild
new file mode 100644
index 000000000000..0f1395ee5005
--- /dev/null
+++ b/dev-java/jfreechart/jfreechart-1.0.19.ebuild
@@ -0,0 +1,96 @@
+# 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.19.ebuild,v 1.1 2015/06/09 16:45:10 monsieurp 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}.zip"
+
+LICENSE="LGPL-2.1"
+SLOT="1.0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="+servlet test"
+
+CDEPEND=">=dev-java/jcommon-1.0.23:1.0
+	dev-java/jfreesvg:2.1
+	servlet? ( java-virtuals/servlet-api:2.3 )"
+
+DEPEND="${CDEPEND}
+	app-arch/unzip
+	>=virtual/jdk-1.6
+	test? (
+		dev-java/ant-junit:0
+		dev-java/junit:4
+	)"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.6"
+
+JAVA_PKG_FILTER_COMPILER="jikes"
+
+RESTRICT='test'
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-1.0.19-build.xml.patch"
+
+	# Fix test failure, obtained from
+	# http://sourceforge.net/p/jfreechart/bugs/1100/
+	epatch "${FILESDIR}/${PN}-1.0.19-fix-TimeSeriesCollectionTest.patch"
+
+	rm -v 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
+	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)
+}
+
+# Tests fail due to:
+# Caught an exception while logging the end of the build.  Exception was:
+# java.lang.OutOfMemoryError: PermGen space
+# java.lang.OutOfMemoryError: PermGen space
+# I don't think there's much we can do here.
+# 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="
+		-Djcommon.jar=$(java-pkg_getjar jcommon-1.0 jcommon.jar) \
+		-Djfreesvg.jar=$(java-pkg_getjar jfreesvg-2.1 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-4)"
+
+	echo "${antflags}"
+}