commit: ab892667224c65ec694d6adbda30c3a1eed67a92
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 26 19:37:31 2019 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Wed Jun 26 20:31:37 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab892667
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 <AT> gentoo.org>
virtual/blas/blas-1.0.ebuild | 14 ++++++++++++++
virtual/blas/blas-3.8.ebuild | 14 --------------
virtual/blas/metadata.xml | 10 +++-------
virtual/cblas/cblas-1.0.ebuild | 14 ++++++++++++++
virtual/cblas/cblas-3.8.ebuild | 14 --------------
virtual/cblas/metadata.xml | 10 +++-------
virtual/lapack/lapack-3.0.ebuild | 13 +++++++++++++
virtual/lapack/lapack-3.1.ebuild | 13 +++++++++++++
virtual/lapack/lapack-3.8.ebuild | 14 --------------
virtual/lapack/metadata.xml | 10 +++-------
virtual/lapacke/lapacke-3.8.ebuild | 14 --------------
virtual/lapacke/metadata.xml | 16 ----------------
12 files changed, 63 insertions(+), 93 deletions(-)
diff --git a/virtual/blas/blas-1.0.ebuild b/virtual/blas/blas-1.0.ebuild
new file mode 100644
index 00000000000..83e7db925a5
--- /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 e3807aaa8c4..00000000000
--- 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 35dd50fb445..1b4d6e817c0 100644
--- 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
index 00000000000..4d838124493
--- /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 0b295963f8d..00000000000
--- 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 204ea7552ca..9aac1c20c93 100644
--- 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
index 00000000000..38d1fae658d
--- /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 00000000000..30d27aba4b4
--- /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 93ddd49d8b7..00000000000
--- 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 0b91d851efe..ccb7a1fa1fa 100644
--- 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
index fc61bf733e2..00000000000
--- 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 299f0ab2ab6..00000000000
--- 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>[email protected]</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>
