sci-chemistry/jmol: Remove last-rited pkg

Signed-off-by: Michał Górny <mgorny@gentoo.org>

5 files changed, 0 insertions, 779 deletions

diff --git a/sci-chemistry/jmol/files/12.0.45/jmol-manifest.patch b/sci-chemistry/jmol/files/12.0.45/jmol-manifest.patch
deleted file mode 100644
index 3b43c219d94f..000000000000
--- a/sci-chemistry/jmol/files/12.0.45/jmol-manifest.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-diff -aurN jmol-11.0.3-orig/manifest/applet0.txt jmol-11.0.3/manifest/applet0.txt
---- jmol-11.0.3-orig/manifest/applet0.txt	1969-12-31 18:00:00.000000000 -0600
-+++ jmol-11.0.3/manifest/applet0.txt	2007-05-16 01:54:10.000000000 -0500
-@@ -0,0 +1,6 @@
-+Main-Class: JmolApplet

-+Sealed: true

-+

-+Name: org/jmol/api/

-+Sealed: false

-+

-diff -aurN jmol-11.0.3-orig/manifest/applet1.txt jmol-11.0.3/manifest/applet1.txt
---- jmol-11.0.3-orig/manifest/applet1.txt	1969-12-31 18:00:00.000000000 -0600
-+++ jmol-11.0.3/manifest/applet1.txt	2007-05-16 01:54:10.000000000 -0500
-@@ -0,0 +1,6 @@
-+Name: org/jmol/api/

-+Sealed: false

-+

-+Name: org/jmol/applet/

-+Sealed: true

-+

-diff -aurN jmol-11.0.3-orig/manifest/applet2.txt jmol-11.0.3/manifest/applet2.txt
---- jmol-11.0.3-orig/manifest/applet2.txt	1969-12-31 18:00:00.000000000 -0600
-+++ jmol-11.0.3/manifest/applet2.txt	2007-05-16 01:56:19.000000000 -0500
-@@ -0,0 +1,3 @@
-+Name: javax/vecmath/
-+
-+
-diff -aurN jmol-11.0.3-orig/manifest/applet3.txt jmol-11.0.3/manifest/applet3.txt
---- jmol-11.0.3-orig/manifest/applet3.txt	1969-12-31 18:00:00.000000000 -0600
-+++ jmol-11.0.3/manifest/applet3.txt	2007-05-16 01:56:47.000000000 -0500
-@@ -0,0 +1,4 @@
-+
-+Name: org/jmol/g3d/
-+Sealed: true
-+
-diff -aurN jmol-11.0.3-orig/manifest/applet4.txt jmol-11.0.3/manifest/applet4.txt
---- jmol-11.0.3-orig/manifest/applet4.txt	1969-12-31 18:00:00.000000000 -0600
-+++ jmol-11.0.3/manifest/applet4.txt	2007-05-16 01:57:05.000000000 -0500
-@@ -0,0 +1,4 @@
-+
-+Name: org/jmol/adapter/smarter/
-+Sealed: true
-+
-diff -aurN jmol-11.0.3-orig/manifest/applet5.txt jmol-11.0.3/manifest/applet5.txt
---- jmol-11.0.3-orig/manifest/applet5.txt	1969-12-31 18:00:00.000000000 -0600
-+++ jmol-11.0.3/manifest/applet5.txt	2007-05-16 01:57:23.000000000 -0500
-@@ -0,0 +1,4 @@
-+Name: org/openscience/jmol/ui/
-+Sealed: true
-+
-+
-diff -aurN jmol-11.0.3-orig/manifest/applet6.txt jmol-11.0.3/manifest/applet6.txt
---- jmol-11.0.3-orig/manifest/applet6.txt	1969-12-31 18:00:00.000000000 -0600
-+++ jmol-11.0.3/manifest/applet6.txt	2007-05-16 01:57:46.000000000 -0500
-@@ -0,0 +1,4 @@
-+
-+Name: org/jmol/viewer/
-+Sealed: true
-+
-diff -aurN jmol-11.0.3-orig/manifest/appletMain.txt jmol-11.0.3/manifest/appletMain.txt
---- jmol-11.0.3-orig/manifest/appletMain.txt	1969-12-31 18:00:00.000000000 -0600
-+++ jmol-11.0.3/manifest/appletMain.txt	2007-05-16 01:54:10.000000000 -0500
-@@ -0,0 +1,5 @@
-+Manifest-Version: 1.0

-+Sealed: true

-+

-+Name: org/jmol/api/

-+Sealed: false

-diff -aurN jmol-11.0.3-orig/manifest/appletMonolithic.txt jmol-11.0.3/manifest/appletMonolithic.txt
---- jmol-11.0.3-orig/manifest/appletMonolithic.txt	1969-12-31 18:00:00.000000000 -0600
-+++ jmol-11.0.3/manifest/appletMonolithic.txt	2007-05-16 01:54:10.000000000 -0500
-@@ -0,0 +1,7 @@
-+Main-Class: JmolApplet

-+Sealed: true

-+

-+Name: org/jmol/api/

-+Sealed: false

-+

-+

