gentoo Easter resync : 12.04.2020

5 files changed, 6 insertions, 92 deletions

diff --git a/dev-python/lxml/Manifest b/dev-python/lxml/Manifest
index c9ccc1dbd7cc..3c38f5daeee7 100644
--- a/dev-python/lxml/Manifest
+++ b/dev-python/lxml/Manifest
@@ -1,12 +1,10 @@
 AUX lxml-3.5.0-cross-compile.patch 1518 BLAKE2B 70907747332021789933759d3e2620d7b70a223664608680663472b648e2da103362bcbba6ee025375579cc2699432a44fc9b44169ba9c830ad546ebd3abd451 SHA512 b53925979e554552e72e58e06df579d2eb0190cadc304d13766852eaaeec78641deb1ef10700a0b52aebbdc998979830413a76a56cf221bce2e9a24926e1680b
 AUX lxml-4.4.2-tests-pypy.patch 17078 BLAKE2B 2dc3bc4f8b1de65f3b287d921880e2632cf3268b0e944846cd641903b382a0065d820093448069fbea318a3bf181b375a441dbf8aa903f0ee71f2ae819358adf SHA512 9a5c021b8cc2cd6cd4a609adb858e582172675aa5bc106ce03f88da95c71d7b2afc04394728e8297b316f6312d338f170a87b4937cda78d78c56e80a3308e3f5
 AUX lxml-4.5.0-tests-pypy.patch 17429 BLAKE2B d27a093c8419e0a9a8a192c91f0f764868aa0164851d3f8650eacda14ecca836b306321de81768b64788ebd013d1916ce2e608d9f000c0699b969cb13fc67ffb SHA512 dfe9bcfd035edbb7e931f9827405f6df449aa9b572970fe4c11e666977df874584bfba12145f79b3d59723da004815f9ec2f708398ef4d8205ad7c3954884361
-DIST lxml-4.3.3.tar.gz 4378439 BLAKE2B 30c2a29e58951164fbff1c9d23362d46987c86b671e0cfa6cf15cbbb3db23ead856786babe57ce553f7b8a66d8ac333410ea1bb3b8b521aac43a038b90daf488 SHA512 cbc1cd30bac4b9ac845d99949c8c231a7870398f942695df5a00586d70d0f6b6ebd457a1a9306806af7d0fd521a14c54d266902943263927a0d940abc3cdf5c0
 DIST lxml-4.4.2.tar.gz 940286 BLAKE2B 28366d1673b356f980cedc64839f070e8166906705bc948af24bba369153accc0a4cea0372e87530227be88a89a0dab4d23308b75fd695f55fdb73e6326aa03b SHA512 af6608df7e47513644b841ecb6291e655122927cb439bd2ae694fd344cf5dca621e3e1ce6b40accc6db9e0c4383b5b3e6c6f9ff19f35c4daf30f119a217113ca
 DIST lxml-4.4.3.tar.gz 940482 BLAKE2B 9ece0314d7b8ef82d70e83f6b77e4abef99d486a0168497f1f97e6a93d81d58e522e259d3569373d2429ac3190a642e8d1107dbae29ca20ec56636f7576545b6 SHA512 7b07450a243595bd412a43e73a55fafda0e6a6e41ed47c5488ee8e6cbd04d48a93db1b06f8b646bdc6377cad063aa53781cf41e3048f9dd7a62ccecc20900298
 DIST lxml-4.5.0.tar.gz 942013 BLAKE2B 24535fb74c58baff26c47c4bfe4ade0155044b30d099f1990c11406eca34e6bb8255631e5b30172adcf95fc61d1ab9d0384dbf9910c7694beed11cbb99595008 SHA512 b4b4692cffb7b8d074e72033711e17df2529d0747c4d086926855bb5a39478e7aea2bc195d201ca3c252822b231dbe47aaedc647e50bbd6b24754668beaa60ca
