[gentoo-commits] proj/sci:master commit in: sci-chemistry/pymol/, sci-chemistry/pymol/files/

["Justin Lecher" <jlec@gentoo.org>]

commit:     ed1028a1b6c2a45f42d1275023094d3195bd1ad9
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 29 09:07:09 2012 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Mar 29 09:07:09 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=ed1028a1

Import tree changes

(Portage version: 2.2.0_alpha96/git/Linux x86_64, unsigned Manifest commit)

---
 sci-chemistry/pymol/ChangeLog                      |    4 ++++
 .../pymol/files/pymol-9999-data-path.patch         |   18 +++++++++++-------
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/sci-chemistry/pymol/ChangeLog b/sci-chemistry/pymol/ChangeLog
index 3aee674..78f20cb 100644
--- a/sci-chemistry/pymol/ChangeLog
+++ b/sci-chemistry/pymol/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  29 Mar 2012; Justin Lecher <jlec@gentoo.org>
+  files/pymol-9999-data-path.patch:
+  Import tree changes
+
   04 Mar 2012; Justin Lecher <jlec@gentoo.org> pymol-9999.ebuild:
   Block pypy usage
 

diff --git a/sci-chemistry/pymol/files/pymol-9999-data-path.patch b/sci-chemistry/pymol/files/pymol-9999-data-path.patch
index e865bfd..a2b09bb 100644
--- a/sci-chemistry/pymol/files/pymol-9999-data-path.patch
+++ b/sci-chemistry/pymol/files/pymol-9999-data-path.patch
@@ -4,8 +4,8 @@
  modules/chempy/tinker/__init__.py   |    2 +-
  modules/pymol/commanding.py         |    6 +++---
  modules/pymol/importing.py          |    2 +-
- modules/pymol/wizard/mutagenesis.py |    4 ++--
- 7 files changed, 17 insertions(+), 17 deletions(-)
+ modules/pymol/wizard/mutagenesis.py |    8 ++++----
+ 7 files changed, 19 insertions(+), 19 deletions(-)
 
 diff --git a/layer0/ShaderMgr.c b/layer0/ShaderMgr.c
 index cc760ae..364277f 100644
@@ -74,7 +74,7 @@ index 23dbe45..795a223 100644
      path = os.environ['PYMOL_DATA'] + '/chempy/'
  elif os.environ.has_key('PYMOL_PATH'):
 -    path = os.environ['PYMOL_PATH'] + '/data/chempy/'   
-+    path = os.environ['PYMOL_PATH'] + '/chempy/'   
++    path = os.environ['PYMOL_PATH'] + '/chempy/'
  elif os.environ.has_key('FREEMOL_MODULES'):
      path = os.environ['FREEMOL_MODULES'] + '/chempy/'
  else:
@@ -127,20 +127,24 @@ diff --git a/modules/pymol/wizard/mutagenesis.py b/modules/pymol/wizard/mutagene
 index 8a5250d..6c1b26c 100644
 --- a/modules/pymol/wizard/mutagenesis.py
 +++ b/modules/pymol/wizard/mutagenesis.py
-@@ -53,7 +53,7 @@ class Mutagenesis(Wizard):
+@@ -52,8 +52,8 @@ class Mutagenesis(Wizard):
+         
          self.dep = default_dep
  
-         self.ind_library = io.pkl.fromFile(os.environ['PYMOL_PATH']+
+-        self.ind_library = io.pkl.fromFile(os.environ['PYMOL_PATH']+
 -                                           "/data/chempy/sidechains/sc_bb_ind.pkl")
++        self.ind_library = io.pkl.fromFile(os.environ['PYMOL_DATA']+
 +                                           "/chempy/sidechains/sc_bb_ind.pkl")
          self.load_library()
          self.status = 0 # 0 no selection, 1 mutagenizing
          self.bump_check = 1
-@@ -218,7 +218,7 @@ class Mutagenesis(Wizard):
+@@ -217,8 +217,8 @@ class Mutagenesis(Wizard):
+     def load_library(self):
          if self.dep == 'dep':
              if not hasattr(self,'dep_library'):
-                 self.dep_library = io.pkl.fromFile(os.environ['PYMOL_PATH']+
+-                self.dep_library = io.pkl.fromFile(os.environ['PYMOL_PATH']+
 -                                           "/data/chempy/sidechains/sc_bb_dep.pkl")
++                self.dep_library = io.pkl.fromFile(os.environ['PYMOL_DATA']+
 +                                           "/chempy/sidechains/sc_bb_dep.pkl")
              
      def set_mode(self,mode):