app-vim/youcompleteme: Switch to PYTHON_MULTI_USEDEP API

Signed-off-by: Michał Górny <[email protected]>
hanetzer · Feb 9, 2020 · 558eef3 · 558eef3
1 parent 2f385a3
commit 558eef3
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 17 deletions.
diff --git 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
@@ -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
  )
 "