[gentoo-commits] proj/sci:master commit in: sci-chemistry/coot/files/, sci-chemistry/coot/

["Justin Lecher" <jlec@gentoo.org>]

commit:     f0c8b800774b3d554c462bd55f2901734108277a
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 28 08:39:59 2011 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Apr 28 08:39:59 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=f0c8b800

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: $
 
+  28 Apr 2011; Justin Lecher <jlec@gentoo.org> +files/9999-gl.patch,
+  files/9999-lidia.patch, coot-9999.ebuild:
+  Fixed underlinking problems
+
   28 Apr 2011; Justin Lecher <jlec@gentoo.org> -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/coot-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=(
 	"${FILESDIR}"/${PV}-goocanvas.patch
 	"${FILESDIR}"/${PV}-clipper.patch
 	"${FILESDIR}"/${PV}-include.patch
+	"${FILESDIR}"/${PV}-gl.patch
 	)
 
 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
+===================================================================
+--- coot-surface/Makefile.am	(revision 3478)
++++ coot-surface/Makefile.am	(working copy)
+@@ -29,4 +29,4 @@
+ 
+ libcoot_surface_la_LIBADD = \
+ 	$(top_builddir)/surface/libccp4mg-surface.la \
+-	$(GLUT_LIBS) $(CLIPPER_LIBS) $(MMDB_LIBS) 
++	$(GLUT_LIBS) $(CLIPPER_LIBS) $(MMDB_LIBS) -lGL

diff --git a/sci-chemistry/coot/files/9999-lidia.patch b/sci-chemistry/coot/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
 ===================================================================
---- 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_LIBS) $(GTK_LIBS)
  
 +libcoot_lidia_la_LIBADD = \
 +	$(top_builddir)/coot-utils/libcoot-coord-utils.la \
@@ -15,3 +15,14 @@ Index: lbg/Makefile.am
  lidia_SOURCES = lidia-main.cc lbg-callbacks-outer.cc
  
  include_HEADERS = lbg.hh wmolecule.hh rdkit-interface.hh flev-annotations.hh 
+Index: lidia-core/Makefile.am
+===================================================================
+--- lidia-core/Makefile.am	(revision 3478)
++++ lidia-core/Makefile.am	(working copy)
+@@ -29,3 +29,6 @@
+ 
+ libcoot_lidia_core_la_SOURCES = lbg-molfile.cc lig-build.cc
+ 
++libcoot_lidia_core_la_LIBADD = \
++	$(top_builddir)/geometry/libcoot-geometry.la \
++	$(MMDB_LIBS)