-diff -aurN jmol-11.0.3-orig/manifest/applet.txt jmol-11.0.3/manifest/applet.txt
---- jmol-11.0.3-orig/manifest/applet.txt	1969-12-31 18:00:00.000000000 -0600
-+++ jmol-11.0.3/manifest/applet.txt	2007-05-16 01:54:10.000000000 -0500
-@@ -0,0 +1,2 @@
-+Manifest-Version: 1.0

-+Sealed: true

-\ No newline at end of file
-diff -aurN jmol-11.0.3-orig/manifest/application.txt jmol-11.0.3/manifest/application.txt
---- jmol-11.0.3-orig/manifest/application.txt	1969-12-31 18:00:00.000000000 -0600
-+++ jmol-11.0.3/manifest/application.txt	2007-05-16 01:54:10.000000000 -0500
-@@ -0,0 +1 @@
-+Main-Class: org.openscience.jmol.app.Jmol

-diff -aurN jmol-11.0.3-orig/manifest/jvxl.txt jmol-11.0.3/manifest/jvxl.txt
---- jmol-11.0.3-orig/manifest/jvxl.txt	1969-12-31 18:00:00.000000000 -0600
-+++ jmol-11.0.3/manifest/jvxl.txt	2007-05-16 01:54:10.000000000 -0500
-@@ -0,0 +1 @@
-+Main-Class: org.openscience.jvxl.Jvxl

diff --git a/sci-chemistry/jmol/files/12.0.45/jmol-nointl.patch b/sci-chemistry/jmol/files/12.0.45/jmol-nointl.patch
deleted file mode 100644
index c1b22e83c615..000000000000
--- a/sci-chemistry/jmol/files/12.0.45/jmol-nointl.patch
+++ /dev/null
@@ -1,313 +0,0 @@
---- build.xml	2011-02-25 12:59:43.000000000 -0600
-+++ build.xml.new	2011-02-27 12:16:02.398959959 -0600
-@@ -110,10 +110,6 @@
-           <srcfiles dir="doc/source"

-                     includes="JmolGuide.docbook.xml, guide/*.docbook.xml"/>

-         </uptodate>

--        <uptodate targetfile="build/doc/JmolUserGuide_fr/index.html">

--          <srcfiles dir="doc/source"

--                    includes="JmolGuide_fr.docbook.xml, guide/*_fr.docbook.xml"/>

--        </uptodate>

-       </and>

-     </condition>

- 

-@@ -123,14 +119,6 @@
-           <srcfiles dir="doc/source"

-                     includes="JmolHistory.xml,JmolHistoryToHtml.xsl,history/changes.xml" />

-         </uptodate>

--        <uptodate targetfile="build/doc/JmolHistory/ChangeLog_fr.html">

--          <srcfiles dir="doc/source"

--                    includes="JmolHistory_fr.xml,JmolHistoryToHtml.xsl,history/changes_fr.xml" />

--        </uptodate>

--        <uptodate targetfile="build/doc/JmolHistory/ChangeLog_nl.html">

--          <srcfiles dir="doc/source"

--                    includes="JmolHistory_nl.xml,JmolHistoryToHtml.xsl,history/changes_nl.xml" />

--        </uptodate>

-       </and>

-     </condition>

-     

-@@ -140,14 +128,6 @@
-           <srcfiles dir="doc/source"

-                     includes="JmolDevelopersGuide.docbook.xml"/>

-         </uptodate>

--        <uptodate targetfile="build/doc/JmolDevelopersGuide_fr.html">

--          <srcfiles dir="doc/source"

--                    includes="JmolDevelopersGuide_fr.docbook.xml"/>

--        </uptodate>

--        <uptodate targetfile="build/doc/JmolDevelopersGuide_de.html">

--          <srcfiles dir="doc/source"

--                    includes="JmolDevelopersGuide_de.docbook.xml"/>

--        </uptodate>

-       </and>

-     </condition>

- 

-@@ -157,14 +137,6 @@
-           <srcfiles dir="doc/source"

-                     includes="JmolAppletGuide.docbook.xml, applet/*.docbook.xml"/>

-         </uptodate>

--        <uptodate targetfile="build/doc/JmolAppletGuide_fr.html">

--          <srcfiles dir="doc/source"

--                    includes="JmolAppletGuide_fr.docbook.xml, applet/*_fr.docbook.xml"/>

--        </uptodate>

--        <uptodate targetfile="build/doc/JmolAppletGuide_de.html">

--          <srcfiles dir="doc/source"

--                    includes="JmolAppletGuide_de.docbook.xml"/>

--        </uptodate>

-       </and>

-     </condition>

- 

-@@ -385,17 +357,12 @@
-   </target>

- 

-   <target name="jar" id="jar"

--          depends="init,classes,jmolGuide,jmolHistory,jmolDevelopersGuide,libjars,main-i18n">

-+          depends="init,classes,jmolGuide,jmolHistory,jmolDevelopersGuide,libjars">

-     <copy todir="${classes.dir}/org/openscience/jmol/Data/guide" >

-       <fileset dir="build/doc/JmolUserGuide">

-         <include name="**/*.html" />

-       </fileset>

-     </copy>

--    <copy todir="${classes.dir}/org/openscience/jmol/Data/guide_fr" >

--      <fileset dir="build/doc/JmolUserGuide_fr">

