gentoo resync : 29.10.2017

9 files changed, 3 insertions, 407 deletions

diff --git a/sci-chemistry/jmol/Manifest b/sci-chemistry/jmol/Manifest
index b47b85f09a7c..92e39efcc077 100644
--- a/sci-chemistry/jmol/Manifest
+++ b/sci-chemistry/jmol/Manifest
@@ -2,8 +2,6 @@ AUX 12.0.45/jmol-manifest.patch 3726 SHA256 74cdf274352161ffdf155b34b8d9110dad9c
 AUX 12.0.45/jmol-nointl.patch 13315 SHA256 6bbf13c59bc3633dc089346c1133ad2b3d0614463abdf364f5ec2e2ccd658df0 SHA512 deb54c7f94e3fd4b43a701d58c992edbc80f650397feea97594a8f00cdc14463a19e2314fa616fb3a0ca42af8b70770c0426b8eacfe1d81a30b53c566e6342c0 WHIRLPOOL 570e359517e1011ba76447161e6c03925db0e6533d262f11f13d9553f75989faa27a0ae5f39352dad19ec53e804e8e39e76bbc79f1b44b495fe948e7b8633472
 AUX caffeine.xyz 1116 SHA256 45a9afac0b247780595944a98f8e1076a7e7e0dbb3e02cb54cecb0764b1cb67f SHA512 863ee4a327b2d765ed042cf24055c708d3970a20c3c3b2ee45b46096390be11a7c02915faedb30ee6cb69101faa5942fcfb19fe2b530afb93460a2cd167c3688 WHIRLPOOL 18df972f5cbafc35be4bf20de29ad8049e7c6f921a668f0c80cd9aff2c3ede32b9b30e830f2629be2136923c554c3711b809915d45ea1bd1da854d8768d6e254
 AUX index.html 328 SHA256 8cba2c5eb7f25c0ecf23bc007eb61549a7d2177ac327db6c1e5f51f333ae2451 SHA512 e89c62ba91ecebb38d6f9c88cc1f257600bd7d6005df97713f2715036d3308dee53f7b838ca749c1acc810cc4701c384525f2763b96ac2f1d6802e639cd1961b WHIRLPOOL 0b407f950f4f2523d21c03b6e4f20f9ef4009e54d666ad3a222b87b0e49576816f3940e4fe076e55e9fda9832170c54f17ed543420333fe489f45f4d7296ee79
-AUX jmol-11.0.3-manifest.patch 3726 SHA256 74cdf274352161ffdf155b34b8d9110dad9c4a15720467f73d301104005566bd SHA512 016e57a3c3e55d89fe2a72447160c0b6359affec305c6b4949892ddec3b4a648bad96b87ff0aa5cb0c5187f59e825b441cbbe60e6936a14df536ed0095f67112 WHIRLPOOL abb250bc77d15a5f3e0a441dd0ffd8809642d8959f896c1ae394b85695b74bd4578013ad99b38abca822ad5db514562b121ad6b2f0265090653d7e359ee85a2f
-AUX jmol-11.0.3-nointl.patch 11109 SHA256 56ad460779a0ecfb90ad61cf4cfae2fad9b017f9f78581a720241e4ea208b49a SHA512 0fe07fb53d989298f7395be39c6ee75f56ab59fc096e956d8481c38581706b17f799e745fcd5b6652c4f1115d4425e7ff9ebef454b606d8de7829e07e26b27e2 WHIRLPOOL daf992208b99fec51f5f0b26ca22d520ebd820a22d439c7baa2b84f2b4b3829ac7139d7d3c48076dd4681af1296fd5e61badd91332efa03cc97e58027b21697a
 AUX jmol-12.2.27-nointl.patch 13821 SHA256 330a911405f00552d37a9c241c4a18b9d3e6812ce858933dbc4574df8248e345 SHA512 6ad196dfd6d38a086fad461f8170340f8ef3beb7ae69916e0285d8e30ce8a40efc278e461a3d0ae0da71611529f4a0e58c9a73336319764b1fef62d75336a8dc WHIRLPOOL 94be437d33ec73ed53c8461e78a7799c2aa34c9b606e309554da191ff74a465fe2243f4953a615aca790d3558e2b69b7edd122526f900475f5b05bb20d98d0fe
 DIST Jmol-12.0.45-full.tar.gz 26501382 SHA256 f9a3fe242841f9b56a718f8da2efe4130e497afe2c12d77f2e68344c62d7f70e SHA512 b0e999335c039e5bde5e261c076f3eb75dd0c33a351445d5c086995d32b3fd03795b3a11dc57a06bf8ac39e74945f3c9f4547ecfbf18b56d827b9a42f5208c11 WHIRLPOOL d0bbae1fc5c96ddfb4dd29f6e09701e496a333a2f44ba266e2a24c60de2d36d73c2184bd9b8f6054b0955535d49856154d6101644ef0297b825c4f6745cfe3bb
 DIST Jmol-12.2.27-full.tar.gz 29493780 SHA256 f2ca3b810ea16a488f6f57003d2a407c8ac040d610479a7ae6d95631157db801 SHA512 a8608e64dc06b6d3b0cb7e911f0a224456a65bdc15c51d6b420ee6abf8d82cdcec9f54f6b1a51cfe032e2e074f173f50a88bcff783311de19ce9b95ad990ebca WHIRLPOOL ae0826eab7eb364acb4f30eb77850450b871a24d8940eaabaf8fe9f3770efc39deb604e3c5f875a695c0d33b516ad47d523982c7a6460f2421f961f50a7680bf
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 3b43c219d94f..000000000000
--- 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 25fd17e36c68..000000000000
--- 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>

