Fix for invalid python syntax

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
RepoMan-Options: --force

4 files changed, 33 insertions, 8 deletions

diff --git a/sci-libs/cctbx/ChangeLog b/sci-libs/cctbx/ChangeLog
index dfcfedf8784f..54dcf0c226c8 100644
--- a/sci-libs/cctbx/ChangeLog
+++ b/sci-libs/cctbx/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-libs/cctbx
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/cctbx/ChangeLog,v 1.5 2010/06/28 16:09:22 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cctbx/ChangeLog,v 1.6 2010/07/03 07:16:02 jlec Exp $
+
+*cctbx-2010.03.29.2334-r1 (03 Jul 2010)
+
+  03 Jul 2010; Justin Lecher <jlec@gentoo.org>
+  +files/2010.03.29.2334-tst_server.py.patch, -cctbx-2010.03.29.2334.ebuild,
+  +cctbx-2010.03.29.2334-r1.ebuild:
+  Fix for invalid python syntax
 
   28 Jun 2010; Christoph Mende <angelos@gentoo.org>
   cctbx-2010.03.29.2334.ebuild:
diff --git a/sci-libs/cctbx/Manifest b/sci-libs/cctbx/Manifest
index c0aabc8c41ff..f91bda9fe3a1 100644
--- a/sci-libs/cctbx/Manifest
+++ b/sci-libs/cctbx/Manifest
@@ -1,16 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
+AUX 2010.03.29.2334-tst_server.py.patch 774 RMD160 12e1115b2ccc0b6b01b365925bf311d29ef08c7a SHA1 09549cc6103f502777acced13a3ed483d713dfc0 SHA256 df058d16d2dc5beaac9f1a1fbf2e640994c7e881d449eb01ac338dadbfb15ac3
 DIST cctbx-2009.11.01.0123.tar.gz 14604079 RMD160 77cc84d4b9e35e7a87f807d8669efb939b2e82ce SHA1 7db71a62786b82f47999919a9411938b123d5b4d SHA256 31e7f79424360f963c6eae528a9d289db4b53c1f7fe4aa9de71201e9d14bc5af
 DIST cctbx-2010.03.29.2334.tar.gz 15570372 RMD160 e543578dbe6568f5f8f80b3ce7a20b10e01193bc SHA1 1442dbd5d1ef3b91e718dce039a24fc1637104d3 SHA256 e1fae804caaf8593c7a3f32e4544046f4c00293063d9099721578cc8fbd17213
 EBUILD cctbx-2009.11.01.0123-r1.ebuild 5840 RMD160 df6c57d186ac192de34afa2bf30be70db60677a1 SHA1 984899e01ffcb2b527e4c1c0126d0afa2ebd8038 SHA256 b2b21d5fb452789edcd35eb3828b94dc9d92e96105a7d0f110f566b6a801e66b
-EBUILD cctbx-2010.03.29.2334.ebuild 5926 RMD160 74eea196f2d5461ecaf5eca4337e2ff7292e5e70 SHA1 4ec2997ef02b89e99316627fd84ee58a9619c89d SHA256 c324f43178dda3b7756aef5a33aece8801d20e13ecc7ebcd60182ca35827f3cf
-MISC ChangeLog 1132 RMD160 45f402dca55ae81d3a4f4f42fc17264cd3cfdec1 SHA1 514feac914d510cf4c106e2513db154ac9de9186 SHA256 648de68b4ac201876d144ecbc79192271c2a2721d95e3abcdd5dc95d0a0e9ebe
+EBUILD cctbx-2010.03.29.2334-r1.ebuild 5975 RMD160 98b2ba0f894bcb003d21ef5d53b5cf7bd619aa8a SHA1 4537c1c2249af3deee68acaf0417844877f6a8a1 SHA256 01825d4dfe20481cdfc7ca86124b22204b0ac3b553b99d0e8e82da7ee11a38f1
+MISC ChangeLog 1363 RMD160 415ffd1e5cd36be0ee747c3190e65f326b169b47 SHA1 0a153969da2b991a20de1a41d18366c9b07db17c SHA256 2f1031bc98efd0920b5414fc0992999fc86198d846f2a12ebfad3d9c0dbce86d
 MISC metadata.xml 767 RMD160 c2fc3bcc534e407e6066ee98beb6878d78a0f6e9 SHA1 a653677e160cf0726e1747b06b5d0cd95e51ac5f SHA256 ef36fc1a1d5d657ba67f88b303f08eef5a1a814d22a2091c07616dc16928e3fa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iF4EAREIAAYFAkwoyVEACgkQmWq1bYTyC0NoIAD9GmMQRFOqGIwNqwGUw3BXyG4K
-FWnCYQAIyocBXm34CmMBAI29wck9H8QilATx/T8Q7Y0MIJ8cOt5c/1ofZ0odcb7Y
-=VcnM
+iEYEARECAAYFAkwu47cACgkQgAnW8HDreRbuHwCeLaXJJ36g970tSQP0n/sDSdBu
+oH8An3jrox5lzOVixpyTmgwM0MiEfjP0
+=WG6j
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/cctbx/cctbx-2010.03.29.2334.ebuild b/sci-libs/cctbx/cctbx-2010.03.29.2334-r1.ebuild
index a8056761614d..df4d0ca01aba 100644
--- a/sci-libs/cctbx/cctbx-2010.03.29.2334.ebuild
+++ b/sci-libs/cctbx/cctbx-2010.03.29.2334-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/cctbx/cctbx-2010.03.29.2334.ebuild,v 1.4 2010/06/28 16:09:22 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cctbx/cctbx-2010.03.29.2334-r1.ebuild,v 1.1 2010/07/03 07:16:02 jlec Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -48,6 +48,8 @@ src_prepare() {
 	local opts
 	local optsld
 
+	epatch "${FILESDIR}"/${PV}-tst_server.py.patch
+
 	rm -rf "${MY_S}/scons"
 
 	mkdir -p "${MY_S}"/scons/src/ "${MY_S}/boost"
diff --git a/sci-libs/cctbx/files/2010.03.29.2334-tst_server.py.patch b/sci-libs/cctbx/files/2010.03.29.2334-tst_server.py.patch
new file mode 100644
index 000000000000..f6509260d313
--- /dev/null
+++ b/sci-libs/cctbx/files/2010.03.29.2334-tst_server.py.patch
@@ -0,0 +1,15 @@
+diff --git a/mmtbx/monomer_library/tst_server.py b/mmtbx/monomer_library/tst_server.py
+index 519d203..91ba783 100644
+--- cctbx_sources/mmtbx/monomer_library/tst_server.py
++++ cctbx_sources/mmtbx/monomer_library/tst_server.py
+@@ -86,8 +86,8 @@ def exercise():
+     for base_code in ["A", "C", "G"]:
+       rna_atoms = srv.get_comp_comp_id_direct(base_code+"r").atom_dict()
+       dna_atoms = srv.get_comp_comp_id_direct(base_code+"d").atom_dict()
+-      for as,bs,c in [(rna_atoms,dna_atoms,"d"), (dna_atoms,rna_atoms,"r")]:
+-        for a in as.keys():
++      for as_,bs,c in [(rna_atoms,dna_atoms,"d"), (dna_atoms,rna_atoms,"r")]:
++        for a in as_.keys():
+           b = bs.get(a, None)
+           if (b is None):
+             print "Not in %s: %s" % (base_code+c, a)