From 45e383c273a93020c47784e518d1b31d4bdfe2de Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Fri, 14 Nov 2014 21:53:43 +0000 Subject: [PATCH] sci-libs/scikits_learn: Version BUmp Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0xB9D4F231BD1558AB! --- sci-libs/scikits_learn/ChangeLog | 8 +- sci-libs/scikits_learn/Manifest | 28 +---- .../scikits_learn/scikits_learn-0.15.1.ebuild | 14 +-- .../scikits_learn/scikits_learn-0.15.2.ebuild | 109 ++++++++++++++++++ 4 files changed, 126 insertions(+), 33 deletions(-) create mode 100644 sci-libs/scikits_learn/scikits_learn-0.15.2.ebuild diff --git a/sci-libs/scikits_learn/ChangeLog b/sci-libs/scikits_learn/ChangeLog index f9c43f9d5e60..da4371a35afc 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-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/scikits_learn/ChangeLog,v 1.26 2014/10/26 18:33:23 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/scikits_learn/ChangeLog,v 1.27 2014/11/14 21:53:42 jlec Exp $ + +*scikits_learn-0.15.2 (14 Nov 2014) + + 14 Nov 2014; Justin Lecher scikits_learn-0.15.1.ebuild, + +scikits_learn-0.15.2.ebuild: + Version BUmp 26 Oct 2014; Justin Lecher scikits_learn-0.15.1.ebuild: Add missing dep for doc building, #451834 diff --git a/sci-libs/scikits_learn/Manifest b/sci-libs/scikits_learn/Manifest index 938a223ebbc1..06c25236df47 100644 --- a/sci-libs/scikits_learn/Manifest +++ b/sci-libs/scikits_learn/Manifest @@ -1,31 +1,11 @@ ------BEGIN PGP SIGNED MESSAGE----- -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 EBUILD scikits_learn-0.13.1.ebuild 2267 SHA256 1aa938ea04737f05a52e51467393bbc9237dc5b1ca9f49d404f85f5aa83a85ca SHA512 84eebeae5bc347ae06c0d7096568eab78e87791f3bd15925169c40e614893619eac9a56030a3e57a98fb06fd167d3226ad28efb4bc988da275cc738cac08b1e6 WHIRLPOOL 05dcfafe226dbbde8311248d44cc8658b7247f6bd4b12eaddc066b0671a72c5785932f8726d87c272fad09e995e69a29c13308eade3ce10245ebe61056e4c660 EBUILD scikits_learn-0.14.1.ebuild 2960 SHA256 bd4cc3401fa190c2e1406e05a037e13e543e6f7d301c5bd1ced3323d3b236158 SHA512 0c1a8116f4b58f296c0c38052e89e469385544cb4cc3b2581e08bd8ab2a6b1154b1e86847d7aabac2de1336cd6c4657083c9428446431b3ee8fe63f8d5afbc73 WHIRLPOOL 1e8f7152d9f46c37ab13f6d503caca0c4bbb4b10ef3df55620184066ab2b8adfbe2913a015da4cacdf26df33af5d4e1d5c41ce8fda3ee28acd715a72dd0d22fd -EBUILD scikits_learn-0.15.1.ebuild 3008 SHA256 225d5bd18a1cc9d66ec616992f084930304d6bbaee91462b7a02119c6fc9a831 SHA512 8f87d7a5a020cc789037207f97c060d4c98ca37274fee36f21743984ae243105f318238098bcd6d4b66e0c257492632a18888c7245318793de1ccd741b6f8232 WHIRLPOOL 8234c7334f7690143aa7552b975f9a39fd27bcc6f2350ddf423e5fe20cc759bb178cd16bfe59bb1921dd217cb4a6ec6398faadd2caaf111a88e61b5523f1778b -MISC ChangeLog 5290 SHA256 5a81290b19e976c2a22d799f75bd8acb50ae56a239d9d8c97d1d6e56b8d2d400 SHA512 67373e3d1e0bb15d09a914feefc0deb71eb5175b2dbda128163971c8695059776b6eff560474fcd4e619ad273e04f2507d2b00fc93c635053926e1fbfacb6997 WHIRLPOOL b6c1d5d627ed11eb05bccae9b778462c37e10523e13af9271424dbce4a1778489846924149c7b5201e0637eec1c399aed279563193f124442a682d89fcdb021e +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 5451 SHA256 b8669468cda9b3bde045bbe2814375a8c7938de43430dd3204231072bbaad407 SHA512 e10caf0daed713ea96624a1c286405adaff3a78700abba0987cb5537405db204e33407d0869083e21120df46d0768aacad30679a53b53277a7a5d657c3723607 WHIRLPOOL fad3819f330e8b80abdd35965d33fdb39126a5ebb535d253138f9a539833806eb517c848def714ef055e765c8da232c58c70cd5aa56a4c3458c8bb06f39628b7 MISC metadata.xml 443 SHA256 03debe78c824fb81c25113a8382fd7b457061eb40a5213a51d13fd6a71668390 SHA512 15e9d16b480e8d1c0339d48908895ddcf426c9e35cb4dad37ceadc62b84969b616a07e317a5943436f84e54f64877f6e2a7197562b9bd84ea90a300ef295f0da WHIRLPOOL 4b77712b446885eaa8643720c9b9a350d0724054083883119163dd4ab94e9586cf895d16b2cf27ea63b8d4bc1ca1ef2d68608372087db6a5526b6dd68a30cf4d ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0 - -iQJ8BAEBCgBmBQJUTT55XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w -ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC -OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVir1wIP/R9cL+T9pQOQgqPm9yTV2vcM -NqqLSPiP7Xs18VYm0AdbgisKIhOabdhBapioLUaNornOd5gwxpHYw9RsSKwr1qW9 -zphj+dKtjkKzwN2BgRrKBri1G3kgePBgz1RPX2NDY8IlwhdztB35LBXUMkV0tDGH -/ahucF+8iR+ZcF38aoJJNTOPLcpiwXroR+drrcoUrTfiEEaGTSAj6LcRfbiuJpaz -/3yt5dIi0pHE22h2hLZ9ZtPZvQdZmTwXWUHfWl+QQ9Z4oVvnXybOKdslrcpBXrUs -kzhyRkJCBae+UIh7cgD5w3Yl2vFwVcprLm7BTGPxvEv7yHjyuE1SNLsOwFzDwAQv -cZe8bCE+5w+pWU98XPsZNjKzJZlrEMCaO0dz/1NNrkAWdxjw0maxuExHJ0WS0Gsg -tar57PtUKa35Xa/tQy7O+LpkTkVYYGZIovw/qE017u0y/sPRy+dpko6rlzPHcR5r -yYVG8q4y0LlTXs9Oy/2VRkLjJ8AS2gpoD7hvR0pX0kaPWNce/+FXGzlhmc90U7Yk -gFK3IRK7cgCu/CHj8j4jpM3vm/ITW5w4UhryO4sj45aDNmMpwG0zUvaT43ds6/b4 -TgNbcI14LbGwtRUUSmrJRLDwZeCw3M+wHWmcJatExM6vt4McEbglbhUOFIKzEWJd -o2duXPi6Z1TYj2bibBZt -=iEiF ------END PGP SIGNATURE----- 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 40c0e95603c7..1cecf76d7139 100644 --- a/sci-libs/scikits_learn/scikits_learn-0.15.1.ebuild +++ b/sci-libs/scikits_learn/scikits_learn-0.15.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 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.15.1.ebuild,v 1.2 2014/10/26 18:33:23 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/scikits_learn/scikits_learn-0.15.1.ebuild,v 1.3 2014/11/14 21:53:42 jlec Exp $ EAPI=5 @@ -23,10 +23,11 @@ IUSE="doc examples test" RDEPEND=" dev-python/joblib[${PYTHON_USEDEP}] - sci-libs/scikits[${PYTHON_USEDEP}] + dev-python/matplotlib[${PYTHON_USEDEP}] + dev-python/nose[${PYTHON_USEDEP}] dev-python/numpy[lapack,${PYTHON_USEDEP}] - sci-libs/scipy[${PYTHON_USEDEP}] - dev-python/matplotlib[${PYTHON_USEDEP}]" + sci-libs/scikits[${PYTHON_USEDEP}] + sci-libs/scipy[${PYTHON_USEDEP}]" DEPEND=" dev-python/cython[${PYTHON_USEDEP}] dev-python/numpy[lapack,${PYTHON_USEDEP}] @@ -36,10 +37,7 @@ DEPEND=" dev-python/joblib[${PYTHON_USEDEP}] dev-python/matplotlib[${PYTHON_USEDEP}] dev-python/sphinx[${PYTHON_USEDEP}] - ) - test? ( - dev-python/joblib[${PYTHON_USEDEP}] - dev-python/nose[${PYTHON_USEDEP}] )" + )" S="${WORKDIR}/${MYP}" diff --git a/sci-libs/scikits_learn/scikits_learn-0.15.2.ebuild b/sci-libs/scikits_learn/scikits_learn-0.15.2.ebuild new file mode 100644 index 000000000000..5ccbfb360093 --- /dev/null +++ b/sci-libs/scikits_learn/scikits_learn-0.15.2.ebuild @@ -0,0 +1,109 @@ +# Copyright 1999-2014 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.15.2.ebuild,v 1.1 2014/11/14 21:53:42 jlec Exp $ + +EAPI=5 + +PYTHON_COMPAT=( python{2_7,3_3,3_4} ) +DISTUTILS_NO_PARALLEL_BUILD=true + +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 +} -- 2.26.2