Depend on unbundled ssm

Package-Manager: portage-2.2.0_alpha45/cvs/Linux x86_64

4 files changed, 70 insertions, 8 deletions

diff --git a/sci-chemistry/coot/ChangeLog b/sci-chemistry/coot/ChangeLog
index a428ef1874f5..bd364d9c8d6a 100644
--- a/sci-chemistry/coot/ChangeLog
+++ b/sci-chemistry/coot/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-chemistry/coot
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/coot/ChangeLog,v 1.40 2011/06/29 13:31:32 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/coot/ChangeLog,v 1.41 2011/07/16 13:14:36 jlec Exp $
+
+  16 Jul 2011; Justin Lecher <jlec@gentoo.org> +files/0.6.2-ssm.patch,
+  coot-0.6.2.ebuild:
+  Depend on unbundled ssm
 
   29 Jun 2011; Justin Lecher <jlec@gentoo.org> coot-0.6.2.ebuild:
   Fix mmdb dep version
diff --git a/sci-chemistry/coot/Manifest b/sci-chemistry/coot/Manifest
index dc7cf6dc0eac..c5b9dc62d7cf 100644
--- a/sci-chemistry/coot/Manifest
+++ b/sci-chemistry/coot/Manifest
@@ -5,19 +5,20 @@ AUX 0.6.1-libpng14.patch 950 RMD160 c2d1c298ada419272d79d49972b13e414a234cd3 SHA
 AUX 0.6.2-clipper-config.patch 431 RMD160 7a00939760bc4c062bbde1a65f53b9556b93c3bc SHA1 0d72c4c898fd29802c74d237b54f715444922956 SHA256 9ae9129e733d845ad2e4dd505bc5e0987147fc3a5e5dd2457b5857643809db2f
 AUX 0.6.2-gl.patch 383 RMD160 6460e87e4da57ff845f96f072dec1354ed117bee SHA1 00bc0bbfc7d4fb00ebc8477941469bef2ed6b670 SHA256 9d47a6cf2d0c7644b945f88acdc7af146df4f9a5a8f883a0e72e1bc8ccf8b380
 AUX 0.6.2-mmdb-config.patch 432 RMD160 8418198b08d15af9ee5d80b15ea46bb9efd2b973 SHA1 3e6f5c888b476d8d37da4effa67a8053784a7a3c SHA256 41484424f2f7f61b0555c893a51884d02f7bd471e70c4c0903c8740dcc273f77
+AUX 0.6.2-ssm.patch 1276 RMD160 8c7eef0034efc2c57bd774fe8ebb1bd0ba9c7aa2 SHA1 8812f35fba16a45b21ecce5243fd26d6105e29e3 SHA256 42f1098b0d56f85125293ca24410061e7a9bee10c94ba6e9fd3496439368bf75
 AUX 0.6.2-test.patch 457 RMD160 1a3e0956d8b7f051fdd964524c0ba9eabf8c2aca SHA1 a8f9584be09cc58e7cb55801115e9649b05aa910 SHA256 494ef09e407c3047145c250c70b90c7679a1c5b9f84c57a680e40580bd980397
 DIST coot-0.6.1.tar.gz 12229005 RMD160 76cbf28320ff52f02b40164eea00e7ec8a6b6c2c SHA1 cdd74e394e07dc17b99f56fce7cf180a177d53d7 SHA256 7897eb62e1add5f8deddd16d24ffd9b4c763e784714cd47fa9777beb79f56066
 DIST coot-0.6.2.tar.gz 13597123 RMD160 707eb3df47681a011f42874210b940329a748bc7 SHA1 46b663125cef4c01387330d144e49acb0b0b5709 SHA256 d2f55db4f75c721d120ea33a4ca42c1abf246dff29a75b7f189e604e32709e78
 DIST greg-data-0.6.1.tar.gz 7930213 RMD160 e9a17d1ef2d3f15b3792ea5c7204901e0105b76b SHA1 f4158fa440406b88d0bb72880cdee9a3653c4233 SHA256 658a557b85ee6b90fc446cb3c605556586a2a5a0575ddd11b42265e019eb74a0
 DIST greg-data-0.6.2.tar.gz 8044588 RMD160 065acee98384540d0c2ffaf2511dfd1aa400b11c SHA1 92cec24dab594d8024f41047af2bf6760e9e7d00 SHA256 c9fedf6e1fa60fda178753bbfb539671c274f64d4daca2b63ab49c59bd4c5856
 EBUILD coot-0.6.1.ebuild 3934 RMD160 6376495fce52056acbaaf0df862fbb502b8a7600 SHA1 0ecc3bfa5760bb663d62c67c98c6146f3f77e707 SHA256 7ac1bd7397140da0386b360ef613067a2932d381d0a85e9ad97218fac20f944d
