sci-biology/nilearn: new versions

Package-Manager: Portage-2.3.40, Repoman-2.3.9

4 files changed, 48 insertions, 11 deletions

diff --git a/sci-biology/nilearn/Manifest b/sci-biology/nilearn/Manifest
index ad8541d5f..a10e7cbe8 100644
--- a/sci-biology/nilearn/Manifest
+++ b/sci-biology/nilearn/Manifest
@@ -1,4 +1,4 @@
-DIST nilearn-0.1.4.1.tar.gz 649510 BLAKE2B aad72e3044d136d532973b8cad90560004af4e3e76d5fbaa1698b952ce85d10d0e57521bc299229ecc350dfbf2e91236d9ba03adf0dec279c6e75c1358318d1b SHA512 277633d1280a69ee69452bf7c6ce3ae8a86be3165575904bdae590488d568e82804eac0a7d040fd0ff49f546adf4bd2b0899c4b3bbbfd92aedb0fc16cc10d9f7
-DIST nilearn-0.2.4.tar.gz 1826461 BLAKE2B 26ddede5d8355089d09de7cb04c0d105839f16d7eacfd9eac8dc5e430f7b37643b827860b94e390670a4a622fb4246822b5f24d54d2b57b42a16309fa06a5928 SHA512 4f8f2572bedf15ab177fd88f21816f08fe32ade92389459ac38e144665f5c2e2aa6a3f01c23bdb6c3cc2d58a73432d051809982020dfc87a1f43390b086c2a9a
 DIST nilearn-0.2.5.tar.gz 2660422 BLAKE2B b66a0a725019afc5fa3845a74b26efff12793d22dc94723486e77db211e1b4da7b97b906911452ee021425cac187a321a4f25f9294def9cec963db0825c08447 SHA512 cf987f05641c8b875f9432b1cdc95aa38c0964d1e661b2542717bfe14177a6369407a12b34a2ef1e3688630104b0b7e5c164bc3529a57f35abad936edb1493b4
 DIST nilearn-0.2.6.tar.gz 2674241 BLAKE2B 3b6a38896e948258c9af7b624cbf809e1928b5e0e3aeb43bd67b85a19d0e51a93fd8914485fedc51f5d1cc75f4d32ec6e0a85f94a422a8d7f29437b80cb99373 SHA512 33de004619d018829f4dd2338ae1738a3ee4ecf188569404f1840f29cd1d30c1d24ffdaa44841ebd4656837973a80646906e24fdf01b11b2678a6c63fe0c228d
+DIST nilearn-0.3.1.tar.gz 2793233 BLAKE2B 55054fdcb21f5a80283a2ba958510aa8a22a73882a324a22e37ee0c5292745658f6f7dd16042ba2e3eb91e7145650961c71de979716cd17af18842763c66223c SHA512 e222d868c2fff4dbe94a8e81498b4e3c4628a77e7f5d7ca77f9a28486f6e993b9ac20c55cf16f06b93cb3ffb577e9e0a87756b089f83c3387ab515e7991d8654
+DIST nilearn-0.4.1.tar.gz 2835584 BLAKE2B c3e8a06b410b087abc8a3e05cbac65397e558de43da0af7d6776fb4817fa190da422b9b085977998cad52bca266799b3bcc285e8ccdef6b9f8cdb6840b934064 SHA512 b5849d49170d5d2a7488d9632162db4922f7edc093182dff2814fd661a6177b8b3f1a459626be0294075fab82d4bfa06485b03bb6b6e290ea230651515982c87
diff --git a/sci-biology/nilearn/nilearn-0.2.4.ebuild b/sci-biology/nilearn/nilearn-0.3.1.ebuild
index a6834596c..49f7a1a33 100644
--- a/sci-biology/nilearn/nilearn-0.2.4.ebuild
+++ b/sci-biology/nilearn/nilearn-0.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,16 +17,34 @@ KEYWORDS="~amd64 ~x86"
 IUSE="+plot test"
 
 DEPEND="
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		)
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	"
 RDEPEND="