--        <include name="**/*.html" />

--      </fileset>

--    </copy>

-     <copy todir="${classes.dir}/org/openscience/jmol/Data" >

-       <fileset dir="build/doc/JmolHistory">

-         <include name="**/*.html" />

-@@ -587,18 +554,6 @@
-       <fileset dir="${appletjars.dir}" includes="**/*"/>

-     </jar>

- 

--    <for list="${all.JmolApplet.languages}" delimiter=","

--         param="current.Jmol.language">

--      <sequential>

--        <jar destfile="${jmol.applet.build.dir}/JmolApplet0_i18n_@{current.Jmol.language}.jar"

--             manifest="manifest/applet_i18n.txt" >

--          <fileset dir="${applet.classes.dir}">

--            <include name="org/jmol/translation/JmolApplet/@{current.Jmol.language}/**" />

--          </fileset>

--        </jar>

--      </sequential>

--    </for>

--

-     <jar destfile="${jmol.applet.build.dir}/JmolApplet0_Minimize.jar" manifest="manifest/applet.txt">

-       <fileset dir="${applet.classes.dir}">

-         <include name="org/jmol/minimize/**" />

-@@ -712,7 +667,6 @@
-         <include name="org/jmol/bspt/**" />

-         <include name="org/jmol/g3d/**" />

-         <include name="org/jmol/geodesic/**" />

--        <include name="org/jmol/i18n/**" />

-         <include name="org/jmol/modelset/**" />

-         <include name="org/jmol/script/**" />

-         <include name="org/jmol/shape/**" />

-@@ -738,7 +692,6 @@
-         <pathelement path="${jmol.applet.build.dir}/JmolApplet0_ShapeSurface.jar" />

-         <pathelement path="${jmol.applet.build.dir}/JmolApplet0_Smiles.jar" />

-         <pathelement path="${jmol.applet.build.dir}/JmolApplet0_Symmetry.jar" />

--        <fileset dir="${jmol.applet.build.dir}" includes="JmolApplet0_i18n_*.jar" />

-       </indexjars>

-     </jar>

-     <!-- changes to this must be replicated below for the signed applet -->

-@@ -851,16 +804,6 @@
-              keystore="selfSignedCertificate/selfSignedCertificate.store"

-              storepass="selfSignedCertificate" alias="selfSignedCertificate" />

- 

--    <for list="${all.JmolApplet.languages}" delimiter=","

--         param="current.Jmol.language">

--      <sequential>

--      	<signjar jar="${jmol.applet.build.dir}/JmolApplet0_i18n_@{current.Jmol.language}.jar"

--                 signedjar="${jmol.applet.build.dir}/JmolAppletSigned0_i18n_@{current.Jmol.language}.jar"

--                 keystore="selfSignedCertificate/selfSignedCertificate.store"

--                 storepass="selfSignedCertificate" alias="selfSignedCertificate" />

--      </sequential>

--    </for>

--

-     <!-- vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv -->

-     <!-- this one must be treated specially because of jar indexing

-          we cannot simply rename the jar file, because the index has

-@@ -906,7 +849,6 @@
-         <pathelement path="${jmol.applet.build.dir}/JmolAppletSigned0_ShapeSurface.jar" />

-         <pathelement path="${jmol.applet.build.dir}/JmolAppletSigned0_Smiles.jar" />

-         <pathelement path="${jmol.applet.build.dir}/JmolAppletSigned0_Symmetry.jar" />

--        <fileset dir="${jmol.applet.build.dir}" includes="JmolAppletSigned0_i18n_*.jar" />

-       </indexjars>

-     </jar>

-     <signjar jar="${jmol.applet.build.dir}/JmolAppletSigned0.jar"

-@@ -944,18 +886,6 @@
- 	      </fileset>

- 	    </jar>

- 

--	    <for list="${all.JmolApplet.languages}" delimiter=","

--	         param="current.Jmol.language">

--	      <sequential>

--	        <jar destfile="${jmol.applet.build.dir}/JmolApplet0_i18n_@{current.Jmol.language}.jar"

--	             manifest="manifest/applet_i18n.txt" >

--	          <fileset dir="${applet.classes.dir}">

--	            <include name="org/jmol/translation/JmolApplet/@{current.Jmol.language}/**" />

--	          </fileset>

--	        </jar>

--	      </sequential>

--	    </for>

--

- 	    <jar destfile="${jmol.applet.build.dir}/JmolApplet0_Minimize.jar" manifest="manifest/applet.txt">

- 	      <fileset dir="${applet.classes.dir}">

- 	        <include name="org/jmol/minimize/**" />

-@@ -1069,7 +999,6 @@
- 	        <include name="org/jmol/bspt/**" />

- 	        <include name="org/jmol/g3d/**" />

- 	        <include name="org/jmol/geodesic/**" />

--	        <include name="org/jmol/i18n/**" />

- 	        <include name="org/jmol/modelset/**" />

- 	        <include name="org/jmol/script/**" />

- 	        <include name="org/jmol/shape/**" />

-@@ -1095,7 +1024,6 @@
- 	        <pathelement path="${jmol.applet.build.dir}/JmolApplet0_ShapeSurface.jar" />

