Imported fix for bug #511044 to main tree

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

4 files changed, 61 insertions, 14 deletions

diff --git a/dev-python/oct2py/ChangeLog b/dev-python/oct2py/ChangeLog
index 99f90c27373d..01ab263eefe1 100644
--- a/dev-python/oct2py/ChangeLog
+++ b/dev-python/oct2py/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for dev-python/oct2py
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/oct2py/ChangeLog,v 1.15 2014/02/25 17:24:45 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/oct2py/ChangeLog,v 1.16 2014/05/29 15:42:10 bicatali Exp $
+
+*oct2py-1.3.0-r1 (29 May 2014)
+
+  29 May 2014; Sébastien Fabbro <bicatali@gentoo.org> -oct2py-1.0.0.ebuild,
+  +oct2py-1.3.0-r1.ebuild, +files/oct2py-1.3.0-test.patch:
+  Imported to main tree
+
+*oct2py-1.3.0-r1 (28 May 2014)
+
+  28 May 2014; cel <cel.gentoo@gmail.com> +files/oct2py-1.3.0-test.patch,
+  +metadata.xml, +oct2py-1.3.0-r1.ebuild:
+  updated oct2py ebuild to provide a working test suite.
 
   25 Feb 2014; Sébastien Fabbro <bicatali@gentoo.org> oct2py-1.3.0.ebuild:
   Fixed documentation building, bug #502310
diff --git a/dev-python/oct2py/Manifest b/dev-python/oct2py/Manifest
index 441566024bf1..b381dbba3d46 100644
--- a/dev-python/oct2py/Manifest
+++ b/dev-python/oct2py/Manifest
@@ -1,18 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX oct2py-1.3.0-test.patch 804 SHA256 71a38f33d781276b2a3588b1abe245157e13360ffe04964a10520be5d9e86197 SHA512 ac5b59a6810d4249748e70829aa01cfa298d5c8befa1a11d60bbeb90af0cdec60cd7dff75db83d282667a9593fb12f732a3568454eb9633b754f54cf47d1cddf WHIRLPOOL 3b7b619d45f2e011ea8601d7af2b3db2cc0dcd8d5e7db883ddb59764481adaa398f5807fcfb720186197d8b9ddbbe82eb3f0a3cbf8f6225085e137c0e51f4d3e
 DIST oct2py-0.4.0.tar.gz 107828 SHA256 f44da1ff41d8b21806976eaef500f1690c9c023bcd2be9a34d2dbbf26e442f00 SHA512 d62b6c7cc0f3a61e78cd4cd6a43d93a90f5d69187eb946847aa3f1df50edf6402ee845c51094696667afc29c284d6ef6e9af58d74b62ec177c2e4d18108c615e WHIRLPOOL 96da3725d4a53fa74791c219bd03d6adc49f11e47deb0ef864c86acc15f52145e303d4ac669667e79ef90dbb4af4cc7df298f16ebff7d5c20d02710c57c7738b
-DIST oct2py-1.0.0.tar.gz 111845 SHA256 753cdda9b20551c09a53bfa5d2bcb0eab7d7c55a7f2f76d008fd0a7e7cca4c04 SHA512 7646cf336095721ba8e95a23bb3b503139d8373b9d97cd12fc8cb412791ce2b17bd7ca3412c1c2319a4e1c6d17db1eeb76227bc4510b2dff2dab4a2c617c180e WHIRLPOOL ea51c05e9c30d89c5d1bdd8a672db71a0c8088651101584a14b58a54538917fa8a03ee552f378f8ddab17f83985215c73082b0563c64cddb02ed798ac6b6e32a
 DIST oct2py-1.3.0.tar.gz 321768 SHA256 f0cae7aae111631c0fffb7f2511ee14fb847b4f501340e8506b0805b50c32f28 SHA512 b9a8896fa463356a08dee7cd2db97bedd5487d93ed33fe73e2c5205118915eac86dcd51dea42dc7338a7f6486704d1c8cb3259c3d8a2b53230c50608d1d043d8 WHIRLPOOL f06214e8005281fec801856596f076a5ad0c35bc3bdc62db3057b320ac1ef8ab07a7f073c4e9ced62ce336c64e773128d333fd0bb26fb891ea6931b84ee22001
 EBUILD oct2py-0.4.0-r1.ebuild 1030 SHA256 eecf096190c0e24a5aa8445eb9a3f3fbf0f0f075c8f2fe14205825f7ea4bbca8 SHA512 a3aed791148bad607732b2abbaabf1946ac72bdf5226226632a88f09103ebf2cf1176fd9ee9ebe6979030c86275a24384298c2c582a5dc6c4f10a5d6eef3f9e9 WHIRLPOOL d86413a0849b9595f7f827a8b990b6ef7b016cab81275e4b7942ec494a61dc5788d9ed0bc658e1010f36b5bc166634cbc755520263c6457d988a40dcb90840a7