-EBUILD lxml-4.3.3.ebuild 2437 BLAKE2B 73fb2f05738a79448b324a20e9a79ec981889511cbc33bde9ec00797eb7e67db85fca94be070cb752203749a5796a60d8bc6a1aba9ae76156c6aae96f9bc9d50 SHA512 33c12f61dd02d7608c21923e9a96a56a9b60f286fc3d97de30780e69cf804dd60b8a0eea9f8cc3a107eb2f6cb119807b7c174cb9b7f8708ed54e5d77cf16851f
-EBUILD lxml-4.4.2.ebuild 2292 BLAKE2B f602993694754b2d07f683adf5faad71708e2ac27c0cd97ef78ec056d8721eb73fdea4b41eb13a437b4e1d79752971f14c6755ed7832a300f74362a8130a19dd SHA512 6e16b2eb4a9b4895dbfc0ed1decc13be6dbe18545e562d41553d01af1a053ad2cd34ff256e2c323d9fd5312bda1e7af0e4c9ac77eadd5696b8626b1ce969f2be
-EBUILD lxml-4.4.3.ebuild 2301 BLAKE2B 7cb17345b72b32f3b21b5b6299b8b1f7359557c5daf11ccf868448f03cba781ea7ea4f9c19e600a28753ae863f6fe988b6fd7c2336be53f8862427501c70c120 SHA512 cd99aa11d270e67bed34ac21aa71770ad3a0c143a97d12d2c4d35532d6c51aa92fa6bda2ed2f684e4087db8d247f108ee72cbe7f7cddc80d71430e834ada011c
-EBUILD lxml-4.5.0.ebuild 2301 BLAKE2B d96936664a021c04a3192c699c6671c3394d8a8827866bdac813c098956a9e193a60c985d332a56efe214fdbbee2c25c357ae738a8fa8565f5fa3329e17418fd SHA512 b158f2bc2b8b0344248395f8b264da9e818435e2c2ba8e0b9c901b9a75ef0f67780d1f5143c8b1d01657ecb599e674a2c753745bb6fac95a34e39b6a1b8bd7e6
+EBUILD lxml-4.4.2.ebuild 2288 BLAKE2B f4ab2fc35a719144270e23e151d1fcf7bf2ab675f44f0dde0efab7b7f8a3a0393a3d4087fbdd4397508e570f605d3aee81fafc5a170b0bf61508d3e6979e952f SHA512 db12c8e27d14d118c3e92cd1e1c13db7682cb6dd38c74de0a90276004f34405abd4fcd7949d9c119c57fad2da8a98d1e55f642083e60def2a4880f1bcc48d7a0
+EBUILD lxml-4.4.3.ebuild 2297 BLAKE2B f8ec2b54edeade0a78d7464f697106408b29d4fb20c0c34b5da6b87cce6436ac70ccf1ede0d06aaefd6ae4fe6ded010e5e7a60dc7fc2d8bd78910ef24716d2d0 SHA512 672e4cba7065e9f33bd2da2dc068b7b63d59cf44f26a7d31d0b950fc2bf51a508bbc257fd1604da897650bd7a6840c55c99fbc20b2717fe5aaa0520c859e04cd
+EBUILD lxml-4.5.0.ebuild 2290 BLAKE2B a1feb1aa54264050a2ef77c1101c76b11823aecfbcca20ff833894aebed22efdd99d09700d4b1837a9eb66ec17387b9f22e783d2df85041099dd0faa0e9fad72 SHA512 b5cdb8fe18ab513d761df659695d57793d2081b7045860f8e89c268bc7b0c5d1a0d646fab85c0d66db365c26c38e224930b48d91c0fc05fc1faeb1763d96efdf
 MISC metadata.xml 317 BLAKE2B ba93bbba5105423b6640b86b29f2a54ff50c9daf42424915cfe25049e983ca03c6f2fc066d4e27fe42292e8290b7091bc00d5a40f49d368a3dd6acce42c4504e SHA512 900609bfd7cd032821afb5d1f6e5c25287178f06a49e59431a710d4e76187a2b41a4a0da383d257777a2120b60f15620da37c70d145eca4a84aa30a08b824fae
diff --git a/dev-python/lxml/lxml-4.3.3.ebuild b/dev-python/lxml/lxml-4.3.3.ebuild
deleted file mode 100644
index 2a00e922abb7..000000000000
--- a/dev-python/lxml/lxml-4.3.3.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-
-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"
-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 ~riscv s390 ~sh 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 )"
-
-# Note: lib{xml2,xslt} are used as C libraries, not Python modules.
-RDEPEND="
-	>=dev-libs/libxml2-2.9.5
-	>=dev-libs/libxslt-1.1.28"
-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}] )
-	"
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.5.0-cross-compile.patch
-)
-
-python_prepare_all() {
-	# avoid replacing PYTHONPATH in tests.
-	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 ! python_is_python3; then
-		local -x CFLAGS="${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=( 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/beautifulsoup
-	optfeature "Translates CSS selectors to XPath 1.0 expressions" dev-python/cssselect
-}
diff --git a/dev-python/lxml/lxml-4.4.2.ebuild b/dev-python/lxml/lxml-4.4.2.ebuild
index ae97f0a89c8d..70dea853ab16 100644
--- a/dev-python/lxml/lxml-4.4.2.ebuild
+++ b/dev-python/lxml/lxml-4.4.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/lxml/lxml/archive/${P}.tar.gz"
 
 LICENSE="BSD ElementTree GPL-2 PSF-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 ~sh 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 )"
 
diff --git a/dev-python/lxml/lxml-4.4.3.ebuild b/dev-python/lxml/lxml-4.4.3.ebuild
index 8e5f5c5c5482..c5cc42ed9a7b 100644
--- a/dev-python/lxml/lxml-4.4.3.ebuild
+++ b/dev-python/lxml/lxml-4.4.3.ebuild
@@ -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 ~sh ~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 )"
 
diff --git a/dev-python/lxml/lxml-4.5.0.ebuild b/dev-python/lxml/lxml-4.5.0.ebuild
index 669878e08cd1..3ccfceb26040 100644
--- a/dev-python/lxml/lxml-4.5.0.ebuild
+++ b/dev-python/lxml/lxml-4.5.0.ebuild
@@ -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 ~sh ~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 )"