3 files changed, 7 insertions, 80 deletions
diff --git a/sci-libs/scikits_learn/ChangeLog b/sci-libs/scikits_learn/ChangeLog
index 0594393d7180..3a0aa4d8183d 100644
--- a/sci-libs/scikits_learn/ChangeLog
+++ b/sci-libs/scikits_learn/ChangeLog
@@ -1,6 +1,10 @@
 # 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.12 2012/05/08 18:47:20 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scikits_learn/ChangeLog,v 1.13 2012/06/21 19:17:13 bicatali Exp $
+
+  21 Jun 2012; Sébastien Fabbro <bicatali@gentoo.org>
+  -scikits_learn-0.10-r1.ebuild, scikits_learn-0.11.ebuild:
+  Restrict pypy
 
 *scikits_learn-0.11 (08 May 2012)
 
diff --git a/sci-libs/scikits_learn/scikits_learn-0.10-r1.ebuild b/sci-libs/scikits_learn/scikits_learn-0.10-r1.ebuild
deleted file mode 100644
index d54d3ce63cf8..000000000000
--- a/sci-libs/scikits_learn/scikits_learn-0.10-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# 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.10-r1.ebuild,v 1.1 2012/04/23 19:49:14 bicatali Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-DISTUTILS_SRC_TEST="setup.py"
-
-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"
-
-CDEPEND="sci-libs/scipy
-	>=sci-libs/libsvm-2.91"
-RDEPEND="${CDEPEND}
-	sci-libs/scikits
-	dev-python/matplotlib"
-DEPEND="${CDEPEND}
-	dev-python/cython
-	dev-python/setuptools
-	doc? ( dev-python/sphinx dev-python/matplotlib )"
-
-S="${WORKDIR}/${MYPN}-${PV}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PV}-atlas.patch
-	# use stock libsvm
-	cat <<-EOF >> site.cfg
-		[libsvm]
-		libraries=svm
-		library_dirs=${EPREFIX}/usr/$(get_libdir)
-		include_dirs=${EPREFIX}/usr/include/
-	EOF
-	# bug #397605
-	[[ ${CHOST} == *-darwin* ]] \
-		&& append-ldflags -bundle "-undefined dynamic_lookup" \
-		|| append-ldflags -shared
-}
-
-src_compile() {
-	distutils_src_compile
-	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_install() {
-	find "${S}" -name \*LICENSE.txt -delete
-	distutils_src_install
-	remove_scikits() {
-		rm -f "${ED}"$(python_get_sitedir)/scikits/__init__.py || die
-	}
-	python_execute_function -q remove_scikits
-	insinto /usr/share/doc/${PF}
-	use doc && dohtml -r doc/_build/html
-	use examples && doins -r examples
-}
diff --git a/sci-libs/scikits_learn/scikits_learn-0.11.ebuild b/sci-libs/scikits_learn/scikits_learn-0.11.ebuild
index 0159594eb545..864a499f918d 100644
--- a/sci-libs/scikits_learn/scikits_learn-0.11.ebuild
+++ b/sci-libs/scikits_learn/scikits_learn-0.11.ebuild
@@ -1,12 +1,12 @@
 # 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.11.ebuild,v 1.1 2012/05/08 18:47:20 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scikits_learn/scikits_learn-0.11.ebuild,v 1.2 2012/06/21 19:17:13 bicatali Exp $
 
 EAPI=4
 
 PYTHON_DEPEND="2"
 SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
+RESTRICT_PYTHON_ABIS="3.* 2.7-pypy-*"
 DISTUTILS_SRC_TEST="setup.py"
 
 inherit distutils multilib flag-o-matic