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

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

commit:     d8acffbbf1110c82aa11ddd40293d5d76c24037d
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Thu Mar  3 13:59:59 2011 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Mar  3 13:59:59 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=d8acffbb

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: $
 
+  03 Mar 2011; Justin Lecher <jlec@gentoo.org> files/9999-lidia.patch,
+  coot-9999.ebuild:
+  Coot live fixes
+
   20 Jan 2011; Justin Lecher <jlec@gentoo.org> coot-9999.ebuild:
   Fix tests
 

diff --git a/sci-chemistry/coot/coot-9999.ebuild b/sci-chemistry/coot/coot-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="
 
 XDEPS="
 	gnome-base/libgnomecanvas
-	gnome-base/librsvg
+	gnome-base/librsvg:2
 	media-libs/libpng
 	media-libs/freeglut
-	>=x11-libs/gtk+-2.2
+	x11-libs/gtk+:2
 	x11-libs/goocanvas
 	x11-libs/gtkglext"
 
@@ -71,6 +71,7 @@ pkg_setup() {
 }
 
 PATCHES=(
+	"${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/coot/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
 ===================================================================
---- 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
  
 +libcoot_lidia_la_LIBADD = \
 +	$(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 = lidia-main.cc
+ lidia_SOURCES = lidia-main.cc lbg-callbacks-outer.cc
  
- # some-coot-utils.hh needed?
+ include_HEADERS = lbg.hh wmolecule.hh rdkit-interface.hh flev-annotations.hh