Some lxml stuff

5 files changed, 75 insertions, 42 deletions

diff --git a/dev-python/cython/Manifest b/dev-python/cython/Manifest
deleted file mode 100644
index edaa049..0000000
--- a/dev-python/cython/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST Cython-0.9.6.12.zip 1294449 RMD160 120aa9d6dcbe1357fad6c61d4868039e0f27c0d9 SHA1 1e57efbb48bbd3a8a997300edef325351eef0c77 SHA256 9423dfd5502f3b38699dd3d8cda0aca8cd9fb4b94d0c9160901dfb1c3cb705d6
-EBUILD cython-0.9.6.12.ebuild 968 RMD160 44755fd29af16db55d7ec4efdd8379187d7307b7 SHA1 0e3806e5d49ac0a0e08d5fa7ccd02331186f79ab SHA256 9cb10e2151faf78ff4eef3ff84b9e6576b363cbf89e1afbbe1fda8ad96403f24
diff --git a/dev-python/cython/cython-0.9.6.12.ebuild b/dev-python/cython/cython-0.9.6.12.ebuild
deleted file mode 100644
index 5a0b4e9..0000000
--- a/dev-python/cython/cython-0.9.6.12.ebuild
+++ /dev/null
@@ -1,40 +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/cython/cython-0.9.6.10b.ebuild,v 1.1 2008/01/04 16:51:19 hawking Exp $
-
-NEED_PYTHON=2.2
-
-inherit distutils eutils
-
-MY_PN="Cython"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A language for writing Python extension modules based on pyrex"
-HOMEPAGE="http://www.cython.org/"
-SRC_URI="http://www.cython.org/${MY_P}.zip"
-
-LICENSE="PSF-2.4"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples"
-
-DEPEND="app-arch/unzip"
-
-S="${WORKDIR}/${MY_P}"
-
-PYTHON_MODNAME="${MY_PN}"
-DOCS="ToDo.txt USAGE.txt"
-
-src_install() {
-	distutils_src_install
-
-	# -A c switch is for Doc/primes.c
-	use doc && dohtml -A c -r Doc/*
-
-	if use examples; then
-		# Demos/ has files with .so,~ suffixes.
-		# So we have to specify precisely what to install.
-		insinto /usr/share/doc/${PF}/examples
-		doins Demos/Makefile* Demos/Setup.py Demos/*.{py,pyx,pxd}
-	fi
-}
diff --git a/dev-python/lxml/Manifest b/dev-python/lxml/Manifest
index e4217f6..917ab8a 100644
--- a/dev-python/lxml/Manifest
+++ b/dev-python/lxml/Manifest
@@ -1,4 +1,7 @@
 AUX gtk-threading-filename-guessing.patch 1054 RMD160 81d9090a447539beb6644249d5366f4d36ea6009 SHA1 1bc29d5737c6fe03fee3566b507695abec638834 SHA256 8b7d6c847c27948455ec3bb74f998ddc807aa293c1083608880716e555a693a0
+AUX lxml-2.0.3-no-fake-pyrex.patch 442 RMD160 75164b0c95c96219be5bd5df529ee10a93b5545a SHA1 f98119743207a587bb1e3b5ccf8b93aa891c9516 SHA256 06d5e8be49eac6188e5ccb48c27b8307f5ddd3ab465d95f5c5adec756f3ee7ba
 AUX parse-gtk-problem.patch 1698 RMD160 179c0807ec7335e63853fd65981cf6b21884f9e3 SHA1 56918ec6f47ef7da5118d76acb21414615091eef SHA256 d42eac9ed08e0c36fa010b4b9f37904b428a2fe4d5376b44aba38aa95ba76331
 DIST lxml-2.0.2.tgz 2002234 RMD160 c3ed569aee8112dfaca2c7be7309ca51cf23317d SHA1 97fc60896e34b48b6179ecc5ebb68ca96cbf2a4a SHA256 0f1a1f9ad32fbd6a60f985a71b9266996b2b4bb4831ff5945106f8fc7fa11a56
+DIST lxml-2.0.4.tgz 2012053 RMD160 5155b1586a01589e152661d65cc60b6c0fcb000d SHA1 6412d1b5ab1c488d729cf77830ce6616c3c89e0b SHA256 5e23ed168c9d1c4976caac5398dbb45fd8c51e9c423e013f571cf0e0eca4a750
 EBUILD lxml-2.0.2-r1.ebuild 1530 RMD160 aaeec83741ead12ad0be063b1e518640666a74d3 SHA1 192c1599e86a6106d69a163689a42c5e9b370b73 SHA256 f813996fe966e4d01ef24b6486d99a2ac0f32ab1777700d9d7792b4b671154ba
+EBUILD lxml-2.0.4.ebuild 1440 RMD160 5537ffecf3ecf1a14757642692bdce8ed6046daf SHA1 476bcbed9bc2ac782619ebf4d6e2bcbce741037e SHA256 0254a5f305c59257b144f4de6cce9f1d0fa0d292a3c54b515bad567b3ff4645e
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 0000000..9042ae6
--- /dev/null
+++ b/dev-python/lxml/files/lxml-2.0.3-no-fake-pyrex.patch
@@ -0,0 +1,15 @@
+--- setup.py	2008-04-07 15:10:32.989740409 +0300
++++ setup.py	2008-04-07 15:11:13.897709903 +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
diff --git a/dev-python/lxml/lxml-2.0.4.ebuild b/dev-python/lxml/lxml-2.0.4.ebuild
new file mode 100644
index 0000000..bb9d4c0
--- /dev/null
+++ b/dev-python/lxml/lxml-2.0.4.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.4 2008/04/08 09:38:57 armin76 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 ~ppc64 ~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}/${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"
+}