Clean up a bit. Enable py2.6 as needed by ipython. Disable Python 3 as not supported by scipy.

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Manifest-Sign-Key: 0x42B9401D

3 files changed, 23 insertions, 15 deletions

diff --git a/dev-python/oct2py/ChangeLog b/dev-python/oct2py/ChangeLog
index 1fe9f82e0f59..55c5d0d66e50 100644
--- a/dev-python/oct2py/ChangeLog
+++ b/dev-python/oct2py/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/oct2py
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/oct2py/ChangeLog,v 1.7 2013/01/22 06:55:35 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/oct2py/ChangeLog,v 1.8 2013/02/11 15:57:19 mgorny Exp $
+
+  11 Feb 2013; Michał Górny <mgorny@gentoo.org> oct2py-0.4.0.ebuild:
+  Clean up a bit. Enable py2.6 as needed by ipython. Disable Python 3 as not
+  supported by scipy.
 
 *oct2py-0.4.0 (22 Jan 2013)
 
diff --git a/dev-python/oct2py/Manifest b/dev-python/oct2py/Manifest
index 9ce8c84668e0..3494a122a315 100644
--- a/dev-python/oct2py/Manifest
+++ b/dev-python/oct2py/Manifest
@@ -4,13 +4,15 @@ Hash: SHA256
 DIST oct2py-0.3.6.tar.gz 109852 SHA256 a05b36c8823e539497cadade4680d17f24672ae10c35e901fde1a179cb74a118 SHA512 f417c73f75c02a143af79b54c3a51bdb16c437841dec23667bc5b0256c8347738e75932ae47179d7ca4d3c8b4b5582e27493879de3ab97665d2b3d7bd492abac WHIRLPOOL 441ddb14575c578d9b382521aec56346a976bfaed86641ebe860a46d5d335da0bc6d44b760f02612f1dfa287e9180adfbcb31cfb619b0b26c39eee6216379bac
 DIST oct2py-0.4.0.tar.gz 107828 SHA256 f44da1ff41d8b21806976eaef500f1690c9c023bcd2be9a34d2dbbf26e442f00 SHA512 d62b6c7cc0f3a61e78cd4cd6a43d93a90f5d69187eb946847aa3f1df50edf6402ee845c51094696667afc29c284d6ef6e9af58d74b62ec177c2e4d18108c615e WHIRLPOOL 96da3725d4a53fa74791c219bd03d6adc49f11e47deb0ef864c86acc15f52145e303d4ac669667e79ef90dbb4af4cc7df298f16ebff7d5c20d02710c57c7738b
 EBUILD oct2py-0.3.6.ebuild 1097 SHA256 0124a3c594724ce1bcf7c70c8a7750d2e7cde9a2b4f984a6fa1acbc672968c63 SHA512 5ba28b190ffa27081eab0739f890dde725fc4ac4e4163c2f309ae81b042471bc8b315b2dfeaf482f9d252519c67b71322453fecd46221e80adf14a8c546d1263 WHIRLPOOL 010b2c78fdfe4d59683832066456a3d75e6e2b4f02cc16deb94278f564dc646dbeca9b9a3d625c8a9baad0c72bddcab2d7d3b035cf80c9a2529d99bc64b9e97e