-EBUILD oct2py-1.0.0.ebuild 1176 SHA256 86f2a83fec56562b077be529c6bd51f18376d0ee358a000f8547378694a46d0d SHA512 54a82dc07d3e989f3a5c9c44fde11324b283b619a82278660066879ab39b4940f73090a6ccfdbfa94fccd98d751559293731b9f07c9c33b14714db08995d6357 WHIRLPOOL ce23d9f65ead3bcfb29da98bbf0c3861f5471c9660fd82318bb9a3dd7b1777f687ea096a5971e981a40b3aa4b6317b590bcd09850f8e25ccef654e76dd6d2edb
+EBUILD oct2py-1.3.0-r1.ebuild 1407 SHA256 6fce19ac3c840b6b4b6c4c28bfd472722b0444897c093ee4fed770d201ccaacd SHA512 3193ce227ceb8e7ea093b22d07e0bddf4a5d768b30a51e701987d86b0ea4ae6eb2e69460b22250531a951eb3ff8a05cbc8e6d7fb7defc8a4700fd63e26fc8964 WHIRLPOOL 99d066c3e75d5722c2d69456ea4a8c6349e932686b7d2473c63e847d78286c99b1d78f273281c452d9c41020880a95c2d44d9cbb3c529a7250afe138c51143ac
 EBUILD oct2py-1.3.0.ebuild 1206 SHA256 3ad7e7c986e0c4b411f9d0acc2197e3fa0e901552048cc34db5c4cece9c6552c SHA512 2435e4a4961e98b954886f3071bf9be9bd2922101fda1ffe655464c9cd1087dae91208c082cb5b73315fca8cd9a07f7264da029239c5498a13a31230ceae832e WHIRLPOOL 8b0d94294bbfdba0278b13be27a4fbf279e07c4ecce68c399446490ef1c53d28c6845797f15323a41ba1ce138646d05210b12089279c7a27571b60301c65f0d2
-MISC ChangeLog 2088 SHA256 83710a3b7b48f92e1b2c1ba3734d8c6d245939dcf92d6c0e205a365d257b78bb SHA512 b879f5c1aecdf8a296466c3d51ff09c98825e836494ab937e4b0ce6a61b4ed663c4abfb7b29e26a24cbd01a6720e779f41269e125d0a102e616b936c9051b243 WHIRLPOOL b790a65b146a9a1f43a6066e6fea5ce01b376e399f27a6817218456ba60d0c1755255d45bfcfd87fd73a1fa9bc7b267090fe8cf7e3f0c7ce98abcba5658e807d
+MISC ChangeLog 2487 SHA256 072a691280bd8c0b709c319008a712e80f6db536de30d763c6786939214af043 SHA512 520016711ae9c7a5528bf05d95c6fdd5945ac228bedc1de14fd4706ad167d11b69b5e1a898dd50c82d1212a41a571e8c73d776522de1946129e521fe990cb551 WHIRLPOOL 8b52c492d4567a3a5c2439f4042a4105f94b84bea5158d3bebe5eba1e9a02a24e1ae42c6d8090dd57328a8a233eaf1251f7cfdeb8cc77be3b02656081f407e73
 MISC metadata.xml 440 SHA256 1865255300c4ba669559260137cbf0e5c53dce171755cf2b44b800e96b934d9e SHA512 1760616000e26e41e4a3af5c0fce03ed33910f347d61f4d5a53c8e8f7c6788f4395566ea8e7ac7bec4567f386cd0b1ce8a33d6bab448c040471e0520d9a6c4fe WHIRLPOOL ef06c2420784197ac9af3d05722143262484629dd008ed0fbe67bb09b528f08bcfc5cdf4773dcec9e76fd67f01fa1d58ee20a3c20041bde57fa7e3f2fb862364
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlMM0d4ACgkQ1ycZbhPLE2CAwACffrEC4RLsGUdts0k6NTxKnMrB
-5moAnjRmh33REqyuGHwT2Z3i3Qy/jpGw
-=3oD6
+iEYEAREIAAYFAlOHVVYACgkQ1ycZbhPLE2B2MwCePzTd2azl+yDjFaBkVqrwgxNh
+XtAAn0rkzyxO/PfQf6aRTfFEPw6YBkZi
+=74Zd
 -----END PGP SIGNATURE-----