- 	        <pathelement path="${jmol.applet.build.dir}/JmolApplet0_Smiles.jar" />

- 	        <pathelement path="${jmol.applet.build.dir}/JmolApplet0_Symmetry.jar" />

--	        <fileset dir="${jmol.applet.build.dir}" includes="JmolApplet0_i18n_*.jar" />

- 	      </indexjars>

- 	    </jar>

- 	    <!-- changes to this must be replicated below for the signed applet -->

-@@ -1104,7 +1032,7 @@
- 	  </target>

- 

- 	<target name="dist" id="dist"

--          depends="doc,main-i18n,main,signed-applet">

-+          depends="doc,main,signed-applet">

-     <!-- first build binary distribution -->

-     <delete dir="build/dist/jmol-${version}"/>

-     <mkdir dir="build/dist/jmol-${version}"/>

-@@ -1163,7 +1091,6 @@
-       <fileset dir=".">

-         <include name="applet.classes" />

-         <include name="build.xml" />

--        <include name="build-i18n.xml" />

-       </fileset>

-     </copy>

- 

-@@ -1246,7 +1173,6 @@
-       <fileset dir=".">

-         <include name="apisio.classes" />

-         <include name="build.xml" />

--        <include name="build-i18n.xml" />

-       </fileset>

-     </copy>

- 

-@@ -1342,7 +1268,7 @@
-   <target name="xclean" id="xclean">

-   </target>

- 

--  <target name="spotless" id="spotless" depends="clean,spotless-i18n">

-+  <target name="spotless" id="spotless" depends="clean">

-     <delete dir="build"/>

-     <delete dir="${javadoc.dir}"/>

-     <delete dir="packaging/rpm/dist"/>

-@@ -1406,16 +1332,6 @@
-       <arg value="../../../doc/source/JmolGuide.docbook.xml" />

-       <arg value="../../${docbook-xsl}/html/chunk.xsl" />

-     </java>

--    <echo message="Generating user's guide (fr)" />

--    <mkdir dir="build/doc/JmolUserGuide_fr" />

--    <java fork="true" dir="build/doc/JmolUserGuide_fr"

--          classname="com.icl.saxon.StyleSheet"

--          classpath="${lib.dir}/saxon.jar" >

--      <jvmarg value="${proxyHost}" />

--      <jvmarg value="${proxyPort}" />

--      <arg value="../../../doc/source/JmolGuide_fr.docbook.xml" />

--      <arg value="../../${docbook-xsl}/html/chunk.xsl" />

--    </java>

-   </target>

- 

-   <target name="jmolHistory" id="jmolHistory"

-@@ -1430,26 +1346,6 @@
-       <arg value="../../../doc/source/JmolHistory.xml" />

-       <arg value="../../../doc/source/JmolHistoryToHtml.xsl" />

-     </java>

--    <echo message="Generating history of changes (fr)" />

--    <java fork="true" dir="build/doc/JmolHistory"

--          classname="com.icl.saxon.StyleSheet"

--          classpath="${lib.dir}/saxon.jar" >

--      <arg value="-o" />

--      <arg value="ChangeLog_fr.html" />

--      <arg value="../../../doc/source/JmolHistory_fr.xml" />

--      <arg value="../../../doc/source/JmolHistoryToHtml.xsl" />

--      <arg value="lang=fr" />

--    </java>

--    <echo message="Generating history of changes (nl)" />

--    <java fork="true" dir="build/doc/JmolHistory"

--          classname="com.icl.saxon.StyleSheet"

--          classpath="${lib.dir}/saxon.jar" >

--      <arg value="-o" />

--      <arg value="ChangeLog_nl.html" />

--      <arg value="../../../doc/source/JmolHistory_nl.xml" />

--      <arg value="../../../doc/source/JmolHistoryToHtml.xsl" />

--      <arg value="lang=nl" />

--    </java>

-   </target>

- 

-   <target name="jmolDevelopersGuide" id="jmolDevelopersGuide"

-@@ -1463,24 +1359,6 @@
-       <arg value="../../doc/source/JmolDevelopersGuide.docbook.xml" />

-       <arg value="../${docbook-xsl}/html/docbook.xsl" />

-     </java>

--    <echo message="Generating developer's guide (fr)" />

--    <java fork="true" dir="build/doc"

--          classname="com.icl.saxon.StyleSheet"

--          classpath="${lib.dir}/saxon.jar" >

--      <arg value="-o" />

--      <arg value="JmolDevelopersGuide_fr.html" />

--      <arg value="../../doc/source/JmolDevelopersGuide_fr.docbook.xml" />

--      <arg value="../${docbook-xsl}/html/docbook.xsl" />

--    </java>

--    <echo message="Generating developer's guide (de)" />

--    <java fork="true" dir="build/doc"

--          classname="com.icl.saxon.StyleSheet"

--          classpath="${lib.dir}/saxon.jar" >

--      <arg value="-o" />

--      <arg value="JmolDevelopersGuide_de.html" />

--      <arg value="../../doc/source/JmolDevelopersGuide_de.docbook.xml" />

--      <arg value="../${docbook-xsl}/html/docbook.xsl" />

--    </java>

-   </target>

- 

-   <target name="jmolAppletGuide" id="jmolAppletGuide" depends="initdoc"

