| 1 |
floppym 12/08/24 20:46:25 |
| 2 |
|
| 3 |
Modified: docutils-0.9.1.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Fix tests when run with python 3. Bug 432546. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha122/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.4 dev-python/docutils/docutils-0.9.1.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/docutils/docutils-0.9.1.ebuild?rev=1.4&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/docutils/docutils-0.9.1.ebuild?rev=1.4&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/docutils/docutils-0.9.1.ebuild?r1=1.3&r2=1.4 |
| 15 |
|
| 16 |
Index: docutils-0.9.1.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/docutils/docutils-0.9.1.ebuild,v |
| 19 |
retrieving revision 1.3 |
| 20 |
retrieving revision 1.4 |
| 21 |
diff -u -r1.3 -r1.4 |
| 22 |
--- docutils-0.9.1.ebuild 24 Aug 2012 18:35:06 -0000 1.3 |
| 23 |
+++ docutils-0.9.1.ebuild 24 Aug 2012 20:46:24 -0000 1.4 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2012 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/docutils-0.9.1.ebuild,v 1.3 2012/08/24 18:35:06 floppym Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/docutils-0.9.1.ebuild,v 1.4 2012/08/24 20:46:24 floppym Exp $ |
| 29 |
|
| 30 |
EAPI="4" |
| 31 |
SUPPORT_PYTHON_ABIS="1" |
| 32 |
@@ -46,8 +46,14 @@ |
| 33 |
|
| 34 |
src_test() { |
| 35 |
testing() { |
| 36 |
- echo PYTHONPATH="build-${PYTHON_ABI}/lib" "$(PYTHON)" $([[ -f build-${PYTHON_ABI}/lib/test/alltests.py ]] && echo build-${PYTHON_ABI}/lib/test/alltests.py || echo test/alltests.py) |
| 37 |
- PYTHONPATH="build-${PYTHON_ABI}/lib" "$(PYTHON)" $([[ -f build-${PYTHON_ABI}/lib/test/alltests.py ]] && echo build-${PYTHON_ABI}/lib/test/alltests.py || echo test/alltests.py) |
| 38 |
+ local testfile |
| 39 |
+ if [[ $(python_get_version --language --major) == 3 ]]; then |
| 40 |
+ testfile=test3/alltests.py |
| 41 |
+ else |
| 42 |
+ testfile=test/alltests.py |
| 43 |
+ fi |
| 44 |
+ echo PYTHONPATH="build-${PYTHON_ABI}/lib" "$(PYTHON)" "${testfile}" |
| 45 |
+ PYTHONPATH="build-${PYTHON_ABI}/lib" "$(PYTHON)" "${testfile}" |
| 46 |
} |
| 47 |
python_execute_function testing |
| 48 |
} |
| 49 |
|
| 50 |
|
| 51 |
|
| 52 |
1.157 dev-python/docutils/ChangeLog |
| 53 |
|
| 54 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/docutils/ChangeLog?rev=1.157&view=markup |
| 55 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/docutils/ChangeLog?rev=1.157&content-type=text/plain |
| 56 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/docutils/ChangeLog?r1=1.156&r2=1.157 |
| 57 |
|
| 58 |
Index: ChangeLog |
| 59 |
=================================================================== |
| 60 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/docutils/ChangeLog,v |
| 61 |
retrieving revision 1.156 |
| 62 |
retrieving revision 1.157 |
| 63 |
diff -u -r1.156 -r1.157 |
| 64 |
--- ChangeLog 24 Aug 2012 18:35:06 -0000 1.156 |
| 65 |
+++ ChangeLog 24 Aug 2012 20:46:24 -0000 1.157 |
| 66 |
@@ -1,6 +1,9 @@ |
| 67 |
# ChangeLog for dev-python/docutils |
| 68 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 69 |
-# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/ChangeLog,v 1.156 2012/08/24 18:35:06 floppym Exp $ |
| 70 |
+# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/ChangeLog,v 1.157 2012/08/24 20:46:24 floppym Exp $ |
| 71 |
+ |
| 72 |
+ 24 Aug 2012; Mike Gilbert <floppym@g.o> docutils-0.9.1.ebuild: |
| 73 |
+ Fix tests when run with python 3. Bug 432546. |
| 74 |
|
| 75 |
24 Aug 2012; Mike Gilbert <floppym@g.o> docutils-0.9.1.ebuild: |
| 76 |
Call die if pkg_preinst is not removed on the next bump. |
Archives