sci-libs/scikits_learn: Drop broken python Abis; enhance test phase

Package-Manager: portage-2.2.6/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

5 files changed, 52 insertions, 31 deletions

diff --git a/sci-libs/scikits_learn/ChangeLog b/sci-libs/scikits_learn/ChangeLog
index c080db369924..cbf5bc4b6e97 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-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/scikits_learn/ChangeLog,v 1.23 2013/08/08 21:35:41 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scikits_learn/ChangeLog,v 1.24 2013/09/18 10:55:51 jlec Exp $
+
+  18 Sep 2013; Justin Lecher <jlec@gentoo.org> scikits_learn-0.13.1.ebuild,
+  scikits_learn-0.14.1.ebuild, metadata.xml:
+  Drop broken python Abis; enhance test phase
 
   08 Aug 2013; Sébastien Fabbro <bicatali@gentoo.org>
   scikits_learn-0.14.1.ebuild:
diff --git a/sci-libs/scikits_learn/Manifest b/sci-libs/scikits_learn/Manifest
index 921bb146c16b..a3dc21105d9c 100644
--- a/sci-libs/scikits_learn/Manifest
+++ b/sci-libs/scikits_learn/Manifest
@@ -1,17 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+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
-EBUILD scikits_learn-0.13.1.ebuild 2218 SHA256 be991c8aa66750d71f8de058e0acaae582d837d4a0b481abcb2fa86cc6e2856e SHA512 a4b12ccf22533152c86238f06ce690405e7c785883fba7e1c203ed5450fa3ebaa746ad5a69f405d8e775860e532e0c380a475f0d0005f9a2a8a8ca93f3a87033 WHIRLPOOL dd9a788b6ae61e29ecfe366ffa6103846c4d6d07d5632201d3b8ab45ebd2eb0faa777c91e86a9acb175237c6b9ee8a0ca5a649565ff8b059491549b839c7de29
-EBUILD scikits_learn-0.14.1.ebuild 2949 SHA256 262f71c8c55435eea928c298849acdea0f9ad542a78afb51f65c720be4955c7e SHA512 113dfccd8391fbb499daf7a5c57c5efd8717c662b0ce7bc52699a46807ce70ab16dbe1c9ab19f4647f4da4fc8e374344c701d39738b4807265520e084156e1dc WHIRLPOOL 2ac824a26420d6968ce493886e6682dc5fef5dde9e6096bc313399a2e6b406db7eee5601e0914011a578638e20620751c30541b13d3a18a20f2052593db5f462
-MISC ChangeLog 4866 SHA256 d8259b65701ee6eb24158cc8efaa038cec326c796e2927a1b56acfc15e851d02 SHA512 342395e929fada46da32b9bd0fd8a5bb8098a1cb3da2e228369ab318845b7524048af721451d5665c462e82a6105047d44cc5dc1edee9ea168421bb96d678599 WHIRLPOOL e43a777e49ee8f134a180b87444d3a97434045ad6b3c5b99540ee29a29cbdfd6b501dbb46a8c6240351c98119e931a4415e0c7eb33cdb60837667bc785892c2d
-MISC metadata.xml 433 SHA256 af5e810788b4d38b99c4429e04eb2177133e9fe1258133a0528dc0ad3f02dd45 SHA512 f7e2daaa7f35b698a34409f072532c01b2a3c9d8ec00a504a0cc3ed4c35d2bd76b1775265ec2adbb31dc80d82022fabf49905dff798e3af9537621644dc44c2c WHIRLPOOL ed4bb1fdf942a1a31d874585fe0a3752875ae38fb7c4bca25845851f7316d5374f73f82f751589edf6a992e2ffd7a98e8fbd4e83297a36a7cb2d4427d3ed4cba
+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
+MISC ChangeLog 5030 SHA256 ad86ebc4439cc0b4c63e87e37c094999a15ec5cd76d3fc153bb635c21c0cdf32 SHA512 92ed611b0d07273855d28a13a596dfc25b7d18e2209708a39f7bc18221165810b66a5be7598b43b78d21132749b955875c3ee364bd6e90f5d6a8f04d7bd8d5f9 WHIRLPOOL 9d2b88b6b41dd363c9c95c14a391ff2d12f119d83d7e76550f171b6456284c109c020d64cdcbf447f77ad1718af79af5aebcea946d5b9625b6a6ec2a44f320f7
+MISC metadata.xml 443 SHA256 03debe78c824fb81c25113a8382fd7b457061eb40a5213a51d13fd6a71668390 SHA512 15e9d16b480e8d1c0339d48908895ddcf426c9e35cb4dad37ceadc62b84969b616a07e317a5943436f84e54f64877f6e2a7197562b9bd84ea90a300ef295f0da WHIRLPOOL 4b77712b446885eaa8643720c9b9a350d0724054083883119163dd4ab94e9586cf895d16b2cf27ea63b8d4bc1ca1ef2d68608372087db6a5526b6dd68a30cf4d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.21 (GNU/Linux)
 