-@@ -1494,24 +1372,6 @@
-       <arg value="../../doc/source/JmolAppletGuide.docbook.xml" />

-       <arg value="../${docbook-xsl}/html/docbook.xsl" />

-     </java>

--    <echo message="Generating applet guide (fr)" />

--    <java fork="true" dir="build/doc"

--          classname="com.icl.saxon.StyleSheet"

--          classpath="${lib.dir}/saxon.jar" >

--      <arg value="-o" />

--      <arg value="JmolAppletGuide_fr.html" />

--      <arg value="../../doc/source/JmolAppletGuide_fr.docbook.xml" />

--      <arg value="../${docbook-xsl}/html/docbook.xsl" />

--    </java>

--    <echo message="Generating applet guide (de)" />

--    <java fork="true" dir="build/doc"

--          classname="com.icl.saxon.StyleSheet"

--          classpath="${lib.dir}/saxon.jar" >

--      <arg value="-o" />

--      <arg value="JmolAppletGuide_de.html" />

--      <arg value="../../doc/source/JmolAppletGuide_de.docbook.xml" />

--      <arg value="../${docbook-xsl}/html/docbook.xsl" />

--    </java>

-   </target>

- 

-   <target name="test" id="test" depends="main,compile-tests">

-@@ -1543,12 +1403,4 @@
-     <jar destfile="${tests.dir}/Tests.jar" basedir="${test-classes.dir}" />

-   </target>

- 

--  <!-- i18n stuff -->

--  <target name="main-i18n" depends="classes">

--    <ant antfile="tools/build-i18n.xml" target="main-i18n"/>

--  </target>

--  <target name="spotless-i18n">

--    <ant antfile="tools/build-i18n.xml" target="spotless-i18n"/>

--  </target>

--

- </project>

diff --git a/sci-chemistry/jmol/files/caffeine.xyz b/sci-chemistry/jmol/files/caffeine.xyz
deleted file mode 100644
index f0325b049f3c..000000000000
--- a/sci-chemistry/jmol/files/caffeine.xyz
+++ /dev/null
@@ -1,26 +0,0 @@
-24
-Caffeine
-H      -3.3804130    -1.1272367     0.5733036
-N       0.9668296    -1.0737425    -0.8198227
-C       0.0567293     0.8527195     0.3923156
-N      -1.3751742    -1.0212243    -0.0570552
-C      -1.2615018     0.2590713     0.5234135
-C      -0.3068337    -1.6836331    -0.7169344
-C       1.1394235     0.1874122    -0.2700900
-N       0.5602627     2.0839095     0.8251589
-O      -0.4926797    -2.8180554    -1.2094732
-C      -2.6328073    -1.7303959    -0.0060953
-O      -2.2301338     0.7988624     1.0899730
-H       2.5496990     2.9734977     0.6229590
-C       2.0527432    -1.7360887    -1.4931279
-H      -2.4807715    -2.7269528     0.4882631
-H      -3.0089039    -1.9025254    -1.0498023
-H       2.9176101    -1.8481516    -0.7857866
-H       2.3787863    -1.1211917    -2.3743655
-H       1.7189877    -2.7489920    -1.8439205
-C      -0.1518450     3.0970046     1.5348347
-C       1.8934096     2.1181245     0.4193193
-N       2.2861252     0.9968439    -0.2440298
-H      -0.1687028     4.0436553     0.9301094
-H       0.3535322     3.2979060     2.5177747
-H      -1.2074498     2.7537592     1.7203047
diff --git a/sci-chemistry/jmol/files/index.html b/sci-chemistry/jmol/files/index.html
deleted file mode 100644
index 35a5d49217e2..000000000000
--- a/sci-chemistry/jmol/files/index.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<html>
-  <head>
-    <title>Jmol Test Page</title>
-      <div align="center"> <b>All the Sugar and Twice the Caffeine.</b> <br><br>
-      <script src="./Jmol.js"></script>
-  </head>
-  <body>
-    <script>
-      jmolInitialize("./"); // REQUIRED
-      jmolApplet(400, "load ./caffeine.xyz");
-    </script></div>
-  </body>
-</html>
-
diff --git a/sci-chemistry/jmol/files/jmol-12.2.27-nointl.patch b/sci-chemistry/jmol/files/jmol-12.2.27-nointl.patch
deleted file mode 100644
index 0a43faaf653d..000000000000
--- a/sci-chemistry/jmol/files/jmol-12.2.27-nointl.patch
+++ /dev/null
@@ -1,330 +0,0 @@
---- orig-build.xml	2012-05-31 13:42:43.943062427 -0500
-+++ build.xml	2012-05-31 14:01:01.691982062 -0500
-@@ -52,8 +52,6 @@
- 

-   <property file="proxy.properties" />

- 

--  <import file="tools/build-i18n.xml"/>

--

-   <path id="project.class.path">

-     <fileset dir="${lib.dir}">

-       <include name="*.jar" />

-@@ -111,10 +109,6 @@
-           <srcfiles dir="doc/source"

-                     includes="JmolGuide.docbook.xml, guide/*.docbook.xml"/>

-         </uptodate>

--        <uptodate targetfile="build/doc/JmolUserGuide_fr/index.html">

