From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2D4B8138331 for ; Fri, 14 Oct 2016 21:30:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8332AE0B6E; Fri, 14 Oct 2016 21:30:45 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 58854E0B6E for ; Fri, 14 Oct 2016 21:30:45 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3F21934112A for ; Fri, 14 Oct 2016 21:30:39 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1F6FA308 for ; Fri, 14 Oct 2016 21:30:36 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1476480596.6ea4f1214d31a3703f3d779af5c010450a034190.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/lxml/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/lxml/lxml-3.4.4-r1.ebuild X-VCS-Directories: dev-python/lxml/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 6ea4f1214d31a3703f3d779af5c010450a034190 X-VCS-Branch: master Date: Fri, 14 Oct 2016 21:30:36 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 5f0a299d-5dcb-46c1-8ce6-20f798978ea9 X-Archives-Hash: c655c7e6d8d7875d7605b69f75dfb69d commit: 6ea4f1214d31a3703f3d779af5c010450a034190 Author: Mathy Vanvoorden vanvoorden be> AuthorDate: Tue Oct 11 21:43:14 2016 +0000 Commit: David Seifert gentoo org> CommitDate: Fri Oct 14 21:29:56 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ea4f121 dev-python/lxml: disable broken test-case, EAPI bump There is a test-case not working because of issues in libxml2. The patch disables the one broken test-case until upstream can fix it. Upstream bug: https://bugs.launchpad.net/lxml/+bug/1608479 Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=592860 Package-Manager: portage-2.3.0 Closes: https://github.com/gentoo/gentoo/pull/2539 Signed-off-by: David Seifert gentoo.org> dev-python/lxml/lxml-3.4.4-r1.ebuild | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/dev-python/lxml/lxml-3.4.4-r1.ebuild b/dev-python/lxml/lxml-3.4.4-r1.ebuild index 522ba36..f6c571b 100644 --- a/dev-python/lxml/lxml-3.4.4-r1.ebuild +++ b/dev-python/lxml/lxml-3.4.4-r1.ebuild @@ -2,9 +2,9 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 -PYTHON_COMPAT=( python2_7 python3_{3,4,5} ) +PYTHON_COMPAT=( python2_7 python3_{4,5} ) inherit distutils-r1 eutils flag-o-matic toolchain-funcs @@ -25,25 +25,29 @@ DEPEND="${RDEPEND} dev-python/setuptools[${PYTHON_USEDEP}] test? ( dev-python/cssselect[${PYTHON_USEDEP}] ) " -# lxml tarball contains files pregenerated by Cython. DISTUTILS_IN_SOURCE_BUILD=1 -python_prepare_all() { - epatch "${FILESDIR}"/${P}-cross-compile.patch +PATCHES=( + "${FILESDIR}"/${P}-cross-compile.patch + + # This patch removes a testcase that fails because of issues + # in libxml2. + # + # Upstream bug: https://bugs.launchpad.net/lxml/+bug/1608479 + "${FILESDIR}"/${PN}-3.6.4-fix-test_xmlschema.patch +) +python_prepare_all() { # avoid replacing PYTHONPATH in tests. sed -i '/sys\.path/d' test.py || die - # seems to be broken - rm src/lxml/tests/test_elementpath.py || die - distutils-r1_python_prepare_all } python_compile() { if [[ ${EPYTHON} != python3* ]]; then - local CFLAGS=${CFLAGS} + local -x CFLAGS="${CFLAGS}" append-cflags -fno-strict-aliasing fi tc-export PKG_CONFIG @@ -55,11 +59,7 @@ python_test() { cp -r -l src/lxml/html/tests "${BUILD_DIR}"/lib/lxml/html/ || die ln -s "${S}"/doc "${BUILD_DIR}"/ || die - local test - for test in test.py selftest.py selftest2.py; do - einfo "Running ${test}" - "${PYTHON}" ${test} -vv -p || die "Test ${test} fails with ${EPYTHON}" - done + "${EPYTHON}" test.py -vv --all-levels -p || die "Test ${test} fails with ${EPYTHON}" } python_install_all() { @@ -67,7 +67,10 @@ python_install_all() { local DOCS=( *.txt doc/*.txt ) local HTML_DOCS=( doc/html/. ) fi - use examples && local EXAMPLES=( samples/. ) + if use examples; then + docinto examples + dodoc -r samples/. + fi distutils-r1_python_install_all }