| 1 |
idella4 12/11/29 10:53:21 |
| 2 |
|
| 3 |
Modified: enable-4.1.0.ebuild enable-4.2.0.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Fixes to test suites in 4.1,2.0, special patch saved to devspace to make workable mix of correct and wrong import paths, skirt 1 invalid test, set 2 tests to xfail, fixes Bug #422945 |
| 6 |
|
| 7 |
(Portage version: 2.1.11.30/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.4 dev-python/enable/enable-4.1.0.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/enable/enable-4.1.0.ebuild?rev=1.4&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/enable/enable-4.1.0.ebuild?rev=1.4&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/enable/enable-4.1.0.ebuild?r1=1.3&r2=1.4 |
| 15 |
|
| 16 |
Index: enable-4.1.0.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/enable/enable-4.1.0.ebuild,v |
| 19 |
retrieving revision 1.3 |
| 20 |
retrieving revision 1.4 |
| 21 |
diff -u -r1.3 -r1.4 |
| 22 |
--- enable-4.1.0.ebuild 7 Aug 2012 04:03:10 -0000 1.3 |
| 23 |
+++ enable-4.1.0.ebuild 29 Nov 2012 10:53:21 -0000 1.4 |
| 24 |
@@ -1,18 +1,20 @@ |
| 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/enable/enable-4.1.0.ebuild,v 1.3 2012/08/07 04:03:10 patrick Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/dev-python/enable/enable-4.1.0.ebuild,v 1.4 2012/11/29 10:53:21 idella4 Exp $ |
| 29 |
|
| 30 |
EAPI=4 |
| 31 |
- |
| 32 |
+PYTHON_DEPEND="2:2.6" |
| 33 |
SUPPORT_PYTHON_ABIS="1" |
| 34 |
-RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-* 2.5" |
| 35 |
+RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*" |
| 36 |
+PYTHON_TESTS_RESTRICTED_ABIS="2.6" |
| 37 |
DISTUTILS_SRC_TEST="nosetests" |
| 38 |
|
| 39 |
inherit distutils eutils virtualx |
| 40 |
|
| 41 |
DESCRIPTION="Enthought Tool Suite: Drawing and interaction packages" |
| 42 |
HOMEPAGE="http://code.enthought.com/projects/enable/ http://pypi.python.org/pypi/enable" |
| 43 |
-SRC_URI="http://www.enthought.com/repo/ets/${P}.tar.gz" |
| 44 |
+SRC_URI="http://www.enthought.com/repo/ets/${P}.tar.gz |
| 45 |
+ http://dev.gentoo.org/~idella4/${PN}-4-TestsPaths.patch" |
| 46 |
|
| 47 |
LICENSE="BSD" |
| 48 |
SLOT="0" |
| 49 |
@@ -37,13 +39,23 @@ |
| 50 |
|
| 51 |
DOCS="docs/*.txt" |
| 52 |
|
| 53 |
+src_prepare() { |
| 54 |
+ distutils_src_prepare |
| 55 |
+ |
| 56 |
+ # Remove check for Darwin systems, set py.test style xfails, |
| 57 |
+ # Re-set import paths in tests, 'enabling' enable to find its own in source modules!!?! |
| 58 |
+ epatch "${DISTDIR}"/${PN}-4-TestsPaths.patch \ |
| 59 |
+ "${FILESDIR}"/${PN}-4-rogue-tests.patch |
| 60 |
+} |
| 61 |
+ |
| 62 |
src_compile() { |
| 63 |
distutils_src_compile |
| 64 |
use doc && emake -C docs html |
| 65 |
} |
| 66 |
|
| 67 |
src_test() { |
| 68 |
- VIRTUALX_COMMAND="distutils_src_test" virtualmake |
| 69 |
+ # Hardcoding build-2.7, 2.7 being the only fully capable candidate |
| 70 |
+ VIRTUALX_COMMAND="python_execute_nosetests -P $(ls -d build-2.7/lib.linux-*/):." virtualmake |
| 71 |
} |
| 72 |
|
| 73 |
src_install() { |
| 74 |
|
| 75 |
|
| 76 |
|
| 77 |
1.2 dev-python/enable/enable-4.2.0.ebuild |
| 78 |
|
| 79 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/enable/enable-4.2.0.ebuild?rev=1.2&view=markup |
| 80 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/enable/enable-4.2.0.ebuild?rev=1.2&content-type=text/plain |
| 81 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/enable/enable-4.2.0.ebuild?r1=1.1&r2=1.2 |
| 82 |
|
| 83 |
Index: enable-4.2.0.ebuild |
| 84 |
=================================================================== |
| 85 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/enable/enable-4.2.0.ebuild,v |
| 86 |
retrieving revision 1.1 |
| 87 |
retrieving revision 1.2 |
| 88 |
diff -u -r1.1 -r1.2 |
| 89 |
--- enable-4.2.0.ebuild 9 Oct 2012 09:22:56 -0000 1.1 |
| 90 |
+++ enable-4.2.0.ebuild 29 Nov 2012 10:53:21 -0000 1.2 |
| 91 |
@@ -1,18 +1,20 @@ |
| 92 |
# Copyright 1999-2012 Gentoo Foundation |
| 93 |
# Distributed under the terms of the GNU General Public License v2 |
| 94 |
-# $Header: /var/cvsroot/gentoo-x86/dev-python/enable/enable-4.2.0.ebuild,v 1.1 2012/10/09 09:22:56 patrick Exp $ |
| 95 |
+# $Header: /var/cvsroot/gentoo-x86/dev-python/enable/enable-4.2.0.ebuild,v 1.2 2012/11/29 10:53:21 idella4 Exp $ |
| 96 |
|
| 97 |
EAPI=4 |
| 98 |
- |
| 99 |
+PYTHON_DEPEND="2:2.6" |
| 100 |
SUPPORT_PYTHON_ABIS="1" |
| 101 |
-RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-* 2.5" |
| 102 |
+RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*" |
| 103 |
+PYTHON_TESTS_RESTRICTED_ABIS="2.6" |
| 104 |
DISTUTILS_SRC_TEST="nosetests" |
| 105 |
|
| 106 |
inherit distutils eutils virtualx |
| 107 |
|
| 108 |
DESCRIPTION="Enthought Tool Suite: Drawing and interaction packages" |
| 109 |
HOMEPAGE="http://code.enthought.com/projects/enable/ http://pypi.python.org/pypi/enable" |
| 110 |
-SRC_URI="http://www.enthought.com/repo/ets/${P}.tar.gz" |
| 111 |
+SRC_URI="http://www.enthought.com/repo/ets/${P}.tar.gz |
| 112 |
+ http://dev.gentoo.org/~idella4/${PN}-4-TestsPaths.patch" |
| 113 |
|
| 114 |
LICENSE="BSD" |
| 115 |
SLOT="0" |
| 116 |
@@ -37,13 +39,23 @@ |
| 117 |
|
| 118 |
DOCS="docs/*.txt" |
| 119 |
|
| 120 |
+src_prepare() { |
| 121 |
+ distutils_src_prepare |
| 122 |
+ |
| 123 |
+ # Remove check for Darwin systems, set py.test style xfails, |
| 124 |
+ # Re-set import paths in tests, 'enabling' enable to find its own in source modules!!?! |
| 125 |
+ epatch "${DISTDIR}"/${PN}-4-TestsPaths.patch \ |
| 126 |
+ "${FILESDIR}"/${PN}-4-rogue-tests.patch |
| 127 |
+} |
| 128 |
+ |
| 129 |
src_compile() { |
| 130 |
distutils_src_compile |
| 131 |
use doc && emake -C docs html |
| 132 |
} |
| 133 |
|
| 134 |
src_test() { |
| 135 |
- VIRTUALX_COMMAND="distutils_src_test" virtualmake |
| 136 |
+ # Hardcoding build-2.7, 2.7 being the only fully capable candidate |
| 137 |
+ VIRTUALX_COMMAND="python_execute_nosetests -P $(ls -d build-2.7/lib.linux-*/):." virtualmake |
| 138 |
} |
| 139 |
|
| 140 |
src_install() { |
| 141 |
|
| 142 |
|
| 143 |
|
| 144 |
1.19 dev-python/enable/ChangeLog |
| 145 |
|
| 146 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/enable/ChangeLog?rev=1.19&view=markup |
| 147 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/enable/ChangeLog?rev=1.19&content-type=text/plain |
| 148 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/enable/ChangeLog?r1=1.18&r2=1.19 |
| 149 |
|
| 150 |
Index: ChangeLog |
| 151 |
=================================================================== |
| 152 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/enable/ChangeLog,v |
| 153 |
retrieving revision 1.18 |
| 154 |
retrieving revision 1.19 |
| 155 |
diff -u -r1.18 -r1.19 |
| 156 |
--- ChangeLog 9 Oct 2012 09:22:56 -0000 1.18 |
| 157 |
+++ ChangeLog 29 Nov 2012 10:53:21 -0000 1.19 |
| 158 |
@@ -1,6 +1,12 @@ |
| 159 |
# ChangeLog for dev-python/enable |
| 160 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 161 |
-# $Header: /var/cvsroot/gentoo-x86/dev-python/enable/ChangeLog,v 1.18 2012/10/09 09:22:56 patrick Exp $ |
| 162 |
+# $Header: /var/cvsroot/gentoo-x86/dev-python/enable/ChangeLog,v 1.19 2012/11/29 10:53:21 idella4 Exp $ |
| 163 |
+ |
| 164 |
+ 30 Nov 2012; Ian Delaney <idella4@g.o> |
| 165 |
+ +files/enable-4-rogue-tests.patch, enable-4.1.0.ebuild, enable-4.2.0.ebuild: |
| 166 |
+ Fixes to test suites in 4.1,2.0, special patch saved to devspace to make |
| 167 |
+ workable mix of correct and wrong import paths, skirt 1 invalid test, set 2 |
| 168 |
+ tests to xfail, fixes Bug #422945 |
| 169 |
|
| 170 |
*enable-4.2.0 (09 Oct 2012) |
Archives