--          <srcfiles dir="doc/source"

--                    includes="JmolGuide_fr.docbook.xml, guide/*_fr.docbook.xml"/>

--        </uptodate>

-       </and>

-     </condition>

- 

-@@ -124,14 +118,6 @@
-           <srcfiles dir="doc/source"

-                     includes="JmolHistory.xml,JmolHistoryToHtml.xsl,history/changes.xml" />

-         </uptodate>

--        <uptodate targetfile="build/doc/JmolHistory/ChangeLog_fr.html">

--          <srcfiles dir="doc/source"

--                    includes="JmolHistory_fr.xml,JmolHistoryToHtml.xsl,history/changes_fr.xml" />

--        </uptodate>

--        <uptodate targetfile="build/doc/JmolHistory/ChangeLog_nl.html">

--          <srcfiles dir="doc/source"

--                    includes="JmolHistory_nl.xml,JmolHistoryToHtml.xsl,history/changes_nl.xml" />

--        </uptodate>

-       </and>

-     </condition>

-     

-@@ -141,14 +127,6 @@
-           <srcfiles dir="doc/source"

-                     includes="JmolDevelopersGuide.docbook.xml"/>

-         </uptodate>

--        <uptodate targetfile="build/doc/JmolDevelopersGuide_fr.html">

--          <srcfiles dir="doc/source"

--                    includes="JmolDevelopersGuide_fr.docbook.xml"/>

--        </uptodate>

--        <uptodate targetfile="build/doc/JmolDevelopersGuide_de.html">

--          <srcfiles dir="doc/source"

--                    includes="JmolDevelopersGuide_de.docbook.xml"/>

--        </uptodate>

-       </and>

-     </condition>

- 

-@@ -158,14 +136,6 @@
-           <srcfiles dir="doc/source"

-                     includes="JmolAppletGuide.docbook.xml, applet/*.docbook.xml"/>

-         </uptodate>

--        <uptodate targetfile="build/doc/JmolAppletGuide_fr.html">

--          <srcfiles dir="doc/source"

--                    includes="JmolAppletGuide_fr.docbook.xml, applet/*_fr.docbook.xml"/>

--        </uptodate>

--        <uptodate targetfile="build/doc/JmolAppletGuide_de.html">

--          <srcfiles dir="doc/source"

--                    includes="JmolAppletGuide_de.docbook.xml"/>

--        </uptodate>

-       </and>

-     </condition>

- 

-@@ -388,17 +358,12 @@
-   </target>

- 

-   <target name="jar" id="jar"

--          depends="init,classes,jmolGuide,jmolHistory,jmolDevelopersGuide,libjars,main-i18n">

-+          depends="init,classes,jmolGuide,jmolHistory,jmolDevelopersGuide,libjars">

-     <copy todir="${classes.dir}/org/openscience/jmol/Data/guide" >

-       <fileset dir="build/doc/JmolUserGuide">

-         <include name="**/*.html" />

-       </fileset>

-     </copy>

--    <copy todir="${classes.dir}/org/openscience/jmol/Data/guide_fr" >

--      <fileset dir="build/doc/JmolUserGuide_fr">

--        <include name="**/*.html" />

--      </fileset>

--    </copy>

-     <copy todir="${classes.dir}/org/openscience/jmol/Data" >

-       <fileset dir="build/doc/JmolHistory">

-         <include name="**/*.html" />

-@@ -603,18 +568,6 @@
-       <fileset dir="${appletjars.dir}" includes="**/*"/>

-     </jar>

- 

--    <for list="${all.JmolApplet.languages}" delimiter=","

--         param="current.Jmol.language">

--      <sequential>

--        <jar destfile="${jmol.applet.build.dir}/JmolApplet0_i18n_@{current.Jmol.language}.jar"

--             manifest="manifest/applet_i18n.txt" >

--          <fileset dir="${applet.classes.dir}">

--            <include name="org/jmol/translation/JmolApplet/@{current.Jmol.language}/**" />

--          </fileset>

--        </jar>

--      </sequential>

--    </for>

--

-     <jar destfile="${jmol.applet.build.dir}/JmolApplet0_Minimize.jar" manifest="manifest/applet.txt">

-       <fileset dir="${applet.classes.dir}">

-         <include name="org/jmol/minimize/**" />

-@@ -729,7 +682,6 @@
-         <include name="org/jmol/constant/**" />

-         <include name="org/jmol/g3d/**" />

-         <include name="org/jmol/geodesic/**" />

--        <include name="org/jmol/i18n/**" />

-         <include name="org/jmol/modelset/**" />

-         <include name="org/jmol/script/**" />

-         <include name="org/jmol/shape/**" />

-@@ -755,7 +707,6 @@
-         <pathelement path="${jmol.applet.build.dir}/JmolApplet0_ShapeSurface.jar" />

-         <pathelement path="${jmol.applet.build.dir}/JmolApplet0_Smiles.jar" />

-         <pathelement path="${jmol.applet.build.dir}/JmolApplet0_Symmetry.jar" />

--        <fileset dir="${jmol.applet.build.dir}" includes="JmolApplet0_i18n_*.jar" />

-       </indexjars>

-     </jar>

