aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2011-05-28 12:42:56 +0200
committerJustin Lecher <jlec@gentoo.org>2011-05-28 12:42:56 +0200
commit55eb436710074770a07f4822d28117a12f6db822 (patch)
tree17809f58f69dacf22d48df6f2d40aecd3048825a /sci-chemistry/coot/files
parentSandbox fix (diff)
downloadsci-55eb436710074770a07f4822d28117a12f6db822.tar.gz
sci-55eb436710074770a07f4822d28117a12f6db822.tar.bz2
sci-55eb436710074770a07f4822d28117a12f6db822.zip
Cleaned for current HEAD
(Portage version: 2.2.0_alpha37/git/Linux x86_64, signed Manifest commit with key 70EB7916)
Diffstat (limited to 'sci-chemistry/coot/files')
-rw-r--r--sci-chemistry/coot/files/9999-clipper.patch9
-rw-r--r--sci-chemistry/coot/files/9999-lidia.patch37
2 files changed, 12 insertions, 34 deletions
diff --git a/sci-chemistry/coot/files/9999-clipper.patch b/sci-chemistry/coot/files/9999-clipper.patch
deleted file mode 100644
index e3f028f98..000000000
--- 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 0ca154c96..207651367 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)