Version bump. Fix tests.

(Portage version: 13808-svn/cvs/Linux x86_64)

4 files changed, 33 insertions, 70 deletions

diff --git a/dev-python/lxml/ChangeLog b/dev-python/lxml/ChangeLog
index 4a0089a66198..447fbedb9932 100644
--- a/dev-python/lxml/ChangeLog
+++ b/dev-python/lxml/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/lxml
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/lxml/ChangeLog,v 1.49 2009/06/08 00:38:56 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/lxml/ChangeLog,v 1.50 2009/07/09 02:49:22 arfrever Exp $
+
+*lxml-2.2.2 (09 Jul 2009)
+
+  09 Jul 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  -lxml-2.1.1.ebuild, -lxml-2.1.5.ebuild, lxml-2.2.1.ebuild,
+  +lxml-2.2.2.ebuild:
+  Version bump. Fix tests.
 
 *lxml-2.2.1 (07 Jun 2009)
 
diff --git a/dev-python/lxml/lxml-2.1.1.ebuild b/dev-python/lxml/lxml-2.1.1.ebuild
deleted file mode 100644
index 2d48f8a30e97..000000000000
--- a/dev-python/lxml/lxml-2.1.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/lxml/lxml-2.1.1.ebuild,v 1.1 2008/08/19 10:07:42 hawking Exp $
-
-NEED_PYTHON="2.3"
-
-inherit distutils eutils multilib
-
-DESCRIPTION="A Pythonic binding for the libxml2 and libxslt libraries"
-HOMEPAGE="http://codespeak.net/lxml/"
-SRC_URI="http://codespeak.net/lxml/${P}.tgz"
-LICENSE="BSD ElementTree GPL-2 PSF-2.4"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc examples"
-
-RDEPEND=">=dev-libs/libxml2-2.6.21
-		>=dev-libs/libxslt-1.1.15"
-DEPEND="${RDEPEND}
-	>=dev-python/cython-0.9.8
-	>=dev-python/setuptools-0.6_rc5"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Use cython instead of own bundled version of pyrex
-	epatch "${FILESDIR}/${PN}-2.0.3-no-fake-pyrex.patch"
-}
-
-src_install() {
-	distutils_src_install
-
-	if use doc; then
-		dohtml doc/html/*
-		dodoc *.txt
-		docinto doc
-		dodoc doc/*.txt
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r samples/*
-	fi
-}
-
-src_test() {
-	distutils_python_version
-	python setup.py build_ext -i || die "building extensions for test use failed"
-	einfo "Running test"
-	"${python}" test.py || die "tests failed"
-	export PYTHONPATH="${PYTHONPATH}:${S}/src"
-	einfo "Running selftest"
-	"${python}" selftest.py || die "selftest failed"
-	einfo "Running selftest2"
-	"${python}" selftest2.py || die "selftest2 failed"
-}
diff --git a/dev-python/lxml/lxml-2.2.1.ebuild b/dev-python/lxml/lxml-2.2.1.ebuild
index 558c0138d90a..6669837ecc32 100644
--- a/dev-python/lxml/lxml-2.2.1.ebuild
+++ b/dev-python/lxml/lxml-2.2.1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/lxml/lxml-2.2.1.ebuild,v 1.1 2009/06/08 00:38:56 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/lxml/lxml-2.2.1.ebuild,v 1.2 2009/07/09 02:49:22 arfrever Exp $
 
 EAPI="2"
 
 NEED_PYTHON="2.3"
 
-inherit distutils
+inherit distutils flag-o-matic
 
 DESCRIPTION="A Pythonic binding for the libxml2 and libxslt libraries"
 HOMEPAGE="http://codespeak.net/lxml/"
@@ -22,6 +22,11 @@ DEPEND="${RDEPEND}
 	>=dev-python/cython-0.9.8
 	>=dev-python/setuptools-0.6_rc5"
 
+pkg_setup() {
+	# Tests fail with some optimizations.
+	replace-flags -O[2-9]* -O1
+}
+
 src_prepare() {
 	# Use Cython instead of own bundled version of Pyrex.
 	epatch "${FILESDIR}/${PN}-2.0.3-no-fake-pyrex.patch"
diff --git a/dev-python/lxml/lxml-2.1.5.ebuild b/dev-python/lxml/lxml-2.2.2.ebuild
index c4414f657e81..9fdd5b84c679 100644
--- a/dev-python/lxml/lxml-2.1.5.ebuild
+++ b/dev-python/lxml/lxml-2.2.2.ebuild
@@ -1,10 +1,12 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/lxml/lxml-2.1.5.ebuild,v 1.2 2009/01/20 22:44:25 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/lxml/lxml-2.2.2.ebuild,v 1.1 2009/07/09 02:49:22 arfrever Exp $
+
+EAPI="2"
 
 NEED_PYTHON="2.3"
 
-inherit distutils
+inherit distutils flag-o-matic
 
 DESCRIPTION="A Pythonic binding for the libxml2 and libxslt libraries"
 HOMEPAGE="http://codespeak.net/lxml/"
@@ -12,22 +14,28 @@ SRC_URI="http://codespeak.net/lxml/${P}.tgz"
 LICENSE="BSD ElementTree GPL-2 PSF-2.4"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc examples"
+IUSE="doc examples +threads"
 
-RDEPEND=">=dev-libs/libxml2-2.6.21
+RDEPEND=">=dev-libs/libxml2-2.7.2
 		>=dev-libs/libxslt-1.1.15"
 DEPEND="${RDEPEND}
 	>=dev-python/cython-0.9.8
 	>=dev-python/setuptools-0.6_rc5"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+pkg_setup() {
+	# Tests fail with some optimizations.
+	replace-flags -O[2-9]* -O1
+}
 
-	# Use cython instead of own bundled version of pyrex
+src_prepare() {
+	# Use Cython instead of own bundled version of Pyrex.
 	epatch "${FILESDIR}/${PN}-2.0.3-no-fake-pyrex.patch"
-	# Patch for xpath/unicode test. This test fails
-	epatch "${FILESDIR}/${P}_unicode_test.patch"
+}
+
+src_compile() {
+	local myconf
+	use threads || myconf+=" --without-threading"
+	${python} setup.py build ${myconf} || die "compilation failed"
 }
 
 src_install() {