From: "Justin Lecher" <jlec@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/sci:master commit in: sci-chemistry/coot/files/, sci-chemistry/coot/
Date: Sat, 16 Jul 2011 13:45:42 +0000 (UTC) [thread overview]
Message-ID: <a42c9e88010b8d397ad5629cb48308d8f8c85fa9.jlec@gentoo> (raw)
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=proj/sci.git;a=commit;h=a42c9e88
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: $
+ 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/coot-9999.ebuild b/sci-chemistry/coot/coot-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="
>=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 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])
+
+-
+-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)
next reply other threads:[~2011-07-16 13:45 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-16 13:45 Justin Lecher [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-09-22 13:40 [gentoo-commits] proj/sci:master commit in: sci-chemistry/coot/files/, sci-chemistry/coot/ Aisha Tammy
2015-09-15 13:34 Justin Lecher
2014-06-30 19:02 Justin Lecher
2013-11-25 18:48 Justin Lecher
2013-10-02 6:49 Justin Lecher
2013-09-28 9:15 Justin Lecher
2013-08-27 6:58 Justin Lecher
2013-07-22 13:29 Justin Lecher
2013-06-02 16:48 Justin Lecher
2012-07-04 7:43 Justin Lecher
2012-06-14 12:11 Justin Lecher
2012-04-25 15:26 Justin Lecher
2012-03-21 11:20 Justin Lecher
2012-02-27 7:29 Justin Lecher
2011-10-11 20:50 Justin Lecher
2011-07-16 13:45 Justin Lecher
2011-06-29 13:32 Justin Lecher
2011-06-15 20:50 Justin Lecher
2011-06-02 8:39 Justin Lecher
2011-05-28 11:50 Justin Lecher
2011-04-29 10:05 Justin Lecher
2011-04-29 10:05 Justin Lecher
2011-03-03 14:23 Justin Lecher
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=a42c9e88010b8d397ad5629cb48308d8f8c85fa9.jlec@gentoo \
--to=jlec@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox