[gentoo-commits] proj/sci:master commit in: sci-libs/gmsh/

["Justin Lecher" <jlec@gentoo.org>]

commit:     e37b8da0878e4041cce13cf4db10a7347b2bf675
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 21 11:03:35 2011 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Tue Jun 21 11:03:35 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=e37b8da0

Added fortran-2.eclass support

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

---
 sci-libs/gmsh/ChangeLog         |    4 ++
 sci-libs/gmsh/gmsh-2.5.0.ebuild |   17 ++++++----
 sci-libs/gmsh/gmsh-9999.ebuild  |   64 +++++++++++++++++++-------------------
 3 files changed, 46 insertions(+), 39 deletions(-)

diff --git a/sci-libs/gmsh/ChangeLog b/sci-libs/gmsh/ChangeLog
index 86517a6..e86d61d 100644
--- a/sci-libs/gmsh/ChangeLog
+++ b/sci-libs/gmsh/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  21 Jun 2011; Justin Lecher <jlec@gentoo.org> gmsh-2.5.0.ebuild,
+  gmsh-9999.ebuild:
+  Added fortran-2.eclass support
+
   27 Mar 2011; Justin Lecher <jlec@gentoo.org> gmsh-2.5.0.ebuild,
   gmsh-9999.ebuild:
   Corrected slot of fltk, #360641

diff --git a/sci-libs/gmsh/gmsh-2.5.0.ebuild b/sci-libs/gmsh/gmsh-2.5.0.ebuild
index 5a0f15d..8d95799 100644
--- a/sci-libs/gmsh/gmsh-2.5.0.ebuild
+++ b/sci-libs/gmsh/gmsh-2.5.0.ebuild
@@ -2,11 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header:  $
 
-EAPI="3"
+EAPI=3
 
-inherit cmake-utils flag-o-matic toolchain-funcs
+inherit cmake-utils flag-o-matic fortran-2 toolchain-funcs
 
-DESCRIPTION="A three-dimensional finite element mesh generator with built-in pre- and post-processing facilities."
+DESCRIPTION="A three-dimensional finite element mesh generator with built-in pre- and post-processing facilities"
 HOMEPAGE="http://www.geuz.org/gmsh/"
 SRC_URI="http://www.geuz.org/gmsh/src/${P}-source.tgz"
 
@@ -17,7 +17,8 @@ KEYWORDS="~amd64 ~x86"
 ## cgns is not compiling ATM, maybe fix cgns lib first
 IUSE="blas chaco cgns doc examples jpeg lua med metis mpi netgen opencascade png petsc taucs tetgen zlib X"
 
-RDEPEND="X? ( x11-libs/fltk:1 )
+RDEPEND="
+	X? ( x11-libs/fltk:1 )
 	blas? ( virtual/blas virtual/lapack sci-libs/fftw:3.0 )
 	cgns? ( sci-libs/cgnslib )
 	jpeg? ( virtual/jpeg )
