gentoo resync : 30.10.2021

4 files changed, 25 insertions, 102 deletions

diff --git a/dev-python/lxml/Manifest b/dev-python/lxml/Manifest
index 658ec20f20fe..8338bae5b4bd 100644
--- a/dev-python/lxml/Manifest
+++ b/dev-python/lxml/Manifest
@@ -1,5 +1,5 @@
 AUX lxml-4.6.0-tests-pypy.patch 17417 BLAKE2B fb4c8452f1401c5d617ebbb3a944772c4da72d8261a99d3593c9886ec7c734d145f4919c61d5a4d434a3df942eb30183988965d28407fbfdae6f228c23dd5ab2 SHA512 527d330145491227319cfbf07d176f100b6d61b285a13f3e6fb0c3fb259df697de45ea22e2dd18db7d927cae32219992c542616c4c0120003b796a30974becb5
+AUX lxml-4.6.3-tests-libxml2.patch 847 BLAKE2B b16ac9e8c4c796db814b02cbe3476b443ea33796d64fe6ee3993d2ab04906dcea46923d7b23fb7cc9c534b8a6dd286eb0e9ab446e9eae18d90aa33f6df35273b SHA512 2b851c835ccbc1be07a823d928d63ceaa78df59133f14519e4fb6c71529341464c65cad05c3f8c500574a321c0340e5b6e51a267e368674329649ed765072d9f
 DIST lxml-4.6.3.tar.gz 948931 BLAKE2B 373248827cb6bc0698b632ef60978adb2b8f7c37444fa1804567f08eb669018dc38fadf52422262fd96280e88c59578d244e4c5a1ed55609af55c010b3bf2b09 SHA512 50e42d6269dc45b4c0ab3285c49307f8bee87fcc4b9e0f531e1ee37bcf83c5938b7e361f906a3158fac8df89a79b932dd64a8839455e45f45f3a5f0ba73ff6a5
-EBUILD lxml-4.6.3-r1.ebuild 2728 BLAKE2B b8b4d6251b11490b53bf6d4eeeffe61d5ce49336a26d81675332c540c8ddc33cb3f0df62320b35f3eef7fa3588c7add0abb1bdee39f7725ee2701278204d0492 SHA512 b135691777c33d9158ca6d6811d972c07fd19d16de94ec522b4200694c46c8768ff9e2109b81ca5b0afa55c75a7779805fa42e2d595330c8cd136bf6f34c2524
-EBUILD lxml-4.6.3.ebuild 2724 BLAKE2B 92ec35b5b36417763e94959a0e6783b93bf46f6fc3e21e57c08c16f1ced68ad6e54023b76f847b1895cfeabaa1e264ce06be452583a427e0701fe805b468717d SHA512 c92f437294a4b224a9c86fdc024e6cc412d1e6e4cba6c8af2c92d8eedbd20f86e6122aa8f505d1b078fa880b57b980bf683304ea5b30af597342d4d2607f1b73
+EBUILD lxml-4.6.3-r1.ebuild 2768 BLAKE2B 43b98b0121a32725ceda3a2da800a32315259db23ca2c1cc6229efbac4b8f9e635c5ad9f4478348f06861346c275201acaf093a78c287d0d8cc70cf69136ca4c SHA512 3e988f71250c111d7e8ac4c44ec0591094eb916cbbb925ad2d8d1537a515f2a5ced448e3e7789f562e4ca0211385acc47b0fc801d13497090adf31d67dcf6d6c
 MISC metadata.xml 410 BLAKE2B 3e45012300d43f9a7169f47a5778a7e6eb87511166f8769bdeb3397672747924f64fbcb64ef532df6665acd139311fb265f050ae44e51eda53716aa126d28cf1 SHA512 c84744f005bfdc76280d50aca4903fe8c2584bb272dbb56c588722e55a765f5f8b232ed634a6553c82de959909e809773a9f1d992a5f7f54fe5b21ead1f2934d
