Remove old, vulnerable versions (bug 509134)

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 30380381)

18 files changed, 10 insertions, 1100 deletions

diff --git a/dev-python/lxml/ChangeLog b/dev-python/lxml/ChangeLog
index 2adf6366abba..76a93198ca04 100644
--- a/dev-python/lxml/ChangeLog
+++ b/dev-python/lxml/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-python/lxml
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/lxml/ChangeLog,v 1.200 2014/05/17 13:50:27 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/lxml/ChangeLog,v 1.201 2014/06/10 12:24:12 djc Exp $
+
+  10 Jun 2014; Dirkjan Ochtman <djc@gentoo.org>
+  -files/lxml-3.0.1-skip-failing-test.patch, -files/lxml-test-elementtree.patch,
+  -lxml-2.3.4.ebuild, -lxml-2.3.5.ebuild, -lxml-2.3.6.ebuild,
+  -lxml-3.0.1.ebuild, -lxml-3.1.0.ebuild, -lxml-3.1.1.ebuild,
+  -lxml-3.1.2.ebuild, -lxml-3.2.0.ebuild, -lxml-3.2.1.ebuild,
+  -lxml-3.2.4.ebuild, -lxml-3.2.5.ebuild, -lxml-3.3.0.ebuild,
+  -lxml-3.3.1.ebuild, -lxml-3.3.2.ebuild, -lxml-3.3.3.ebuild:
+  Remove old, vulnerable versions (bug 509134)
 
   17 May 2014; Agostino Sarubbo <ago@gentoo.org> lxml-3.3.5.ebuild:
   Stable for alpha, wrt bug #509134
