commit: da33dd882cd94c5e77764cb73ef7cce3193f23b3 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Thu Dec 22 22:22:10 2016 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Thu Dec 22 22:45:46 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da33dd88
dev-python/lxml: Removed old. Package-Manager: Portage-2.3.3, Repoman-2.3.1 dev-python/lxml/Manifest | 2 - .../lxml/files/lxml-3.4.4-cross-compile.patch | 36 ---------- dev-python/lxml/lxml-3.4.4-r1.ebuild | 81 ---------------------- dev-python/lxml/lxml-3.4.4.ebuild | 78 --------------------- dev-python/lxml/lxml-3.5.0-r1.ebuild | 81 ---------------------- dev-python/lxml/lxml-3.5.0.ebuild | 70 ------------------- 6 files changed, 348 deletions(-) diff --git a/dev-python/lxml/Manifest b/dev-python/lxml/Manifest index ac265e4..4f34f2f 100644 --- a/dev-python/lxml/Manifest +++ b/dev-python/lxml/Manifest @@ -1,5 +1,3 @@ -DIST lxml-3.4.4.tar.gz 3537508 SHA256 b3d362bac471172747cda3513238f115cbd6c5f8b8e6319bf6a97a7892724099 SHA512 94453ff0562fc18a4b43555271e2469556255b69daf5f801d1a0f1ff29fd73f4b46d4faba9bfe86b42cfdac31005a0d3cfcbf230e0c7593dd5fc6461afcad906 WHIRLPOOL 6debafb391c94bd57510498c8261a511759f52feb3065c8bdf3103b177b1ddcbad54968f1eceac07b97e42087a1c59a060a3719f9ea9d25a662da34bf314b89e -DIST lxml-3.5.0.tar.gz 3810202 SHA256 349f93e3a4b09cc59418854ab8013d027d246757c51744bf20069bc89016f578 SHA512 9b728642bec22be39aef603050121715521603a50bc01d3851e1eb7bfc6302c991da3a3bdebfdeaa9038e19fe39d8286f60851fecf1c4e85469f0ed8fa6e9368 WHIRLPOOL 50b9d3767377a5dee7359e4651bb91bc84539cbc18b552f07b9cf9b9f3f263c8cc3aae64adafb88a78776235a5f3780342d7b29cd369b77e8dc9ef8f8739a290 DIST lxml-3.6.0.tar.gz 3693901 SHA256 9c74ca28a7f0c30dca8872281b3c47705e21217c8bc63912d95c9e2a7cac6bdf SHA512 2dd25a4f51e3e71b78e82e32f3838137d8b21936c23c16f901f4180277c4d4b7f14e1f47d306022cc1d13dc2e0b7f405319632e554aa989f551f424cc423d60d WHIRLPOOL 081c97bca209bc234dfb4e439da45ecde1cfd4c2da31384601c96293a5ab5def9d713bee612b4c84a5372d5b9035126ff6cbc496bd56b141f89b6a4fe916540b DIST lxml-3.6.4.tar.gz 3707675 SHA256 61d5d3e00b5821e6cda099b3b4ccfea4527bf7c595e0fb3a7a760490cedd6172 SHA512 0412b266d7a70af21f2e4e05d63c3ce63049661ef27e2bf190cbfe1e982b6980fe980a998a360796b958fa9e148ae5bb48136354d4b0bb042055340e37f61e1e WHIRLPOOL b9cd81c885a1b12c36b50f4d616214f1912baed7991a3178e9415bffff74277c849b2e7c82fd7f27fb984148267348f5a72088d0b175ebf2731a16b876988255 DIST lxml-3.7.0.tar.gz 3788603 SHA256 9c62eb2a1862e1ae285d7e7e3b7dc8772d387b19258086afcec143c6b7b8a5c9 SHA512 c34081332bcb911fb3be820300ec78e1e310fcef8b44d1b1ae28424de7f29b215b1266b1bc0ee50696b989b258e1af2774980c5bea96b403151596407522bdc8 WHIRLPOOL 050336ad26a7addeae34648fa9a30eabce4cf5b79bf84967f25854eb60ba8182b5ce21986fa4cb92081068c9561e9c4b00fde4e0f9c5929b25b5c7f0d3422bf2 diff --git a/dev-python/lxml/files/lxml-3.4.4-cross-compile.patch b/dev-python/lxml/files/lxml-3.4.4-cross-compile.patch deleted file mode 100644 index 049b884..00000000 --- a/dev-python/lxml/files/lxml-3.4.4-cross-compile.patch +++ /dev/null @@ -1,36 +0,0 @@ -use pkg-config to find libxml2/libxslt details rather than xxx-config scripts - ---- a/setupinfo.py -+++ b/setupinfo.py -@@ -87,19 +87,6 @@ def ext_modules(static_include_dirs, static_library_dirs, - source_extension = ".c" - print("Building without Cython.") - -- lib_versions = get_library_versions() -- versions_ok = True -- if lib_versions[0]: -- print("Using build configuration of libxml2 %s and libxslt %s" % -- lib_versions) -- versions_ok = check_min_version(lib_versions[0], (2, 7, 0), 'libxml2') -- else: -- print("Using build configuration of libxslt %s" % -- lib_versions[1]) -- versions_ok |= check_min_version(lib_versions[1], (1, 1, 23), 'libxslt') -- if not versions_ok: -- raise RuntimeError("Dependency missing") -- - _include_dirs = include_dirs(static_include_dirs) - _library_dirs = library_dirs(static_library_dirs) - _cflags = cflags(static_cflags) -@@ -310,8 +297,9 @@ def get_library_versions(): - - - def flags(option): -- xml2_flags = run_command(find_xml2_config(), "--%s" % option) -- xslt_flags = run_command(find_xslt_config(), "--%s" % option) -+ pkg_config = os.environ.get('PKG_CONFIG', 'pkg-config') -+ xml2_flags = run_command(pkg_config, 'libxml-2.0', '--%s' % option) -+ xslt_flags = run_command(pkg_config, 'libxslt', '--%s' % option) - - flag_list = xml2_flags.split() - for flag in xslt_flags.split(): diff --git a/dev-python/lxml/lxml-3.4.4-r1.ebuild b/dev-python/lxml/lxml-3.4.4-r1.ebuild deleted file mode 100644 index f6c571b..00000000 --- a/dev-python/lxml/lxml-3.4.4-r1.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -PYTHON_COMPAT=( python2_7 python3_{4,5} ) - -inherit distutils-r1 eutils flag-o-matic toolchain-funcs - -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 ~arm64 ~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="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" -DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( dev-python/cssselect[${PYTHON_USEDEP}] ) - " - -DISTUTILS_IN_SOURCE_BUILD=1 - -PATCHES=( - "${FILESDIR}"/${P}-cross-compile.patch - - # This patch removes a testcase that fails because of issues - # in libxml2. - # - # Upstream bug: https://bugs.launchpad.net/lxml/+bug/1608479 - "${FILESDIR}"/${PN}-3.6.4-fix-test_xmlschema.patch -) - -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 -x CFLAGS="${CFLAGS}" - append-cflags -fno-strict-aliasing - fi - tc-export PKG_CONFIG - 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 - - "${EPYTHON}" test.py -vv --all-levels -p || die "Test ${test} fails with ${EPYTHON}" -} - -python_install_all() { - if use doc; then - local DOCS=( *.txt doc/*.txt ) - local HTML_DOCS=( doc/html/. ) - fi - if use examples; then - docinto examples - dodoc -r samples/. - fi - - distutils-r1_python_install_all -} - -pkg_postinst() { - optfeature "Support for BeautifulSoup3 as a parser backend" dev-python/beautifulsoup - optfeature "Translates CSS selectors to XPath 1.0 expressions" dev-python/cssselect -} diff --git a/dev-python/lxml/lxml-3.4.4.ebuild b/dev-python/lxml/lxml-3.4.4.ebuild deleted file mode 100644 index eedde0a..00000000 --- a/dev-python/lxml/lxml-3.4.4.ebuild +++ /dev/null @@ -1,78 +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_{4,5} ) - -inherit distutils-r1 eutils flag-o-matic toolchain-funcs - -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 ~arm64 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="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" -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() { - epatch "${FILESDIR}"/${P}-cross-compile.patch - - # 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 - tc-export PKG_CONFIG - 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 -} - -pkg_postinst() { - optfeature "Support for BeautifulSoup3 as a parser backend" dev-python/beautifulsoup - optfeature "Translates CSS selectors to XPath 1.0 expressions" dev-python/cssselect -} diff --git a/dev-python/lxml/lxml-3.5.0-r1.ebuild b/dev-python/lxml/lxml-3.5.0-r1.ebuild deleted file mode 100644 index bbaf02f..00000000 --- a/dev-python/lxml/lxml-3.5.0-r1.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -PYTHON_COMPAT=( python2_7 python3_{4,5} ) - -inherit distutils-r1 eutils flag-o-matic toolchain-funcs - -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 ~arm64 ~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="doc examples +threads test" - -# Note: lib{xml2,xslt} are used as C libraries, not Python modules. -RDEPEND=" - >=dev-libs/libxml2-2.9.2 - >=dev-libs/libxslt-1.1.28" -DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( dev-python/cssselect[${PYTHON_USEDEP}] ) - " - -DISTUTILS_IN_SOURCE_BUILD=1 - -PATCHES=( - "${FILESDIR}"/${P}-cross-compile.patch - - # This patch removes a testcase that fails because of issues - # in libxml2. - # - # Upstream bug: https://bugs.launchpad.net/lxml/+bug/1608479 - "${FILESDIR}"/${PN}-3.6.4-fix-test_xmlschema.patch -) - -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 -x CFLAGS="${CFLAGS}" - append-cflags -fno-strict-aliasing - fi - tc-export PKG_CONFIG - 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 - - "${EPYTHON}" test.py -vv --all-levels -p || die "Test ${test} fails with ${EPYTHON}" -} - -python_install_all() { - if use doc; then - local DOCS=( *.txt doc/*.txt ) - local HTML_DOCS=( doc/html/. ) - fi - if use examples; then - docinto examples - dodoc -r samples/. - fi - - distutils-r1_python_install_all -} - -pkg_postinst() { - optfeature "Support for BeautifulSoup3 as a parser backend" dev-python/beautifulsoup - optfeature "Translates CSS selectors to XPath 1.0 expressions" dev-python/cssselect -} diff --git a/dev-python/lxml/lxml-3.5.0.ebuild b/dev-python/lxml/lxml-3.5.0.ebuild deleted file mode 100644 index ba76872..00000000 --- a/dev-python/lxml/lxml-3.5.0.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -PYTHON_COMPAT=( python2_7 python3_{4,5} ) - -inherit distutils-r1 eutils flag-o-matic toolchain-funcs - -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 ~arm64 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="doc examples +threads test" - -# Note: lib{xml2,xslt} are used as C libraries, not Python modules. -RDEPEND=" - >=dev-libs/libxml2-2.9.2 - >=dev-libs/libxslt-1.1.28" -DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( dev-python/cssselect[${PYTHON_USEDEP}] ) - " - -DISTUTILS_IN_SOURCE_BUILD=1 - -PATCHES=( "${FILESDIR}"/${P}-cross-compile.patch ) - -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 - tc-export PKG_CONFIG - 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 - - "${PYTHON}" test.py -vv --all-levels -p || die "Test ${test} fails with ${EPYTHON}" -} - -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 -} - -pkg_postinst() { - optfeature "Support for BeautifulSoup3 as a parser backend" dev-python/beautifulsoup - optfeature "Translates CSS selectors to XPath 1.0 expressions" dev-python/cssselect -}