Adopt to unbundled ssm

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

4 files changed, 69 insertions, 7 deletions

diff --git a/sci-chemistry/coot/ChangeLog b/sci-chemistry/coot/ChangeLog
index 50444a3ca..7f7c6e467 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: $
 
+  16 Jul 2011; Justin Lecher <jlec@gentoo.org> +files/9999-ssm.patch,
+  coot-9999.ebuild:
+  Adopt to unbundled ssm
+
   15 Jul 2011; Justin Lecher <jlec@gentoo.org> files/9999-mmdb-config.patch:
   Mmdb fix
 
diff --git a/sci-chemistry/coot/Manifest b/sci-chemistry/coot/Manifest
index 9e7cd6679..df9f5aff9 100644
--- a/sci-chemistry/coot/Manifest
+++ b/sci-chemistry/coot/Manifest
@@ -7,15 +7,16 @@ AUX 9999-goocanvas.patch 702 RMD160 9b26975eb658f15dfd806e47be9c11bcb7f850db SHA
 AUX 9999-include.patch 345 RMD160 6e42ce2afa7141f9cdcda0ca3ea5a11ef4f0f15f SHA1 3df3955307115ed8527f55fb49452905991c36cc SHA256 07b61fb298da857c5c37abb492cf192c65f9b538a3fc2d316aca7f4269e25a75
 AUX 9999-lidia.patch 518 RMD160 bc1ac82f5d0e1c51f5cebaceb758ca306ea638d9 SHA1 7eb4f7e08ab0aea2f94d2ef27f26fc2aa796f21e SHA256 4b0cc3ed5a0a21cc9af5c2148779a6b82d2ad555720843af237efe0a3cc15be8
 AUX 9999-mmdb-config.patch 479 RMD160 8026b5420940726547200e51db7ce82d7706702c SHA1 e1b1c9ea87fdb2fa5d6c7301d397986d6a9afc4a SHA256 0b7d61f9c5f9664672286e82a790d4dea1673ed1537ef62b59142ced97685d82
+AUX 9999-ssm.patch 1276 RMD160 8c7eef0034efc2c57bd774fe8ebb1bd0ba9c7aa2 SHA1 8812f35fba16a45b21ecce5243fd26d6105e29e3 SHA256 42f1098b0d56f85125293ca24410061e7a9bee10c94ba6e9fd3496439368bf75
 AUX 9999-test.patch 457 RMD160 1a3e0956d8b7f051fdd964524c0ba9eabf8c2aca SHA1 a8f9584be09cc58e7cb55801115e9649b05aa910 SHA256 494ef09e407c3047145c250c70b90c7679a1c5b9f84c57a680e40580bd980397
-DIST greg-data.tar.gz 8044590 RMD160 65bc3006c121748d20ad0f268093002fcee99ede SHA1 7fbb80fe467ee059f8c6f634be8d8c2df62ead36 SHA256 0e82a373c4694cfa4c05820f6fd69436e9bdb594e665a448458d33680a1d931b
-EBUILD coot-9999.ebuild 4187 RMD160 6c0cfa176f55078f2dcede25d570e9294eb60173 SHA1 64293e37406b4c075a2498f3ce004fa604ec26ff SHA256 706dae8547408c9613d3546252e6ccf81d0f71f84c834efccf0bbcda16b4a648
-MISC ChangeLog 10334 RMD160 063d9898b19ef2bc12d65264c2d5ff33fdadc0c5 SHA1 46d22bdd722102edc285ed541a1f0b04610eec82 SHA256 02df8486e0b05b8697201d37c6986590ba66a69761533f96802fd5eb02064b66
+DIST greg-data.tar.gz 8044588 RMD160 3613c453ddc3d7f7cfb9e018a82d0f7581b05038 SHA1 d0a5f6f024fc08087620ab0c83747cc66e3cd436 SHA256 6dbb4edfa6d00a1b27ebbcc1c98b95abd041653fdb4521ca3c14e0000eec8b4c
+EBUILD coot-9999.ebuild 4190 RMD160 4b1fed17901575b6762f20b287e6b45e39687973 SHA1 55f02812ab2b7cf7e7ba022772ee812831fcf149 SHA256 0cc0ee6cd568a28a8e3b83594c07dc79996ed329cdfe5616fd4c4068405fbffa
+MISC ChangeLog 10450 RMD160 1a47936b2c3a2ebf9b9c5d970ef081b309cd478d SHA1 1440ade284008acf1fd30ca2f89f401546cbefe3 SHA256 f778a13ca3c564b3ff2ac3924dfb25131689987719c47e8f4121360ab25a3a18
 MISC metadata.xml 309 RMD160 62b0b67572300bd5b40f1ac76c9e198b1b241391 SHA1 cf618b7b327adc672fa00a392e96a3c60ce4b8db SHA256 1adfc298fdb6b02eac868761ad3ce2b93074cb83a61b730dc39fe6bfa7f51142
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREKAAYFAk4gg9kACgkQgAnW8HDreRbINACgySi7hc4q8xBKoVR5nOcEeiIG
-riQAmwZ2cgdZpRER1kXPvvGFNOHk+m1w
-=+QJK
+iEYEAREKAAYFAk4hlf0ACgkQgAnW8HDreRaLqgCfSZ8svfrbKclRWCP4EJfDUzqp
+jiEAoJLPIdEHCfxUm89AUiwkuCdpULy3
+=UEop
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/coot/coot-9999.ebuild b/sci-chemistry/coot/coot-9999.ebuild
index ecb5ff027..93859d2d8 100644
--- a/sci-chemistry/coot/coot-9999.ebuild
+++ b/sci-chemistry/coot/coot-9999.ebuild
@@ -31,6 +31,7 @@ SCIDEPS="
 	>=sci-libs/coot-data-2
 	>=sci-libs/gsl-1.3
 	>=sci-libs/mmdb-1.23
