From 558eef33b65fa47e25a839c8836b6c67e44edfc5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= Date: Fri, 7 Feb 2020 13:20:26 +0100 Subject: [PATCH] app-vim/youcompleteme: 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 --- .../youcompleteme-20130910.ebuild | 12 ++++---- .../youcompleteme-99999999.ebuild | 30 +++++++++++-------- 2 files changed, 25 insertions(+), 17 deletions(-) diff --git a/app-vim/youcompleteme/youcompleteme-20130910.ebuild b/app-vim/youcompleteme/youcompleteme-20130910.ebuild index 90bc485b4174..29e5f6c94260 100644 --- a/app-vim/youcompleteme/youcompleteme-20130910.ebuild +++ b/app-vim/youcompleteme/youcompleteme-20130910.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -26,13 +26,15 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND="${PYTHON_DEPS} clang? ( >=sys-devel/clang-3.3 ) || ( - app-editors/vim[python,${PYTHON_USEDEP}] - app-editors/gvim[python,${PYTHON_USEDEP}] + app-editors/vim[python,${PYTHON_SINGLE_USEDEP}] + app-editors/gvim[python,${PYTHON_SINGLE_USEDEP}] )" DEPEND="${RDEPEND} test? ( - >=dev-python/mock-1.0.1[${PYTHON_USEDEP}] - >=dev-python/nose-1.3.0[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + >=dev-python/mock-1.0.1[${PYTHON_MULTI_USEDEP}] + >=dev-python/nose-1.3.0[${PYTHON_MULTI_USEDEP}] + ') )" CMAKE_IN_SOURCE_BUILD=1 diff --git a/app-vim/youcompleteme/youcompleteme-99999999.ebuild b/app-vim/youcompleteme/youcompleteme-99999999.ebuild index 987fec6263bf..c5e133ef7435 100644 --- a/app-vim/youcompleteme/youcompleteme-99999999.ebuild +++ b/app-vim/youcompleteme/youcompleteme-99999999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -26,26 +26,32 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" COMMON_DEPEND=" ${PYTHON_DEPS} clang? ( >=sys-devel/clang-3.3 ) - dev-libs/boost[python,threads,${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + dev-libs/boost[python,threads,${PYTHON_MULTI_USEDEP}] + ') || ( - app-editors/vim[python,${PYTHON_USEDEP}] - app-editors/gvim[python,${PYTHON_USEDEP}] + app-editors/vim[python,${PYTHON_SINGLE_USEDEP}] + app-editors/gvim[python,${PYTHON_SINGLE_USEDEP}] ) " RDEPEND=" ${COMMON_DEPEND} - dev-python/bottle[${PYTHON_USEDEP}] - virtual/python-futures[${PYTHON_USEDEP}] - dev-python/jedi[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - dev-python/sh[${PYTHON_USEDEP}] - dev-python/waitress[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + dev-python/bottle[${PYTHON_MULTI_USEDEP}] + virtual/python-futures[${PYTHON_MULTI_USEDEP}] + dev-python/jedi[${PYTHON_MULTI_USEDEP}] + dev-python/requests[${PYTHON_MULTI_USEDEP}] + dev-python/sh[${PYTHON_MULTI_USEDEP}] + dev-python/waitress[${PYTHON_MULTI_USEDEP}] + ') " DEPEND=" ${COMMON_DEPEND} test? ( - >=dev-python/mock-1.0.1[${PYTHON_USEDEP}] - >=dev-python/nose-1.3.0[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + >=dev-python/mock-1.0.1[${PYTHON_MULTI_USEDEP}] + >=dev-python/nose-1.3.0[${PYTHON_MULTI_USEDEP}] + ') >=dev-cpp/gtest-1.8.0 ) " -- 2.26.2