diff --git a/sci-chemistry/molmol/Manifest b/sci-chemistry/molmol/Manifest
index a2ea2253be38..5baa7db90f35 100644
--- a/sci-chemistry/molmol/Manifest
+++ b/sci-chemistry/molmol/Manifest
@@ -11,7 +11,7 @@ DIST molmol-2k.2.0-src.tar.gz 1088805 SHA256 1104dcb1b2517581c7d6b1695ff2e92f407
 EBUILD molmol-2k_p2-r2.ebuild 1692 SHA256 bd4feca46efdf75a59ac864bd4b3c5e90997779681c296e871dccdf305bb512e SHA512 60a0fa252d9a6e59d17eb0a5f1df819170e95c1a4857187c5620dc33a01113a87001eff940983861db4b2137fc56026b0a19092681b9738d2055421ba7c0d10a WHIRLPOOL f0578627c681faf49953ed86351bea08706c3f7938a6909989b77afdbe0162a456e2fc1b48510ab601476b4063c5929b2404e9bdf497f307d60080a73358e833
 EBUILD molmol-2k_p2-r3.ebuild 1817 SHA256 9409a09878d0eba2510638843ed671e3c900001f20f778c2db57d95648303ec1 SHA512 723d3cff895cc9a7037de631027485ce35ac3a1ce4621f72cfe9eb26bbbb7554dbea8bce33898ff4c0e7c25addea5f844ba17e4e526689bbd9bcc4f999d78964 WHIRLPOOL 8105575d069f277115165d85d89ca20752e98b3aac74dc0e5082a97b38b0607474782ec6c14c6d39815df28e9cdc72c68d7ebb30638034b068e47c4d42a3dadc
 EBUILD molmol-2k_p2-r4.ebuild 1834 SHA256 fa9dbf6e0d1e1e8ed4a5b2a84b7db3cef9fa716e398037ebedd26a4778777b8f SHA512 7f995739ff9ef95bf9408245957a4a282dd23a309ad8eb791ad688ecac0af51229638c078e924572032d281ff4f1b31b4ad9a97d35cf20c21639b244e2c28c8d WHIRLPOOL fa7d6d1a08bed868dda749ecb071e342c5f5b906d5cf277efb6b38fb1a3a907c1d5ec6f0a855dd23c93411a86b828490e14848d3ceb79f5be8237457ff139ac9
