Imported changes from tree

(Portage version: 2.2.0_alpha41/git/Linux x86_64, signed Manifest commit with key 70EB7916)

3 files changed, 51 insertions, 0 deletions

diff --git a/sci-chemistry/coot/files/9999-clipper-config.patch b/sci-chemistry/coot/files/9999-clipper-config.patch
new file mode 100644
index 000000000..311b5e88d
--- /dev/null
+++ b/sci-chemistry/coot/files/9999-clipper-config.patch
@@ -0,0 +1,17 @@
+ macros/clipper.m4 |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/macros/clipper.m4 b/macros/clipper.m4
+index 0bf087a..d0e8b6b 100644
+--- a/macros/clipper.m4
++++ b/macros/clipper.m4
+@@ -98,6 +98,9 @@ case $ac_cv_build_alias in
+         ;;
+ esac
+ 
++CLIPPER_CXXFLAGS=`clipper-config --cflags`
++CLIPPER_LDOPTS=`clipper-config --libs`
++
+ AC_MSG_CHECKING([for Clipper])
+ 
+ 	LIBS="$save_LIBS $CLIPPER_LDOPTS"
diff --git a/sci-chemistry/coot/files/9999-mmdb-config.patch b/sci-chemistry/coot/files/9999-mmdb-config.patch
new file mode 100644
index 000000000..1d7cbd452
--- /dev/null
+++ b/sci-chemistry/coot/files/9999-mmdb-config.patch
@@ -0,0 +1,18 @@
+ macros/mmdb.m4 |    4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/macros/mmdb.m4 b/macros/mmdb.m4
+index b477597..d05cf66 100644
+--- a/macros/mmdb.m4
++++ b/macros/mmdb.m4
+@@ -86,6 +86,10 @@ else
+  ac_MMDB_LDOPTS="-lmmdb -lm"
+ fi
+ 
++PKG_CHECK_MODULES([MMDB],[mmdb >= 1.2])
++ac_MMDB_LDOPTS="${MMDB_LIBS}"
++ac_MMDB_CXXFLAGS="${MMDB_CFLAGS}"
++
+ AC_MSG_CHECKING([for MMDB])
+ 
+ 	LIBS="$save_LIBS $ac_MMDB_LDOPTS"
diff --git a/sci-chemistry/coot/files/9999-test.patch b/sci-chemistry/coot/files/9999-test.patch
new file mode 100644
index 000000000..8cb79e65d
--- /dev/null
+++ b/sci-chemistry/coot/files/9999-test.patch
@@ -0,0 +1,16 @@
+ src/testing.cc |    4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+
+diff --git a/src/testing.cc b/src/testing.cc
+index f767bf6..097b9b9 100644
+--- a/src/testing.cc
++++ b/src/testing.cc
+@@ -86,6 +86,8 @@ std::string greg_test(const std::string &file_name) {
+    const char *c = getenv("COOT_TEST_DATA_DIR");
+    if (c) {
+       dd = c;
++      dd += "/";
++      dd += file_name;
+    } else { 
+       const char *d = getenv("HOME");
+       if (d) {