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 1QS3Rg-0001rA-9p for garchives@archives.gentoo.org; Thu, 02 Jun 2011 08:40:00 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 609631C026; Thu, 2 Jun 2011 08:39:53 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 229591C026 for ; Thu, 2 Jun 2011 08:39:53 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E6CB41B401A for ; Thu, 2 Jun 2011 08:39:51 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 1AF4980506 for ; Thu, 2 Jun 2011 08:39:51 +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: <065a95be5ffc0c5b37c5f7b6b8aa89271247ab12.jlec@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-chemistry/coot/files/, sci-chemistry/coot/ X-VCS-Repository: proj/sci X-VCS-Files: sci-chemistry/coot/ChangeLog sci-chemistry/coot/coot-9999.ebuild sci-chemistry/coot/files/9999-align.patch X-VCS-Directories: sci-chemistry/coot/files/ sci-chemistry/coot/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: 065a95be5ffc0c5b37c5f7b6b8aa89271247ab12 Date: Thu, 2 Jun 2011 08:39:51 +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: X-Archives-Hash: ec8d9e15f7653df0a023ebfc59884729 commit: 065a95be5ffc0c5b37c5f7b6b8aa89271247ab12 Author: Justin Lecher gentoo org> AuthorDate: Thu Jun 2 08:39:46 2011 +0000 Commit: Justin Lecher gentoo org> CommitDate: Thu Jun 2 08:39:46 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/sci.git;a=3Dc= ommit;h=3D065a95be Fixes for latest HEAD (Portage version: 2.2.0_alpha37/git/Linux x86_64, signed Manifest commit = with key 70EB7916) --- sci-chemistry/coot/ChangeLog | 4 ++++ sci-chemistry/coot/coot-9999.ebuild | 1 + sci-chemistry/coot/files/9999-align.patch | 29 +++++++++++++++++++++++= ++++++ 3 files changed, 34 insertions(+), 0 deletions(-) diff --git a/sci-chemistry/coot/ChangeLog b/sci-chemistry/coot/ChangeLog index 61ad2d8..30aec2f 100644 --- a/sci-chemistry/coot/ChangeLog +++ b/sci-chemistry/coot/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ =20 + 02 Jun 2011; Justin Lecher +files/9999-align.patch, + coot-9999.ebuild: + Fixes for latest HEAD + 28 May 2011; Justin Lecher -files/9999-clipper.patch= , files/9999-lidia.patch, coot-9999.ebuild: Cleaned for current HEAD diff --git a/sci-chemistry/coot/coot-9999.ebuild b/sci-chemistry/coot/coo= t-9999.ebuild index bfeee1e..c6c8953 100644 --- a/sci-chemistry/coot/coot-9999.ebuild +++ b/sci-chemistry/coot/coot-9999.ebuild @@ -75,6 +75,7 @@ PATCHES=3D( "${FILESDIR}"/${PV}-goocanvas.patch "${FILESDIR}"/${PV}-include.patch "${FILESDIR}"/${PV}-gl.patch + "${FILESDIR}"/${PV}-align.patch ) =20 src_unpack() { diff --git a/sci-chemistry/coot/files/9999-align.patch b/sci-chemistry/co= ot/files/9999-align.patch new file mode 100644 index 0000000..17e5787 --- /dev/null +++ b/sci-chemistry/coot/files/9999-align.patch @@ -0,0 +1,29 @@ +Index: src/c-interface-mutate.cc +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D +--- src/c-interface-mutate.cc (revision 3528) ++++ src/c-interface-mutate.cc (working copy) +@@ -292,7 +292,9 @@ + PyObject *r =3D Py_False; + if (is_valid_model_molecule(imol)) { + std::pair p =3D=20 +- graphics_info_t::molecules[imol].find_terminal_residue_type(chain_id,= resno); ++ graphics_info_t::molecules[imol].find_terminal_residue_type(chain_id,= resno, ++ graphics_info_t::alignment_wgap, ++ graphics_info_t::alignment_wspace); + if (p.first) { + r =3D PyString_FromString(p.second.c_str()); + } +Index: src/c-interface-validate.cc +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D +--- src/c-interface-validate.cc (revision 3528) ++++ src/c-interface-validate.cc (working copy) +@@ -1653,7 +1653,8 @@ +=20 + if (is_valid_model_molecule(imol)) { + std::pair > ar =3D=20 +- graphics_info_t::molecules[imol].residue_mismatches(); ++ graphics_info_t::molecules[imol].residue_mismatches(graphics_in= fo_t::alignment_wgap, ++ graphics_info_t::alignment_wspace); + if (ar.first) + r =3D PyList_New(0); + for (unsigned int ir=3D0; ir