-EBUILD molmol-2k_p2-r5.ebuild 1842 SHA256 77271b14705603d0f8198db6b7f5884ed34a04de1066a2a224135932e071437b SHA512 29e216d410dac3ce982010ace56a02f23d35b3dddc04ad773a5d2a6d1c0e4a002fd0ef8f486c7c6d872800a590cfb996c7d354670e09ce9de578c55fc1548bc9 WHIRLPOOL 3bf1f853446979be17c8674676a9e72e0e185edbf5469230f575fcb8c7fb732cd8c0db170f24d3351caf8eeade8af0a3f55db3735ea5867ead09a4ab6e8893fd
+EBUILD molmol-2k_p2-r5.ebuild 1841 SHA256 7d88081fd46d44a954ede1a166c2a1a9374e4c18b0d6737917c0352479eb0e09 SHA512 e5e0826994823cea86838987eeb8e5f352a5aa5c4acad706e5f5b2023da24edf05d127ed870f20724c3c2247b527efae1e3429b8b0a9cf911b3c3de81a11bc5b WHIRLPOOL 4d96e5e14d093fb248fc29efa50df6d8956553b651eedbe6bc698d01884f524ad95ef37ffa2a87c255385d1253613e923a886a711a65d3a5c57ec76b968ea887
 MISC ChangeLog 3059 SHA256 c09731a5cd875e00a43dc23970cf08d7d30eae68ff674688f7d7e8170dc1c1a3 SHA512 bd7b1586db627d7f9ddeca3bc80febad1ba7073f3e8bc667fba6d3c9608850fec131ac8082845d3b35037267c60caff6b59aa325b10dba6c33cea98e3edfa758 WHIRLPOOL 16df2bdef50a933b13ea413fd3d4e4b4b79237f8c567d8c4863fda6cc063682360e66a235b9cb1c2f1d981092a9d70eda1f4394cf1af3c66cbb2624f71c73096
 MISC ChangeLog-2015 5362 SHA256 5495e3b639f2c394d2a1c373fe680282178d7fe0ac0ec529daa6219b6f2eb1c9 SHA512 e7d0079ecc3703857100d349db4750104ba00fa677827134d1b446ce1c1049dabad667df9513a7e8d08d622d8ca06aa91cceb15fa5cd6dc15e2d105008b44a64 WHIRLPOOL ce38ea072497b114bdc1e67d35155fa6f7b3f4a294810ab2b81b94599617b1dc3a21481bf60189672c352a723163cc015dceca448a702c9bfe42a15d56e99e42
 MISC metadata.xml 271 SHA256 70036ea85140f86ed670bc2791c9de861c4b6164755ee36a2560d1c812ec13f6 SHA512 3e6e6047a29e07123b81279cae1de17bc4bd4c3d7d8a8d26560114a18185f473d038fc220fa81c7213fa203ce197bad8b1c272d9b7e41cd770a953fa6308ff92 WHIRLPOOL 1ccb964819c99258af550a41c6712ba8ebdecbec1c821106de2f22c37b1c981cd4f324856a8014b08bd186bcd2a7fa45a7e772cc15705d1a39016b5229e77269
diff --git a/sci-chemistry/molmol/molmol-2k_p2-r5.ebuild b/sci-chemistry/molmol/molmol-2k_p2-r5.ebuild
index 23720c5be51c..16e8b8553600 100644
--- a/sci-chemistry/molmol/molmol-2k_p2-r5.ebuild
+++ b/sci-chemistry/molmol/molmol-2k_p2-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="molmol"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="
diff --git a/sci-chemistry/molsketch/Manifest b/sci-chemistry/molsketch/Manifest
index 32b1636db490..5bf5bd9ad0b5 100644
--- a/sci-chemistry/molsketch/Manifest
+++ b/sci-chemistry/molsketch/Manifest
@@ -2,7 +2,6 @@ AUX molsketch-0.3.0-_DEFAULT_SOURCE.patch 661 SHA256 0ee57232a61e2ec9e44250b7a66
 AUX molsketch-0.3.0-desktop.patch 572 SHA256 6273aa20d8498ed522c3dbd5bcb966e7923e56f3497bff6441ff717a0f714486 SHA512 dbb074dd2bff41872ce9363241aa26bdc2537950c7635399c7a173845c30b8603de24bc6dcaf8a27a6eadbdc2c5249aa4cdd2bb63f059475d53f99b99acffd6a WHIRLPOOL 353f839287b5e58700cf25d788fb12b659bb345dbea714c59827957cd19c872660cec3b51619b90717fcc5755d21980258419f9de42586afdf5f1abd1ea6ce0a
 AUX molsketch-0.3.0-no-quotes.patch 490 SHA256 3979e7020f559665692fdade6a4dca2e0d5c840866b88c2a5615f9e908263875 SHA512 cf5028b8b99c77543943f517eee6eafbe8bc8a590fe8dbb9840001e568866a74c852fd59653714f507b0a5a556ce7c40dd1768c29df92af9cb8ff4131ac48e35 WHIRLPOOL 3f2a0999a706e9ec5ebce4697aeba8ce1ea22ec9442c947369afe2292bd2415cf7faceb72e1fe0c8c7dbd9aa9b9ba77382e6fbee052448939e7e7df11802df54
 AUX molsketch-0.4.1-more-quotes.patch 478 SHA256 6cf71ad30457dc6dc6fc1b6f2d884cfd914304d6525faa5bc378c7de03933be8 SHA512 015344abb4aaa7f214e4e8a7eebe1a7a8f4d43b8a76a9c5f984fc4c5cf8da450430330543fe69d481ceec25c5a59ee332439654fd4ce82ce080aa4883cc1d113 WHIRLPOOL bb8a51964018cf50185e6d0e876ad7e2e255658c34b47a6292e7d157cc58b9b2759e2e17d1d3cfb88bab6b014247a09bc122790ba95cba2a63db89f360243ec2
