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 <floppym@gentoo.org>

diff --git a/virtual/blas/blas-1.0.ebuild b/virtual/blas/blas-1.0.ebuild
new file mode 100644 (file)
index 0000000..83e7db9
--- /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 (file)
index e3807aa..0000000
--- 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 35dd50fb44504f977048122283a429339728e702..1b4d6e817c05fd4c54e13ff962bed04353caed0d 100644 (file)
--- a/virtual/blas/metadata.xml
+++ b/virtual/blas/metadata.xml
@@ -6,11 +6,7 @@
     <name>Gentoo Science Project</name>
   </maintainer>
   <longdescription lang="en">
-    Gentoo virtual package for the Basic Linear Algebra Subprograms
-    FORTRAN 77 implementation.
-  </longdescription>
-  <use>
-    <flag name="eselect-ldso">Enable runtime library switching by
-    eselect and ld.so.</flag>
-  </use>
+Gentoo virtual package for the Basic Linear Algebra Subprograms
+FORTRAN 77 implementation.
+</longdescription>
 </pkgmetadata>

diff --git a/virtual/cblas/cblas-1.0.ebuild b/virtual/cblas/cblas-1.0.ebuild
new file mode 100644 (file)
index 0000000..4d83812
--- /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 (file)
index 0b29596..0000000
--- 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 204ea7552ca95a69cd6feb6d19649d5d255859cf..9aac1c20c93f61a1b928d8840beacf8eb2c1ec1f 100644 (file)
--- a/virtual/cblas/metadata.xml
+++ b/virtual/cblas/metadata.xml
@@ -6,11 +6,7 @@
     <name>Gentoo Science Project</name>
   </maintainer>
   <longdescription lang="en">
-    Gentoo virtual package for the Basic Linear Algebra Subprograms
-    C implementation.
-  </longdescription>
-  <use>
-    <flag name="eselect-ldso">Enable runtime library switching by
-    eselect and ld.so.</flag>
-  </use>
+Gentoo virtual package for the Basic Linear Algebra Subprograms
+C implementation.
+</longdescription>
 </pkgmetadata>

diff --git a/virtual/lapack/lapack-3.0.ebuild b/virtual/lapack/lapack-3.0.ebuild
new file mode 100644 (file)
index 0000000..38d1fae
--- /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 (file)
index 0000000..30d27ab
--- /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 (file)
index 93ddd49..0000000
--- 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 0b91d851efe1cf6160adf2e0fb4cf800ec8adabd..ccb7a1fa1fad8161388f52f0d42fc74d3402990c 100644 (file)
--- a/virtual/lapack/metadata.xml
+++ b/virtual/lapack/metadata.xml
@@ -6,11 +6,7 @@
     <name>Gentoo Science Project</name>
   </maintainer>
   <longdescription lang="en">
-    Gentoo virtual package for the Linear Algebra PACKAge
-    FORTRAN 77 implementation.
-  </longdescription>
-  <use>
-    <flag name="eselect-ldso">Enable runtime library switching by
-    eselect and ld.so.</flag>
-  </use>
+Gentoo virtual package for the Linear Algebra PACKAge
+FORTRAN 77 implementation.
+</longdescription>
 </pkgmetadata>

diff --git a/virtual/lapacke/lapacke-3.8.ebuild b/virtual/lapacke/lapacke-3.8.ebuild
deleted file mode 100644 (file)
index fc61bf7..0000000
--- 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 (file)
index 299f0ab..0000000
--- a/virtual/lapacke/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>sci@gentoo.org</email>
-    <name>Gentoo Science Project</name>
-  </maintainer>
-  <longdescription lang="en">
-    Gentoo virtual package for the Linear Algebra PACKAge C
-    implementation.
-  </longdescription>
-  <use>
-    <flag name="eselect-ldso">Enable runtime library switching by
-    eselect and ld.so.</flag>
-  </use>
-</pkgmetadata>