Restricting python-3, removed old

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

4 files changed, 12 insertions, 87 deletions

diff --git a/sci-libs/scikits_learn/ChangeLog b/sci-libs/scikits_learn/ChangeLog
index a7a388c326e7..b64850ecd9b3 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.14 2012/11/30 00:25:42 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scikits_learn/ChangeLog,v 1.15 2012/12/10 18:32:50 bicatali Exp $
+
+  10 Dec 2012; Sébastien Fabbro <bicatali@gentoo.org>
+  -scikits_learn-0.11.ebuild, scikits_learn-0.12.1.ebuild:
+  Restricting python-3, removed old
 
 *scikits_learn-0.12.1 (30 Nov 2012)
 
diff --git a/sci-libs/scikits_learn/Manifest b/sci-libs/scikits_learn/Manifest
index 0e0f6ff7dc2a..f23b59eacfe7 100644
--- a/sci-libs/scikits_learn/Manifest
+++ b/sci-libs/scikits_learn/Manifest
@@ -3,16 +3,14 @@ Hash: SHA256
 
 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
+EBUILD scikits_learn-0.12.1.ebuild 2006 SHA256 9cade9db8f220a7747a1b5be1d50d9ff724114c1686bbaa70c3c12b1d7f05570 SHA512 5f93b62402b1edc0afc0742921f9e96acad9f27a2c167b6c250184fe95d001cc55552244eee008302099c0aeb6232649b970af7910565d509ef584513c04df50 WHIRLPOOL f47def6873ecd2af85d429ca21af4efed56b54454f12c17edbb00a4bbf5128b47823ed499074d86de3debc44a836dd3c40f3fde293f4c9a08f11f9b127a725a7
+MISC ChangeLog 3435 SHA256 22e49fb070898105c76fd63d1c0d0737cae605254e0a9165b70603195a6bb1ed SHA512 e343d88d307eed7605257c96f239adf890048c89f12422a34ac1fbbd202184bf65e8acc93f20510e3db61ba3c4549c043d68d4a4abaeca409744167a94c88589 WHIRLPOOL e75ddbb750fb20226de12289507f5a9070880f5c06ec8a8786ce0ff6c19a15f1fc1302b283dbdbf9469d3fc7131ea53bf45e097ff81e7e4040f2632f371cf9c2
 MISC metadata.xml 360 SHA256 6d8c6ea79bfa70bc97b21c3b11454f4e47e31c20442a9ff96230d535562e945c SHA512 328186381a1b178f863b9fbe0bc9c699fbf5d60ff37363f20be3c0f6d83abff8fd3b56464ca4ae48aaee463e6bee93132ba225389540071e061b792cff2ab5ab WHIRLPOOL b974fa2483272b6fe8f2c716b961260b0b6123aab445cf8ddc91280dc489b370b311c15b2830088aca2c61770ad3f05278df12a711422f90a1f2cc2f4abe4d26
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlC3/QoACgkQ1ycZbhPLE2ByqwCgiwye1qNXVdIWp8Ju7SUo7cKG
-k5gAoIjkfGK1gbQ857Ejz9k6OwXLB8SR
-=2FV+
+iEYEAREIAAYFAlDGKtcACgkQ1ycZbhPLE2BWZACeILLbhnZ8+i19r0r3yZdj0jn5
+aUIAn3u1sUpckwQduW95RloewtLQXtB8
+=6n1n
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/scikits_learn/scikits_learn-0.11.ebuild b/sci-libs/scikits_learn/scikits_learn-0.11.ebuild
deleted file mode 100644
index 864a499f918d..000000000000
--- a/sci-libs/scikits_learn/scikits_learn-0.11.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.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.* 2.7-pypy-*"
-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}"/0.10-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.12.1.ebuild b/sci-libs/scikits_learn/scikits_learn-0.12.1.ebuild
index 0e2c3fac912c..75e1a0f6bf13 100644
--- a/sci-libs/scikits_learn/scikits_learn-0.12.1.ebuild
+++ b/sci-libs/scikits_learn/scikits_learn-0.12.1.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.12.1.ebuild,v 1.1 2012/11/30 00:25:42 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scikits_learn/scikits_learn-0.12.1.ebuild,v 1.2 2012/12/10 18:32:50 bicatali Exp $
 
 EAPI=4
 
 PYTHON_DEPEND="2"
 SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.7-pypy-*"
+RESTRICT_PYTHON_ABIS="3.* 2.7-pypy-*"
 
 inherit distutils multilib flag-o-matic