Gentoo Archives: gentoo-commits

From: Andrew Ammerlaan <andrewammerlaan@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/sci:master commit in: dev-java/jfreechart/files/, dev-java/jfreechart/
Date: Wed, 27 Oct 2021 09:06:52
Message-Id: 1635325565.e41ce285c93ac3d29c449f754f1af708cc68403a.andrewammerlaan@gentoo
1 commit: e41ce285c93ac3d29c449f754f1af708cc68403a
2 Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
3 AuthorDate: Wed Oct 27 09:06:05 2021 +0000
4 Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
5 CommitDate: Wed Oct 27 09:06:05 2021 +0000
6 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=e41ce285
7
8 dev-java/jfreechart: last-rites from ::gentoo, EAPI bump
9
10 Package-Manager: Portage-3.0.28, Repoman-3.0.3
11 Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
12
13 .../files/jfreechart-1.0.19-build.xml.patch | 25 ++++++++
14 ...chart-1.0.19-fix-TimeSeriesCollectionTest.patch | 24 ++++++++
15 dev-java/jfreechart/jfreechart-1.0.19-r2.ebuild | 71 ++++++++++++++++++++++
16 dev-java/jfreechart/metadata.xml | 11 ++++
17 4 files changed, 131 insertions(+)
18
19 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
20 new file mode 100644
21 index 000000000..ffe657b89
22 --- /dev/null
23 +++ b/dev-java/jfreechart/files/jfreechart-1.0.19-build.xml.patch
24 @@ -0,0 +1,25 @@
25 +--- a/ant/build.xml 2011-11-20 22:40:13.000000000 +0100
26 ++++ b/ant/build.xml 2013-03-09 14:10:53.987970148 +0100
27 +@@ -40,10 +40,9 @@
28 + <available classname="java.lang.Annotation" property="src.version" value="1.5"/>
29 + <available classname="java.lang.Annotation" property="target.version" value="1.5"/>
30 + <path id="build.classpath">
31 +- <fileset dir="${basedir}/lib/">
32 +- <include name="${jcommon.name}-${jcommon.version}.jar"/>
33 +- <include name="servlet.jar"/>
34 +- </fileset>
35 ++ <pathelement location="${jcommon.jar}"/>
36 ++ <pathelement location="${servlet.jar}"/>
37 ++ <pathelement location="${gnujaxp.jar}"/>
38 + </path>
39 +
40 + </target>
41 +@@ -321,7 +320,7 @@
42 +
43 + <!-- COMPILE THE JUNIT TESTS. -->
44 + <target name="compile-tests"
45 +- depends="compile,compile-experimental"
46 ++ depends="initialise"
47 + description="Compile the test code">
48 +
49 + <mkdir dir="${basedir}/build-tests"/>
50
51 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
52 new file mode 100644
53 index 000000000..ebb6c4aef
54 --- /dev/null
55 +++ b/dev-java/jfreechart/files/jfreechart-1.0.19-fix-TimeSeriesCollectionTest.patch
56 @@ -0,0 +1,24 @@
57 +--- a/tests/org/jfree/data/time/TimeSeriesCollectionTest.java 2011-11-20 22:40:13.000000000 +0100
58 ++++ b/tests/org/jfree/data/time/TimeSeriesCollectionTest.java 2013-05-21 00:18:03.840041846 +0200
59 +@@ -339,6 +339,10 @@
60 + * java.util.List, boolean)} method.
61 + */
62 + public void testFindDomainBounds() {
63 ++ // store the current time zone
64 ++ TimeZone saved = TimeZone.getDefault();
65 ++ TimeZone.setDefault(TimeZone.getTimeZone("Europe/Paris"));
66 ++
67 + TimeSeriesCollection dataset = new TimeSeriesCollection();
68 + List visibleSeriesKeys = new java.util.ArrayList();
69 + Range r = DatasetUtilities.findDomainBounds(dataset, visibleSeriesKeys,
70 +@@ -351,10 +355,6 @@
71 + r = DatasetUtilities.findDomainBounds(dataset, visibleSeriesKeys, true);
72 + assertNull(r);
73 +
74 +- // store the current time zone
75 +- TimeZone saved = TimeZone.getDefault();
76 +- TimeZone.setDefault(TimeZone.getTimeZone("Europe/Paris"));
77 +-
78 + s1.add(new Year(2008), 8.0);
79 + r = DatasetUtilities.findDomainBounds(dataset, visibleSeriesKeys, true);
80 + assertEquals(1199142000000.0, r.getLowerBound(), EPSILON);
81
82 diff --git a/dev-java/jfreechart/jfreechart-1.0.19-r2.ebuild b/dev-java/jfreechart/jfreechart-1.0.19-r2.ebuild
83 new file mode 100644
84 index 000000000..e83f79d4b
85 --- /dev/null
86 +++ b/dev-java/jfreechart/jfreechart-1.0.19-r2.ebuild
87 @@ -0,0 +1,71 @@
88 +# Copyright 1999-2021 Gentoo Authors
89 +# Distributed under the terms of the GNU General Public License v2
90 +
91 +EAPI=7
92 +
93 +JAVA_PKG_IUSE="doc source"
94 +
95 +inherit java-pkg-2 java-ant-2
96 +
97 +DESCRIPTION="JFreeChart is a free Java class library for generating charts"
98 +HOMEPAGE="http://www.jfree.org/jfreechart"
99 +SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
100 +
101 +LICENSE="LGPL-2.1"
102 +SLOT="1.0"
103 +KEYWORDS="~amd64 ~x86"
104 +IUSE="test"
105 +
106 +CDEPEND="
107 + dev-java/jfreesvg:2.1
108 + >=dev-java/jcommon-1.0.23:1.0
109 + java-virtuals/servlet-api:3.0"
110 +
111 +RDEPEND="
112 + ${CDEPEND}
113 + >=virtual/jre-1.6"
114 +
115 +BDEPEND="
116 + ${CDEPEND}
117 + test? (
118 + dev-java/ant-junit:0
119 + dev-java/junit:4
120 + )
121 + app-arch/unzip
122 + >=virtual/jdk-1.6"
123 +
124 +RESTRICT="test"
125 +
126 +PATCHES=(
127 + "${FILESDIR}/${PN}-1.0.19-build.xml.patch"
128 + "${FILESDIR}/${PN}-1.0.19-fix-TimeSeriesCollectionTest.patch"
129 +)
130 +
131 +JAVA_ANT_ENCODING="ISO-8859-1"
132 +JAVA_ANT_REWRITE_CLASSPATH="yes"
133 +
134 +EANT_BUILD_XML="ant/build.xml"
135 +EANT_BUILD_TARGET="compile-experimental"
136 +EANT_GENTOO_CLASSPATH="
137 + jfreesvg-2.1
138 + jcommon-1.0
139 + servlet-api-3.0
140 +"
141 +
142 +EANT_DOC_TARGET="javadoc"
143 +
144 +src_prepare() {
145 + default
146 +
147 + java-pkg_clean
148 +}
149 +
150 +src_install() {
151 + java-pkg_newjar "lib/${P}.jar" "${PN}.jar"
152 + java-pkg_newjar "lib/${P}-experimental.jar" "${PN}-experimental.jar"
153 +
154 + dodoc README.txt ChangeLog NEWS
155 +
156 + use doc && java-pkg_dojavadoc javadoc
157 + use source && java-pkg_dosrc source/org
158 +}
159
160 diff --git a/dev-java/jfreechart/metadata.xml b/dev-java/jfreechart/metadata.xml
161 new file mode 100644
162 index 000000000..eae2d8963
163 --- /dev/null
164 +++ b/dev-java/jfreechart/metadata.xml
165 @@ -0,0 +1,11 @@
166 +<?xml version="1.0" encoding="UTF-8"?>
167 +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
168 +<pkgmetadata>
169 + <maintainer type="project">
170 + <email>sci@g.o</email>
171 + <name>Gentoo Science Project</name>
172 + </maintainer>
173 + <upstream>
174 + <remote-id type="sourceforge">jfreechart</remote-id>
175 + </upstream>
176 +</pkgmetadata>