Version Bump

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xE9402A79B03529A2!

3 files changed, 134 insertions, 19 deletions

diff --git a/sci-libs/scikits_learn/ChangeLog b/sci-libs/scikits_learn/ChangeLog
index 2c2c457980a7..55e73f70fb54 100644
--- a/sci-libs/scikits_learn/ChangeLog
+++ b/sci-libs/scikits_learn/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/scikits_learn
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/scikits_learn/ChangeLog,v 1.29 2015/04/08 18:49:15 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scikits_learn/ChangeLog,v 1.30 2015/05/22 14:42:42 jlec Exp $
+
+*scikits_learn-0.16.1 (22 May 2015)
+
+  22 May 2015; Justin Lecher <jlec@gentoo.org> +scikits_learn-0.16.1.ebuild:
+  Version Bump
 
   08 Apr 2015; Michał Górny <mgorny@gentoo.org> scikits_learn-0.13.1.ebuild,
   scikits_learn-0.14.1.ebuild:
diff --git a/sci-libs/scikits_learn/Manifest b/sci-libs/scikits_learn/Manifest
index 218fb1717a0e..304beef20ae6 100644
--- a/sci-libs/scikits_learn/Manifest
+++ b/sci-libs/scikits_learn/Manifest
@@ -1,33 +1,35 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX scikits_learn-0.14.1-system-cblas.patch 1072 SHA256 56fdc4b1226d8456d674961cb466a00442935b7dc1ccc1d9178bac8ddd984eab SHA512 bb9d7265c81fe11d5a4467716e982eafb046cd24fe317a01e02d20ff43df39e9557a4325f26cf131b87a26e9fe86342abf3166be058aeeca41fb675f9ead17d3 WHIRLPOOL b0ac8bb1998224030be1d42593d7b70d0a1f0b562920f11e47d38e8cefcb033a5bfcfe6fdf851a9ec4bfdc7254e01af6010242c2d8215255a5e11f6b130697db
 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
 EBUILD scikits_learn-0.13.1.ebuild 2263 SHA256 3f0f008126a14784733f8d386507a545ee42f9e0c6d2ea31be01d3845390b5e9 SHA512 455efd01b9fa41b378b11ae3598bfabf24d37cc125dad62591cb526847a8ba8d697469306ce1dbab06f48fbfd4ed5ef62beb3335b880070ec04665c19a5b30d5 WHIRLPOOL f5174da524be2cbb99957683212d2dc81d2fe43d603ccb534029fb0610eed72bb7ee12f647ca3ca63f49781a20ef7225eb35ad36fab66f2ccf5cde032d1b01fa
 EBUILD scikits_learn-0.14.1.ebuild 2958 SHA256 e08d830ad49183392d9fe12a89e2422d7a0d8da603f3bc9ef8dc0f17f63fcb76 SHA512 92227eed002630ee1f084c950bb07f20cb3d76e3032bf3e4b76e2fd9f32c6c41b1fbf1fab4921e3e0a0d207c4f59f44d35b28ec4fc963cec66faf5a33185db39 WHIRLPOOL a520135ad7c68b46b78d9fe832cd443f16873534c82987fd6a26e44b817c67c6362cf6d46e651915fc3915b049266c268d92a5581b8165fd3d8cf45db87bb34d
 EBUILD scikits_learn-0.15.1.ebuild 2958 SHA256 54e152c014590aba7ce80bf1f0dd6996763dff5b7975e651957b0763f22c5ba9 SHA512 4e63416f87628e47afbc66b94aaed3ef3cc74b926292ca32126c5070cdc2b846cb93c876331b00e45fb54fde7df3647fd9d9830ac946ceed6b454b81bd20aebf WHIRLPOOL 078aea04410ad04125dddd15ec6a8c08abda2653d96ef48d9a93f97cae24c0ed61a8f1c1bd152bb98f8e61d713aa1305eb7d6420f4325b805f22e32aaf7fa32c
 EBUILD scikits_learn-0.15.2.ebuild 2958 SHA256 55da970a8358c5d9bc044d8466f808879ab868a55dd742c42814cadc763b3066 SHA512 ed984c47e5fb324a2d9ddafb555e959d368a9698132237c271e0212605f3264b096f7d6114abb7674c636bed7bc1f0e909e9a8bcbdfdb15a97fdfbf1b85fd757 WHIRLPOOL 4b2f7e15266ea0edbbfa7e03b88b3cb78baa2942ffcbb5fd796ea81bac112bb4007cbbd0941db30f47ab4a7dd20c9f7b53b7389a97e1c7edbf984a7ffea1cc9c
