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 1Pv9R3-0004th-LE for garchives@archives.gentoo.org; Thu, 03 Mar 2011 14:23:21 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E545BE0230; Thu, 3 Mar 2011 14:23:14 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 951F8E0230 for ; Thu, 3 Mar 2011 14:23:14 +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 5F92C1B416A for ; Thu, 3 Mar 2011 14:23:13 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id C2CEE8006A for ; Thu, 3 Mar 2011 14:23:12 +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-lidia.patch X-VCS-Directories: sci-chemistry/coot/files/ sci-chemistry/coot/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: d8acffbbf1110c82aa11ddd40293d5d76c24037d Date: Thu, 3 Mar 2011 14:23:12 +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: f34186d001893f5708cef1c82a03bfb6 commit: d8acffbbf1110c82aa11ddd40293d5d76c24037d Author: Justin Lecher gentoo org> AuthorDate: Thu Mar 3 13:59:59 2011 +0000 Commit: Justin Lecher gentoo org> CommitDate: Thu Mar 3 13:59:59 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/sci.git;a=3Dc= ommit;h=3Dd8acffbb Coot live fixes (Portage version: 2.2.0_alpha26/git/Linux x86_64, signed Manifest commit = with key 70EB7916) --- sci-chemistry/coot/ChangeLog | 4 ++++ sci-chemistry/coot/coot-9999.ebuild | 5 +++-- sci-chemistry/coot/files/9999-lidia.patch | 13 +++++++------ 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/sci-chemistry/coot/ChangeLog b/sci-chemistry/coot/ChangeLog index 954daf8..d02adf0 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 + 03 Mar 2011; Justin Lecher files/9999-lidia.patch, + coot-9999.ebuild: + Coot live fixes + 20 Jan 2011; Justin Lecher coot-9999.ebuild: Fix tests =20 diff --git a/sci-chemistry/coot/coot-9999.ebuild b/sci-chemistry/coot/coo= t-9999.ebuild index f957107..d12f36d 100644 --- a/sci-chemistry/coot/coot-9999.ebuild +++ b/sci-chemistry/coot/coot-9999.ebuild @@ -37,10 +37,10 @@ SCIDEPS=3D" =20 XDEPS=3D" gnome-base/libgnomecanvas - gnome-base/librsvg + gnome-base/librsvg:2 media-libs/libpng media-libs/freeglut - >=3Dx11-libs/gtk+-2.2 + x11-libs/gtk+:2 x11-libs/goocanvas x11-libs/gtkglext" =20 @@ -71,6 +71,7 @@ pkg_setup() { } =20 PATCHES=3D( + "${FILESDIR}"/${PV}-lidia.patch "${FILESDIR}"/${PV}-goocanvas.patch "${FILESDIR}"/${PV}-clipper.patch "${FILESDIR}"/${PV}-include.patch diff --git a/sci-chemistry/coot/files/9999-lidia.patch b/sci-chemistry/co= ot/files/9999-lidia.patch index 2ac3fcc..5b5039c 100644 --- a/sci-chemistry/coot/files/9999-lidia.patch +++ b/sci-chemistry/coot/files/9999-lidia.patch @@ -1,16 +1,17 @@ Index: lbg/Makefile.am =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 ---- lbg/Makefile.am (revision 3299) +--- lbg/Makefile.am (revision 3406) +++ lbg/Makefile.am (working copy) -@@ -24,6 +24,11 @@ - lbg-search.cc some-coot-utils.cc residue-circles.cc rdkit-interface= .cc \ +@@ -25,6 +25,12 @@ + lbg-search.cc residue-circles.cc rdkit-interface.cc \ flev-annotations.cc =20 +libcoot_lidia_la_LIBADD =3D \ + $(top_builddir)/coot-utils/libcoot-coord-utils.la \ + $(top_builddir)/lidia-core/libcoot-lidia-core.la \ -+ $(GSL_LIBS) $(GTK_LIBS) $(GOOCANVAS_LIBS) ++ $(top_builddir)/geometry/libcoot-geometry.la \ ++ $(GTK_LIBS) $(GSL_LIBS) $(GOOCANVAS_LIBS) + - lidia_SOURCES =3D lidia-main.cc + lidia_SOURCES =3D lidia-main.cc lbg-callbacks-outer.cc =20 - # some-coot-utils.hh needed? + include_HEADERS =3D lbg.hh wmolecule.hh rdkit-interface.hh flev-annotat= ions.hh=20