From 38095147e8fce7bd6a85fc1b7d0297dd5e6e7265 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= Date: Fri, 7 Feb 2020 14:01:25 +0100 Subject: [PATCH] dev-util/eric: Switch to PYTHON_MULTI_USEDEP API MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- dev-util/eric/eric-18.03.ebuild | 24 +++++++++++-------- ...eric-19.11.ebuild => eric-19.11-r1.ebuild} | 18 ++++++++------ 2 files changed, 25 insertions(+), 17 deletions(-) rename dev-util/eric/{eric-19.11.ebuild => eric-19.11-r1.ebuild} (68%) diff --git a/dev-util/eric/eric-18.03.ebuild b/dev-util/eric/eric-18.03.ebuild index 3e51fdbe81d8..c67b729ada77 100644 --- a/dev-util/eric/eric-18.03.ebuild +++ b/dev-util/eric/eric-18.03.ebuild @@ -19,18 +19,22 @@ IUSE="" DEPEND=" ${PYTHON_DEPS} - >=dev-python/sip-4.14.3[${PYTHON_USEDEP}] - >=dev-python/PyQt5-5.7.1[gui,network,printsupport,sql,svg,widgets,${PYTHON_USEDEP}] - >=dev-python/qscintilla-python-2.10[qt5(+),${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + >=dev-python/sip-4.14.3[${PYTHON_MULTI_USEDEP}] + >=dev-python/PyQt5-5.7.1[gui,network,printsupport,sql,svg,widgets,${PYTHON_MULTI_USEDEP}] + >=dev-python/qscintilla-python-2.10[qt5(+),${PYTHON_MULTI_USEDEP}] + ') " RDEPEND="${DEPEND} - || ( - dev-python/PyQt5[help,webengine,${PYTHON_USEDEP}] - dev-python/PyQt5[help,webkit,${PYTHON_USEDEP}] - ) - >=dev-python/chardet-3.0.4[${PYTHON_USEDEP}] - >=dev-python/coverage-4.1.0[${PYTHON_USEDEP}] - >=dev-python/pygments-2.2.0[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + || ( + dev-python/PyQt5[help,webengine,${PYTHON_MULTI_USEDEP}] + dev-python/PyQt5[help,webkit,${PYTHON_MULTI_USEDEP}] + ) + >=dev-python/chardet-3.0.4[${PYTHON_MULTI_USEDEP}] + >=dev-python/coverage-4.1.0[${PYTHON_MULTI_USEDEP}] + >=dev-python/pygments-2.2.0[${PYTHON_MULTI_USEDEP}] + ') !dev-util/eric:4 !dev-util/eric:5 " diff --git a/dev-util/eric/eric-19.11.ebuild b/dev-util/eric/eric-19.11-r1.ebuild similarity index 68% rename from dev-util/eric/eric-19.11.ebuild rename to dev-util/eric/eric-19.11-r1.ebuild index 425d51c2062c..bb8cee447042 100644 --- a/dev-util/eric/eric-19.11.ebuild +++ b/dev-util/eric/eric-19.11-r1.ebuild @@ -20,15 +20,19 @@ IUSE="spell" DEPEND=" ${PYTHON_DEPS} - >=dev-python/PyQt5-5.12[gui,help,network,printsupport,sql,svg,widgets,${PYTHON_USEDEP}] - dev-python/PyQtWebEngine[${PYTHON_USEDEP}] - dev-python/qscintilla-python[${PYTHON_USEDEP}] - dev-python/sip[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + >=dev-python/PyQt5-5.12[gui,help,network,printsupport,sql,svg,widgets,${PYTHON_MULTI_USEDEP}] + dev-python/PyQtWebEngine[${PYTHON_MULTI_USEDEP}] + dev-python/qscintilla-python[${PYTHON_MULTI_USEDEP}] + dev-python/sip[${PYTHON_MULTI_USEDEP}] + ') " RDEPEND="${DEPEND} - >=dev-python/chardet-3.0.4[${PYTHON_USEDEP}] - >=dev-python/pygments-2.3.1[${PYTHON_USEDEP}] - spell? ( dev-python/pyenchant[${PYTHON_USEDEP}] ) + $(python_gen_cond_dep ' + >=dev-python/chardet-3.0.4[${PYTHON_MULTI_USEDEP}] + >=dev-python/pygments-2.3.1[${PYTHON_MULTI_USEDEP}] + spell? ( dev-python/pyenchant[${PYTHON_MULTI_USEDEP}] ) + ') " REQUIRED_USE="${PYTHON_REQUIRED_USE}" -- 2.26.2