@@ -42,10 +43,12 @@ S=${WORKDIR}/${P}-source
 
 src_configure() {
 	local mycmakeargs=""
-	use blas && mycmakeargs="${mycmakeargs}
-		-DCMAKE_Fortran_COMPILER=$(tc-getF77)"
+	use blas && \
+		mycmakeargs="${mycmakeargs}
+			-DCMAKE_Fortran_COMPILER=$(tc-getF77)"
 
-	mycmakeargs="${mycmakeargs} $(cmake-utils_use_enable blas BLAS_LAPACK)
+	mycmakeargs="${mycmakeargs}
+		$(cmake-utils_use_enable blas BLAS_LAPACK)
 		$(cmake-utils_use_enable cgns CGNS)
 		$(cmake-utils_use_enable chaco CHACO)
 		$(cmake-utils_use_enable X FLTK)

diff --git a/sci-libs/gmsh/gmsh-9999.ebuild b/sci-libs/gmsh/gmsh-9999.ebuild
index c32c95f..a0d5757 100644
--- a/sci-libs/gmsh/gmsh-9999.ebuild
+++ b/sci-libs/gmsh/gmsh-9999.ebuild
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header:  $
 
-EAPI="2"
+EAPI=2
 
-inherit cmake-utils flag-o-matic subversion toolchain-funcs
+inherit cmake-utils flag-o-matic fortran-2 subversion toolchain-funcs
 
 DESCRIPTION="A three-dimensional finite element mesh generator with built-in pre- and post-processing facilities."
 HOMEPAGE="http://www.geuz.org/gmsh/"
@@ -17,27 +17,25 @@ SLOT="0"
 KEYWORDS=""
 IUSE="blas chaco cgns doc examples jpeg med metis mpi opencascade png taucs zlib X"
 
-RDEPEND="X? ( x11-libs/fltk:1 )
-		blas? ( virtual/blas virtual/lapack sci-libs/fftw:3.0 )
-		cgns? ( sci-libs/cgnslib )
-		jpeg? ( virtual/jpeg )
-		med? ( >=sci-libs/med-2.3.4 )
-		mpi? ( sys-cluster/openmpi[cxx] )
-		opencascade? ( sci-libs/opencascade )
-		png? ( media-libs/libpng )
-		zlib? ( sys-libs/zlib )
-		taucs? ( sci-libs/taucs )"
+RDEPEND="
+	X? ( x11-libs/fltk:1 )
+	blas? ( virtual/blas virtual/lapack sci-libs/fftw:3.0 )
+	cgns? ( sci-libs/cgnslib )
+	jpeg? ( virtual/jpeg )
+	med? ( >=sci-libs/med-2.3.4 )
+	mpi? ( sys-cluster/openmpi[cxx] )
+	opencascade? ( sci-libs/opencascade )
+	png? ( media-libs/libpng )
+	zlib? ( sys-libs/zlib )
+	taucs? ( sci-libs/taucs )"
 
 DEPEND="${RDEPEND}
-		dev-util/cmake
-		dev-vcs/subversion
-		doc? ( virtual/latex-base )"
+	dev-util/cmake
+	dev-vcs/subversion
+	doc? ( virtual/latex-base )"
 
 pkg_setup() {
-	ewarn "Put the F77 variable in env files to select your fortran compiler"
-	ewarn "example for gfortran:"
-	ewarn "echo \"F77=gfortran\" >> /etc/portage/env/sci-libs/gmsh"
-
+	fortran-2_pkg_setup
 	use taucs && ! use metis && \
 		die "taucs USE flag requires metis USE flag to be enabled"
 }
@@ -45,19 +43,21 @@ pkg_setup() {
 src_configure() {
 	local mycmakeargs=""
 
-	use blas && mycmakeargs="${mycmakeargs}
-						-DCMAKE_Fortran_COMPILER=$(tc-getF77)"
-
-	mycmakeargs="${mycmakeargs} $(cmake-utils_use_enable blas BLAS_LAPACK)
-								$(cmake-utils_use_enable cgns CGNS)
-								$(cmake-utils_use_enable chaco CHACO)
-								$(cmake-utils_use_enable X FLTK)
-								$(cmake-utils_use_enable X FL_TREE)
-								$(cmake-utils_use_enable X GRAPHICS)
-								$(cmake-utils_use_enable med MED)
-								$(cmake-utils_use_enable metis METIS)
-								$(cmake-utils_use_enable taucs TAUCS)
-								$(cmake-utils_use_enable opencascade OCC)"
+	use blas && \
+		mycmakeargs="${mycmakeargs}
+			-DCMAKE_Fortran_COMPILER=$(tc-getF77)"
+
+	mycmakeargs="${mycmakeargs}
+		$(cmake-utils_use_enable blas BLAS_LAPACK)
+		$(cmake-utils_use_enable cgns CGNS)
+		$(cmake-utils_use_enable chaco CHACO)
+		$(cmake-utils_use_enable X FLTK)
+		$(cmake-utils_use_enable X FL_TREE)
+		$(cmake-utils_use_enable X GRAPHICS)
+		$(cmake-utils_use_enable med MED)
+		$(cmake-utils_use_enable metis METIS)
+		$(cmake-utils_use_enable taucs TAUCS)
+		$(cmake-utils_use_enable opencascade OCC)"
 
 #    I'm not sure if this is needed, but it seems to help in some circumstances
 #    see http://bugs.gentoo.org/show_bug.cgi?id=195980#c18