+	dev-python/joblib[${PYTHON_USEDEP}]
 	dev-python/numpy[${PYTHON_USEDEP}]
 	sci-libs/scikits_learn[${PYTHON_USEDEP}]
 	sci-libs/scipy[${PYTHON_USEDEP}]
 	sci-libs/nibabel[${PYTHON_USEDEP}]
 	plot? ( dev-python/matplotlib[${PYTHON_USEDEP}] )"
 
+# upstream is reluctant to *not* depend on bundled scikits_learn:
+# https://github.com/nilearn/nilearn/pull/1398
+python_prepare_all() {
+	local f
+	for f in nilearn/{*/*/,*/,}*.py; do
+		sed -r \
+			-e '/^from/s/(sklearn|\.|)\.externals\.joblib/joblib/' \
+			-e 's/from (sklearn|\.|)\.externals import/import/' \
+		-i $f || die
+	done
+
+	distutils-r1_python_prepare_all
+}
+
 python_test() {
 	echo "backend: Agg" > matplotlibrc
 	MPLCONFIGDIR=. nosetests -v || die
diff --git a/sci-biology/nilearn/nilearn-0.1.4.1.ebuild b/sci-biology/nilearn/nilearn-0.4.1.ebuild
index 86d1ed20e..49f7a1a33 100644
--- a/sci-biology/nilearn/nilearn-0.1.4.1.ebuild
+++ b/sci-biology/nilearn/nilearn-0.4.1.ebuild
@@ -1,16 +1,15 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 
 inherit distutils-r1
 
-MY_PV="0.1.4.post1"
 DESCRIPTION="Fast and easy statistical learning on NeuroImaging data"
 HOMEPAGE="http://nilearn.github.io/"
-SRC_URI="mirror://pypi/n/${PN}/${PN}-${MY_PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/nilearn/nilearn/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
@@ -18,17 +17,33 @@ KEYWORDS="~amd64 ~x86"
 IUSE="+plot test"
 
 DEPEND="
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		)
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	"
 RDEPEND="
+	dev-python/joblib[${PYTHON_USEDEP}]
 	dev-python/numpy[${PYTHON_USEDEP}]
 	sci-libs/scikits_learn[${PYTHON_USEDEP}]
 	sci-libs/scipy[${PYTHON_USEDEP}]
 	sci-libs/nibabel[${PYTHON_USEDEP}]
 	plot? ( dev-python/matplotlib[${PYTHON_USEDEP}] )"
 
-S="${WORKDIR}/${PN}-${MY_PV}"
+# upstream is reluctant to *not* depend on bundled scikits_learn:
+# https://github.com/nilearn/nilearn/pull/1398
+python_prepare_all() {
+	local f
+	for f in nilearn/{*/*/,*/,}*.py; do
+		sed -r \
+			-e '/^from/s/(sklearn|\.|)\.externals\.joblib/joblib/' \
+			-e 's/from (sklearn|\.|)\.externals import/import/' \
+		-i $f || die
+	done
+
+	distutils-r1_python_prepare_all
+}
 
 python_test() {
 	echo "backend: Agg" > matplotlibrc
diff --git a/sci-biology/nilearn/nilearn-9999.ebuild b/sci-biology/nilearn/nilearn-9999.ebuild
index eddfd0e2c..ecaae3009 100644
--- a/sci-biology/nilearn/nilearn-9999.ebuild
+++ b/sci-biology/nilearn/nilearn-9999.ebuild
@@ -18,10 +18,14 @@ KEYWORDS=""
 IUSE="+plot test"
 
 DEPEND="
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		)
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	"
 RDEPEND="
+	dev-python/joblib[${PYTHON_USEDEP}]
 	dev-python/numpy[${PYTHON_USEDEP}]
 	sci-libs/scikits_learn[${PYTHON_USEDEP}]
 	sci-libs/scipy[${PYTHON_USEDEP}]