Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-chemistry/jmol/files/12.0.45/, sci-chemistry/jmol/files/, profiles/, ...
Date: Sat, 14 Sep 2019 15:48:37
Message-Id: 1568475860.1c1e7716d83e31e0ea116ddcab30807b2cdc0d5b.mgorny@gentoo
1 commit: 1c1e7716d83e31e0ea116ddcab30807b2cdc0d5b
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sat Sep 14 15:44:20 2019 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sat Sep 14 15:44:20 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c1e7716
7
8 sci-chemistry/jmol: Remove last-rited pkg
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 profiles/package.mask | 1 -
13 sci-chemistry/jmol/Manifest | 3 -
14 .../jmol/files/12.0.45/jmol-manifest.patch | 96 ------
15 sci-chemistry/jmol/files/12.0.45/jmol-nointl.patch | 313 -------------------
16 sci-chemistry/jmol/files/caffeine.xyz | 26 --
17 sci-chemistry/jmol/files/index.html | 14 -
18 sci-chemistry/jmol/files/jmol-12.2.27-nointl.patch | 330 ---------------------
19 sci-chemistry/jmol/jmol-12.0.45-r1.ebuild | 100 -------
20 sci-chemistry/jmol/jmol-12.2.27-r1.ebuild | 98 ------
21 sci-chemistry/jmol/metadata.xml | 15 -
22 10 files changed, 996 deletions(-)
23
24 diff --git a/profiles/package.mask b/profiles/package.mask
25 index 0de8a394f4f..feef25289e3 100644
26 --- a/profiles/package.mask
27 +++ b/profiles/package.mask
28 @@ -1117,7 +1117,6 @@ app-text/jpdftweak
29 dev-util/deskzilla
30 media-sound/tuxguitar
31 sci-mathematics/isabelle
32 -sci-chemistry/jmol
33
34 # Michał Górny <mgorny@g.o> (2019-08-14)
35 # No longer builds. Homepage is gone, and its keep-alive fork is also
36
37 diff --git a/sci-chemistry/jmol/Manifest b/sci-chemistry/jmol/Manifest
38 deleted file mode 100644
39 index f2869dc0d9a..00000000000
40 --- a/sci-chemistry/jmol/Manifest
41 +++ /dev/null
42 @@ -1,3 +0,0 @@
43 -DIST Jmol-12.0.45-full.tar.gz 26501382 BLAKE2B 68db22b79ecfca719ac4dc6e971e5f3fbfc1c66cd669ea5e823e18da0fca28279afaf9cc8999398849df9d718a6efcbd975f913c62e0b558de5b785f63d62045 SHA512 b0e999335c039e5bde5e261c076f3eb75dd0c33a351445d5c086995d32b3fd03795b3a11dc57a06bf8ac39e74945f3c9f4547ecfbf18b56d827b9a42f5208c11
44 -DIST Jmol-12.2.27-full.tar.gz 29493780 BLAKE2B 8e4dc9334348847fe0b54baea1c0575d70a2e564a194474e8e007ec6dc60fdb46a8d139f5dad1686b32f23a4be11a76dfc6578e015d65a532a891bf24425c20e SHA512 a8608e64dc06b6d3b0cb7e911f0a224456a65bdc15c51d6b420ee6abf8d82cdcec9f54f6b1a51cfe032e2e074f173f50a88bcff783311de19ce9b95ad990ebca
45 -DIST jmol-selfSignedCertificate.store.tar 10240 BLAKE2B 04dc1504bc751d2a9829b12fe64f851885d308ffee170cffc871d59552d46bff8ab211e5bdb4ed00b596b3882a359669bf4ebf170cca37d518d76f140294d1e6 SHA512 2c3e9d1183a0b174273346d0fba0729caa415ef53fe01629a4c47daa2393c9e18ca3f57984911e6340197429cf0ee581c64bb9b6072db902102976030d9f2c23
46
47 diff --git a/sci-chemistry/jmol/files/12.0.45/jmol-manifest.patch b/sci-chemistry/jmol/files/12.0.45/jmol-manifest.patch
48 deleted file mode 100644
49 index 3b43c219d94..00000000000
50 --- a/sci-chemistry/jmol/files/12.0.45/jmol-manifest.patch
51 +++ /dev/null
52 @@ -1,96 +0,0 @@
53 -diff -aurN jmol-11.0.3-orig/manifest/applet0.txt jmol-11.0.3/manifest/applet0.txt
54 ---- jmol-11.0.3-orig/manifest/applet0.txt 1969-12-31 18:00:00.000000000 -0600
55 -+++ jmol-11.0.3/manifest/applet0.txt 2007-05-16 01:54:10.000000000 -0500
56 -@@ -0,0 +1,6 @@
57 -+Main-Class: JmolApplet
58 -+Sealed: true
59 -+
60 -+Name: org/jmol/api/
61 -+Sealed: false
62 -+
63 -diff -aurN jmol-11.0.3-orig/manifest/applet1.txt jmol-11.0.3/manifest/applet1.txt
64 ---- jmol-11.0.3-orig/manifest/applet1.txt 1969-12-31 18:00:00.000000000 -0600
65 -+++ jmol-11.0.3/manifest/applet1.txt 2007-05-16 01:54:10.000000000 -0500
66 -@@ -0,0 +1,6 @@
67 -+Name: org/jmol/api/
68 -+Sealed: false
69 -+
70 -+Name: org/jmol/applet/
71 -+Sealed: true
72 -+
73 -diff -aurN jmol-11.0.3-orig/manifest/applet2.txt jmol-11.0.3/manifest/applet2.txt
74 ---- jmol-11.0.3-orig/manifest/applet2.txt 1969-12-31 18:00:00.000000000 -0600
75 -+++ jmol-11.0.3/manifest/applet2.txt 2007-05-16 01:56:19.000000000 -0500
76 -@@ -0,0 +1,3 @@
77 -+Name: javax/vecmath/
78 -+
79 -+
80 -diff -aurN jmol-11.0.3-orig/manifest/applet3.txt jmol-11.0.3/manifest/applet3.txt
81 ---- jmol-11.0.3-orig/manifest/applet3.txt 1969-12-31 18:00:00.000000000 -0600
82 -+++ jmol-11.0.3/manifest/applet3.txt 2007-05-16 01:56:47.000000000 -0500
83 -@@ -0,0 +1,4 @@
84 -+
85 -+Name: org/jmol/g3d/
86 -+Sealed: true
87 -+
88 -diff -aurN jmol-11.0.3-orig/manifest/applet4.txt jmol-11.0.3/manifest/applet4.txt
89 ---- jmol-11.0.3-orig/manifest/applet4.txt 1969-12-31 18:00:00.000000000 -0600
90 -+++ jmol-11.0.3/manifest/applet4.txt 2007-05-16 01:57:05.000000000 -0500
91 -@@ -0,0 +1,4 @@
92 -+
93 -+Name: org/jmol/adapter/smarter/
94 -+Sealed: true
95 -+
96 -diff -aurN jmol-11.0.3-orig/manifest/applet5.txt jmol-11.0.3/manifest/applet5.txt
97 ---- jmol-11.0.3-orig/manifest/applet5.txt 1969-12-31 18:00:00.000000000 -0600
98 -+++ jmol-11.0.3/manifest/applet5.txt 2007-05-16 01:57:23.000000000 -0500
99 -@@ -0,0 +1,4 @@
100 -+Name: org/openscience/jmol/ui/
101 -+Sealed: true
102 -+
103 -+
104 -diff -aurN jmol-11.0.3-orig/manifest/applet6.txt jmol-11.0.3/manifest/applet6.txt
105 ---- jmol-11.0.3-orig/manifest/applet6.txt 1969-12-31 18:00:00.000000000 -0600
106 -+++ jmol-11.0.3/manifest/applet6.txt 2007-05-16 01:57:46.000000000 -0500
107 -@@ -0,0 +1,4 @@
108 -+
109 -+Name: org/jmol/viewer/
110 -+Sealed: true
111 -+
112 -diff -aurN jmol-11.0.3-orig/manifest/appletMain.txt jmol-11.0.3/manifest/appletMain.txt
113 ---- jmol-11.0.3-orig/manifest/appletMain.txt 1969-12-31 18:00:00.000000000 -0600
114 -+++ jmol-11.0.3/manifest/appletMain.txt 2007-05-16 01:54:10.000000000 -0500
115 -@@ -0,0 +1,5 @@
116 -+Manifest-Version: 1.0
117 -+Sealed: true
118 -+
119 -+Name: org/jmol/api/
120 -+Sealed: false
121 -diff -aurN jmol-11.0.3-orig/manifest/appletMonolithic.txt jmol-11.0.3/manifest/appletMonolithic.txt
122 ---- jmol-11.0.3-orig/manifest/appletMonolithic.txt 1969-12-31 18:00:00.000000000 -0600
123 -+++ jmol-11.0.3/manifest/appletMonolithic.txt 2007-05-16 01:54:10.000000000 -0500
124 -@@ -0,0 +1,7 @@
125 -+Main-Class: JmolApplet
126 -+Sealed: true
127 -+
128 -+Name: org/jmol/api/
129 -+Sealed: false
130 -+
131 -+
132 -diff -aurN jmol-11.0.3-orig/manifest/applet.txt jmol-11.0.3/manifest/applet.txt
133 ---- jmol-11.0.3-orig/manifest/applet.txt 1969-12-31 18:00:00.000000000 -0600
134 -+++ jmol-11.0.3/manifest/applet.txt 2007-05-16 01:54:10.000000000 -0500
135 -@@ -0,0 +1,2 @@
136 -+Manifest-Version: 1.0
137 -+Sealed: true
138 -\ No newline at end of file
139 -diff -aurN jmol-11.0.3-orig/manifest/application.txt jmol-11.0.3/manifest/application.txt
140 ---- jmol-11.0.3-orig/manifest/application.txt 1969-12-31 18:00:00.000000000 -0600
141 -+++ jmol-11.0.3/manifest/application.txt 2007-05-16 01:54:10.000000000 -0500
142 -@@ -0,0 +1 @@
143 -+Main-Class: org.openscience.jmol.app.Jmol
144 -diff -aurN jmol-11.0.3-orig/manifest/jvxl.txt jmol-11.0.3/manifest/jvxl.txt
145 ---- jmol-11.0.3-orig/manifest/jvxl.txt 1969-12-31 18:00:00.000000000 -0600
146 -+++ jmol-11.0.3/manifest/jvxl.txt 2007-05-16 01:54:10.000000000 -0500
147 -@@ -0,0 +1 @@
148 -+Main-Class: org.openscience.jvxl.Jvxl
149
150 diff --git a/sci-chemistry/jmol/files/12.0.45/jmol-nointl.patch b/sci-chemistry/jmol/files/12.0.45/jmol-nointl.patch
151 deleted file mode 100644
152 index c1b22e83c61..00000000000
153 --- a/sci-chemistry/jmol/files/12.0.45/jmol-nointl.patch
154 +++ /dev/null
155 @@ -1,313 +0,0 @@
156 ---- build.xml 2011-02-25 12:59:43.000000000 -0600
157 -+++ build.xml.new 2011-02-27 12:16:02.398959959 -0600
158 -@@ -110,10 +110,6 @@
159 - <srcfiles dir="doc/source"
160 - includes="JmolGuide.docbook.xml, guide/*.docbook.xml"/>
161 - </uptodate>
162 -- <uptodate targetfile="build/doc/JmolUserGuide_fr/index.html">
163 -- <srcfiles dir="doc/source"
164 -- includes="JmolGuide_fr.docbook.xml, guide/*_fr.docbook.xml"/>
165 -- </uptodate>
166 - </and>
167 - </condition>
168 -
169 -@@ -123,14 +119,6 @@
170 - <srcfiles dir="doc/source"
171 - includes="JmolHistory.xml,JmolHistoryToHtml.xsl,history/changes.xml" />
172 - </uptodate>
173 -- <uptodate targetfile="build/doc/JmolHistory/ChangeLog_fr.html">
174 -- <srcfiles dir="doc/source"
175 -- includes="JmolHistory_fr.xml,JmolHistoryToHtml.xsl,history/changes_fr.xml" />
176 -- </uptodate>
177 -- <uptodate targetfile="build/doc/JmolHistory/ChangeLog_nl.html">
178 -- <srcfiles dir="doc/source"
179 -- includes="JmolHistory_nl.xml,JmolHistoryToHtml.xsl,history/changes_nl.xml" />
180 -- </uptodate>
181 - </and>
182 - </condition>
183 -
184 -@@ -140,14 +128,6 @@
185 - <srcfiles dir="doc/source"
186 - includes="JmolDevelopersGuide.docbook.xml"/>
187 - </uptodate>
188 -- <uptodate targetfile="build/doc/JmolDevelopersGuide_fr.html">
189 -- <srcfiles dir="doc/source"
190 -- includes="JmolDevelopersGuide_fr.docbook.xml"/>
191 -- </uptodate>
192 -- <uptodate targetfile="build/doc/JmolDevelopersGuide_de.html">
193 -- <srcfiles dir="doc/source"
194 -- includes="JmolDevelopersGuide_de.docbook.xml"/>
195 -- </uptodate>
196 - </and>
197 - </condition>
198 -
199 -@@ -157,14 +137,6 @@
200 - <srcfiles dir="doc/source"
201 - includes="JmolAppletGuide.docbook.xml, applet/*.docbook.xml"/>
202 - </uptodate>
203 -- <uptodate targetfile="build/doc/JmolAppletGuide_fr.html">
204 -- <srcfiles dir="doc/source"
205 -- includes="JmolAppletGuide_fr.docbook.xml, applet/*_fr.docbook.xml"/>
206 -- </uptodate>
207 -- <uptodate targetfile="build/doc/JmolAppletGuide_de.html">
208 -- <srcfiles dir="doc/source"
209 -- includes="JmolAppletGuide_de.docbook.xml"/>
210 -- </uptodate>
211 - </and>
212 - </condition>
213 -
214 -@@ -385,17 +357,12 @@
215 - </target>
216 -
217 - <target name="jar" id="jar"
218 -- depends="init,classes,jmolGuide,jmolHistory,jmolDevelopersGuide,libjars,main-i18n">
219 -+ depends="init,classes,jmolGuide,jmolHistory,jmolDevelopersGuide,libjars">
220 - <copy todir="${classes.dir}/org/openscience/jmol/Data/guide" >
221 - <fileset dir="build/doc/JmolUserGuide">
222 - <include name="**/*.html" />
223 - </fileset>
224 - </copy>
225 -- <copy todir="${classes.dir}/org/openscience/jmol/Data/guide_fr" >
226 -- <fileset dir="build/doc/JmolUserGuide_fr">
227 -- <include name="**/*.html" />
228 -- </fileset>
229 -- </copy>
230 - <copy todir="${classes.dir}/org/openscience/jmol/Data" >
231 - <fileset dir="build/doc/JmolHistory">
232 - <include name="**/*.html" />
233 -@@ -587,18 +554,6 @@
234 - <fileset dir="${appletjars.dir}" includes="**/*"/>
235 - </jar>
236 -
237 -- <for list="${all.JmolApplet.languages}" delimiter=","
238 -- param="current.Jmol.language">
239 -- <sequential>
240 -- <jar destfile="${jmol.applet.build.dir}/JmolApplet0_i18n_@{current.Jmol.language}.jar"
241 -- manifest="manifest/applet_i18n.txt" >
242 -- <fileset dir="${applet.classes.dir}">
243 -- <include name="org/jmol/translation/JmolApplet/@{current.Jmol.language}/**" />
244 -- </fileset>
245 -- </jar>
246 -- </sequential>
247 -- </for>
248 --
249 - <jar destfile="${jmol.applet.build.dir}/JmolApplet0_Minimize.jar" manifest="manifest/applet.txt">
250 - <fileset dir="${applet.classes.dir}">
251 - <include name="org/jmol/minimize/**" />
252 -@@ -712,7 +667,6 @@
253 - <include name="org/jmol/bspt/**" />
254 - <include name="org/jmol/g3d/**" />
255 - <include name="org/jmol/geodesic/**" />
256 -- <include name="org/jmol/i18n/**" />
257 - <include name="org/jmol/modelset/**" />
258 - <include name="org/jmol/script/**" />
259 - <include name="org/jmol/shape/**" />
260 -@@ -738,7 +692,6 @@
261 - <pathelement path="${jmol.applet.build.dir}/JmolApplet0_ShapeSurface.jar" />
262 - <pathelement path="${jmol.applet.build.dir}/JmolApplet0_Smiles.jar" />
263 - <pathelement path="${jmol.applet.build.dir}/JmolApplet0_Symmetry.jar" />
264 -- <fileset dir="${jmol.applet.build.dir}" includes="JmolApplet0_i18n_*.jar" />
265 - </indexjars>
266 - </jar>
267 - <!-- changes to this must be replicated below for the signed applet -->
268 -@@ -851,16 +804,6 @@
269 - keystore="selfSignedCertificate/selfSignedCertificate.store"
270 - storepass="selfSignedCertificate" alias="selfSignedCertificate" />
271 -
272 -- <for list="${all.JmolApplet.languages}" delimiter=","
273 -- param="current.Jmol.language">
274 -- <sequential>
275 -- <signjar jar="${jmol.applet.build.dir}/JmolApplet0_i18n_@{current.Jmol.language}.jar"
276 -- signedjar="${jmol.applet.build.dir}/JmolAppletSigned0_i18n_@{current.Jmol.language}.jar"
277 -- keystore="selfSignedCertificate/selfSignedCertificate.store"
278 -- storepass="selfSignedCertificate" alias="selfSignedCertificate" />
279 -- </sequential>
280 -- </for>
281 --
282 - <!-- vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv -->
283 - <!-- this one must be treated specially because of jar indexing
284 - we cannot simply rename the jar file, because the index has
285 -@@ -906,7 +849,6 @@
286 - <pathelement path="${jmol.applet.build.dir}/JmolAppletSigned0_ShapeSurface.jar" />
287 - <pathelement path="${jmol.applet.build.dir}/JmolAppletSigned0_Smiles.jar" />
288 - <pathelement path="${jmol.applet.build.dir}/JmolAppletSigned0_Symmetry.jar" />
289 -- <fileset dir="${jmol.applet.build.dir}" includes="JmolAppletSigned0_i18n_*.jar" />
290 - </indexjars>
291 - </jar>
292 - <signjar jar="${jmol.applet.build.dir}/JmolAppletSigned0.jar"
293 -@@ -944,18 +886,6 @@
294 - </fileset>
295 - </jar>
296 -
297 -- <for list="${all.JmolApplet.languages}" delimiter=","
298 -- param="current.Jmol.language">
299 -- <sequential>
300 -- <jar destfile="${jmol.applet.build.dir}/JmolApplet0_i18n_@{current.Jmol.language}.jar"
301 -- manifest="manifest/applet_i18n.txt" >
302 -- <fileset dir="${applet.classes.dir}">
303 -- <include name="org/jmol/translation/JmolApplet/@{current.Jmol.language}/**" />
304 -- </fileset>
305 -- </jar>
306 -- </sequential>
307 -- </for>
308 --
309 - <jar destfile="${jmol.applet.build.dir}/JmolApplet0_Minimize.jar" manifest="manifest/applet.txt">
310 - <fileset dir="${applet.classes.dir}">
311 - <include name="org/jmol/minimize/**" />
312 -@@ -1069,7 +999,6 @@
313 - <include name="org/jmol/bspt/**" />
314 - <include name="org/jmol/g3d/**" />
315 - <include name="org/jmol/geodesic/**" />
316 -- <include name="org/jmol/i18n/**" />
317 - <include name="org/jmol/modelset/**" />
318 - <include name="org/jmol/script/**" />
319 - <include name="org/jmol/shape/**" />
320 -@@ -1095,7 +1024,6 @@
321 - <pathelement path="${jmol.applet.build.dir}/JmolApplet0_ShapeSurface.jar" />
322 - <pathelement path="${jmol.applet.build.dir}/JmolApplet0_Smiles.jar" />
323 - <pathelement path="${jmol.applet.build.dir}/JmolApplet0_Symmetry.jar" />
324 -- <fileset dir="${jmol.applet.build.dir}" includes="JmolApplet0_i18n_*.jar" />
325 - </indexjars>
326 - </jar>
327 - <!-- changes to this must be replicated below for the signed applet -->
328 -@@ -1104,7 +1032,7 @@
329 - </target>
330 -
331 - <target name="dist" id="dist"
332 -- depends="doc,main-i18n,main,signed-applet">
333 -+ depends="doc,main,signed-applet">
334 - <!-- first build binary distribution -->
335 - <delete dir="build/dist/jmol-${version}"/>
336 - <mkdir dir="build/dist/jmol-${version}"/>
337 -@@ -1163,7 +1091,6 @@
338 - <fileset dir=".">
339 - <include name="applet.classes" />
340 - <include name="build.xml" />
341 -- <include name="build-i18n.xml" />
342 - </fileset>
343 - </copy>
344 -
345 -@@ -1246,7 +1173,6 @@
346 - <fileset dir=".">
347 - <include name="apisio.classes" />
348 - <include name="build.xml" />
349 -- <include name="build-i18n.xml" />
350 - </fileset>
351 - </copy>
352 -
353 -@@ -1342,7 +1268,7 @@
354 - <target name="xclean" id="xclean">
355 - </target>
356 -
357 -- <target name="spotless" id="spotless" depends="clean,spotless-i18n">
358 -+ <target name="spotless" id="spotless" depends="clean">
359 - <delete dir="build"/>
360 - <delete dir="${javadoc.dir}"/>
361 - <delete dir="packaging/rpm/dist"/>
362 -@@ -1406,16 +1332,6 @@
363 - <arg value="../../../doc/source/JmolGuide.docbook.xml" />
364 - <arg value="../../${docbook-xsl}/html/chunk.xsl" />
365 - </java>
366 -- <echo message="Generating user's guide (fr)" />
367 -- <mkdir dir="build/doc/JmolUserGuide_fr" />
368 -- <java fork="true" dir="build/doc/JmolUserGuide_fr"
369 -- classname="com.icl.saxon.StyleSheet"
370 -- classpath="${lib.dir}/saxon.jar" >
371 -- <jvmarg value="${proxyHost}" />
372 -- <jvmarg value="${proxyPort}" />
373 -- <arg value="../../../doc/source/JmolGuide_fr.docbook.xml" />
374 -- <arg value="../../${docbook-xsl}/html/chunk.xsl" />
375 -- </java>
376 - </target>
377 -
378 - <target name="jmolHistory" id="jmolHistory"
379 -@@ -1430,26 +1346,6 @@
380 - <arg value="../../../doc/source/JmolHistory.xml" />
381 - <arg value="../../../doc/source/JmolHistoryToHtml.xsl" />
382 - </java>
383 -- <echo message="Generating history of changes (fr)" />
384 -- <java fork="true" dir="build/doc/JmolHistory"
385 -- classname="com.icl.saxon.StyleSheet"
386 -- classpath="${lib.dir}/saxon.jar" >
387 -- <arg value="-o" />
388 -- <arg value="ChangeLog_fr.html" />
389 -- <arg value="../../../doc/source/JmolHistory_fr.xml" />
390 -- <arg value="../../../doc/source/JmolHistoryToHtml.xsl" />
391 -- <arg value="lang=fr" />
392 -- </java>
393 -- <echo message="Generating history of changes (nl)" />
394 -- <java fork="true" dir="build/doc/JmolHistory"
395 -- classname="com.icl.saxon.StyleSheet"
396 -- classpath="${lib.dir}/saxon.jar" >
397 -- <arg value="-o" />
398 -- <arg value="ChangeLog_nl.html" />
399 -- <arg value="../../../doc/source/JmolHistory_nl.xml" />
400 -- <arg value="../../../doc/source/JmolHistoryToHtml.xsl" />
401 -- <arg value="lang=nl" />
402 -- </java>
403 - </target>
404 -
405 - <target name="jmolDevelopersGuide" id="jmolDevelopersGuide"
406 -@@ -1463,24 +1359,6 @@
407 - <arg value="../../doc/source/JmolDevelopersGuide.docbook.xml" />
408 - <arg value="../${docbook-xsl}/html/docbook.xsl" />
409 - </java>
410 -- <echo message="Generating developer's guide (fr)" />
411 -- <java fork="true" dir="build/doc"
412 -- classname="com.icl.saxon.StyleSheet"
413 -- classpath="${lib.dir}/saxon.jar" >
414 -- <arg value="-o" />
415 -- <arg value="JmolDevelopersGuide_fr.html" />
416 -- <arg value="../../doc/source/JmolDevelopersGuide_fr.docbook.xml" />
417 -- <arg value="../${docbook-xsl}/html/docbook.xsl" />
418 -- </java>
419 -- <echo message="Generating developer's guide (de)" />
420 -- <java fork="true" dir="build/doc"
421 -- classname="com.icl.saxon.StyleSheet"
422 -- classpath="${lib.dir}/saxon.jar" >
423 -- <arg value="-o" />
424 -- <arg value="JmolDevelopersGuide_de.html" />
425 -- <arg value="../../doc/source/JmolDevelopersGuide_de.docbook.xml" />
426 -- <arg value="../${docbook-xsl}/html/docbook.xsl" />
427 -- </java>
428 - </target>
429 -
430 - <target name="jmolAppletGuide" id="jmolAppletGuide" depends="initdoc"
431 -@@ -1494,24 +1372,6 @@
432 - <arg value="../../doc/source/JmolAppletGuide.docbook.xml" />
433 - <arg value="../${docbook-xsl}/html/docbook.xsl" />
434 - </java>
435 -- <echo message="Generating applet guide (fr)" />
436 -- <java fork="true" dir="build/doc"
437 -- classname="com.icl.saxon.StyleSheet"
438 -- classpath="${lib.dir}/saxon.jar" >
439 -- <arg value="-o" />
440 -- <arg value="JmolAppletGuide_fr.html" />
441 -- <arg value="../../doc/source/JmolAppletGuide_fr.docbook.xml" />
442 -- <arg value="../${docbook-xsl}/html/docbook.xsl" />
443 -- </java>
444 -- <echo message="Generating applet guide (de)" />
445 -- <java fork="true" dir="build/doc"
446 -- classname="com.icl.saxon.StyleSheet"
447 -- classpath="${lib.dir}/saxon.jar" >
448 -- <arg value="-o" />
449 -- <arg value="JmolAppletGuide_de.html" />
450 -- <arg value="../../doc/source/JmolAppletGuide_de.docbook.xml" />
451 -- <arg value="../${docbook-xsl}/html/docbook.xsl" />
452 -- </java>
453 - </target>
454 -
455 - <target name="test" id="test" depends="main,compile-tests">
456 -@@ -1543,12 +1403,4 @@
457 - <jar destfile="${tests.dir}/Tests.jar" basedir="${test-classes.dir}" />
458 - </target>
459 -
460 -- <!-- i18n stuff -->
461 -- <target name="main-i18n" depends="classes">
462 -- <ant antfile="tools/build-i18n.xml" target="main-i18n"/>
463 -- </target>
464 -- <target name="spotless-i18n">
465 -- <ant antfile="tools/build-i18n.xml" target="spotless-i18n"/>
466 -- </target>
467 --
468 - </project>
469
470 diff --git a/sci-chemistry/jmol/files/caffeine.xyz b/sci-chemistry/jmol/files/caffeine.xyz
471 deleted file mode 100644
472 index f0325b049f3..00000000000
473 --- a/sci-chemistry/jmol/files/caffeine.xyz
474 +++ /dev/null
475 @@ -1,26 +0,0 @@
476 -24
477 -Caffeine
478 -H -3.3804130 -1.1272367 0.5733036
479 -N 0.9668296 -1.0737425 -0.8198227
480 -C 0.0567293 0.8527195 0.3923156
481 -N -1.3751742 -1.0212243 -0.0570552
482 -C -1.2615018 0.2590713 0.5234135
483 -C -0.3068337 -1.6836331 -0.7169344
484 -C 1.1394235 0.1874122 -0.2700900
485 -N 0.5602627 2.0839095 0.8251589
486 -O -0.4926797 -2.8180554 -1.2094732
487 -C -2.6328073 -1.7303959 -0.0060953
488 -O -2.2301338 0.7988624 1.0899730
489 -H 2.5496990 2.9734977 0.6229590
490 -C 2.0527432 -1.7360887 -1.4931279
491 -H -2.4807715 -2.7269528 0.4882631
492 -H -3.0089039 -1.9025254 -1.0498023
493 -H 2.9176101 -1.8481516 -0.7857866
494 -H 2.3787863 -1.1211917 -2.3743655
495 -H 1.7189877 -2.7489920 -1.8439205
496 -C -0.1518450 3.0970046 1.5348347
497 -C 1.8934096 2.1181245 0.4193193
498 -N 2.2861252 0.9968439 -0.2440298
499 -H -0.1687028 4.0436553 0.9301094
500 -H 0.3535322 3.2979060 2.5177747
501 -H -1.2074498 2.7537592 1.7203047
502
503 diff --git a/sci-chemistry/jmol/files/index.html b/sci-chemistry/jmol/files/index.html
504 deleted file mode 100644
505 index 35a5d49217e..00000000000
506 --- a/sci-chemistry/jmol/files/index.html
507 +++ /dev/null
508 @@ -1,14 +0,0 @@
509 -<html>
510 - <head>
511 - <title>Jmol Test Page</title>
512 - <div align="center"> <b>All the Sugar and Twice the Caffeine.</b> <br><br>
513 - <script src="./Jmol.js"></script>
514 - </head>
515 - <body>
516 - <script>
517 - jmolInitialize("./"); // REQUIRED
518 - jmolApplet(400, "load ./caffeine.xyz");
519 - </script></div>
520 - </body>
521 -</html>
522 -
523
524 diff --git a/sci-chemistry/jmol/files/jmol-12.2.27-nointl.patch b/sci-chemistry/jmol/files/jmol-12.2.27-nointl.patch
525 deleted file mode 100644
526 index 0a43faaf653..00000000000
527 --- a/sci-chemistry/jmol/files/jmol-12.2.27-nointl.patch
528 +++ /dev/null
529 @@ -1,330 +0,0 @@
530 ---- orig-build.xml 2012-05-31 13:42:43.943062427 -0500
531 -+++ build.xml 2012-05-31 14:01:01.691982062 -0500
532 -@@ -52,8 +52,6 @@
533 -
534 - <property file="proxy.properties" />
535 -
536 -- <import file="tools/build-i18n.xml"/>
537 --
538 - <path id="project.class.path">
539 - <fileset dir="${lib.dir}">
540 - <include name="*.jar" />
541 -@@ -111,10 +109,6 @@
542 - <srcfiles dir="doc/source"
543 - includes="JmolGuide.docbook.xml, guide/*.docbook.xml"/>
544 - </uptodate>
545 -- <uptodate targetfile="build/doc/JmolUserGuide_fr/index.html">
546 -- <srcfiles dir="doc/source"
547 -- includes="JmolGuide_fr.docbook.xml, guide/*_fr.docbook.xml"/>
548 -- </uptodate>
549 - </and>
550 - </condition>
551 -
552 -@@ -124,14 +118,6 @@
553 - <srcfiles dir="doc/source"
554 - includes="JmolHistory.xml,JmolHistoryToHtml.xsl,history/changes.xml" />
555 - </uptodate>
556 -- <uptodate targetfile="build/doc/JmolHistory/ChangeLog_fr.html">
557 -- <srcfiles dir="doc/source"
558 -- includes="JmolHistory_fr.xml,JmolHistoryToHtml.xsl,history/changes_fr.xml" />
559 -- </uptodate>
560 -- <uptodate targetfile="build/doc/JmolHistory/ChangeLog_nl.html">
561 -- <srcfiles dir="doc/source"
562 -- includes="JmolHistory_nl.xml,JmolHistoryToHtml.xsl,history/changes_nl.xml" />
563 -- </uptodate>
564 - </and>
565 - </condition>
566 -
567 -@@ -141,14 +127,6 @@
568 - <srcfiles dir="doc/source"
569 - includes="JmolDevelopersGuide.docbook.xml"/>
570 - </uptodate>
571 -- <uptodate targetfile="build/doc/JmolDevelopersGuide_fr.html">
572 -- <srcfiles dir="doc/source"
573 -- includes="JmolDevelopersGuide_fr.docbook.xml"/>
574 -- </uptodate>
575 -- <uptodate targetfile="build/doc/JmolDevelopersGuide_de.html">
576 -- <srcfiles dir="doc/source"
577 -- includes="JmolDevelopersGuide_de.docbook.xml"/>
578 -- </uptodate>
579 - </and>
580 - </condition>
581 -
582 -@@ -158,14 +136,6 @@
583 - <srcfiles dir="doc/source"
584 - includes="JmolAppletGuide.docbook.xml, applet/*.docbook.xml"/>
585 - </uptodate>
586 -- <uptodate targetfile="build/doc/JmolAppletGuide_fr.html">
587 -- <srcfiles dir="doc/source"
588 -- includes="JmolAppletGuide_fr.docbook.xml, applet/*_fr.docbook.xml"/>
589 -- </uptodate>
590 -- <uptodate targetfile="build/doc/JmolAppletGuide_de.html">
591 -- <srcfiles dir="doc/source"
592 -- includes="JmolAppletGuide_de.docbook.xml"/>
593 -- </uptodate>
594 - </and>
595 - </condition>
596 -
597 -@@ -388,17 +358,12 @@
598 - </target>
599 -
600 - <target name="jar" id="jar"
601 -- depends="init,classes,jmolGuide,jmolHistory,jmolDevelopersGuide,libjars,main-i18n">
602 -+ depends="init,classes,jmolGuide,jmolHistory,jmolDevelopersGuide,libjars">
603 - <copy todir="${classes.dir}/org/openscience/jmol/Data/guide" >
604 - <fileset dir="build/doc/JmolUserGuide">
605 - <include name="**/*.html" />
606 - </fileset>
607 - </copy>
608 -- <copy todir="${classes.dir}/org/openscience/jmol/Data/guide_fr" >
609 -- <fileset dir="build/doc/JmolUserGuide_fr">
610 -- <include name="**/*.html" />
611 -- </fileset>
612 -- </copy>
613 - <copy todir="${classes.dir}/org/openscience/jmol/Data" >
614 - <fileset dir="build/doc/JmolHistory">
615 - <include name="**/*.html" />
616 -@@ -603,18 +568,6 @@
617 - <fileset dir="${appletjars.dir}" includes="**/*"/>
618 - </jar>
619 -
620 -- <for list="${all.JmolApplet.languages}" delimiter=","
621 -- param="current.Jmol.language">
622 -- <sequential>
623 -- <jar destfile="${jmol.applet.build.dir}/JmolApplet0_i18n_@{current.Jmol.language}.jar"
624 -- manifest="manifest/applet_i18n.txt" >
625 -- <fileset dir="${applet.classes.dir}">
626 -- <include name="org/jmol/translation/JmolApplet/@{current.Jmol.language}/**" />
627 -- </fileset>
628 -- </jar>
629 -- </sequential>
630 -- </for>
631 --
632 - <jar destfile="${jmol.applet.build.dir}/JmolApplet0_Minimize.jar" manifest="manifest/applet.txt">
633 - <fileset dir="${applet.classes.dir}">
634 - <include name="org/jmol/minimize/**" />
635 -@@ -729,7 +682,6 @@
636 - <include name="org/jmol/constant/**" />
637 - <include name="org/jmol/g3d/**" />
638 - <include name="org/jmol/geodesic/**" />
639 -- <include name="org/jmol/i18n/**" />
640 - <include name="org/jmol/modelset/**" />
641 - <include name="org/jmol/script/**" />
642 - <include name="org/jmol/shape/**" />
643 -@@ -755,7 +707,6 @@
644 - <pathelement path="${jmol.applet.build.dir}/JmolApplet0_ShapeSurface.jar" />
645 - <pathelement path="${jmol.applet.build.dir}/JmolApplet0_Smiles.jar" />
646 - <pathelement path="${jmol.applet.build.dir}/JmolApplet0_Symmetry.jar" />
647 -- <fileset dir="${jmol.applet.build.dir}" includes="JmolApplet0_i18n_*.jar" />
648 - </indexjars>
649 - </jar>
650 - <!-- changes to this must be replicated below for the signed applet -->
651 -@@ -868,16 +819,6 @@
652 - keystore="selfSignedCertificate/selfSignedCertificate.store"
653 - storepass="selfSignedCertificate" alias="selfSignedCertificate" />
654 -
655 -- <for list="${all.JmolApplet.languages}" delimiter=","
656 -- param="current.Jmol.language">
657 -- <sequential>
658 -- <signjar jar="${jmol.applet.build.dir}/JmolApplet0_i18n_@{current.Jmol.language}.jar"
659 -- signedjar="${jmol.applet.build.dir}/JmolAppletSigned0_i18n_@{current.Jmol.language}.jar"
660 -- keystore="selfSignedCertificate/selfSignedCertificate.store"
661 -- storepass="selfSignedCertificate" alias="selfSignedCertificate" />
662 -- </sequential>
663 -- </for>
664 --
665 - <!-- vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv -->
666 - <!-- this one must be treated specially because of jar indexing
667 - we cannot simply rename the jar file, because the index has
668 -@@ -905,7 +846,6 @@
669 - <include name="org/jmol/shape/**" />
670 - <include name="org/jmol/viewer/**" />
671 - <include name="org/jmol/util/**" />
672 -- <include name="org/jmol/i18n/**" />
673 - </fileset>
674 - <indexjars>
675 - <pathelement path="${jmol.applet.build.dir}/JmolAppletSigned0_Console.jar" />
676 -@@ -924,7 +864,6 @@
677 - <pathelement path="${jmol.applet.build.dir}/JmolAppletSigned0_ShapeSurface.jar" />
678 - <pathelement path="${jmol.applet.build.dir}/JmolAppletSigned0_Smiles.jar" />
679 - <pathelement path="${jmol.applet.build.dir}/JmolAppletSigned0_Symmetry.jar" />
680 -- <fileset dir="${jmol.applet.build.dir}" includes="JmolAppletSigned0_i18n_*.jar" />
681 - </indexjars>
682 - </jar>
683 - <signjar jar="${jmol.applet.build.dir}/JmolAppletSigned0.jar"
684 -@@ -963,18 +902,6 @@
685 - </fileset>
686 - </jar>
687 -
688 -- <for list="${all.JmolApplet.languages}" delimiter=","
689 -- param="current.Jmol.language">
690 -- <sequential>
691 -- <jar destfile="${jmol.applet.build.dir}/JmolApplet0_i18n_@{current.Jmol.language}.jar"
692 -- manifest="manifest/applet_i18n.txt" >
693 -- <fileset dir="${applet.classes.dir}">
694 -- <include name="org/jmol/translation/JmolApplet/@{current.Jmol.language}/**" />
695 -- </fileset>
696 -- </jar>
697 -- </sequential>
698 -- </for>
699 --
700 - <jar destfile="${jmol.applet.build.dir}/JmolApplet0_Minimize.jar" manifest="manifest/applet.txt">
701 - <fileset dir="${applet.classes.dir}">
702 - <include name="org/jmol/minimize/**" />
703 -@@ -1088,7 +1015,6 @@
704 - <include name="org/jmol/constant/**" />
705 - <include name="org/jmol/g3d/**" />
706 - <include name="org/jmol/geodesic/**" />
707 -- <include name="org/jmol/i18n/**" />
708 - <include name="org/jmol/modelset/**" />
709 - <include name="org/jmol/script/**" />
710 - <include name="org/jmol/shape/**" />
711 -@@ -1114,7 +1040,6 @@
712 - <pathelement path="${jmol.applet.build.dir}/JmolApplet0_ShapeSurface.jar" />
713 - <pathelement path="${jmol.applet.build.dir}/JmolApplet0_Smiles.jar" />
714 - <pathelement path="${jmol.applet.build.dir}/JmolApplet0_Symmetry.jar" />
715 -- <fileset dir="${jmol.applet.build.dir}" includes="JmolApplet0_i18n_*.jar" />
716 - </indexjars>
717 - </jar>
718 - <!-- changes to this must be replicated below for the signed applet -->
719 -@@ -1123,7 +1048,7 @@
720 - </target>
721 -
722 - <target name="dist" id="dist"
723 -- depends="doc,main-i18n,main,signed-applet">
724 -+ depends="doc,main,signed-applet">
725 - <!-- first build binary distribution -->
726 - <delete dir="build/dist/jmol-${version}"/>
727 - <mkdir dir="build/dist/jmol-${version}"/>
728 -@@ -1183,7 +1108,6 @@
729 - <fileset dir=".">
730 - <include name="applet.classes" />
731 - <include name="build.xml" />
732 -- <include name="build-i18n.xml" />
733 - </fileset>
734 - </copy>
735 -
736 -@@ -1278,7 +1202,6 @@
737 - <fileset dir=".">
738 - <include name="apisio.classes" />
739 - <include name="build.xml" />
740 -- <include name="build-i18n.xml" />
741 - </fileset>
742 - </copy>
743 -
744 -@@ -1374,7 +1297,7 @@
745 - <target name="xclean" id="xclean">
746 - </target>
747 -
748 -- <target name="spotless" id="spotless" depends="clean,spotless-i18n">
749 -+ <target name="spotless" id="spotless" depends="clean">
750 - <delete dir="build"/>
751 - <delete dir="${javadoc.dir}"/>
752 - <delete dir="packaging/rpm/dist"/>
753 -@@ -1438,16 +1361,6 @@
754 - <arg value="../../../doc/source/JmolGuide.docbook.xml" />
755 - <arg value="../../${docbook-xsl}/html/chunk.xsl" />
756 - </java>
757 -- <echo message="Generating user's guide (fr)" />
758 -- <mkdir dir="build/doc/JmolUserGuide_fr" />
759 -- <java fork="true" dir="build/doc/JmolUserGuide_fr"
760 -- classname="com.icl.saxon.StyleSheet"
761 -- classpath="${lib.dir}/saxon.jar" >
762 -- <jvmarg value="${proxyHost}" />
763 -- <jvmarg value="${proxyPort}" />
764 -- <arg value="../../../doc/source/JmolGuide_fr.docbook.xml" />
765 -- <arg value="../../${docbook-xsl}/html/chunk.xsl" />
766 -- </java>
767 - </target>
768 -
769 - <target name="jmolHistory" id="jmolHistory"
770 -@@ -1462,26 +1375,6 @@
771 - <arg value="../../../doc/source/JmolHistory.xml" />
772 - <arg value="../../../doc/source/JmolHistoryToHtml.xsl" />
773 - </java>
774 -- <echo message="Generating history of changes (fr)" />
775 -- <java fork="true" dir="build/doc/JmolHistory"
776 -- classname="com.icl.saxon.StyleSheet"
777 -- classpath="${lib.dir}/saxon.jar" >
778 -- <arg value="-o" />
779 -- <arg value="ChangeLog_fr.html" />
780 -- <arg value="../../../doc/source/JmolHistory_fr.xml" />
781 -- <arg value="../../../doc/source/JmolHistoryToHtml.xsl" />
782 -- <arg value="lang=fr" />
783 -- </java>
784 -- <echo message="Generating history of changes (nl)" />
785 -- <java fork="true" dir="build/doc/JmolHistory"
786 -- classname="com.icl.saxon.StyleSheet"
787 -- classpath="${lib.dir}/saxon.jar" >
788 -- <arg value="-o" />
789 -- <arg value="ChangeLog_nl.html" />
790 -- <arg value="../../../doc/source/JmolHistory_nl.xml" />
791 -- <arg value="../../../doc/source/JmolHistoryToHtml.xsl" />
792 -- <arg value="lang=nl" />
793 -- </java>
794 - </target>
795 -
796 - <target name="jmolDevelopersGuide" id="jmolDevelopersGuide"
797 -@@ -1495,24 +1388,6 @@
798 - <arg value="../../doc/source/JmolDevelopersGuide.docbook.xml" />
799 - <arg value="../${docbook-xsl}/html/docbook.xsl" />
800 - </java>
801 -- <echo message="Generating developer's guide (fr)" />
802 -- <java fork="true" dir="build/doc"
803 -- classname="com.icl.saxon.StyleSheet"
804 -- classpath="${lib.dir}/saxon.jar" >
805 -- <arg value="-o" />
806 -- <arg value="JmolDevelopersGuide_fr.html" />
807 -- <arg value="../../doc/source/JmolDevelopersGuide_fr.docbook.xml" />
808 -- <arg value="../${docbook-xsl}/html/docbook.xsl" />
809 -- </java>
810 -- <echo message="Generating developer's guide (de)" />
811 -- <java fork="true" dir="build/doc"
812 -- classname="com.icl.saxon.StyleSheet"
813 -- classpath="${lib.dir}/saxon.jar" >
814 -- <arg value="-o" />
815 -- <arg value="JmolDevelopersGuide_de.html" />
816 -- <arg value="../../doc/source/JmolDevelopersGuide_de.docbook.xml" />
817 -- <arg value="../${docbook-xsl}/html/docbook.xsl" />
818 -- </java>
819 - </target>
820 -
821 - <target name="jmolAppletGuide" id="jmolAppletGuide" depends="initdoc"
822 -@@ -1526,24 +1401,6 @@
823 - <arg value="../../doc/source/JmolAppletGuide.docbook.xml" />
824 - <arg value="../${docbook-xsl}/html/docbook.xsl" />
825 - </java>
826 -- <echo message="Generating applet guide (fr)" />
827 -- <java fork="true" dir="build/doc"
828 -- classname="com.icl.saxon.StyleSheet"
829 -- classpath="${lib.dir}/saxon.jar" >
830 -- <arg value="-o" />
831 -- <arg value="JmolAppletGuide_fr.html" />
832 -- <arg value="../../doc/source/JmolAppletGuide_fr.docbook.xml" />
833 -- <arg value="../${docbook-xsl}/html/docbook.xsl" />
834 -- </java>
835 -- <echo message="Generating applet guide (de)" />
836 -- <java fork="true" dir="build/doc"
837 -- classname="com.icl.saxon.StyleSheet"
838 -- classpath="${lib.dir}/saxon.jar" >
839 -- <arg value="-o" />
840 -- <arg value="JmolAppletGuide_de.html" />
841 -- <arg value="../../doc/source/JmolAppletGuide_de.docbook.xml" />
842 -- <arg value="../${docbook-xsl}/html/docbook.xsl" />
843 -- </java>
844 - </target>
845 -
846 - <target name="test" id="test" depends="main,compile-tests">
847 -@@ -1575,12 +1432,4 @@
848 - <jar destfile="${tests.dir}/Tests.jar" basedir="${test-classes.dir}" />
849 - </target>
850 -
851 -- <!-- i18n stuff -->
852 -- <target name="main-i18n" depends="classes">
853 -- <ant antfile="tools/build-i18n.xml" target="main-i18n"/>
854 -- </target>
855 -- <target name="spotless-i18n">
856 -- <ant antfile="tools/build-i18n.xml" target="spotless-i18n"/>
857 -- </target>
858 --
859 - </project>
860
861 diff --git a/sci-chemistry/jmol/jmol-12.0.45-r1.ebuild b/sci-chemistry/jmol/jmol-12.0.45-r1.ebuild
862 deleted file mode 100644
863 index 589cc469b42..00000000000
864 --- a/sci-chemistry/jmol/jmol-12.0.45-r1.ebuild
865 +++ /dev/null
866 @@ -1,100 +0,0 @@
867 -# Copyright 1999-2014 Gentoo Foundation
868 -# Distributed under the terms of the GNU General Public License v2
869 -
870 -EAPI=5
871 -WEBAPP_OPTIONAL="yes"
872 -
873 -inherit eutils webapp java-pkg-2 java-ant-2
874 -
875 -MY_P=Jmol
876 -
877 -DESCRIPTION="Java molecular viever for 3-D chemical structures"
878 -HOMEPAGE="http://jmol.sourceforge.net/"
879 -SRC_URI="
880 - mirror://sourceforge/${PN}/${MY_P}-${PV}-full.tar.gz
881 - https://dev.gentoo.org/~jlec/distfiles/${PN}-selfSignedCertificate.store.tar"
882 -
883 -WEBAPP_MANUAL_SLOT="yes"
884 -SLOT="0"
885 -KEYWORDS="~amd64 ~x86"
886 -LICENSE="LGPL-2.1"
887 -IUSE="client-only vhosts"
888 -
889 -COMMON_DEP="
890 - dev-java/commons-cli:1
891 - dev-java/itext:0
892 - sci-libs/jmol-acme:0
893 - sci-libs/vecmath-objectclub:0"
894 -
895 -RDEPEND=">=virtual/jre-1.4
896 - ${COMMON_DEP}"
897 -DEPEND=">=virtual/jdk-1.4
898 - !client-only? ( ${WEBAPP_DEPEND} )
899 - ${COMMON_DEP}"
900 -
901 -pkg_setup() {
902 - use client-only || webapp_pkg_setup
903 - java-pkg-2_pkg_setup
904 -}
905 -
906 -src_prepare() {
907 - epatch \
908 - "${FILESDIR}"/${PV}/${PN}-nointl.patch \
909 - "${FILESDIR}"/${PV}/${PN}-manifest.patch
910 -
911 - mkdir "${S}"/selfSignedCertificate || die "Failed to create Cert directory."
912 - cp "${WORKDIR}"/selfSignedCertificate.store "${S}"/selfSignedCertificate/ \
913 - || die "Failed to install Cert file."
914 -
915 - rm -v "${S}"/*.jar "${S}"/plugin-jars/*.jar || die
916 - cd "${S}/jars"
917 -
918 -# We still have to use netscape.jar on amd64 until a nice way to include plugin.jar comes along.
919 - if use amd64; then
920 - mv -v netscape.jar netscape.tempjar || die "Failed to move netscape.jar."
921 - rm -v *.jar *.tar.gz || die "Failed to remove jars."
922 - mv -v netscape.tempjar netscape.jar || die "Failed to move netscape.tempjar."
923 - fi
924 -
925 - java-pkg_jar-from vecmath-objectclub vecmath-objectclub.jar vecmath1.2-1.14.jar
926 - java-pkg_jar-from itext iText.jar itext-1.4.5.jar
927 - java-pkg_jar-from jmol-acme jmol-acme.jar Acme.jar
928 - java-pkg_jar-from commons-cli-1 commons-cli.jar commons-cli-1.0.jar
929 -
930 - mkdir -p "${S}/build/appjars" || die
931 -}
932 -
933 -src_compile() {
934 - # prevent absorbing dep's classes
935 - eant -Dlibjars.uptodate=true main
936 -}
937 -
938 -src_install() {
939 - java-pkg_dojar build/Jmol.jar
940 - dohtml -r build/doc/* || die "Failed to install html docs."
941 - dodoc *.txt doc/*license* || die "Failed to install licenses."
942 -
943 - java-pkg_dolauncher ${PN} --main org.openscience.jmol.app.Jmol \
944 - --java_args "-Xmx512m"
945 -
946 - if ! use client-only ; then
947 - webapp_src_preinst
948 - cp Jmol.js build/Jmol.jar "${ED}"${MY_HTDOCSDIR} || die "${cmd} failed."
949 - cp build/JmolApplet*.jar "${ED}"${MY_HTDOCSDIR} || die "${cmd} failed."
950 - cp applet.classes "${ED}"${MY_HTDOCSDIR} || die "${cmd} failed."
951 - cp -r build/classes/* "${ED}"${MY_HTDOCSDIR} || die "${cmd} failed."
952 - cp -r build/appletjars/* "${ED}"${MY_HTDOCSDIR} || die "${cmd} failed."
953 - cp "${FILESDIR}"/caffeine.xyz "${ED}"${MY_HTDOCSDIR} || die "${cmd} failed."
954 - cp "${FILESDIR}"/index.html "${ED}"${MY_HTDOCSDIR} || die "${cmd} failed."
955 -
956 - webapp_src_install
957 - fi
958 -}
959 -
960 -pkg_postinst() {
961 - use client-only || webapp_pkg_postinst
962 -}
963 -
964 -pkg_prerm() {
965 - use client-only || webapp_pkg_prerm
966 -}
967
968 diff --git a/sci-chemistry/jmol/jmol-12.2.27-r1.ebuild b/sci-chemistry/jmol/jmol-12.2.27-r1.ebuild
969 deleted file mode 100644
970 index a109067c1d7..00000000000
971 --- a/sci-chemistry/jmol/jmol-12.2.27-r1.ebuild
972 +++ /dev/null
973 @@ -1,98 +0,0 @@
974 -# Copyright 1999-2019 Gentoo Authors
975 -# Distributed under the terms of the GNU General Public License v2
976 -
977 -EAPI=5
978 -WEBAPP_OPTIONAL="yes"
979 -
980 -inherit eutils webapp java-pkg-2 java-ant-2
981 -
982 -MY_P=Jmol
983 -
984 -DESCRIPTION="Java molecular viever for 3-D chemical structures"
985 -HOMEPAGE="http://jmol.sourceforge.net/"
986 -SRC_URI="
987 - mirror://sourceforge/${PN}/${MY_P}-${PV}-full.tar.gz
988 - https://dev.gentoo.org/~jlec/distfiles/${PN}-selfSignedCertificate.store.tar"
989 -
990 -LICENSE="LGPL-2.1"
991 -KEYWORDS="~amd64 ~x86"
992 -IUSE="+client-only vhosts"
993 -
994 -WEBAPP_MANUAL_SLOT="yes"
995 -SLOT="0"
996 -
997 -COMMON_DEP="
998 - dev-java/commons-cli:1
999 - dev-java/itext:0
1000 - sci-libs/jmol-acme:0
1001 - sci-libs/vecmath-objectclub:0
1002 - sci-libs/naga"
1003 -RDEPEND=">=virtual/jre-1.5
1004 - ${COMMON_DEP}"
1005 -DEPEND=">=virtual/jdk-1.5
1006 - dev-java/saxon:6.5
1007 - !client-only? ( ${WEBAPP_DEPEND} )
1008 - ${COMMON_DEP}"
1009 -
1010 -pkg_setup() {
1011 - use client-only || webapp_pkg_setup
1012 - java-pkg-2_pkg_setup
1013 -}
1014 -
1015 -src_prepare() {
1016 - epatch "${FILESDIR}"/${P}-nointl.patch
1017 -
1018 - rm -v "${S}"/*.jar "${S}"/plugin-jars/*.jar || die
1019 - cd "${S}/jars"
1020 -
1021 -# We still have to use netscape.jar on amd64 until a nice way to include plugin.jar comes along.
1022 - if use amd64; then
1023 - mv -v netscape.jar netscape.tempjar || die "Failed to move netscape.jar."
1024 - rm -v *.jar *.tar.gz || die "Failed to remove jars."
1025 - mv -v netscape.tempjar netscape.jar || die "Failed to move netscape.tempjar."
1026 - fi
1027 -
1028 - java-pkg_jar-from vecmath-objectclub vecmath-objectclub.jar vecmath1.2-1.14.jar
1029 - java-pkg_jar-from itext iText.jar itext-1.4.5.jar
1030 - java-pkg_jar-from jmol-acme jmol-acme.jar Acme.jar
1031 - java-pkg_jar-from commons-cli-1 commons-cli.jar commons-cli-1.0.jar
1032 - java-pkg_jar-from naga
1033 - java-pkg_jar-from --build-only saxon-6.5 saxon.jar
1034 -
1035 - mkdir -p "${S}/build/appjars" || die
1036 -}
1037 -
1038 -src_compile() {
1039 - # prevent absorbing dep's classes
1040 - eant -Dlibjars.uptodate=true main
1041 -}
1042 -
1043 -src_install() {
1044 - java-pkg_dojar build/Jmol.jar
1045 - dohtml -r build/doc/* || die "Failed to install html docs."
1046 - dodoc *.txt doc/*license* || die "Failed to install licenses."
1047 -
1048 - java-pkg_dolauncher ${PN} --main org.openscience.jmol.app.Jmol \
1049 - --java_args "-Xmx512m"
1050 -
1051 - if ! use client-only ; then
1052 - webapp_src_preinst
1053 - cp Jmol.js build/Jmol.jar "${ED}"${MY_HTDOCSDIR} || die "${cmd} failed."
1054 - cp build/JmolApplet*.jar "${ED}"${MY_HTDOCSDIR} || die "${cmd} failed."
1055 - cp applet.classes "${ED}"${MY_HTDOCSDIR} || die "${cmd} failed."
1056 - cp -r build/classes/* "${ED}"${MY_HTDOCSDIR} || die "${cmd} failed."
1057 - cp -r build/appletjars/* "${ED}"${MY_HTDOCSDIR} || die "${cmd} failed."
1058 - cp "${FILESDIR}"/caffeine.xyz "${ED}"${MY_HTDOCSDIR} || die "${cmd} failed."
1059 - cp "${FILESDIR}"/index.html "${ED}"${MY_HTDOCSDIR} || die "${cmd} failed."
1060 -
1061 - webapp_src_install
1062 - fi
1063 -}
1064 -
1065 -pkg_postinst() {
1066 - use client-only || webapp_pkg_postinst
1067 -}
1068 -
1069 -pkg_prerm() {
1070 - use client-only || webapp_pkg_prerm
1071 -}
1072
1073 diff --git a/sci-chemistry/jmol/metadata.xml b/sci-chemistry/jmol/metadata.xml
1074 deleted file mode 100644
1075 index 888f06b55ce..00000000000
1076 --- a/sci-chemistry/jmol/metadata.xml
1077 +++ /dev/null
1078 @@ -1,15 +0,0 @@
1079 -<?xml version="1.0" encoding="UTF-8"?>
1080 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
1081 -<pkgmetadata>
1082 - <maintainer type="project">
1083 - <email>sci-chemistry@g.o</email>
1084 - <name>Gentoo Chemistry Project</name>
1085 - </maintainer>
1086 - <use>
1087 - <flag name="client-only">Install the viewer only, no applet files for httpd
1088 - </flag>
1089 - </use>
1090 - <upstream>
1091 - <remote-id type="sourceforge">jmol</remote-id>
1092 - </upstream>
1093 -</pkgmetadata>