1 |
commit: ab892667224c65ec694d6adbda30c3a1eed67a92 |
2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Jun 26 19:37:31 2019 +0000 |
4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jun 26 20:31:37 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab892667 |
7 |
|
8 |
Revert "virtual/{blas,cblas,lapack,lapacke}: add/update virtual packages." |
9 |
|
10 |
This reverts commit 5f8a985b71b033d7a7c4d252c00dd83669ee5913. |
11 |
|
12 |
This commit dropped all stable keywords on these packages, causing |
13 |
treewide depenency breakage. |
14 |
|
15 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
16 |
|
17 |
virtual/blas/blas-1.0.ebuild | 14 ++++++++++++++ |
18 |
virtual/blas/blas-3.8.ebuild | 14 -------------- |
19 |
virtual/blas/metadata.xml | 10 +++------- |
20 |
virtual/cblas/cblas-1.0.ebuild | 14 ++++++++++++++ |
21 |
virtual/cblas/cblas-3.8.ebuild | 14 -------------- |
22 |
virtual/cblas/metadata.xml | 10 +++------- |
23 |
virtual/lapack/lapack-3.0.ebuild | 13 +++++++++++++ |
24 |
virtual/lapack/lapack-3.1.ebuild | 13 +++++++++++++ |
25 |
virtual/lapack/lapack-3.8.ebuild | 14 -------------- |
26 |
virtual/lapack/metadata.xml | 10 +++------- |
27 |
virtual/lapacke/lapacke-3.8.ebuild | 14 -------------- |
28 |
virtual/lapacke/metadata.xml | 16 ---------------- |
29 |
12 files changed, 63 insertions(+), 93 deletions(-) |
30 |
|
31 |
diff --git a/virtual/blas/blas-1.0.ebuild b/virtual/blas/blas-1.0.ebuild |
32 |
new file mode 100644 |
33 |
index 00000000000..83e7db925a5 |
34 |
--- /dev/null |
35 |
+++ b/virtual/blas/blas-1.0.ebuild |
36 |
@@ -0,0 +1,14 @@ |
37 |
+# Copyright 1999-2019 Gentoo Authors |
38 |
+# Distributed under the terms of the GNU General Public License v2 |
39 |
+ |
40 |
+EAPI=5 |
41 |
+ |
42 |
+DESCRIPTION="Virtual for FORTRAN 77 BLAS implementation" |
43 |
+SLOT="0" |
44 |
+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" |
45 |
+ |
46 |
+RDEPEND="|| ( |
47 |
+ sci-libs/blas-reference |
48 |
+ >=sci-libs/mkl-9.1.023 |
49 |
+ sci-libs/blas-goto |
50 |
+ )" |
51 |
|
52 |
diff --git a/virtual/blas/blas-3.8.ebuild b/virtual/blas/blas-3.8.ebuild |
53 |
deleted file mode 100644 |
54 |
index e3807aaa8c4..00000000000 |
55 |
--- a/virtual/blas/blas-3.8.ebuild |
56 |
+++ /dev/null |
57 |
@@ -1,14 +0,0 @@ |
58 |
-# Copyright 1999-2019 Gentoo Authors |
59 |
-# Distributed under the terms of the GNU General Public License v2 |
60 |
- |
61 |
-EAPI="7" |
62 |
- |
63 |
-DESCRIPTION="Virtual for FORTRAN 77 BLAS implementation" |
64 |
-SLOT="0" |
65 |
-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" |
66 |
-IUSE="eselect-ldso" |
67 |
- |
68 |
-RDEPEND=" |
69 |
- >=sci-libs/lapack-3.8.0[eselect-ldso?] |
70 |
-" |
71 |
-DEPEND="${RDEPEND}" |
72 |
|
73 |
diff --git a/virtual/blas/metadata.xml b/virtual/blas/metadata.xml |
74 |
index 35dd50fb445..1b4d6e817c0 100644 |
75 |
--- a/virtual/blas/metadata.xml |
76 |
+++ b/virtual/blas/metadata.xml |
77 |
@@ -6,11 +6,7 @@ |
78 |
<name>Gentoo Science Project</name> |
79 |
</maintainer> |
80 |
<longdescription lang="en"> |
81 |
- Gentoo virtual package for the Basic Linear Algebra Subprograms |
82 |
- FORTRAN 77 implementation. |
83 |
- </longdescription> |
84 |
- <use> |
85 |
- <flag name="eselect-ldso">Enable runtime library switching by |
86 |
- eselect and ld.so.</flag> |
87 |
- </use> |
88 |
+Gentoo virtual package for the Basic Linear Algebra Subprograms |
89 |
+FORTRAN 77 implementation. |
90 |
+</longdescription> |
91 |
</pkgmetadata> |
92 |
|
93 |
diff --git a/virtual/cblas/cblas-1.0.ebuild b/virtual/cblas/cblas-1.0.ebuild |
94 |
new file mode 100644 |
95 |
index 00000000000..4d838124493 |
96 |
--- /dev/null |
97 |
+++ b/virtual/cblas/cblas-1.0.ebuild |
98 |
@@ -0,0 +1,14 @@ |
99 |
+# Copyright 1999-2017 Gentoo Foundation |
100 |
+# Distributed under the terms of the GNU General Public License v2 |
101 |
+ |
102 |
+EAPI=5 |
103 |
+ |
104 |
+DESCRIPTION="Virtual for BLAS C implementation" |
105 |
+SLOT="0" |
106 |
+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" |
107 |
+ |
108 |
+RDEPEND="|| ( |
109 |
+ sci-libs/cblas-reference |
110 |
+ sci-libs/gsl[-cblas-external] |
111 |
+ >=sci-libs/mkl-9.1.023 |
112 |
+ )" |
113 |
|
114 |
diff --git a/virtual/cblas/cblas-3.8.ebuild b/virtual/cblas/cblas-3.8.ebuild |
115 |
deleted file mode 100644 |
116 |
index 0b295963f8d..00000000000 |
117 |
--- a/virtual/cblas/cblas-3.8.ebuild |
118 |
+++ /dev/null |
119 |
@@ -1,14 +0,0 @@ |
120 |
-# Copyright 1999-2019 Gentoo Authors |
121 |
-# Distributed under the terms of the GNU General Public License v2 |
122 |
- |
123 |
-EAPI="7" |
124 |
- |
125 |
-DESCRIPTION="Virtual for BLAS C implementation" |
126 |
-SLOT="0" |
127 |
-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" |
128 |
-IUSE="eselect-ldso" |
129 |
- |
130 |
-RDEPEND=" |
131 |
- >=sci-libs/lapack-3.8.0[eselect-ldso?] |
132 |
-" |
133 |
-DEPEND="${RDEPEND}" |
134 |
|
135 |
diff --git a/virtual/cblas/metadata.xml b/virtual/cblas/metadata.xml |
136 |
index 204ea7552ca..9aac1c20c93 100644 |
137 |
--- a/virtual/cblas/metadata.xml |
138 |
+++ b/virtual/cblas/metadata.xml |
139 |
@@ -6,11 +6,7 @@ |
140 |
<name>Gentoo Science Project</name> |
141 |
</maintainer> |
142 |
<longdescription lang="en"> |
143 |
- Gentoo virtual package for the Basic Linear Algebra Subprograms |
144 |
- C implementation. |
145 |
- </longdescription> |
146 |
- <use> |
147 |
- <flag name="eselect-ldso">Enable runtime library switching by |
148 |
- eselect and ld.so.</flag> |
149 |
- </use> |
150 |
+Gentoo virtual package for the Basic Linear Algebra Subprograms |
151 |
+C implementation. |
152 |
+</longdescription> |
153 |
</pkgmetadata> |
154 |
|
155 |
diff --git a/virtual/lapack/lapack-3.0.ebuild b/virtual/lapack/lapack-3.0.ebuild |
156 |
new file mode 100644 |
157 |
index 00000000000..38d1fae658d |
158 |
--- /dev/null |
159 |
+++ b/virtual/lapack/lapack-3.0.ebuild |
160 |
@@ -0,0 +1,13 @@ |
161 |
+# Copyright 1999-2017 Gentoo Foundation |
162 |
+# Distributed under the terms of the GNU General Public License v2 |
163 |
+ |
164 |
+EAPI=5 |
165 |
+ |
166 |
+DESCRIPTION="Virtual for Linear Algebra Package FORTRAN 77 (LAPACK) implementation" |
167 |
+SLOT="0" |
168 |
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd" |
169 |
+ |
170 |
+RDEPEND="|| ( |
171 |
+ sci-libs/lapack-reference |
172 |
+ >=sci-libs/mkl-9.1.023 |
173 |
+ )" |
174 |
|
175 |
diff --git a/virtual/lapack/lapack-3.1.ebuild b/virtual/lapack/lapack-3.1.ebuild |
176 |
new file mode 100644 |
177 |
index 00000000000..30d27aba4b4 |
178 |
--- /dev/null |
179 |
+++ b/virtual/lapack/lapack-3.1.ebuild |
180 |
@@ -0,0 +1,13 @@ |
181 |
+# Copyright 1999-2019 Gentoo Authors |
182 |
+# Distributed under the terms of the GNU General Public License v2 |
183 |
+ |
184 |
+EAPI=5 |
185 |
+ |
186 |
+DESCRIPTION="Virtual for Linear Algebra Package FORTRAN 77 (LAPACK) implementation" |
187 |
+SLOT="0" |
188 |
+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" |
189 |
+ |
190 |
+RDEPEND="|| ( |
191 |
+ >=sci-libs/lapack-reference-3.1 |
192 |
+ >=sci-libs/mkl-10 |
193 |
+ )" |
194 |
|
195 |
diff --git a/virtual/lapack/lapack-3.8.ebuild b/virtual/lapack/lapack-3.8.ebuild |
196 |
deleted file mode 100644 |
197 |
index 93ddd49d8b7..00000000000 |
198 |
--- a/virtual/lapack/lapack-3.8.ebuild |
199 |
+++ /dev/null |
200 |
@@ -1,14 +0,0 @@ |
201 |
-# Copyright 1999-2019 Gentoo Authors |
202 |
-# Distributed under the terms of the GNU General Public License v2 |
203 |
- |
204 |
-EAPI=7 |
205 |
- |
206 |
-DESCRIPTION="Virtual for Linear Algebra Package FORTRAN 77 (LAPACK) implementation" |
207 |
-SLOT="0" |
208 |
-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" |
209 |
-IUSE="eselect-ldso" |
210 |
- |
211 |
-RDEPEND=" |
212 |
- >=sci-libs/lapack-3.8.0[eselect-ldso?] |
213 |
-" |
214 |
-DEPEND="${RDEPEND}" |
215 |
|
216 |
diff --git a/virtual/lapack/metadata.xml b/virtual/lapack/metadata.xml |
217 |
index 0b91d851efe..ccb7a1fa1fa 100644 |
218 |
--- a/virtual/lapack/metadata.xml |
219 |
+++ b/virtual/lapack/metadata.xml |
220 |
@@ -6,11 +6,7 @@ |
221 |
<name>Gentoo Science Project</name> |
222 |
</maintainer> |
223 |
<longdescription lang="en"> |
224 |
- Gentoo virtual package for the Linear Algebra PACKAge |
225 |
- FORTRAN 77 implementation. |
226 |
- </longdescription> |
227 |
- <use> |
228 |
- <flag name="eselect-ldso">Enable runtime library switching by |
229 |
- eselect and ld.so.</flag> |
230 |
- </use> |
231 |
+Gentoo virtual package for the Linear Algebra PACKAge |
232 |
+FORTRAN 77 implementation. |
233 |
+</longdescription> |
234 |
</pkgmetadata> |
235 |
|
236 |
diff --git a/virtual/lapacke/lapacke-3.8.ebuild b/virtual/lapacke/lapacke-3.8.ebuild |
237 |
deleted file mode 100644 |
238 |
index fc61bf733e2..00000000000 |
239 |
--- a/virtual/lapacke/lapacke-3.8.ebuild |
240 |
+++ /dev/null |
241 |
@@ -1,14 +0,0 @@ |
242 |
-# Copyright 1999-2019 Gentoo Authors |
243 |
-# Distributed under the terms of the GNU General Public License v2 |
244 |
- |
245 |
-EAPI=7 |
246 |
- |
247 |
-DESCRIPTION="Virtual for LAPACK C implementation" |
248 |
-SLOT="0" |
249 |
-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" |
250 |
-IUSE="eselect-ldso" |
251 |
- |
252 |
-RDEPEND=" |
253 |
- >=sci-libs/lapack-3.8.0[lapacke,eselect-ldso?] |
254 |
-" |
255 |
-DEPEND="${RDEPEND}" |
256 |
|
257 |
diff --git a/virtual/lapacke/metadata.xml b/virtual/lapacke/metadata.xml |
258 |
deleted file mode 100644 |
259 |
index 299f0ab2ab6..00000000000 |
260 |
--- a/virtual/lapacke/metadata.xml |
261 |
+++ /dev/null |
262 |
@@ -1,16 +0,0 @@ |
263 |
-<?xml version="1.0" encoding="UTF-8"?> |
264 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
265 |
-<pkgmetadata> |
266 |
- <maintainer type="project"> |
267 |
- <email>sci@g.o</email> |
268 |
- <name>Gentoo Science Project</name> |
269 |
- </maintainer> |
270 |
- <longdescription lang="en"> |
271 |
- Gentoo virtual package for the Linear Algebra PACKAge C |
272 |
- implementation. |
273 |
- </longdescription> |
274 |
- <use> |
275 |
- <flag name="eselect-ldso">Enable runtime library switching by |
276 |
- eselect and ld.so.</flag> |
277 |
- </use> |
278 |
-</pkgmetadata> |