aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Junghans <ottxor@gentoo.org>2012-02-27 19:21:03 -0700
committerChristoph Junghans <ottxor@gentoo.org>2012-02-27 19:21:03 -0700
commit45189a322543c56316dde9f7b9342b4856da468d (patch)
tree7c242e16f684759e8a919e27f55a89a827872d8e /sci-chemistry
parentMerge branch 'master' of git://git.overlays.gentoo.org/proj/sci (diff)
parentsci-physics/root: fix build on non-english locales (diff)
downloadsci-45189a322543c56316dde9f7b9342b4856da468d.tar.gz
sci-45189a322543c56316dde9f7b9342b4856da468d.tar.bz2
sci-45189a322543c56316dde9f7b9342b4856da468d.zip
Merge branch 'master' of git://git.overlays.gentoo.org/proj/sci
Diffstat (limited to 'sci-chemistry')
-rw-r--r--sci-chemistry/coot/ChangeLog8
-rw-r--r--sci-chemistry/coot/coot-9999.ebuild5
-rw-r--r--sci-chemistry/coot/files/9999-include.patch12
-rw-r--r--sci-chemistry/coot/files/9999-lidia.patch15
4 files changed, 9 insertions, 31 deletions
diff --git a/sci-chemistry/coot/ChangeLog b/sci-chemistry/coot/ChangeLog
index b097d5b0d..15080873d 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@gentoo.org> -files/9999-include.patch,
+ -files/9999-lidia.patch, coot-9999.ebuild:
+ Cleaned old patches, added goocanvas config option
+
+ 25 Feb 2012; Justin Lecher <jlec@gentoo.org> -files/9999-include.patch,
+ -files/9999-lidia.patch, coot-9999.ebuild:
+ Cleaned old patches, added goocanvas config option
+
14 Jan 2012; Justin Lecher <jlec@gentoo.org> -Manifest, -Manifest:
Dropped Manifest
diff --git a/sci-chemistry/coot/coot-9999.ebuild b/sci-chemistry/coot/coot-9999.ebuild
index dd204d0aa..ec0fe5616 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 3076663db..000000000
--- 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 207651367..000000000
--- 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)