-AUX molsketch-0.4.1-no-quotes.patch 545 SHA256 59a963c1720d39ed82ff3cd3178043c3188d168c79ca6a53ff31def8dfeef5cf SHA512 8bf7db168567f47980e9f7b3547c4359f3ed427187a6f5d3be60658214891362538caa9db9607fd791a34f99961baadfaf50cc07135669471740d77a3b715b6a WHIRLPOOL 128796460a931c6408928330feb05a31cbf6c9972ead3a4d0e14b496565df9752233d2a374999c8086b4469ad13411a695518ef999006ddf5f35ef139146b606
 DIST Molsketch-0.3.0-src.tar.gz 337388 SHA256 078b05bfd591930430bc1e5df802af27bdf40718b9218ba6435eadc209d4d1bc SHA512 405553c9d84f0ce9d70a237834f8273dd5010b95868434f9b1b9042fd626e2782c5d3da7d17d9485946210e48e86d0c2de8385d80667018dbc833c3928d076d4 WHIRLPOOL 659717039bf294072117a8e7dc1cb590c6804d3dbde625aa16451bfdb6371933c71f6241fee1e38cec696bdb89e19111c30cf6ed17810daf09b75272080fbb31
 DIST Molsketch-0.4.1-src.tar.gz 1499842 SHA256 6b183ed3ba92f89f1318879657a79c09d7135c99af28eee8758f46f131e05a30 SHA512 263b088c2b8d01c1f13802b18aea6f6784580fe1a806de45b0e1ecd9f29024350e01a611bdeed1891938acc733a42746203d345d3be13ebaf4c309413e86bf26 WHIRLPOOL 383e9fffd1cd2db195e962f58e97d0ffd858dc14353c99ed0bdd7e577413e5ac991ed18a41b5d4ee4b926887a6a2654fe30167f82759142b21b753c30e41cbd7
 EBUILD molsketch-0.3.0.ebuild 1352 SHA256 b7eae9694ea2ff18229e58b5e0060b6f5e0b8cd74a18ad93ee8a8f6273c27288 SHA512 d63d3a6ac76f071977d1708f072082a1e2ea3c7f02bb6cb37a28cdc62a9255eb2766257cf86b0a9c65ef9c7a0cf5828e7d1afc8616035c2cb93cb155fbbf72e0 WHIRLPOOL 4274d4095329e6ce6d3cf7a34817e9c6e70d3ba138eff52617a4faa2d8f977ad0b7f9c66ae35df2d29fa128f79f9bb6faa296e483c32d5203bca84fd53ca06ed
