gentoo resync : 16.09.2020

4 files changed, 5 insertions, 45 deletions

diff --git a/dev-python/lxml/Manifest b/dev-python/lxml/Manifest
index 97644fa6ba6a..35549687122e 100644
--- a/dev-python/lxml/Manifest
+++ b/dev-python/lxml/Manifest
@@ -1,8 +1,7 @@
-AUX lxml-3.5.0-cross-compile.patch 1518 BLAKE2B 70907747332021789933759d3e2620d7b70a223664608680663472b648e2da103362bcbba6ee025375579cc2699432a44fc9b44169ba9c830ad546ebd3abd451 SHA512 b53925979e554552e72e58e06df579d2eb0190cadc304d13766852eaaeec78641deb1ef10700a0b52aebbdc998979830413a76a56cf221bce2e9a24926e1680b
 AUX lxml-4.5.0-tests-pypy.patch 17429 BLAKE2B d27a093c8419e0a9a8a192c91f0f764868aa0164851d3f8650eacda14ecca836b306321de81768b64788ebd013d1916ce2e608d9f000c0699b969cb13fc67ffb SHA512 dfe9bcfd035edbb7e931f9827405f6df449aa9b572970fe4c11e666977df874584bfba12145f79b3d59723da004815f9ec2f708398ef4d8205ad7c3954884361
 AUX lxml-4.5.1-py39.patch 17992 BLAKE2B 17855768819d42b0b67f9a66c5cb1661b71385fb5f28ee275a018497fb55c5da9ae8f8284f38635ac8322ec5ac071ea7dfe496f30dcabde2293e7a6703b3147d SHA512 9c2ea59c526f0ab0a0feaed86d9fca7253582ca8bd09b7ccc6e9638100ab53b5ba716a1c61c311019d13b25cfe72fa28be5cf38eecda1d33e77315f0a7fb166d
 DIST lxml-4.5.1.tar.gz 942377 BLAKE2B 3b7434b50d7f81628f17adf0c65e38c826304674495160a216c3051d86ddd9924f2854cf35453ba8270ca461c4c5429698a002853642f9e52206de1443c6b6f0 SHA512 0f16cdcb8aa7f8c98d3fb625d6713b422c14f0d4e7348cda38eb0776f0cfa637faaabc14dc63f8052f2741c908de6f71cfcb6471d5286c09780816b46cbfb439
 DIST lxml-4.5.2.tar.gz 943480 BLAKE2B 11130d2507ff0d61637d7fef2f4b28c5fbbbfe8864504c8f3a231899be4db14e6be65edc6e780719686605663b0c5f76f161beb509dc58d16ee3a9158a7db59c SHA512 146dcb4414b7f0815c5930048d9dc89711bf0a3ee091c89f4475265cdd6f1690a20f82ec24a282a43cff8854f9b960f0cd4430cff79a7506d39ac1baf7770695
-EBUILD lxml-4.5.1.ebuild 2280 BLAKE2B 45e69675c800525b39a9f26960569910900f15d27e30425f4dcb6a59724f6962df1bd56c7e887739d82001a9ff5ba0b10219f0df23bcd3de32654380ef43206f SHA512 17d0324fe06c46be955af96a82718ae04e5fff68cbfe0c8f127ee805d8ebcd0502b6b8a63b29a8d21fc557b7d56da4264e75efbfdbc02376429c6afc1b0564b3
-EBUILD lxml-4.5.2.ebuild 2246 BLAKE2B d0e4b6b6b93e90ac0683596c0a36658f85331ecfb8d325ebe639c494d10658da99aa755d86b959c5ed9bfacb7ea898d242f9943f75019467f87a881397c042ee SHA512 60e2fca65bfb547af1adfac7bfc4890cc0ed0e49e483033de81488e8a9a1db4f9792907cb27830cd6bb345c58fea1b7ed4971ef82e44e14fc4ff3dfdc128dea1
+EBUILD lxml-4.5.1.ebuild 2284 BLAKE2B dae3e0f7151b1a660276c23eccb1a52faa631a879aadf877016765aa038b0a4d6c1fca10ee1e5fb0981c4db9f8f63badc4d9e208ca1e40adb4985421a92b9418 SHA512 855356ab8be6fdcc024eb5117d1b6f49be4390237ff8b7e7098f661ed82321f23220d80da606e925e664e11760a9a90e222393e603ffba84374b5e34878c0f5a
+EBUILD lxml-4.5.2.ebuild 2247 BLAKE2B 98bcd13a52412ffae6f8be77266db161a37ca23c27ec8092f47c853567afaa35faf30700105e3c74f0ec22162e73502b3a0c8956d65d86c0d2dd366f20025341 SHA512 4656c26d3541440c6f5cbbdbe2ffbeb52ea0d4e2c637f399c73bc13947a377bc09bcf60df99509f4ae3ffe7013b3a644131a1eeba42e615b96d08e18580a92f4
 MISC metadata.xml 317 BLAKE2B ba93bbba5105423b6640b86b29f2a54ff50c9daf42424915cfe25049e983ca03c6f2fc066d4e27fe42292e8290b7091bc00d5a40f49d368a3dd6acce42c4504e SHA512 900609bfd7cd032821afb5d1f6e5c25287178f06a49e59431a710d4e76187a2b41a4a0da383d257777a2120b60f15620da37c70d145eca4a84aa30a08b824fae
diff --git a/dev-python/lxml/files/lxml-3.5.0-cross-compile.patch b/dev-python/lxml/files/lxml-3.5.0-cross-compile.patch
deleted file mode 100644
index 82a371c72978..000000000000
--- a/dev-python/lxml/files/lxml-3.5.0-cross-compile.patch
+++ /dev/null
@@ -1,39 +0,0 @@
- setupinfo.py | 18 +++---------------
- 1 file changed, 3 insertions(+), 15 deletions(-)
-
-diff --git a/setupinfo.py b/setupinfo.py
-index e04c38f..0549eaa 100644
---- a/setupinfo.py
-+++ b/setupinfo.py
-@@ -93,19 +93,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")
--
-     base_dir = get_base_dir()
-     _include_dirs = _prefer_reldirs(
-         base_dir, include_dirs(static_include_dirs) + [INCLUDE_PACKAGE_PATH])
-@@ -358,8 +345,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-4.5.1.ebuild b/dev-python/lxml/lxml-4.5.1.ebuild
index 3759600dec7c..49c1e25edcd5 100644
--- a/dev-python/lxml/lxml-4.5.1.ebuild
+++ b/dev-python/lxml/lxml-4.5.1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} pypy3 )
 
-inherit distutils-r1 eutils toolchain-funcs
+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"
diff --git a/dev-python/lxml/lxml-4.5.2.ebuild b/dev-python/lxml/lxml-4.5.2.ebuild
index 29cf22e36c1a..5fda592375ee 100644
--- a/dev-python/lxml/lxml-4.5.2.ebuild
+++ b/dev-python/lxml/lxml-4.5.2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} pypy3 )
 
-inherit distutils-r1 eutils toolchain-funcs
+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"
@@ -14,7 +14,7 @@ S=${WORKDIR}/lxml-${P}
 
 LICENSE="BSD ElementTree GPL-2 PSF-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~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 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples +threads test"
 RESTRICT="!test? ( test )"