-     <!-- changes to this must be replicated below for the signed applet -->

-@@ -868,16 +819,6 @@
-              keystore="selfSignedCertificate/selfSignedCertificate.store"

-              storepass="selfSignedCertificate" alias="selfSignedCertificate" />

- 

--    <for list="${all.JmolApplet.languages}" delimiter=","

--         param="current.Jmol.language">

--      <sequential>

--      	<signjar jar="${jmol.applet.build.dir}/JmolApplet0_i18n_@{current.Jmol.language}.jar"

--                 signedjar="${jmol.applet.build.dir}/JmolAppletSigned0_i18n_@{current.Jmol.language}.jar"

--                 keystore="selfSignedCertificate/selfSignedCertificate.store"

--                 storepass="selfSignedCertificate" alias="selfSignedCertificate" />

--      </sequential>

--    </for>

--

-     <!-- vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv -->

-     <!-- this one must be treated specially because of jar indexing

-          we cannot simply rename the jar file, because the index has

-@@ -905,7 +846,6 @@
- 		<include name="org/jmol/shape/**" />

- 		<include name="org/jmol/viewer/**" />

- 		<include name="org/jmol/util/**" />

--		<include name="org/jmol/i18n/**" />

-       </fileset>    	

-       <indexjars>

-         <pathelement path="${jmol.applet.build.dir}/JmolAppletSigned0_Console.jar" />

-@@ -924,7 +864,6 @@
-         <pathelement path="${jmol.applet.build.dir}/JmolAppletSigned0_ShapeSurface.jar" />

-         <pathelement path="${jmol.applet.build.dir}/JmolAppletSigned0_Smiles.jar" />

-         <pathelement path="${jmol.applet.build.dir}/JmolAppletSigned0_Symmetry.jar" />

--        <fileset dir="${jmol.applet.build.dir}" includes="JmolAppletSigned0_i18n_*.jar" />

-       </indexjars>

-     </jar>

-     <signjar jar="${jmol.applet.build.dir}/JmolAppletSigned0.jar"

-@@ -963,18 +902,6 @@
-       </fileset>

-     </jar>

- 

--    <for list="${all.JmolApplet.languages}" delimiter=","

--         param="current.Jmol.language">

--      <sequential>

--        <jar destfile="${jmol.applet.build.dir}/JmolApplet0_i18n_@{current.Jmol.language}.jar"

--             manifest="manifest/applet_i18n.txt" >

--          <fileset dir="${applet.classes.dir}">

--            <include name="org/jmol/translation/JmolApplet/@{current.Jmol.language}/**" />

--          </fileset>

--        </jar>

--      </sequential>

--    </for>

--

-     <jar destfile="${jmol.applet.build.dir}/JmolApplet0_Minimize.jar" manifest="manifest/applet.txt">

-       <fileset dir="${applet.classes.dir}">

-         <include name="org/jmol/minimize/**" />

-@@ -1088,7 +1015,6 @@
-         <include name="org/jmol/constant/**" />

-         <include name="org/jmol/g3d/**" />

-         <include name="org/jmol/geodesic/**" />

--        <include name="org/jmol/i18n/**" />

-         <include name="org/jmol/modelset/**" />

-         <include name="org/jmol/script/**" />

-         <include name="org/jmol/shape/**" />

-@@ -1114,7 +1040,6 @@
-         <pathelement path="${jmol.applet.build.dir}/JmolApplet0_ShapeSurface.jar" />

-         <pathelement path="${jmol.applet.build.dir}/JmolApplet0_Smiles.jar" />

-         <pathelement path="${jmol.applet.build.dir}/JmolApplet0_Symmetry.jar" />

--        <fileset dir="${jmol.applet.build.dir}" includes="JmolApplet0_i18n_*.jar" />

-       </indexjars>

-     </jar>

-     <!-- changes to this must be replicated below for the signed applet -->

-@@ -1123,7 +1048,7 @@
-   </target>

- 

-   <target name="dist" id="dist"

--          depends="doc,main-i18n,main,signed-applet">

-+          depends="doc,main,signed-applet">

-     <!-- first build binary distribution -->

-     <delete dir="build/dist/jmol-${version}"/>

-     <mkdir dir="build/dist/jmol-${version}"/>

-@@ -1183,7 +1108,6 @@
-       <fileset dir=".">

-         <include name="applet.classes" />

-         <include name="build.xml" />

--        <include name="build-i18n.xml" />

-       </fileset>

-     </copy>

- 

-@@ -1278,7 +1202,6 @@
-       <fileset dir=".">

-         <include name="apisio.classes" />

-         <include name="build.xml" />

--        <include name="build-i18n.xml" />

-       </fileset>

-     </copy>

- 

-@@ -1374,7 +1297,7 @@
-   <target name="xclean" id="xclean">

-   </target>

- 

--  <target name="spotless" id="spotless" depends="clean,spotless-i18n">

-+  <target name="spotless" id="spotless" depends="clean">

-     <delete dir="build"/>

-     <delete dir="${javadoc.dir}"/>

-     <delete dir="packaging/rpm/dist"/>

-@@ -1438,16 +1361,6 @@
-       <arg value="../../../doc/source/JmolGuide.docbook.xml" />