-iEYEAREIAAYFAlIED2UACgkQ1ycZbhPLE2A4VgCgn2Q57GJFxPfTCFHV+TKKYFmC
-YZUAnRTJBAq9erqUGfWdTxAvR5uxcofk
-=8WsD
+iQIcBAEBCgAGBQJSOYa4AAoJELnU8jG9FVirYY0P+wdK+x2NdsxdghZrX24JYJ5l
+Lh9D5QTXIEIp1TTM9gKtskmRNgVAvGA/iSNOdnZJGWiMrn+zHTnTpkuNVJy+BEBu
+ONXDhFEqlTU64jY0nQEJZZAlD3zGciOl0VNkzsQgTxpSO2/XtVxaBhlu9g7cSUtp
+qkSPv16oa5WMOJt1fOlSfjMkwhsW3fzmP832J9qjs4ZdcMri7oMQi/1xv0kN6JcC
+OFYHKJSH9twiKxksbFTzVAk20QZrAwaIHIGbOkQIub1+kKzpIedOWMKmNXiTZ+1J
+UGfPS4k2Td+gVMJO1byfOSBZRMBe0AaH5t3eh2MbTRcj1P9ML4APJoBYxeMNKTcQ
+X6bgkhAKS9eecJWltd4suE3cd/p96M+m4Qd8BYENbPE75O3mAeVwvlg8+V/IABGN
+ekvi+se/ebAxQhnSTLKL4eGE9GMdiauC7kqke+WI/GFR2i3TTWQyYIC2VMDiIths
+yszmKtlijY3LO0/HJiuSQcEN8BMHnTm4/kZPLEEtBUhfSHowBI+OWcjngRgy3ife
+kWrM1m2d4Zera9IBwM0T7LEu4MEG3ZNx09coICgTBxiVWbeXvt0NqrONjfFIcYZB
+tdzMzsixGq0WmeenLE+Jb7sJcQJd826vRbpfaO9unOu3k4BJTm6lFTTelthsBOXy
+yAp93RO5PSPcqR5e3rKe
+=9Q6G
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/scikits_learn/metadata.xml b/sci-libs/scikits_learn/metadata.xml
index 64fe2c7def04..7b42750bd926 100644
--- a/sci-libs/scikits_learn/metadata.xml
+++ b/sci-libs/scikits_learn/metadata.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
-<longdescription lang="en">
+  <herd>sci</herd>
+  <longdescription lang="en">
   scikits.learn is a python library for machine learning. It aims to
   implement classic machine learning algorithms while remaining simple
   and efficient.
 </longdescription>
