* [gentoo-commits] gentoo-x86 commit in sci-chemistry/tinker: tinker-6.ebuild ChangeLog tinker-5.1.09.ebuild
@ 2010-12-16 13:59 Justin Lecher (jlec)
0 siblings, 0 replies; 3+ messages in thread
From: Justin Lecher (jlec) @ 2010-12-16 13:59 UTC (permalink / raw
To: gentoo-commits
jlec 10/12/16 13:59:36
Modified: tinker-6.ebuild ChangeLog tinker-5.1.09.ebuild
Log:
Removal of fortran.eclass, #348851
(Portage version: 2.2.0_alpha8/cvs/Linux x86_64)
Revision Changes Path
1.2 sci-chemistry/tinker/tinker-6.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/tinker/tinker-6.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/tinker/tinker-6.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/tinker/tinker-6.ebuild?r1=1.1&r2=1.2
Index: tinker-6.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/tinker/tinker-6.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tinker-6.ebuild 2 Dec 2010 22:15:39 -0000 1.1
+++ tinker-6.ebuild 16 Dec 2010 13:59:36 -0000 1.2
@@ -1,11 +1,10 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/tinker/tinker-6.ebuild,v 1.1 2010/12/02 22:15:39 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/tinker/tinker-6.ebuild,v 1.2 2010/12/16 13:59:36 jlec Exp $
EAPI="2"
-FORTRAN="gfortran ifc"
-inherit fortran flag-o-matic java-pkg-opt-2 toolchain-funcs
+inherit flag-o-matic java-pkg-opt-2 toolchain-funcs
DESCRIPTION="Molecular modeling package that includes force fields, such as AMBER and CHARMM"
HOMEPAGE="http://dasher.wustl.edu/tinker/"
@@ -22,19 +21,19 @@
dev-libs/maloc
!dev-util/diffuse
>=virtual/jre-1.6"
+
RESTRICT="mirror"
S="${WORKDIR}"/${PN}${PV}/source
pkg_setup() {
- fortran_pkg_setup
java-pkg-opt-2_pkg_setup
tc-has-openmp || die "Please use an openmp capable compiler like gcc[openmp]"
}
src_prepare() {
sed 's:strip:true:g' -i ../make/Makefile
- [[ ${FORTRANC} == "ifc" ]] || epatch "${FILESDIR}"/${PV}-openmp.patch
+ [[ $(tc-getFC) == "ifort" ]] || epatch "${FILESDIR}"/${PV}-openmp.patch
}
src_compile() {
@@ -46,7 +45,7 @@
# use dummy routines in pmpb.f instead of apbs calls
rm pmpb.c || die
- if [[ ${FORTRANC} == "gfortran" ]]; then
+ if [[ $(tc-getFC) == "gfortran" ]]; then
append-flags -fopenmp
_omplib="-lgomp"
else
@@ -58,7 +57,7 @@
emake \
-f ../make/Makefile \
- F77="${FORTRANC}" \
+ F77="$(tc-getFC)" \
CC="$(tc-getCC) -c" \
F77FLAGS=-c \
OPTFLAGS="${FFLAGS}" \
1.29 sci-chemistry/tinker/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/tinker/ChangeLog?rev=1.29&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/tinker/ChangeLog?rev=1.29&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/tinker/ChangeLog?r1=1.28&r2=1.29
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/tinker/ChangeLog,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- ChangeLog 2 Dec 2010 22:15:37 -0000 1.28
+++ ChangeLog 16 Dec 2010 13:59:36 -0000 1.29
@@ -1,6 +1,10 @@
# ChangeLog for sci-chemistry/tinker
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/tinker/ChangeLog,v 1.28 2010/12/02 22:15:37 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/tinker/ChangeLog,v 1.29 2010/12/16 13:59:36 jlec Exp $
+
+ 16 Dec 2010; Justin Lecher <jlec@gentoo.org> tinker-5.1.09.ebuild,
+ tinker-6.ebuild:
+ Removal of fortran.eclass, #348851
*tinker-6 (02 Dec 2010)
1.4 sci-chemistry/tinker/tinker-5.1.09.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/tinker/tinker-5.1.09.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/tinker/tinker-5.1.09.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/tinker/tinker-5.1.09.ebuild?r1=1.3&r2=1.4
Index: tinker-5.1.09.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/tinker/tinker-5.1.09.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tinker-5.1.09.ebuild 2 Dec 2010 10:51:37 -0000 1.3
+++ tinker-5.1.09.ebuild 16 Dec 2010 13:59:36 -0000 1.4
@@ -1,11 +1,10 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/tinker/tinker-5.1.09.ebuild,v 1.3 2010/12/02 10:51:37 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/tinker/tinker-5.1.09.ebuild,v 1.4 2010/12/16 13:59:36 jlec Exp $
EAPI="2"
-FORTRAN="gfortran ifc"
-inherit eutils fortran java-pkg-opt-2 toolchain-funcs
+inherit eutils java-pkg-opt-2 toolchain-funcs
DESCRIPTION="Molecular modeling package that includes force fields, such as AMBER and CHARMM"
HOMEPAGE="http://dasher.wustl.edu/tinker/"
@@ -21,12 +20,12 @@
dev-libs/maloc
!dev-util/diffuse
>=virtual/jre-1.6"
+
RESTRICT="mirror"
S="${WORKDIR}"/tinker/source
pkg_setup() {
- fortran_pkg_setup
java-pkg-opt-2_pkg_setup
}
@@ -42,7 +41,7 @@
done
emake -e \
-f ../make/Makefile \
- F77="${FORTRANC}" \
+ F77="$(tc-getFC)" \
CC="$(tc-getCC) -c" \
F77FLAGS=-c \
OPTFLAGS="${FFLAGS}" \
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sci-chemistry/tinker: tinker-6.ebuild ChangeLog tinker-5.1.09.ebuild
@ 2011-06-21 9:13 Justin Lecher (jlec)
0 siblings, 0 replies; 3+ messages in thread
From: Justin Lecher (jlec) @ 2011-06-21 9:13 UTC (permalink / raw
To: gentoo-commits
jlec 11/06/21 09:13:12
Modified: tinker-6.ebuild ChangeLog tinker-5.1.09.ebuild
Log:
Added fortran-2.eclass support
(Portage version: 2.2.0_alpha41/cvs/Linux x86_64)
Revision Changes Path
1.4 sci-chemistry/tinker/tinker-6.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/tinker/tinker-6.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/tinker/tinker-6.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/tinker/tinker-6.ebuild?r1=1.3&r2=1.4
Index: tinker-6.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/tinker/tinker-6.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tinker-6.ebuild 17 Dec 2010 08:07:54 -0000 1.3
+++ tinker-6.ebuild 21 Jun 2011 09:13:12 -0000 1.4
@@ -1,10 +1,10 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/tinker/tinker-6.ebuild,v 1.3 2010/12/17 08:07:54 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/tinker/tinker-6.ebuild,v 1.4 2011/06/21 09:13:12 jlec Exp $
-EAPI="2"
+EAPI=2
-inherit flag-o-matic java-pkg-opt-2 toolchain-funcs
+inherit flag-o-matic fortran-2 java-pkg-opt-2 toolchain-funcs
DESCRIPTION="Molecular modeling package that includes force fields, such as AMBER and CHARMM"
HOMEPAGE="http://dasher.wustl.edu/tinker/"
@@ -27,6 +27,7 @@
S="${WORKDIR}"/${PN}${PV}/source
pkg_setup() {
+ fortran-2_pkg_setup
java-pkg-opt-2_pkg_setup
tc-has-openmp || die "Please use an openmp capable compiler like gcc[openmp]"
}
1.31 sci-chemistry/tinker/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/tinker/ChangeLog?rev=1.31&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/tinker/ChangeLog?rev=1.31&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/tinker/ChangeLog?r1=1.30&r2=1.31
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/tinker/ChangeLog,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- ChangeLog 17 Dec 2010 08:07:54 -0000 1.30
+++ ChangeLog 21 Jun 2011 09:13:12 -0000 1.31
@@ -1,6 +1,10 @@
# ChangeLog for sci-chemistry/tinker
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/tinker/ChangeLog,v 1.30 2010/12/17 08:07:54 jlec Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/tinker/ChangeLog,v 1.31 2011/06/21 09:13:12 jlec Exp $
+
+ 21 Jun 2011; Justin Lecher <jlec@gentoo.org> tinker-5.1.09.ebuild,
+ tinker-6.ebuild:
+ Added fortran-2.eclass support
17 Dec 2010; Justin Lecher <jlec@gentoo.org> tinker-6.ebuild:
Fix for fortran.eclass removal
1.5 sci-chemistry/tinker/tinker-5.1.09.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/tinker/tinker-5.1.09.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/tinker/tinker-5.1.09.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/tinker/tinker-5.1.09.ebuild?r1=1.4&r2=1.5
Index: tinker-5.1.09.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/tinker/tinker-5.1.09.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- tinker-5.1.09.ebuild 16 Dec 2010 13:59:36 -0000 1.4
+++ tinker-5.1.09.ebuild 21 Jun 2011 09:13:12 -0000 1.5
@@ -1,10 +1,10 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/tinker/tinker-5.1.09.ebuild,v 1.4 2010/12/16 13:59:36 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/tinker/tinker-5.1.09.ebuild,v 1.5 2011/06/21 09:13:12 jlec Exp $
EAPI="2"
-inherit eutils java-pkg-opt-2 toolchain-funcs
+inherit eutils fortran-2 java-pkg-opt-2 toolchain-funcs
DESCRIPTION="Molecular modeling package that includes force fields, such as AMBER and CHARMM"
HOMEPAGE="http://dasher.wustl.edu/tinker/"
@@ -26,6 +26,7 @@
S="${WORKDIR}"/tinker/source
pkg_setup() {
+ fortran-2_pkg_setup
java-pkg-opt-2_pkg_setup
}
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sci-chemistry/tinker: tinker-6.ebuild ChangeLog tinker-5.1.09.ebuild
@ 2011-06-21 15:55 Justin Lecher (jlec)
0 siblings, 0 replies; 3+ messages in thread
From: Justin Lecher (jlec) @ 2011-06-21 15:55 UTC (permalink / raw
To: gentoo-commits
jlec 11/06/21 15:55:41
Modified: tinker-6.ebuild ChangeLog tinker-5.1.09.ebuild
Log:
Add dependency on virtual/fortran
(Portage version: 2.2.0_alpha41/cvs/Linux x86_64)
Revision Changes Path
1.5 sci-chemistry/tinker/tinker-6.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/tinker/tinker-6.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/tinker/tinker-6.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/tinker/tinker-6.ebuild?r1=1.4&r2=1.5
Index: tinker-6.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/tinker/tinker-6.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- tinker-6.ebuild 21 Jun 2011 09:13:12 -0000 1.4
+++ tinker-6.ebuild 21 Jun 2011 15:55:41 -0000 1.5
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/tinker/tinker-6.ebuild,v 1.4 2011/06/21 09:13:12 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/tinker/tinker-6.ebuild,v 1.5 2011/06/21 15:55:41 jlec Exp $
EAPI=2
@@ -15,7 +15,9 @@
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE="examples"
-DEPEND=">=virtual/jdk-1.6"
+DEPEND="
+ virtual/fortran
+ >=virtual/jdk-1.6"
RDEPEND="
>=sci-libs/fftw-3.2.2-r1[fortran,threads]
dev-libs/maloc
1.32 sci-chemistry/tinker/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/tinker/ChangeLog?rev=1.32&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/tinker/ChangeLog?rev=1.32&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/tinker/ChangeLog?r1=1.31&r2=1.32
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/tinker/ChangeLog,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- ChangeLog 21 Jun 2011 09:13:12 -0000 1.31
+++ ChangeLog 21 Jun 2011 15:55:41 -0000 1.32
@@ -1,6 +1,10 @@
# ChangeLog for sci-chemistry/tinker
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/tinker/ChangeLog,v 1.31 2011/06/21 09:13:12 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/tinker/ChangeLog,v 1.32 2011/06/21 15:55:41 jlec Exp $
+
+ 21 Jun 2011; Justin Lecher <jlec@gentoo.org> tinker-5.1.09.ebuild,
+ tinker-6.ebuild:
+ Add dependency on virtual/fortran
21 Jun 2011; Justin Lecher <jlec@gentoo.org> tinker-5.1.09.ebuild,
tinker-6.ebuild:
1.6 sci-chemistry/tinker/tinker-5.1.09.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/tinker/tinker-5.1.09.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/tinker/tinker-5.1.09.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/tinker/tinker-5.1.09.ebuild?r1=1.5&r2=1.6
Index: tinker-5.1.09.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/tinker/tinker-5.1.09.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- tinker-5.1.09.ebuild 21 Jun 2011 09:13:12 -0000 1.5
+++ tinker-5.1.09.ebuild 21 Jun 2011 15:55:41 -0000 1.6
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/tinker/tinker-5.1.09.ebuild,v 1.5 2011/06/21 09:13:12 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/tinker/tinker-5.1.09.ebuild,v 1.6 2011/06/21 15:55:41 jlec Exp $
EAPI="2"
@@ -15,7 +15,9 @@
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE="examples"
-DEPEND=">=virtual/jdk-1.6"
+DEPEND="
+ virtual/fortran
+ >=virtual/jdk-1.6"
RDEPEND="
dev-libs/maloc
!dev-util/diffuse
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-06-21 15:56 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-12-16 13:59 [gentoo-commits] gentoo-x86 commit in sci-chemistry/tinker: tinker-6.ebuild ChangeLog tinker-5.1.09.ebuild Justin Lecher (jlec)
-- strict thread matches above, loose matches on Subject: below --
2011-06-21 9:13 Justin Lecher (jlec)
2011-06-21 15:55 Justin Lecher (jlec)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox