From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SDBKk-0000Uc-1J for garchives@archives.gentoo.org; Thu, 29 Mar 2012 09:07:54 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4F9E7E0CEE; Thu, 29 Mar 2012 09:07:27 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 12EE0E0CEE for ; Thu, 29 Mar 2012 09:07:26 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B76A81B401B for ; Thu, 29 Mar 2012 09:07:23 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 640FBE542E for ; Thu, 29 Mar 2012 09:07:21 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1333012029.ed1028a1b6c2a45f42d1275023094d3195bd1ad9.jlec@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-chemistry/pymol/, sci-chemistry/pymol/files/ X-VCS-Repository: proj/sci X-VCS-Files: sci-chemistry/pymol/ChangeLog sci-chemistry/pymol/files/pymol-9999-data-path.patch X-VCS-Directories: sci-chemistry/pymol/ sci-chemistry/pymol/files/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: ed1028a1b6c2a45f42d1275023094d3195bd1ad9 X-VCS-Branch: master Date: Thu, 29 Mar 2012 09:07:21 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 8f4a988d-df44-4a92-83e6-078613de0f41 X-Archives-Hash: 3b54782d89d65d4a807524c6f22602e3 commit: ed1028a1b6c2a45f42d1275023094d3195bd1ad9 Author: Justin Lecher gentoo org> AuthorDate: Thu Mar 29 09:07:09 2012 +0000 Commit: Justin Lecher gentoo org> CommitDate: Thu Mar 29 09:07:09 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/sci.git;a=3Dc= ommit;h=3Ded1028a1 Import tree changes (Portage version: 2.2.0_alpha96/git/Linux x86_64, unsigned Manifest commi= t) --- 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/ChangeLo= g 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: $ =20 + 29 Mar 2012; Justin Lecher + files/pymol-9999-data-path.patch: + Import tree changes + 04 Mar 2012; Justin Lecher pymol-9999.ebuild: Block pypy usage =20 diff --git a/sci-chemistry/pymol/files/pymol-9999-data-path.patch b/sci-c= hemistry/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(-) =20 diff --git a/layer0/ShaderMgr.c b/layer0/ShaderMgr.c index cc760ae..364277f 100644 @@ -74,7 +74,7 @@ index 23dbe45..795a223 100644 path =3D os.environ['PYMOL_DATA'] + '/chempy/' elif os.environ.has_key('PYMOL_PATH'): - path =3D os.environ['PYMOL_PATH'] + '/data/chempy/' =20 -+ path =3D os.environ['PYMOL_PATH'] + '/chempy/' =20 ++ path =3D os.environ['PYMOL_PATH'] + '/chempy/' elif os.environ.has_key('FREEMOL_MODULES'): path =3D 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): + =20 self.dep =3D default_dep =20 - self.ind_library =3D io.pkl.fromFile(os.environ['PYMOL_PATH']+ +- self.ind_library =3D io.pkl.fromFile(os.environ['PYMOL_PATH']+ - "/data/chempy/sidechains/sc_= bb_ind.pkl") ++ self.ind_library =3D io.pkl.fromFile(os.environ['PYMOL_DATA']+ + "/chempy/sidechains/sc_bb_in= d.pkl") self.load_library() self.status =3D 0 # 0 no selection, 1 mutagenizing self.bump_check =3D 1 -@@ -218,7 +218,7 @@ class Mutagenesis(Wizard): +@@ -217,8 +217,8 @@ class Mutagenesis(Wizard): + def load_library(self): if self.dep =3D=3D 'dep': if not hasattr(self,'dep_library'): - self.dep_library =3D io.pkl.fromFile(os.environ['PYMOL_= PATH']+ +- self.dep_library =3D io.pkl.fromFile(os.environ['PYMOL_= PATH']+ - "/data/chempy/sidechains/sc_= bb_dep.pkl") ++ self.dep_library =3D io.pkl.fromFile(os.environ['PYMOL_= DATA']+ + "/chempy/sidechains/sc_bb_de= p.pkl") =20 def set_mode(self,mode):