[gentoo-commits] proj/sci:master commit in: sci-chemistry/ambertools/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Justin Lecher" <jlec@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/sci:master commit in: sci-chemistry/ambertools/
Date: Tue, 21 Jun 2011 11:54:15 +0000 (UTC)	[thread overview]
Message-ID: <8436ce9d0b5b4908c7588716acf111347bdf4e81.jlec@gentoo> (raw)

commit:     8436ce9d0b5b4908c7588716acf111347bdf4e81
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 21 10:50:20 2011 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Tue Jun 21 10:50:20 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=8436ce9d

commit

(Portage version: 2.2.0_alpha41/git/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 70EB7916)

---
 sci-chemistry/ambertools/ChangeLog             |    4 ++++
 sci-chemistry/ambertools/ambertools-1.4.ebuild |   24 +++++++++++-------------
 sci-chemistry/ambertools/ambertools-1.5.ebuild |   24 +++++++++++-------------
 3 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/sci-chemistry/ambertools/ChangeLog b/sci-chemistry/ambertools/ChangeLog
index 26101af..ea945fd 100644
--- a/sci-chemistry/ambertools/ChangeLog
+++ b/sci-chemistry/ambertools/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  21 Jun 2011; Justin Lecher <jlec@gentoo.org> ambertools-1.4.ebuild,
+  ambertools-1.5.ebuild:
+  Added fortran-2.eclass support
+
 *ambertools-1.5 (04 Jun 2011)
 
   04 Jun 2011; Reinis Danne <rei4dan@gmail.com> +ambertools-1.5.ebuild,

diff --git a/sci-chemistry/ambertools/ambertools-1.4.ebuild b/sci-chemistry/ambertools/ambertools-1.4.ebuild
index 9e0e96b..67e1428 100644
--- a/sci-chemistry/ambertools/ambertools-1.4.ebuild
+++ b/sci-chemistry/ambertools/ambertools-1.4.ebuild
@@ -2,11 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI=4
 
-inherit toolchain-funcs eutils
+inherit toolchain-funcs eutils fortran-2
 
-DESCRIPTION="A suite of programs for carrying out complete molecular mechanics investigations"
+DESCRIPTION="A suite for carrying out complete molecular mechanics investigations"
 HOMEPAGE="http://ambermd.org/#AmberTools"
 SRC_URI="AmberTools-${PV}.tar.bz2"
 
@@ -14,6 +14,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="mpi openmp X"
+
 RESTRICT="fetch"
 
 RDEPEND="
@@ -36,21 +37,18 @@ pkg_nofetch() {
 }
 
 pkg_setup() {
-	if use openmp &&
-	[[ $(tc-getCC)$ == *gcc* ]] &&
-		( [[ $(gcc-major-version)$(gcc-minor-version) -lt 42 ]] ||
-		! has_version sys-devel/gcc[openmp] )
-	then
-		ewarn "You are using gcc and OpenMP is only available with gcc >= 4.2 "
-		ewarn "If you want to build ${PN} with OpenMP, abort now,"
-		ewarn "and switch CC to an OpenMP capable compiler"
+	fortran-2_pkg_setup
+	if use openmp; then
+		tc-has-openmp || \
+			die "Please select an openmp capable compiler like gcc[openmp]"
 	fi
 	AMBERHOME="${S}"
 }
 
 src_prepare() {
-	epatch "${FILESDIR}/${P}-bugfix_1-18.patch"
-	epatch "${FILESDIR}/${P}-gentoo.patch"
+	epatch \
+		"${FILESDIR}/${P}-bugfix_1-18.patch" \
+		"${FILESDIR}/${P}-gentoo.patch"
 	cd AmberTools/src
 	rm -r arpack blas lapack fftw-2.1.5 c9x-complex cifparse netcdf pnetcdf reduce ucpp-1.3 || die
 }

diff --git a/sci-chemistry/ambertools/ambertools-1.5.ebuild b/sci-chemistry/ambertools/ambertools-1.5.ebuild
index 776a56f..347c64b 100644
--- a/sci-chemistry/ambertools/ambertools-1.5.ebuild
+++ b/sci-chemistry/ambertools/ambertools-1.5.ebuild
@@ -2,11 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI=4
 
-inherit toolchain-funcs eutils
+inherit toolchain-funcs eutils fortran-2
 
-DESCRIPTION="A suite of programs for carrying out complete molecular mechanics investigations"
+DESCRIPTION="A suite for carrying out complete molecular mechanics investigations"
 HOMEPAGE="http://ambermd.org/#AmberTools"
 SRC_URI="AmberTools-${PV}.tar.bz2"
 
@@ -14,6 +14,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="mpi openmp X"
+
 RESTRICT="fetch"
 
 RDEPEND="
@@ -38,21 +39,18 @@ pkg_nofetch() {
 }
 
 pkg_setup() {
-	if use openmp &&
-	[[ $(tc-getCC)$ == *gcc* ]] &&
-		( [[ $(gcc-major-version)$(gcc-minor-version) -lt 42 ]] ||
-		! has_version sys-devel/gcc[openmp] )
-	then
-		ewarn "You are using gcc and OpenMP is only available with gcc >= 4.2 "
-		ewarn "If you want to build ${PN} with OpenMP, abort now,"
-		ewarn "and switch CC to an OpenMP capable compiler"
+	fortran-2_pkg_setup
+	if use openmp; then
+		tc-has-openmp || \
+			die "Please select an openmp capable compiler like gcc[openmp]"
 	fi
 	AMBERHOME="${S}"
 }
 
 src_prepare() {
-	epatch "${FILESDIR}/${P}-bugfix_1-3.patch"
-	epatch "${FILESDIR}/${P}-gentoo.patch"
+	epatch \
+		"${FILESDIR}/${P}-bugfix_1-3.patch" \
+		"${FILESDIR}/${P}-gentoo.patch"
 	cd AmberTools/src
 	rm -r arpack blas lapack fftw-2.1.5 c9x-complex cifparse netcdf pnetcdf reduce ucpp-1.3 || die
 }

next             reply	other threads:[~2011-06-21 11:56 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-06-21 11:54 Justin Lecher [this message]
  -- strict thread matches above, loose matches on Subject: below --
2016-01-22  8:15 [gentoo-commits] proj/sci:master commit in: sci-chemistry/ambertools/ Justin Lecher
2013-06-28 16:11 Christoph Junghans
2013-03-03 17:52 Justin Lecher
2013-02-22 10:15 Justin Lecher
2012-11-08  9:39 Justin Lecher
2012-10-27 17:32 Reinis Danne
2011-07-28 12:28 Alexey Shvetsov
2011-07-28 12:03 Alexey Shvetsov
2011-06-23  9:31 Justin Lecher
2011-03-15 10:23 Justin Lecher
2011-03-07 18:34 Alexey Shvetsov
2011-03-07 18:28 Alexey Shvetsov
2011-03-07 18:23 Alexey Shvetsov
2011-03-07 18:20 Alexey Shvetsov
2011-03-07 18:20 Alexey Shvetsov
2011-03-07  1:55 Alexey Shvetsov
2011-03-07  1:49 Alexey Shvetsov
2011-03-07  1:49 Alexey Shvetsov

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:26101af dfblob:ea945fd dfblob:9e0e96b dfblob:67e1428
dfblob:776a56f dfblob:347c64b )
 OR (
bs:"[gentoo-commits] proj/sci:master commit in: sci-chemistry/ambertools/" )
	(help)

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=8436ce9d0b5b4908c7588716acf111347bdf4e81.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