diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2012-12-10 20:11:58 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2012-12-10 20:11:58 +0000 |
| commit | b75c4ad9aad97a8ae99e125c359e346b229cb2a1 (patch) | |
| tree | b9246ea9baf23beca1fbfa39e4c7607843d79843 /dev-python/lxml | |
| parent | 3.0.56 kernel released (diff) | |
| download | historical-b75c4ad9aad97a8ae99e125c359e346b229cb2a1.tar.gz historical-b75c4ad9aad97a8ae99e125c359e346b229cb2a1.tar.bz2 historical-b75c4ad9aad97a8ae99e125c359e346b229cb2a1.zip | |
Fix running tests in out-of-source build.
Package-Manager: portage-2.2.0_alpha147/cvs/Linux x86_64
Manifest-Sign-Key: 0x42B9401D
Diffstat (limited to 'dev-python/lxml')
| -rw-r--r-- | dev-python/lxml/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-python/lxml/Manifest | 14 | ||||
| -rw-r--r-- | dev-python/lxml/lxml-3.0.1.ebuild | 20 |
3 files changed, 20 insertions, 19 deletions
diff --git a/dev-python/lxml/ChangeLog b/dev-python/lxml/ChangeLog index 79cc6dd7c652..817596df792a 100644 --- a/dev-python/lxml/ChangeLog +++ b/dev-python/lxml/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-python/lxml # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/lxml/ChangeLog,v 1.143 2012/12/10 11:27:44 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/lxml/ChangeLog,v 1.144 2012/12/10 20:11:56 mgorny Exp $ + + 10 Dec 2012; Michał Górny <mgorny@gentoo.org> lxml-3.0.1.ebuild: + Fix running tests in out-of-source build. 10 Dec 2012; Michał Górny <mgorny@gentoo.org> lxml-3.0.1.ebuild: Clean up the ebuild a bit. Fix test phases. Enable all CPython versions. diff --git a/dev-python/lxml/Manifest b/dev-python/lxml/Manifest index 1f1be4fba4a6..85137ad7ce46 100644 --- a/dev-python/lxml/Manifest +++ b/dev-python/lxml/Manifest @@ -9,15 +9,15 @@ DIST lxml-3.0.1.tgz 3205224 SHA256 50367b086d18b1cadc8d6ddf2525495d9d216b81e9a70 EBUILD lxml-2.3.4.ebuild 2387 SHA256 3f1f1f5278d3a25156181c725bbbcbcc39933e7a7f0710c7c42ef9ecff1aa90d SHA512 043e2941dedb405887b292f93ae5c17e1ad41dad2e935723b793cfbe5c5fa5dd947ac13030e055ed16bc63fee5c2c8dfef37b860efa7fc034b699f7674766772 WHIRLPOOL 5189a11f84b18128dd6c4e72085e70623c6fcc86c23891295f850a185b6f57c1f17c1abdaff73b32a7a20c70810c559c8728f2089d8e7709aaecee0dd86e464b EBUILD lxml-2.3.5.ebuild 2250 SHA256 ae75bc5f972f1d4aec8fce2122641578f537c821befcc794f6cec703451ecee0 SHA512 5a1dd98a130045d7b4bc61481bd5952e965bfc3a112178716d893b16835fe8660445c07de31a843135585bb8b29caee80d006741e4a9ab50fdb5de55c5659a9a WHIRLPOOL e189520a001c45f4d89a0888a9440b0f452f6a44f163831aed61e151cb95db6dad09ae58a66690371c4130344492ad85c9f69c81bedaf3ddd2f9836b2eb1e8cf EBUILD lxml-2.3.6.ebuild 2250 SHA256 9569aacea58d41b77e51e2ac5568136af6ac25731cae3de9f3cd673fece75e76 SHA512 b9ba78498665a035616428bde0c6aca5137162176dd72fc2cdd18814735407de041ad66674a17bb58a35b1c7a4d165ebe2aed63a95e0b70940e6cdd4f9e8ad98 WHIRLPOOL 599f795caa74b81d282464467d17766810bd1c13b993123af4357b1abf1e2a039b4fe417966d596ee96854956d8c0933caf56d9f6ed451b9139286abdc3475fc -EBUILD lxml-3.0.1.ebuild 2295 SHA256 5bf0049c747a0321ab54b46c1bff2dc4f0a180ddf081f698942e8c484284361a SHA512 28c88863e004b220083ef4255a5c1764555f7d026676b883b9e4f9cf5d255d69c096c358171aed56f45e42ab4f342516b093eff0cfc0de75003fdc553e383576 WHIRLPOOL 4add23ebfc8a4020974f939bc35f22e200daf7e591d2df7fcd506c614823d35d96fa5d8ace89eec66531d6bf7b24e705d725fadbda2e662cb59ab129b65f3354 -MISC ChangeLog 17702 SHA256 4351170a799c50508d8fba60de189a76f7b6cbab810ef557065de90a7edd7c04 SHA512 a0f73c5c8fb3ab7b6fc12f6a0db6229bc205d41d40d66f84ebd61d2c409c7c2e1ade40d88e04caf98c8aead853b0d1ecfe6639dc4d15d32dfd45ee3e81b1e08f WHIRLPOOL b4203125f2a7cf1477072207de7945103d26173ca274fb5ce9cef3d12ed679ca06426def1cab45daffda0e88075c4a00a4bea33ed3baa5b509048eb5f53f6323 +EBUILD lxml-3.0.1.ebuild 2216 SHA256 439b0ca2c4e98bbcb1175ee3e61b19d80597cda6333445ac1107048921c1c8e7 SHA512 a68b94bab64cefb4d6d98f997b11162a98ac87eaf229776c846bb9f47676ed1cfaf772ba8d99556dcf57dc787eec713fd7e206e54a943df74a5f7462a09d28e1 WHIRLPOOL 6d114c951f1e0b3bdc6630682d71df2e5cee0611a06cc9c1ae229a503a6160e113fad80a71954dc46fb8765a9755a8bfa1f435d774bff01f9f76dcc3c71a3af6 +MISC ChangeLog 17816 SHA256 e5e6b1e1015ff31728f9e4073d6ccea2cbb964bd5951c9ed6f37b51e5cb20590 SHA512 cdcd12fa91d88954c4665da523134f817955b96a2f3cbea3cc595e5f6ed5c172c30c8cb46673a54ab4b1b2cd5f8baa4980a24c9b56b9a9cbd95ae5473228f189 WHIRLPOOL 8ea007f0e537a09e5ab81cd78d6b08ccf64cc1672f4c4f92985d9bc6424dcf6704d2635b900f57afde8472ade481e3992d25ae4ee3337ad94a77400ff5521b64 MISC metadata.xml 159 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4 SHA512 d5a29b9f6ecddfc368dc0f1f8919cd3c3d6ecf2c7a82bc8d4c0dd51b7aa15561ed0462acb8ae39bc84f97e706e82d9b4b06357494f164f1648219f604b473fbe WHIRLPOOL 36e19b63a1b307cc200e1d73499b7477f73799db3909e71b5a0916084728351c76d400f65e2c8b3f8fffb2c9ba54c0bd235f785b47414178d98f11d64a9420d7 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iJwEAQEIAAYFAlDFx0MACgkQfXuS5UK5QB1VzQQAncvMi5bwfXvXAZHsjAVhF09Z -ELsO8hXc1/xDj3zu2xnI3tuf4b6nbr3u6JHgCyZDqvCmnQLDS4zLYk+cX++7tkLM -/REwjOLoLa7YgxUY0rKLMUHpuEeFNF/rR3sstNHSBRx0hbHaj2FJCG0LayzGd7gH -GWyZLrqSwJt2dFrOQHA= -=TtQy +iJwEAQEIAAYFAlDGQhcACgkQfXuS5UK5QB3cLQP9Fv091jSGmNK247zwWd9RWABd +dHYPqm68qfa0tDqyRjeOdEaXw6FcyrAWzmZ10g5sb8c0sOnyXxFBhbRe6QaHDi0S +3D2KFKyYygEtr5gHt8hRsg5glUvIzJG0gFeSp1MToa74VzQWzm7iqo/GfVfMtHNe +KhTUjBJglyeNAIboL5Y= +=obUU -----END PGP SIGNATURE----- diff --git a/dev-python/lxml/lxml-3.0.1.ebuild b/dev-python/lxml/lxml-3.0.1.ebuild index a4fa03d3f1fb..0ddd907ea84f 100644 --- a/dev-python/lxml/lxml-3.0.1.ebuild +++ b/dev-python/lxml/lxml-3.0.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/lxml/lxml-3.0.1.ebuild,v 1.6 2012/12/10 11:27:44 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/lxml/lxml-3.0.1.ebuild,v 1.7 2012/12/10 20:11:56 mgorny Exp $ EAPI=4 PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} ) @@ -21,7 +21,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 # have to drop some keywords pending resolution of bug #438388 #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" -IUSE="doc examples test +threads" +IUSE="doc examples +threads" RDEPEND=">=dev-libs/libxml2-2.7.2 >=dev-libs/libxslt-1.1.15 @@ -33,11 +33,11 @@ DEPEND="${RDEPEND} S="${WORKDIR}/${MY_P}" python_prepare_all() { - # Necessary due to hackery in src_test(). - # Drop when that hackery is replaced with one respecting BUILD_DIR. - use test && DISTUTILS_IN_SOURCE_BUILD=1 - local PATCHES=( "${FILESDIR}/${P}-skip-failing-test.patch" ) + + # avoid replacing PYTHONPATH in tests. + sed -i -e '/sys\.path/d' test.py || die + distutils-r1_python_prepare_all } @@ -45,13 +45,11 @@ python_test() { # Tests broken with Python 3, generally due to Unicode. [[ ${EPYTHON} == python3.* ]] && return - local module - for module in lxml/etree lxml/objectify; do - cp -l build/lib.*/${module}.so src/${module}.so || die - done + cp -r -l src/lxml/tests "${BUILD_DIR}"/lib/lxml/ || die + cp -r -l src/lxml/html/tests "${BUILD_DIR}"/lib/lxml/html/ || die + ln -s "${S}"/doc "${BUILD_DIR}"/ || die local test - local PYTHONPATH=src/ # needed for selftest* for test in test.py selftest.py selftest2.py; do einfo "Running ${test}" "${PYTHON}" ${test} || die "Test ${test} fails with ${EPYTHON}" |