diff --git a/sci-geosciences/grass/grass-8.4.1-r2.ebuild b/sci-geosciences/grass/grass-8.4.1-r2.ebuild index 94f9f50d6b11d..fb51cc79478cb 100644 --- a/sci-geosciences/grass/grass-8.4.1-r2.ebuild +++ b/sci-geosciences/grass/grass-8.4.1-r2.ebuild @@ -58,13 +58,24 @@ RDEPEND=" media-libs/libglvnd media-libs/glu blas? ( - virtual/cblas[eselect-ldso(+)] - virtual/blas[eselect-ldso(+)] + || ( + virtual/cblas[eselect-ldso(+)] + virtual/cblas[flexiblas(-)] + ) + || ( + virtual/blas[eselect-ldso(+)] + virtual/blas[flexiblas(-)] + ) ) bzip2? ( app-arch/bzip2:= ) fftw? ( sci-libs/fftw:3.0= ) geos? ( sci-libs/geos:= ) - lapack? ( virtual/lapack[eselect-ldso(+)] ) + lapack? ( + || ( + virtual/lapack[eselect-ldso(+)] + virtual/lapack[flexiblas(-)] + ) + ) mysql? ( dev-db/mysql-connector-c:= ) netcdf? ( sci-libs/netcdf:= ) odbc? ( dev-db/unixODBC ) @@ -115,7 +126,7 @@ pkg_pretend() { pkg_setup() { [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp - if use lapack; then + if use lapack && has_version "virtual/lapack[eselect-ldso(+)]"; then local mylapack=$(eselect lapack show) if [[ -z "${mylapack/.*reference.*/}" ]] && \ [[ -z "${mylapack/.*atlas.*/}" ]]; then @@ -126,7 +137,7 @@ pkg_setup() { fi fi - if use blas; then + if use blas && has_version "virtual/blas[eselect-ldso(+)]"; then local myblas=$(eselect blas show) if [[ -z "${myblas/.*reference.*/}" ]] && \ [[ -z "${myblas/.*atlas.*/}" ]]; then diff --git a/sci-geosciences/grass/grass-9999.ebuild b/sci-geosciences/grass/grass-9999.ebuild index b967fc11f0774..9921deb2b8580 100644 --- a/sci-geosciences/grass/grass-9999.ebuild +++ b/sci-geosciences/grass/grass-9999.ebuild @@ -58,13 +58,24 @@ RDEPEND=" media-libs/libglvnd media-libs/glu blas? ( - virtual/cblas[eselect-ldso(+)] - virtual/blas[eselect-ldso(+)] + || ( + virtual/cblas[eselect-ldso(+)] + virtual/cblas[flexiblas(-)] + ) + || ( + virtual/blas[eselect-ldso(+)] + virtual/blas[flexiblas(-)] + ) ) bzip2? ( app-arch/bzip2:= ) fftw? ( sci-libs/fftw:3.0= ) geos? ( sci-libs/geos:= ) - lapack? ( virtual/lapack[eselect-ldso(+)] ) + lapack? ( + || ( + virtual/lapack[eselect-ldso(+)] + virtual/lapack[flexiblas(-)] + ) + ) mysql? ( dev-db/mysql-connector-c:= ) netcdf? ( sci-libs/netcdf:= ) odbc? ( dev-db/unixODBC ) @@ -108,7 +119,7 @@ pkg_pretend() { pkg_setup() { [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp - if use lapack; then + if use lapack && has_version "virtual/lapack[eselect-ldso(+)]"; then local mylapack=$(eselect lapack show) if [[ -z "${mylapack/.*reference.*/}" ]] && \ [[ -z "${mylapack/.*atlas.*/}" ]]; then @@ -119,7 +130,7 @@ pkg_setup() { fi fi - if use blas; then + if use blas && has_version "virtual/blas[eselect-ldso(+)]"; then local myblas=$(eselect blas show) if [[ -z "${myblas/.*reference.*/}" ]] && \ [[ -z "${myblas/.*atlas.*/}" ]]; then