-       <arg value="../../${docbook-xsl}/html/chunk.xsl" />

-     </java>

--    <echo message="Generating user's guide (fr)" />

--    <mkdir dir="build/doc/JmolUserGuide_fr" />

--    <java fork="true" dir="build/doc/JmolUserGuide_fr"

--          classname="com.icl.saxon.StyleSheet"

--          classpath="${lib.dir}/saxon.jar" >

--      <jvmarg value="${proxyHost}" />

--      <jvmarg value="${proxyPort}" />

--      <arg value="../../../doc/source/JmolGuide_fr.docbook.xml" />

--      <arg value="../../${docbook-xsl}/html/chunk.xsl" />

--    </java>

-   </target>

- 

-   <target name="jmolHistory" id="jmolHistory"

-@@ -1462,26 +1375,6 @@
-       <arg value="../../../doc/source/JmolHistory.xml" />

-       <arg value="../../../doc/source/JmolHistoryToHtml.xsl" />

-     </java>

--    <echo message="Generating history of changes (fr)" />

--    <java fork="true" dir="build/doc/JmolHistory"

--          classname="com.icl.saxon.StyleSheet"

--          classpath="${lib.dir}/saxon.jar" >

--      <arg value="-o" />

--      <arg value="ChangeLog_fr.html" />

--      <arg value="../../../doc/source/JmolHistory_fr.xml" />

--      <arg value="../../../doc/source/JmolHistoryToHtml.xsl" />

--      <arg value="lang=fr" />

--    </java>

--    <echo message="Generating history of changes (nl)" />

--    <java fork="true" dir="build/doc/JmolHistory"

--          classname="com.icl.saxon.StyleSheet"

--          classpath="${lib.dir}/saxon.jar" >

--      <arg value="-o" />

--      <arg value="ChangeLog_nl.html" />

--      <arg value="../../../doc/source/JmolHistory_nl.xml" />

--      <arg value="../../../doc/source/JmolHistoryToHtml.xsl" />

--      <arg value="lang=nl" />

--    </java>

-   </target>

- 

-   <target name="jmolDevelopersGuide" id="jmolDevelopersGuide"

-@@ -1495,24 +1388,6 @@
-       <arg value="../../doc/source/JmolDevelopersGuide.docbook.xml" />

-       <arg value="../${docbook-xsl}/html/docbook.xsl" />

-     </java>

--    <echo message="Generating developer's guide (fr)" />

--    <java fork="true" dir="build/doc"

--          classname="com.icl.saxon.StyleSheet"

--          classpath="${lib.dir}/saxon.jar" >

--      <arg value="-o" />

--      <arg value="JmolDevelopersGuide_fr.html" />

--      <arg value="../../doc/source/JmolDevelopersGuide_fr.docbook.xml" />

--      <arg value="../${docbook-xsl}/html/docbook.xsl" />

--    </java>

--    <echo message="Generating developer's guide (de)" />

--    <java fork="true" dir="build/doc"

--          classname="com.icl.saxon.StyleSheet"

--          classpath="${lib.dir}/saxon.jar" >

--      <arg value="-o" />

--      <arg value="JmolDevelopersGuide_de.html" />

--      <arg value="../../doc/source/JmolDevelopersGuide_de.docbook.xml" />

--      <arg value="../${docbook-xsl}/html/docbook.xsl" />

--    </java>

-   </target>

- 

-   <target name="jmolAppletGuide" id="jmolAppletGuide" depends="initdoc"

-@@ -1526,24 +1401,6 @@
-       <arg value="../../doc/source/JmolAppletGuide.docbook.xml" />

-       <arg value="../${docbook-xsl}/html/docbook.xsl" />

-     </java>

--    <echo message="Generating applet guide (fr)" />

--    <java fork="true" dir="build/doc"

--          classname="com.icl.saxon.StyleSheet"

--          classpath="${lib.dir}/saxon.jar" >

--      <arg value="-o" />

--      <arg value="JmolAppletGuide_fr.html" />

--      <arg value="../../doc/source/JmolAppletGuide_fr.docbook.xml" />

--      <arg value="../${docbook-xsl}/html/docbook.xsl" />

--    </java>

--    <echo message="Generating applet guide (de)" />

--    <java fork="true" dir="build/doc"

--          classname="com.icl.saxon.StyleSheet"

--          classpath="${lib.dir}/saxon.jar" >

--      <arg value="-o" />

--      <arg value="JmolAppletGuide_de.html" />

--      <arg value="../../doc/source/JmolAppletGuide_de.docbook.xml" />

--      <arg value="../${docbook-xsl}/html/docbook.xsl" />

--    </java>

-   </target>

- 

-   <target name="test" id="test" depends="main,compile-tests">

-@@ -1575,12 +1432,4 @@
-     <jar destfile="${tests.dir}/Tests.jar" basedir="${test-classes.dir}" />

-   </target>

- 

--  <!-- i18n stuff -->

--  <target name="main-i18n" depends="classes">

--    <ant antfile="tools/build-i18n.xml" target="main-i18n"/>

--  </target>

--  <target name="spotless-i18n">

--    <ant antfile="tools/build-i18n.xml" target="spotless-i18n"/>

--  </target>

--

- </project>