From: "Michal Gorny (mgorny)" <mgorny@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] gentoo-x86 commit in dev-python/lxml: lxml-3.0.1.ebuild ChangeLog
Date: Mon, 10 Dec 2012 11:27:44 +0000 (UTC) [thread overview]
Message-ID: <20121210112744.7D8D52171D@flycatcher.gentoo.org> (raw)
mgorny 12/12/10 11:27:44
Modified: lxml-3.0.1.ebuild ChangeLog
Log:
Clean up the ebuild a bit. Fix test phases. Enable all CPython versions.
(Portage version: 2.2.0_alpha147/cvs/Linux x86_64, signed Manifest commit with key 42B9401D)
Revision Changes Path
1.6 dev-python/lxml/lxml-3.0.1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/lxml/lxml-3.0.1.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/lxml/lxml-3.0.1.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/lxml/lxml-3.0.1.ebuild?r1=1.5&r2=1.6
Index: lxml-3.0.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/lxml/lxml-3.0.1.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- lxml-3.0.1.ebuild 1 Dec 2012 10:19:38 -0000 1.5
+++ lxml-3.0.1.ebuild 10 Dec 2012 11:27:44 -0000 1.6
@@ -1,9 +1,9 @@
# 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.5 2012/12/01 10:19:38 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/lxml/lxml-3.0.1.ebuild,v 1.6 2012/12/10 11:27:44 mgorny Exp $
EAPI=4
-PYTHON_COMPAT=(python2_6 python2_7 python3_1 python3_2 python3_3)
+PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
inherit distutils-r1
@@ -21,7 +21,7 @@
# 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 +threads"
+IUSE="doc examples test +threads"
RDEPEND=">=dev-libs/libxml2-2.7.2
>=dev-libs/libxslt-1.1.15
@@ -32,13 +32,13 @@
S="${WORKDIR}/${MY_P}"
-# Necessary due to hackery in src_test().
-# Drop when that hackery is replaced with one respecting BUILD_DIR.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-src_prepare() {
- PATCHES=( "${FILESDIR}/${P}-skip-failing-test.patch" )
- distutils-r1_src_prepare
+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" )
+ distutils-r1_python_prepare_all
}
python_test() {
@@ -46,32 +46,26 @@
[[ ${EPYTHON} == python3.* ]] && return
local module
- for module in "${BUILD_DIR}"/lib/lxml/*.so; do
- ln -fs "${module}" src/lxml/ || die
+ for module in lxml/etree lxml/objectify; do
+ cp -l build/lib.*/${module}.so src/${module}.so || die
done
- local exit_status="0" test
+ local test
local PYTHONPATH=src/ # needed for selftest*
for test in test.py selftest.py selftest2.py; do
einfo "Running ${test}"
- if ! "${PYTHON}" ${test}; then
- eerror "${test} failed with ${EPYTHON}"
- exit_status="1"
- fi
+ "${PYTHON}" ${test} || die "Test ${test} fails with ${EPYTHON}"
done
- return "${exit_status}"
}
-src_install() {
- distutils-r1_src_install
-
+python_install_all() {
if use doc; then
- dohtml -r doc/html/*
- dodoc *.txt
- docinto doc
- dodoc doc/*.txt
+ local DOCS=( *.txt doc/*.txt )
+ local HTML_DOCS=( doc/html/. )
fi
+ distutils-r1_python_install_all
+
if use examples; then
docinto examples
dodoc -r samples/*
1.143 dev-python/lxml/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/lxml/ChangeLog?rev=1.143&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/lxml/ChangeLog?rev=1.143&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/lxml/ChangeLog?r1=1.142&r2=1.143
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/lxml/ChangeLog,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -r1.142 -r1.143
--- ChangeLog 1 Dec 2012 10:19:38 -0000 1.142
+++ ChangeLog 10 Dec 2012 11:27:44 -0000 1.143
@@ -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.142 2012/12/01 10:19:38 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/lxml/ChangeLog,v 1.143 2012/12/10 11:27:44 mgorny Exp $
+
+ 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.
01 Dec 2012; Michał Górny <mgorny@gentoo.org> lxml-3.0.1.ebuild:
Force in-source build due to src_test() hackery.
next reply other threads:[~2012-12-10 11:27 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-10 11:27 Michal Gorny (mgorny) [this message]
-- strict thread matches above, loose matches on Subject: below --
2013-02-02 22:00 [gentoo-commits] gentoo-x86 commit in dev-python/lxml: lxml-3.0.1.ebuild ChangeLog Agostino Sarubbo (ago)
2013-02-02 21:53 Agostino Sarubbo (ago)
2013-01-18 0:12 Patrick McLean (chutzpah)
2013-01-17 7:35 Michal Gorny (mgorny)
2013-01-16 21:27 Michal Gorny (mgorny)
2012-12-17 19:58 Michal Gorny (mgorny)
2012-12-10 20:11 Michal Gorny (mgorny)
2012-12-01 10:19 Michal Gorny (mgorny)
2012-11-01 12:21 Michal Gorny (mgorny)
2012-10-29 16:26 Michal Gorny (mgorny)
2012-10-19 20:25 Patrick McLean (chutzpah)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20121210112744.7D8D52171D@flycatcher.gentoo.org \
--to=mgorny@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox