--- file_not_specified_in_diff +++ file_not_specified_in_diff @@ -22,1 +22,1 @@ -IUSE="lapack" --- +IUSE="lapack fortran" @@ -29,2 +29,0 @@ -FORTRAN="gfortran g77" - @@ -77,27 +75,33 @@ - # Map compilers to what numpy calls them (same as scipy) - case "${FORTRANC}" in - gfortran) - NUMPY_FC="gnu95" - ;; - g77) - NUMPY_FC="gnu" - ;; - g95) - NUMPY_FC="g95" - ;; - ifc|ifort) - if use ia64; then - NUMPY_FC="intele" - elif use amd64; then - NUMPY_FC="intelem" - else - NUMPY_FC="intel" - fi - ;; - *) - local msg="Invalid Fortran compiler \'${FORTRANC}\'" - eerror "${msg}" - die "${msg}" - ;; - esac - export NUMPY_FC --- + if use fortran; then + + # This will set FORTRANC + need_fortran "gfortran g77" + + # Map compilers to what numpy calls them (same as scipy) + case "${FORTRANC}" in + gfortran) + NUMPY_FC="gnu95" + ;; + g77) + NUMPY_FC="gnu" + ;; + g95) + NUMPY_FC="g95" + ;; + ifc|ifort) + if use ia64; then + NUMPY_FC="intele" + elif use amd64; then + NUMPY_FC="intelem" + else + NUMPY_FC="intel" + fi + ;; + *) + local msg="Invalid Fortran compiler \'${FORTRANC}\'" + eerror "${msg}" + die "${msg}" + ;; + esac + export NUMPY_FC + fi @@ -152,0 +156,7 @@ +# Horrible kludge to avoid fortran.eclass::fortran_pkg_setup() +# to be called by the global "inherit fortran" +# Suggested in: https://bugs.gentoo.org/show_bug.cgi?id=186913 +pkg_setup() { + true +} +