+	sci-libs/ssm
 	<sci-libs/monomer-db-1
 	sci-chemistry/reduce
 	<sci-chemistry/refmac-5.6
@@ -82,6 +83,7 @@ PATCHES=(
 	"${FILESDIR}"/${PV}-gl.patch
 	"${FILESDIR}"/${PV}-mmdb-config.patch
 	"${FILESDIR}"/${PV}-test.patch
+	"${FILESDIR}"/${PV}-ssm.patch
 	)
 
 src_unpack() {
@@ -109,7 +111,6 @@ src_configure() {
 	econf \
 		--includedir='${prefix}/include/coot' \
 		--with-gtkcanvas-prefix="${EPREFIX}/usr" \
-		--with-ssmlib-prefix="${EPREFIX}/usr" \
 		--with-gtkgl-prefix="${EPREFIX}/usr" \
 		--with-guile \
 		--with-python="${EPREFIX}/usr" \
diff --git a/sci-chemistry/coot/files/9999-ssm.patch b/sci-chemistry/coot/files/9999-ssm.patch
new file mode 100644
index 000000000..c801da724
--- /dev/null
+++ b/sci-chemistry/coot/files/9999-ssm.patch
@@ -0,0 +1,56 @@
+ macros/mmdb-ssm.m4 |   42 +-----------------------------------------
+ 1 files changed, 1 insertions(+), 41 deletions(-)
+
+diff --git a/macros/mmdb-ssm.m4 b/macros/mmdb-ssm.m4
+index 1937a16..6ef547c 100644
+--- a/macros/mmdb-ssm.m4
++++ b/macros/mmdb-ssm.m4
+@@ -22,47 +22,7 @@
+ AC_DEFUN([AM_WITH_MMDBSSM],
+ [AC_PROVIDE([AM_USE_MMDBSSM])
+ 
+-
+-AC_ARG_WITH(ssmlib-prefix, 
+-	AC_HELP_STRING( [--with-ssmlib-prefix=PFX], [Prefix where SSMLib has been installed] ),
+-	[ with_ssmlib_prefix="$withval" ],
+- with_ssmlib_prefix="")
+-
+-AC_MSG_CHECKING([for SSMLib])
+-
+-if test x$with_ssmlib_prefix != x; then
+-
+-   MMDBSSM_CXXFLAGS="-DHAVE_SSMLIB"
+-   MMDBSSM_LIBS="-L$with_ssmlib_prefix/$acl_libdirstem -lssm"
+-
+-ac_mmdb_dirs='
+-.
+-include
+-include/ssm
+-include/mmdb
+-lib
+-src
+-lib/src
+-lib/src/mmdb'
+-
+-   for ac_dir in $ac_mmdb_dirs; do
+-      if test -r "$with_ssmlib_prefix/$ac_dir/ssm_superpose.h"; then
+-         ac_MMDBSSM_CXXFLAGS="-I$with_ssmlib_prefix/$ac_dir"
+-         break
+-      fi
+-   done
+-
+-  MMDBSSM_CXXFLAGS="$MMDBSSM_CXXFLAGS $ac_MMDBSSM_CXXFLAGS"
+-  
+-else 
+-
+-   MMDBSSM_CXXFLAGS=""
+-   MMDBSSM_LIBS=""
+-   with_ssmlib_prefix=no 
+-
+-fi
+-
+-AC_MSG_RESULT([$with_ssmlib_prefix])
++PKG_CHECK_MODULES([MMDBSSM],[ssm])
+ 
+ AC_SUBST(MMDBSSM_CXXFLAGS)
+ AC_SUBST(MMDBSSM_LIBS)