-<upstream>
-  <remote-id type="pypi">scikit-learn</remote-id>
-</upstream>
+  <upstream>
+    <remote-id type="pypi">scikit-learn</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sci-libs/scikits_learn/scikits_learn-0.13.1.ebuild b/sci-libs/scikits_learn/scikits_learn-0.13.1.ebuild
index 23df0caf1abf..60ea92e13aad 100644
--- a/sci-libs/scikits_learn/scikits_learn-0.13.1.ebuild
+++ b/sci-libs/scikits_learn/scikits_learn-0.13.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 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.13.1.ebuild,v 1.3 2013/05/15 07:08:18 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scikits_learn/scikits_learn-0.13.1.ebuild,v 1.4 2013/09/18 10:55:51 jlec Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 DISTUTILS_NO_PARALLEL_BUILD=true
 
 inherit distutils-r1 multilib flag-o-matic
@@ -42,6 +42,7 @@ python_prepare_all() {
 
 	# scikits-learn now uses the horrible numpy.distutils automagic
 	export SCIPY_FCONFIG="config_fc --noopt --noarch"
+	distutils-r1_python_prepare_all
 }
 
 python_compile() {
@@ -67,9 +68,10 @@ python_test() {
 	use doc && return
 	esetup.py \
 		install --root="${T}/test-${EPYTHON}" \
-		--no-compile ${SCIPY_FCONFIG} || die
-	cd "${T}/test-${EPYTHON}/$(python_get_sitedir)" || die
-	PYTHONPATH=. nosetests-${EPYTHON} sklearn --exe || die
+		--no-compile ${SCIPY_FCONFIG}
+	pushd "${T}/test-${EPYTHON}/$(python_get_sitedir)" || die > /dev/null
+	nosetests -v sklearn --exe || die
+	popd > /dev/null
 }
 
 python_install() {
@@ -78,8 +80,10 @@ python_install() {
 
 python_install_all() {
 	find "${S}" -name \*LICENSE.txt -delete
+	use doc && HTML_DOCS=( doc/_build/html/. )
 	distutils-r1_python_install_all
-	insinto /usr/share/doc/${PF}
-	use doc && dohtml -r doc/_build/html
-	use examples && doins -r examples
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
 }
diff --git a/sci-libs/scikits_learn/scikits_learn-0.14.1.ebuild b/sci-libs/scikits_learn/scikits_learn-0.14.1.ebuild
index d486056b82d3..f4c453ce4e64 100644
--- a/sci-libs/scikits_learn/scikits_learn-0.14.1.ebuild
+++ b/sci-libs/scikits_learn/scikits_learn-0.14.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 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.14.1.ebuild,v 1.2 2013/08/08 21:35:41 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scikits_learn/scikits_learn-0.14.1.ebuild,v 1.3 2013/09/18 10:55:51 jlec Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_3} )
 DISTUTILS_NO_PARALLEL_BUILD=true
 
 inherit distutils-r1 eutils multilib flag-o-matic
@@ -88,9 +88,10 @@ python_test() {
 	distutils_install_for_testing ${SCIPY_FCONFIG}
 	esetup.py \
 		install --root="${T}/test-${EPYTHON}" \
-		--no-compile ${SCIPY_FCONFIG} || die
-	cd "${T}/test-${EPYTHON}/$(python_get_sitedir)" || die
-	PYTHONPATH=. nosetests-${EPYTHON} -v sklearn --exe || die
+		--no-compile ${SCIPY_FCONFIG}
+	pushd "${T}/test-${EPYTHON}/$(python_get_sitedir)" || die > /dev/null
+	nosetests -v sklearn --exe || die
+	popd > /dev/null
 }
 
 python_install() {
@@ -99,8 +100,10 @@ python_install() {
 
 python_install_all() {
 	find "${S}" -name \*LICENSE.txt -delete
+	use doc && HTML_DOCS=( doc/_build/html/. )
 	distutils-r1_python_install_all
-	insinto /usr/share/doc/${PF}
-	use doc && dohtml -r doc/_build/html/*
-	use examples && doins -r examples
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
 }