1 |
commit: aa8dde67795b5593e55652dc5af192989c7a956a |
2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed May 25 21:09:23 2016 +0000 |
4 |
Commit: Johannes Huber <johu <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed May 25 22:23:27 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa8dde67 |
7 |
|
8 |
dev-java/freehep-graphicsio-emf: Version bump to 2.4, EAPI bump, tests |
9 |
|
10 |
Also add emf2svg launcher and fix NPE, closes bugs #304317, #304323. |
11 |
|
12 |
Package-Manager: portage-2.3.0_rc1 |
13 |
|
14 |
dev-java/freehep-graphicsio-emf/Manifest | 2 +- |
15 |
.../freehep-graphicsio-emf/files/github-30.patch | 34 ++++++++++++ |
16 |
.../freehep-graphicsio-emf-2.1.1.ebuild | 34 ------------ |
17 |
.../freehep-graphicsio-emf-2.4.ebuild | 61 ++++++++++++++++++++++ |
18 |
dev-java/freehep-graphicsio-emf/metadata.xml | 3 ++ |
19 |
5 files changed, 99 insertions(+), 35 deletions(-) |
20 |
|
21 |
diff --git a/dev-java/freehep-graphicsio-emf/Manifest b/dev-java/freehep-graphicsio-emf/Manifest |
22 |
index e598c6a..249f670 100644 |
23 |
--- a/dev-java/freehep-graphicsio-emf/Manifest |
24 |
+++ b/dev-java/freehep-graphicsio-emf/Manifest |
25 |
@@ -1 +1 @@ |
26 |
-DIST freehep-graphicsio-emf-2.1.1-sources.jar 131325 SHA256 c7b32d145be3aedf8adfe679359852c5dc8994d3a70b55f32bfeae85ebb3d629 SHA512 d5f971bb9ff8c5860b26e2e6cb02453db7a088349a2ce9840f8375b586f7911f5f1640b8e47e11c1afd8d7f04934f5f68722f276b22e8a0c28ef3d080d329cad WHIRLPOOL 8b505aaee85196dfb4b6912cfdcb9297a979ea1cf236f5a33c2664263d525012b80dad8180038f2427362ef314b637ceeb009fd47980f42e6d956d634873baf4 |
27 |
+DIST freehep-vectorgraphics-2.4.tar.gz 4118379 SHA256 2c7e1bbb3c056e9de83e5f7d9e0b2aeb3f46734000cdd0f18423eb43216305dd SHA512 b5cf083cc6951e7c4b438d5e648f61ca20b23e02163a8cfc4669beaaec2fa9e33338b0ba6875bfe4a3864ac48f9774acfedc2a3b2f59a7488ef99a4817e39382 WHIRLPOOL 62d61e05935348cf8b5d81033408729b02377f8a91760d08ab98a8e1451ea4d44e992a98dfb951978272ca842dbfa0d2885430cd16428dcf4da005aa092fbe76 |
28 |
|
29 |
diff --git a/dev-java/freehep-graphicsio-emf/files/github-30.patch b/dev-java/freehep-graphicsio-emf/files/github-30.patch |
30 |
new file mode 100644 |
31 |
index 0000000..c652ec6 |
32 |
--- /dev/null |
33 |
+++ b/dev-java/freehep-graphicsio-emf/files/github-30.patch |
34 |
@@ -0,0 +1,34 @@ |
35 |
+https://github.com/freehep/freehep-vectorgraphics/issues/30 |
36 |
+ |
37 |
+diff -Naur freehep-vectorgraphics-freehep-vectorgraphics-2.4.orig/freehep-graphicsio-emf/src/main/java/org/freehep/graphicsio/emf/EMFConverter.java freehep-vectorgraphics-freehep-vectorgraphics-2.4/freehep-graphicsio-emf/src/main/java/org/freehep/graphicsio/emf/EMFConverter.java |
38 |
+--- freehep-vectorgraphics-freehep-vectorgraphics-2.4.orig/freehep-graphicsio-emf/src/main/java/org/freehep/graphicsio/emf/EMFConverter.java 2014-09-02 09:59:14.000000000 +0100 |
39 |
++++ freehep-vectorgraphics-freehep-vectorgraphics-2.4/freehep-graphicsio-emf/src/main/java/org/freehep/graphicsio/emf/EMFConverter.java 2016-05-25 22:50:41.859734476 +0100 |
40 |
+@@ -4,6 +4,7 @@ |
41 |
+ import org.freehep.graphicsbase.util.export.ExportFileType; |
42 |
+ |
43 |
+ import java.util.List; |
44 |
++import java.util.Properties; |
45 |
+ import java.io.FileInputStream; |
46 |
+ import java.io.File; |
47 |
+ |
48 |
+@@ -64,9 +65,10 @@ |
49 |
+ destFileName += type.toLowerCase(); |
50 |
+ } |
51 |
+ |
52 |
++ Properties p = new Properties(); |
53 |
++ |
54 |
+ // TODO there is no possibility to use Constants of base class! |
55 |
+ /* create SVG properties |
56 |
+- Properties p = new Properties(); |
57 |
+ p.put(SVGGraphics2D.EMBED_FONTS, Boolean.toString(false)); |
58 |
+ p.put(SVGGraphics2D.CLIP, Boolean.toString(true)); |
59 |
+ p.put(SVGGraphics2D.COMPRESS, Boolean.toString(false)); |
60 |
+@@ -82,7 +84,7 @@ |
61 |
+ new File(destFileName), |
62 |
+ emfPanel, |
63 |
+ emfPanel, |
64 |
+- null, |
65 |
++ p, |
66 |
+ "Freehep EMF converter"); |
67 |
+ } catch (Exception e) { |
68 |
+ e.printStackTrace(); |
69 |
|
70 |
diff --git a/dev-java/freehep-graphicsio-emf/freehep-graphicsio-emf-2.1.1.ebuild b/dev-java/freehep-graphicsio-emf/freehep-graphicsio-emf-2.1.1.ebuild |
71 |
deleted file mode 100644 |
72 |
index 528bbff..0000000 |
73 |
--- a/dev-java/freehep-graphicsio-emf/freehep-graphicsio-emf-2.1.1.ebuild |
74 |
+++ /dev/null |
75 |
@@ -1,34 +0,0 @@ |
76 |
-# Copyright 1999-2010 Gentoo Foundation |
77 |
-# Distributed under the terms of the GNU General Public License v2 |
78 |
-# $Id$ |
79 |
- |
80 |
-JAVA_PKG_IUSE="" |
81 |
-GROUP_ID="org.freehep" |
82 |
-MAVEN2_REPOSITORIES="http://java.freehep.org/maven2" |
83 |
- |
84 |
-inherit java-pkg-2 java-mvn-src |
85 |
- |
86 |
-DESCRIPTION="High Energy Physics Java library - FreeHEP Enhanced Metafile Format Driver" |
87 |
-HOMEPAGE="http://java.freehep.org/" |
88 |
- |
89 |
-LICENSE="LGPL-2.1" |
90 |
-SLOT="0" |
91 |
-KEYWORDS="~amd64 ~x86" |
92 |
-IUSE="" |
93 |
- |
94 |
-CDEPEND=">=dev-java/freehep-util-2.0.2 |
95 |
- >=dev-java/freehep-graphicsio-2.1.1 |
96 |
- >=dev-java/freehep-graphicsio-tests-2.1.1 |
97 |
- dev-java/jdom |
98 |
- dev-java/junit |
99 |
- dev-java/freehep-misc-deps |
100 |
- dev-java/freehep-util |
101 |
- dev-java/freehep-swing |
102 |
- dev-java/freehep-graphics2d |
103 |
- dev-java/freehep-io |
104 |
- dev-java/freehep-export" |
105 |
-DEPEND=">=virtual/jdk-1.5 |
106 |
- ${CDEPEND}" |
107 |
-RDEPEND=">=virtual/jre-1.5 |
108 |
- ${CDEPEND}" |
109 |
-JAVA_GENTOO_CLASSPATH="freehep-util,freehep-graphicsio,freehep-graphicsio-tests,jdom-1.0,junit,freehep-misc-deps,freehep-util,freehep-swing,freehep-graphics2d,freehep-io,freehep-export" |
110 |
|
111 |
diff --git a/dev-java/freehep-graphicsio-emf/freehep-graphicsio-emf-2.4.ebuild b/dev-java/freehep-graphicsio-emf/freehep-graphicsio-emf-2.4.ebuild |
112 |
new file mode 100644 |
113 |
index 0000000..9df8c82 |
114 |
--- /dev/null |
115 |
+++ b/dev-java/freehep-graphicsio-emf/freehep-graphicsio-emf-2.4.ebuild |
116 |
@@ -0,0 +1,61 @@ |
117 |
+# Copyright 1999-2016 Gentoo Foundation |
118 |
+# Distributed under the terms of the GNU General Public License v2 |
119 |
+# $Id$ |
120 |
+ |
121 |
+EAPI=5 |
122 |
+ |
123 |
+MY_PN="freehep-vectorgraphics" |
124 |
+MY_P="${MY_PN}-${PV}" |
125 |
+JAVA_PKG_IUSE="doc source" |
126 |
+ |
127 |
+inherit eutils java-pkg-2 java-pkg-simple |
128 |
+ |
129 |
+DESCRIPTION="High Energy Physics Java library - FreeHEP Enhanced Metafile Format Driver" |
130 |
+HOMEPAGE="http://java.freehep.org/" |
131 |
+SRC_URI="https://github.com/freehep/${MY_PN}/archive/${MY_P}.tar.gz" |
132 |
+LICENSE="Apache-2.0 LGPL-2.1" |
133 |
+SLOT="0" |
134 |
+KEYWORDS="~amd64 ~x86" |
135 |
+IUSE="test" |
136 |
+ |
137 |
+CDEPEND="~dev-java/freehep-graphics2d-${PV}:${SLOT} |
138 |
+ ~dev-java/freehep-graphicsbase-${PV}:${SLOT} |
139 |
+ ~dev-java/freehep-graphicsio-${PV}:${SLOT} |
140 |
+ dev-java/freehep-io:0" |
141 |
+ |
142 |
+DEPEND="${CDEPEND} |
143 |
+ >=virtual/jdk-1.7 |
144 |
+ test? ( |
145 |
+ ~dev-java/freehep-graphicsio-tests-${PV}:${SLOT} |
146 |
+ dev-java/junit:4 |
147 |
+ )" |
148 |
+ |
149 |
+RDEPEND="${CDEPEND} |
150 |
+ >=virtual/jre-1.7" |
151 |
+ |
152 |
+S="${WORKDIR}/${MY_PN}-${MY_P}/${PN}" |
153 |
+JAVA_SRC_DIR="src/main/java" |
154 |
+JAVA_GENTOO_CLASSPATH="freehep-graphics2d,freehep-graphicsbase,freehep-graphicsio,freehep-io" |
155 |
+ |
156 |
+java_prepare() { |
157 |
+ epatch "${FILESDIR}"/github-30.patch |
158 |
+} |
159 |
+ |
160 |
+src_compile() { |
161 |
+ java-pkg-simple_src_compile |
162 |
+ java-pkg_addres ${PN}.jar src/main/resources |
163 |
+} |
164 |
+ |
165 |
+src_install() { |
166 |
+ java-pkg-simple_src_install |
167 |
+ java-pkg_register-optional-dependency freehep-graphicsio-svg |
168 |
+ java-pkg_dolauncher emf2svg --main org.freehep.graphicsio.emf.EMF2SVG |
169 |
+} |
170 |
+ |
171 |
+src_test() { |
172 |
+ local DIR=src/test/java |
173 |
+ local CP="${DIR}:${PN}.jar:$(java-pkg_getjars junit-4,freehep-graphicsio-tests,${JAVA_GENTOO_CLASSPATH})" |
174 |
+ |
175 |
+ ejavac -cp "${CP}" -d ${DIR} $(find ${DIR} -name "*.java") |
176 |
+ ejunit4 -classpath "${CP}" org.freehep.graphicsio.emf.test.EMFTestSuite |
177 |
+} |
178 |
|
179 |
diff --git a/dev-java/freehep-graphicsio-emf/metadata.xml b/dev-java/freehep-graphicsio-emf/metadata.xml |
180 |
index 952a4b9..696a250 100644 |
181 |
--- a/dev-java/freehep-graphicsio-emf/metadata.xml |
182 |
+++ b/dev-java/freehep-graphicsio-emf/metadata.xml |
183 |
@@ -5,4 +5,7 @@ |
184 |
<email>java@g.o</email> |
185 |
<name>Java</name> |
186 |
</maintainer> |
187 |
+ <upstream> |
188 |
+ <remote-id type="github">freehep/freehep-vectorgraphics</remote-id> |
189 |
+ </upstream> |
190 |
</pkgmetadata> |