-MISC ChangeLog 5598 SHA256 04af68989831dd149eb97532b2b75b042c96452d25c7672424312d0004f42a1e SHA512 4ed962c50a8a9c9cdc338e947e7eb665014cee0a4d809bafedf9a4824db824eb18451d1b4204540d07aed51ff975d40f418db8d07c71e1f771eb9a116320779a WHIRLPOOL d05147cff30f2b46f73d53a46aae023d0dca72d5ac09aac3877c66f07733c02e7c031f2e5a6393f3645e4ade4954236c6885b6bfb91b09ebad980cac47f6c735
+EBUILD scikits_learn-0.16.1.ebuild 2929 SHA256 7e046575b56276e40fe17dfb06d9660bb62e0a393bbb856c5c12f0ad6bc90bb5 SHA512 6f1d47709dbda8c421794182e1b51c31bbb3f1a46db4c358f6de893cd5f00df2ce0ddbdbe974c89887db2d7c7e53a798e64c74d1221abdd2bf5fd4128be0e70b WHIRLPOOL 44b43afdef70b63ed62dc16e063cce3318c152253bb46b5b9768b803775ecfdbce7dec95bb25b13b34e12a43340dab42a5d1006be54867e8047aba3efa8b8290
+MISC ChangeLog 5726 SHA256 76fbcc3142b580d287089d267dbda8d044a3d0ade4d1e2e95af1a30aec2a442e SHA512 59b8a2d3390e0209cf1c3bdc15d17f16b2f400bd96a056ccd0bcb58e80e038e6be64dabbef0fc039d4ac23da03834146d686d870323121e40c1c0f763104adf6 WHIRLPOOL 4b465b0652cc74f4ea4c0306dc361e608ab0455a5e0d88e106d5ea56878acfe593364296b71446e36a3890282411049689e4dd0beda59ecad07c293423ed779f
 MISC metadata.xml 443 SHA256 03debe78c824fb81c25113a8382fd7b457061eb40a5213a51d13fd6a71668390 SHA512 15e9d16b480e8d1c0339d48908895ddcf426c9e35cb4dad37ceadc62b84969b616a07e317a5943436f84e54f64877f6e2a7197562b9bd84ea90a300ef295f0da WHIRLPOOL 4b77712b446885eaa8643720c9b9a350d0724054083883119163dd4ab94e9586cf895d16b2cf27ea63b8d4bc1ca1ef2d68608372087db6a5526b6dd68a30cf4d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVJXhFXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOLcwP/1gC7RpJqelyTzx5U/9eYj6c
-/ciHNjaljdFzVY3TaCt2Ne9LJMDkAKs7+ql9F9hkrfCjLiicMBzfnX6+kop/gVGu
-ttHsALz4lIazmi1iums1hmiI8djGHCfxJUMwM4DtaKMPcocIkj2d1br/BRsQHefj
-/hFaZRUvn6osb376uUtOnyS2l4mo8qHqQCG5B1deAT8i8yv7UQaxn3AVJROqya98
-PrnZaNgw35cyS4Z6sviC9tbISzqpHbtLoQ8ZCsyTpUc/x/cXKuxtB21UAI7YCgpP
-7LgX/t7FMLyz6ZyxuXfajR7ARfExfadrwOwLuXUX4iIpPiUQC9T62u2Z+4gsJUeY
-dMdQS+nJogt6Ti66B/DlUH/G9KHrDjDeK+2bRg4Hd9pzKX35ZnizFyRL7UtyD1ZY
-JssG7gN8VaPVUr8iioGeNhvB2bFRG+1hNC0DKLHChUHIF6qqsLh//QFHunQogVlX
-AdXupkui+XvrdY/jOhqGyyGmM3CoQgQuBhx9vOq3ZrXa4Q9f+dhypkCdtgZwfL3b
-AKJz6EBEHYClA32UZGCHdZdT4TAaTHZqI0fp3cLPysK+JrcJm2q1bDEH8GXUldL+
-P/luGzDf4f0VE+0g/JnoFkp47C6A2HfK7KyaZYjMQvHOo3zaVW+w8kl4AwwhL1+p
-eP+8xuGke476pbzomVjO
-=Us89
+iQJ8BAEBCgBmBQJVX0BjXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiqzwP/0MsreZUplnoN3uUc030DOua
+aOwiKoEUqtWbQjfKS7/vUrxVBoKv5RUpV6waemNUWUxiuvV1Cq9012yY2/q5CpGY
+EIsHjgFnGW4Z4sFWTpnzq7twp1RrY2ssvx3oln5XZj61RF5Gp4opSyubYcZH4M6P
+Q0NMojF5Is7aSPxSdRb3+wojDoG+PXo2zkqB2E6rp2F13jqO1MG/49H4yP7LSh0W
+P6dlMLuUD49nl+bJG9jIpIjS6DGE6ItYjEevf6zpo+929wrv2LyuZb7LLOr6iq9E
+cuyr/BfcPPjW60YaIFkOT+bzl+/nQCQXxAw/jlhJU++jYJFIX4f7g5RPmzSavQ8g
+q984HPRHlDe3dslT+g8LM1iUuK8Iu1shd93IwUGzgSE93EmWM8Wovxl4o9F3Dq+W
+7Q+etsgn7VRMEau0jO67AUAGXPN/lrCCeQFJiZFt+woymZQbIfoo7pcadIHP0k6S
+ezXM8ChxWd1prgfQxp02I5EVRsi6P8Hd8SzEZQrQ8dMymySmMzAk7mDQWflT6AmU
+jaJ0dUTf2GnQ9f6citTxqV84nwYmhh4LwX7/PIaS55574bwTjmWMDbJoyPqG399M
+KgqwZq3cfDU91p5IgjKCWAeih1VFPESCgFoKb+8aMt1okc7kqg0ROK7t9sYXL9v7
+PJlWig/pmir9NkArRc89
+=4PtO
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/scikits_learn/scikits_learn-0.16.1.ebuild b/sci-libs/scikits_learn/scikits_learn-0.16.1.ebuild
new file mode 100644
index 000000000000..ae56becc4eb2
--- /dev/null
+++ b/sci-libs/scikits_learn/scikits_learn-0.16.1.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scikits_learn/scikits_learn-0.16.1.ebuild,v 1.1 2015/05/22 14:42:42 jlec Exp $
+
+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}]"
+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
+
+	# 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/. )
+	distutils-r1_python_install_all
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+}