diff --git a/sci-chemistry/molsketch/files/molsketch-0.4.1-no-quotes.patch b/sci-chemistry/molsketch/files/molsketch-0.4.1-no-quotes.patch
deleted file mode 100644
index 1b63ed51edec..000000000000
--- a/sci-chemistry/molsketch/files/molsketch-0.4.1-no-quotes.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 64c18a2..75c2fb7 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -97,7 +97,7 @@ endif(Qt5Core_FOUND AND Qt5Widgets_FOUND AND Qt5Gui_FOUND AND Qt5PrintSupport_FO
- if(FORCEQt4)
-         add_definitions(-DQTVERSIONSUFFIX="")
- else(FORCEQt4)
--        add_definitions(-DQTVERSIONSUFFIX="\\\"-qt5\\\"")
-+        add_definitions(-DQTVERSIONSUFFIX="-qt5")
- endif(FORCEQt4)
- 
- ################ Reading version and default paths
diff --git a/sci-chemistry/reduce/Manifest b/sci-chemistry/reduce/Manifest
index d1a6f3611091..bfebd30206f5 100644
--- a/sci-chemistry/reduce/Manifest
+++ b/sci-chemistry/reduce/Manifest
@@ -1,4 +1,3 @@
-AUX 3.13.080428-CFLAGS.patch 706 SHA256 ce2b82b16421d58bf5de67703f5e9b718f73176891408867460c560ece42cf63 SHA512 849f0ccb7e452a93e4534b232e0ac89a08fcf1c5c34e74910f76e485f12b96ee0aee04728efd8d6a888538ba8a83d4e1604d1a02cdaeeb23aa0d21a80e7b2be9 WHIRLPOOL abfdcd1f5352c282be497a13dd4295fd3bb66267f88f8642fbda14e909d6c52c67d944ff3d0e4c4a27fe57995009290a7a9870ed589c66803890654addbad1a6
 AUX 3.13.080428-LDFLAGS.patch 230 SHA256 9cdcab6d020e8bed56b6938e77c78c66dda91789a29761548511f1ec3220c013 SHA512 f7b471998c1fa5bb5c4eba7fd3f0900469b3ce1d90399413a18b736e5d35d93875c2b1666afe307935c9e71c516a7bd2db7eee1fba9640d403a2401a4427a539 WHIRLPOOL 7d932a12731035f0a3349aaa053f059f83db71d004711c41c33869df7afaeef6fce643f38285ad3ff7215183907be7b42c331d0c8118d11b49d53e90dea11f94
 AUX 3.14.080821-CFLAGS.patch 736 SHA256 18c5e5e6a20f82b0bcfbc3875742fd3de6ac5ae34c4e2aa194aac5515323fc24 SHA512 f435a889845065374753841a0ba5de64e5be0d73935bd145d2e69980671cb3620441e99ec68bedbd876f45a0d61f406dc1a98f1ed7affaf4c923105d7540530a WHIRLPOOL 76b5aad71c1ccef0d0e73159da768f76fee1aea5d07899b82944ef89da3e8f6e44ce40d1f0121b105880279ae9c64af5132485041aaa776aab636ad2e7f5119c
 AUX reduce-3.16.111118-fix-c++14.patch 565 SHA256 785e4d0580150889303f868f630a61a137143f0ef653d00c81912af44774b60a SHA512 8b38d5cbcc76318bb1309185858000daf8cca15a466ce0d4174126c9a5caa50e79d8198d3e3ff3427aa4629d51d0e50773d96b7bce7d94e16cace4bb80f4eed0 WHIRLPOOL 9b9a7622a98b72f099840443d7af8a059af87c98d6c6f599259bcb9ef44369803b71443c3f09678340657a5b4396ef2a941066c5c2af80712c9da194fac19295
diff --git a/sci-chemistry/reduce/files/3.13.080428-CFLAGS.patch b/sci-chemistry/reduce/files/3.13.080428-CFLAGS.patch
deleted file mode 100644
index 7daa5336f689..000000000000
--- a/sci-chemistry/reduce/files/3.13.080428-CFLAGS.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/reduce_src/Makefile b/reduce_src/Makefile
-index 598e367..067ace4 100644
---- a/reduce_src/Makefile
-+++ b/reduce_src/Makefile
-@@ -12,7 +12,7 @@ PROG_FLGS   = -DAROMATICS_ACCEPT_HBONDS \
- #              -DDEBUGMOVABLENODE -DDEBUGDOTCOUNTS
- #              -DMINPREDEFINED -DMAXPREDEFINED\
- 
--CFLAGS = $(OPT) $(DEBUG) $(PROG_FLGS) $(DICT_LOC)\
-+CXXFLAGS = $(OPT) $(DEBUG) $(PROG_FLGS) $(DICT_LOC)\
-          -I$(PDBHOME) -I$(TOOLHOME) 
- #         -Wall
- 
-@@ -26,7 +26,7 @@ OBJLIST = GraphToHoldScores.o reduce.o CTab.o ElementInfo.o StdResH.o ResBlk.o A
- CXX		= g++
- 
- .cpp.o:
--	$(CXX) -c $*.cpp $(CFLAGS)
-+	$(CXX) -c $*.cpp $(CXXFLAGS)
- 
- OPT             = -O3
- DEBUG           = $(CXXDEBUGFLAGS)