| 1 |
mgorny 12/10/29 16:26:39 |
| 2 |
|
| 3 |
Modified: lxml-3.0.1.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Fix running tests with out-of-source builds. Minor fixes & restore keywords lost due to python-exec. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key 42B9401D) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.3 dev-python/lxml/lxml-3.0.1.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/lxml/lxml-3.0.1.ebuild?rev=1.3&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/lxml/lxml-3.0.1.ebuild?rev=1.3&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/lxml/lxml-3.0.1.ebuild?r1=1.2&r2=1.3 |
| 15 |
|
| 16 |
Index: lxml-3.0.1.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/lxml/lxml-3.0.1.ebuild,v |
| 19 |
retrieving revision 1.2 |
| 20 |
retrieving revision 1.3 |
| 21 |
diff -u -r1.2 -r1.3 |
| 22 |
--- lxml-3.0.1.ebuild 20 Oct 2012 16:22:03 -0000 1.2 |
| 23 |
+++ lxml-3.0.1.ebuild 29 Oct 2012 16:26:39 -0000 1.3 |
| 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/lxml/lxml-3.0.1.ebuild,v 1.2 2012/10/20 16:22:03 jer Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/dev-python/lxml/lxml-3.0.1.ebuild,v 1.3 2012/10/29 16:26:39 mgorny Exp $ |
| 29 |
|
| 30 |
EAPI=4 |
| 31 |
PYTHON_COMPAT=(python2_6 python2_7 python3_1 python3_2 python3_3) |
| 32 |
@@ -16,7 +16,7 @@ |
| 33 |
|
| 34 |
LICENSE="BSD ElementTree GPL-2 PSF-2" |
| 35 |
SLOT="0" |
| 36 |
-KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" |
| 37 |
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" |
| 38 |
|
| 39 |
# have to drop some keywords pending resolution of bug #438388 |
| 40 |
#KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" |
| 41 |
@@ -33,31 +33,29 @@ |
| 42 |
S="${WORKDIR}/${MY_P}" |
| 43 |
|
| 44 |
src_prepare() { |
| 45 |
- epatch "${FILESDIR}/${P}-skip-failing-test.patch" |
| 46 |
+ PATCHES=( "${FILESDIR}/${P}-skip-failing-test.patch" ) |
| 47 |
distutils-r1_src_prepare |
| 48 |
} |
| 49 |
|
| 50 |
-src_test() { |
| 51 |
- run_tests() { |
| 52 |
- # Tests broken with Python 3, generally due to Unicode. |
| 53 |
- [[ "${EPYTHON%.*}" == python3 ]] && return |
| 54 |
- |
| 55 |
- local module |
| 56 |
- for module in $(ls build/lib.*/lxml/*.so); do |
| 57 |
- ln -s "../../${module}" "src/lxml/$(basename ${module})" |
| 58 |
- done |
| 59 |
- |
| 60 |
- local exit_status="0" test |
| 61 |
- for test in test.py selftest.py selftest2.py; do |
| 62 |
- einfo "Running ${test}" |
| 63 |
- if ! "${PYTHON}" ${test}; then |
| 64 |
- eerror "${test} failed with ${EPYTHON}" |
| 65 |
- exit_status="1" |
| 66 |
- fi |
| 67 |
- done |
| 68 |
- return "${exit_status}" |
| 69 |
- } |
| 70 |
- python_foreach_impl run_tests |
| 71 |
+python_test() { |
| 72 |
+ # Tests broken with Python 3, generally due to Unicode. |
| 73 |
+ [[ ${EPYTHON} == python3.* ]] && return |
| 74 |
+ |
| 75 |
+ local module |
| 76 |
+ for module in "${BUILD_DIR}"/lib.*/lxml/*.so; do |
| 77 |
+ ln -fs "${module}" src/lxml/ || die |
| 78 |
+ done |
| 79 |
+ |
| 80 |
+ local exit_status="0" test |
| 81 |
+ local PYTHONPATH=src/ # needed for selftest* |
| 82 |
+ for test in test.py selftest.py selftest2.py; do |
| 83 |
+ einfo "Running ${test}" |
| 84 |
+ if ! "${PYTHON}" ${test}; then |
| 85 |
+ eerror "${test} failed with ${EPYTHON}" |
| 86 |
+ exit_status="1" |
| 87 |
+ fi |
| 88 |
+ done |
| 89 |
+ return "${exit_status}" |
| 90 |
} |
| 91 |
|
| 92 |
src_install() { |
| 93 |
|
| 94 |
|
| 95 |
|
| 96 |
1.140 dev-python/lxml/ChangeLog |
| 97 |
|
| 98 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/lxml/ChangeLog?rev=1.140&view=markup |
| 99 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/lxml/ChangeLog?rev=1.140&content-type=text/plain |
| 100 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/lxml/ChangeLog?r1=1.139&r2=1.140 |
| 101 |
|
| 102 |
Index: ChangeLog |
| 103 |
=================================================================== |
| 104 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/lxml/ChangeLog,v |
| 105 |
retrieving revision 1.139 |
| 106 |
retrieving revision 1.140 |
| 107 |
diff -u -r1.139 -r1.140 |
| 108 |
--- ChangeLog 20 Oct 2012 16:22:03 -0000 1.139 |
| 109 |
+++ ChangeLog 29 Oct 2012 16:26:39 -0000 1.140 |
| 110 |
@@ -1,6 +1,10 @@ |
| 111 |
# ChangeLog for dev-python/lxml |
| 112 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 113 |
-# $Header: /var/cvsroot/gentoo-x86/dev-python/lxml/ChangeLog,v 1.139 2012/10/20 16:22:03 jer Exp $ |
| 114 |
+# $Header: /var/cvsroot/gentoo-x86/dev-python/lxml/ChangeLog,v 1.140 2012/10/29 16:26:39 mgorny Exp $ |
| 115 |
+ |
| 116 |
+ 29 Oct 2012; Michał Górny <mgorny@g.o> lxml-3.0.1.ebuild: |
| 117 |
+ Fix running tests with out-of-source builds. Minor fixes & restore keywords |
| 118 |
+ lost due to python-exec. |
| 119 |
|
| 120 |
20 Oct 2012; Jeroen Roovers <jer@g.o> lxml-3.0.1.ebuild: |
| 121 |
Marked ~hppa (bug #438388). |
Archives