Restrict pypy

Package-Manager: portage-2.1.10.65/cvs/Linux x86_64

4 files changed, 12 insertions, 87 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/Manifest b/sci-libs/scikits_learn/Manifest
index 1dcdc1b95a55..6e0fdfbaf5d7 100644
--- a/sci-libs/scikits_learn/Manifest
+++ b/sci-libs/scikits_learn/Manifest
@@ -2,16 +2,14 @@
 Hash: SHA1
 
 AUX 0.10-atlas.patch 2524 RMD160 2229ca5e4b2ac26c71481bf216387eae55a64f08 SHA1 c4736cf0ae577010189c71f75e46a2c60bab7e7c SHA256 25f0d89b50c36931ccb52be02676bb2c7f78a0f4f270f01319eea287af132e94
-DIST scikit-learn-0.10.tar.gz 2613175 RMD160 6f09bee8fb3f7f7a6deaae4cb00c7ed5d794a68a SHA1 a26b2616fa23c768ca60fdd50178665d38df5687 SHA256 16ff3ffcd9a0eac7066fc809f03d06c05fea5e2f6d7ea65fb24352700764117b
 DIST scikit-learn-0.11.tar.gz 2891731 RMD160 3d439d1b1abb00e10c0e02d5bce0f0193746af42 SHA1 3878884b6039a24cb1391445c9d8a03930d944dc SHA256 531ab0b08c6be2b2bf70ccb005b39bd3f84c854e40d6f23bf9a365c028868f0d
-EBUILD scikits_learn-0.10-r1.ebuild 1972 RMD160 b5f52c70e63b499fa9532801c3969255bd02e189 SHA1 40366d1ca26f6e9f372d07292b3db6d585c1e33a SHA256 f10c2635c94a165db12a7316f0ec6dadbfd93344ba95a6de51043d2fce9d5f60
-EBUILD scikits_learn-0.11.ebuild 1968 RMD160 e96ebeeb6a8a2a5726deb3f518212fa6a962620f SHA1 6cea9a73d34eb7ea7668c442b69aa91744c798d6 SHA256 11ad102ff675dd9fe50c9ed1f378c430c13c4ff4ac945a8d455f907dd30361ec
-MISC ChangeLog 2985 RMD160 237352b4724b0599af33dfca8dd3b81bb7b90709 SHA1 4a1f24aa115460ae737fb1f46d19663fe8f180f1 SHA256 b675ceb5439aa554ddd9f918f6fe81ab376c44dd30a2041d6d0650b76c5b828c
+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
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk+pakAACgkQ1ycZbhPLE2BbGwCgm/PCa4FWt+MWM5oPCXRTLUWw
-cIEAnAw2Hs/7HlR2We7y7BrM2R3nmM5L
-=Omh7
+iEYEARECAAYFAk/jc0IACgkQ1ycZbhPLE2DjaACfWbGM/D08+vZU9X6sG1aC8Gxq
+CLsAoIofQ3AzZkZ+0dJEAAaBjyRUXCzD
+=ZU1f
 -----END PGP SIGNATURE-----
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