[gentoo-commits] gentoo-x86 commit in sci-chemistry/ccp4-apps: ChangeLog ccp4-apps-6.1.3-r5.ebuild ccp4-apps-6.1.3-r4.ebuild ccp4-apps-6.1.3-r1.ebuild ccp4-apps-6.1.3-r2.ebuild

[gentoo-commits] gentoo-x86 commit in sci-chemistry/ccp4-apps: ChangeLog ccp4-apps-6.1.3-r5.ebuild ccp4-apps-6.1.3-r4.ebuild ccp4-apps-6.1.3-r1.ebuild ccp4-apps-6.1.3-r2.ebuild

[Justin Lecher (jlec)]

jlec        10/12/16 13:17:53

  Modified:             ChangeLog ccp4-apps-6.1.3-r5.ebuild
  Removed:              ccp4-apps-6.1.3-r4.ebuild ccp4-apps-6.1.3-r1.ebuild
                        ccp4-apps-6.1.3-r2.ebuild
  Log:
  Removal of fortran.eclass, #348851
  
  (Portage version: 2.2.0_alpha8/cvs/Linux x86_64)

Revision  Changes    Path
1.17                 sci-chemistry/ccp4-apps/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/ccp4-apps/ChangeLog?rev=1.17&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/ccp4-apps/ChangeLog?rev=1.17&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/ccp4-apps/ChangeLog?r1=1.16&r2=1.17

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/ccp4-apps/ChangeLog,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ChangeLog	2 Dec 2010 07:25:57 -0000	1.16
+++ ChangeLog	16 Dec 2010 13:17:53 -0000	1.17
@@ -1,6 +1,11 @@
 # ChangeLog for sci-chemistry/ccp4-apps
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccp4-apps/ChangeLog,v 1.16 2010/12/02 07:25:57 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccp4-apps/ChangeLog,v 1.17 2010/12/16 13:17:53 jlec Exp $
+
+  16 Dec 2010; Justin Lecher <jlec@gentoo.org> -ccp4-apps-6.1.3-r1.ebuild,
+  -ccp4-apps-6.1.3-r2.ebuild, -ccp4-apps-6.1.3-r4.ebuild,
+  ccp4-apps-6.1.3-r5.ebuild:
+  Removal of fortran.eclass, #348851
 
   02 Dec 2010; Justin Lecher <jlec@gentoo.org> ccp4-apps-6.1.3-r1.ebuild,
   ccp4-apps-6.1.3-r2.ebuild, ccp4-apps-6.1.3-r4.ebuild,



1.3                  sci-chemistry/ccp4-apps/ccp4-apps-6.1.3-r5.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/ccp4-apps/ccp4-apps-6.1.3-r5.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/ccp4-apps/ccp4-apps-6.1.3-r5.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/ccp4-apps/ccp4-apps-6.1.3-r5.ebuild?r1=1.2&r2=1.3

Index: ccp4-apps-6.1.3-r5.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/ccp4-apps/ccp4-apps-6.1.3-r5.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ccp4-apps-6.1.3-r5.ebuild	2 Dec 2010 07:25:57 -0000	1.2
+++ ccp4-apps-6.1.3-r5.ebuild	16 Dec 2010 13:17:53 -0000	1.3
@@ -1,14 +1,12 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccp4-apps/ccp4-apps-6.1.3-r5.ebuild,v 1.2 2010/12/02 07:25:57 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccp4-apps/ccp4-apps-6.1.3-r5.ebuild,v 1.3 2010/12/16 13:17:53 jlec Exp $
 
 EAPI="3"
 
 PYTHON_DEPEND="2"
 
-inherit autotools eutils flag-o-matic fortran gnuconfig python toolchain-funcs
-
-FORTRAN="g77 gfortran ifc"
+inherit autotools eutils flag-o-matic gnuconfig python toolchain-funcs
 
 MY_P="${PN/-apps}-${PV}"
 
@@ -106,7 +104,6 @@
 
 pkg_setup() {
 	python_set_active_version 2
-	fortran_pkg_setup
 }
 
 src_prepare() {
@@ -116,7 +113,7 @@
 		dir=$(eval echo \${${base}[0]})
 		p=$(eval echo \${${base}[1]})
 		pushd "${dir}" >& /dev/null
-		ccp_patch ${DISTDIR}/"${p}"
+		ccp_patch "${DISTDIR}/${p}"
 		popd >& /dev/null
 	done
 	einfo "Done."
@@ -209,7 +206,7 @@
 	# irix irix64 sunos sunos64 aix hpux osf1 linux freebsd
 	# linux_compaq_compilers linux_intel_compilers generic Darwin
 	# ia64_linux_intel Darwin_ibm_compilers linux_ibm_compilers
-	if [[ "${FORTRANC}" = "ifc" ]]; then
+	if [[ "$(tc-getFC)" = "ifort" ]]; then
 		if use ia64; then
 			GENTOO_OSNAME="ia64_linux_intel"
 		else
@@ -249,7 +246,7 @@
 	export COPTIM=${CFLAGS}
 	export CXXOPTIM=${CXXFLAGS}
 	# Default to -O2 if FFLAGS is unset
-	export FC=${FORTRANC}
+	export FC=$(tc-getFC)
 	export FOPTIM=${FFLAGS:- -O2}
 	export BINSORT_SCR="${T}"
 	export CCP4_MASTER="${WORKDIR}"