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

[Justin Lecher]

commit:     55eb436710074770a07f4822d28117a12f6db822
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sat May 28 10:42:56 2011 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sat May 28 10:42:56 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=55eb4367

Cleaned for current HEAD

(Portage version: 2.2.0_alpha37/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-clipper.patch |    9 ------
 sci-chemistry/coot/files/9999-lidia.patch   |   37 ++++++++------------------
 4 files changed, 16 insertions(+), 35 deletions(-)

diff --git a/sci-chemistry/coot/ChangeLog b/sci-chemistry/coot/ChangeLog
index 07b2eb3..61ad2d8 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 May 2011; Justin Lecher <jlec@g.o> -files/9999-clipper.patch,
+  files/9999-lidia.patch, coot-9999.ebuild:
+  Cleaned for current HEAD
+
   02 May 2011; Justin Lecher <jlec@g.o> coot-9999.ebuild:
   Fix x11-libs/goocanvas SLOT
 

diff --git a/sci-chemistry/coot/coot-9999.ebuild b/sci-chemistry/coot/coot-9999.ebuild
index 67b679f..bfeee1e 100644
--- a/sci-chemistry/coot/coot-9999.ebuild
+++ b/sci-chemistry/coot/coot-9999.ebuild
@@ -73,7 +73,6 @@ pkg_setup() {
 PATCHES=(
 	"${FILESDIR}"/${PV}-lidia.patch
 	"${FILESDIR}"/${PV}-goocanvas.patch
-	"${FILESDIR}"/${PV}-clipper.patch
 	"${FILESDIR}"/${PV}-include.patch
 	"${FILESDIR}"/${PV}-gl.patch
 	)

diff --git a/sci-chemistry/coot/files/9999-clipper.patch b/sci-chemistry/coot/files/9999-clipper.patch
deleted file mode 100644
index e3f028f..0000000
--- a/sci-chemistry/coot/files/9999-clipper.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-Index: lidia-core/Makefile.am
-===================================================================
---- lidia-core/Makefile.am	(revision 3299)
-+++ lidia-core/Makefile.am	(working copy)
-@@ -23,3 +23,4 @@
- 
- libcoot_lidia_core_la_SOURCES = lbg-molfile.cc lig-build.cc
- 
-+libcoot_lidia_core_la_LIBADD = $(CLIPPER_LIBS)

diff --git a/sci-chemistry/coot/files/9999-lidia.patch b/sci-chemistry/coot/files/9999-lidia.patch
index 0ca154c..2076513 100644
--- a/sci-chemistry/coot/files/9999-lidia.patch
+++ b/sci-chemistry/coot/files/9999-lidia.patch
@@ -1,28 +1,15 @@
-Index: lbg/Makefile.am
-===================================================================
---- lbg/Makefile.am	(revision 3478)
-+++ lbg/Makefile.am	(working copy)
-@@ -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 \
-+	$(top_builddir)/lidia-core/libcoot-lidia-core.la \
-+	$(top_builddir)/geometry/libcoot-geometry.la \
-+	$(GTK_LIBS) $(GSL_LIBS) $(GOOCANVAS_LIBS)
+ lidia-core/Makefile.am |    4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/lidia-core/Makefile.am b/lidia-core/Makefile.am
+index 17d468d..78bf054 100644
+--- a/lidia-core/Makefile.am
++++ b/lidia-core/Makefile.am
+@@ -34,3 +34,7 @@ libcoot_lidia_core_la_SOURCES = lbg-molfile.cc lig-build.cc
+ # test_molfile_SOURCES: test-molfile.cc
+ 
+ # test_molfile_LDADD: libcoot-lidia-core.la
 +
- 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)
++	$(MMDB_LIBS) $(CLIPPER_LIBS)