public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/scikits_learn/
@ 2015-11-06 16:22 Justin Lecher
  0 siblings, 0 replies; 24+ messages in thread
From: Justin Lecher @ 2015-11-06 16:22 UTC (permalink / raw
  To: gentoo-commits

commit:     8194b256bb9c1dcc01db4947f963144b0729bae7
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Fri Nov  6 15:10:50 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Nov  6 16:22:23 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8194b256

sci-libs/scikits_learn: Version Bump

Package-Manager: portage-2.2.23
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 sci-libs/scikits_learn/Manifest                  |   1 +
 sci-libs/scikits_learn/metadata.xml              |   2 +-
 sci-libs/scikits_learn/scikits_learn-0.17.ebuild | 113 +++++++++++++++++++++++
 3 files changed, 115 insertions(+), 1 deletion(-)

diff --git a/sci-libs/scikits_learn/Manifest b/sci-libs/scikits_learn/Manifest
index 94c82bc..f395149 100644
--- a/sci-libs/scikits_learn/Manifest
+++ b/sci-libs/scikits_learn/Manifest
@@ -3,3 +3,4 @@ DIST scikit-learn-0.14.1.tar.gz 23228378 SHA256 4c317cabb56c61f4c574879b53aa6bbe
 DIST scikit-learn-0.15.1.tar.gz 7034220 SHA256 4b13456727b9310857f12cc7b9d1c62d59f3ef602fea9d391afc0c8c847ed17d SHA512 4c2e68b1bb75c85c2a83605a32ba5adbd224bc25b19fca85e18dbe24f20cbe51cbfb02be546a4f05fc190f77e438cb17c6a5d69026455e8c11907599462f9984 WHIRLPOOL e1bc387b013abcab18d8ee0545dda543bb098b9d7636229880dea667fc4627d1822fe8a430a2d26dbafcc0b0e90326d5529245e6eff1345b73fc5a24b7a51096
 DIST scikit-learn-0.15.2.tar.gz 7007922 SHA256 1a8a881f6f13edc0ac58931ce21f899eb7920af50aa08802413d1239e2aa5fa6 SHA512 ca2470df73be1b735f756f641fdbb4dc59a54b67d12f61c54542f0928ce9242665d1b8793673a9d989a41f2c2945c2ba92ed54fc9914fbe030a5c8af289c6523 WHIRLPOOL 9043bf653f8d866f98e5a2342fbacf51fafefd5096e70989ebeb4b580c38b5468c3a2eb598d4d5492ba1413378b8c133938baa20d4a292c9f94c5596dbf1d405
 DIST scikit-learn-0.16.1.tar.gz 7267115 SHA256 c0721e295056c95c7002e05726f2bd271a7923e88bdeab34a2b60aac2b0ee6e4 SHA512 18ea7420a4a7f23f030ad1e20cf29dd7d6183872ed4aa3daf4bfb5106728de21775461b90a917f231e56fee78eea5927ff8c3160c1da1473f34315b00994461b WHIRLPOOL 15eba05ba0d9ac62ed30636ece9091cb9930e432e5726b67be3de0ae5b81a187eac8cac69184106b4a5a1c4393801fb6a375b6f025c3562223ad5ed0e508ad8c
+DIST scikit-learn-0.17.tar.gz 7834903 SHA256 23a5b6804524cb2cd54d8310010169511c7633dcf69af7439747eec02677f314 SHA512 53a76e2f90e27967bf216cd9d7e8051ed847a3381e3b7b7b8236511b4105eef41bd4d3c9f7f71a51db4b0bf99cbd571d7c1b26803757cff04424b70cb834b555 WHIRLPOOL 3a1ef13dafe6eb38389f68bc75dee10bfe141bac6d2782cd11be27ffcb8fe7efdf113b6911a238c6cd141bfe3b69960f47cf0725d0ea033129dff8fb5c57bef4

diff --git a/sci-libs/scikits_learn/metadata.xml b/sci-libs/scikits_learn/metadata.xml
index e393de4..f6f2f71 100644
--- a/sci-libs/scikits_learn/metadata.xml
+++ b/sci-libs/scikits_learn/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>sci</herd>

diff --git a/sci-libs/scikits_learn/scikits_learn-0.17.ebuild b/sci-libs/scikits_learn/scikits_learn-0.17.ebuild
new file mode 100644
index 0000000..7f2e53f
--- /dev/null
+++ b/sci-libs/scikits_learn/scikits_learn-0.17.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
+
+inherit distutils-r1 eutils multilib flag-o-matic
+
+MYPN="${PN/scikits_/scikit-}"
+MYP="${MYPN}-${PV}"
+
+DESCRIPTION="Python modules for machine learning and data mining"
+HOMEPAGE="http://scikit-learn.org"
+SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples test"
+
+RDEPEND="
+	dev-python/joblib[${PYTHON_USEDEP}]
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	dev-python/nose[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.6.1[lapack,${PYTHON_USEDEP}]
+	sci-libs/scikits[${PYTHON_USEDEP}]
+	>=sci-libs/scipy-0.9[${PYTHON_USEDEP}]
+	virtual/funcsigs[${PYTHON_USEDEP}]
+	"
+DEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/numpy[lapack,${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/joblib[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		)"
+
+S="${WORKDIR}/${MYP}"
+
+python_prepare_all() {
+	# bug #397605
+	[[ ${CHOST} == *-darwin* ]] \
+		&& append-ldflags -bundle "-undefined dynamic_lookup" \
+		|| append-ldflags -shared
+
+	# scikits-learn now uses the horrible numpy.distutils automagic
+	export SCIPY_FCONFIG="config_fc --noopt --noarch"
+
+	# use system joblib
+	rm -r sklearn/externals/joblib/* || die
+	echo "from joblib import *" > sklearn/externals/joblib/__init__.py
+	sed -i -e '/joblib\/test/d' sklearn/externals/setup.py || die
+	sed -i -e 's/..externals.joblib/joblib/g' \
+		sklearn/decomposition/tests/test_sparse_pca.py \
+		sklearn/metrics/pairwise.py || die
+
+	rm sklearn/externals/funcsigs.py || die
+	rm sklearn/externals/odict.py || die
+	sed \
+		-e 's:from ..externals.funcsigs import signature:from funcsigs import signature:g' \
+		-i sklearn/utils/fixes.py || die
+
+	# use gentoo cblas infrastructure
+	epatch "${FILESDIR}"/${PN}-0.14.1-system-cblas.patch
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	distutils-r1_python_compile ${SCIPY_FCONFIG}
+}
+
+python_compile_all() {
+	if use doc; then
+		cd "${S}/doc"
+		local d="${BUILD_DIR}"/lib
+		ln -s "${S}"/sklearn/datasets/{data,descr,images} \
+			"${d}"/sklearn/datasets
+		VARTEXFONTS="${T}"/fonts \
+			MPLCONFIGDIR="${BUILD_DIR}" \
+			PYTHONPATH="${d}" \
+			emake html
+		rm -r "${d}"/sklearn/datasets/{data,desr,images}
+	fi
+}
+
+python_test() {
+	# doc builds and runs tests
+	use doc && return
+	distutils_install_for_testing ${SCIPY_FCONFIG}
+	esetup.py \
+		install --root="${T}/test-${EPYTHON}" \
+		--no-compile ${SCIPY_FCONFIG}
+	pushd "${T}/test-${EPYTHON}/$(python_get_sitedir)" || die > /dev/null
+	nosetests -v sklearn --exe || die
+	popd > /dev/null
+}
+
+python_install() {
+	distutils-r1_python_install ${SCIPY_FCONFIG}
+}
+
+python_install_all() {
+	find "${S}" -name \*LICENSE.txt -delete
+	use doc && HTML_DOCS=( doc/_build/html/. )
+	use examples && EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/scikits_learn/
@ 2016-01-06 15:07 Justin Lecher
  0 siblings, 0 replies; 24+ messages in thread
From: Justin Lecher @ 2016-01-06 15:07 UTC (permalink / raw
  To: gentoo-commits

commit:     55ffc41bbd379ce18e8fd5b7939fb16f0efb26e8
Author:     Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
AuthorDate: Wed Jan  6 11:15:48 2016 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Wed Jan  6 11:15:48 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55ffc41b

sci-libs/scikits_learn: Add missing dependency on virtual/blas

Package-Manager: portage-2.2.26

 sci-libs/scikits_learn/scikits_learn-0.14.1.ebuild | 2 ++
 sci-libs/scikits_learn/scikits_learn-0.15.1.ebuild | 2 ++
 sci-libs/scikits_learn/scikits_learn-0.15.2.ebuild | 2 ++
 sci-libs/scikits_learn/scikits_learn-0.16.1.ebuild | 1 +
 sci-libs/scikits_learn/scikits_learn-0.17.ebuild   | 2 ++
 5 files changed, 9 insertions(+)

diff --git a/sci-libs/scikits_learn/scikits_learn-0.14.1.ebuild b/sci-libs/scikits_learn/scikits_learn-0.14.1.ebuild
index fa4df05..3e380b4 100644
--- a/sci-libs/scikits_learn/scikits_learn-0.14.1.ebuild
+++ b/sci-libs/scikits_learn/scikits_learn-0.14.1.ebuild
@@ -26,12 +26,14 @@ RDEPEND="
 	dev-python/numpy[lapack,${PYTHON_USEDEP}]
 	sci-libs/scipy[${PYTHON_USEDEP}]
 	dev-python/matplotlib[${PYTHON_USEDEP}]
+	virtual/blas
 	virtual/cblas"
 DEPEND="
 	dev-python/cython[${PYTHON_USEDEP}]
 	dev-python/numpy[lapack,${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	sci-libs/scipy[${PYTHON_USEDEP}]
+	virtual/blas
 	virtual/cblas
 	doc? (
 		dev-python/sphinx[${PYTHON_USEDEP}]

diff --git a/sci-libs/scikits_learn/scikits_learn-0.15.1.ebuild b/sci-libs/scikits_learn/scikits_learn-0.15.1.ebuild
index bef5d88..fbd1831 100644
--- a/sci-libs/scikits_learn/scikits_learn-0.15.1.ebuild
+++ b/sci-libs/scikits_learn/scikits_learn-0.15.1.ebuild
@@ -27,12 +27,14 @@ RDEPEND="
 	dev-python/numpy[lapack,${PYTHON_USEDEP}]
 	sci-libs/scikits[${PYTHON_USEDEP}]
 	sci-libs/scipy[${PYTHON_USEDEP}]
+	virtual/blas
 	virtual/cblas"
 DEPEND="
 	dev-python/cython[${PYTHON_USEDEP}]
 	dev-python/numpy[lapack,${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	sci-libs/scipy[${PYTHON_USEDEP}]
+	virtual/blas
 	virtual/cblas
 	doc? (
 		dev-python/joblib[${PYTHON_USEDEP}]

diff --git a/sci-libs/scikits_learn/scikits_learn-0.15.2.ebuild b/sci-libs/scikits_learn/scikits_learn-0.15.2.ebuild
index bef5d88..fbd1831 100644
--- a/sci-libs/scikits_learn/scikits_learn-0.15.2.ebuild
+++ b/sci-libs/scikits_learn/scikits_learn-0.15.2.ebuild
@@ -27,12 +27,14 @@ RDEPEND="
 	dev-python/numpy[lapack,${PYTHON_USEDEP}]
 	sci-libs/scikits[${PYTHON_USEDEP}]
 	sci-libs/scipy[${PYTHON_USEDEP}]
+	virtual/blas
 	virtual/cblas"
 DEPEND="
 	dev-python/cython[${PYTHON_USEDEP}]
 	dev-python/numpy[lapack,${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	sci-libs/scipy[${PYTHON_USEDEP}]
+	virtual/blas
 	virtual/cblas
 	doc? (
 		dev-python/joblib[${PYTHON_USEDEP}]

diff --git a/sci-libs/scikits_learn/scikits_learn-0.16.1.ebuild b/sci-libs/scikits_learn/scikits_learn-0.16.1.ebuild
index 73ec3e4..98e179d 100644
--- a/sci-libs/scikits_learn/scikits_learn-0.16.1.ebuild
+++ b/sci-libs/scikits_learn/scikits_learn-0.16.1.ebuild
@@ -27,6 +27,7 @@ RDEPEND="
 	dev-python/numpy[lapack,${PYTHON_USEDEP}]
 	sci-libs/scikits[${PYTHON_USEDEP}]
 	sci-libs/scipy[${PYTHON_USEDEP}]
+	virtual/blas
 	virtual/cblas"
 DEPEND="
 	dev-python/cython[${PYTHON_USEDEP}]

diff --git a/sci-libs/scikits_learn/scikits_learn-0.17.ebuild b/sci-libs/scikits_learn/scikits_learn-0.17.ebuild
index 53742d6..79808a6 100644
--- a/sci-libs/scikits_learn/scikits_learn-0.17.ebuild
+++ b/sci-libs/scikits_learn/scikits_learn-0.17.ebuild
@@ -27,6 +27,7 @@ RDEPEND="
 	>=dev-python/numpy-1.6.1[lapack,${PYTHON_USEDEP}]
 	sci-libs/scikits[${PYTHON_USEDEP}]
 	>=sci-libs/scipy-0.9[${PYTHON_USEDEP}]
+	virtual/blas
 	virtual/cblas
 	virtual/python-funcsigs[${PYTHON_USEDEP}]
 	"
@@ -35,6 +36,7 @@ DEPEND="
 	dev-python/numpy[lapack,${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	sci-libs/scipy[${PYTHON_USEDEP}]
+	virtual/blas
 	virtual/cblas
 	doc? (
 		dev-python/joblib[${PYTHON_USEDEP}]


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/scikits_learn/
@ 2016-01-06 15:07 Justin Lecher
  0 siblings, 0 replies; 24+ messages in thread
From: Justin Lecher @ 2016-01-06 15:07 UTC (permalink / raw
  To: gentoo-commits

commit:     cd678d707b8908315e4a0b5164615df538d84281
Author:     Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
AuthorDate: Wed Jan  6 11:00:17 2016 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Wed Jan  6 11:00:17 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd678d70

sci-libs/scikits_learn: Add missing dependency on virtual/cblas

Package-Manager: portage-2.2.26

 sci-libs/scikits_learn/scikits_learn-0.14.1.ebuild | 6 ++++--
 sci-libs/scikits_learn/scikits_learn-0.15.1.ebuild | 6 ++++--
 sci-libs/scikits_learn/scikits_learn-0.15.2.ebuild | 6 ++++--
 sci-libs/scikits_learn/scikits_learn-0.16.1.ebuild | 6 ++++--
 sci-libs/scikits_learn/scikits_learn-0.17.ebuild   | 4 +++-
 5 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/sci-libs/scikits_learn/scikits_learn-0.14.1.ebuild b/sci-libs/scikits_learn/scikits_learn-0.14.1.ebuild
index 0fc4c83..fa4df05 100644
--- a/sci-libs/scikits_learn/scikits_learn-0.14.1.ebuild
+++ b/sci-libs/scikits_learn/scikits_learn-0.14.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -25,12 +25,14 @@ RDEPEND="
 	sci-libs/scikits[${PYTHON_USEDEP}]
 	dev-python/numpy[lapack,${PYTHON_USEDEP}]
 	sci-libs/scipy[${PYTHON_USEDEP}]
-	dev-python/matplotlib[${PYTHON_USEDEP}]"
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	virtual/cblas"
 DEPEND="
 	dev-python/cython[${PYTHON_USEDEP}]
 	dev-python/numpy[lapack,${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	sci-libs/scipy[${PYTHON_USEDEP}]
+	virtual/cblas
 	doc? (
 		dev-python/sphinx[${PYTHON_USEDEP}]
 		dev-python/matplotlib[${PYTHON_USEDEP}] )

diff --git a/sci-libs/scikits_learn/scikits_learn-0.15.1.ebuild b/sci-libs/scikits_learn/scikits_learn-0.15.1.ebuild
index 76b1f1a..bef5d88 100644
--- a/sci-libs/scikits_learn/scikits_learn-0.15.1.ebuild
+++ b/sci-libs/scikits_learn/scikits_learn-0.15.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -26,12 +26,14 @@ RDEPEND="
 	dev-python/nose[${PYTHON_USEDEP}]
 	dev-python/numpy[lapack,${PYTHON_USEDEP}]
 	sci-libs/scikits[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]"
+	sci-libs/scipy[${PYTHON_USEDEP}]
+	virtual/cblas"
 DEPEND="
 	dev-python/cython[${PYTHON_USEDEP}]
 	dev-python/numpy[lapack,${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	sci-libs/scipy[${PYTHON_USEDEP}]
+	virtual/cblas
 	doc? (
 		dev-python/joblib[${PYTHON_USEDEP}]
 		dev-python/matplotlib[${PYTHON_USEDEP}]

diff --git a/sci-libs/scikits_learn/scikits_learn-0.15.2.ebuild b/sci-libs/scikits_learn/scikits_learn-0.15.2.ebuild
index 76b1f1a..bef5d88 100644
--- a/sci-libs/scikits_learn/scikits_learn-0.15.2.ebuild
+++ b/sci-libs/scikits_learn/scikits_learn-0.15.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -26,12 +26,14 @@ RDEPEND="
 	dev-python/nose[${PYTHON_USEDEP}]
 	dev-python/numpy[lapack,${PYTHON_USEDEP}]
 	sci-libs/scikits[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]"
+	sci-libs/scipy[${PYTHON_USEDEP}]
+	virtual/cblas"
 DEPEND="
 	dev-python/cython[${PYTHON_USEDEP}]
 	dev-python/numpy[lapack,${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	sci-libs/scipy[${PYTHON_USEDEP}]
+	virtual/cblas
 	doc? (
 		dev-python/joblib[${PYTHON_USEDEP}]
 		dev-python/matplotlib[${PYTHON_USEDEP}]

diff --git a/sci-libs/scikits_learn/scikits_learn-0.16.1.ebuild b/sci-libs/scikits_learn/scikits_learn-0.16.1.ebuild
index f4fd867..73ec3e4 100644
--- a/sci-libs/scikits_learn/scikits_learn-0.16.1.ebuild
+++ b/sci-libs/scikits_learn/scikits_learn-0.16.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -26,12 +26,14 @@ RDEPEND="
 	dev-python/nose[${PYTHON_USEDEP}]
 	dev-python/numpy[lapack,${PYTHON_USEDEP}]
 	sci-libs/scikits[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]"
+	sci-libs/scipy[${PYTHON_USEDEP}]
+	virtual/cblas"
 DEPEND="
 	dev-python/cython[${PYTHON_USEDEP}]
 	dev-python/numpy[lapack,${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	sci-libs/scipy[${PYTHON_USEDEP}]
+	virtual/cblas
 	doc? (
 		dev-python/joblib[${PYTHON_USEDEP}]
 		dev-python/matplotlib[${PYTHON_USEDEP}]

diff --git a/sci-libs/scikits_learn/scikits_learn-0.17.ebuild b/sci-libs/scikits_learn/scikits_learn-0.17.ebuild
index 9877244..53742d6 100644
--- a/sci-libs/scikits_learn/scikits_learn-0.17.ebuild
+++ b/sci-libs/scikits_learn/scikits_learn-0.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -27,6 +27,7 @@ RDEPEND="
 	>=dev-python/numpy-1.6.1[lapack,${PYTHON_USEDEP}]
 	sci-libs/scikits[${PYTHON_USEDEP}]
 	>=sci-libs/scipy-0.9[${PYTHON_USEDEP}]
+	virtual/cblas
 	virtual/python-funcsigs[${PYTHON_USEDEP}]
 	"
 DEPEND="
@@ -34,6 +35,7 @@ DEPEND="
 	dev-python/numpy[lapack,${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	sci-libs/scipy[${PYTHON_USEDEP}]
+	virtual/cblas
 	doc? (
 		dev-python/joblib[${PYTHON_USEDEP}]
 		dev-python/matplotlib[${PYTHON_USEDEP}]


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/scikits_learn/
@ 2016-01-06 15:07 Justin Lecher
  0 siblings, 0 replies; 24+ messages in thread
From: Justin Lecher @ 2016-01-06 15:07 UTC (permalink / raw
  To: gentoo-commits

commit:     260a6942b72d13517252f72eee279f78ffea2a23
Author:     Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
AuthorDate: Wed Jan  6 11:20:23 2016 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Wed Jan  6 11:20:23 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=260a6942

sci-libs/scikits_learn: Add missing dies

Package-Manager: portage-2.2.26

 sci-libs/scikits_learn/scikits_learn-0.14.1.ebuild | 6 +++---
 sci-libs/scikits_learn/scikits_learn-0.15.1.ebuild | 6 +++---
 sci-libs/scikits_learn/scikits_learn-0.15.2.ebuild | 6 +++---
 sci-libs/scikits_learn/scikits_learn-0.16.1.ebuild | 4 ++--
 sci-libs/scikits_learn/scikits_learn-0.17.ebuild   | 6 +++---
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/sci-libs/scikits_learn/scikits_learn-0.14.1.ebuild b/sci-libs/scikits_learn/scikits_learn-0.14.1.ebuild
index 3e380b4..0b2c983 100644
--- a/sci-libs/scikits_learn/scikits_learn-0.14.1.ebuild
+++ b/sci-libs/scikits_learn/scikits_learn-0.14.1.ebuild
@@ -73,15 +73,15 @@ python_compile() {
 
 python_compile_all() {
 	if use doc; then
-		cd "${S}/doc"
+		cd "${S}/doc" || die
 		local d="${BUILD_DIR}"/lib
 		ln -s "${S}"/sklearn/datasets/{data,descr,images} \
-			"${d}"/sklearn/datasets
+			"${d}"/sklearn/datasets || die
 		VARTEXFONTS="${T}"/fonts \
 			MPLCONFIGDIR="${BUILD_DIR}" \
 			PYTHONPATH="${d}" \
 			emake html
-		rm -r "${d}"/sklearn/datasets/{data,desr,images}
+		rm -r "${d}"/sklearn/datasets/{data,desr,images} || die
 	fi
 }
 

diff --git a/sci-libs/scikits_learn/scikits_learn-0.15.1.ebuild b/sci-libs/scikits_learn/scikits_learn-0.15.1.ebuild
index fbd1831..c50ed8a 100644
--- a/sci-libs/scikits_learn/scikits_learn-0.15.1.ebuild
+++ b/sci-libs/scikits_learn/scikits_learn-0.15.1.ebuild
@@ -73,15 +73,15 @@ python_compile() {
 
 python_compile_all() {
 	if use doc; then
-		cd "${S}/doc"
+		cd "${S}/doc" || die
 		local d="${BUILD_DIR}"/lib
 		ln -s "${S}"/sklearn/datasets/{data,descr,images} \
-			"${d}"/sklearn/datasets
+			"${d}"/sklearn/datasets || die
 		VARTEXFONTS="${T}"/fonts \
 			MPLCONFIGDIR="${BUILD_DIR}" \
 			PYTHONPATH="${d}" \
 			emake html
-		rm -r "${d}"/sklearn/datasets/{data,desr,images}
+		rm -r "${d}"/sklearn/datasets/{data,desr,images} || die
 	fi
 }
 

diff --git a/sci-libs/scikits_learn/scikits_learn-0.15.2.ebuild b/sci-libs/scikits_learn/scikits_learn-0.15.2.ebuild
index fbd1831..c50ed8a 100644
--- a/sci-libs/scikits_learn/scikits_learn-0.15.2.ebuild
+++ b/sci-libs/scikits_learn/scikits_learn-0.15.2.ebuild
@@ -73,15 +73,15 @@ python_compile() {
 
 python_compile_all() {
 	if use doc; then
-		cd "${S}/doc"
+		cd "${S}/doc" || die
 		local d="${BUILD_DIR}"/lib
 		ln -s "${S}"/sklearn/datasets/{data,descr,images} \
-			"${d}"/sklearn/datasets
+			"${d}"/sklearn/datasets || die
 		VARTEXFONTS="${T}"/fonts \
 			MPLCONFIGDIR="${BUILD_DIR}" \
 			PYTHONPATH="${d}" \
 			emake html
-		rm -r "${d}"/sklearn/datasets/{data,desr,images}
+		rm -r "${d}"/sklearn/datasets/{data,desr,images} || die
 	fi
 }
 

diff --git a/sci-libs/scikits_learn/scikits_learn-0.16.1.ebuild b/sci-libs/scikits_learn/scikits_learn-0.16.1.ebuild
index 98e179d..46432a1 100644
--- a/sci-libs/scikits_learn/scikits_learn-0.16.1.ebuild
+++ b/sci-libs/scikits_learn/scikits_learn-0.16.1.ebuild
@@ -72,7 +72,7 @@ python_compile() {
 
 python_compile_all() {
 	if use doc; then
-		cd "${S}/doc"
+		cd "${S}/doc" || die
 		local d="${BUILD_DIR}"/lib
 		ln -s "${S}"/sklearn/datasets/{data,descr,images} \
 			"${d}"/sklearn/datasets
@@ -80,7 +80,7 @@ python_compile_all() {
 			MPLCONFIGDIR="${BUILD_DIR}" \
 			PYTHONPATH="${d}" \
 			emake html
-		rm -r "${d}"/sklearn/datasets/{data,desr,images}
+		rm -r "${d}"/sklearn/datasets/{data,desr,images} || die
 	fi
 }
 

diff --git a/sci-libs/scikits_learn/scikits_learn-0.17.ebuild b/sci-libs/scikits_learn/scikits_learn-0.17.ebuild
index 79808a6..b7c3bcd 100644
--- a/sci-libs/scikits_learn/scikits_learn-0.17.ebuild
+++ b/sci-libs/scikits_learn/scikits_learn-0.17.ebuild
@@ -81,15 +81,15 @@ python_compile() {
 
 python_compile_all() {
 	if use doc; then
-		cd "${S}/doc"
+		cd "${S}/doc" || die
 		local d="${BUILD_DIR}"/lib
 		ln -s "${S}"/sklearn/datasets/{data,descr,images} \
-			"${d}"/sklearn/datasets
+			"${d}"/sklearn/datasets || die
 		VARTEXFONTS="${T}"/fonts \
 			MPLCONFIGDIR="${BUILD_DIR}" \
 			PYTHONPATH="${d}" \
 			emake html
-		rm -r "${d}"/sklearn/datasets/{data,desr,images}
+		rm -r "${d}"/sklearn/datasets/{data,desr,images} || die
 	fi
 }
 


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/scikits_learn/
@ 2016-01-26 19:09 Justin Lecher
  0 siblings, 0 replies; 24+ messages in thread
From: Justin Lecher @ 2016-01-26 19:09 UTC (permalink / raw
  To: gentoo-commits

commit:     afadb91fb20b3f5fbbe19c2c493ec78cb480d560
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 26 19:09:10 2016 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Tue Jan 26 19:09:18 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=afadb91f

sci-libs/scikits_learn: Fix typo in doc installation

Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=572806

Package-Manager: portage-2.2.27
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 sci-libs/scikits_learn/scikits_learn-0.17.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/scikits_learn/scikits_learn-0.17.ebuild b/sci-libs/scikits_learn/scikits_learn-0.17.ebuild
index b7c3bcd..304b625 100644
--- a/sci-libs/scikits_learn/scikits_learn-0.17.ebuild
+++ b/sci-libs/scikits_learn/scikits_learn-0.17.ebuild
@@ -89,7 +89,7 @@ python_compile_all() {
 			MPLCONFIGDIR="${BUILD_DIR}" \
 			PYTHONPATH="${d}" \
 			emake html
-		rm -r "${d}"/sklearn/datasets/{data,desr,images} || die
+		rm -r "${d}"/sklearn/datasets/{data,descr,images} || die
 	fi
 }
 


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/scikits_learn/
@ 2016-01-26 19:09 Justin Lecher
  0 siblings, 0 replies; 24+ messages in thread
From: Justin Lecher @ 2016-01-26 19:09 UTC (permalink / raw
  To: gentoo-commits

commit:     55af64bf12a24f3fc834c8d40abd0d745ba9f673
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 26 17:01:35 2016 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Tue Jan 26 19:09:18 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55af64bf

sci-libs/scikits_learn: Drop old

obsoletes:

Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=436750
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=423269

Package-Manager: portage-2.2.27
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 sci-libs/scikits_learn/Manifest                    |   5 -
 sci-libs/scikits_learn/scikits_learn-0.13.1.ebuild |  88 ----------------
 sci-libs/scikits_learn/scikits_learn-0.14.1.ebuild | 112 ---------------------
 sci-libs/scikits_learn/scikits_learn-0.15.1.ebuild | 112 ---------------------
 sci-libs/scikits_learn/scikits_learn-0.15.2.ebuild | 112 ---------------------
 sci-libs/scikits_learn/scikits_learn-0.16.1.ebuild | 111 --------------------
 6 files changed, 540 deletions(-)

diff --git a/sci-libs/scikits_learn/Manifest b/sci-libs/scikits_learn/Manifest
index f395149..2e18c12 100644
--- a/sci-libs/scikits_learn/Manifest
+++ b/sci-libs/scikits_learn/Manifest
@@ -1,6 +1 @@
-DIST scikit-learn-0.13.1.tar.gz 3477412 SHA256 a6e4759a779ba792435d096c882a0d66ee29d369755c09209f1a4e50877bdc94 SHA512 945475bf6e5600da63d26217ae6966f8f5e3a8d9c7645363ba9e9d8d4c475e2ebcfa45e75f8988537716b7a9c16980c52df4310b924eec4da9433d1fc98cc34b WHIRLPOOL 0af58429d604eb1fb22f24e155daaa67831d16d49ff414b29a150f03617be1811796d653afb0f7b4eac9f03cf318910dd9544dc3a58543a333fccd8580a59d4b
-DIST scikit-learn-0.14.1.tar.gz 23228378 SHA256 4c317cabb56c61f4c574879b53aa6bbea0132bb630678229bce98638f4b000e0 SHA512 4d094a698f73c458f2f8c03240fab070854bcb5871acfc4f1aaf1a6f19f28a70bc6aeadb89bf6c586d2b39b81f57175dbb7d64ac4c3693a3be1b407f78e44c52 WHIRLPOOL 39f317721f278037b779001f3cb5e117b6d9da5996df78a53440d68bc860eccbf462a1d48890246624d8e256a6301fb8195199a2ff387bb60179fb11bda9aea6
-DIST scikit-learn-0.15.1.tar.gz 7034220 SHA256 4b13456727b9310857f12cc7b9d1c62d59f3ef602fea9d391afc0c8c847ed17d SHA512 4c2e68b1bb75c85c2a83605a32ba5adbd224bc25b19fca85e18dbe24f20cbe51cbfb02be546a4f05fc190f77e438cb17c6a5d69026455e8c11907599462f9984 WHIRLPOOL e1bc387b013abcab18d8ee0545dda543bb098b9d7636229880dea667fc4627d1822fe8a430a2d26dbafcc0b0e90326d5529245e6eff1345b73fc5a24b7a51096
-DIST scikit-learn-0.15.2.tar.gz 7007922 SHA256 1a8a881f6f13edc0ac58931ce21f899eb7920af50aa08802413d1239e2aa5fa6 SHA512 ca2470df73be1b735f756f641fdbb4dc59a54b67d12f61c54542f0928ce9242665d1b8793673a9d989a41f2c2945c2ba92ed54fc9914fbe030a5c8af289c6523 WHIRLPOOL 9043bf653f8d866f98e5a2342fbacf51fafefd5096e70989ebeb4b580c38b5468c3a2eb598d4d5492ba1413378b8c133938baa20d4a292c9f94c5596dbf1d405
-DIST scikit-learn-0.16.1.tar.gz 7267115 SHA256 c0721e295056c95c7002e05726f2bd271a7923e88bdeab34a2b60aac2b0ee6e4 SHA512 18ea7420a4a7f23f030ad1e20cf29dd7d6183872ed4aa3daf4bfb5106728de21775461b90a917f231e56fee78eea5927ff8c3160c1da1473f34315b00994461b WHIRLPOOL 15eba05ba0d9ac62ed30636ece9091cb9930e432e5726b67be3de0ae5b81a187eac8cac69184106b4a5a1c4393801fb6a375b6f025c3562223ad5ed0e508ad8c
 DIST scikit-learn-0.17.tar.gz 7834903 SHA256 23a5b6804524cb2cd54d8310010169511c7633dcf69af7439747eec02677f314 SHA512 53a76e2f90e27967bf216cd9d7e8051ed847a3381e3b7b7b8236511b4105eef41bd4d3c9f7f71a51db4b0bf99cbd571d7c1b26803757cff04424b70cb834b555 WHIRLPOOL 3a1ef13dafe6eb38389f68bc75dee10bfe141bac6d2782cd11be27ffcb8fe7efdf113b6911a238c6cd141bfe3b69960f47cf0725d0ea033129dff8fb5c57bef4

diff --git a/sci-libs/scikits_learn/scikits_learn-0.13.1.ebuild b/sci-libs/scikits_learn/scikits_learn-0.13.1.ebuild
deleted file mode 100644
index 0554e1c..0000000
--- a/sci-libs/scikits_learn/scikits_learn-0.13.1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 multilib flag-o-matic
-
-MYPN="${PN/scikits_/scikit-}"
-
-DESCRIPTION="Python modules for machine learning and data mining"
-HOMEPAGE="http://scikit-learn.org"
-SRC_URI="mirror://sourceforge/${MYPN}/${MYPN}-${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples"
-
-RDEPEND="
-	sci-libs/scikits[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
-	dev-python/matplotlib[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MYPN}-${PV}"
-
-python_prepare_all() {
-	# bug #397605
-	[[ ${CHOST} == *-darwin* ]] \
-		&& append-ldflags -bundle "-undefined dynamic_lookup" \
-		|| append-ldflags -shared
-
-	# scikits-learn now uses the horrible numpy.distutils automagic
-	export SCIPY_FCONFIG="config_fc --noopt --noarch"
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	distutils-r1_python_compile ${SCIPY_FCONFIG}
-}
-
-python_compile_all() {
-	if use doc; then
-		cd "${S}/doc"
-		local d="${BUILD_DIR}"/lib
-		ln -s "${S}"/sklearn/datasets/{data,descr,images} \
-			"${d}"/sklearn/datasets
-		VARTEXFONTS="${T}"/fonts \
-			MPLCONFIGDIR="${BUILD_DIR}" \
-			PYTHONPATH="${d}" \
-			emake html
-		rm -r "${d}"/sklearn/datasets/{data,desr,images}
-	fi
-}
-
-python_test() {
-	# doc builds and runs tests
-	use doc && return
-	esetup.py \
-		install --root="${T}/test-${EPYTHON}" \
-		--no-compile ${SCIPY_FCONFIG}
-	pushd "${T}/test-${EPYTHON}/$(python_get_sitedir)" || die > /dev/null
-	nosetests -v sklearn --exe || die
-	popd > /dev/null
-}
-
-python_install() {
-	distutils-r1_python_install ${SCIPY_FCONFIG}
-}
-
-python_install_all() {
-	find "${S}" -name \*LICENSE.txt -delete
-	use doc && HTML_DOCS=( doc/_build/html/. )
-	distutils-r1_python_install_all
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}

diff --git a/sci-libs/scikits_learn/scikits_learn-0.14.1.ebuild b/sci-libs/scikits_learn/scikits_learn-0.14.1.ebuild
deleted file mode 100644
index 0b2c983..0000000
--- a/sci-libs/scikits_learn/scikits_learn-0.14.1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3} )
-
-inherit distutils-r1 eutils multilib flag-o-matic
-
-MYPN="${PN/scikits_/scikit-}"
-MYP="${MYPN}-${PV}"
-
-DESCRIPTION="Python modules for machine learning and data mining"
-HOMEPAGE="http://scikit-learn.org"
-SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples test"
-
-RDEPEND="
-	dev-python/joblib[${PYTHON_USEDEP}]
-	sci-libs/scikits[${PYTHON_USEDEP}]
-	dev-python/numpy[lapack,${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	virtual/blas
-	virtual/cblas"
-DEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/numpy[lapack,${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
-	virtual/blas
-	virtual/cblas
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}] )
-	test? (
-		dev-python/joblib[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MYP}"
-
-python_prepare_all() {
-	# bug #397605
-	[[ ${CHOST} == *-darwin* ]] \
-		&& append-ldflags -bundle "-undefined dynamic_lookup" \
-		|| append-ldflags -shared
-
-	# scikits-learn now uses the horrible numpy.distutils automagic
-	export SCIPY_FCONFIG="config_fc --noopt --noarch"
-
-	# use system joblib
-	rm -r sklearn/externals/joblib/* || die
-	echo "from joblib import *" > sklearn/externals/joblib/__init__.py
-	sed -i -e '/joblib\/test/d' sklearn/externals/setup.py || die
-	sed -i -e 's/..externals.joblib/joblib/g' \
-		sklearn/decomposition/tests/test_sparse_pca.py \
-		sklearn/metrics/pairwise.py || die
-
-	# use gentoo cblas infrastructure
-	epatch "${FILESDIR}"/${P}-system-cblas.patch
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	distutils-r1_python_compile ${SCIPY_FCONFIG}
-}
-
-python_compile_all() {
-	if use doc; then
-		cd "${S}/doc" || die
-		local d="${BUILD_DIR}"/lib
-		ln -s "${S}"/sklearn/datasets/{data,descr,images} \
-			"${d}"/sklearn/datasets || die
-		VARTEXFONTS="${T}"/fonts \
-			MPLCONFIGDIR="${BUILD_DIR}" \
-			PYTHONPATH="${d}" \
-			emake html
-		rm -r "${d}"/sklearn/datasets/{data,desr,images} || die
-	fi
-}
-
-python_test() {
-	# doc builds and runs tests
-	use doc && return
-	distutils_install_for_testing ${SCIPY_FCONFIG}
-	esetup.py \
-		install --root="${T}/test-${EPYTHON}" \
-		--no-compile ${SCIPY_FCONFIG}
-	pushd "${T}/test-${EPYTHON}/$(python_get_sitedir)" || die > /dev/null
-	nosetests -v sklearn --exe || die
-	popd > /dev/null
-}
-
-python_install() {
-	distutils-r1_python_install ${SCIPY_FCONFIG}
-}
-
-python_install_all() {
-	find "${S}" -name \*LICENSE.txt -delete
-	use doc && HTML_DOCS=( doc/_build/html/. )
-	distutils-r1_python_install_all
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}

diff --git a/sci-libs/scikits_learn/scikits_learn-0.15.1.ebuild b/sci-libs/scikits_learn/scikits_learn-0.15.1.ebuild
deleted file mode 100644
index c50ed8a..0000000
--- a/sci-libs/scikits_learn/scikits_learn-0.15.1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit distutils-r1 eutils multilib flag-o-matic
-
-MYPN="${PN/scikits_/scikit-}"
-MYP="${MYPN}-${PV}"
-
-DESCRIPTION="Python modules for machine learning and data mining"
-HOMEPAGE="http://scikit-learn.org"
-SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples test"
-
-RDEPEND="
-	dev-python/joblib[${PYTHON_USEDEP}]
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	dev-python/nose[${PYTHON_USEDEP}]
-	dev-python/numpy[lapack,${PYTHON_USEDEP}]
-	sci-libs/scikits[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
-	virtual/blas
-	virtual/cblas"
-DEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/numpy[lapack,${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
-	virtual/blas
-	virtual/cblas
-	doc? (
-		dev-python/joblib[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		)"
-
-S="${WORKDIR}/${MYP}"
-
-python_prepare_all() {
-	# bug #397605
-	[[ ${CHOST} == *-darwin* ]] \
-		&& append-ldflags -bundle "-undefined dynamic_lookup" \
-		|| append-ldflags -shared
-
-	# scikits-learn now uses the horrible numpy.distutils automagic
-	export SCIPY_FCONFIG="config_fc --noopt --noarch"
-
-	# use system joblib
-	rm -r sklearn/externals/joblib/* || die
-	echo "from joblib import *" > sklearn/externals/joblib/__init__.py
-	sed -i -e '/joblib\/test/d' sklearn/externals/setup.py || die
-	sed -i -e 's/..externals.joblib/joblib/g' \
-		sklearn/decomposition/tests/test_sparse_pca.py \
-		sklearn/metrics/pairwise.py || die
-
-	# use gentoo cblas infrastructure
-	epatch "${FILESDIR}"/${PN}-0.14.1-system-cblas.patch
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	distutils-r1_python_compile ${SCIPY_FCONFIG}
-}
-
-python_compile_all() {
-	if use doc; then
-		cd "${S}/doc" || die
-		local d="${BUILD_DIR}"/lib
-		ln -s "${S}"/sklearn/datasets/{data,descr,images} \
-			"${d}"/sklearn/datasets || die
-		VARTEXFONTS="${T}"/fonts \
-			MPLCONFIGDIR="${BUILD_DIR}" \
-			PYTHONPATH="${d}" \
-			emake html
-		rm -r "${d}"/sklearn/datasets/{data,desr,images} || die
-	fi
-}
-
-python_test() {
-	# doc builds and runs tests
-	use doc && return
-	distutils_install_for_testing ${SCIPY_FCONFIG}
-	esetup.py \
-		install --root="${T}/test-${EPYTHON}" \
-		--no-compile ${SCIPY_FCONFIG}
-	pushd "${T}/test-${EPYTHON}/$(python_get_sitedir)" || die > /dev/null
-	nosetests -v sklearn --exe || die
-	popd > /dev/null
-}
-
-python_install() {
-	distutils-r1_python_install ${SCIPY_FCONFIG}
-}
-
-python_install_all() {
-	find "${S}" -name \*LICENSE.txt -delete
-	use doc && HTML_DOCS=( doc/_build/html/. )
-	distutils-r1_python_install_all
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}

diff --git a/sci-libs/scikits_learn/scikits_learn-0.15.2.ebuild b/sci-libs/scikits_learn/scikits_learn-0.15.2.ebuild
deleted file mode 100644
index c50ed8a..0000000
--- a/sci-libs/scikits_learn/scikits_learn-0.15.2.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit distutils-r1 eutils multilib flag-o-matic
-
-MYPN="${PN/scikits_/scikit-}"
-MYP="${MYPN}-${PV}"
-
-DESCRIPTION="Python modules for machine learning and data mining"
-HOMEPAGE="http://scikit-learn.org"
-SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples test"
-
-RDEPEND="
-	dev-python/joblib[${PYTHON_USEDEP}]
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	dev-python/nose[${PYTHON_USEDEP}]
-	dev-python/numpy[lapack,${PYTHON_USEDEP}]
-	sci-libs/scikits[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
-	virtual/blas
-	virtual/cblas"
-DEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/numpy[lapack,${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
-	virtual/blas
-	virtual/cblas
-	doc? (
-		dev-python/joblib[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		)"
-
-S="${WORKDIR}/${MYP}"
-
-python_prepare_all() {
-	# bug #397605
-	[[ ${CHOST} == *-darwin* ]] \
-		&& append-ldflags -bundle "-undefined dynamic_lookup" \
-		|| append-ldflags -shared
-
-	# scikits-learn now uses the horrible numpy.distutils automagic
-	export SCIPY_FCONFIG="config_fc --noopt --noarch"
-
-	# use system joblib
-	rm -r sklearn/externals/joblib/* || die
-	echo "from joblib import *" > sklearn/externals/joblib/__init__.py
-	sed -i -e '/joblib\/test/d' sklearn/externals/setup.py || die
-	sed -i -e 's/..externals.joblib/joblib/g' \
-		sklearn/decomposition/tests/test_sparse_pca.py \
-		sklearn/metrics/pairwise.py || die
-
-	# use gentoo cblas infrastructure
-	epatch "${FILESDIR}"/${PN}-0.14.1-system-cblas.patch
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	distutils-r1_python_compile ${SCIPY_FCONFIG}
-}
-
-python_compile_all() {
-	if use doc; then
-		cd "${S}/doc" || die
-		local d="${BUILD_DIR}"/lib
-		ln -s "${S}"/sklearn/datasets/{data,descr,images} \
-			"${d}"/sklearn/datasets || die
-		VARTEXFONTS="${T}"/fonts \
-			MPLCONFIGDIR="${BUILD_DIR}" \
-			PYTHONPATH="${d}" \
-			emake html
-		rm -r "${d}"/sklearn/datasets/{data,desr,images} || die
-	fi
-}
-
-python_test() {
-	# doc builds and runs tests
-	use doc && return
-	distutils_install_for_testing ${SCIPY_FCONFIG}
-	esetup.py \
-		install --root="${T}/test-${EPYTHON}" \
-		--no-compile ${SCIPY_FCONFIG}
-	pushd "${T}/test-${EPYTHON}/$(python_get_sitedir)" || die > /dev/null
-	nosetests -v sklearn --exe || die
-	popd > /dev/null
-}
-
-python_install() {
-	distutils-r1_python_install ${SCIPY_FCONFIG}
-}
-
-python_install_all() {
-	find "${S}" -name \*LICENSE.txt -delete
-	use doc && HTML_DOCS=( doc/_build/html/. )
-	distutils-r1_python_install_all
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}

diff --git a/sci-libs/scikits_learn/scikits_learn-0.16.1.ebuild b/sci-libs/scikits_learn/scikits_learn-0.16.1.ebuild
deleted file mode 100644
index 46432a1..0000000
--- a/sci-libs/scikits_learn/scikits_learn-0.16.1.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4} )
-
-inherit distutils-r1 eutils multilib flag-o-matic
-
-MYPN="${PN/scikits_/scikit-}"
-MYP="${MYPN}-${PV}"
-
-DESCRIPTION="Python modules for machine learning and data mining"
-HOMEPAGE="http://scikit-learn.org"
-SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples test"
-
-RDEPEND="
-	dev-python/joblib[${PYTHON_USEDEP}]
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	dev-python/nose[${PYTHON_USEDEP}]
-	dev-python/numpy[lapack,${PYTHON_USEDEP}]
-	sci-libs/scikits[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
-	virtual/blas
-	virtual/cblas"
-DEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/numpy[lapack,${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
-	virtual/cblas
-	doc? (
-		dev-python/joblib[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		)"
-
-S="${WORKDIR}/${MYP}"
-
-python_prepare_all() {
-	# bug #397605
-	[[ ${CHOST} == *-darwin* ]] \
-		&& append-ldflags -bundle "-undefined dynamic_lookup" \
-		|| append-ldflags -shared
-
-	# scikits-learn now uses the horrible numpy.distutils automagic
-	export SCIPY_FCONFIG="config_fc --noopt --noarch"
-
-	# use system joblib
-	rm -r sklearn/externals/joblib/* || die
-	echo "from joblib import *" > sklearn/externals/joblib/__init__.py
-	sed -i -e '/joblib\/test/d' sklearn/externals/setup.py || die
-	sed -i -e 's/..externals.joblib/joblib/g' \
-		sklearn/decomposition/tests/test_sparse_pca.py \
-		sklearn/metrics/pairwise.py || die
-
-	# use gentoo cblas infrastructure
-	epatch "${FILESDIR}"/${PN}-0.14.1-system-cblas.patch
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	distutils-r1_python_compile ${SCIPY_FCONFIG}
-}
-
-python_compile_all() {
-	if use doc; then
-		cd "${S}/doc" || die
-		local d="${BUILD_DIR}"/lib
-		ln -s "${S}"/sklearn/datasets/{data,descr,images} \
-			"${d}"/sklearn/datasets
-		VARTEXFONTS="${T}"/fonts \
-			MPLCONFIGDIR="${BUILD_DIR}" \
-			PYTHONPATH="${d}" \
-			emake html
-		rm -r "${d}"/sklearn/datasets/{data,desr,images} || die
-	fi
-}
-
-python_test() {
-	# doc builds and runs tests
-	use doc && return
-	distutils_install_for_testing ${SCIPY_FCONFIG}
-	esetup.py \
-		install --root="${T}/test-${EPYTHON}" \
-		--no-compile ${SCIPY_FCONFIG}
-	pushd "${T}/test-${EPYTHON}/$(python_get_sitedir)" || die > /dev/null
-	nosetests -v sklearn --exe || die
-	popd > /dev/null
-}
-
-python_install() {
-	distutils-r1_python_install ${SCIPY_FCONFIG}
-}
-
-python_install_all() {
-	find "${S}" -name \*LICENSE.txt -delete
-	use doc && HTML_DOCS=( doc/_build/html/. )
-	distutils-r1_python_install_all
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/scikits_learn/
@ 2016-08-13 18:48 David Seifert
  0 siblings, 0 replies; 24+ messages in thread
From: David Seifert @ 2016-08-13 18:48 UTC (permalink / raw
  To: gentoo-commits

commit:     0e8483cf1fe8b3776bd29f6c056764d3e95cfa6d
Author:     Horea Christian <horea.christ <AT> yandex <DOT> com>
AuthorDate: Thu Aug 11 02:57:05 2016 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Aug 13 18:48:24 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e8483cf

sci-libs/scikits_learn: using system joblib for cross_validation module

Package-Manager: portage-2.3.0
Closes: https://github.com/gentoo/gentoo/pull/2065

Signed-off-by: David Seifert <soap <AT> gentoo.org>

 sci-libs/scikits_learn/scikits_learn-0.17.1.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sci-libs/scikits_learn/scikits_learn-0.17.1.ebuild b/sci-libs/scikits_learn/scikits_learn-0.17.1.ebuild
index 865a207..89c2409 100644
--- a/sci-libs/scikits_learn/scikits_learn-0.17.1.ebuild
+++ b/sci-libs/scikits_learn/scikits_learn-0.17.1.ebuild
@@ -61,7 +61,8 @@ python_prepare_all() {
 	rm -r sklearn/externals/joblib/* || die
 	echo "from joblib import *" > sklearn/externals/joblib/__init__.py
 	sed -i -e '/joblib\/test/d' sklearn/externals/setup.py || die
-	sed -i -e 's/..externals.joblib/joblib/g' \
+	sed -i -e 's/..externals.joblib/ joblib/g' \
+		sklearn/cross_validation.py \
 		sklearn/decomposition/tests/test_sparse_pca.py \
 		sklearn/metrics/pairwise.py || die
 


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/scikits_learn/
@ 2017-02-14  6:47 Benda XU
  0 siblings, 0 replies; 24+ messages in thread
From: Benda XU @ 2017-02-14  6:47 UTC (permalink / raw
  To: gentoo-commits

commit:     d71430e877ec01acffeb3f9d988c09103c0fb78a
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 14 06:46:45 2017 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Tue Feb 14 06:47:08 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d71430e8

sci-libs/scikits_learn: version bump.

  Fix joblib ImportError by replacing all bundled joblib
  imports with the system one.

Bug: 609136 590296

Package-Manager: portage-2.3.3

 sci-libs/scikits_learn/scikits_learn-0.18.1.ebuild | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/sci-libs/scikits_learn/scikits_learn-0.18.1.ebuild b/sci-libs/scikits_learn/scikits_learn-0.18.1.ebuild
index 75452bc99b..8f668c735b 100644
--- a/sci-libs/scikits_learn/scikits_learn-0.18.1.ebuild
+++ b/sci-libs/scikits_learn/scikits_learn-0.18.1.ebuild
@@ -56,20 +56,17 @@ python_prepare_all() {
 	export SCIPY_FCONFIG="config_fc --noopt --noarch"
 
 	# use system joblib
-	rm -r sklearn/externals/joblib/* || die
-	echo "from joblib import *" > sklearn/externals/joblib/__init__.py
-	sed -i -e '/joblib\/test/d' sklearn/externals/setup.py || die
-	sed -i -e 's/..externals.joblib/ joblib/g' \
-		sklearn/cross_validation.py \
-		sklearn/decomposition/tests/test_sparse_pca.py \
-		sklearn/metrics/pairwise.py || die
+	rm -r sklearn/externals/joblib || die
+	sed -i -e '/joblib/d' sklearn/externals/setup.py || die
+	for f in sklearn/{*/,}*.py; do
+		sed -r -e 's/from (sklearn|\.|)\.externals\.joblib/from joblib/' -i $f || die
+	done
 
 	rm sklearn/externals/funcsigs.py || die
 	rm sklearn/externals/odict.py || die
-	sed -e 's:from ..externals.funcsigs import signature:from funcsigs import signature:g' \
-		-i sklearn/utils/fixes.py || die
-	sed -e 's:from sklearn.externals.funcsigs import signature:from funcsigs import signature:g' \
-		-i sklearn/gaussian_process/{tests/test_,}kernels.py || die
+	for f in sklearn/{utils/fixes.py,gaussian_process/{tests/test_,}kernels.py}; do
+		sed -r -e 's/from (sklearn|\.|)\.externals\.funcsigs/from funcsigs/' -i $f || die
+	done
 
 	distutils-r1_python_prepare_all
 }


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/scikits_learn/
@ 2017-02-14  6:47 Benda XU
  0 siblings, 0 replies; 24+ messages in thread
From: Benda XU @ 2017-02-14  6:47 UTC (permalink / raw
  To: gentoo-commits

commit:     1ce3b61530ea7ad1d14c847f0d5863f702257f56
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 14 06:07:37 2017 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Tue Feb 14 06:47:08 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ce3b615

sci-libs/scikits_learn: version bump.

Package-Manager: portage-2.3.3

 sci-libs/scikits_learn/Manifest                    |   1 +
 sci-libs/scikits_learn/scikits_learn-0.18.1.ebuild | 117 +++++++++++++++++++++
 2 files changed, 118 insertions(+)

diff --git a/sci-libs/scikits_learn/Manifest b/sci-libs/scikits_learn/Manifest
index 265606265a..8fc199b9b8 100644
--- a/sci-libs/scikits_learn/Manifest
+++ b/sci-libs/scikits_learn/Manifest
@@ -1,2 +1,3 @@
 DIST scikit-learn-0.17.1.tar.gz 7898571 SHA256 9f4cf58e57d81783289fc503caaed1f210bab49b7a6f680bf3c04b1e0a96e5f0 SHA512 5786e04a13225d2433103f1873f2753e332704b98c4c32b840970f763ec1abf0248007089e5ae47e11c66535f05a0d0402715622e6d6f0955ec7961b92e1b2e5 WHIRLPOOL cded0be080aa0e6e5486d2613c007c7ff1ea769b623f60cb97c4e03b2d130c53b66e9c22a20d644c61cd82eb8b460024a2b84365ff846aacfc07bf49a6bef0ac
 DIST scikit-learn-0.17.tar.gz 7834903 SHA256 23a5b6804524cb2cd54d8310010169511c7633dcf69af7439747eec02677f314 SHA512 53a76e2f90e27967bf216cd9d7e8051ed847a3381e3b7b7b8236511b4105eef41bd4d3c9f7f71a51db4b0bf99cbd571d7c1b26803757cff04424b70cb834b555 WHIRLPOOL 3a1ef13dafe6eb38389f68bc75dee10bfe141bac6d2782cd11be27ffcb8fe7efdf113b6911a238c6cd141bfe3b69960f47cf0725d0ea033129dff8fb5c57bef4
+DIST scikit-learn-0.18.1.tar.gz 8933930 SHA256 1eddfc27bb37597a5d514de1299981758e660e0af56981c0bfdf462c9568a60c SHA512 7149e683424351a28c19501302ece147cb03d4d12b08822eb2b1898a4978b96803323778fbba628008dd7a7c85daea4e9b550a71ee76851f9a09b2baac18a799 WHIRLPOOL c709586d3b8bdd938a81e97cfc5c77e31b7b0ef068c2d3f6ec922999a524d9ba0234ca42270724b2f6f3da98409b6d85b229aa241adbc02136b95bbb91c757b6

diff --git a/sci-libs/scikits_learn/scikits_learn-0.18.1.ebuild b/sci-libs/scikits_learn/scikits_learn-0.18.1.ebuild
new file mode 100644
index 0000000000..75452bc99b
--- /dev/null
+++ b/sci-libs/scikits_learn/scikits_learn-0.18.1.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1 flag-o-matic
+
+MYPN="${PN/scikits_/scikit-}"
+MYP="${MYPN}-${PV}"
+
+DESCRIPTION="Python modules for machine learning and data mining"
+HOMEPAGE="http://scikit-learn.org"
+SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples test"
+
+RDEPEND="
+	dev-python/joblib[${PYTHON_USEDEP}]
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	dev-python/nose[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.6.1[lapack,${PYTHON_USEDEP}]
+	sci-libs/scikits[${PYTHON_USEDEP}]
+	>=sci-libs/scipy-0.9[${PYTHON_USEDEP}]
+	virtual/blas
+	virtual/cblas
+	virtual/python-funcsigs[${PYTHON_USEDEP}]
+	"
+DEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/numpy[lapack,${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]
+	virtual/blas
+	virtual/cblas
+	doc? (
+		dev-python/joblib[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		)"
+
+S="${WORKDIR}/${MYP}"
+
+python_prepare_all() {
+	# bug #397605
+	[[ ${CHOST} == *-darwin* ]] \
+		&& append-ldflags -bundle "-undefined dynamic_lookup" \
+		|| append-ldflags -shared
+
+	# scikits-learn now uses the horrible numpy.distutils automagic
+	export SCIPY_FCONFIG="config_fc --noopt --noarch"
+
+	# use system joblib
+	rm -r sklearn/externals/joblib/* || die
+	echo "from joblib import *" > sklearn/externals/joblib/__init__.py
+	sed -i -e '/joblib\/test/d' sklearn/externals/setup.py || die
+	sed -i -e 's/..externals.joblib/ joblib/g' \
+		sklearn/cross_validation.py \
+		sklearn/decomposition/tests/test_sparse_pca.py \
+		sklearn/metrics/pairwise.py || die
+
+	rm sklearn/externals/funcsigs.py || die
+	rm sklearn/externals/odict.py || die
+	sed -e 's:from ..externals.funcsigs import signature:from funcsigs import signature:g' \
+		-i sklearn/utils/fixes.py || die
+	sed -e 's:from sklearn.externals.funcsigs import signature:from funcsigs import signature:g' \
+		-i sklearn/gaussian_process/{tests/test_,}kernels.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	distutils-r1_python_compile ${SCIPY_FCONFIG}
+}
+
+python_compile_all() {
+	if use doc; then
+		cd "${S}/doc" || die
+		local d="${BUILD_DIR}"/lib
+		ln -s "${S}"/sklearn/datasets/{data,descr,images} \
+			"${d}"/sklearn/datasets || die
+		VARTEXFONTS="${T}"/fonts \
+			MPLCONFIGDIR="${BUILD_DIR}" \
+			PYTHONPATH="${d}" \
+			emake html
+		rm -r "${d}"/sklearn/datasets/{data,descr,images} || die
+	fi
+}
+
+python_test() {
+	# doc builds and runs tests
+	use doc && return
+	distutils_install_for_testing ${SCIPY_FCONFIG}
+	esetup.py \
+		install --root="${T}/test-${EPYTHON}" \
+		--no-compile ${SCIPY_FCONFIG}
+	pushd "${T}/test-${EPYTHON}/$(python_get_sitedir)" || die > /dev/null
+	nosetests -v sklearn --exe || die
+	popd > /dev/null
+}
+
+python_install() {
+	distutils-r1_python_install ${SCIPY_FCONFIG}
+}
+
+python_install_all() {
+	find "${S}" -name \*LICENSE.txt -delete
+	insinto /usr/share/doc/${PF}
+	use doc && doins -r doc/_build/html
+	use examples && doins -r examples
+	distutils-r1_python_install_all
+}


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/scikits_learn/
@ 2017-02-14 11:33 Benda XU
  0 siblings, 0 replies; 24+ messages in thread
From: Benda XU @ 2017-02-14 11:33 UTC (permalink / raw
  To: gentoo-commits

commit:     7bcb0eb7500285331e1539812462d8155a2939b0
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 14 11:32:43 2017 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Tue Feb 14 11:32:59 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7bcb0eb7

sci-libs/scikits_learn: sed to counter more bundled imports

  e.g.  from sklearn.externals import joblib

Package-Manager: portage-2.3.3

 sci-libs/scikits_learn/scikits_learn-0.18.1.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sci-libs/scikits_learn/scikits_learn-0.18.1.ebuild b/sci-libs/scikits_learn/scikits_learn-0.18.1.ebuild
index 8f668c735b..865735d2a0 100644
--- a/sci-libs/scikits_learn/scikits_learn-0.18.1.ebuild
+++ b/sci-libs/scikits_learn/scikits_learn-0.18.1.ebuild
@@ -59,7 +59,8 @@ python_prepare_all() {
 	rm -r sklearn/externals/joblib || die
 	sed -i -e '/joblib/d' sklearn/externals/setup.py || die
 	for f in sklearn/{*/,}*.py; do
-		sed -r -e 's/from (sklearn|\.|)\.externals\.joblib/from joblib/' -i $f || die
+		sed -r -e '/^from/s/(sklearn|\.|)\.externals\.joblib/joblib/' \
+			-e 's/from (sklearn|\.|)\.externals import/import/' -i $f || die
 	done
 
 	rm sklearn/externals/funcsigs.py || die


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/scikits_learn/
@ 2017-06-28  4:02 Sebastien Fabbro
  0 siblings, 0 replies; 24+ messages in thread
From: Sebastien Fabbro @ 2017-06-28  4:02 UTC (permalink / raw
  To: gentoo-commits

commit:     efb5e8dff42c169bcc310642a2b8727642bc83ae
Author:     Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 27 05:18:18 2017 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Wed Jun 28 04:00:11 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efb5e8df

sci-libs/scikits_learn: version bump

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 sci-libs/scikits_learn/Manifest                    |   1 +
 sci-libs/scikits_learn/scikits_learn-0.18.2.ebuild | 119 +++++++++++++++++++++
 2 files changed, 120 insertions(+)

diff --git a/sci-libs/scikits_learn/Manifest b/sci-libs/scikits_learn/Manifest
index 8fc199b9b8d..9b7f7d03ef7 100644
--- a/sci-libs/scikits_learn/Manifest
+++ b/sci-libs/scikits_learn/Manifest
@@ -1,3 +1,4 @@
 DIST scikit-learn-0.17.1.tar.gz 7898571 SHA256 9f4cf58e57d81783289fc503caaed1f210bab49b7a6f680bf3c04b1e0a96e5f0 SHA512 5786e04a13225d2433103f1873f2753e332704b98c4c32b840970f763ec1abf0248007089e5ae47e11c66535f05a0d0402715622e6d6f0955ec7961b92e1b2e5 WHIRLPOOL cded0be080aa0e6e5486d2613c007c7ff1ea769b623f60cb97c4e03b2d130c53b66e9c22a20d644c61cd82eb8b460024a2b84365ff846aacfc07bf49a6bef0ac
 DIST scikit-learn-0.17.tar.gz 7834903 SHA256 23a5b6804524cb2cd54d8310010169511c7633dcf69af7439747eec02677f314 SHA512 53a76e2f90e27967bf216cd9d7e8051ed847a3381e3b7b7b8236511b4105eef41bd4d3c9f7f71a51db4b0bf99cbd571d7c1b26803757cff04424b70cb834b555 WHIRLPOOL 3a1ef13dafe6eb38389f68bc75dee10bfe141bac6d2782cd11be27ffcb8fe7efdf113b6911a238c6cd141bfe3b69960f47cf0725d0ea033129dff8fb5c57bef4
 DIST scikit-learn-0.18.1.tar.gz 8933930 SHA256 1eddfc27bb37597a5d514de1299981758e660e0af56981c0bfdf462c9568a60c SHA512 7149e683424351a28c19501302ece147cb03d4d12b08822eb2b1898a4978b96803323778fbba628008dd7a7c85daea4e9b550a71ee76851f9a09b2baac18a799 WHIRLPOOL c709586d3b8bdd938a81e97cfc5c77e31b7b0ef068c2d3f6ec922999a524d9ba0234ca42270724b2f6f3da98409b6d85b229aa241adbc02136b95bbb91c757b6
+DIST scikit-learn-0.18.2.tar.gz 9224516 SHA256 f78c3e11bf38838eaf637cdd9e8d6b575a4a4048d1670a03a72b0d00d3f39ffa SHA512 7c5c7bdd577ad215790654ce1eff6e802aebe53283ab6c5f12684cf99aeecc8976f9a9803f619f549d4d03be0d7634f249046e4b4f15afa12aecb2697e2e0b05 WHIRLPOOL eb4ca45c73892ca378bd580f00fd4d7ad3ea886d9522586e88bf291162cb30bd3bb23ead2c5d2283010fac650d183c0979710f30d1ba4a57f12a8e87052df847

diff --git a/sci-libs/scikits_learn/scikits_learn-0.18.2.ebuild b/sci-libs/scikits_learn/scikits_learn-0.18.2.ebuild
new file mode 100644
index 00000000000..7f8aa4ce668
--- /dev/null
+++ b/sci-libs/scikits_learn/scikits_learn-0.18.2.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1 flag-o-matic
+
+MYPN="${PN/scikits_/scikit-}"
+MYP="${MYPN}-${PV}"
+
+DESCRIPTION="Python modules for machine learning and data mining"
+HOMEPAGE="http://scikit-learn.org"
+SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples test"
+
+RDEPEND="
+	dev-python/joblib[${PYTHON_USEDEP}]
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	dev-python/nose[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.6.1[lapack,${PYTHON_USEDEP}]
+	sci-libs/scikits[${PYTHON_USEDEP}]
+	>=sci-libs/scipy-0.9[${PYTHON_USEDEP}]
+	virtual/blas
+	virtual/cblas
+	virtual/python-funcsigs[${PYTHON_USEDEP}]
+	"
+DEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/numpy[lapack,${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]
+	virtual/blas
+	virtual/cblas
+	doc? (
+		dev-python/joblib[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		)"
+
+S="${WORKDIR}/${MYP}"
+
+PATCHES=( "${FILESDIR}/${PN}-0.18.1-system-cblas.patch" )
+
+python_prepare_all() {
+	# bug #397605
+	[[ ${CHOST} == *-darwin* ]] \
+		&& append-ldflags -bundle "-undefined dynamic_lookup" \
+		|| append-ldflags -shared
+
+	# scikits-learn now uses the horrible numpy.distutils automagic
+	export SCIPY_FCONFIG="config_fc --noopt --noarch"
+
+	# remove bundled cblas
+	rm -r sklearn/src || die
+
+	# use system joblib
+	rm -r sklearn/externals/joblib || die
+	sed -i -e '/joblib/d' sklearn/externals/setup.py || die
+	for f in sklearn/{*/,}*.py; do
+		sed -r -e '/^from/s/(sklearn|\.|)\.externals\.joblib/joblib/' \
+			-e 's/from (sklearn|\.|)\.externals import/import/' -i $f || die
+	done
+
+	rm sklearn/externals/funcsigs.py || die
+	rm sklearn/externals/odict.py || die
+	for f in sklearn/{utils/fixes.py,gaussian_process/{tests/test_,}kernels.py}; do
+		sed -r -e 's/from (sklearn|\.|)\.externals\.funcsigs/from funcsigs/' -i $f || die
+	done
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	distutils-r1_python_compile ${SCIPY_FCONFIG}
+}
+
+python_compile_all() {
+	if use doc; then
+		cd "${S}/doc" || die
+		local d="${BUILD_DIR}"/lib
+		ln -s "${S}"/sklearn/datasets/{data,descr,images} \
+			"${d}"/sklearn/datasets || die
+		VARTEXFONTS="${T}"/fonts \
+			MPLCONFIGDIR="${BUILD_DIR}" \
+			PYTHONPATH="${d}" \
+			emake html
+		rm -r "${d}"/sklearn/datasets/{data,descr,images} || die
+	fi
+}
+
+python_test() {
+	# doc builds and runs tests
+	use doc && return
+	distutils_install_for_testing ${SCIPY_FCONFIG}
+	esetup.py \
+		install --root="${T}/test-${EPYTHON}" \
+		--no-compile ${SCIPY_FCONFIG}
+	pushd "${T}/test-${EPYTHON}/$(python_get_sitedir)" || die > /dev/null
+	nosetests -v sklearn --exe || die
+	popd > /dev/null
+}
+
+python_install() {
+	distutils-r1_python_install ${SCIPY_FCONFIG}
+}
+
+python_install_all() {
+	find "${S}" -name \*LICENSE.txt -delete
+	insinto /usr/share/doc/${PF}
+	use doc && doins -r doc/_build/html
+	use examples && doins -r examples
+	distutils-r1_python_install_all
+}


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/scikits_learn/
@ 2017-08-03 17:33 Sebastien Fabbro
  0 siblings, 0 replies; 24+ messages in thread
From: Sebastien Fabbro @ 2017-08-03 17:33 UTC (permalink / raw
  To: gentoo-commits

commit:     bac12eae1c20a7fcc573094385b4315c7622a57c
Author:     Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Wed Aug  2 18:14:55 2017 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Thu Aug  3 17:33:04 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bac12eae

sci-libs/scikits_learn: keep funcsigs and joblib bundled to avoid hair pulling

Package-Manager: Portage-2.3.6, Repoman-2.3.3

 .../scikits_learn/scikits_learn-0.18.2-r1.ebuild   | 123 +++++++++++++++++++++
 1 file changed, 123 insertions(+)

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
new file mode 100644
index 00000000000..339670ff4d3
--- /dev/null
+++ b/sci-libs/scikits_learn/scikits_learn-0.18.2-r1.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1 flag-o-matic
+
+MYPN="${PN/scikits_/scikit-}"
+MYP="${MYPN}-${PV}"
+
+DESCRIPTION="Python modules for machine learning and data mining"
+HOMEPAGE="http://scikit-learn.org"
+SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples test"
+
+# tried to unbundle virtual/python-funcsigs, funcsigs, odict
+# but it is a large mess to maintain
+
+RDEPEND="
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	dev-python/nose[${PYTHON_USEDEP}]
+	dev-python/numpy[lapack,${PYTHON_USEDEP}]
+	sci-libs/scikits[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]
+	virtual/blas:=
+	virtual/cblas:=
+"
+
+DEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/numpy[lapack,${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]
+	virtual/blas:=
+	virtual/cblas:=
+	doc? (
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/${MYP}"
+
+PATCHES=( "${FILESDIR}/${PN}-0.18.1-system-cblas.patch" )
+
+python_prepare_all() {
+	# bug #397605
+	[[ ${CHOST} == *-darwin* ]] \
+		&& append-ldflags -bundle "-undefined dynamic_lookup" \
+		|| append-ldflags -shared
+
+	# scikits-learn now uses the horrible numpy.distutils automagic
+	export SCIPY_FCONFIG="config_fc --noopt --noarch"
+
+	# remove bundled cblas
+	rm -r sklearn/src || die
+
+	# commented out, since it is a mess to maintain
+	# use system joblib
+	#rm -r sklearn/externals/joblib || die
+	#sed -i -e '/joblib/d' sklearn/externals/setup.py || die
+	#for f in sklearn/{*/,}*.py; do
+	#	sed -r -e '/^from/s/(sklearn|\.|)\.externals\.joblib/joblib/' \
+	#		-e 's/from (sklearn|\.|)\.externals import/import/' -i $f || die
+	#done
+
+	# use system funcsigs and odict
+	#rm sklearn/externals/funcsigs.py || die
+	#rm sklearn/externals/odict.py || die
+	#for f in sklearn/{utils/fixes.py,gaussian_process/{tests/test_,}kernels.py}; do
+	#	sed -r -e 's/from (sklearn|\.|)\.externals\.funcsigs/from funcsigs/' -i $f || die
+	#done
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	distutils-r1_python_compile ${SCIPY_FCONFIG}
+}
+
+python_compile_all() {
+	if use doc; then
+		cd "${S}/doc" || die
+		local d="${BUILD_DIR}/lib"
+		ln -s \
+		   "${S}"/sklearn/datasets/{data,descr,images} \
+		   "${d}"/sklearn/datasets || die
+		VARTEXFONTS="${T}"/fonts \
+			MPLCONFIGDIR="${BUILD_DIR}" \
+			PYTHONPATH="${d}" \
+			emake html
+		rm -r "${d}"/sklearn/datasets/{data,descr,images} || die
+	fi
+}
+
+python_test() {
+	# doc builds and runs tests
+	use doc && return
+	distutils_install_for_testing ${SCIPY_FCONFIG}
+	esetup.py install \
+			  --root="${T}/test-${EPYTHON}" \
+			  --no-compile ${SCIPY_FCONFIG}
+	pushd "${T}/test-${EPYTHON}/$(python_get_sitedir)" || die > /dev/null
+	JOBLIB_MULTIPROCESSING=2 SKLEARN_SKIP_NETWORK_TESTS=1 nosetests -v sklearn --exe || die
+	popd > /dev/null
+}
+
+python_install() {
+	distutils-r1_python_install ${SCIPY_FCONFIG}
+}
+
+python_install_all() {
+	find "${S}" -name \*LICENSE.txt -delete
+	insinto /usr/share/doc/${PF}
+	use doc && doins -r doc/_build/html
+	use examples && doins -r examples
+	distutils-r1_python_install_all
+}


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/scikits_learn/
@ 2017-08-16 18:12 Sebastien Fabbro
  0 siblings, 0 replies; 24+ messages in thread
From: Sebastien Fabbro @ 2017-08-16 18:12 UTC (permalink / raw
  To: gentoo-commits

commit:     de6f7fa12ac92c0074d82525ad58bff3cab5f416
Author:     Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 15 18:22:09 2017 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Wed Aug 16 18:11:53 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de6f7fa1

sci-libs/scikits_learn: version bump. remove doc building for now (downloading internet data)

Package-Manager: Portage-2.3.7, Repoman-2.3.3

 sci-libs/scikits_learn/Manifest                    |   1 +
 sci-libs/scikits_learn/scikits_learn-0.19.0.ebuild | 106 +++++++++++++++++++++
 2 files changed, 107 insertions(+)

diff --git a/sci-libs/scikits_learn/Manifest b/sci-libs/scikits_learn/Manifest
index 9b7f7d03ef7..ee5111b5906 100644
--- a/sci-libs/scikits_learn/Manifest
+++ b/sci-libs/scikits_learn/Manifest
@@ -2,3 +2,4 @@ DIST scikit-learn-0.17.1.tar.gz 7898571 SHA256 9f4cf58e57d81783289fc503caaed1f21
 DIST scikit-learn-0.17.tar.gz 7834903 SHA256 23a5b6804524cb2cd54d8310010169511c7633dcf69af7439747eec02677f314 SHA512 53a76e2f90e27967bf216cd9d7e8051ed847a3381e3b7b7b8236511b4105eef41bd4d3c9f7f71a51db4b0bf99cbd571d7c1b26803757cff04424b70cb834b555 WHIRLPOOL 3a1ef13dafe6eb38389f68bc75dee10bfe141bac6d2782cd11be27ffcb8fe7efdf113b6911a238c6cd141bfe3b69960f47cf0725d0ea033129dff8fb5c57bef4
 DIST scikit-learn-0.18.1.tar.gz 8933930 SHA256 1eddfc27bb37597a5d514de1299981758e660e0af56981c0bfdf462c9568a60c SHA512 7149e683424351a28c19501302ece147cb03d4d12b08822eb2b1898a4978b96803323778fbba628008dd7a7c85daea4e9b550a71ee76851f9a09b2baac18a799 WHIRLPOOL c709586d3b8bdd938a81e97cfc5c77e31b7b0ef068c2d3f6ec922999a524d9ba0234ca42270724b2f6f3da98409b6d85b229aa241adbc02136b95bbb91c757b6
 DIST scikit-learn-0.18.2.tar.gz 9224516 SHA256 f78c3e11bf38838eaf637cdd9e8d6b575a4a4048d1670a03a72b0d00d3f39ffa SHA512 7c5c7bdd577ad215790654ce1eff6e802aebe53283ab6c5f12684cf99aeecc8976f9a9803f619f549d4d03be0d7634f249046e4b4f15afa12aecb2697e2e0b05 WHIRLPOOL eb4ca45c73892ca378bd580f00fd4d7ad3ea886d9522586e88bf291162cb30bd3bb23ead2c5d2283010fac650d183c0979710f30d1ba4a57f12a8e87052df847
+DIST scikit-learn-0.19.0.tar.gz 9341628 SHA256 24f5cb67559e0df27827b1804b197431c08880d2ec9285724fac90906830021f SHA512 1b88bc043b08de9b5bb1f3814b8101c73ced010cf94bd725fb69e1ef95b4a9597a34de4a19f84fbbf63e54d47e95b3ff498d611234fcdfcaa5e4e3cf696289d2 WHIRLPOOL 8131244337c0f491fe687f823164d6ee067b3531576243367c3c99069d5a395b8b38acbc1d446046bd05588637f7ddf329f5a3af9a707efad43f3cbb0d7da492

diff --git a/sci-libs/scikits_learn/scikits_learn-0.19.0.ebuild b/sci-libs/scikits_learn/scikits_learn-0.19.0.ebuild
new file mode 100644
index 00000000000..0b9b744c56a
--- /dev/null
+++ b/sci-libs/scikits_learn/scikits_learn-0.19.0.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1 flag-o-matic
+
+MYPN="${PN/scikits_/scikit-}"
+MYP="${MYPN}-${PV}"
+
+DESCRIPTION="Python modules for machine learning and data mining"
+HOMEPAGE="http://scikit-learn.org"
+SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples test"
+
+# tried to unbundle virtual/python-funcsigs, funcsigs, odict
+# but it is a large mess to maintain
+
+RDEPEND="
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	dev-python/nose[${PYTHON_USEDEP}]
+	dev-python/numpy[lapack,${PYTHON_USEDEP}]
+	sci-libs/scikits[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]
+	virtual/blas:=
+	virtual/cblas:=
+"
+
+DEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/numpy[lapack,${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]
+	virtual/blas:=
+	virtual/cblas:=
+"
+
+S="${WORKDIR}/${MYP}"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.18.1-system-cblas.patch )
+
+python_prepare_all() {
+	# bug #397605
+	[[ ${CHOST} == *-darwin* ]] \
+		&& append-ldflags -bundle "-undefined dynamic_lookup" \
+		|| append-ldflags -shared
+
+	# scikits-learn now uses the horrible numpy.distutils automagic
+	export SCIPY_FCONFIG="config_fc --noopt --noarch"
+
+	# remove bundled cblas
+	rm -r sklearn/src || die
+
+	# commented out, since it is a mess to maintain
+	# use system joblib
+	#rm -r sklearn/externals/joblib || die
+	#sed -i -e '/joblib/d' sklearn/externals/setup.py || die
+	#for f in sklearn/{*/,}*.py; do
+	#	sed -r -e '/^from/s/(sklearn|\.|)\.externals\.joblib/joblib/' \
+	#		-e 's/from (sklearn|\.|)\.externals import/import/' -i $f || die
+	#done
+
+	# use system funcsigs and odict
+	#rm sklearn/externals/funcsigs.py || die
+	#rm sklearn/externals/odict.py || die
+	#for f in sklearn/{utils/fixes.py,gaussian_process/{tests/test_,}kernels.py}; do
+	#	sed -r -e 's/from (sklearn|\.|)\.externals\.funcsigs/from funcsigs/' -i $f || die
+	#done
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	distutils-r1_python_compile ${SCIPY_FCONFIG}
+}
+
+python_test() {
+	# doc builds and runs tests
+	use doc && return
+	distutils_install_for_testing ${SCIPY_FCONFIG}
+	esetup.py install \
+			  --root="${T}/test-${EPYTHON}" \
+			  --no-compile ${SCIPY_FCONFIG}
+	pushd "${T}/test-${EPYTHON}/$(python_get_sitedir)" || die > /dev/null
+	JOBLIB_MULTIPROCESSING=2 SKLEARN_SKIP_NETWORK_TESTS=1 nosetests -v sklearn --exe || die
+	popd > /dev/null
+}
+
+python_install() {
+	distutils-r1_python_install ${SCIPY_FCONFIG}
+}
+
+python_install_all() {
+	find "${S}" -name \*LICENSE.txt -delete
+	distutils-r1_python_install_all
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+}


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/scikits_learn/
@ 2019-02-27  4:25 Aaron Bauman
  0 siblings, 0 replies; 24+ messages in thread
From: Aaron Bauman @ 2019-02-27  4:25 UTC (permalink / raw
  To: gentoo-commits

commit:     4e27cd5f81c7876e7ef38197ea135434466d0754
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sat Feb 23 16:51:55 2019 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Wed Feb 27 04:21:21 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e27cd5f

sci-libs/scikits_learn: use HTTPS

Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>

 sci-libs/scikits_learn/scikits_learn-0.17.1.ebuild    | 4 ++--
 sci-libs/scikits_learn/scikits_learn-0.17.ebuild      | 4 ++--
 sci-libs/scikits_learn/scikits_learn-0.18.1.ebuild    | 4 ++--
 sci-libs/scikits_learn/scikits_learn-0.18.2-r1.ebuild | 4 ++--
 sci-libs/scikits_learn/scikits_learn-0.18.2.ebuild    | 4 ++--
 sci-libs/scikits_learn/scikits_learn-0.19.0.ebuild    | 4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/sci-libs/scikits_learn/scikits_learn-0.17.1.ebuild b/sci-libs/scikits_learn/scikits_learn-0.17.1.ebuild
index 052d3210d7e..38fddda9bb6 100644
--- a/sci-libs/scikits_learn/scikits_learn-0.17.1.ebuild
+++ b/sci-libs/scikits_learn/scikits_learn-0.17.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ MYPN="${PN/scikits_/scikit-}"
 MYP="${MYPN}-${PV}"
 
 DESCRIPTION="Python modules for machine learning and data mining"
-HOMEPAGE="http://scikit-learn.org"
+HOMEPAGE="https://scikit-learn.org"
 SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz"
 
 LICENSE="BSD"

diff --git a/sci-libs/scikits_learn/scikits_learn-0.17.ebuild b/sci-libs/scikits_learn/scikits_learn-0.17.ebuild
index b2e0f79446e..063aa6ed9ed 100644
--- a/sci-libs/scikits_learn/scikits_learn-0.17.ebuild
+++ b/sci-libs/scikits_learn/scikits_learn-0.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ MYPN="${PN/scikits_/scikit-}"
 MYP="${MYPN}-${PV}"
 
 DESCRIPTION="Python modules for machine learning and data mining"
-HOMEPAGE="http://scikit-learn.org"
+HOMEPAGE="https://scikit-learn.org"
 SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz"
 
 LICENSE="BSD"

diff --git a/sci-libs/scikits_learn/scikits_learn-0.18.1.ebuild b/sci-libs/scikits_learn/scikits_learn-0.18.1.ebuild
index 69d00a0a7a6..491f696e456 100644
--- a/sci-libs/scikits_learn/scikits_learn-0.18.1.ebuild
+++ b/sci-libs/scikits_learn/scikits_learn-0.18.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ MYPN="${PN/scikits_/scikit-}"
 MYP="${MYPN}-${PV}"
 
 DESCRIPTION="Python modules for machine learning and data mining"
-HOMEPAGE="http://scikit-learn.org"
+HOMEPAGE="https://scikit-learn.org"
 SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz"
 
 LICENSE="BSD"

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
index 339670ff4d3..5538576036b 100644
--- a/sci-libs/scikits_learn/scikits_learn-0.18.2-r1.ebuild
+++ b/sci-libs/scikits_learn/scikits_learn-0.18.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ MYPN="${PN/scikits_/scikit-}"
 MYP="${MYPN}-${PV}"
 
 DESCRIPTION="Python modules for machine learning and data mining"
-HOMEPAGE="http://scikit-learn.org"
+HOMEPAGE="https://scikit-learn.org"
 SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz"
 
 LICENSE="BSD"

diff --git a/sci-libs/scikits_learn/scikits_learn-0.18.2.ebuild b/sci-libs/scikits_learn/scikits_learn-0.18.2.ebuild
index 7f8aa4ce668..a96a3a8ab8f 100644
--- a/sci-libs/scikits_learn/scikits_learn-0.18.2.ebuild
+++ b/sci-libs/scikits_learn/scikits_learn-0.18.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ MYPN="${PN/scikits_/scikit-}"
 MYP="${MYPN}-${PV}"
 
 DESCRIPTION="Python modules for machine learning and data mining"
-HOMEPAGE="http://scikit-learn.org"
+HOMEPAGE="https://scikit-learn.org"
 SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz"
 
 LICENSE="BSD"

diff --git a/sci-libs/scikits_learn/scikits_learn-0.19.0.ebuild b/sci-libs/scikits_learn/scikits_learn-0.19.0.ebuild
index 0b9b744c56a..82a1027e231 100644
--- a/sci-libs/scikits_learn/scikits_learn-0.19.0.ebuild
+++ b/sci-libs/scikits_learn/scikits_learn-0.19.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ MYPN="${PN/scikits_/scikit-}"
 MYP="${MYPN}-${PV}"
 
 DESCRIPTION="Python modules for machine learning and data mining"
-HOMEPAGE="http://scikit-learn.org"
+HOMEPAGE="https://scikit-learn.org"
 SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz"
 
 LICENSE="BSD"


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/scikits_learn/
@ 2019-08-03 20:36 Alexey Shvetsov
  0 siblings, 0 replies; 24+ messages in thread
From: Alexey Shvetsov @ 2019-08-03 20:36 UTC (permalink / raw
  To: gentoo-commits

commit:     4c1e6fc861c343c1dc528cf2f90daa6a14ad5b13
Author:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Sat Aug  3 20:20:22 2019 +0000
Commit:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Sat Aug  3 20:20:22 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c1e6fc8

sci-libs/scikits_learn: Works with py3.7

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Alexey Shvetsov <alexxy <AT> gentoo.org>

 .../scikits_learn/scikits_learn-0.19.0-r1.ebuild   | 106 +++++++++++++++++++++
 1 file changed, 106 insertions(+)

diff --git a/sci-libs/scikits_learn/scikits_learn-0.19.0-r1.ebuild b/sci-libs/scikits_learn/scikits_learn-0.19.0-r1.ebuild
new file mode 100644
index 00000000000..3184d4e8555
--- /dev/null
+++ b/sci-libs/scikits_learn/scikits_learn-0.19.0-r1.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit distutils-r1 flag-o-matic
+
+MYPN="${PN/scikits_/scikit-}"
+MYP="${MYPN}-${PV}"
+
+DESCRIPTION="Python modules for machine learning and data mining"
+HOMEPAGE="https://scikit-learn.org"
+SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples test"
+
+# tried to unbundle virtual/python-funcsigs, funcsigs, odict
+# but it is a large mess to maintain
+
+RDEPEND="
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	dev-python/nose[${PYTHON_USEDEP}]
+	dev-python/numpy[lapack,${PYTHON_USEDEP}]
+	sci-libs/scikits[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]
+	virtual/blas:=
+	virtual/cblas:=
+"
+
+DEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/numpy[lapack,${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]
+	virtual/blas:=
+	virtual/cblas:=
+"
+
+S="${WORKDIR}/${MYP}"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.18.1-system-cblas.patch )
+
+python_prepare_all() {
+	# bug #397605
+	[[ ${CHOST} == *-darwin* ]] \
+		&& append-ldflags -bundle "-undefined dynamic_lookup" \
+		|| append-ldflags -shared
+
+	# scikits-learn now uses the horrible numpy.distutils automagic
+	export SCIPY_FCONFIG="config_fc --noopt --noarch"
+
+	# remove bundled cblas
+	rm -r sklearn/src || die
+
+	# commented out, since it is a mess to maintain
+	# use system joblib
+	#rm -r sklearn/externals/joblib || die
+	#sed -i -e '/joblib/d' sklearn/externals/setup.py || die
+	#for f in sklearn/{*/,}*.py; do
+	#	sed -r -e '/^from/s/(sklearn|\.|)\.externals\.joblib/joblib/' \
+	#		-e 's/from (sklearn|\.|)\.externals import/import/' -i $f || die
+	#done
+
+	# use system funcsigs and odict
+	#rm sklearn/externals/funcsigs.py || die
+	#rm sklearn/externals/odict.py || die
+	#for f in sklearn/{utils/fixes.py,gaussian_process/{tests/test_,}kernels.py}; do
+	#	sed -r -e 's/from (sklearn|\.|)\.externals\.funcsigs/from funcsigs/' -i $f || die
+	#done
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	distutils-r1_python_compile ${SCIPY_FCONFIG}
+}
+
+python_test() {
+	# doc builds and runs tests
+	use doc && return
+	distutils_install_for_testing ${SCIPY_FCONFIG}
+	esetup.py install \
+			  --root="${T}/test-${EPYTHON}" \
+			  --no-compile ${SCIPY_FCONFIG}
+	pushd "${T}/test-${EPYTHON}/$(python_get_sitedir)" || die > /dev/null
+	JOBLIB_MULTIPROCESSING=2 SKLEARN_SKIP_NETWORK_TESTS=1 nosetests -v sklearn --exe || die
+	popd > /dev/null
+}
+
+python_install() {
+	distutils-r1_python_install ${SCIPY_FCONFIG}
+}
+
+python_install_all() {
+	find "${S}" -name \*LICENSE.txt -delete
+	distutils-r1_python_install_all
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+}


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/scikits_learn/
@ 2020-01-16  7:03 Michał Górny
  0 siblings, 0 replies; 24+ messages in thread
From: Michał Górny @ 2020-01-16  7:03 UTC (permalink / raw
  To: gentoo-commits

commit:     7c319b1f21e6ab39c26cddaf0ba0c3bb251d6f5a
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 16 06:56:05 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jan 16 07:02:46 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c319b1f

sci-libs/scikits_learn: Remove Python 2

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 sci-libs/scikits_learn/scikits_learn-0.19.0-r1.ebuild | 2 +-
 sci-libs/scikits_learn/scikits_learn-0.20.2.ebuild    | 2 +-
 sci-libs/scikits_learn/scikits_learn-0.20.4.ebuild    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sci-libs/scikits_learn/scikits_learn-0.19.0-r1.ebuild b/sci-libs/scikits_learn/scikits_learn-0.19.0-r1.ebuild
index 991b1ca7d29..467c2124494 100644
--- a/sci-libs/scikits_learn/scikits_learn-0.19.0-r1.ebuild
+++ b/sci-libs/scikits_learn/scikits_learn-0.19.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1 flag-o-matic
 

diff --git a/sci-libs/scikits_learn/scikits_learn-0.20.2.ebuild b/sci-libs/scikits_learn/scikits_learn-0.20.2.ebuild
index a7cda1c289c..2f8f116d33b 100644
--- a/sci-libs/scikits_learn/scikits_learn-0.20.2.ebuild
+++ b/sci-libs/scikits_learn/scikits_learn-0.20.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1 flag-o-matic
 

diff --git a/sci-libs/scikits_learn/scikits_learn-0.20.4.ebuild b/sci-libs/scikits_learn/scikits_learn-0.20.4.ebuild
index a7cda1c289c..2f8f116d33b 100644
--- a/sci-libs/scikits_learn/scikits_learn-0.20.4.ebuild
+++ b/sci-libs/scikits_learn/scikits_learn-0.20.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1 flag-o-matic
 


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/scikits_learn/
@ 2020-01-16  7:03 Michał Górny
  0 siblings, 0 replies; 24+ messages in thread
From: Michał Górny @ 2020-01-16  7:03 UTC (permalink / raw
  To: gentoo-commits

commit:     35fbb469eeb84c740d4d40efa2789b0d7b2f40de
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 16 07:00:35 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jan 16 07:02:57 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35fbb469

sci-libs/scikits_learn: Use HTTPS

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 sci-libs/scikits_learn/scikits_learn-0.20.2.ebuild | 2 +-
 sci-libs/scikits_learn/scikits_learn-0.20.4.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-libs/scikits_learn/scikits_learn-0.20.2.ebuild b/sci-libs/scikits_learn/scikits_learn-0.20.2.ebuild
index 2f8f116d33b..901e9afe5ff 100644
--- a/sci-libs/scikits_learn/scikits_learn-0.20.2.ebuild
+++ b/sci-libs/scikits_learn/scikits_learn-0.20.2.ebuild
@@ -11,7 +11,7 @@ MYPN="${PN/scikits_/scikit-}"
 MYP="${MYPN}-${PV}"
 
 DESCRIPTION="Python modules for machine learning and data mining"
-HOMEPAGE="http://scikit-learn.org"
+HOMEPAGE="https://scikit-learn.org"
 SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz"
 
 LICENSE="BSD"

diff --git a/sci-libs/scikits_learn/scikits_learn-0.20.4.ebuild b/sci-libs/scikits_learn/scikits_learn-0.20.4.ebuild
index 2f8f116d33b..901e9afe5ff 100644
--- a/sci-libs/scikits_learn/scikits_learn-0.20.4.ebuild
+++ b/sci-libs/scikits_learn/scikits_learn-0.20.4.ebuild
@@ -11,7 +11,7 @@ MYPN="${PN/scikits_/scikit-}"
 MYP="${MYPN}-${PV}"
 
 DESCRIPTION="Python modules for machine learning and data mining"
-HOMEPAGE="http://scikit-learn.org"
+HOMEPAGE="https://scikit-learn.org"
 SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz"
 
 LICENSE="BSD"


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/scikits_learn/
@ 2020-01-28  8:24 Joonas Niilola
  0 siblings, 0 replies; 24+ messages in thread
From: Joonas Niilola @ 2020-01-28  8:24 UTC (permalink / raw
  To: gentoo-commits

commit:     62c9d99bc57ce6d26a0009705d3a2308be627b49
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 28 08:17:20 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Jan 28 08:24:13 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62c9d99b

sci-libs/scikits_learn: fix MissingTestRestrict CI issue

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 sci-libs/scikits_learn/scikits_learn-0.20.2.ebuild | 2 ++
 sci-libs/scikits_learn/scikits_learn-0.20.4.ebuild | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/sci-libs/scikits_learn/scikits_learn-0.20.2.ebuild b/sci-libs/scikits_learn/scikits_learn-0.20.2.ebuild
index 901e9afe5ff..fc65c21b1d4 100644
--- a/sci-libs/scikits_learn/scikits_learn-0.20.2.ebuild
+++ b/sci-libs/scikits_learn/scikits_learn-0.20.2.ebuild
@@ -19,6 +19,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="examples test"
 
+RESTRICT="!test? ( test )"
+
 # tried to unbundle virtual/python-funcsigs, funcsigs, odict
 # but it is a large mess to maintain
 

diff --git a/sci-libs/scikits_learn/scikits_learn-0.20.4.ebuild b/sci-libs/scikits_learn/scikits_learn-0.20.4.ebuild
index 901e9afe5ff..fc65c21b1d4 100644
--- a/sci-libs/scikits_learn/scikits_learn-0.20.4.ebuild
+++ b/sci-libs/scikits_learn/scikits_learn-0.20.4.ebuild
@@ -19,6 +19,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="examples test"
 
+RESTRICT="!test? ( test )"
+
 # tried to unbundle virtual/python-funcsigs, funcsigs, odict
 # but it is a large mess to maintain
 


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/scikits_learn/
@ 2020-04-03  3:30 Patrick McLean
  0 siblings, 0 replies; 24+ messages in thread
From: Patrick McLean @ 2020-04-03  3:30 UTC (permalink / raw
  To: gentoo-commits

commit:     7ac2026d1c2deeaa4ecc8ba6080351ebcd833649
Author:     Patrick McLean <patrick.mclean <AT> sony <DOT> com>
AuthorDate: Fri Apr  3 03:29:13 2020 +0000
Commit:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Fri Apr  3 03:30:14 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ac2026d

sci-libs/scikits_learn-0.22.2_p1: Version bump

Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-2.3.96, Repoman-2.3.22
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>

 sci-libs/scikits_learn/Manifest                    |  1 +
 .../scikits_learn/scikits_learn-0.22.2_p1.ebuild   | 80 ++++++++++++++++++++++
 2 files changed, 81 insertions(+)

diff --git a/sci-libs/scikits_learn/Manifest b/sci-libs/scikits_learn/Manifest
index bb13bbcc95f..87d114ec5e6 100644
--- a/sci-libs/scikits_learn/Manifest
+++ b/sci-libs/scikits_learn/Manifest
@@ -1,3 +1,4 @@
 DIST scikit-learn-0.19.0.tar.gz 9341628 BLAKE2B c9e0c12558e81efb6f5cfddead028980b0019d2f6d0fdce5662c9138ec3a5b2a3d30b022a5713578bc7effd09894006e8f7f60a3e038ca66297502d9d4212686 SHA512 1b88bc043b08de9b5bb1f3814b8101c73ced010cf94bd725fb69e1ef95b4a9597a34de4a19f84fbbf63e54d47e95b3ff498d611234fcdfcaa5e4e3cf696289d2
 DIST scikit-learn-0.20.2.tar.gz 10275187 BLAKE2B 6865fd101f99930e014f4a2a89616e1ee917df27a5a1b0a931d47503d7df509fe6490799e876a5d68b1cb76a35c6f85e4acbb31a28adfc528720fe9a69e108a7 SHA512 5e0bdea3c40e38880683c6a49cdf2f4c0d40c1f5436c1d8209d613440d5d9d13b9a608e73943a890ef3effaddd930b5c171c45d29700afb8629285ba4aad414f
 DIST scikit-learn-0.20.4.tar.gz 11684276 BLAKE2B 791fd5c7e3ebfdb9bf01524be46b19341b5750fdc5352de9e50cc395a34cf91551825352f18f235b658b55b38829981884fca9f0535a1c505adeb18ac5d87ceb SHA512 a94c254440641a987df1eaec63302639b8e6f56705ec426c350070658141dd574b502eb1e4b94ae9c766c1becfd911f08bb97d5c87d39b0546d8444ed281b06a
+DIST scikits_learn-0.22.2_p1.tar.gz 7034850 BLAKE2B 41c362ef6594e837a9fc798837e666fbb51e33954fdf700292650204fd9d1ab4fc4d1695890d02a24ad68f4dcc2d3cde8f0827eca70c6fb9a6f0e5c0d9c04fd5 SHA512 20bcda5c65f76bce9b71c5b5fb1b499f7f3a7a3f6fa5fade80a38dc658cb434e16e9d5a4906a9657157a5cc90a6d51080575d6e510207baa9f8b06c4fa761d5b

diff --git a/sci-libs/scikits_learn/scikits_learn-0.22.2_p1.ebuild b/sci-libs/scikits_learn/scikits_learn-0.22.2_p1.ebuild
new file mode 100644
index 00000000000..1bf6679a1b9
--- /dev/null
+++ b/sci-libs/scikits_learn/scikits_learn-0.22.2_p1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit distutils-r1
+
+MY_PV="${PV//_p/.post}"
+MY_PN="${PN//s_/-}"
+
+DESCRIPTION="Machine learning library for Python"
+HOMEPAGE="https://scikit-learn.org/stable/
+	https://github.com/scikit-learn/scikit-learn"
+SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+#ffhttps://github.com/scikit-learn/scikit-learn/archive/0.22.2.post1.tar.gz
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/wheel[${PYTHON_USEDEP}]
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]
+	sci-libs/scikits[${PYTHON_USEDEP}]
+	virtual/blas:=
+	virtual/cblas:=
+"
+DEPEND="
+	virtual/blas:=
+	virtual/cblas:=
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/joblib[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# scikits-learn now uses the horrible numpy.distutils automagic
+	export SCIPY_FCONFIG="config_fc --noopt --noarch"
+
+	# remove bundled cblas
+	rm -rf sklearn/src || die "failed to remove bundled cblas"
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	distutils-r1_python_compile ${SCIPY_FCONFIG}
+}
+
+python_test() {
+	distutils_install_for_testing ${SCIPY_FCONFIG}
+	pushd "${TEST_DIR}/lib" >/dev/null || die
+	pytest -vv || die "testing failed with ${EPYTHON}"
+	popd >/dev/null || die
+}
+
+python_install() {
+	distutils-r1_python_install ${SCIPY_FCONFIG}
+}
+
+python_install_all() {
+	find "${S}" -name \*LICENSE.txt -delete
+	distutils-r1_python_install_all
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+}


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/scikits_learn/
@ 2020-04-08  6:56 Patrick McLean
  0 siblings, 0 replies; 24+ messages in thread
From: Patrick McLean @ 2020-04-08  6:56 UTC (permalink / raw
  To: gentoo-commits

commit:     caeeaa26d5b88873af0772f80961052a3a2fcfb2
Author:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Fri Apr  3 15:44:37 2020 +0000
Commit:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Wed Apr  8 06:56:40 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=caeeaa26

sci-libs/scikits_learn: bug fix

fixes missing IUSE="examples" bug

Closes: https://bugs.gentoo.org/716016
Package-Manager: Portage-2.3.96, Repoman-2.3.22
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>
Closes: https://github.com/gentoo/gentoo/pull/15215
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>

 sci-libs/scikits_learn/scikits_learn-0.22.2_p1.ebuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/sci-libs/scikits_learn/scikits_learn-0.22.2_p1.ebuild b/sci-libs/scikits_learn/scikits_learn-0.22.2_p1.ebuild
index 1bf6679a1b9..804ed2914a0 100644
--- a/sci-libs/scikits_learn/scikits_learn-0.22.2_p1.ebuild
+++ b/sci-libs/scikits_learn/scikits_learn-0.22.2_p1.ebuild
@@ -19,8 +19,7 @@ S="${WORKDIR}/${MY_PN}-${MY_PV}"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
+IUSE="examples"
 
 RDEPEND="
 	dev-python/wheel[${PYTHON_USEDEP}]


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/scikits_learn/
@ 2020-05-09 11:24 Mikle Kolyada
  0 siblings, 0 replies; 24+ messages in thread
From: Mikle Kolyada @ 2020-05-09 11:24 UTC (permalink / raw
  To: gentoo-commits

commit:     90e375abfcdfcc36efc05d9bd995b14904a6a20b
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sat May  9 11:22:25 2020 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sat May  9 11:23:53 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90e375ab

sci-libs/scikits_learn: amd64 stable wrt bug #721496

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>

 sci-libs/scikits_learn/scikits_learn-0.22.2_p1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/scikits_learn/scikits_learn-0.22.2_p1.ebuild b/sci-libs/scikits_learn/scikits_learn-0.22.2_p1.ebuild
index 804ed2914a0..7ab1d5789ce 100644
--- a/sci-libs/scikits_learn/scikits_learn-0.22.2_p1.ebuild
+++ b/sci-libs/scikits_learn/scikits_learn-0.22.2_p1.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_PN}-${MY_PV}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="examples"
 
 RDEPEND="


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/scikits_learn/
@ 2020-05-09 11:24 Mikle Kolyada
  0 siblings, 0 replies; 24+ messages in thread
From: Mikle Kolyada @ 2020-05-09 11:24 UTC (permalink / raw
  To: gentoo-commits

commit:     c6cffa66ddf2e8c31423fd5698e0791f8f4ff57f
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sat May  9 11:23:13 2020 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sat May  9 11:23:56 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6cffa66

sci-libs/scikits_learn: x86 stable wrt bug #721496

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="x86"
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>

 sci-libs/scikits_learn/scikits_learn-0.22.2_p1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/scikits_learn/scikits_learn-0.22.2_p1.ebuild b/sci-libs/scikits_learn/scikits_learn-0.22.2_p1.ebuild
index 7ab1d5789ce..3e4407171f7 100644
--- a/sci-libs/scikits_learn/scikits_learn-0.22.2_p1.ebuild
+++ b/sci-libs/scikits_learn/scikits_learn-0.22.2_p1.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_PN}-${MY_PV}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="examples"
 
 RDEPEND="


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/scikits_learn/
@ 2020-06-01  6:41 Georgy Yakovlev
  0 siblings, 0 replies; 24+ messages in thread
From: Georgy Yakovlev @ 2020-06-01  6:41 UTC (permalink / raw
  To: gentoo-commits

commit:     83d2573649fe4aa76723d767e29a8e8f9f95e423
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  1 05:41:43 2020 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Mon Jun  1 06:22:12 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83d25736

sci-libs/scikits_learn: add ~ppc64 keyword, bug #715962

Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 sci-libs/scikits_learn/scikits_learn-0.22.2_p1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/scikits_learn/scikits_learn-0.22.2_p1.ebuild b/sci-libs/scikits_learn/scikits_learn-0.22.2_p1.ebuild
index 3e4407171f7..aaf2a275fbb 100644
--- a/sci-libs/scikits_learn/scikits_learn-0.22.2_p1.ebuild
+++ b/sci-libs/scikits_learn/scikits_learn-0.22.2_p1.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_PN}-${MY_PV}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~ppc64 x86"
 IUSE="examples"
 
 RDEPEND="


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/scikits_learn/
@ 2020-11-13  1:14 Sam James
  0 siblings, 0 replies; 24+ messages in thread
From: Sam James @ 2020-11-13  1:14 UTC (permalink / raw
  To: gentoo-commits

commit:     db15b69f2065aec023f5b5c28df309d71657c0bf
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 13 01:14:23 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Nov 13 01:14:23 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db15b69f

sci-libs/scikits_learn: arm64 keyworded (bug #754153)

Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-libs/scikits_learn/scikits_learn-0.23.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/scikits_learn/scikits_learn-0.23.2.ebuild b/sci-libs/scikits_learn/scikits_learn-0.23.2.ebuild
index 55d42a949aa..8a8db3923d0 100644
--- a/sci-libs/scikits_learn/scikits_learn-0.23.2.ebuild
+++ b/sci-libs/scikits_learn/scikits_learn-0.23.2.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/scikit-learn-${PV}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="examples"
 
 DEPEND="


^ permalink raw reply related	[flat|nested] 24+ messages in thread

end of thread, other threads:[~2020-11-13  1:14 UTC | newest]

Thread overview: 24+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-01-28  8:24 [gentoo-commits] repo/gentoo:master commit in: sci-libs/scikits_learn/ Joonas Niilola
  -- strict thread matches above, loose matches on Subject: below --
2020-11-13  1:14 Sam James
2020-06-01  6:41 Georgy Yakovlev
2020-05-09 11:24 Mikle Kolyada
2020-05-09 11:24 Mikle Kolyada
2020-04-08  6:56 Patrick McLean
2020-04-03  3:30 Patrick McLean
2020-01-16  7:03 Michał Górny
2020-01-16  7:03 Michał Górny
2019-08-03 20:36 Alexey Shvetsov
2019-02-27  4:25 Aaron Bauman
2017-08-16 18:12 Sebastien Fabbro
2017-08-03 17:33 Sebastien Fabbro
2017-06-28  4:02 Sebastien Fabbro
2017-02-14 11:33 Benda XU
2017-02-14  6:47 Benda XU
2017-02-14  6:47 Benda XU
2016-08-13 18:48 David Seifert
2016-01-26 19:09 Justin Lecher
2016-01-26 19:09 Justin Lecher
2016-01-06 15:07 Justin Lecher
2016-01-06 15:07 Justin Lecher
2016-01-06 15:07 Justin Lecher
2015-11-06 16:22 Justin Lecher

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox