From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org)
	by finch.gentoo.org with esmtp (Exim 4.60)
	(envelope-from <gentoo-commits+bounces-363039-garchives=archives.gentoo.org@lists.gentoo.org>)
	id 1Qi5Bn-0006GG-Mt
	for garchives@archives.gentoo.org; Sat, 16 Jul 2011 13:45:51 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 7A22321C03C;
	Sat, 16 Jul 2011 13:45:44 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	by pigeon.gentoo.org (Postfix) with ESMTP id 3D21521C03C
	for <gentoo-commits@lists.gentoo.org>; Sat, 16 Jul 2011 13:45:44 +0000 (UTC)
Received: from pelican.gentoo.org (unknown [66.219.59.40])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id A98032AC343
	for <gentoo-commits@lists.gentoo.org>; Sat, 16 Jul 2011 13:45:43 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by pelican.gentoo.org (Postfix) with ESMTP id EB2DA8004C
	for <gentoo-commits@lists.gentoo.org>; Sat, 16 Jul 2011 13:45:42 +0000 (UTC)
From: "Justin Lecher" <jlec@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" <jlec@gentoo.org>
Message-ID: <a42c9e88010b8d397ad5629cb48308d8f8c85fa9.jlec@gentoo>
Subject: [gentoo-commits] proj/sci:master commit in: sci-chemistry/coot/files/, sci-chemistry/coot/
X-VCS-Repository: proj/sci
X-VCS-Files: sci-chemistry/coot/ChangeLog sci-chemistry/coot/coot-9999.ebuild sci-chemistry/coot/files/9999-ssm.patch
X-VCS-Directories: sci-chemistry/coot/files/ sci-chemistry/coot/
X-VCS-Committer: jlec
X-VCS-Committer-Name: Justin Lecher
X-VCS-Revision: a42c9e88010b8d397ad5629cb48308d8f8c85fa9
Date: Sat, 16 Jul 2011 13:45:42 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt: 
X-Archives-Hash: 007ea94d6ef0e9b129d35eef35713fe8

commit:     a42c9e88010b8d397ad5629cb48308d8f8c85fa9
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 16 13:45:33 2011 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sat Jul 16 13:45:33 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=3Dproj/sci.git;a=3Dc=
ommit;h=3Da42c9e88

Adopt to unbundled ssm

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

---
 sci-chemistry/coot/ChangeLog            |    4 ++
 sci-chemistry/coot/coot-9999.ebuild     |    3 +-
 sci-chemistry/coot/files/9999-ssm.patch |   56 +++++++++++++++++++++++++=
++++++
 3 files changed, 62 insertions(+), 1 deletions(-)

diff --git a/sci-chemistry/coot/ChangeLog b/sci-chemistry/coot/ChangeLog
index 50444a3..7f7c6e4 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: $
=20
+  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.pa=
tch:
   Mmdb fix
=20

diff --git a/sci-chemistry/coot/coot-9999.ebuild b/sci-chemistry/coot/coo=
t-9999.ebuild
index ecb5ff0..93859d2 100644
--- a/sci-chemistry/coot/coot-9999.ebuild
+++ b/sci-chemistry/coot/coot-9999.ebuild
@@ -31,6 +31,7 @@ SCIDEPS=3D"
 	>=3Dsci-libs/coot-data-2
 	>=3Dsci-libs/gsl-1.3
 	>=3Dsci-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=3D(
 	"${FILESDIR}"/${PV}-gl.patch
 	"${FILESDIR}"/${PV}-mmdb-config.patch
 	"${FILESDIR}"/${PV}-test.patch
+	"${FILESDIR}"/${PV}-ssm.patch
 	)
=20
 src_unpack() {
@@ -109,7 +111,6 @@ src_configure() {
 	econf \
 		--includedir=3D'${prefix}/include/coot' \
 		--with-gtkcanvas-prefix=3D"${EPREFIX}/usr" \
-		--with-ssmlib-prefix=3D"${EPREFIX}/usr" \
 		--with-gtkgl-prefix=3D"${EPREFIX}/usr" \
 		--with-guile \
 		--with-python=3D"${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 0000000..c801da7
--- /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])
+=20
+-
+-AC_ARG_WITH(ssmlib-prefix,=20
+-	AC_HELP_STRING( [--with-ssmlib-prefix=3DPFX], [Prefix where SSMLib has=
 been installed] ),
+-	[ with_ssmlib_prefix=3D"$withval" ],
+- with_ssmlib_prefix=3D"")
+-
+-AC_MSG_CHECKING([for SSMLib])
+-
+-if test x$with_ssmlib_prefix !=3D x; then
+-
+-   MMDBSSM_CXXFLAGS=3D"-DHAVE_SSMLIB"
+-   MMDBSSM_LIBS=3D"-L$with_ssmlib_prefix/$acl_libdirstem -lssm"
+-
+-ac_mmdb_dirs=3D'
+-.
+-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=3D"-I$with_ssmlib_prefix/$ac_dir"
+-         break
+-      fi
+-   done
+-
+-  MMDBSSM_CXXFLAGS=3D"$MMDBSSM_CXXFLAGS $ac_MMDBSSM_CXXFLAGS"
+- =20
+-else=20
+-
+-   MMDBSSM_CXXFLAGS=3D""
+-   MMDBSSM_LIBS=3D""
+-   with_ssmlib_prefix=3Dno=20
+-
+-fi
+-
+-AC_MSG_RESULT([$with_ssmlib_prefix])
++PKG_CHECK_MODULES([MMDBSSM],[ssm])
+=20
+ AC_SUBST(MMDBSSM_CXXFLAGS)
+ AC_SUBST(MMDBSSM_LIBS)