gentoo resync : 12.01.2019

4 files changed, 29 insertions, 63 deletions

diff --git a/dev-python/lxml/Manifest b/dev-python/lxml/Manifest
index 78cc3664dd6f..fb543505572e 100644
--- a/dev-python/lxml/Manifest
+++ b/dev-python/lxml/Manifest
@@ -1,7 +1,6 @@
 AUX lxml-3.5.0-cross-compile.patch 1518 BLAKE2B 70907747332021789933759d3e2620d7b70a223664608680663472b648e2da103362bcbba6ee025375579cc2699432a44fc9b44169ba9c830ad546ebd3abd451 SHA512 b53925979e554552e72e58e06df579d2eb0190cadc304d13766852eaaeec78641deb1ef10700a0b52aebbdc998979830413a76a56cf221bce2e9a24926e1680b
-AUX lxml-3.6.4-fix-test_xmlschema.patch 1483 BLAKE2B 95c7610f2626471ca76946993463eb243501916788f4812f4489ab86f3b49494298bfa780b4d06ff8fc75d46ecf969ae389e4e418631250b5c610225f46a11d9 SHA512 5ea10849df7966b8e1c55a699c1489f72714449de3564ee13b5d9410877db3691e82c1d37cb6ea60c30c2deac33bb839583f0bb81a3551baac39bf14ca066229
-DIST lxml-4.1.1.tar.gz 2380804 BLAKE2B 4d3c4ef0472c7af7bb4185142a8274b596dd55a908d41f5295d0a78031a7efb3aef8893ca739f8db0675e44d4b0c346746a2758d31a54825c06a153203599ab9 SHA512 9542e5206f9b2f9e072c52ef8e6cf44d1aaae8ae3e7ca7e820c1fac12e716503308ccb3cebc52155b4c93799f3ebca247781fc491524d004378bd26f5cddb9d1
 DIST lxml-4.2.5.tar.gz 4414081 BLAKE2B c1c75a0a0c33011e2becb729de2c15dd786dd12bddeba4f2f26032d0d17104f258b471f5f961cbf96340df66cbce3e874d7a16c59731af280a309132b669d1b9 SHA512 4cf336d3e1471e8a26492760a143881517d12eb1c2dad82f8786540471bfabd68f8c795d97b7362166418c2be3c7996816638fdbd5a594536b9981478b90fdfe
-EBUILD lxml-4.1.1.ebuild 2255 BLAKE2B ac130330e175fc5639729716306218108619bf2e681e4f9338f08fee19a8687c76918a6cedfb967ba5279db1dd351b882c61a8785595e857eecfac7d4130211f SHA512 d46331d190b2a450a25f8049513b4eb949cefc664a432be3dbb3e9d1760706ce18ad3d6f59b858211be96cd022c1c31d5f434db5f34b8f20206403e41e2fbe1e
-EBUILD lxml-4.2.5.ebuild 2353 BLAKE2B 5ac6a995b3fed4b292a529f8d112f6c212dbdf4d5aba3c7c6d05da720c1b79a78919e9f3919e793440b280df4f5947dcf00d88946152da1b681466ad6bc803fc SHA512 96c71b0b55be968fe85765f9043e44bb517e4cd7e420e45dbb3fbd269cdf390fb60ec588873498d63bb07977206534c6d9bb2b787e68955f7da6b6469391642f
+DIST lxml-4.3.0.tar.gz 2483162 BLAKE2B 3f3646a47a0344af22bfb567a0985a27e8a46051850e99b5e82d0bc59c94c0e9b19ca93cf6d5d790599e81c9513686c3462ad6544ad658d0efd77ad431b07014 SHA512 49d122c8a6dafe50195bc8cfb3ea52780054a57762132c000cd976fdbdbabaab6bc8b95b77d124ae144f33c24d71793a2debbebf789d5ca866734a984edac8bb
+EBUILD lxml-4.2.5.ebuild 2350 BLAKE2B 9dae62d57ba95ad0ddc7358552fe2160fcfc70292b0a91d98d7b75fe4bd72b7638ce9febdf64bf504ff4709241f4054052792f05d90a969730ddc02739a8a811 SHA512 f8320c3324b14db07b442074734363744239b3f69e555b2d6a7cf6beb50349fda22992353923d5e142f04e00e6b5f257d1d9f84999fc5d1e6fe649414e2c6d7b
+EBUILD lxml-4.3.0.ebuild 2444 BLAKE2B 63e3cee7de3363d948a5bd34e50a0d90d771b94895e18a7249c66ed60b19ffa4703af30d0390bf21bd9f6af581db463d617e0477959f7c6a5115d6b2bc538062 SHA512 0c0fef86e16ec497f4a42f7aac2e53979ea5098131eee87912788f64716d118267baf8e29096df27096ae412c098128e2a9c629866c607f8d089ae9b207705bf
 MISC metadata.xml 317 BLAKE2B ba93bbba5105423b6640b86b29f2a54ff50c9daf42424915cfe25049e983ca03c6f2fc066d4e27fe42292e8290b7091bc00d5a40f49d368a3dd6acce42c4504e SHA512 900609bfd7cd032821afb5d1f6e5c25287178f06a49e59431a710d4e76187a2b41a4a0da383d257777a2120b60f15620da37c70d145eca4a84aa30a08b824fae
