From: W. Trevor King <wking@tremily.us>
Date: Fri, 3 Oct 2014 22:48:07 +0000 (-0700)
Subject: Merge remote-tracking branch 'laurentb/dev-python/pytest-xdist'
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=refs%2Fheads%2Fdev-python%2Fpytest-xdist;p=wtk-overlay.git

Merge remote-tracking branch 'laurentb/dev-python/pytest-xdist'

Add DOCS and a missing Setuptools DEPEND.

I've dropped LICENSE from his DOCS because its content matches the
wording used by the Open Source Initiative [1].  It also matches the
wording used by the MIT license in the gentoo tree, although that one
has an additional:

  [Except as contained in this notice ...]

block at the end.

[1]: http://opensource.org/licenses/MIT
---

ea04814278daa576c9a1850bdbfe4b7fdcbe7c42
diff --cc pytest-xdist-1.11.ebuild
index 0000000,89839ea..c485a15
mode 000000,100644..120000
--- a/pytest-xdist-1.11.ebuild
+++ b/pytest-xdist-1.11.ebuild
@@@ -1,0 -1,24 +1,1 @@@
 -# Copyright 2012-2014 Gentoo Foundation
 -# Distributed under the terms of the GNU General Public License v2
 -
 -EAPI=5
 -
 -PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
 -
 -inherit distutils-r1
 -
 -DESCRIPTION="py.test xdist plugin for distributed testing and loop-on-failing"
 -HOMEPAGE="https://pypi.python.org/pypi/pytest-xdist
 -https://bitbucket.org/hpk42/pytest-xdist"
 -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 -
 -LICENSE="MIT"
 -SLOT="0"
 -KEYWORDS="~amd64 ~x64"
 -IUSE=""
 -
 -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 -RDEPEND=">=dev-python/pytest-2.4.2[${PYTHON_USEDEP}]
 -	>=dev-python/execnet-1.1[${PYTHON_USEDEP}]"
 -
 -DOCS=( CHANGELOG LICENSE README.txt )
++pytest-xdist-9999.ebuild
diff --cc pytest-xdist-9999.ebuild
index 944b118,0000000..b151451
mode 100644,000000..100644
--- a/pytest-xdist-9999.ebuild
+++ b/pytest-xdist-9999.ebuild
@@@ -1,39 -1,0 +1,42 @@@
 +# Copyright 1999-2014 Gentoo Foundation
 +# Distributed under the terms of the GNU General Public License v2
 +# $Header: $
 +
 +EAPI=5
 +PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
 +
 +inherit distutils-r1
 +
 +if [[ "${PV}" == "9999" ]]; then
 +	inherit mercurial
 +	EHG_REPO_URI="https://bitbucket.org/hpk42/pytest-xdist"
 +	SRC_URI=""
 +else
 +	SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 +fi
 +
 +DESCRIPTION="A distributed testing plugin for py.test"
 +HOMEPAGE="https://bitbucket.org/hpk42/pytest-xdist https://pypi.python.org/pypi/pytest-xdist"
 +
 +LICENSE="MIT"
 +SLOT="0"
 +KEYWORDS="~amd64 ~x86"
 +IUSE="test"
 +
 +RDEPEND="
 +	>=dev-python/pytest-2.4.2[${PYTHON_USEDEP}]
 +	>=dev-python/py-1.4.22[${PYTHON_USEDEP}]
 +	>=dev-python/execnet-1.1[${PYTHON_USEDEP}]
 +	"
 +DEPEND="
++	dev-python/setuptools[${PYTHON_USEDEP}]
 +	test? (
 +		${RDEPEND}
 +	)"
 +
++DOCS=( CHANGELOG README.txt )
++
 +python_test() {
 +	distutils_install_for_testing
 +	py.test || die "Testsuite failed under ${EPYTHON}"
 +}