gentoo resync : 24.02.2018

3 files changed, 89 insertions, 10 deletions

diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest
index 211995187176..34c81f4c97da 100644
--- a/dev-python/pytest/Manifest
+++ b/dev-python/pytest/Manifest
@@ -1,5 +1,7 @@
 DIST pytest-3.0.3.tar.gz 731934 BLAKE2B 7fb57d75bd54eb8a31d9701fdf739119715c475eaaacae3cd038057c1d2bf43fa86ccdc45b3c84962708ef606976ab39ad41e0c3690c8b5f4c04d870579a384e SHA512 ec0b4a5f0d6673a339c5a70b402c004c23db7001005454329eeaea15d890f53b8f2740f6c6254499d0f915b9058bfdfa535d9f22847bb382a060d65204fce4af
 DIST pytest-3.2.2.tar.gz 786396 BLAKE2B e669da930890e902b0323ec3a6685080ddd889e74655f7b4cb08ec421651f987597021a31471aab5a32d637b99620ce7792cbdf8f85561db3bb10ff06a446ba1 SHA512 6df3a50e7d1efeaf7a283920b16d1daf800798f422bc851b0aacd2bbd5cb0a88c95f9057fae49943b9dfe6527ed552cdf8d983b944ab91d0af252ee4f6eb82db
+DIST pytest-3.4.1.tar.gz 812928 BLAKE2B 27b25fcc5a268b1c92188c01bf16bf1eb4b8ced7d1a3c8095350ec55b1f1845a5d54bd6bd169142ca0d327f2f8d193774643174a356dd95fa07b3195bc1e8713 SHA512 75f728840cde6512619a03ce75fd0b04cb9d57a99f381366a0f9c10ffa3210448e7e85505357bfa9bfb0cca11cdedda2c0e091e5473ed82707a2597f234e659a
 EBUILD pytest-3.0.3.ebuild 1969 BLAKE2B 4413fcae34abc9ab190ee8274f0d35e89842c95b91e98a4c61be0e69e25a788814c986911820c0e0e361eac385b3a3078aecb6c70b0aa03ccfa54f603cb065c4 SHA512 6c2a5039ea0da514625e3bfdb15578aec046ee6a8feeb1fb8a5daff232b74a64d467af0b7efee481749de9b84877cbaf39bf7c5ae98f2e11db1fc2f8350b35fb
-EBUILD pytest-3.2.2.ebuild 2100 BLAKE2B ab07341407c3a737ada173465fe1feffe08c5210fe37724b01c90f522df19b6c07806834c4376eec83df59a9997c403982ff2b94f66c87c1cb18c1502894204f SHA512 6814aa6e5ccd514b44b3a999d1e8ef80d98bb2239377e1f155337f89775e84df4550536bcedc7b1c85467ea18012ede7b7806abe53bb75a7cd9b84330030e919
+EBUILD pytest-3.2.2.ebuild 2113 BLAKE2B fc850aa9a44d84623da2ddf75f3731ff07573de9c9132a8840331dd74e2de71da14b1b7da74580ae892405829c4b03eb01c409b94026857e0509a513e9e36c6f SHA512 5be8acbef7b0ff96c10ed34eb6c9cb49172b272df0729e9ece786285e4752d69a4e012835342df6a1160b01e1bd5d87753823adc0346e12f128c402ade457bc0
+EBUILD pytest-3.4.1.ebuild 2205 BLAKE2B ccba28845423939133eba6369bf823909602318d69c37c6c47af0ead716dd6d675074d02e525e14dc01bb1d042bc9a183d658d4c5a2f95df7f33a8aff919f5a1 SHA512 9bf638ed7029a578e3114fe81c83cdf4ffa62e350e57c0bb376d67a4df253f554973ad5e2af2cd88799636f13358d2aa5edbe01d2b17c28ca5f6d05ddea9849a
 MISC metadata.xml 309 BLAKE2B f29391c5f96f44f6329d3665346a5d46ecb4a86d103ae8008769af86126756e76bfa89cfe462e9c219e5f70b64013f662d020c7a2f6015d8cadd0eb25a7614eb SHA512 ba53c13ac716488e3e5dadf5dcfcb697dc9bb13f89e9d0fb98b9a5a6e36cafeeb64d1348008f42497117bf46fb6f3bc288c10a68c4d5ab53c9c02a3ae61b594f
diff --git a/dev-python/pytest/pytest-3.2.2.ebuild b/dev-python/pytest/pytest-3.2.2.ebuild
index 1bead6e09096..a8ed90ecf524 100644
--- a/dev-python/pytest/pytest-3.2.2.ebuild
+++ b/dev-python/pytest/pytest-3.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~amd64-fbsd"
 IUSE="doc test"
 
 # When bumping, please check setup.py for the proper py version
@@ -24,8 +24,8 @@ COMMON_DEPEND="
 	doc? (
 		dev-python/pyyaml[${PYTHON_USEDEP}]
 		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-"
+	)"
+
 DEPEND="${COMMON_DEPEND}
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
 	test? (
@@ -34,11 +34,11 @@ DEPEND="${COMMON_DEPEND}
 		dev-python/nose[${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/requests[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	!<dev-python/logilab-common-1.3.0
-"
+	)"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	!<dev-python/logilab-common-1.3.0"
 
 python_prepare_all() {
 	chmod o-w *egg*/* || die
diff --git a/dev-python/pytest/pytest-3.4.1.ebuild b/dev-python/pytest/pytest-3.4.1.ebuild
new file mode 100644
index 000000000000..1070af400082
--- /dev/null
+++ b/dev-python/pytest/pytest-3.4.1.ebuild
@@ -0,0 +1,77 @@
+# 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{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="Simple powerful testing with Python"
+HOMEPAGE="http://pytest.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+# When bumping, please check setup.py for the proper py version
+PY_VER="1.5.0"
+COMMON_DEPEND="
+	>=dev-python/attrs-17.2.0[${PYTHON_USEDEP}]
+	>=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)"
+
+DEPEND="${COMMON_DEPEND}
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/hypothesis-3.5.2[${PYTHON_USEDEP}]
+		>dev-python/pytest-xdist-1.13[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+	)"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	!<dev-python/logilab-common-1.3.0"
+
+python_prepare_all() {
+	chmod o-w *egg*/* || die
+	# Disable versioning of py.test script to avoid collision with
+	# versioning performed by the eclass.
+	sed -e "s/return points/return {'py.test': target}/" -i setup.py || die "sed failed"
+	grep -qF "py>=${PY_VER}" setup.py || die "Incorrect dev-python/py dependency"
+
+	# Something in the ebuild environment causes this to hang/error.
+	# https://bugs.gentoo.org/598442
+	rm testing/test_pdb.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# test_nose.py not written to suit py3.2 in pypy3
+	if [[ "${EPYTHON}" == pypy3 ]]; then
+		"${PYTHON}" "${BUILD_DIR}"/lib/pytest.py --lsof -rfsxX \
+			--ignore=testing/BUILD_nose.py \
+			|| die "tests failed with ${EPYTHON}"
+	else
+		"${PYTHON}" "${BUILD_DIR}"/lib/pytest.py --lsof -rfsxX testing || die "tests failed with ${EPYTHON}"
+	fi
+}
+
+python_compile_all(){
+	use doc && emake -C doc/en html
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( doc/en/_build/html/. )
+	distutils-r1_python_install_all
+}