diff --git a/dev-python/lxml/files/lxml-4.6.3-tests-libxml2.patch b/dev-python/lxml/files/lxml-4.6.3-tests-libxml2.patch
new file mode 100644
index 000000000000..4c682add3a2d
--- /dev/null
+++ b/dev-python/lxml/files/lxml-4.6.3-tests-libxml2.patch
@@ -0,0 +1,22 @@
+https://github.com/lxml/lxml/commit/852ed1092bd80b6b9a51db24371047ec88843031
+https://bugs.gentoo.org/791190
+
+From: Stefan Behnel <stefan_ml@behnel.de>
+Date: Tue, 18 May 2021 22:02:02 +0200
+Subject: [PATCH] Adapt a test to a behavioural change in libxml2 2.9.11+.
+
+--- a/src/lxml/tests/test_etree.py
++++ b/src/lxml/tests/test_etree.py
+@@ -3036,7 +3036,10 @@ def test_subelement_nsmap(self):
+     def test_html_prefix_nsmap(self):
+         etree = self.etree
+         el = etree.HTML('<hha:page-description>aa</hha:page-description>').find('.//page-description')
+-        self.assertEqual({'hha': None}, el.nsmap)
++        if etree.LIBXML_VERSION < (2, 9, 11):
++            self.assertEqual({'hha': None}, el.nsmap)
++        else:
++            self.assertEqual({}, el.nsmap)
+ 
+     def test_getchildren(self):
+         Element = self.etree.Element
+
diff --git a/dev-python/lxml/lxml-4.6.3-r1.ebuild b/dev-python/lxml/lxml-4.6.3-r1.ebuild
index e0ce5bad3a36..cf132e427473 100644
--- a/dev-python/lxml/lxml-4.6.3-r1.ebuild
+++ b/dev-python/lxml/lxml-4.6.3-r1.ebuild
@@ -41,6 +41,7 @@ DISTUTILS_IN_SOURCE_BUILD=1
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-4.6.0-tests-pypy.patch
+	"${FILESDIR}"/${P}-tests-libxml2.patch
 )
 
 python_check_deps() {
diff --git a/dev-python/lxml/lxml-4.6.3.ebuild b/dev-python/lxml/lxml-4.6.3.ebuild
deleted file mode 100644
index 1e533db84d9b..000000000000
--- a/dev-python/lxml/lxml-4.6.3.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-
-inherit distutils-r1 optfeature toolchain-funcs
-
-DESCRIPTION="A Pythonic binding for the libxml2 and libxslt libraries"
-HOMEPAGE="https://lxml.de/ https://pypi.org/project/lxml/ https://github.com/lxml/lxml"
-SRC_URI="https://github.com/lxml/lxml/archive/${P}.tar.gz"
-S=${WORKDIR}/lxml-${P}
-
-LICENSE="BSD ElementTree GPL-2 PSF-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc examples +threads test"
-RESTRICT="!test? ( test )"
-
-# Note: lib{xml2,xslt} are used as C libraries, not Python modules.
-RDEPEND="
-	<dev-libs/libxml2-2.9.12
-	>=dev-libs/libxslt-1.1.28"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	dev-python/cython[${PYTHON_USEDEP}]
-	doc? (
-		$(python_gen_any_dep '
-			dev-python/docutils[${PYTHON_USEDEP}]
-			dev-python/pygments[${PYTHON_USEDEP}]
-			dev-python/sphinx[${PYTHON_USEDEP}]
-			dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-		')
-	)
-	test? ( dev-python/cssselect[${PYTHON_USEDEP}] )
-	"
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.6.0-tests-pypy.patch
-)
-
-python_check_deps() {
-	use doc || return 0
-	has_version "dev-python/docutils[${PYTHON_USEDEP}]" &&
-	has_version "dev-python/pygments[${PYTHON_USEDEP}]" &&
-	has_version "dev-python/sphinx[${PYTHON_USEDEP}]" &&
-	has_version "dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]"
-}
-
-python_prepare_all() {
-	# avoid replacing PYTHONPATH in tests.
-	sed -i -e '/sys\.path/d' test.py || die
-
-	# don't use some random SDK on Darwin
-	sed -i -e '/_ldflags =/s/=.*isysroot.*darwin.*None/= None/' \
-		setupinfo.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	if ! python_is_python3; then
-		local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
-	fi
-	tc-export PKG_CONFIG
-	distutils-r1_python_compile
-}
-
-python_compile_all() {
-	use doc && emake html
-}
-
-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=( README.rst *.txt doc/*.txt )
-		local HTML_DOCS=( doc/html/. )
-	fi
-	if use examples; then
-		dodoc -r samples
-	fi
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "Support for BeautifulSoup as a parser backend" dev-python/beautifulsoup4
-	optfeature "Translates CSS selectors to XPath 1.0 expressions" dev-python/cssselect
-}