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 1QFkaF-0004SZ-HI for garchives@archives.gentoo.org; Fri, 29 Apr 2011 10:05:59 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7DEBD1C017; Fri, 29 Apr 2011 10:05:47 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 299571C017 for ; Fri, 29 Apr 2011 10:05:47 +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 7B7571B4084 for ; Fri, 29 Apr 2011 10:05:46 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id D995880507 for ; Fri, 29 Apr 2011 10:05:45 +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-gl.patch 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: f0c8b800774b3d554c462bd55f2901734108277a Date: Fri, 29 Apr 2011 10:05:45 +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: 5ce677e4814bb48b3a83b276a76c9170 commit: f0c8b800774b3d554c462bd55f2901734108277a Author: Justin Lecher gentoo org> AuthorDate: Thu Apr 28 08:39:59 2011 +0000 Commit: Justin Lecher gentoo org> CommitDate: Thu Apr 28 08:39:59 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/sci.git;a=3Dc= ommit;h=3Df0c8b800 Fixed underlinking problems (Portage version: 2.2.0_alpha30/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-gl.patch | 10 ++++++++++ sci-chemistry/coot/files/9999-lidia.patch | 19 +++++++++++++++---- 4 files changed, 30 insertions(+), 4 deletions(-) diff --git a/sci-chemistry/coot/ChangeLog b/sci-chemistry/coot/ChangeLog index c44d9a6..accf687 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 + 28 Apr 2011; Justin Lecher +files/9999-gl.patch, + files/9999-lidia.patch, coot-9999.ebuild: + Fixed underlinking problems + 28 Apr 2011; Justin Lecher -files/9999-gsl.patch, -files/9999-openmp.patch, -files/9999-rappermc.patch, -files/fix-namespace-error.patch, -files/glib.m4, -files/gtk.m4: diff --git a/sci-chemistry/coot/coot-9999.ebuild b/sci-chemistry/coot/coo= t-9999.ebuild index f9481c4..e8f1076 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}-clipper.patch "${FILESDIR}"/${PV}-include.patch + "${FILESDIR}"/${PV}-gl.patch ) =20 src_unpack() { diff --git a/sci-chemistry/coot/files/9999-gl.patch b/sci-chemistry/coot/= files/9999-gl.patch new file mode 100644 index 0000000..bbd858c --- /dev/null +++ b/sci-chemistry/coot/files/9999-gl.patch @@ -0,0 +1,10 @@ +Index: coot-surface/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 +--- coot-surface/Makefile.am (revision 3478) ++++ coot-surface/Makefile.am (working copy) +@@ -29,4 +29,4 @@ +=20 + libcoot_surface_la_LIBADD =3D \ + $(top_builddir)/surface/libccp4mg-surface.la \ +- $(GLUT_LIBS) $(CLIPPER_LIBS) $(MMDB_LIBS)=20 ++ $(GLUT_LIBS) $(CLIPPER_LIBS) $(MMDB_LIBS) -lGL diff --git a/sci-chemistry/coot/files/9999-lidia.patch b/sci-chemistry/co= ot/files/9999-lidia.patch index 5b5039c..0ca154c 100644 --- a/sci-chemistry/coot/files/9999-lidia.patch +++ b/sci-chemistry/coot/files/9999-lidia.patch @@ -1,10 +1,10 @@ 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 3406) +--- lbg/Makefile.am (revision 3478) +++ lbg/Makefile.am (working copy) -@@ -25,6 +25,12 @@ - lbg-search.cc residue-circles.cc rdkit-interface.cc \ - flev-annotations.cc +@@ -32,6 +32,12 @@ + $(top_builddir)/utils/libcoot-utils.la \ + $(CLIPPER_LIBS) $(MMDB_LIBS) $(GSL_LIBS) $(RDKIT_LIBS) $(GOOCANVAS_LIB= S) $(GTK_LIBS) =20 +libcoot_lidia_la_LIBADD =3D \ + $(top_builddir)/coot-utils/libcoot-coord-utils.la \ @@ -15,3 +15,14 @@ Index: lbg/Makefile.am lidia_SOURCES =3D lidia-main.cc lbg-callbacks-outer.cc =20 include_HEADERS =3D lbg.hh wmolecule.hh rdkit-interface.hh flev-annotat= ions.hh=20 +Index: lidia-core/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 +--- lidia-core/Makefile.am (revision 3478) ++++ lidia-core/Makefile.am (working copy) +@@ -29,3 +29,6 @@ +=20 + libcoot_lidia_core_la_SOURCES =3D lbg-molfile.cc lig-build.cc +=20 ++libcoot_lidia_core_la_LIBADD =3D \ ++ $(top_builddir)/geometry/libcoot-geometry.la \ ++ $(MMDB_LIBS)