From e2f37a65be374b22c9cb1377b98d0a7341aeac89 Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Fri, 25 Sep 2015 09:09:07 +0200 Subject: [PATCH] dev-python/lxml: Drop old Package-Manager: portage-2.2.21 Signed-off-by: Justin Lecher --- dev-python/lxml/Manifest | 3 - .../lxml/files/lxml-3.3.x-test_etree.py.patch | 14 ---- dev-python/lxml/lxml-3.3.5.ebuild | 77 ------------------- dev-python/lxml/lxml-3.4.2.ebuild | 68 ---------------- dev-python/lxml/lxml-3.4.3.ebuild | 74 ------------------ dev-python/lxml/lxml-3.4.4.ebuild | 2 +- 6 files changed, 1 insertion(+), 237 deletions(-) delete mode 100644 dev-python/lxml/files/lxml-3.3.x-test_etree.py.patch delete mode 100644 dev-python/lxml/lxml-3.3.5.ebuild delete mode 100644 dev-python/lxml/lxml-3.4.2.ebuild delete mode 100644 dev-python/lxml/lxml-3.4.3.ebuild diff --git a/dev-python/lxml/Manifest b/dev-python/lxml/Manifest index 9799c2f0fd23..b45bfeee81a4 100644 --- a/dev-python/lxml/Manifest +++ b/dev-python/lxml/Manifest @@ -1,5 +1,2 @@ -DIST lxml-3.3.5.tar.gz 3467344 SHA256 6ad6949dc7eea744a30fba77a968dd5910f545220e58bcc813b9df5c793e318a SHA512 b6692565e95ae8856347a2cbef4d1a1614cbc34aa47fbea10cfb49f5d5690a21e577e53e7cfbe73db18190a6919a1055fe5ee5ccaf1d03dc2bc0c5cf2c81ef2e WHIRLPOOL f9e875085701264128d37458f5c03a1e6dfb0a6d3e49f88cfc90031a40f17dfb06ff57151729bb03f96d2959b1bae40b0617076ace7d695433fcd857d13ec697 DIST lxml-3.4.1.tar.gz 3524523 SHA256 069594837d0376a1bacf5cc42aa9a1be2e1c1396dc62f7d07f7358afecd34adf SHA512 ab669d1f9833e43b43ece4ef2481eebe22e9084ab07139f5c5c1fa6ea478177069d6ce96ece7eddef86982da418ec55a3785c4b78958f49f6ed415dc63af45ed WHIRLPOOL 5390f23aec3b7c07b9541f85ee5c674f267b99a9ef035cc5024d5f6defe6ee8ded500703b97b3f742f7630d25dbc538534654c8a3cddafb1ff37f5c5494bffb5 -DIST lxml-3.4.2.tar.gz 3526862 SHA256 c7d5990298af6ffb00312973a25f0cc917a6368126dd40eaab41d78d3e1ea25d SHA512 de57da48813cb6920937b23a82cf8fe389e0f215e3e5c4a873fae7a223d8df7fe693d835163cccedd23b538857ed8e5eb3f0d8e4e2c5ed33065c6fbb74604f10 WHIRLPOOL 0601d6474dad0b2dc6c47a906acc546e91e72b3e15bbf3d56d7f6c1ad2d46ae9e4007d775911ce2fef71ff06dba01d70d671379a079c92191aad13600a4e6a31 -DIST lxml-3.4.3.tar.gz 3541740 SHA256 6ce4a11ab485a67a899aa3e080c97b22a9df40c7077bd9146a821d3872cf2037 SHA512 9ce34fef03e19b13fd78f13562dba570018c6588c187452fa1a0e3db441c5583333e85386a56c243db6f0f03875b4be514f4e6084a386aa83a6e436fec992e4f WHIRLPOOL cfebfaa0a1cdb4cf9e451b0d3c7246fbf104bccd0511d4f4060862fdd88bd0699ce2b4e604afc5ae65cc037182565d8590cfe451c361ddecc4177fe09db0ffd7 DIST lxml-3.4.4.tar.gz 3537508 SHA256 b3d362bac471172747cda3513238f115cbd6c5f8b8e6319bf6a97a7892724099 SHA512 94453ff0562fc18a4b43555271e2469556255b69daf5f801d1a0f1ff29fd73f4b46d4faba9bfe86b42cfdac31005a0d3cfcbf230e0c7593dd5fc6461afcad906 WHIRLPOOL 6debafb391c94bd57510498c8261a511759f52feb3065c8bdf3103b177b1ddcbad54968f1eceac07b97e42087a1c59a060a3719f9ea9d25a662da34bf314b89e diff --git a/dev-python/lxml/files/lxml-3.3.x-test_etree.py.patch b/dev-python/lxml/files/lxml-3.3.x-test_etree.py.patch deleted file mode 100644 index 3c8667a4f497..000000000000 --- a/dev-python/lxml/files/lxml-3.3.x-test_etree.py.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- build/lib/lxml/tests/test_etree.py.orig 2015-03-15 17:01:51.337909343 +0100 -+++ build/lib/lxml/tests/test_etree.py 2015-03-15 17:04:25.059318388 +0100 -@@ -1225,6 +1225,11 @@ - root[0].attrib, {'default': 'valueB'}) - - def test_resolve_filename_dtd_relative(self): -+ # This test is broken as it tries to resolve a file path -+ # with the file:// path convention and will fail. -+ # So let's not waste our time here and return straight away. -+ return -+ - parse = self.etree.parse - parser = self.etree.XMLParser(attribute_defaults=True) - assertEqual = self.assertEqual diff --git a/dev-python/lxml/lxml-3.3.5.ebuild b/dev-python/lxml/lxml-3.3.5.ebuild deleted file mode 100644 index 3f2ee0e8223d..000000000000 --- a/dev-python/lxml/lxml-3.3.5.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -PYTHON_COMPAT=( python{2_7,3_{3,4}} ) -inherit distutils-r1 eutils flag-o-matic - -DESCRIPTION="A Pythonic binding for the libxml2 and libxslt libraries" -HOMEPAGE="http://lxml.de/ https://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_gen_cond_dep 'dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]' 'python2*') - $(python_gen_cond_dep 'dev-python/beautifulsoup:python-3[${PYTHON_USEDEP}]' 'python3*') - )" -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 - - OLDPWD=$(pwd) - cd "${BUILD_DIR}" || die "can't cd into ${BUILD_DIR}" - - # Patching test files has to happen at this precise moment. - # Not before, not after but now. - epatch "${FILESDIR}"/lxml-3.3.x-test_etree.py.patch - - cd "${OLDPWD}" - - 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.4.2.ebuild b/dev-python/lxml/lxml-3.4.2.ebuild deleted file mode 100644 index 17699a769d5d..000000000000 --- a/dev-python/lxml/lxml-3.4.2.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -PYTHON_COMPAT=( python{2_7,3_3,3_4} ) -inherit distutils-r1 flag-o-matic - -DESCRIPTION="A Pythonic binding for the libxml2 and libxslt libraries" -HOMEPAGE="http://lxml.de/ https://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 ~arm64" -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.23 - beautifulsoup3? ( - $(python_gen_cond_dep 'dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]' 'python2*') - $(python_gen_cond_dep 'dev-python/beautifulsoup:python-3[${PYTHON_USEDEP}]' 'python3*') - )" -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 '/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.4.3.ebuild b/dev-python/lxml/lxml-3.4.3.ebuild deleted file mode 100644 index 4aeedc9f0d68..000000000000 --- a/dev-python/lxml/lxml-3.4.3.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -PYTHON_COMPAT=( python2_7 python3_{3,4} ) - -inherit distutils-r1 flag-o-matic - -DESCRIPTION="A Pythonic binding for the libxml2 and libxslt libraries" -HOMEPAGE="http://lxml.de/ https://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 ~arm64" -IUSE="beautifulsoup3 doc examples +threads test" - -# Note: lib{xml2,xslt} are used as C libraries, not Python modules. -RDEPEND=" - >=dev-libs/libxml2-2.7.2 - >=dev-libs/libxslt-1.1.23 - beautifulsoup3? ( - $(python_gen_cond_dep 'dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]' 'python2*') - $(python_gen_cond_dep 'dev-python/beautifulsoup:python-3[${PYTHON_USEDEP}]' 'python3*') - )" -DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( dev-python/cssselect[${PYTHON_USEDEP}] ) - " -# lxml tarball contains files pregenerated by Cython. - -DISTUTILS_IN_SOURCE_BUILD=1 - -python_prepare_all() { - # avoid replacing PYTHONPATH in tests. - sed -i '/sys\.path/d' test.py || die - - # seems to be broken - rm src/lxml/tests/test_elementpath.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} -vv -p || 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.4.4.ebuild b/dev-python/lxml/lxml-3.4.4.ebuild index a4ea22da4003..abc003264842 100644 --- a/dev-python/lxml/lxml-3.4.4.ebuild +++ b/dev-python/lxml/lxml-3.4.4.ebuild @@ -73,6 +73,6 @@ python_install_all() { } pkg_postinst() { - optfeature "Support for BeautifulSoup as a parser backend" dev-python/beautifulsoup-3* + optfeature "Support for BeautifulSoup3 as a parser backend" dev-python/beautifulsoup optfeature "Translates CSS selectors to XPath 1.0 expressions" dev-python/cssselect } -- 2.26.2