#4894 pymol-py-1.8.6.0-1

[Jack Howarth]

Update to the 1.8.6.0 using the upstream tarball and disable the new optional build against msgpack using the Info file changes...

Index: pymol-py.info
===================================================================
RCS file: /cvsroot/fink/dists/10.9-libcxx/stable/main/finkinfo/sci/pymol-py.info,v
retrieving revision 1.6
diff -u -r1.6 pymol-py.info
--- pymol-py.info   11 Feb 2017 22:32:09 -0000  1.6
+++ pymol-py.info   10 Mar 2017 16:43:37 -0000
@@ -1,13 +1,14 @@
 Info2: <<
 Package: pymol-py%type_pkg[python]
-Version: 1.8.5.0
+Version: 1.8.6.0
 Revision: 1
 UseMaxBuildJobs: false
 Maintainer: None <fink-devel@lists.sourceforge.net>
 Type: python (2.7 3.4 3.5 3.6)
-# r4166
-Source: https://sourceforge.net/code-snapshots/svn/p/py/pymol/code/pymol-code-4166-trunk.zip
-Source-MD5: 06a9b708e9b1ced6e6963e80e25ab0fe
+# r4170
+#Source: https://sourceforge.net/code-snapshots/svn/p/py/pymol/code/pymol-code-4166-trunk.zip
+Source: mirror:sourceforge:pymol/pymol/1.8/pymol-v%v.tar.bz2
+Source-MD5: dc317a4046d653417ac6d4a984176e26
 Source2: http://www.weizmann.ac.il/ISPC/eMovie.py
 Source2-MD5: 832252d4cee1ba88d50a35681b5ecd4b
 Source3: http://www.weizmann.ac.il/ISPC/eMovie_rigimol.inp
@@ -18,7 +19,8 @@
 PatchFile2-MD5: 6e45a30ca2c47122951f6f92659da221 
 PatchFile3: pymol-py-unused.patch
 PatchFile3-MD5: a75ac08e516eef4851fb1b42fdccdd60
-SourceDirectory: pymol-code-4166-trunk/pymol
+#SourceDirectory: pymol-code-4166-trunk/pymol
+SourceDirectory: pymol
 # Avoid including headers from fink before source directories
 NoSetCPPFLAGS: true
 SetCFLAGS: -Wno-c++11-extensions
@@ -58,7 +60,8 @@
    then patch -p1 < %{PatchFile2}
 fi
 patch -p0 < %{PatchFile3}
-pushd ../..
+#pushd ../..
+pushd ..
 perl -pi -e 's|\topen_eMovie\(\)|#\topen_eMovie\(\)|g' eMovie.py
 popd
 perl -pi -e 's|searchDirs.append\(os.path.join\("/opt", "local", "bin"\)\)||g' modules/pmg_tk/startup/apbs_tools.py 
@@ -69,7 +72,7 @@
 <<
 InstallScript: <<
 #! /bin/sh -ex
-%p/bin/python%type_raw[python] setup.py install --root %d
+%p/bin/python%type_raw[python] setup.py install --root %d --use-msgpackc=no
 # setup2.py currently mishandles the creation of the pymol_path symlink
 # and the placement of the associated subdirectories.
 #%p/bin/python%type_raw[python] setup2.py install --root %d
@@ -80,8 +83,10 @@
 chmod ugo+x %i/lib/pymol-py%type_pkg[python]/bin/pymol
 # skip installation of eMovie until ported to python3
 if [ "%type_raw[python]" == "2.7" ]; then
-cp ../../eMovie.py %i/lib/python%type_raw[python]/site-packages/pmg_tk/startup/eMovie.py
-cp ../../eMovie_rigimol.inp %i/lib/python%type_raw[python]/site-packages/pymol/eMovie_rigimol.inp
+#cp ../../eMovie.py %i/lib/python%type_raw[python]/site-packages/pmg_tk/startup/eMovie.py
+#cp ../../eMovie_rigimol.inp %i/lib/python%type_raw[python]/site-packages/pymol/eMovie_rigimol.inp
+cp ../eMovie.py %i/lib/python%type_raw[python]/site-packages/pmg_tk/startup/eMovie.py
+cp ../eMovie_rigimol.inp %i/lib/python%type_raw[python]/site-packages/pymol/eMovie_rigimol.inp
 fi
 rm -f %i/bin/pymol
 <<

Tested on 10.12 with 'fink -m' for the 2.7, 3.4 and 3.5 python variants.

[Jack Howarth]

Info file for pymol-py-1.8.6.0-1