diff --git a/dev-python/oct2py/files/oct2py-1.3.0-test.patch b/dev-python/oct2py/files/oct2py-1.3.0-test.patch
new file mode 100644
index 000000000000..9bc22e091918
--- /dev/null
+++ b/dev-python/oct2py/files/oct2py-1.3.0-test.patch
@@ -0,0 +1,21 @@
+diff --git a/oct2py/ipython/tests/test_octavemagic.py b/oct2py/ipython/tests/test_octavemagic.py
+index b75d992..43c0a8b 100644
+--- a/oct2py/ipython/tests/test_octavemagic.py
++++ b/oct2py/ipython/tests/test_octavemagic.py
+@@ -1,5 +1,6 @@
+ """Tests for Octave magics extension."""
+ 
++import codecs
+ import unittest
+ import sys
+ from IPython.testing.globalipapp import get_ipython
+@@ -22,7 +23,8 @@ class OctaveMagicTest(unittest.TestCase):
+         IPython team's logic.
+         '''
+         if not sys.stdin.encoding:
+-            sys.stdin.encoding = 'utf-8'  # needed for py.test
++            # needed for py.test
++            sys.stdin = codecs.getreader('utf-8')(sys.stdin)
+         cls.ip = get_ipython()
+         # This is just to get a minimally modified version of the changes
+         # working
diff --git a/dev-python/oct2py/oct2py-1.0.0.ebuild b/dev-python/oct2py/oct2py-1.3.0-r1.ebuild
index dd54af67fc42..30da90cc21dd 100644
--- a/dev-python/oct2py/oct2py-1.0.0.ebuild
+++ b/dev-python/oct2py/oct2py-1.3.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/oct2py/oct2py-1.0.0.ebuild,v 1.1 2013/10/20 18:24:00 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/oct2py/oct2py-1.3.0-r1.ebuild,v 1.1 2014/05/29 15:42:10 bicatali Exp $
 
 EAPI=5
 
@@ -21,20 +21,34 @@ RDEPEND="
 	sci-libs/scipy[${PYTHON_USEDEP}]
 	sci-mathematics/octave"
 DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	doc? (
+		dev-python/sphinx-bootstrap-theme
+		dev-python/numpydoc
+	)
 	test? (
 		dev-python/nose[${PYTHON_USEDEP}]
 		dev-python/ipython[${PYTHON_USEDEP}]
-		)"
+	)"
+
+python_prepare_all() {
+	local PATCHES=(
+		"${FILESDIR}/${P}-test.patch"
+	)
+	distutils-r1_python_prepare_all
+}
 
 python_compile_all() {
 	if use doc; then
-		sphinx-build doc html || die
+		sphinx-build docs html || die
 	fi
 }
 
 python_test() {
-	nosetests oct2py --with-doctest || die "Tests fail with ${EPYTHON}"
+	unset DISPLAY
+	if [[ ${EPYTHON} == python2* ]]; then
+		local OPTIONS="--with-doctest"
+	fi
+	nosetests oct2py ${OPTIONS} || die "Tests fail with ${EPYTHON}"
 	iptest -v IPython.extensions.tests.test_octavemagic || die "Tests fail with ${EPYTHON}"
 }
 
@@ -43,7 +57,7 @@ python_install_all() {
 	distutils-r1_python_install_all
 
 	if use examples; then
-		insinto /usr/share/${PF}/
+		insinto /usr/share/doc/${PF}
 		doins -r example
 	fi
 }