diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2010-07-03 07:16:02 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2010-07-03 07:16:02 +0000 |
| commit | 85db8de1df8298224900ec42599ab7b18beda7b3 (patch) | |
| tree | 3c1d2dce066dbeff062f4eeac8677810a8226aa1 /sci-libs/cctbx | |
| parent | Block File Collisions (diff) | |
| download | gentoo-2-85db8de1df8298224900ec42599ab7b18beda7b3.tar.gz gentoo-2-85db8de1df8298224900ec42599ab7b18beda7b3.tar.bz2 gentoo-2-85db8de1df8298224900ec42599ab7b18beda7b3.zip | |
Fix for invalid python syntax
(Portage version: 2.2_rc67/cvs/Linux x86_64, RepoMan options: --force)
Diffstat (limited to 'sci-libs/cctbx')
| -rw-r--r-- | sci-libs/cctbx/ChangeLog | 9 | ||||
| -rw-r--r-- | sci-libs/cctbx/cctbx-2010.03.29.2334-r1.ebuild (renamed from sci-libs/cctbx/cctbx-2010.03.29.2334.ebuild) | 4 | ||||
| -rw-r--r-- | sci-libs/cctbx/files/2010.03.29.2334-tst_server.py.patch | 15 |
3 files changed, 26 insertions, 2 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/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) |