gentoo resync : 23.03.2018

3 files changed, 77 insertions, 3 deletions

diff --git a/dev-python/lxml/Manifest b/dev-python/lxml/Manifest
index 723542209511..58bee4fc8162 100644
--- a/dev-python/lxml/Manifest
+++ b/dev-python/lxml/Manifest
@@ -2,6 +2,8 @@ AUX lxml-3.5.0-cross-compile.patch 1518 BLAKE2B 70907747332021789933759d3e2620d7
 AUX lxml-3.6.4-fix-test_xmlschema.patch 1483 BLAKE2B 95c7610f2626471ca76946993463eb243501916788f4812f4489ab86f3b49494298bfa780b4d06ff8fc75d46ecf969ae389e4e418631250b5c610225f46a11d9 SHA512 5ea10849df7966b8e1c55a699c1489f72714449de3564ee13b5d9410877db3691e82c1d37cb6ea60c30c2deac33bb839583f0bb81a3551baac39bf14ca066229
 DIST lxml-3.8.0.tar.gz 3795205 BLAKE2B 39f3edc7efe48bd569b636de89cfcd8f7e4e88e025fd5c21164e35edf110546112844a4ddb6cb1842649fb165de3b3880b0fdb7a23522a891b35390adf64c95b SHA512 08f6f352e22ed2bc199a5f34a1c6b5f7b41ec282dc0026c9f16a06466c27e39e8eb18608ba4493636170eeac4b0194f7050445e1cc9bd0a4628573c404593088
 DIST lxml-4.1.1.tar.gz 2380804 BLAKE2B 4d3c4ef0472c7af7bb4185142a8274b596dd55a908d41f5295d0a78031a7efb3aef8893ca739f8db0675e44d4b0c346746a2758d31a54825c06a153203599ab9 SHA512 9542e5206f9b2f9e072c52ef8e6cf44d1aaae8ae3e7ca7e820c1fac12e716503308ccb3cebc52155b4c93799f3ebca247781fc491524d004378bd26f5cddb9d1
+DIST lxml-4.2.0.tar.gz 4282112 BLAKE2B 5dd68d984097253fac4c35d59e7b687fa1bc0699946accb66687b94e0b3d807c7c555795486828307ccbadd87aa989b6bba2d2fc71cec27e8b8e52f2762c5548 SHA512 89c7dd5d36e8816008b22b25bb02275a008fcfe26f6fdeff139ac8394bd773035bf423b9d7c4233f19985e5a8c12f936b71096c55e28957e97da0810d88de8d3
 EBUILD lxml-3.8.0.ebuild 2254 BLAKE2B af045d3431f3d876327f59cc9da8523a1936dd81a60806d939776bb01dd00ee0d8c7cb3b219725e4e3e04584dc88ec489d30e09f3623bf7cf2c91a5af351f5bc SHA512 bd042b2a97d121436bc890f017b908510e4c199a37524c0497c0adb0d81071c3061f67b0f9fc1435def6d47cd9a4970e9f7f94aba9a629b8964d351a7d58b75b
-EBUILD lxml-4.1.1.ebuild 2264 BLAKE2B c0d3792cb46ac2f0316d811e56ec76b0d38fe2b363177d8fdb500b07356955412a76068965373b746d1b581bcdc70a433fdde2b12daed752b67d81d9fbb3ee48 SHA512 0d03174c227a945680fcaa13ba8ba1f28981b52a8f45693564b258b5f8966217eda13dc4e72307394ae4de0696e34f977b62bfba01d547d893bd9d1dd6a08cf6
+EBUILD lxml-4.1.1.ebuild 2269 BLAKE2B 0f4a8bc8f5c7dd0b7d8a051f7db27863c711b82b91aa4526af9026b86f588a363d995e36caf3c1c4bbc6cce188c74da95b6858d42616afcde3de274edfb82ef9 SHA512 9335416193581247ac14cc264148385a6ebb5ce510117affee0446b2c9b854d54ec8137341681bcf0b4768b6235bdf3ddda6b28b025d7971de6e13d86d575757
+EBUILD lxml-4.2.0.ebuild 2026 BLAKE2B a1821db827a0a5d23e4445e1d5528ade6522c7756eaac50d491723c85bb092c7a2263d9540db0ea87771a5ab1c35b37bf7b3698ee63d08caf4ceebb6bb200258 SHA512 240dbf3a64c8fcabb02e51187022a5470311267552de6005ef077eaedafc72cc0f97f99549b29bd54770414145096ac1223f41bb415e34ca4540b4f084c1a443
 MISC metadata.xml 317 BLAKE2B ba93bbba5105423b6640b86b29f2a54ff50c9daf42424915cfe25049e983ca03c6f2fc066d4e27fe42292e8290b7091bc00d5a40f49d368a3dd6acce42c4504e SHA512 900609bfd7cd032821afb5d1f6e5c25287178f06a49e59431a710d4e76187a2b41a4a0da383d257777a2120b60f15620da37c70d145eca4a84aa30a08b824fae
diff --git a/dev-python/lxml/lxml-4.1.1.ebuild b/dev-python/lxml/lxml-4.1.1.ebuild
index 2ab0055cd819..50407de9c305 100644
--- a/dev-python/lxml/lxml-4.1.1.ebuild
+++ b/dev-python/lxml/lxml-4.1.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
 
 inherit distutils-r1 eutils flag-o-matic toolchain-funcs
 
diff --git a/dev-python/lxml/lxml-4.2.0.ebuild b/dev-python/lxml/lxml-4.2.0.ebuild
new file mode 100644
index 000000000000..83ea4f6e4d8f
--- /dev/null
+++ b/dev-python/lxml/lxml-4.2.0.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+
+inherit distutils-r1 eutils toolchain-funcs
+
+DESCRIPTION="A Pythonic binding for the libxml2 and libxslt libraries"
+HOMEPAGE="http://lxml.de/ https://pypi.python.org/pypi/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 ~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.5
+	>=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}"/${PN}-3.5.0-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 ! 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 BeautifulSoup3 as a parser backend" dev-python/beautifulsoup
+	optfeature "Translates CSS selectors to XPath 1.0 expressions" dev-python/cssselect
+}