From: Mike Gilbert Date: Wed, 26 Jun 2019 19:37:31 +0000 (-0400) Subject: Revert "virtual/{blas,cblas,lapack,lapacke}: add/update virtual packages." X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=ab892667224c65ec694d6adbda30c3a1eed67a92;p=gentoo.git Revert "virtual/{blas,cblas,lapack,lapacke}: add/update virtual packages." This reverts commit 5f8a985b71b033d7a7c4d252c00dd83669ee5913. This commit dropped all stable keywords on these packages, causing treewide depenency breakage. Signed-off-by: Mike Gilbert --- diff --git a/virtual/blas/blas-1.0.ebuild b/virtual/blas/blas-1.0.ebuild new file mode 100644 index 000000000000..83e7db925a5a --- /dev/null +++ b/virtual/blas/blas-1.0.ebuild @@ -0,0 +1,14 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +DESCRIPTION="Virtual for FORTRAN 77 BLAS implementation" +SLOT="0" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris" + +RDEPEND="|| ( + sci-libs/blas-reference + >=sci-libs/mkl-9.1.023 + sci-libs/blas-goto + )" diff --git a/virtual/blas/blas-3.8.ebuild b/virtual/blas/blas-3.8.ebuild deleted file mode 100644 index e3807aaa8c4a..000000000000 --- a/virtual/blas/blas-3.8.ebuild +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -DESCRIPTION="Virtual for FORTRAN 77 BLAS implementation" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris" -IUSE="eselect-ldso" - -RDEPEND=" - >=sci-libs/lapack-3.8.0[eselect-ldso?] -" -DEPEND="${RDEPEND}" diff --git a/virtual/blas/metadata.xml b/virtual/blas/metadata.xml index 35dd50fb4450..1b4d6e817c05 100644 --- a/virtual/blas/metadata.xml +++ b/virtual/blas/metadata.xml @@ -6,11 +6,7 @@ Gentoo Science Project - Gentoo virtual package for the Basic Linear Algebra Subprograms - FORTRAN 77 implementation. - - - Enable runtime library switching by - eselect and ld.so. - +Gentoo virtual package for the Basic Linear Algebra Subprograms +FORTRAN 77 implementation. + diff --git a/virtual/cblas/cblas-1.0.ebuild b/virtual/cblas/cblas-1.0.ebuild new file mode 100644 index 000000000000..4d8381244936 --- /dev/null +++ b/virtual/cblas/cblas-1.0.ebuild @@ -0,0 +1,14 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +DESCRIPTION="Virtual for BLAS C implementation" +SLOT="0" +KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" + +RDEPEND="|| ( + sci-libs/cblas-reference + sci-libs/gsl[-cblas-external] + >=sci-libs/mkl-9.1.023 + )" diff --git a/virtual/cblas/cblas-3.8.ebuild b/virtual/cblas/cblas-3.8.ebuild deleted file mode 100644 index 0b295963f8de..000000000000 --- a/virtual/cblas/cblas-3.8.ebuild +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -DESCRIPTION="Virtual for BLAS C implementation" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" -IUSE="eselect-ldso" - -RDEPEND=" - >=sci-libs/lapack-3.8.0[eselect-ldso?] -" -DEPEND="${RDEPEND}" diff --git a/virtual/cblas/metadata.xml b/virtual/cblas/metadata.xml index 204ea7552ca9..9aac1c20c93f 100644 --- a/virtual/cblas/metadata.xml +++ b/virtual/cblas/metadata.xml @@ -6,11 +6,7 @@ Gentoo Science Project - Gentoo virtual package for the Basic Linear Algebra Subprograms - C implementation. - - - Enable runtime library switching by - eselect and ld.so. - +Gentoo virtual package for the Basic Linear Algebra Subprograms +C implementation. + diff --git a/virtual/lapack/lapack-3.0.ebuild b/virtual/lapack/lapack-3.0.ebuild new file mode 100644 index 000000000000..38d1fae658da --- /dev/null +++ b/virtual/lapack/lapack-3.0.ebuild @@ -0,0 +1,13 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +DESCRIPTION="Virtual for Linear Algebra Package FORTRAN 77 (LAPACK) implementation" +SLOT="0" +KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd" + +RDEPEND="|| ( + sci-libs/lapack-reference + >=sci-libs/mkl-9.1.023 + )" diff --git a/virtual/lapack/lapack-3.1.ebuild b/virtual/lapack/lapack-3.1.ebuild new file mode 100644 index 000000000000..30d27aba4b40 --- /dev/null +++ b/virtual/lapack/lapack-3.1.ebuild @@ -0,0 +1,13 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +DESCRIPTION="Virtual for Linear Algebra Package FORTRAN 77 (LAPACK) implementation" +SLOT="0" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" + +RDEPEND="|| ( + >=sci-libs/lapack-reference-3.1 + >=sci-libs/mkl-10 + )" diff --git a/virtual/lapack/lapack-3.8.ebuild b/virtual/lapack/lapack-3.8.ebuild deleted file mode 100644 index 93ddd49d8b79..000000000000 --- a/virtual/lapack/lapack-3.8.ebuild +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Virtual for Linear Algebra Package FORTRAN 77 (LAPACK) implementation" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" -IUSE="eselect-ldso" - -RDEPEND=" - >=sci-libs/lapack-3.8.0[eselect-ldso?] -" -DEPEND="${RDEPEND}" diff --git a/virtual/lapack/metadata.xml b/virtual/lapack/metadata.xml index 0b91d851efe1..ccb7a1fa1fad 100644 --- a/virtual/lapack/metadata.xml +++ b/virtual/lapack/metadata.xml @@ -6,11 +6,7 @@ Gentoo Science Project - Gentoo virtual package for the Linear Algebra PACKAge - FORTRAN 77 implementation. - - - Enable runtime library switching by - eselect and ld.so. - +Gentoo virtual package for the Linear Algebra PACKAge +FORTRAN 77 implementation. + diff --git a/virtual/lapacke/lapacke-3.8.ebuild b/virtual/lapacke/lapacke-3.8.ebuild deleted file mode 100644 index fc61bf733e2e..000000000000 --- a/virtual/lapacke/lapacke-3.8.ebuild +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Virtual for LAPACK C implementation" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" -IUSE="eselect-ldso" - -RDEPEND=" - >=sci-libs/lapack-3.8.0[lapacke,eselect-ldso?] -" -DEPEND="${RDEPEND}" diff --git a/virtual/lapacke/metadata.xml b/virtual/lapacke/metadata.xml deleted file mode 100644 index 299f0ab2ab69..000000000000 --- a/virtual/lapacke/metadata.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - sci@gentoo.org - Gentoo Science Project - - - Gentoo virtual package for the Linear Algebra PACKAge C - implementation. - - - Enable runtime library switching by - eselect and ld.so. - -