Version bump. Drop old.

Package-Manager: portage--svn.wrabbit

4 files changed, 70 insertions, 51 deletions

diff --git a/dev-python/lxml/ChangeLog b/dev-python/lxml/ChangeLog
index 6dabc045109d..5ff16aafef14 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.45 2008/07/14 05:38:13 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/lxml/ChangeLog,v 1.46 2008/08/19 10:07:42 hawking Exp $
+
+*lxml-2.1.1 (19 Aug 2008)
+
+  19 Aug 2008; Ali Polatel <hawking@gentoo.org> -lxml-1.0.2.ebuild,
+  +lxml-2.1.1.ebuild:
+  Version bump. Drop old.
 
   14 Jul 2008; Rob Cakebread <pythonhead@gentoo.org> -lxml-2.0.2.ebuild:
   Removed crusty old 2.0.2
diff --git a/dev-python/lxml/Manifest b/dev-python/lxml/Manifest
index 3a9a608afd22..e936fa2af4f8 100644
--- a/dev-python/lxml/Manifest
+++ b/dev-python/lxml/Manifest
@@ -3,20 +3,20 @@ Hash: SHA1
 
 AUX lxml-1.0-distutils.diff 615 RMD160 ba45fc71e1c35819fcd07a772b7870c09281eb78 SHA1 eccf1cd25a2dde67add688e5248996e03b07abaa SHA256 0cd3de4b484132e090faf70b4b7b9537c4e6593ae21e604f459405c74789a67d
 AUX lxml-2.0.3-no-fake-pyrex.patch 442 RMD160 75164b0c95c96219be5bd5df529ee10a93b5545a SHA1 f98119743207a587bb1e3b5ccf8b93aa891c9516 SHA256 06d5e8be49eac6188e5ccb48c27b8307f5ddd3ab465d95f5c5adec756f3ee7ba
-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.3.tgz 2012530 RMD160 25ba3ba87bc000dfe52e5c10f3d5eddbb45fbf77 SHA1 1ffa38df8cd738653ab0c988f82617dbbbf20794 SHA256 bf08f386ce087f11e75411494ecf604bcfd1d6ac1722502c8abdc2df852bf2cd
 DIST lxml-2.0.5.tgz 2044547 RMD160 3e12da4a5b8cd559c33db2a3d81b990ef96179d1 SHA1 e04f526aef2538efeb910188ff6e906ad74e98ce SHA256 8f9a29a3f7f77f883c43184f3cf76242048d90daa9245da9f075f89acde212cc
-EBUILD lxml-1.0.2.ebuild 899 RMD160 2bb102fc801aa1db0c0d95dc00c792a8990d32d1 SHA1 8e05852b962700cf674f8012add97d68ddf31161 SHA256 243459c673568d0278ed8775e252314d38a9a9fe597c3fb34098d5a901d18ad2
+DIST lxml-2.1.1.tgz 2665557 RMD160 0907eea3dfd7e4f15ad3f7eb1d5eb69173fd8d4f SHA1 797c996d3381f59495582336daceaf50b9c14fff SHA256 f2f6e8157423abc979a42df71486d805d670764c75b509fe9a87c241c185d247
 EBUILD lxml-1.3.6.ebuild 1287 RMD160 2358704e9a2133eeac5a7695afae039f45a99dd9 SHA1 a4603e8d4dc1f8c50d9b854d470edf4f93318ad5 SHA256 ab8eabdc12fd6375979e70a2a678c4a9516a4de0497660c7215ef30032919f24
 EBUILD lxml-2.0.3.ebuild 1428 RMD160 ae5d09c2e744e79c977c01c1df8ff567b2753e0a SHA1 c3abd54c6dcbb6b1bad6d93f291a20606efd4f41 SHA256 f80390b5f362a351cab41beb909642e016410f8dc69a07a755b2e85a21fe0a36
 EBUILD lxml-2.0.5.ebuild 1450 RMD160 dda943d201b388d0557821e18325f9241c6269b6 SHA1 622af93e0088772f50b6c40812d779b00384dffa SHA256 c98903c659d951b4243acd012d8a29d864a5178226df2569ede35a7e2327937b
-MISC ChangeLog 5989 RMD160 29016f1e1787dec351204f745b4835bbdafd1269 SHA1 26e0bfe3a2a33b8e88ed60daa0e7a53340f8a8a2 SHA256 98c631b4315e4b7e0e84605473daf38c90f3eea2d71dea68722b73485168f485
+EBUILD lxml-2.1.1.ebuild 1449 RMD160 a0b940471eab0cb5aebe7c36fef54bbc13eca72d SHA1 d9a313b523b174fa501a898c87bfc469f1e48f75 SHA256 2ee62a0fa6aaef99f541f4fe2fafac4f1d04d6013af25efeb6a46380e4901b44
+MISC ChangeLog 6130 RMD160 62d0bf587a647d95433648766171f8df01a2a934 SHA1 348e2faa1d22d18674ea2afd4087ff381bc5bb93 SHA256 f46e1766585f57b86a8e7a4b0e41a826a1b08da6c87ddf4e3e664301e024b8aa
 MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkh65k8ACgkQ8aihIaC/zgD8kgCfYtp0vxdJ7JiimF9Vs//6VlYH
-A8AAoMja1i2ZFJXdWS252BFI53aha/kB
-=UEhY
+iEYEARECAAYFAkiqm3kACgkQQU4yORhF8iAsiACgzTxqMIEGZ+bti+27LWDe6Klq
+PfgAoIt9Ykp5mV+T5pbJa5jFyCqww3ST
+=1ZJe
 -----END PGP SIGNATURE-----
diff --git a/dev-python/lxml/lxml-1.0.2.ebuild b/dev-python/lxml/lxml-1.0.2.ebuild
deleted file mode 100644
index a248e209125f..000000000000
--- a/dev-python/lxml/lxml-1.0.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/lxml/lxml-1.0.2.ebuild,v 1.6 2007/07/08 07:39:58 hawking Exp $
-
-inherit distutils eutils
-
-DESCRIPTION="lxml is a Pythonic binding for the libxml2 and libxslt libraries"
-HOMEPAGE="http://codespeak.net/lxml/"
-SRC_URI="http://codespeak.net/lxml/${P}.tgz"
-
-LICENSE="BSD GPL-2 as-is"
-SLOT="0"
-KEYWORDS="~amd64 ia64 x86"
-IUSE=""
-
-DEPEND=">=dev-libs/libxml2-2.6.16
-		>=dev-libs/libxslt-1.1.12
-		>=dev-python/pyrex-0.9.3
-		virtual/python"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${PN}-1.0-distutils.diff"
-}
-
-src_test() {
-	make test
-}
-
-src_install() {
-	distutils_src_install
-
-	dohtml doc/html/*
-
-	dodoc *.txt
-	docinto doc
-	dodoc doc/*.txt
-	docinto doc/licenses
-	dodoc doc/licenses/*
-
-	insinto /usr/share/doc/${PF}
-	doins -r samples
-}
diff --git a/dev-python/lxml/lxml-2.1.1.ebuild b/dev-python/lxml/lxml-2.1.1.ebuild
new file mode 100644
index 000000000000..2d48f8a30e97
--- /dev/null
+++ b/dev-python/lxml/lxml-2.1.1.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.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"
+}