-EBUILD oct2py-0.4.0.ebuild 921 SHA256 37f98fe8c1734d33937710925c945fd6a172b2c68027ddf4ff51912e20c4d393 SHA512 b5387d46263feffbcd35d43c9c39e98f53f60a50f0d357b67059c25bf45bd421462d93cfa06a8cece469ae6507b848282277ffa9ee77eadc8666d0ab4f435a11 WHIRLPOOL 2f5b9e5a77134a2588a5d36fa7477ff32349715d0f97a4794fce13767bbb819e2f950d3063a676e1d0879ed13753f867c030dd0b673a4b40932dd3431a52d90f
-MISC ChangeLog 1019 SHA256 ef115a401786e647a743d22eb83021a347929995154310dc7f8a52499fd91e06 SHA512 35cdccca61350908897ebeb79e8297a895536165a59323ac6a5290f935102fa29c3111309a7f41c558cb4115a3be8c7c30eb6a82fe9c41488c1e686549331bab WHIRLPOOL e4c70c4689079c97ba96168595f7fe2138d664a28e15471d429f214cb43f6305a408780947f3758b7ac1b13589164a4afa46087daf47a2d506ea9f435ea047a6
+EBUILD oct2py-0.4.0.ebuild 1019 SHA256 5ee2a2ea52f24d3f0870cd194e6d944f1e971a7dbcbd8b695de6b0f4c65e57f6 SHA512 71fce1679c688edc8586cbc21a80b53d996e28631d7f90faa3d74cdc5d8eba344e0b0d47ac2bff9b7ffe2acf1ed92f61e773ef8d6020f1488bc7037699f02fd0 WHIRLPOOL b04961be5dcdde60baca391ef2c382adf325daef06b6d0248d3bc3171d73841116fb4a961214a830266a6b946083fc33eb7ec47b5d129a9fb9d97b0dc10e0412
+MISC ChangeLog 1189 SHA256 ded3a4e244967a10bbc170f28531dccbe79617d4aef5749269fcbb9c1859661f SHA512 f642739b01bdafb7a0318ccd5b7ad3b57d8ae8956ef7699821f64c2f3508397f989cbd5bf9e4f1b89587605c836091b4a99d992f6118d28b5a34f229dd38ea50 WHIRLPOOL 24cffb8cebbff9b13bd429bb10665229ff8ba2aa1d381e282126bd09f33802f1fabbcea1650ae31cbd31c30faeccb558becf243949b5f60edbb06187e0202878
 MISC metadata.xml 440 SHA256 1865255300c4ba669559260137cbf0e5c53dce171755cf2b44b800e96b934d9e SHA512 1760616000e26e41e4a3af5c0fce03ed33910f347d61f4d5a53c8e8f7c6788f4395566ea8e7ac7bec4567f386cd0b1ce8a33d6bab448c040471e0520d9a6c4fe WHIRLPOOL ef06c2420784197ac9af3d05722143262484629dd008ed0fbe67bb09b528f08bcfc5cdf4773dcec9e76fd67f01fa1d58ee20a3c20041bde57fa7e3f2fb862364
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlD+N/YACgkQso7CE7gHKw3R+wCgp+cGwbc8xbf0d8tRgbmbHBMi
-VZIAoN0Swqvf3qvesf+NFR3YRVB6koxY
-=tuLu
+iJwEAQEIAAYFAlEZFOkACgkQfXuS5UK5QB1r6QP/THil5HLKv5kC/DhckAXXk0W3
+6HIybRncLVe7jskeVa/EfbrVRb06aDv3h+WfNfR+S28N8x+FQy03t5XyabPycMZK
+lT4aftQUiMDb2hG8HzZ4Wt9aI48tD5OchThNkWlgWbsy+OLVjHvMcZygTaMYx0HI
+ZqLuAZm7+QknHj7IPLw=
+=bHL1
 -----END PGP SIGNATURE-----
diff --git a/dev-python/oct2py/oct2py-0.4.0.ebuild b/dev-python/oct2py/oct2py-0.4.0.ebuild
index d07c637d416d..46393433e142 100644
--- a/dev-python/oct2py/oct2py-0.4.0.ebuild
+++ b/dev-python/oct2py/oct2py-0.4.0.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/dev-python/oct2py/oct2py-0.4.0.ebuild,v 1.1 2013/01/22 06:55:35 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/oct2py/oct2py-0.4.0.ebuild,v 1.2 2013/02/11 15:57:19 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_2} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit distutils-r1
 
@@ -17,10 +17,10 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples"
 
-RDEPEND="sci-libs/scipy
+RDEPEND="sci-libs/scipy[${PYTHON_USEDEP}]
 	sci-mathematics/octave"
 DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx )"
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
 
 python_compile_all() {
 	if use doc; then
@@ -29,14 +29,16 @@ python_compile_all() {
 }
 
 python_test() {
-	nosetests || die
+	nosetests || die "Tests fail with ${EPYTHON}"
 }
 
 python_install_all() {
-	use doc && dohtml -r html/
+	use doc && local HTML_DOCS=( html/. )
+	distutils-r1_python_install_all
+
 	if use examples; then
-		docompress -x /usr/share/doc/${PF}/example
-		insinto /usr/share/doc/${PF}/
-		doins -r example/
+		docompress -x /usr/share/doc/${PF}/examples
+		docinto examples
+		doins -r example/.
 	fi
 }