diff --git a/dev-python/lxml/files/lxml-3.0.1-skip-failing-test.patch b/dev-python/lxml/files/lxml-3.0.1-skip-failing-test.patch
deleted file mode 100644
index 55bf345e9c42..000000000000
--- a/dev-python/lxml/files/lxml-3.0.1-skip-failing-test.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/lxml/tests/test_xpathevaluator.py	2012-09-28 12:13:26.000000000 -0700
-+++ b/src/lxml/tests/test_xpathevaluator.py	2012-10-18 14:46:38.869913757 -0700
-@@ -587,6 +587,8 @@
-         self.assertEquals(match_dates[0].text, '2009-11-12')
- 
-     def test_xpath_exslt_functions_strings(self):
-+    	# test seems to cause memory allocation errors
-+    	return None
-         tree = self.parse('<a><b>2009-11-12</b><b>2008-12-11</b></a>')
- 
-         match_date = tree.xpath('str:replace(//b[1], "-", "*")',
diff --git a/dev-python/lxml/files/lxml-test-elementtree.patch b/dev-python/lxml/files/lxml-test-elementtree.patch
deleted file mode 100644
index d482ce7d6bee..000000000000
--- a/dev-python/lxml/files/lxml-test-elementtree.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From a7853944dacbe12097c1ef15836caeffbab8396c Mon Sep 17 00:00:00 2001
-From: Stefan Behnel <stefan_ml@behnel.de>
-Date: Sat, 4 May 2013 14:00:06 +0200
-Subject: [PATCH] prefer stdlib ET over externally installed version as the
- stdlib has taken the lead now
-
----
- src/lxml/tests/common_imports.py | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/lxml/tests/common_imports.py b/src/lxml/tests/common_imports.py
-index 645a7db..c528a3c 100644
---- a/src/lxml/tests/common_imports.py
-+++ b/src/lxml/tests/common_imports.py
-@@ -19,10 +19,10 @@ def make_version_tuple(version_string):
- IS_PYTHON3 = sys.version_info[0] >= 3
- 
- try:
--    from elementtree import ElementTree # standard ET
-+    from xml.etree import ElementTree # Python 2.5+
- except ImportError:
-     try:
--        from xml.etree import ElementTree # Python 2.5+
-+        from elementtree import ElementTree # standard ET
-     except ImportError:
-         ElementTree = None
- 
-@@ -32,10 +32,10 @@ def make_version_tuple(version_string):
-     ET_VERSION = (0,0,0)
- 
- try:
--    import cElementTree # standard ET
-+    from xml.etree import cElementTree # Python 2.5+
- except ImportError:
-     try:
--        from xml.etree import cElementTree # Python 2.5+
-+        import cElementTree # standard ET
-     except ImportError:
-         cElementTree = None
- 
--- 
-1.8.1.6
-
diff --git a/dev-python/lxml/lxml-2.3.4.ebuild b/dev-python/lxml/lxml-2.3.4.ebuild
deleted file mode 100644
index 917a2c3c5a4b..000000000000
--- a/dev-python/lxml/lxml-2.3.4.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# 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-2.3.4.ebuild,v 1.12 2012/12/27 10:48:42 armin76 Exp $
-
-EAPI="3"
-PYTHON_DEPEND="*::3.2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.3 *-jython 2.7-pypy-*"
-
-inherit distutils
-
-MY_P="${PN}-${PV/_/}"
-
-DESCRIPTION="A Pythonic binding for the libxml2 and libxslt libraries"
-HOMEPAGE="http://codespeak.net/lxml/ http://pypi.python.org/pypi/lxml"
-SRC_URI="http://codespeak.net/lxml/${MY_P}.tgz"
-# SRC_URI="http://codespeak.net/lxml/dev/${MY_P}.tgz"
-
-LICENSE="BSD ElementTree GPL-2 PSF-2"
-SLOT="0"
-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"
-
-RDEPEND=">=dev-libs/libxml2-2.7.2
-	>=dev-libs/libxslt-1.1.15
-	>=dev-python/beautifulsoup-3.0.8"
-DEPEND="${RDEPEND}
-	dev-python/setuptools"
-# lxml tarball contains files pregenerated by Cython.
-
-S="${WORKDIR}/${MY_P}"
-
-PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
-
-# Compiler warnings are suppressed without --warnings option.
-DISTUTILS_GLOBAL_OPTIONS=("--warnings")
-
-src_compile() {
-	distutils_src_compile $(use threads || echo --without-threading)
-}
-
-src_test() {
-	testing() {
-		# Tests broken with Python 3.
-		[[ "${PYTHON_ABI}" == 3.* ]] && return
-
-		local module
-		for module in lxml/etree lxml/objectify; do
-			ln -fs "../../$(ls -d build-${PYTHON_ABI}/lib.*)/${module}.so" "src/${module}.so" || die "ln -fs src/${module} failed"
-		done
-
-		local exit_status="0" test
-		for test in test.py selftest.py selftest2.py; do
-			einfo "Running ${test}"
-			if ! PYTHONPATH="$(ls -d build-${PYTHON_ABI}/lib.*)" "$(PYTHON)" "${test}"; then
-				eerror "${test} failed with $(python_get_implementation) $(python_get_version)"
-				exit_status="1"
-			fi
-		done
-
-		return "${exit_status}"
-	}
-	python_execute_function testing
-}
-
-src_install() {
-	distutils_src_install
-
-	if use doc; then
-		dohtml -r doc/html/* || die "Installation of documentation failed"
-		dodoc *.txt || die "Installation of documentation failed"
-		docinto doc
-		dodoc doc/*.txt || die "Installation of documentation failed"
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r samples/* || die "Installation of examples failed"
-	fi
-}
diff --git a/dev-python/lxml/lxml-2.3.5.ebuild b/dev-python/lxml/lxml-2.3.5.ebuild
deleted file mode 100644
index 6b8f440ab1f4..000000000000
--- a/dev-python/lxml/lxml-2.3.5.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# 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-2.3.5.ebuild,v 1.3 2012/10/13 18:43:05 armin76 Exp $
-
-EAPI="4"
-PYTHON_DEPEND="*::3.2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.3 *-jython 2.7-pypy-*"
-
-inherit distutils
-
-MY_P="${PN}-${PV/_/}"
-
-DESCRIPTION="A Pythonic binding for the libxml2 and libxslt libraries"
-HOMEPAGE="http://codespeak.net/lxml/ http://pypi.python.org/pypi/lxml"
-SRC_URI="http://codespeak.net/lxml/${MY_P}.tgz"
-# SRC_URI="http://codespeak.net/lxml/dev/${MY_P}.tgz"
-
-LICENSE="BSD ElementTree GPL-2 PSF-2"
-SLOT="0"
-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"
-
-RDEPEND=">=dev-libs/libxml2-2.7.2
-	>=dev-libs/libxslt-1.1.15
-	>=dev-python/beautifulsoup-3.0.8"
-DEPEND="${RDEPEND}
-	dev-python/setuptools"
-# lxml tarball contains files pregenerated by Cython.
-
-S="${WORKDIR}/${MY_P}"
-
-PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
-
-# Compiler warnings are suppressed without --warnings option.
-DISTUTILS_GLOBAL_OPTIONS=("*-cpython --warnings")
-
-src_compile() {
-	distutils_src_compile $(use threads || echo --without-threading)
-}
-
-src_test() {
-	testing() {
-		# Tests broken with Python 3.
-		[[ "${PYTHON_ABI}" == 3.* ]] && return
-
-		local module
-		for module in lxml/etree lxml/objectify; do
-			ln -fs "../../$(ls -d build-${PYTHON_ABI}/lib.*)/${module}.so" "src/${module}.so" || die "ln -fs src/${module} failed"
-		done
-
-		local exit_status="0" test
-		for test in test.py selftest.py selftest2.py; do
-			einfo "Running ${test}"
-			if ! PYTHONPATH="$(ls -d build-${PYTHON_ABI}/lib.*)" "$(PYTHON)" "${test}"; then
-				eerror "${test} failed with $(python_get_implementation) $(python_get_version)"
-				exit_status="1"
-			fi
-		done
-
-		return "${exit_status}"
-	}
-	python_execute_function testing
-}
-
-src_install() {
-	distutils_src_install
-
-	if use doc; then
-		dohtml -r doc/html/*
-		dodoc *.txt
-		docinto doc
-		dodoc doc/*.txt
-	fi
-
-	if use examples; then
-		docinto examples
-		dodoc -r samples/*
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-python/lxml/lxml-2.3.6.ebuild b/dev-python/lxml/lxml-2.3.6.ebuild
deleted file mode 100644
index 4ea84004c76d..000000000000
--- a/dev-python/lxml/lxml-2.3.6.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# 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-2.3.6.ebuild,v 1.3 2012/10/13 18:43:05 armin76 Exp $
-
-EAPI="4"
-PYTHON_DEPEND="*::3.2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.3 *-jython 2.7-pypy-*"
-
-inherit distutils
-
-MY_P="${PN}-${PV/_/}"
-
-DESCRIPTION="A Pythonic binding for the libxml2 and libxslt libraries"
-HOMEPAGE="http://codespeak.net/lxml/ http://pypi.python.org/pypi/lxml"
-SRC_URI="http://codespeak.net/lxml/${MY_P}.tgz"
-# SRC_URI="http://codespeak.net/lxml/dev/${MY_P}.tgz"
-
-LICENSE="BSD ElementTree GPL-2 PSF-2"
-SLOT="0"
-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"
-
-RDEPEND=">=dev-libs/libxml2-2.7.2
-	>=dev-libs/libxslt-1.1.15
-	>=dev-python/beautifulsoup-3.0.8"
-DEPEND="${RDEPEND}
-	dev-python/setuptools"
-# lxml tarball contains files pregenerated by Cython.
-
-S="${WORKDIR}/${MY_P}"
-
-PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
-
-# Compiler warnings are suppressed without --warnings option.
-DISTUTILS_GLOBAL_OPTIONS=("*-cpython --warnings")
-
-src_compile() {
-	distutils_src_compile $(use threads || echo --without-threading)
-}
-
-src_test() {
-	testing() {
-		# Tests broken with Python 3.
-		[[ "${PYTHON_ABI}" == 3.* ]] && return
-
-		local module
-		for module in lxml/etree lxml/objectify; do
-			ln -fs "../../$(ls -d build-${PYTHON_ABI}/lib.*)/${module}.so" "src/${module}.so" || die "ln -fs src/${module} failed"
-		done
-
-		local exit_status="0" test
-		for test in test.py selftest.py selftest2.py; do
-			einfo "Running ${test}"
-			if ! PYTHONPATH="$(ls -d build-${PYTHON_ABI}/lib.*)" "$(PYTHON)" "${test}"; then
-				eerror "${test} failed with $(python_get_implementation) $(python_get_version)"
-				exit_status="1"
-			fi
-		done
-
-		return "${exit_status}"
-	}
-	python_execute_function testing
-}
-
-src_install() {
-	distutils_src_install
-
-	if use doc; then
-		dohtml -r doc/html/*
-		dodoc *.txt
-		docinto doc
-		dodoc doc/*.txt
-	fi
-
-	if use examples; then
-		docinto examples
-		dodoc -r samples/*
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-python/lxml/lxml-3.0.1.ebuild b/dev-python/lxml/lxml-3.0.1.ebuild
deleted file mode 100644
index 1bdd08ea4704..000000000000
--- a/dev-python/lxml/lxml-3.0.1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2013 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.14 2013/09/05 18:46:13 mgorny Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
-
-inherit distutils-r1
-
-MY_P="${PN}-${PV/_/}"
-
-DESCRIPTION="A Pythonic binding for the libxml2 and libxslt libraries"
-HOMEPAGE="http://codespeak.net/lxml/ http://pypi.python.org/pypi/lxml"
-SRC_URI="http://codespeak.net/lxml/${MY_P}.tgz"
-# SRC_URI="http://codespeak.net/lxml/dev/${MY_P}.tgz"
-
-LICENSE="BSD ElementTree GPL-2 PSF-2"
-SLOT="0"
-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"
-
-# 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"
-
-# Note: lib{xml2,xslt} are used as C libraries, not Python modules.
-RDEPEND=">=dev-libs/libxml2-2.7.2
-	>=dev-libs/libxslt-1.1.15
-	dev-python/beautifulsoup[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-# lxml tarball contains files pregenerated by Cython.
-
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
-	local PATCHES=( "${FILESDIR}/${P}-skip-failing-test.patch" )
-
-	# avoid replacing PYTHONPATH in tests.
-	sed -i -e '/sys\.path/d' test.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# Tests broken with Python 3, generally due to Unicode.
-	[[ ${EPYTHON} == python3.* ]] && return
-
-	cp -r -l src/lxml/tests "${BUILD_DIR}"/lib/lxml/ || die
-	cp -r -l src/lxml/html/tests "${BUILD_DIR}"/lib/lxml/html/ || die
-	ln -s "${S}"/doc "${BUILD_DIR}"/ || die
-
-	local test
-	for test in test.py selftest.py selftest2.py; do
-		einfo "Running ${test}"
-		"${PYTHON}" ${test} || die "Test ${test} fails with ${EPYTHON}"
-	done
-}
-
-python_install_all() {
-	if use doc; then
-		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/*
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-python/lxml/lxml-3.1.0.ebuild b/dev-python/lxml/lxml-3.1.0.ebuild
deleted file mode 100644
index a83e3d73fd4b..000000000000
--- a/dev-python/lxml/lxml-3.1.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/lxml/lxml-3.1.0.ebuild,v 1.2 2013/09/05 18:46:13 mgorny Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
-
-inherit distutils-r1
-
-DESCRIPTION="A Pythonic binding for the libxml2 and libxslt libraries"
-HOMEPAGE="http://lxml.de/ http://pypi.python.org/pypi/lxml/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD ElementTree GPL-2 PSF-2"
-SLOT="0"
-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"
-
-# Note: lib{xml2,xslt} are used as C libraries, not Python modules.
-RDEPEND=">=dev-libs/libxml2-2.7.2
-	>=dev-libs/libxslt-1.1.15
-	dev-python/beautifulsoup[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-# lxml tarball contains files pregenerated by Cython.
-
-python_prepare_all() {
-	# avoid replacing PYTHONPATH in tests.
-	sed -i -e '/sys\.path/d' test.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	cp -r -l src/lxml/tests "${BUILD_DIR}"/lib/lxml/ || die
-	cp -r -l src/lxml/html/tests "${BUILD_DIR}"/lib/lxml/html/ || die
-	ln -s "${S}"/doc "${BUILD_DIR}"/ || die
-
-	local test
-	for test in test.py selftest.py selftest2.py; do
-		einfo "Running ${test}"
-		"${PYTHON}" ${test} || die "Test ${test} fails with ${EPYTHON}"
-	done
-}
-
-python_install_all() {
-	if use doc; then
-		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/*
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-python/lxml/lxml-3.1.1.ebuild b/dev-python/lxml/lxml-3.1.1.ebuild
deleted file mode 100644
index f8fd56730627..000000000000
--- a/dev-python/lxml/lxml-3.1.1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/lxml/lxml-3.1.1.ebuild,v 1.2 2013/09/05 18:46:13 mgorny Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
-
-inherit distutils-r1
-
-DESCRIPTION="A Pythonic binding for the libxml2 and libxslt libraries"
-HOMEPAGE="http://lxml.de/ http://pypi.python.org/pypi/lxml/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD ElementTree GPL-2 PSF-2"
-SLOT="0"
-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"
-
-# Note: lib{xml2,xslt} are used as C libraries, not Python modules.
-RDEPEND=">=dev-libs/libxml2-2.7.2
-	>=dev-libs/libxslt-1.1.15
-	dev-python/beautifulsoup[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-# lxml tarball contains files pregenerated by Cython.
-
-python_prepare_all() {
-	# avoid replacing PYTHONPATH in tests.
-	sed -i -e '/sys\.path/d' test.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	cp -r -l src/lxml/tests "${BUILD_DIR}"/lib/lxml/ || die
-	cp -r -l src/lxml/html/tests "${BUILD_DIR}"/lib/lxml/html/ || die
-	ln -s "${S}"/doc "${BUILD_DIR}"/ || die
-
-	local test
-	for test in test.py selftest.py selftest2.py; do
-		einfo "Running ${test}"
-		"${PYTHON}" ${test} || die "Test ${test} fails with ${EPYTHON}"
-	done
-}
-
-python_install_all() {
-	if use doc; then
-		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/*
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-python/lxml/lxml-3.1.2.ebuild b/dev-python/lxml/lxml-3.1.2.ebuild
deleted file mode 100644
index 28c84bef57da..000000000000
--- a/dev-python/lxml/lxml-3.1.2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/lxml/lxml-3.1.2.ebuild,v 1.2 2013/09/05 18:46:13 mgorny Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
-
-inherit distutils-r1
-
-DESCRIPTION="A Pythonic binding for the libxml2 and libxslt libraries"
-HOMEPAGE="http://lxml.de/ http://pypi.python.org/pypi/lxml/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD ElementTree GPL-2 PSF-2"
-SLOT="0"
-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"
-
-# Note: lib{xml2,xslt} are used as C libraries, not Python modules.
-RDEPEND=">=dev-libs/libxml2-2.7.2
-	>=dev-libs/libxslt-1.1.15
-	dev-python/beautifulsoup[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-# lxml tarball contains files pregenerated by Cython.
-
-python_prepare_all() {
-	# avoid replacing PYTHONPATH in tests.
-	sed -i -e '/sys\.path/d' test.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	cp -r -l src/lxml/tests "${BUILD_DIR}"/lib/lxml/ || die
-	cp -r -l src/lxml/html/tests "${BUILD_DIR}"/lib/lxml/html/ || die
-	ln -s "${S}"/doc "${BUILD_DIR}"/ || die
-
-	local test
-	for test in test.py selftest.py selftest2.py; do
-		einfo "Running ${test}"
-		"${PYTHON}" ${test} || die "Test ${test} fails with ${EPYTHON}"
-	done
-}
-
-python_install_all() {
-	if use doc; then
-		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/*
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-python/lxml/lxml-3.2.0.ebuild b/dev-python/lxml/lxml-3.2.0.ebuild
deleted file mode 100644
index 5179443845b4..000000000000
--- a/dev-python/lxml/lxml-3.2.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/lxml/lxml-3.2.0.ebuild,v 1.6 2013/09/05 18:46:13 mgorny Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
-
-inherit distutils-r1 flag-o-matic
-
-DESCRIPTION="A Pythonic binding for the libxml2 and libxslt libraries"
-HOMEPAGE="http://lxml.de/ http://pypi.python.org/pypi/lxml/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD ElementTree GPL-2 PSF-2"
-SLOT="0"
-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"
-
-# Note: lib{xml2,xslt} are used as C libraries, not Python modules.
-RDEPEND=">=dev-libs/libxml2-2.7.2
-	>=dev-libs/libxslt-1.1.15
-	dev-python/beautifulsoup[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-# lxml tarball contains files pregenerated by Cython.
-
-PATCHES=( "${FILESDIR}/lxml-test-elementtree.patch" )
-
-python_prepare_all() {
-	# avoid replacing PYTHONPATH in tests.
-	sed -i -e '/sys\.path/d' test.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	if [[ ${EPYTHON} != python3* ]]; then
-		local CFLAGS=${CFLAGS}
-		append-cflags -fno-strict-aliasing
-	fi
-	distutils-r1_python_compile
-}
-
-python_test() {
-	cp -r -l src/lxml/tests "${BUILD_DIR}"/lib/lxml/ || die
-	cp -r -l src/lxml/html/tests "${BUILD_DIR}"/lib/lxml/html/ || die
-	ln -s "${S}"/doc "${BUILD_DIR}"/ || die
-
-	local test
-	for test in test.py selftest.py selftest2.py; do
-		einfo "Running ${test}"
-		"${PYTHON}" ${test} || die "Test ${test} fails with ${EPYTHON}"
-	done
-}
-
-python_install_all() {
-	if use doc; then
-		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/*
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-python/lxml/lxml-3.2.1.ebuild b/dev-python/lxml/lxml-3.2.1.ebuild
deleted file mode 100644
index 7fc57b0b4433..000000000000
--- a/dev-python/lxml/lxml-3.2.1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/lxml/lxml-3.2.1.ebuild,v 1.15 2014/02/11 19:19:33 jer Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
-
-inherit distutils-r1 flag-o-matic
-
-DESCRIPTION="A Pythonic binding for the libxml2 and libxslt libraries"
-HOMEPAGE="http://lxml.de/ http://pypi.python.org/pypi/lxml/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD ElementTree GPL-2 PSF-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="beautifulsoup3 doc examples +threads"
-
-# Note: lib{xml2,xslt} are used as C libraries, not Python modules.
-RDEPEND=">=dev-libs/libxml2-2.7.2
-	>=dev-libs/libxslt-1.1.15
-	beautifulsoup3? (
-		python_targets_python2_6? ( dev-python/beautifulsoup:python-2[python_targets_python2_6] )
-		python_targets_python2_7? ( dev-python/beautifulsoup:python-2[python_targets_python2_7] )
-		python_targets_python3_2? ( dev-python/beautifulsoup:python-3[python_targets_python3_2] )
-		python_targets_python3_3? ( dev-python/beautifulsoup:python-3[python_targets_python3_3] )
-	)"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-# lxml tarball contains files pregenerated by Cython.
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_prepare_all() {
-	# avoid replacing PYTHONPATH in tests.
-	sed -i -e '/sys\.path/d' test.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	if [[ ${EPYTHON} != python3* ]]; then
-		local CFLAGS=${CFLAGS}
-		append-cflags -fno-strict-aliasing
-	fi
-	distutils-r1_python_compile
-}
-
-python_test() {
-	cp -r -l src/lxml/tests "${BUILD_DIR}"/lib/lxml/ || die
-	cp -r -l src/lxml/html/tests "${BUILD_DIR}"/lib/lxml/html/ || die
-	ln -s "${S}"/doc "${BUILD_DIR}"/ || die
-
-	local test
-	for test in test.py selftest.py selftest2.py; do
-		einfo "Running ${test}"
-		"${PYTHON}" ${test} || die "Test ${test} fails with ${EPYTHON}"
-	done
-}
-
-python_install_all() {
-	if use doc; then
-		local DOCS=( *.txt doc/*.txt )
-		local HTML_DOCS=( doc/html/. )
-	fi
-	use examples && local EXAMPLES=( samples/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/lxml/lxml-3.2.4.ebuild b/dev-python/lxml/lxml-3.2.4.ebuild
deleted file mode 100644
index 48233f4eed30..000000000000
--- a/dev-python/lxml/lxml-3.2.4.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/lxml/lxml-3.2.4.ebuild,v 1.1 2013/11/07 20:25:32 radhermit Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
-
-inherit distutils-r1 flag-o-matic
-
-DESCRIPTION="A Pythonic binding for the libxml2 and libxslt libraries"
-HOMEPAGE="http://lxml.de/ http://pypi.python.org/pypi/lxml/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD ElementTree GPL-2 PSF-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="beautifulsoup3 doc examples +threads"
-
-# Note: lib{xml2,xslt} are used as C libraries, not Python modules.
-RDEPEND=">=dev-libs/libxml2-2.7.2
-	>=dev-libs/libxslt-1.1.15
-	beautifulsoup3? (
-		python_targets_python2_6? ( dev-python/beautifulsoup:python-2[python_targets_python2_6] )
-		python_targets_python2_7? ( dev-python/beautifulsoup:python-2[python_targets_python2_7] )
-		python_targets_python3_2? ( dev-python/beautifulsoup:python-3[python_targets_python3_2] )
-		python_targets_python3_3? ( dev-python/beautifulsoup:python-3[python_targets_python3_3] )
-	)"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-# lxml tarball contains files pregenerated by Cython.
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_prepare_all() {
-	# avoid replacing PYTHONPATH in tests.
-	sed -i -e '/sys\.path/d' test.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	if [[ ${EPYTHON} != python3* ]]; then
-		local CFLAGS=${CFLAGS}
-		append-cflags -fno-strict-aliasing
-	fi
-	distutils-r1_python_compile
-}
-
-python_test() {
-	cp -r -l src/lxml/tests "${BUILD_DIR}"/lib/lxml/ || die
-	cp -r -l src/lxml/html/tests "${BUILD_DIR}"/lib/lxml/html/ || die
-	ln -s "${S}"/doc "${BUILD_DIR}"/ || die
-
-	local test
-	for test in test.py selftest.py selftest2.py; do
-		einfo "Running ${test}"
-		"${PYTHON}" ${test} || die "Test ${test} fails with ${EPYTHON}"
-	done
-}
-
-python_install_all() {
-	if use doc; then
-		local DOCS=( *.txt doc/*.txt )
-		local HTML_DOCS=( doc/html/. )
-	fi
-	use examples && local EXAMPLES=( samples/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/lxml/lxml-3.2.5.ebuild b/dev-python/lxml/lxml-3.2.5.ebuild
deleted file mode 100644
index 7010e6247688..000000000000
--- a/dev-python/lxml/lxml-3.2.5.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/lxml/lxml-3.2.5.ebuild,v 1.1 2014/01/25 10:08:42 radhermit Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
-
-inherit distutils-r1 flag-o-matic
-
-DESCRIPTION="A Pythonic binding for the libxml2 and libxslt libraries"
-HOMEPAGE="http://lxml.de/ http://pypi.python.org/pypi/lxml/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD ElementTree GPL-2 PSF-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="beautifulsoup3 doc examples +threads"
-
-# Note: lib{xml2,xslt} are used as C libraries, not Python modules.
-RDEPEND=">=dev-libs/libxml2-2.7.2
-	>=dev-libs/libxslt-1.1.15
-	beautifulsoup3? (
-		python_targets_python2_6? ( dev-python/beautifulsoup:python-2[python_targets_python2_6] )
-		python_targets_python2_7? ( dev-python/beautifulsoup:python-2[python_targets_python2_7] )
-		python_targets_python3_2? ( dev-python/beautifulsoup:python-3[python_targets_python3_2] )
-		python_targets_python3_3? ( dev-python/beautifulsoup:python-3[python_targets_python3_3] )
-	)"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-# lxml tarball contains files pregenerated by Cython.
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_prepare_all() {
-	# avoid replacing PYTHONPATH in tests.
-	sed -i -e '/sys\.path/d' test.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	if [[ ${EPYTHON} != python3* ]]; then
-		local CFLAGS=${CFLAGS}
-		append-cflags -fno-strict-aliasing
-	fi
-	distutils-r1_python_compile
-}
-
-python_test() {
-	cp -r -l src/lxml/tests "${BUILD_DIR}"/lib/lxml/ || die
-	cp -r -l src/lxml/html/tests "${BUILD_DIR}"/lib/lxml/html/ || die
-	ln -s "${S}"/doc "${BUILD_DIR}"/ || die
-
-	local test
-	for test in test.py selftest.py selftest2.py; do
-		einfo "Running ${test}"
-		"${PYTHON}" ${test} || die "Test ${test} fails with ${EPYTHON}"
-	done
-}
-
-python_install_all() {
-	if use doc; then
-		local DOCS=( *.txt doc/*.txt )
-		local HTML_DOCS=( doc/html/. )
-	fi
-	use examples && local EXAMPLES=( samples/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/lxml/lxml-3.3.0.ebuild b/dev-python/lxml/lxml-3.3.0.ebuild
deleted file mode 100644
index 4681f660d210..000000000000
--- a/dev-python/lxml/lxml-3.3.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/lxml/lxml-3.3.0.ebuild,v 1.8 2014/03/12 10:06:34 ago Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
-
-inherit distutils-r1 flag-o-matic
-
-DESCRIPTION="A Pythonic binding for the libxml2 and libxslt libraries"
-HOMEPAGE="http://lxml.de/ http://pypi.python.org/pypi/lxml/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD ElementTree GPL-2 PSF-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="beautifulsoup3 doc examples +threads"
-
-# Note: lib{xml2,xslt} are used as C libraries, not Python modules.
-RDEPEND=">=dev-libs/libxml2-2.7.2
-	>=dev-libs/libxslt-1.1.15
-	beautifulsoup3? (
-		python_targets_python2_6? ( dev-python/beautifulsoup:python-2[python_targets_python2_6] )
-		python_targets_python2_7? ( dev-python/beautifulsoup:python-2[python_targets_python2_7] )
-		python_targets_python3_2? ( dev-python/beautifulsoup:python-3[python_targets_python3_2] )
-		python_targets_python3_3? ( dev-python/beautifulsoup:python-3[python_targets_python3_3] )
-	)"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-# lxml tarball contains files pregenerated by Cython.
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_prepare_all() {
-	# avoid replacing PYTHONPATH in tests.
-	sed -i -e '/sys\.path/d' test.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	if [[ ${EPYTHON} != python3* ]]; then
-		local CFLAGS=${CFLAGS}
-		append-cflags -fno-strict-aliasing
-	fi
-	distutils-r1_python_compile
-}
-
-python_test() {
-	cp -r -l src/lxml/tests "${BUILD_DIR}"/lib/lxml/ || die
-	cp -r -l src/lxml/html/tests "${BUILD_DIR}"/lib/lxml/html/ || die
-	ln -s "${S}"/doc "${BUILD_DIR}"/ || die
-
-	local test
-	for test in test.py selftest.py selftest2.py; do
-		einfo "Running ${test}"
-		"${PYTHON}" ${test} || die "Test ${test} fails with ${EPYTHON}"
-	done
-}
-
-python_install_all() {
-	if use doc; then
-		local DOCS=( *.txt doc/*.txt )
-		local HTML_DOCS=( doc/html/. )
-	fi
-	use examples && local EXAMPLES=( samples/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/lxml/lxml-3.3.1.ebuild b/dev-python/lxml/lxml-3.3.1.ebuild
deleted file mode 100644
index a98733a08525..000000000000
--- a/dev-python/lxml/lxml-3.3.1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/lxml/lxml-3.3.1.ebuild,v 1.1 2014/02/19 19:10:26 radhermit Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
-
-inherit distutils-r1 flag-o-matic
-
-DESCRIPTION="A Pythonic binding for the libxml2 and libxslt libraries"
-HOMEPAGE="http://lxml.de/ http://pypi.python.org/pypi/lxml/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD ElementTree GPL-2 PSF-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="beautifulsoup3 doc examples +threads"
-
-# Note: lib{xml2,xslt} are used as C libraries, not Python modules.
-RDEPEND=">=dev-libs/libxml2-2.7.2
-	>=dev-libs/libxslt-1.1.15
-	beautifulsoup3? (
-		python_targets_python2_6? ( dev-python/beautifulsoup:python-2[python_targets_python2_6] )
-		python_targets_python2_7? ( dev-python/beautifulsoup:python-2[python_targets_python2_7] )
-		python_targets_python3_2? ( dev-python/beautifulsoup:python-3[python_targets_python3_2] )
-		python_targets_python3_3? ( dev-python/beautifulsoup:python-3[python_targets_python3_3] )
-	)"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-# lxml tarball contains files pregenerated by Cython.
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_prepare_all() {
-	# avoid replacing PYTHONPATH in tests.
-	sed -i -e '/sys\.path/d' test.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	if [[ ${EPYTHON} != python3* ]]; then
-		local CFLAGS=${CFLAGS}
-		append-cflags -fno-strict-aliasing
-	fi
-	distutils-r1_python_compile
-}
-
-python_test() {
-	cp -r -l src/lxml/tests "${BUILD_DIR}"/lib/lxml/ || die
-	cp -r -l src/lxml/html/tests "${BUILD_DIR}"/lib/lxml/html/ || die
-	ln -s "${S}"/doc "${BUILD_DIR}"/ || die
-
-	local test
-	for test in test.py selftest.py selftest2.py; do
-		einfo "Running ${test}"
-		"${PYTHON}" ${test} || die "Test ${test} fails with ${EPYTHON}"
-	done
-}
-
-python_install_all() {
-	if use doc; then
-		local DOCS=( *.txt doc/*.txt )
-		local HTML_DOCS=( doc/html/. )
-	fi
-	use examples && local EXAMPLES=( samples/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/lxml/lxml-3.3.2.ebuild b/dev-python/lxml/lxml-3.3.2.ebuild
deleted file mode 100644
index 94897a465430..000000000000
--- a/dev-python/lxml/lxml-3.3.2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/lxml/lxml-3.3.2.ebuild,v 1.1 2014/03/01 05:26:32 radhermit Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
-
-inherit distutils-r1 flag-o-matic
-
-DESCRIPTION="A Pythonic binding for the libxml2 and libxslt libraries"
-HOMEPAGE="http://lxml.de/ http://pypi.python.org/pypi/lxml/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD ElementTree GPL-2 PSF-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="beautifulsoup3 doc examples +threads"
-
-# Note: lib{xml2,xslt} are used as C libraries, not Python modules.
-RDEPEND=">=dev-libs/libxml2-2.7.2
-	>=dev-libs/libxslt-1.1.15
-	beautifulsoup3? (
-		python_targets_python2_6? ( dev-python/beautifulsoup:python-2[python_targets_python2_6] )
-		python_targets_python2_7? ( dev-python/beautifulsoup:python-2[python_targets_python2_7] )
-		python_targets_python3_2? ( dev-python/beautifulsoup:python-3[python_targets_python3_2] )
-		python_targets_python3_3? ( dev-python/beautifulsoup:python-3[python_targets_python3_3] )
-	)"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-# lxml tarball contains files pregenerated by Cython.
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_prepare_all() {
-	# avoid replacing PYTHONPATH in tests.
-	sed -i -e '/sys\.path/d' test.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	if [[ ${EPYTHON} != python3* ]]; then
-		local CFLAGS=${CFLAGS}
-		append-cflags -fno-strict-aliasing
-	fi
-	distutils-r1_python_compile
-}
-
-python_test() {
-	cp -r -l src/lxml/tests "${BUILD_DIR}"/lib/lxml/ || die
-	cp -r -l src/lxml/html/tests "${BUILD_DIR}"/lib/lxml/html/ || die
-	ln -s "${S}"/doc "${BUILD_DIR}"/ || die
-
-	local test
-	for test in test.py selftest.py selftest2.py; do
-		einfo "Running ${test}"
-		"${PYTHON}" ${test} || die "Test ${test} fails with ${EPYTHON}"
-	done
-}
-
-python_install_all() {
-	if use doc; then
-		local DOCS=( *.txt doc/*.txt )
-		local HTML_DOCS=( doc/html/. )
-	fi
-	use examples && local EXAMPLES=( samples/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/lxml/lxml-3.3.3.ebuild b/dev-python/lxml/lxml-3.3.3.ebuild
deleted file mode 100644
index 6a2acc01e518..000000000000
--- a/dev-python/lxml/lxml-3.3.3.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/lxml/lxml-3.3.3.ebuild,v 1.2 2014/04/02 21:15:29 chutzpah Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7,3_{2,3,4}} )
-inherit distutils-r1 flag-o-matic
-
-DESCRIPTION="A Pythonic binding for the libxml2 and libxslt libraries"
-HOMEPAGE="http://lxml.de/ http://pypi.python.org/pypi/lxml/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD ElementTree GPL-2 PSF-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="beautifulsoup3 doc examples +threads"
-
-# Note: lib{xml2,xslt} are used as C libraries, not Python modules.
-RDEPEND="
-	>=dev-libs/libxml2-2.7.2
-	>=dev-libs/libxslt-1.1.15
-	beautifulsoup3? (
-		python_targets_python2_6? ( dev-python/beautifulsoup:python-2[python_targets_python2_6] )
-		python_targets_python2_7? ( dev-python/beautifulsoup:python-2[python_targets_python2_7] )
-		python_targets_python3_2? ( dev-python/beautifulsoup:python-3[python_targets_python3_2] )
-		python_targets_python3_3? ( dev-python/beautifulsoup:python-3[python_targets_python3_3] )
-	)"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-# lxml tarball contains files pregenerated by Cython.
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_prepare_all() {
-	# avoid replacing PYTHONPATH in tests.
-	sed -i -e '/sys\.path/d' test.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	if [[ ${EPYTHON} != python3* ]]; then
-		local CFLAGS=${CFLAGS}
-		append-cflags -fno-strict-aliasing
-	fi
-	distutils-r1_python_compile
-}
-
-python_test() {
-	cp -r -l src/lxml/tests "${BUILD_DIR}"/lib/lxml/ || die
-	cp -r -l src/lxml/html/tests "${BUILD_DIR}"/lib/lxml/html/ || die
-	ln -s "${S}"/doc "${BUILD_DIR}"/ || die
-
-	local test
-	for test in test.py selftest.py selftest2.py; do
-		einfo "Running ${test}"
-		"${PYTHON}" ${test} || die "Test ${test} fails with ${EPYTHON}"
-	done
-}
-
-python_install_all() {
-	if use doc; then
-		local DOCS=( *.txt doc/*.txt )
-		local HTML_DOCS=( doc/html/. )
-	fi
-	use examples && local EXAMPLES=( samples/. )
-
-	distutils-r1_python_install_all
-}