aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSébastien Fabbro <sebfabbro@gmail.com>2010-08-05 23:37:49 +0100
committerSébastien Fabbro <sebfabbro@gmail.com>2010-08-05 23:37:49 +0100
commit59bb4225420ee167933364eaea801c5f36a878fe (patch)
tree3e24b04263b213046dfea4e069aae28ea591de65 /sci-libs/scikits_learn
parentFix python handling, thanks to jlec for noticing. (diff)
downloadsci-59bb4225420ee167933364eaea801c5f36a878fe.tar.gz
sci-59bb4225420ee167933364eaea801c5f36a878fe.tar.bz2
sci-59bb4225420ee167933364eaea801c5f36a878fe.zip
scikits_learn bump
Diffstat (limited to 'sci-libs/scikits_learn')
-rw-r--r--sci-libs/scikits_learn/ChangeLog6
-rw-r--r--sci-libs/scikits_learn/Manifest17
-rw-r--r--sci-libs/scikits_learn/scikits_learn-0.4.ebuild (renamed from sci-libs/scikits_learn/scikits_learn-0.2.ebuild)41
3 files changed, 33 insertions, 31 deletions
diff --git a/sci-libs/scikits_learn/ChangeLog b/sci-libs/scikits_learn/ChangeLog
index e0c8b0b18..cd2099603 100644
--- a/sci-libs/scikits_learn/ChangeLog
+++ b/sci-libs/scikits_learn/ChangeLog
@@ -2,6 +2,12 @@
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*scikits_learn-0.4 (05 Aug 2010)
+
+ 05 Aug 2010; Sébastien Fabbro <bicatali@gentoo.org>
+ -scikits_learn-0.2.ebuild, +scikits_learn-0.4.ebuild:
+ Version bump. Now depend on system libsvm
+
29 Jun 2010; Justin Lecher <jlec@gentoo.org> scikits_learn-0.2.ebuild:
Python ABI fixes
diff --git a/sci-libs/scikits_learn/Manifest b/sci-libs/scikits_learn/Manifest
index c5b0599d0..818e672a3 100644
--- a/sci-libs/scikits_learn/Manifest
+++ b/sci-libs/scikits_learn/Manifest
@@ -1,15 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-DIST scikits.learn-0.2.tar.gz 3546152 RMD160 d11a9d8b3a6db41d4e257f5e1feb9a99c4813b0a SHA1 155313abd33cb5c393636e784795e5d1ebb6c37d SHA256 0a2615f19232e631fb115d4a5a77fecf1f6192f950c1483083ab4a4f477170fc
-DIST scikits.learn.pdf 594915 RMD160 5a8e9501a11c90098cc6cb79c3575daf5e4c3100 SHA1 4b352c5bec5bcf1254d6918cb08f29277bc11f02 SHA256 39f97b9f1ef45583227dae266fe770ec6551d6cf8b15a7a72f3949ea36277ae2
-EBUILD scikits_learn-0.2.ebuild 1368 RMD160 4653fb0170c8f9e8d8de65c4e3d3db3df7c63d52 SHA1 2b5e241e9fb562dba39d7d4633e659b61c93c431 SHA256 0fdc1db61315c2fd44d5b03dca5c91f81ee39288cc147ff3f9ea01b6e910eabc
-MISC ChangeLog 367 RMD160 e69a74328e7bbc235577ca96e55a83ae9da428da SHA1 41b071f57bd37d355ac260cacbd933cc92e6adcd SHA256 1e709f21f8d941d0ea634356002845f2e1aa8145c9f127f4c47a435959d0c605
+DIST scikits.learn-0.4.tar.gz 654070 RMD160 08012a26fbf552a35d0b3c5c245b115bf1904e70 SHA1 c9d11c24ac3004f743f9df0f1e75ab2513c029a3 SHA256 48fb6b5baaf6ba1f16a021bb5b3c52ed59892acd7d1eb46235e525f677e014bc
+EBUILD scikits_learn-0.4.ebuild 1462 RMD160 63bd7500a07faa5fb5cd2d4a63bc1b919a7784a4 SHA1 304b054824dfc58f8a13aa8286865590bbe78176 SHA256 9358cf2301c9e413c7d4c583c31af80991afb72d39545b1f53ae52c59d5912e9
+MISC ChangeLog 557 RMD160 fc0da5cc77f2b05eb9fcdd861e5bbf18861740bf SHA1 f7a6c194d204bf305378f3361f7c17fc30a49adb SHA256 fa1709e0ff57e4b2bf90e9059332cd5805892c57c768600ba0b4639532eb273d
MISC metadata.xml 360 RMD160 b7e8ec0449f59c0dd0a7e3810b7c86b260d51530 SHA1 a54074283be9e7d2a113220e92a622b6fb4bfe45 SHA256 6d8c6ea79bfa70bc97b21c3b11454f4e47e31c20442a9ff96230d535562e945c
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iEYEARECAAYFAkwqNc8ACgkQgAnW8HDreRaZwgCcCe68/O1xHGBFCeAYzHDzVmzb
-FhQAoKtq9Bj28eiDC58QdJSgeisHNnTp
-=YBE/
------END PGP SIGNATURE-----
diff --git a/sci-libs/scikits_learn/scikits_learn-0.2.ebuild b/sci-libs/scikits_learn/scikits_learn-0.4.ebuild
index 28dea4bf4..2b1559c4f 100644
--- a/sci-libs/scikits_learn/scikits_learn-0.2.ebuild
+++ b/sci-libs/scikits_learn/scikits_learn-0.4.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI="2"
+EAPI="3"
PYTHON_DEPEND="2"
SUPPORT_PYTHON_ABIS="1"
@@ -14,38 +14,45 @@ MY_P="${P/scikits_/scikits.}"
DESCRIPTION="A set of python modules for machine learning and data mining"
HOMEPAGE="http://sourceforge.net/apps/trac/scikit-learn"
-SRC_URI="mirror://sourceforge/scikit-learn/${MY_P}.tar.gz
- doc? ( http://scikit-learn.sourceforge.net/doc/scikits.learn.pdf )"
+SRC_URI="mirror://sourceforge/scikit-learn/${MY_P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="doc examples test"
-RDEPEND="dev-python/numpy
- sci-libs/scikits_optimization"
-
-DEPEND="${RDEPEND}
+CDEPEND="sci-libs/scipy
+ >=sci-libs/libsvm-2.91"
+RDEPEND="${CDEPEND}
+ dev-python/matplotlib"
+DEPEND="${CDEPEND}
+ dev-python/cython
dev-python/setuptools
- doc? ( dev-python/sphinx )
- test? ( sci-libs/scikits_optimization )"
+ doc? ( dev-python/sphinx dev-python/matplotlib )"
S="${WORKDIR}/${MY_P}"
+src_prepare() {
+ # use stock libsvm
+ cat <<-EOF >> site.cfg
+ [libsvm]
+ libraries=svm
+ library_dirs=${EPREFIX}/usr/$(get_libdir)
+ include_dirs=${EPREFIX}/usr/include/libsvm-2.0/libsvm
+ EOF
+}
+
src_compile() {
distutils_src_compile
if use doc; then
- "$(PYTHON -f)" setup.py build_sphinx || die "Generation of documentation failed"
+ cd "${S}/doc"
+ export VARTEXFONTS="${T}"/fonts
+ MPLCONFIGDIR="${S}/build-$(PYTHON -f --ABI)" \
+ PYTHONPATH=$(ls -d "${S}"/build-$(PYTHON -f --ABI)/lib*) \
+ emake html latex || die
fi
}
-src_test() {
- testing() {
- PYTHONPATH="$(dir -d build-${PYTHON_ABI}/lib*)" "$(PYTHON)" setup.py build -b "build-${PYTHON_ABI}" test
- }
- python_execute_function testing
-}
-
src_install() {
find "${S}" -name \*LICENSE.txt -delete
distutils_src_install