commit: d3b4de720e68019d5ac50a37ee238deeb639870e Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> AuthorDate: Mon Sep 18 13:18:26 2017 +0000 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> CommitDate: Fri Oct 27 21:50:48 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3b4de72
sci-chemistry/jmol: remove unused patches. Closes: https://github.com/gentoo/gentoo/pull/5721 .../jmol/files/jmol-11.0.3-manifest.patch | 96 -------- sci-chemistry/jmol/files/jmol-11.0.3-nointl.patch | 266 --------------------- 2 files changed, 362 deletions(-) diff --git a/sci-chemistry/jmol/files/jmol-11.0.3-manifest.patch b/sci-chemistry/jmol/files/jmol-11.0.3-manifest.patch deleted file mode 100644 index 3b43c219d94..00000000000 --- a/sci-chemistry/jmol/files/jmol-11.0.3-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/jmol-11.0.3-nointl.patch b/sci-chemistry/jmol/files/jmol-11.0.3-nointl.patch deleted file mode 100644 index 25fd17e36c6..00000000000 --- a/sci-chemistry/jmol/files/jmol-11.0.3-nointl.patch +++ /dev/null @@ -1,266 +0,0 @@ ---- jmol-11.0.3-orig/build.xml 2007-05-17 09:35:04.000000000 -0500 -+++ jmol-11.0.3/build.xml 2007-05-17 09:40:21.000000000 -0500 -@@ -100,10 +100,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> - -@@ -113,14 +109,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> - -@@ -130,14 +118,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> - -@@ -147,14 +127,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> - -@@ -332,17 +304,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" /> -@@ -462,7 +429,6 @@ - <!-- note that this class is included in JmolApplet0.jar --> - <exclude name="org/jmol/api/JmolAppletInterface.class" /> - <include name="org/jmol/applet/**" /> -- <include name="org/jmol/i18n/**" /> - <include name="org/jmol/popup/**" /> - </fileset> - </jar> -@@ -502,12 +468,6 @@ - </fileset> - </jar> - -- <jar destfile="${jmol.applet.build.dir}/JmolApplet_i18n.jar" manifest="manifest/applet_i18n.txt" > -- <fileset dir="${applet.classes.dir}"> -- <include name="org/jmol/translation/**" /> -- </fileset> -- </jar> -- - <!-- vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv --> - <!-- changes to this must be replicated below for the signed applet --> - <jar destfile="${jmol.applet.build.dir}/JmolApplet0.jar" -@@ -527,7 +487,6 @@ - <pathelement path="${jmol.applet.build.dir}/JmolApplet4.jar" /> - <pathelement path="${jmol.applet.build.dir}/JmolApplet5.jar" /> - <pathelement path="${jmol.applet.build.dir}/JmolApplet6.jar" /> -- <pathelement path="${jmol.applet.build.dir}/JmolApplet_i18n.jar" /> - </indexjars> - </jar> - <!-- changes to this must be replicated below for the signed applet --> -@@ -564,10 +523,6 @@ - signedjar="${jmol.applet.build.dir}/JmolAppletSigned6.jar" - keystore="selfSignedCertificate/selfSignedCertificate.store" - storepass="selfSignedCertificate" alias="selfSignedCertificate" /> -- <signjar jar="${jmol.applet.build.dir}/JmolApplet_i18n.jar" -- signedjar="${jmol.applet.build.dir}/JmolAppletSigned_i18n.jar" -- keystore="selfSignedCertificate/selfSignedCertificate.store" -- storepass="selfSignedCertificate" alias="selfSignedCertificate" /> - - <!-- vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv --> - <!-- this one must be treated specially because of jar indexing -@@ -589,7 +544,6 @@ - <pathelement path="${jmol.applet.build.dir}/JmolAppletSigned4.jar" /> - <pathelement path="${jmol.applet.build.dir}/JmolAppletSigned5.jar" /> - <pathelement path="${jmol.applet.build.dir}/JmolAppletSigned6.jar" /> -- <pathelement path="${jmol.applet.build.dir}/JmolAppletSigned_i18n.jar" /> - </indexjars> - </jar> - <signjar jar="${jmol.applet.build.dir}/JmolAppletSigned0.jar" -@@ -599,7 +553,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}"/> -@@ -655,7 +609,6 @@ - <fileset dir="."> - <include name="applet.classes" /> - <include name="build.xml" /> -- <include name="build-i18n.xml" /> - </fileset> - </copy> - -@@ -744,7 +697,6 @@ - <fileset dir="."> - <include name="apisio.classes" /> - <include name="build.xml" /> -- <include name="build-i18n.xml" /> - </fileset> - </copy> - -@@ -839,7 +791,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"/> -@@ -900,16 +852,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" -@@ -924,26 +866,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" -@@ -957,24 +879,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" -@@ -988,24 +892,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"> -@@ -1036,12 +922,4 @@ - <jar destfile="${tests.dir}/Tests.jar" basedir="${test-classes.dir}" /> - </target> - -- <!-- i18n stuff --> -- <target name="main-i18n" depends="classes"> -- <ant antfile="build-i18n.xml" target="main-i18n"/> -- </target> -- <target name="spotless-i18n"> -- <ant antfile="build-i18n.xml" target="spotless-i18n"/> -- </target> -- - </project>
