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 1QWx2v-0005Fg-MH for garchives@archives.gentoo.org; Wed, 15 Jun 2011 20:50:42 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9675B1C0B7; Wed, 15 Jun 2011 20:50:32 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 544411C0AA for ; Wed, 15 Jun 2011 20:50:32 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 866D61B4001 for ; Wed, 15 Jun 2011 20:50:31 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id D409B8003C for ; Wed, 15 Jun 2011 20:50:25 +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: 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: df5c5e7ff841c1a20bb841e5c4da4dc398cfe9bc Date: Wed, 15 Jun 2011 20:50:25 +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: 14d11934eda9838ff68bafc9fbaa464e commit: df5c5e7ff841c1a20bb841e5c4da4dc398cfe9bc Author: Justin Lecher gentoo org> AuthorDate: Wed Jun 15 15:24:51 2011 +0000 Commit: Justin Lecher gentoo org> CommitDate: Wed Jun 15 15:24:51 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/sci.git;a=3Dc= ommit;h=3Ddf5c5e7f Updated to current HEAD (Portage version: 2.2.0_alpha41/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, 4 insertions(+), 30 deletions(-) diff --git a/sci-chemistry/coot/ChangeLog b/sci-chemistry/coot/ChangeLog index 30aec2f..2d688c2 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 + 15 Jun 2011; Justin Lecher -files/9999-align.patch, + coot-9999.ebuild: + Updated to current HEAD + 02 Jun 2011; Justin Lecher +files/9999-align.patch, coot-9999.ebuild: Fixes for latest HEAD diff --git a/sci-chemistry/coot/coot-9999.ebuild b/sci-chemistry/coot/coo= t-9999.ebuild index c6c8953..bfeee1e 100644 --- a/sci-chemistry/coot/coot-9999.ebuild +++ b/sci-chemistry/coot/coot-9999.ebuild @@ -75,7 +75,6 @@ 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 deleted file mode 100644 index 17e5787..0000000 --- a/sci-chemistry/coot/files/9999-align.patch +++ /dev/null @@ -1,29 +0,0 @@ -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