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 ) id 1QYzZC-00081t-H3 for garchives@archives.gentoo.org; Tue, 21 Jun 2011 11:56:30 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CF3A31C173; Tue, 21 Jun 2011 11:54:16 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 930DD1C173 for ; Tue, 21 Jun 2011 11:54:16 +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 EE9381B401E for ; Tue, 21 Jun 2011 11:54:15 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 4F4168003E for ; Tue, 21 Jun 2011 11:54:15 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <8436ce9d0b5b4908c7588716acf111347bdf4e81.jlec@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-chemistry/ambertools/ X-VCS-Repository: proj/sci X-VCS-Files: sci-chemistry/ambertools/ChangeLog sci-chemistry/ambertools/ambertools-1.4.ebuild sci-chemistry/ambertools/ambertools-1.5.ebuild X-VCS-Directories: sci-chemistry/ambertools/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: 8436ce9d0b5b4908c7588716acf111347bdf4e81 Date: Tue, 21 Jun 2011 11:54:15 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 490c7af64ba15a3264f486553404c8c4 commit: 8436ce9d0b5b4908c7588716acf111347bdf4e81 Author: Justin Lecher gentoo org> AuthorDate: Tue Jun 21 10:50:20 2011 +0000 Commit: Justin Lecher gentoo org> CommitDate: Tue Jun 21 10:50:20 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/sci.git;a=3Dc= ommit;h=3D8436ce9d commit (Portage version: 2.2.0_alpha41/git/Linux x86_64, RepoMan options: --forc= e, 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/ambertool= s/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: $ =20 + 21 Jun 2011; Justin Lecher ambertools-1.4.ebuild, + ambertools-1.5.ebuild: + Added fortran-2.eclass support + *ambertools-1.5 (04 Jun 2011) =20 04 Jun 2011; Reinis Danne +ambertools-1.5.ebuild, diff --git a/sci-chemistry/ambertools/ambertools-1.4.ebuild b/sci-chemist= ry/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: $ =20 -EAPI=3D"4" +EAPI=3D4 =20 -inherit toolchain-funcs eutils +inherit toolchain-funcs eutils fortran-2 =20 -DESCRIPTION=3D"A suite of programs for carrying out complete molecular m= echanics investigations" +DESCRIPTION=3D"A suite for carrying out complete molecular mechanics inv= estigations" HOMEPAGE=3D"http://ambermd.org/#AmberTools" SRC_URI=3D"AmberTools-${PV}.tar.bz2" =20 @@ -14,6 +14,7 @@ LICENSE=3D"GPL-2" SLOT=3D"0" KEYWORDS=3D"~amd64 ~x86" IUSE=3D"mpi openmp X" + RESTRICT=3D"fetch" =20 RDEPEND=3D" @@ -36,21 +37,18 @@ pkg_nofetch() { } =20 pkg_setup() { - if use openmp && - [[ $(tc-getCC)$ =3D=3D *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 >=3D 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=3D"${S}" } =20 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-chemist= ry/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: $ =20 -EAPI=3D"4" +EAPI=3D4 =20 -inherit toolchain-funcs eutils +inherit toolchain-funcs eutils fortran-2 =20 -DESCRIPTION=3D"A suite of programs for carrying out complete molecular m= echanics investigations" +DESCRIPTION=3D"A suite for carrying out complete molecular mechanics inv= estigations" HOMEPAGE=3D"http://ambermd.org/#AmberTools" SRC_URI=3D"AmberTools-${PV}.tar.bz2" =20 @@ -14,6 +14,7 @@ LICENSE=3D"GPL-2" SLOT=3D"0" KEYWORDS=3D"~amd64 ~x86" IUSE=3D"mpi openmp X" + RESTRICT=3D"fetch" =20 RDEPEND=3D" @@ -38,21 +39,18 @@ pkg_nofetch() { } =20 pkg_setup() { - if use openmp && - [[ $(tc-getCC)$ =3D=3D *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 >=3D 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=3D"${S}" } =20 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 }