Version bump, use cython instead of bundled pyrex.

Package-Manager: portage-2.1.4.4

4 files changed, 102 insertions, 2 deletions

diff --git a/dev-python/lxml/ChangeLog b/dev-python/lxml/ChangeLog
index 619a5f8795be..beaea29c65fb 100644
--- a/dev-python/lxml/ChangeLog
+++ b/dev-python/lxml/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/lxml
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/lxml/ChangeLog,v 1.33 2008/03/20 20:30:16 fmccor Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/lxml/ChangeLog,v 1.34 2008/03/31 11:16:02 hawking Exp $
+
+*lxml-2.0.3 (31 Mar 2008)
+
+  31 Mar 2008; Ali Polatel <hawking@gentoo.org>
+  +files/lxml-2.0.3-no-fake-pyrex.patch, +lxml-2.0.3.ebuild:
+  Version bump, use cython instead of bundled pyrex.
 
   20 Mar 2008; Ferris McCormick <fmccor@gentoo.org> lxml-1.3.6.ebuild:
   Add ~sparc for Bug #213611.  Tests pass (which is not the case for 2.0.2).
diff --git a/dev-python/lxml/Manifest b/dev-python/lxml/Manifest
index ecc046c5bff7..4531cb9e5a98 100644
--- a/dev-python/lxml/Manifest
+++ b/dev-python/lxml/Manifest
@@ -1,9 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX lxml-1.0-distutils.diff 615 RMD160 ba45fc71e1c35819fcd07a772b7870c09281eb78 SHA1 eccf1cd25a2dde67add688e5248996e03b07abaa SHA256 0cd3de4b484132e090faf70b4b7b9537c4e6593ae21e604f459405c74789a67d
+AUX lxml-2.0.3-no-fake-pyrex.patch 783 RMD160 6fee6ebd64327636a218af23733536f6b02733e6 SHA1 20a6b3a713f5193d9ed2cf6f06c99bc8582887c8 SHA256 66f5086e80d8b4aee18c5a1ce2c77d580a910d41669fd1d6e00dbd3f4a3435c6
 DIST lxml-1.0.2.tgz 378107 RMD160 f872804291722838ed82c933498394b6bdfb2614 SHA1 e747a9220c3ccc7292237dc91eb7d75d562a196d SHA256 2ac2154e3f66b5b32ca25d47e3977db115ac6dc52ddb7442ce16e65a4ac1afee
 DIST lxml-1.3.6.tgz 1253422 RMD160 deb98a07ea6b56f9c945e0e48848cb2d26818e77 SHA1 0a3d84d4d34a7a3bb12484e54c2c71703dff7826 SHA256 91258c3ba06dd07036533af2377b6adcc12b043d0f4bb98be8daebe4f4befea4
 DIST lxml-2.0.2.tgz 2002234 RMD160 c3ed569aee8112dfaca2c7be7309ca51cf23317d SHA1 97fc60896e34b48b6179ecc5ebb68ca96cbf2a4a SHA256 0f1a1f9ad32fbd6a60f985a71b9266996b2b4bb4831ff5945106f8fc7fa11a56
+DIST lxml-2.0.3.tgz 2012530 RMD160 25ba3ba87bc000dfe52e5c10f3d5eddbb45fbf77 SHA1 1ffa38df8cd738653ab0c988f82617dbbbf20794 SHA256 bf08f386ce087f11e75411494ecf604bcfd1d6ac1722502c8abdc2df852bf2cd
 EBUILD lxml-1.0.2.ebuild 899 RMD160 2bb102fc801aa1db0c0d95dc00c792a8990d32d1 SHA1 8e05852b962700cf674f8012add97d68ddf31161 SHA256 243459c673568d0278ed8775e252314d38a9a9fe597c3fb34098d5a901d18ad2
 EBUILD lxml-1.3.6.ebuild 1288 RMD160 da615f249fce5d8081142ea00d8537edf7a4251f SHA1 8dd00d0773d1c4f91656a296f3da67bf12fa5b2e SHA256 51b97640b1517171ffb6b6d16170e866aab7500495abed7583aeec05451a0b36
 EBUILD lxml-2.0.2.ebuild 1333 RMD160 4e673ca96ccb4a732fd2c1ad8258cc1234754ba6 SHA1 c1000349094da038761bc64d20d793cbc69b8408 SHA256 4c74f1d4d629f9bc598fc99aefc10108d41395c024fd53a5a29a6cb28b31a3fc
