From c6c8f852018fae4a9c94fb81ce193aa6a32ad2e5 Mon Sep 17 00:00:00 2001 From: Matthew Thode Date: Sat, 23 Mar 2019 14:57:08 -0500 Subject: dev-python/pytest: fix more-itertools dep more-itertools dropped py27 support, so have to use multiple python_gen_cond_dep lines Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Matthew Thode --- dev-python/pytest/pytest-3.10.1.ebuild | 6 ++++-- dev-python/pytest/pytest-4.3.1.ebuild | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) (limited to 'dev-python/pytest') diff --git a/dev-python/pytest/pytest-3.10.1.ebuild b/dev-python/pytest/pytest-3.10.1.ebuild index 97eacfe36376..5e0846138d99 100644 --- a/dev-python/pytest/pytest-3.10.1.ebuild +++ b/dev-python/pytest/pytest-3.10.1.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="test" # When bumping, please check setup.py for the proper py version @@ -24,7 +24,9 @@ PY_VER="1.5.0" RDEPEND=" >=dev-python/atomicwrites-1.0[${PYTHON_USEDEP}] >=dev-python/attrs-17.4.0[${PYTHON_USEDEP}] - >=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}] + $(python_gen_cond_dep '>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]' python2_7 ) + $(python_gen_cond_dep '=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]' python3_{4,5,6,7} pypy{,3} ) $(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' python2_7 python3_{4,5} ) >=dev-python/pluggy-0.7[${PYTHON_USEDEP}] >=dev-python/py-${PY_VER}[${PYTHON_USEDEP}] diff --git a/dev-python/pytest/pytest-4.3.1.ebuild b/dev-python/pytest/pytest-4.3.1.ebuild index ab4d81909734..75106fd33ffe 100644 --- a/dev-python/pytest/pytest-4.3.1.ebuild +++ b/dev-python/pytest/pytest-4.3.1.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="test" # When bumping, please check setup.py for the proper py version @@ -24,7 +24,9 @@ PY_VER="1.5.0" RDEPEND=" >=dev-python/atomicwrites-1.0[${PYTHON_USEDEP}] >=dev-python/attrs-17.4.0[${PYTHON_USEDEP}] - >=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}] + $(python_gen_cond_dep '>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]' python2_7 ) + $(python_gen_cond_dep '=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]' python3_{4,5,6,7} pypy{,3} ) $(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' python2_7 python3_{4,5} ) >=dev-python/pluggy-0.7[${PYTHON_USEDEP}] >=dev-python/py-${PY_VER}[${PYTHON_USEDEP}] -- cgit v1.2.3-65-gdbad