diff --git a/dev-python/lxml/files/lxml-3.6.4-fix-test_xmlschema.patch b/dev-python/lxml/files/lxml-3.6.4-fix-test_xmlschema.patch
deleted file mode 100644
index 13f963ab2e2f..000000000000
--- a/dev-python/lxml/files/lxml-3.6.4-fix-test_xmlschema.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/src/lxml/tests/test_xmlschema.py b/src/lxml/tests/test_xmlschema.py
-index 26d8432..b41c097 100644
---- a/src/lxml/tests/test_xmlschema.py
-+++ b/src/lxml/tests/test_xmlschema.py
-@@ -168,31 +168,6 @@ class ETreeXMLSchemaTestCase(HelperTestCase):
-         self.assertEqual('ho', root[2].get('hardy'))
-         self.assertEqual('hey', root[3].get('hardy'))
- 
--    def test_xmlschema_parse_fixed_attributes(self):
--        # does not work as of libxml2 2.7.3
--        schema = self.parse('''
--<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
--  <xsd:element name="a" type="AType"/>
--  <xsd:complexType name="AType">
--    <xsd:sequence minOccurs="3" maxOccurs="3">
--      <xsd:element name="b" type="BType" />
--    </xsd:sequence>
--  </xsd:complexType>
--  <xsd:complexType name="BType">
--    <xsd:attribute name="hardy" type="xsd:string" fixed="hey" />
--  </xsd:complexType>
--</xsd:schema>
--''')
--        schema = etree.XMLSchema(schema)
--        parser = etree.XMLParser(schema=schema, attribute_defaults=True)
--
--        tree_valid = self.parse('<a><b/><b hardy="hey"/><b/></a>',
--                                parser=parser)
--        root = tree_valid.getroot()
--        self.assertEqual('hey', root[0].get('hardy'))
--        self.assertEqual('hey', root[1].get('hardy'))
--        self.assertEqual('hey', root[2].get('hardy'))
--
-     def test_xmlschema_stringio(self):
-         schema_file = BytesIO('''
- <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
diff --git a/dev-python/lxml/lxml-4.2.5.ebuild b/dev-python/lxml/lxml-4.2.5.ebuild
index 83887cb6fdc8..db70a534b3aa 100644
--- a/dev-python/lxml/lxml-4.2.5.ebuild
+++ b/dev-python/lxml/lxml-4.2.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ 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 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~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.
diff --git a/dev-python/lxml/lxml-4.1.1.ebuild b/dev-python/lxml/lxml-4.3.0.ebuild
index c2534ff1fe52..38415295fbb3 100644
--- a/dev-python/lxml/lxml-4.1.1.ebuild
+++ b/dev-python/lxml/lxml-4.3.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy )
 
-inherit distutils-r1 eutils flag-o-matic toolchain-funcs
+inherit distutils-r1 eutils 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"
@@ -13,14 +13,17 @@ 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 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~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/libxml2-2.9.5
 	>=dev-libs/libxslt-1.1.28"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	$(python_gen_cond_dep 'dev-python/cython[${PYTHON_USEDEP}]' python2_7 'python3*')
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? ( dev-python/cssselect[${PYTHON_USEDEP}] )
 	"
@@ -29,25 +32,26 @@ DISTUTILS_IN_SOURCE_BUILD=1
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.5.0-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
+	sed -i -e '/sys\.path/d' test.py || die
+
+	# apparently logs have changed with libxslt upgrade
+	# https://bugs.launchpad.net/lxml/+bug/1782078
+	sed -i -e '/assertEqual(4, len(log)/d' src/lxml/tests/test_threading.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 [[ ${EPYTHON} != python3* ]]; then
-		local -x CFLAGS="${CFLAGS}"
-		append-cflags -fno-strict-aliasing
+	if ! python_is_python3; then
+		local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
 	fi
 	tc-export PKG_CONFIG
 	distutils-r1_python_compile
@@ -63,18 +67,17 @@ python_test() {
 
 python_install_all() {
 	if use doc; then
-		local DOCS=( *.txt doc/*.txt )
+		local DOCS=( README.rst *.txt doc/*.txt )
 		local HTML_DOCS=( doc/html/. )
 	fi
 	if use examples; then
-		docinto examples
-		dodoc -r samples/.
+		dodoc -r samples
 	fi
 
 	distutils-r1_python_install_all
 }
 
 pkg_postinst() {
-	optfeature "Support for BeautifulSoup3 as a parser backend" dev-python/beautifulsoup
+	optfeature "Support for BeautifulSoup as a parser backend" dev-python/beautifulsoup
 	optfeature "Translates CSS selectors to XPath 1.0 expressions" dev-python/cssselect
 }