-MISC ChangeLog 4635 RMD160 7c8ea1304809fbd420499912fb7a5b2eb6926153 SHA1 6de953a4f84ec2a2fedd07587489dd9d0c607be0 SHA256 a961ccc4d778416f2e9b6d485850dc841c5a786248a7352b35b0ddd80edbaebf
+EBUILD lxml-2.0.3.ebuild 1414 RMD160 f96ef3ae0aad22097eb2330b71758bb81663bdea SHA1 3599494fb74a514b84e2434526fcf1ad51401816 SHA256 fd848e704e53d1b3cda34a61c92a4d116fa1b1d36fb442083cb3b4edff44b25b
+MISC ChangeLog 4826 RMD160 fa1af12e0f8b66e45b4b74079530c4d6a914e136 SHA1 db348f5d8d6a7f94926b4a5d19acd17a87a93728 SHA256 7c1af8d6955728c6d0d4213af582d27d87c74d6eba4bd07753c304a0e4e8e8c4
 MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkfwx/oACgkQQU4yORhF8iA1SQCdEozYxuJMznLutkHoSpQ1I4LF
+ifQAoKu+WoBLBFDNO3OJXvq1lmsVLrOZ
+=VGpn
+-----END PGP SIGNATURE-----
diff --git a/dev-python/lxml/files/lxml-2.0.3-no-fake-pyrex.patch b/dev-python/lxml/files/lxml-2.0.3-no-fake-pyrex.patch
new file mode 100644
index 000000000000..5e11a05003f5
--- /dev/null
+++ b/dev-python/lxml/files/lxml-2.0.3-no-fake-pyrex.patch
@@ -0,0 +1,24 @@
+--- setup.py.orig	2008-03-31 13:54:39.865024409 +0300
++++ setup.py	2008-03-31 14:02:10.318035107 +0300
+@@ -4,10 +4,9 @@
+ 
+ try:
+     import Cython
+-    # may need to work around setuptools bug by providing a fake Pyrex
+-    sys.path.insert(0, os.path.join(os.path.dirname(__file__), "fake_pyrex"))
+ except ImportError:
+-    pass
++    print >>sys.stderr, "lxml requires cython-0.9.6.10 or later."
++    sys.exit(1)
+ 
+ try:
+     import pkg_resources
+@@ -16,7 +15,7 @@
+     except pkg_resources.VersionConflict:
+         from ez_setup import use_setuptools
+         use_setuptools(version="0.6c5")
+-    #pkg_resources.require("Cython==0.9.6.10")
++    pkg_resources.require("Cython>=0.9.6.10")
+     from setuptools import setup
+     extra_options["zip_safe"] = False
+ except ImportError:
diff --git a/dev-python/lxml/lxml-2.0.3.ebuild b/dev-python/lxml/lxml-2.0.3.ebuild
new file mode 100644
index 000000000000..9087964db823
--- /dev/null
+++ b/dev-python/lxml/lxml-2.0.3.ebuild
@@ -0,0 +1,57 @@
+# 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.0.3.ebuild,v 1.1 2008/03/31 11:16:02 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 ~x86"
+IUSE="doc examples"
+
+RDEPEND=">=dev-libs/libxml2-2.6.20
+		>=dev-libs/libxslt-1.1.15"
+DEPEND="${RDEPEND}
+	>=dev-python/cython-0.9.6.10
+	>=dev-python/setuptools-0.6_rc5"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Use cython instead of own bundled version of pyrex
+	epatch "${FILESDIR}/${P}-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"
+}