Version bump

Package-Manager: portage-2.2.01.21313-prefix/cvs/Linux x86_64
Manifest-Sign-Key: 0x13CB1360

4 files changed, 128 insertions, 12 deletions

diff --git a/sci-libs/scikits_learn/ChangeLog b/sci-libs/scikits_learn/ChangeLog
index 3a0aa4d8183d..a7a388c326e7 100644
--- a/sci-libs/scikits_learn/ChangeLog
+++ b/sci-libs/scikits_learn/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/scikits_learn
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/scikits_learn/ChangeLog,v 1.13 2012/06/21 19:17:13 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scikits_learn/ChangeLog,v 1.14 2012/11/30 00:25:42 bicatali Exp $
+
+*scikits_learn-0.12.1 (30 Nov 2012)
+
+  30 Nov 2012; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/0.12.1-linalg.patch, +scikits_learn-0.12.1.ebuild:
+  Version bump
 
   21 Jun 2012; Sébastien Fabbro <bicatali@gentoo.org>
   -scikits_learn-0.10-r1.ebuild, scikits_learn-0.11.ebuild:
@@ -101,4 +107,3 @@
   26 Mar 2010; Sébastien Fabbro <bicatali@gentoo.org>
   +scikits_learn-0.2.ebuild, +metadata.xml:
   Initial import
