Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/scikits_learn/, sci-libs/scikits_learn/files/
Date: Sun, 29 Dec 2019 08:53:40
Message-Id: 1577609592.4b745c04e33c0393c2640637622046f78c2c5636.soap@gentoo
1 commit: 4b745c04e33c0393c2640637622046f78c2c5636
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Sun Dec 29 08:53:12 2019 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Sun Dec 29 08:53:12 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b745c04
7
8 sci-libs/scikits_learn: Remove old
9
10 Package-Manager: Portage-2.3.83, Repoman-2.3.20
11 Signed-off-by: David Seifert <soap <AT> gentoo.org>
12
13 sci-libs/scikits_learn/Manifest | 4 -
14 .../files/scikits_learn-0.14.1-system-cblas.patch | 28 -----
15 .../files/scikits_learn-0.17.1-system-cblas.patch | 30 -----
16 sci-libs/scikits_learn/scikits_learn-0.17.1.ebuild | 117 -------------------
17 sci-libs/scikits_learn/scikits_learn-0.17.ebuild | 117 -------------------
18 sci-libs/scikits_learn/scikits_learn-0.18.1.ebuild | 120 --------------------
19 .../scikits_learn/scikits_learn-0.18.2-r1.ebuild | 124 ---------------------
20 sci-libs/scikits_learn/scikits_learn-0.18.2.ebuild | 120 --------------------
21 sci-libs/scikits_learn/scikits_learn-0.19.0.ebuild | 107 ------------------
22 9 files changed, 767 deletions(-)
23
24 diff --git a/sci-libs/scikits_learn/Manifest b/sci-libs/scikits_learn/Manifest
25 index af427e21cc5..cc6598f1275 100644
26 --- a/sci-libs/scikits_learn/Manifest
27 +++ b/sci-libs/scikits_learn/Manifest
28 @@ -1,5 +1 @@
29 -DIST scikit-learn-0.17.1.tar.gz 7898571 BLAKE2B 4125864e8701e072e45f83be504a0eba8480f2c08584a6e98f2ae09dd4d64487931eca2ae116230b0d8945822d6e07cc2102129f48e789825c2b70102121fa06 SHA512 5786e04a13225d2433103f1873f2753e332704b98c4c32b840970f763ec1abf0248007089e5ae47e11c66535f05a0d0402715622e6d6f0955ec7961b92e1b2e5
30 -DIST scikit-learn-0.17.tar.gz 7834903 BLAKE2B 9492a0deff723bd1ff3a976f080a5db0d1bf590521a324d627b09bbb755dbdccc6e41fe71519e10bbad8d425b6b12ff6f44b0518d501d9d075dfa5d021be64dd SHA512 53a76e2f90e27967bf216cd9d7e8051ed847a3381e3b7b7b8236511b4105eef41bd4d3c9f7f71a51db4b0bf99cbd571d7c1b26803757cff04424b70cb834b555
31 -DIST scikit-learn-0.18.1.tar.gz 8933930 BLAKE2B 48cfc73769531242d1228f41115a78e4649c52e7d8796e54286f996ddab72353e3f73bf22302535b7d24f55194e893ed681c74dd60beab5f8ba09aa3af8e161a SHA512 7149e683424351a28c19501302ece147cb03d4d12b08822eb2b1898a4978b96803323778fbba628008dd7a7c85daea4e9b550a71ee76851f9a09b2baac18a799
32 -DIST scikit-learn-0.18.2.tar.gz 9224516 BLAKE2B fe4b402e3ac561f9272a0a51ddc17092f2a9fada3e2dc081be3fe66bb7932e0ca0c14d9be21272c364d13c4d9669e9ff399e16b53b5cbaa3f5b20e43d2bb448d SHA512 7c5c7bdd577ad215790654ce1eff6e802aebe53283ab6c5f12684cf99aeecc8976f9a9803f619f549d4d03be0d7634f249046e4b4f15afa12aecb2697e2e0b05
33 DIST scikit-learn-0.19.0.tar.gz 9341628 BLAKE2B c9e0c12558e81efb6f5cfddead028980b0019d2f6d0fdce5662c9138ec3a5b2a3d30b022a5713578bc7effd09894006e8f7f60a3e038ca66297502d9d4212686 SHA512 1b88bc043b08de9b5bb1f3814b8101c73ced010cf94bd725fb69e1ef95b4a9597a34de4a19f84fbbf63e54d47e95b3ff498d611234fcdfcaa5e4e3cf696289d2
34
35 diff --git a/sci-libs/scikits_learn/files/scikits_learn-0.14.1-system-cblas.patch b/sci-libs/scikits_learn/files/scikits_learn-0.14.1-system-cblas.patch
36 deleted file mode 100644
37 index 96c6cc2dbde..00000000000
38 --- a/sci-libs/scikits_learn/files/scikits_learn-0.14.1-system-cblas.patch
39 +++ /dev/null
40 @@ -1,28 +0,0 @@
41 ---- sklearn/setup.py.orig 2013-08-08 13:54:08.310879167 -0700
42 -+++ sklearn/setup.py 2013-08-08 13:52:59.808456423 -0700
43 -@@ -68,14 +68,6 @@
44 - libraries=libraries,
45 - )
46 -
47 -- # some libs needs cblas, fortran-compiled BLAS will not be sufficient
48 -- blas_info = get_info('blas_opt', 0)
49 -- if (not blas_info) or (
50 -- ('NO_ATLAS_INFO', 1) in blas_info.get('define_macros', [])):
51 -- config.add_library('cblas',
52 -- sources=[join('src', 'cblas', '*.c')])
53 -- warnings.warn(BlasNotFoundError.__doc__)
54 --
55 - # the following packages depend on cblas, so they have to be build
56 - # after the above.
57 - config.add_subpackage('linear_model')
58 ---- sklearn/_build_utils.py.orig 2013-08-08 14:01:35.994589269 -0700
59 -+++ sklearn/_build_utils.py 2013-08-08 12:19:41.875967870 -0700
60 -@@ -23,7 +23,7 @@
61 - return False
62 -
63 - blas_info = get_info('blas_opt', 0)
64 -- if (not blas_info) or atlas_not_found(blas_info):
65 -+ if (not blas_info):
66 - cblas_libs = ['cblas']
67 - blas_info.pop('libraries', None)
68 - else:
69
70 diff --git a/sci-libs/scikits_learn/files/scikits_learn-0.17.1-system-cblas.patch b/sci-libs/scikits_learn/files/scikits_learn-0.17.1-system-cblas.patch
71 deleted file mode 100644
72 index 42657a7adac..00000000000
73 --- a/sci-libs/scikits_learn/files/scikits_learn-0.17.1-system-cblas.patch
74 +++ /dev/null
75 @@ -1,30 +0,0 @@
76 -diff -Nur scikit-learn-0.17.1.orig/sklearn/_build_utils.py scikit-learn-0.17.1/sklearn/_build_utils.py
77 ---- scikit-learn-0.17.1.orig/sklearn/_build_utils.py 2016-03-09 00:27:54.756813784 +0000
78 -+++ scikit-learn-0.17.1/sklearn/_build_utils.py 2016-03-09 00:30:09.605118512 +0000
79 -@@ -23,7 +23,7 @@
80 - return False
81 -
82 - blas_info = get_info('blas_opt', 0)
83 -- if (not blas_info) or atlas_not_found(blas_info):
84 -+ if (not blas_info):
85 - cblas_libs = ['cblas']
86 - blas_info.pop('libraries', None)
87 - else:
88 -diff -Nur scikit-learn-0.17.1.orig/sklearn/setup.py scikit-learn-0.17.1/sklearn/setup.py
89 ---- scikit-learn-0.17.1.orig/sklearn/setup.py 2016-03-09 00:27:54.806813156 +0000
90 -+++ scikit-learn-0.17.1/sklearn/setup.py 2016-03-09 00:29:28.215638848 +0000
91 -@@ -58,14 +58,6 @@
92 - libraries=libraries,
93 - )
94 -
95 -- # some libs needs cblas, fortran-compiled BLAS will not be sufficient
96 -- blas_info = get_info('blas_opt', 0)
97 -- if (not blas_info) or (
98 -- ('NO_ATLAS_INFO', 1) in blas_info.get('define_macros', [])):
99 -- config.add_library('cblas',
100 -- sources=[join('src', 'cblas', '*.c')])
101 -- warnings.warn(BlasNotFoundError.__doc__)
102 --
103 - # the following packages depend on cblas, so they have to be build
104 - # after the above.
105 - config.add_subpackage('linear_model')
106
107 diff --git a/sci-libs/scikits_learn/scikits_learn-0.17.1.ebuild b/sci-libs/scikits_learn/scikits_learn-0.17.1.ebuild
108 deleted file mode 100644
109 index e83910a436b..00000000000
110 --- a/sci-libs/scikits_learn/scikits_learn-0.17.1.ebuild
111 +++ /dev/null
112 @@ -1,117 +0,0 @@
113 -# Copyright 1999-2019 Gentoo Authors
114 -# Distributed under the terms of the GNU General Public License v2
115 -
116 -EAPI=6
117 -
118 -PYTHON_COMPAT=( python2_7 python3_5 )
119 -
120 -inherit distutils-r1 flag-o-matic
121 -
122 -MYPN="${PN/scikits_/scikit-}"
123 -MYP="${MYPN}-${PV}"
124 -
125 -DESCRIPTION="Python modules for machine learning and data mining"
126 -HOMEPAGE="https://scikit-learn.org"
127 -SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz"
128 -
129 -LICENSE="BSD"
130 -SLOT="0"
131 -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
132 -IUSE="doc examples test"
133 -RESTRICT="!test? ( test )"
134 -
135 -RDEPEND="
136 - dev-python/joblib[${PYTHON_USEDEP}]
137 - dev-python/matplotlib[${PYTHON_USEDEP}]
138 - dev-python/nose[${PYTHON_USEDEP}]
139 - >=dev-python/numpy-1.6.1[lapack,${PYTHON_USEDEP}]
140 - sci-libs/scikits[${PYTHON_USEDEP}]
141 - >=sci-libs/scipy-0.9[${PYTHON_USEDEP}]
142 - virtual/blas
143 - virtual/cblas
144 - virtual/python-funcsigs[${PYTHON_USEDEP}]
145 - "
146 -DEPEND="
147 - dev-python/cython[${PYTHON_USEDEP}]
148 - dev-python/numpy[lapack,${PYTHON_USEDEP}]
149 - dev-python/setuptools[${PYTHON_USEDEP}]
150 - sci-libs/scipy[${PYTHON_USEDEP}]
151 - virtual/blas
152 - virtual/cblas
153 - doc? (
154 - dev-python/joblib[${PYTHON_USEDEP}]
155 - dev-python/matplotlib[${PYTHON_USEDEP}]
156 - dev-python/sphinx[${PYTHON_USEDEP}]
157 - )"
158 -
159 -S="${WORKDIR}/${MYP}"
160 -
161 -PATCHES=( "${FILESDIR}/${P}-system-cblas.patch" )
162 -
163 -python_prepare_all() {
164 - # bug #397605
165 - [[ ${CHOST} == *-darwin* ]] \
166 - && append-ldflags -bundle "-undefined dynamic_lookup" \
167 - || append-ldflags -shared
168 -
169 - # scikits-learn now uses the horrible numpy.distutils automagic
170 - export SCIPY_FCONFIG="config_fc --noopt --noarch"
171 -
172 - # use system joblib
173 - rm -r sklearn/externals/joblib/* || die
174 - echo "from joblib import *" > sklearn/externals/joblib/__init__.py
175 - sed -i -e '/joblib\/test/d' sklearn/externals/setup.py || die
176 - sed -i -e 's/..externals.joblib/ joblib/g' \
177 - sklearn/cross_validation.py \
178 - sklearn/decomposition/tests/test_sparse_pca.py \
179 - sklearn/metrics/pairwise.py || die
180 -
181 - rm sklearn/externals/funcsigs.py || die
182 - rm sklearn/externals/odict.py || die
183 - sed -e 's:from ..externals.funcsigs import signature:from funcsigs import signature:g' \
184 - -i sklearn/utils/fixes.py || die
185 -
186 - distutils-r1_python_prepare_all
187 -}
188 -
189 -python_compile() {
190 - distutils-r1_python_compile ${SCIPY_FCONFIG}
191 -}
192 -
193 -python_compile_all() {
194 - if use doc; then
195 - cd "${S}/doc" || die
196 - local d="${BUILD_DIR}"/lib
197 - ln -s "${S}"/sklearn/datasets/{data,descr,images} \
198 - "${d}"/sklearn/datasets || die
199 - VARTEXFONTS="${T}"/fonts \
200 - MPLCONFIGDIR="${BUILD_DIR}" \
201 - PYTHONPATH="${d}" \
202 - emake html
203 - rm -r "${d}"/sklearn/datasets/{data,descr,images} || die
204 - fi
205 -}
206 -
207 -python_test() {
208 - # doc builds and runs tests
209 - use doc && return
210 - distutils_install_for_testing ${SCIPY_FCONFIG}
211 - esetup.py \
212 - install --root="${T}/test-${EPYTHON}" \
213 - --no-compile ${SCIPY_FCONFIG}
214 - pushd "${T}/test-${EPYTHON}/$(python_get_sitedir)" || die > /dev/null
215 - nosetests -v sklearn --exe || die
216 - popd > /dev/null
217 -}
218 -
219 -python_install() {
220 - distutils-r1_python_install ${SCIPY_FCONFIG}
221 -}
222 -
223 -python_install_all() {
224 - find "${S}" -name \*LICENSE.txt -delete
225 - insinto /usr/share/doc/${PF}
226 - use doc && doins -r doc/_build/html
227 - use examples && doins -r examples
228 - distutils-r1_python_install_all
229 -}
230
231 diff --git a/sci-libs/scikits_learn/scikits_learn-0.17.ebuild b/sci-libs/scikits_learn/scikits_learn-0.17.ebuild
232 deleted file mode 100644
233 index e8b01caac0b..00000000000
234 --- a/sci-libs/scikits_learn/scikits_learn-0.17.ebuild
235 +++ /dev/null
236 @@ -1,117 +0,0 @@
237 -# Copyright 1999-2019 Gentoo Authors
238 -# Distributed under the terms of the GNU General Public License v2
239 -
240 -EAPI=5
241 -
242 -PYTHON_COMPAT=( python2_7 )
243 -
244 -inherit distutils-r1 eutils multilib flag-o-matic
245 -
246 -MYPN="${PN/scikits_/scikit-}"
247 -MYP="${MYPN}-${PV}"
248 -
249 -DESCRIPTION="Python modules for machine learning and data mining"
250 -HOMEPAGE="https://scikit-learn.org"
251 -SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz"
252 -
253 -LICENSE="BSD"
254 -SLOT="0"
255 -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
256 -IUSE="doc examples test"
257 -RESTRICT="!test? ( test )"
258 -
259 -RDEPEND="
260 - dev-python/joblib[${PYTHON_USEDEP}]
261 - dev-python/matplotlib[${PYTHON_USEDEP}]
262 - dev-python/nose[${PYTHON_USEDEP}]
263 - >=dev-python/numpy-1.6.1[lapack,${PYTHON_USEDEP}]
264 - sci-libs/scikits[${PYTHON_USEDEP}]
265 - >=sci-libs/scipy-0.9[${PYTHON_USEDEP}]
266 - virtual/blas
267 - virtual/cblas
268 - virtual/python-funcsigs[${PYTHON_USEDEP}]
269 - "
270 -DEPEND="
271 - dev-python/cython[${PYTHON_USEDEP}]
272 - dev-python/numpy[lapack,${PYTHON_USEDEP}]
273 - dev-python/setuptools[${PYTHON_USEDEP}]
274 - sci-libs/scipy[${PYTHON_USEDEP}]
275 - virtual/blas
276 - virtual/cblas
277 - doc? (
278 - dev-python/joblib[${PYTHON_USEDEP}]
279 - dev-python/matplotlib[${PYTHON_USEDEP}]
280 - dev-python/sphinx[${PYTHON_USEDEP}]
281 - )"
282 -
283 -S="${WORKDIR}/${MYP}"
284 -
285 -python_prepare_all() {
286 - # bug #397605
287 - [[ ${CHOST} == *-darwin* ]] \
288 - && append-ldflags -bundle "-undefined dynamic_lookup" \
289 - || append-ldflags -shared
290 -
291 - # scikits-learn now uses the horrible numpy.distutils automagic
292 - export SCIPY_FCONFIG="config_fc --noopt --noarch"
293 -
294 - # use system joblib
295 - rm -r sklearn/externals/joblib/* || die
296 - echo "from joblib import *" > sklearn/externals/joblib/__init__.py
297 - sed -i -e '/joblib\/test/d' sklearn/externals/setup.py || die
298 - sed -i -e 's/..externals.joblib/joblib/g' \
299 - sklearn/decomposition/tests/test_sparse_pca.py \
300 - sklearn/metrics/pairwise.py || die
301 -
302 - rm sklearn/externals/funcsigs.py || die
303 - rm sklearn/externals/odict.py || die
304 - sed \
305 - -e 's:from ..externals.funcsigs import signature:from funcsigs import signature:g' \
306 - -i sklearn/utils/fixes.py || die
307 -
308 - # use gentoo cblas infrastructure
309 - epatch "${FILESDIR}"/${PN}-0.14.1-system-cblas.patch
310 -
311 - distutils-r1_python_prepare_all
312 -}
313 -
314 -python_compile() {
315 - distutils-r1_python_compile ${SCIPY_FCONFIG}
316 -}
317 -
318 -python_compile_all() {
319 - if use doc; then
320 - cd "${S}/doc" || die
321 - local d="${BUILD_DIR}"/lib
322 - ln -s "${S}"/sklearn/datasets/{data,descr,images} \
323 - "${d}"/sklearn/datasets || die
324 - VARTEXFONTS="${T}"/fonts \
325 - MPLCONFIGDIR="${BUILD_DIR}" \
326 - PYTHONPATH="${d}" \
327 - emake html
328 - rm -r "${d}"/sklearn/datasets/{data,descr,images} || die
329 - fi
330 -}
331 -
332 -python_test() {
333 - # doc builds and runs tests
334 - use doc && return
335 - distutils_install_for_testing ${SCIPY_FCONFIG}
336 - esetup.py \
337 - install --root="${T}/test-${EPYTHON}" \
338 - --no-compile ${SCIPY_FCONFIG}
339 - pushd "${T}/test-${EPYTHON}/$(python_get_sitedir)" || die > /dev/null
340 - nosetests -v sklearn --exe || die
341 - popd > /dev/null
342 -}
343 -
344 -python_install() {
345 - distutils-r1_python_install ${SCIPY_FCONFIG}
346 -}
347 -
348 -python_install_all() {
349 - find "${S}" -name \*LICENSE.txt -delete
350 - use doc && HTML_DOCS=( doc/_build/html/. )
351 - use examples && EXAMPLES=( examples/. )
352 - distutils-r1_python_install_all
353 -}
354
355 diff --git a/sci-libs/scikits_learn/scikits_learn-0.18.1.ebuild b/sci-libs/scikits_learn/scikits_learn-0.18.1.ebuild
356 deleted file mode 100644
357 index 1a04525ec15..00000000000
358 --- a/sci-libs/scikits_learn/scikits_learn-0.18.1.ebuild
359 +++ /dev/null
360 @@ -1,120 +0,0 @@
361 -# Copyright 1999-2019 Gentoo Authors
362 -# Distributed under the terms of the GNU General Public License v2
363 -
364 -EAPI=6
365 -
366 -PYTHON_COMPAT=( python2_7 python3_5 )
367 -
368 -inherit distutils-r1 flag-o-matic
369 -
370 -MYPN="${PN/scikits_/scikit-}"
371 -MYP="${MYPN}-${PV}"
372 -
373 -DESCRIPTION="Python modules for machine learning and data mining"
374 -HOMEPAGE="https://scikit-learn.org"
375 -SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz"
376 -
377 -LICENSE="BSD"
378 -SLOT="0"
379 -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
380 -IUSE="doc examples test"
381 -RESTRICT="!test? ( test )"
382 -
383 -RDEPEND="
384 - dev-python/joblib[${PYTHON_USEDEP}]
385 - dev-python/matplotlib[${PYTHON_USEDEP}]
386 - dev-python/nose[${PYTHON_USEDEP}]
387 - >=dev-python/numpy-1.6.1[lapack,${PYTHON_USEDEP}]
388 - sci-libs/scikits[${PYTHON_USEDEP}]
389 - >=sci-libs/scipy-0.9[${PYTHON_USEDEP}]
390 - virtual/blas
391 - virtual/cblas
392 - virtual/python-funcsigs[${PYTHON_USEDEP}]
393 - "
394 -DEPEND="
395 - dev-python/cython[${PYTHON_USEDEP}]
396 - dev-python/numpy[lapack,${PYTHON_USEDEP}]
397 - dev-python/setuptools[${PYTHON_USEDEP}]
398 - sci-libs/scipy[${PYTHON_USEDEP}]
399 - virtual/blas
400 - virtual/cblas
401 - doc? (
402 - dev-python/joblib[${PYTHON_USEDEP}]
403 - dev-python/matplotlib[${PYTHON_USEDEP}]
404 - dev-python/sphinx[${PYTHON_USEDEP}]
405 - )"
406 -
407 -S="${WORKDIR}/${MYP}"
408 -
409 -PATCHES=( "${FILESDIR}/${P}-system-cblas.patch" )
410 -
411 -python_prepare_all() {
412 - # bug #397605
413 - [[ ${CHOST} == *-darwin* ]] \
414 - && append-ldflags -bundle "-undefined dynamic_lookup" \
415 - || append-ldflags -shared
416 -
417 - # scikits-learn now uses the horrible numpy.distutils automagic
418 - export SCIPY_FCONFIG="config_fc --noopt --noarch"
419 -
420 - # remove bundled cblas
421 - rm -r sklearn/src || die
422 -
423 - # use system joblib
424 - rm -r sklearn/externals/joblib || die
425 - sed -i -e '/joblib/d' sklearn/externals/setup.py || die
426 - for f in sklearn/{*/,}*.py; do
427 - sed -r -e '/^from/s/(sklearn|\.|)\.externals\.joblib/joblib/' \
428 - -e 's/from (sklearn|\.|)\.externals import/import/' -i $f || die
429 - done
430 -
431 - rm sklearn/externals/funcsigs.py || die
432 - rm sklearn/externals/odict.py || die
433 - for f in sklearn/{utils/fixes.py,gaussian_process/{tests/test_,}kernels.py}; do
434 - sed -r -e 's/from (sklearn|\.|)\.externals\.funcsigs/from funcsigs/' -i $f || die
435 - done
436 -
437 - distutils-r1_python_prepare_all
438 -}
439 -
440 -python_compile() {
441 - distutils-r1_python_compile ${SCIPY_FCONFIG}
442 -}
443 -
444 -python_compile_all() {
445 - if use doc; then
446 - cd "${S}/doc" || die
447 - local d="${BUILD_DIR}"/lib
448 - ln -s "${S}"/sklearn/datasets/{data,descr,images} \
449 - "${d}"/sklearn/datasets || die
450 - VARTEXFONTS="${T}"/fonts \
451 - MPLCONFIGDIR="${BUILD_DIR}" \
452 - PYTHONPATH="${d}" \
453 - emake html
454 - rm -r "${d}"/sklearn/datasets/{data,descr,images} || die
455 - fi
456 -}
457 -
458 -python_test() {
459 - # doc builds and runs tests
460 - use doc && return
461 - distutils_install_for_testing ${SCIPY_FCONFIG}
462 - esetup.py \
463 - install --root="${T}/test-${EPYTHON}" \
464 - --no-compile ${SCIPY_FCONFIG}
465 - pushd "${T}/test-${EPYTHON}/$(python_get_sitedir)" || die > /dev/null
466 - nosetests -v sklearn --exe || die
467 - popd > /dev/null
468 -}
469 -
470 -python_install() {
471 - distutils-r1_python_install ${SCIPY_FCONFIG}
472 -}
473 -
474 -python_install_all() {
475 - find "${S}" -name \*LICENSE.txt -delete
476 - insinto /usr/share/doc/${PF}
477 - use doc && doins -r doc/_build/html
478 - use examples && doins -r examples
479 - distutils-r1_python_install_all
480 -}
481
482 diff --git a/sci-libs/scikits_learn/scikits_learn-0.18.2-r1.ebuild b/sci-libs/scikits_learn/scikits_learn-0.18.2-r1.ebuild
483 deleted file mode 100644
484 index 854f19af4e3..00000000000
485 --- a/sci-libs/scikits_learn/scikits_learn-0.18.2-r1.ebuild
486 +++ /dev/null
487 @@ -1,124 +0,0 @@
488 -# Copyright 1999-2019 Gentoo Authors
489 -# Distributed under the terms of the GNU General Public License v2
490 -
491 -EAPI=6
492 -
493 -PYTHON_COMPAT=( python2_7 python3_{5,6} )
494 -
495 -inherit distutils-r1 flag-o-matic
496 -
497 -MYPN="${PN/scikits_/scikit-}"
498 -MYP="${MYPN}-${PV}"
499 -
500 -DESCRIPTION="Python modules for machine learning and data mining"
501 -HOMEPAGE="https://scikit-learn.org"
502 -SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz"
503 -
504 -LICENSE="BSD"
505 -SLOT="0"
506 -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
507 -IUSE="doc examples test"
508 -RESTRICT="!test? ( test )"
509 -
510 -# tried to unbundle virtual/python-funcsigs, funcsigs, odict
511 -# but it is a large mess to maintain
512 -
513 -RDEPEND="
514 - dev-python/matplotlib[${PYTHON_USEDEP}]
515 - dev-python/nose[${PYTHON_USEDEP}]
516 - dev-python/numpy[lapack,${PYTHON_USEDEP}]
517 - sci-libs/scikits[${PYTHON_USEDEP}]
518 - sci-libs/scipy[${PYTHON_USEDEP}]
519 - virtual/blas:=
520 - virtual/cblas:=
521 -"
522 -
523 -DEPEND="
524 - dev-python/cython[${PYTHON_USEDEP}]
525 - dev-python/numpy[lapack,${PYTHON_USEDEP}]
526 - dev-python/setuptools[${PYTHON_USEDEP}]
527 - sci-libs/scipy[${PYTHON_USEDEP}]
528 - virtual/blas:=
529 - virtual/cblas:=
530 - doc? (
531 - dev-python/matplotlib[${PYTHON_USEDEP}]
532 - dev-python/sphinx[${PYTHON_USEDEP}]
533 - )
534 -"
535 -
536 -S="${WORKDIR}/${MYP}"
537 -
538 -PATCHES=( "${FILESDIR}/${PN}-0.18.1-system-cblas.patch" )
539 -
540 -python_prepare_all() {
541 - # bug #397605
542 - [[ ${CHOST} == *-darwin* ]] \
543 - && append-ldflags -bundle "-undefined dynamic_lookup" \
544 - || append-ldflags -shared
545 -
546 - # scikits-learn now uses the horrible numpy.distutils automagic
547 - export SCIPY_FCONFIG="config_fc --noopt --noarch"
548 -
549 - # remove bundled cblas
550 - rm -r sklearn/src || die
551 -
552 - # commented out, since it is a mess to maintain
553 - # use system joblib
554 - #rm -r sklearn/externals/joblib || die
555 - #sed -i -e '/joblib/d' sklearn/externals/setup.py || die
556 - #for f in sklearn/{*/,}*.py; do
557 - # sed -r -e '/^from/s/(sklearn|\.|)\.externals\.joblib/joblib/' \
558 - # -e 's/from (sklearn|\.|)\.externals import/import/' -i $f || die
559 - #done
560 -
561 - # use system funcsigs and odict
562 - #rm sklearn/externals/funcsigs.py || die
563 - #rm sklearn/externals/odict.py || die
564 - #for f in sklearn/{utils/fixes.py,gaussian_process/{tests/test_,}kernels.py}; do
565 - # sed -r -e 's/from (sklearn|\.|)\.externals\.funcsigs/from funcsigs/' -i $f || die
566 - #done
567 - distutils-r1_python_prepare_all
568 -}
569 -
570 -python_compile() {
571 - distutils-r1_python_compile ${SCIPY_FCONFIG}
572 -}
573 -
574 -python_compile_all() {
575 - if use doc; then
576 - cd "${S}/doc" || die
577 - local d="${BUILD_DIR}/lib"
578 - ln -s \
579 - "${S}"/sklearn/datasets/{data,descr,images} \
580 - "${d}"/sklearn/datasets || die
581 - VARTEXFONTS="${T}"/fonts \
582 - MPLCONFIGDIR="${BUILD_DIR}" \
583 - PYTHONPATH="${d}" \
584 - emake html
585 - rm -r "${d}"/sklearn/datasets/{data,descr,images} || die
586 - fi
587 -}
588 -
589 -python_test() {
590 - # doc builds and runs tests
591 - use doc && return
592 - distutils_install_for_testing ${SCIPY_FCONFIG}
593 - esetup.py install \
594 - --root="${T}/test-${EPYTHON}" \
595 - --no-compile ${SCIPY_FCONFIG}
596 - pushd "${T}/test-${EPYTHON}/$(python_get_sitedir)" || die > /dev/null
597 - JOBLIB_MULTIPROCESSING=2 SKLEARN_SKIP_NETWORK_TESTS=1 nosetests -v sklearn --exe || die
598 - popd > /dev/null
599 -}
600 -
601 -python_install() {
602 - distutils-r1_python_install ${SCIPY_FCONFIG}
603 -}
604 -
605 -python_install_all() {
606 - find "${S}" -name \*LICENSE.txt -delete
607 - insinto /usr/share/doc/${PF}
608 - use doc && doins -r doc/_build/html
609 - use examples && doins -r examples
610 - distutils-r1_python_install_all
611 -}
612
613 diff --git a/sci-libs/scikits_learn/scikits_learn-0.18.2.ebuild b/sci-libs/scikits_learn/scikits_learn-0.18.2.ebuild
614 deleted file mode 100644
615 index 191789ac6c0..00000000000
616 --- a/sci-libs/scikits_learn/scikits_learn-0.18.2.ebuild
617 +++ /dev/null
618 @@ -1,120 +0,0 @@
619 -# Copyright 1999-2019 Gentoo Authors
620 -# Distributed under the terms of the GNU General Public License v2
621 -
622 -EAPI=6
623 -
624 -PYTHON_COMPAT=( python2_7 python3_{5,6} )
625 -
626 -inherit distutils-r1 flag-o-matic
627 -
628 -MYPN="${PN/scikits_/scikit-}"
629 -MYP="${MYPN}-${PV}"
630 -
631 -DESCRIPTION="Python modules for machine learning and data mining"
632 -HOMEPAGE="https://scikit-learn.org"
633 -SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz"
634 -
635 -LICENSE="BSD"
636 -SLOT="0"
637 -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
638 -IUSE="doc examples test"
639 -RESTRICT="!test? ( test )"
640 -
641 -RDEPEND="
642 - dev-python/joblib[${PYTHON_USEDEP}]
643 - dev-python/matplotlib[${PYTHON_USEDEP}]
644 - dev-python/nose[${PYTHON_USEDEP}]
645 - >=dev-python/numpy-1.6.1[lapack,${PYTHON_USEDEP}]
646 - sci-libs/scikits[${PYTHON_USEDEP}]
647 - >=sci-libs/scipy-0.9[${PYTHON_USEDEP}]
648 - virtual/blas
649 - virtual/cblas
650 - virtual/python-funcsigs[${PYTHON_USEDEP}]
651 - "
652 -DEPEND="
653 - dev-python/cython[${PYTHON_USEDEP}]
654 - dev-python/numpy[lapack,${PYTHON_USEDEP}]
655 - dev-python/setuptools[${PYTHON_USEDEP}]
656 - sci-libs/scipy[${PYTHON_USEDEP}]
657 - virtual/blas
658 - virtual/cblas
659 - doc? (
660 - dev-python/joblib[${PYTHON_USEDEP}]
661 - dev-python/matplotlib[${PYTHON_USEDEP}]
662 - dev-python/sphinx[${PYTHON_USEDEP}]
663 - )"
664 -
665 -S="${WORKDIR}/${MYP}"
666 -
667 -PATCHES=( "${FILESDIR}/${PN}-0.18.1-system-cblas.patch" )
668 -
669 -python_prepare_all() {
670 - # bug #397605
671 - [[ ${CHOST} == *-darwin* ]] \
672 - && append-ldflags -bundle "-undefined dynamic_lookup" \
673 - || append-ldflags -shared
674 -
675 - # scikits-learn now uses the horrible numpy.distutils automagic
676 - export SCIPY_FCONFIG="config_fc --noopt --noarch"
677 -
678 - # remove bundled cblas
679 - rm -r sklearn/src || die
680 -
681 - # use system joblib
682 - rm -r sklearn/externals/joblib || die
683 - sed -i -e '/joblib/d' sklearn/externals/setup.py || die
684 - for f in sklearn/{*/,}*.py; do
685 - sed -r -e '/^from/s/(sklearn|\.|)\.externals\.joblib/joblib/' \
686 - -e 's/from (sklearn|\.|)\.externals import/import/' -i $f || die
687 - done
688 -
689 - rm sklearn/externals/funcsigs.py || die
690 - rm sklearn/externals/odict.py || die
691 - for f in sklearn/{utils/fixes.py,gaussian_process/{tests/test_,}kernels.py}; do
692 - sed -r -e 's/from (sklearn|\.|)\.externals\.funcsigs/from funcsigs/' -i $f || die
693 - done
694 -
695 - distutils-r1_python_prepare_all
696 -}
697 -
698 -python_compile() {
699 - distutils-r1_python_compile ${SCIPY_FCONFIG}
700 -}
701 -
702 -python_compile_all() {
703 - if use doc; then
704 - cd "${S}/doc" || die
705 - local d="${BUILD_DIR}"/lib
706 - ln -s "${S}"/sklearn/datasets/{data,descr,images} \
707 - "${d}"/sklearn/datasets || die
708 - VARTEXFONTS="${T}"/fonts \
709 - MPLCONFIGDIR="${BUILD_DIR}" \
710 - PYTHONPATH="${d}" \
711 - emake html
712 - rm -r "${d}"/sklearn/datasets/{data,descr,images} || die
713 - fi
714 -}
715 -
716 -python_test() {
717 - # doc builds and runs tests
718 - use doc && return
719 - distutils_install_for_testing ${SCIPY_FCONFIG}
720 - esetup.py \
721 - install --root="${T}/test-${EPYTHON}" \
722 - --no-compile ${SCIPY_FCONFIG}
723 - pushd "${T}/test-${EPYTHON}/$(python_get_sitedir)" || die > /dev/null
724 - nosetests -v sklearn --exe || die
725 - popd > /dev/null
726 -}
727 -
728 -python_install() {
729 - distutils-r1_python_install ${SCIPY_FCONFIG}
730 -}
731 -
732 -python_install_all() {
733 - find "${S}" -name \*LICENSE.txt -delete
734 - insinto /usr/share/doc/${PF}
735 - use doc && doins -r doc/_build/html
736 - use examples && doins -r examples
737 - distutils-r1_python_install_all
738 -}
739
740 diff --git a/sci-libs/scikits_learn/scikits_learn-0.19.0.ebuild b/sci-libs/scikits_learn/scikits_learn-0.19.0.ebuild
741 deleted file mode 100644
742 index f6a48d144c7..00000000000
743 --- a/sci-libs/scikits_learn/scikits_learn-0.19.0.ebuild
744 +++ /dev/null
745 @@ -1,107 +0,0 @@
746 -# Copyright 1999-2019 Gentoo Authors
747 -# Distributed under the terms of the GNU General Public License v2
748 -
749 -EAPI=6
750 -
751 -PYTHON_COMPAT=( python2_7 python3_{5,6} )
752 -
753 -inherit distutils-r1 flag-o-matic
754 -
755 -MYPN="${PN/scikits_/scikit-}"
756 -MYP="${MYPN}-${PV}"
757 -
758 -DESCRIPTION="Python modules for machine learning and data mining"
759 -HOMEPAGE="https://scikit-learn.org"
760 -SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz"
761 -
762 -LICENSE="BSD"
763 -SLOT="0"
764 -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
765 -IUSE="examples test"
766 -RESTRICT="!test? ( test )"
767 -
768 -# tried to unbundle virtual/python-funcsigs, funcsigs, odict
769 -# but it is a large mess to maintain
770 -
771 -RDEPEND="
772 - dev-python/matplotlib[${PYTHON_USEDEP}]
773 - dev-python/nose[${PYTHON_USEDEP}]
774 - dev-python/numpy[lapack,${PYTHON_USEDEP}]
775 - sci-libs/scikits[${PYTHON_USEDEP}]
776 - sci-libs/scipy[${PYTHON_USEDEP}]
777 - virtual/blas:=
778 - virtual/cblas:=
779 -"
780 -
781 -DEPEND="
782 - dev-python/cython[${PYTHON_USEDEP}]
783 - dev-python/numpy[lapack,${PYTHON_USEDEP}]
784 - dev-python/setuptools[${PYTHON_USEDEP}]
785 - sci-libs/scipy[${PYTHON_USEDEP}]
786 - virtual/blas:=
787 - virtual/cblas:=
788 -"
789 -
790 -S="${WORKDIR}/${MYP}"
791 -
792 -PATCHES=( "${FILESDIR}"/${PN}-0.18.1-system-cblas.patch )
793 -
794 -python_prepare_all() {
795 - # bug #397605
796 - [[ ${CHOST} == *-darwin* ]] \
797 - && append-ldflags -bundle "-undefined dynamic_lookup" \
798 - || append-ldflags -shared
799 -
800 - # scikits-learn now uses the horrible numpy.distutils automagic
801 - export SCIPY_FCONFIG="config_fc --noopt --noarch"
802 -
803 - # remove bundled cblas
804 - rm -r sklearn/src || die
805 -
806 - # commented out, since it is a mess to maintain
807 - # use system joblib
808 - #rm -r sklearn/externals/joblib || die
809 - #sed -i -e '/joblib/d' sklearn/externals/setup.py || die
810 - #for f in sklearn/{*/,}*.py; do
811 - # sed -r -e '/^from/s/(sklearn|\.|)\.externals\.joblib/joblib/' \
812 - # -e 's/from (sklearn|\.|)\.externals import/import/' -i $f || die
813 - #done
814 -
815 - # use system funcsigs and odict
816 - #rm sklearn/externals/funcsigs.py || die
817 - #rm sklearn/externals/odict.py || die
818 - #for f in sklearn/{utils/fixes.py,gaussian_process/{tests/test_,}kernels.py}; do
819 - # sed -r -e 's/from (sklearn|\.|)\.externals\.funcsigs/from funcsigs/' -i $f || die
820 - #done
821 - distutils-r1_python_prepare_all
822 -}
823 -
824 -python_compile() {
825 - distutils-r1_python_compile ${SCIPY_FCONFIG}
826 -}
827 -
828 -python_test() {
829 - # doc builds and runs tests
830 - use doc && return
831 - distutils_install_for_testing ${SCIPY_FCONFIG}
832 - esetup.py install \
833 - --root="${T}/test-${EPYTHON}" \
834 - --no-compile ${SCIPY_FCONFIG}
835 - pushd "${T}/test-${EPYTHON}/$(python_get_sitedir)" || die > /dev/null
836 - JOBLIB_MULTIPROCESSING=2 SKLEARN_SKIP_NETWORK_TESTS=1 nosetests -v sklearn --exe || die
837 - popd > /dev/null
838 -}
839 -
840 -python_install() {
841 - distutils-r1_python_install ${SCIPY_FCONFIG}
842 -}
843 -
844 -python_install_all() {
845 - find "${S}" -name \*LICENSE.txt -delete
846 - distutils-r1_python_install_all
847 - if use examples; then
848 - dodoc -r examples
849 - docompress -x /usr/share/doc/${PF}/examples
850 - fi
851 -
852 -}