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

[Justin Lecher]

commit:     a8123cc7b89c5ab45e3b19f82a6f242aaacb2ed0
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 27 07:29:24 2012 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Feb 27 07:29:24 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=a8123cc7

Cleaned old patches, added goocanvas config option

(Portage version: 2.2.0_alpha89/git/Linux x86_64, unsigned Manifest commit)

---
 sci-chemistry/coot/ChangeLog                |    8 ++++++++
 sci-chemistry/coot/coot-9999.ebuild         |    5 +----
 sci-chemistry/coot/files/9999-include.patch |   12 ------------
 sci-chemistry/coot/files/9999-lidia.patch   |   15 ---------------
 4 files changed, 9 insertions(+), 31 deletions(-)

diff --git a/sci-chemistry/coot/ChangeLog b/sci-chemistry/coot/ChangeLog
index b097d5b..1508087 100644
--- a/sci-chemistry/coot/ChangeLog
+++ b/sci-chemistry/coot/ChangeLog
@@ -2,6 +2,14 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  27 Feb 2012; Justin Lecher <jlec@g.o> -files/9999-include.patch,
+  -files/9999-lidia.patch, coot-9999.ebuild:
+  Cleaned old patches, added goocanvas config option
+
+  25 Feb 2012; Justin Lecher <jlec@g.o> -files/9999-include.patch,
+  -files/9999-lidia.patch, coot-9999.ebuild:
+  Cleaned old patches, added goocanvas config option
+
   14 Jan 2012; Justin Lecher <jlec@g.o> -Manifest, -Manifest:
   Dropped Manifest
 

diff --git a/sci-chemistry/coot/coot-9999.ebuild b/sci-chemistry/coot/coot-9999.ebuild
index dd204d0..ec0fe56 100644
--- a/sci-chemistry/coot/coot-9999.ebuild
+++ b/sci-chemistry/coot/coot-9999.ebuild
@@ -81,9 +81,7 @@ pkg_setup() {
 
 PATCHES=(
 	"${FILESDIR}"/${PV}-clipper-config.patch
-	"${FILESDIR}"/${PV}-lidia.patch
 	"${FILESDIR}"/${PV}-goocanvas.patch
-	"${FILESDIR}"/${PV}-include.patch
 	"${FILESDIR}"/${PV}-gl.patch
 	"${FILESDIR}"/${PV}-mmdb-config.patch
 	"${FILESDIR}"/${PV}-test.patch
@@ -113,8 +111,7 @@ src_configure() {
 	# Yes, this is broken behavior.
 	local myeconfargs=(
 		--includedir='${prefix}/include/coot'
-		--with-gtkcanvas-prefix="${EPREFIX}/usr"
-		--with-gtkgl-prefix="${EPREFIX}/usr"
+		--with-goocanvas-prefix="${EPREFIX}/usr"
 		--with-guile
 		--with-python="${EPREFIX}/usr"
 		--with-guile-gtk

diff --git a/sci-chemistry/coot/files/9999-include.patch b/sci-chemistry/coot/files/9999-include.patch
deleted file mode 100644
index 3076663..0000000
--- a/sci-chemistry/coot/files/9999-include.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: lbg/Makefile.am
-===================================================================
---- lbg/Makefile.am	(revision 3219)
-+++ lbg/Makefile.am	(working copy)
-@@ -2,6 +2,7 @@
- lib_LTLIBRARIES=libcoot-lidia.la
- 
- INCLUDES = \
-+	-I$(top_srcdir)/coot-utils \
- 	-I$(top_srcdir)/lidia-core \
- 	-I$(top_srcdir)/geometry \
- 	-I$(top_srcdir)/utils \

diff --git a/sci-chemistry/coot/files/9999-lidia.patch b/sci-chemistry/coot/files/9999-lidia.patch
deleted file mode 100644
index 2076513..0000000
--- a/sci-chemistry/coot/files/9999-lidia.patch
+++ /dev/null
@@ -1,15 +0,0 @@
- 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
-+
-+libcoot_lidia_core_la_LIBADD = \
-+	$(top_builddir)/geometry/libcoot-geometry.la \
-+	$(MMDB_LIBS) $(CLIPPER_LIBS)