From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id BB1C81381F3 for ; Tue, 27 Aug 2013 06:59:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 85D33E0AFD; Tue, 27 Aug 2013 06:58:56 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0B490E0AFD for ; Tue, 27 Aug 2013 06:58:55 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C416D33EA97 for ; Tue, 27 Aug 2013 06:58:54 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 78D11E468F for ; Tue, 27 Aug 2013 06:58:53 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1377586701.e76da5ba2d87e85005bd3f41ebf9eee23bb6bba8.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/files/9999-pc.patch X-VCS-Directories: sci-chemistry/coot/files/ sci-chemistry/coot/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: e76da5ba2d87e85005bd3f41ebf9eee23bb6bba8 X-VCS-Branch: master Date: Tue, 27 Aug 2013 06:58:53 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 70ded878-e04e-40ea-8047-834ef9e811c9 X-Archives-Hash: f7f79a613e8476ce60a11b2f01891d68 commit: e76da5ba2d87e85005bd3f41ebf9eee23bb6bba8 Author: Justin Lecher gentoo org> AuthorDate: Tue Aug 27 06:58:21 2013 +0000 Commit: Justin Lecher gentoo org> CommitDate: Tue Aug 27 06:58:21 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=e76da5ba sci-chemistry/coot: Fix pc patch Package-Manager: portage-2.2.1 --- sci-chemistry/coot/ChangeLog | 3 ++ sci-chemistry/coot/files/9999-pc.patch | 51 +++++++++++++++++++--------------- 2 files changed, 31 insertions(+), 23 deletions(-) diff --git a/sci-chemistry/coot/ChangeLog b/sci-chemistry/coot/ChangeLog index 1c966c0..54fba79 100644 --- a/sci-chemistry/coot/ChangeLog +++ b/sci-chemistry/coot/ChangeLog @@ -2,6 +2,9 @@ # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 27 Aug 2013; Justin Lecher files/9999-pc.patch: + Fix pc patch + 22 Jul 2013; Justin Lecher files/9999-pc.patch: Don't use relative path diff --git a/sci-chemistry/coot/files/9999-pc.patch b/sci-chemistry/coot/files/9999-pc.patch index 0cf7a2e..16e899f 100644 --- a/sci-chemistry/coot/files/9999-pc.patch +++ b/sci-chemistry/coot/files/9999-pc.patch @@ -39,7 +39,7 @@ index 46f6362..fd3fd9a 100644 * surface/CXXSphereNode.h: removed the ; again! diff --git a/analysis/Makefile.am b/analysis/Makefile.am -index 8754df4..1174dfd 100644 +index 8a873dc..ef4a9cf 100644 --- a/analysis/Makefile.am +++ b/analysis/Makefile.am @@ -8,8 +8,8 @@ pkgincludedir = $(includedir)/coot/analysis @@ -51,7 +51,7 @@ index 8754df4..1174dfd 100644 + $(CLIPPER_CFLAGS) \ + $(MMDB_CFLAGS) - libcoot_analysis_la_SOURCES = bfkurt.cc mogul.cc kolmogorov.cc + libcoot_analysis_la_SOURCES = bfkurt.cc mogul.cc kolmogorov.hh kolmogorov.cc cablam.hh cablam.cc diff --git a/angles/Makefile.am b/angles/Makefile.am index b89276d..935ce06 100644 @@ -313,7 +313,7 @@ index 399f453..3d2ff55 100755 # $(WITH_SCRIPT_CFLAGS) diff --git a/configure.in b/configure.in -index d99d280..eca9b91 100644 +index 5928c3c..9e235b5 100644 --- a/configure.in +++ b/configure.in @@ -108,14 +108,18 @@ esac @@ -338,7 +338,7 @@ index d99d280..eca9b91 100644 # we set default coot_guile to true coot_guile=true -@@ -189,11 +193,15 @@ AM_PATH_LIBGLADE +@@ -186,11 +190,15 @@ AM_PATH_LIBGLADE dnl =========================== GooCanvas ================================ @@ -443,7 +443,7 @@ index 3a85b9e..1a11cdf 100644 pkginclude_HEADERS = db-main.hh db-strands.hh pkgincludedir = $(includedir)/coot/db-main diff --git a/db-main/Makefile.simple b/db-main/Makefile.simple -index cec561d..c207a43 100644 +index cec561d..31d35a0 100644 --- a/db-main/Makefile.simple +++ b/db-main/Makefile.simple @@ -19,7 +19,7 @@ CLIPPER = $(HOME)/crystal @@ -848,29 +848,34 @@ index 30fdcb9..3e4c0c6 100644 ifelse([$1], , :, [$1]) diff --git a/macros/mmdb-ssm.m4 b/macros/mmdb-ssm.m4 -index 1937a16..26101d3 100644 +index 25dc502..fcfde1d 100644 --- a/macros/mmdb-ssm.m4 +++ b/macros/mmdb-ssm.m4 -@@ -32,7 +32,7 @@ AC_MSG_CHECKING([for SSMLib]) +@@ -31,14 +31,13 @@ AC_ARG_WITH(ssmlib-prefix, + AC_MSG_CHECKING([for ssm library]) if test x$with_ssmlib_prefix != x; then +- + if test -r "$with_ssmlib_prefix/include/ssm/ssm_superpose.h"; then -- MMDBSSM_CXXFLAGS="-DHAVE_SSMLIB" +- MMDBSSM_CXXFLAGS="-DHAVE_SSMLIB" + MMDBSSM_CFLAGS="-DHAVE_SSMLIB" - MMDBSSM_LIBS="-L$with_ssmlib_prefix/$acl_libdirstem -lssm" - - ac_mmdb_dirs=' -@@ -47,16 +47,16 @@ 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" -+ ac_MMDBSSM_CFLAGS="-I$with_ssmlib_prefix/$ac_dir" - break - fi - done - -- MMDBSSM_CXXFLAGS="$MMDBSSM_CXXFLAGS $ac_MMDBSSM_CXXFLAGS" + # AFAICS, ssm does not put its libs in $acl_libdirstem + # MMDBSSM_LIBS="-L$with_ssmlib_prefix/$acl_libdirstem -lssm" + MMDBSSM_LIBS="-L$with_ssmlib_prefix/lib -lssm" +- ac_MMDBSSM_CXXFLAGS="-I$with_ssmlib_prefix/include" ++ ac_MMDBSSM_CFLAGS="-I$with_ssmlib_prefix/include" + + # saved_LIBS="$LIBS" + # saved_CPPFLAGS="$CPPFLAGS" +@@ -49,12 +48,13 @@ if test x$with_ssmlib_prefix != x; then + + else + AC_MSG_FAILURE([ --with-ssmlib-prefix specified but include files not found]) +- fi +- MMDBSSM_CXXFLAGS="$MMDBSSM_CXXFLAGS $ac_MMDBSSM_CXXFLAGS" ++ fi ++ + MMDBSSM_CFLAGS="$MMDBSSM_CFLAGS $ac_MMDBSSM_CFLAGS" else @@ -880,7 +885,7 @@ index 1937a16..26101d3 100644 MMDBSSM_LIBS="" with_ssmlib_prefix=no -@@ -64,6 +64,6 @@ fi +@@ -62,6 +62,6 @@ fi AC_MSG_RESULT([$with_ssmlib_prefix])