commit: 10ca5ce93db9891fc72dfd08d9b5bbc37feaa154 Author: Alfred Wingate <parona <AT> protonmail <DOT> com> AuthorDate: Tue Nov 18 05:22:32 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Dec 1 02:27:44 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10ca5ce9
sci-geosciences/grass: allow flexiblas Bug: https://bugs.gentoo.org/965270 Signed-off-by: Alfred Wingate <parona <AT> protonmail.com> Part-of: https://github.com/gentoo/gentoo/pull/44664 Closes: https://github.com/gentoo/gentoo/pull/44664 Signed-off-by: Sam James <sam <AT> gentoo.org> sci-geosciences/grass/grass-8.4.1-r2.ebuild | 21 ++++++++++++++++----- sci-geosciences/grass/grass-9999.ebuild | 21 ++++++++++++++++----- 2 files changed, 32 insertions(+), 10 deletions(-) diff --git a/sci-geosciences/grass/grass-8.4.1-r2.ebuild b/sci-geosciences/grass/grass-8.4.1-r2.ebuild index 94f9f50d6b11..fb51cc79478c 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 b967fc11f077..9921deb2b858 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