-
diff --git a/sci-libs/scikits_learn/Manifest b/sci-libs/scikits_learn/Manifest
index 6e0fdfbaf5d7..0e0f6ff7dc2a 100644
--- a/sci-libs/scikits_learn/Manifest
+++ b/sci-libs/scikits_learn/Manifest
@@ -1,15 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX 0.10-atlas.patch 2524 RMD160 2229ca5e4b2ac26c71481bf216387eae55a64f08 SHA1 c4736cf0ae577010189c71f75e46a2c60bab7e7c SHA256 25f0d89b50c36931ccb52be02676bb2c7f78a0f4f270f01319eea287af132e94
-DIST scikit-learn-0.11.tar.gz 2891731 RMD160 3d439d1b1abb00e10c0e02d5bce0f0193746af42 SHA1 3878884b6039a24cb1391445c9d8a03930d944dc SHA256 531ab0b08c6be2b2bf70ccb005b39bd3f84c854e40d6f23bf9a365c028868f0d
-EBUILD scikits_learn-0.11.ebuild 1979 RMD160 cfed0018a633f065d7ed9f8a947bfd65c6cd76f4 SHA1 47d1b622dd5fb57a34a1a3ec33204addd2209bc1 SHA256 90f04d1017d1e5bb4eb8693de6590ecef6dda35a3fb268e6daa890fe688f2f13
-MISC ChangeLog 3117 RMD160 f3749f79cd61052ef080ae95188de674cd7f9c98 SHA1 6be05cf438f19a338c2acacbb7e00248e4993398 SHA256 9c4a60a32e23259c062e5d38fb956a8214fd535b93eaedf29d5015a7deacdcda
-MISC metadata.xml 360 RMD160 b7e8ec0449f59c0dd0a7e3810b7c86b260d51530 SHA1 a54074283be9e7d2a113220e92a622b6fb4bfe45 SHA256 6d8c6ea79bfa70bc97b21c3b11454f4e47e31c20442a9ff96230d535562e945c
+AUX 0.10-atlas.patch 2524 SHA256 25f0d89b50c36931ccb52be02676bb2c7f78a0f4f270f01319eea287af132e94 SHA512 733628a21213cafefa0849da3ba99892e7c690b4ca1d5917bdef4a0b4623b686532cbf789f9303264342fe7b0e073ff420ede73ee6acc8d7adc56340425d04a8 WHIRLPOOL 8110029e9e58524a739d9130675ef2b0a23c1bc90e73fe9cbb44713452a38f636dfb6fd1030ef360434acadc94b11e13fe391f49875765087043e4222f9bdac6
+AUX 0.12.1-linalg.patch 1310 SHA256 347bb5f43138f9f1ba57f14b4b9ef4d3ade3fb4dbadc22d827c11445621814f3 SHA512 6c974d8853c15f85221f1c611ad6987287dac4117ce136bbd3380b3fc2040e3bcbc4e42be6b9be0e14d41cf6fc900b050fa441a1f27acf6a933f9524e8512549 WHIRLPOOL c28726d7d975cf493724519f987f6183b92af73e35ab8c98857db400523d46d884903d69db1fb3ab8d3b0a07d0d178d33f39266c8f2b17eea53fc789a318bb56
+DIST scikit-learn-0.11.tar.gz 2891731 SHA256 531ab0b08c6be2b2bf70ccb005b39bd3f84c854e40d6f23bf9a365c028868f0d
+DIST scikit-learn-0.12.1.tar.gz 2964072 SHA256 f542e58a15c93e118036801b55441470e9fc668e8811c39cc0f935a800ff8eaf SHA512 d9d65c36fb8314b9a7e749718d53491661d6007968b59bfa47e84e724c5a44fac8ae7d06150b04a33916542749bf8cfc240fcedb6b0ab02cce0e1ffa23115df2 WHIRLPOOL 53089e2ec6eee5d31b39087187dcc13a11fa9307bcbfdf404c1a9b0580dbaecee742bc7dfd14216b6d80c43484a32a5c3d62704c06488760a6d2bf4bc8560c0a
+EBUILD scikits_learn-0.11.ebuild 1979 SHA256 90f04d1017d1e5bb4eb8693de6590ecef6dda35a3fb268e6daa890fe688f2f13 SHA512 d3060cee6707f94777f7493a8b9539e65dd5dafd1aef0eb19540d7e60e0487a0b08e6d3f7f5a6f97cdea055c6025385d3df1a464943cf32f3fb0963c1e92c53e WHIRLPOOL d5ada82c8edadb1d34c450a14103b2b3f3fd187ffbffae7a1d9d81631046da12c0b31b0b35554aa80e21dd2a11bbcf97f95515fe358adf3412682c1397a9b284
+EBUILD scikits_learn-0.12.1.ebuild 2002 SHA256 6a009bf956893437ffcf2776990a75a702ac40245cafba7fdbfa8dfb542ed69d SHA512 45ac5fa2a304e5c1c5a00809ab3c8ed452802425a8f35aea1f68fe979b3783925131b36a22bd9d7bcc690e1a0484f97ac7091c47fb5edb8a8b669ad0a53c5317 WHIRLPOOL 32af5272058ba2f39fd7616e61f33aca8995143ec6a1a6ad9f9be25f036496c61958354a6636f144c4cff0fe60cb98970835a5fc26344622e8050fdd283ba999
+MISC ChangeLog 3284 SHA256 42fcd0d3bc6954a747672b57a8ccf95b1802321075b299dbde91678712045ae6 SHA512 7c999bc0d052480199264903ab981585a2c44e931f4e0b0529e628cc518e3cec29ae0162a3abbb1cc155d627ad23f92650ed8841350f2ea3bbf4e853bbdc9b07 WHIRLPOOL 83638cbf5d702f9307e3b8f05785708b46eab9efe936066f09bc046c878c3c6ba48c19f7d1f9e33ebf10c99e191d44b26ab16548085f45f51735059293807d7a
+MISC metadata.xml 360 SHA256 6d8c6ea79bfa70bc97b21c3b11454f4e47e31c20442a9ff96230d535562e945c SHA512 328186381a1b178f863b9fbe0bc9c699fbf5d60ff37363f20be3c0f6d83abff8fd3b56464ca4ae48aaee463e6bee93132ba225389540071e061b792cff2ab5ab WHIRLPOOL b974fa2483272b6fe8f2c716b961260b0b6123aab445cf8ddc91280dc489b370b311c15b2830088aca2c61770ad3f05278df12a711422f90a1f2cc2f4abe4d26
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk/jc0IACgkQ1ycZbhPLE2DjaACfWbGM/D08+vZU9X6sG1aC8Gxq
-CLsAoIofQ3AzZkZ+0dJEAAaBjyRUXCzD
-=ZU1f
+iEYEAREIAAYFAlC3/QoACgkQ1ycZbhPLE2ByqwCgiwye1qNXVdIWp8Ju7SUo7cKG
+k5gAoIjkfGK1gbQ857Ejz9k6OwXLB8SR
+=2FV+
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/scikits_learn/files/0.12.1-linalg.patch b/sci-libs/scikits_learn/files/0.12.1-linalg.patch
new file mode 100644
index 000000000000..ca113ffe6416
--- /dev/null
+++ b/sci-libs/scikits_learn/files/0.12.1-linalg.patch
@@ -0,0 +1,29 @@
+--- a/sklearn/linear_model/least_angle.py
++++ b/sklearn/linear_model/least_angle.py
+@@ -236,8 +236,8 @@ def lars_path(X, y, Xy=None, Gram=None,
+                 L_.flat[::n_active + 1] += (2 ** i) * eps
+                 least_squares, info = solve_cholesky(L_,
+                                     sign_active[:n_active], lower=True)
+-                AA = 1. / np.sqrt(np.sum(least_squares
+-                                         * sign_active[:n_active]))
++                tmp = max(np.sum(least_squares * sign_active[:n_active]), eps)
++                AA = 1. / np.sqrt(tmp)
+                 i += 1
+         least_squares *= AA
+ 
+--- a/sklearn/linear_model/tests/test_least_angle.py
++++ b/sklearn/linear_model/tests/test_least_angle.py
+@@ -101,6 +101,13 @@ def test_collinearity():
+     assert_true(not np.isnan(coef_path_).any())
+     residual = np.dot(X, coef_path_[:, -1]) - y
+     assert_less((residual ** 2).sum(), 1.)  # just make sure it's bounded
++    
++    n_samples = 10
++    X = np.random.rand(n_samples, 5)
++    y = np.zeros(n_samples)
++    _, _, coef_path_ = linear_model.lars_path(X, y, Gram='auto', copy_X=False, 
++         copy_Gram=False, alpha_min=0., method='lasso', verbose=0, max_iter=500)
++    assert_array_almost_equal(coef_path_, np.zeros_like(coef_path_))
+ 
+ 
+ def test_no_path():
diff --git a/sci-libs/scikits_learn/scikits_learn-0.12.1.ebuild b/sci-libs/scikits_learn/scikits_learn-0.12.1.ebuild
new file mode 100644
index 000000000000..0e2c3fac912c
--- /dev/null
+++ b/sci-libs/scikits_learn/scikits_learn-0.12.1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2012 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.12.1.ebuild,v 1.1 2012/11/30 00:25:42 bicatali Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="2.7-pypy-*"
+
+inherit distutils 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
+	sci-libs/scipy
+	dev-python/matplotlib"
+DEPEND="
+	dev-python/cython
+	dev-python/setuptools
+	sci-libs/scipy
+	doc? ( dev-python/sphinx dev-python/matplotlib )"
+
+S="${WORKDIR}/${MYPN}-${PV}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/0.12.1-linalg.patch
+
+	# 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"
+}
+
+src_compile() {
+	distutils_src_compile ${SCIPY_FCONFIG}
+	if use doc; then
+		cd "${S}/doc"
+		local d=$(ls -d "${S}"/build-$(PYTHON -f --ABI)/lib*)
+		ln -s "${S}"/sklearn/datasets/{data,descr,images} \
+			"${d}"/sklearn/datasets
+		VARTEXFONTS="${T}"/fonts \
+			MPLCONFIGDIR="${S}/build-$(PYTHON -f --ABI)" \
+			PYTHONPATH="${d}" \
+			emake html
+		rm -r "${d}"/sklearn/datasets/{data,desr,images}
+	fi
+}
+
+src_test() {
+	# doc builds and runs tests
+	use doc && return
+	testing() {
+		"$(PYTHON)" setup.py build_ext --inplace ${SCIPY_FCONFIG} || die
+		PYTHONPATH=. nosetests sklearn --exe || die
+	}
+	python_execute_function testing
+}
+
+src_install() {
+	find "${S}" -name \*LICENSE.txt -delete
+	distutils_src_install ${SCIPY_FCONFIG}
+	insinto /usr/share/doc/${PF}
+	use doc && dohtml -r doc/_build/html
+	use examples && doins -r examples
+}