-EBUILD coot-0.6.2.ebuild 4004 RMD160 738547d8ef80b6c036e280e747da83d9c1c55d1c SHA1 3716ed4b5bb5f200e884f90deeb78138a98b46fc SHA256 41e56b538291800a540b42b7e4c9da3519a9e9b185053990aa4745c0f9c0cf7d
-MISC ChangeLog 6242 RMD160 907e9c07b505bed31e34f175bf747b12376d428b SHA1 a6b80ecc6e59e957d2e4c6c72d3ee27fe16079c9 SHA256 5e9e79d2a0988316af30f10ebe7ae85cb0a0f6bceb762f0207ff84036540fb99
+EBUILD coot-0.6.2.ebuild 4007 RMD160 9a2bf9ec0350b5fe3dd3213509a6d009194c3af9 SHA1 46a091ef6974ab8e4a4d831b43834924476ae7eb SHA256 898ca3da1d4c6d118ad666c910f13c03c2bd33527faa082d16fe187379898f1a
+MISC ChangeLog 6361 RMD160 8d577dadb6986167bae1e15406864469fa3300c1 SHA1 74e2ea8cfa43e7e3ebe9e730c3a12043069778ed SHA256 0c6daefdf925b493b928feac4b28d22d2025446eb95eefbb0093b22bce5551b0
 MISC metadata.xml 167 RMD160 ea4003a55d6e2079381a540c441fc59cde29025a SHA1 3bc6dc4dd68f7de22828138e62aa117387b1765d SHA256 f313eeec4ebffac500b57a98a225e32c77489fc826a50494749b6cdeec28e3e8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREKAAYFAk4LKT4ACgkQgAnW8HDreRbuSgCfSza4j39AiTJvMmttWhgEKIR5
-/xUAoJsViX9MVF+U4P+0YHS6PBRyAEOu
-=8XFJ
+iEYEAREKAAYFAk4hjsEACgkQgAnW8HDreRau3gCgo4Yw9pywVc2lUzM1U3uSBnAc
+lfcAoLIVrYTRstA1Z9VMPzutXdl7QoNN
+=7OtJ
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/coot/coot-0.6.2.ebuild b/sci-chemistry/coot/coot-0.6.2.ebuild
index 4e2227b8d0c0..30ae440df979 100644
--- a/sci-chemistry/coot/coot-0.6.2.ebuild
+++ b/sci-chemistry/coot/coot-0.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/coot/coot-0.6.2.ebuild,v 1.3 2011/06/29 13:31:32 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/coot/coot-0.6.2.ebuild,v 1.4 2011/07/16 13:14:36 jlec Exp $
 
 EAPI=3
 
@@ -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
@@ -78,6 +79,7 @@ PATCHES=(
 	"${FILESDIR}"/${PV}-mmdb-config.patch
 	"${FILESDIR}"/${PV}-gl.patch
 	"${FILESDIR}"/${PV}-test.patch
+	"${FILESDIR}"/${PV}-ssm.patch
 	)
 
 src_prepare() {
@@ -92,7 +94,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/0.6.2-ssm.patch b/sci-chemistry/coot/files/0.6.2-ssm.patch
new file mode 100644
index 000000000000..c801da72410a
--- /dev/null
+++ b/sci-chemistry/coot/files/0.6.2-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)