From 1f8fd0087790124ddc8362fa09d68fa2e71e3995 Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Wed, 9 Feb 2022 13:33:16 +0000 Subject: youcompleteme: Replace deprecated PYTHON_MULTI_USEDEP --- app-vim/youcompleteme/Manifest | 2 +- .../youcompleteme/youcompleteme-20220113-r1.ebuild | 85 ++++++++++++++++++++++ .../youcompleteme/youcompleteme-20220113.ebuild | 85 ---------------------- 3 files changed, 86 insertions(+), 86 deletions(-) create mode 100644 app-vim/youcompleteme/youcompleteme-20220113-r1.ebuild delete mode 100644 app-vim/youcompleteme/youcompleteme-20220113.ebuild (limited to 'app-vim') diff --git a/app-vim/youcompleteme/Manifest b/app-vim/youcompleteme/Manifest index 00e93aa..7c4d19a 100644 --- a/app-vim/youcompleteme/Manifest +++ b/app-vim/youcompleteme/Manifest @@ -1,3 +1,3 @@ DIST ycmd-f7ba6e791829c2ad0a3b77bd8e921f2b4c71d7dc.tar.gz 2953797 BLAKE2B e56b17c3f9b714eda7a7405c44330b651f578b4d5a5799f0fde0d2a1661d7e513f5265c839c6afa1959188e8c339c8064c58ec7dea35b24872b4b08780f2dd04 SHA512 479a2843904910f150303101843414e9290c279c87e1410665fd84d5e9895e194832d461bae0ef6a7893a2c87df09049405d2a4d36a4a96c115f371e27b82d24 DIST youcompleteme-7684b6c6b49f8d3bdbd17ecdc9ee7d228039808e.tar.gz 305508 BLAKE2B 9e5f6cae9d288e2b24e503b8df11928dc5cbeaada6b4f24bab0ed93aeb7705ab4b1312e4000091b77eb47561d7cd9b9ffd2442086b57c22fd6dace246ea83a16 SHA512 91a0f004adc371750702af87715e396d885507cf84a9f6120c1f6a865bedc520e7918697d8bdcf1fd6096c7fc32accb7f6f62a60b6c074a3b6089058f6d1ed62 -EBUILD youcompleteme-20220113.ebuild 2422 BLAKE2B c2c795e6ac1af250e5e70d36d89fe4493c6e4da263d1076dece7a54e14bc9db077850b89cbce11eee39d8e63f0d9d3c42952c8c40a3bef0595bb623d37206c18 SHA512 b3db2f11ffe6fa2a87d1ebe885c90dc98830cb3b851f79bc7d0908235b0db2761f27aa3ecac6b8bc0af47f81d4948f9d0a115cf664ee32ab97abd6b80639c71d +EBUILD youcompleteme-20220113-r1.ebuild 2392 BLAKE2B 478e0dd8ebc2a8c0347cc4b9d5bca793a7d5312a73e90b30042df68aefaa7f39a6fcb3588ae94ed0f61c751a90eb35d5e608f5b5220954e96e49e4300933d900 SHA512 a28ca11d35156949aab9be51044ce29644f5280e3ff1bdd202e23e387f56513d5c8b3816d78700e31cce37ac3aee41f096b309bdf36fa5889b08081de7cbb241 diff --git a/app-vim/youcompleteme/youcompleteme-20220113-r1.ebuild b/app-vim/youcompleteme/youcompleteme-20220113-r1.ebuild new file mode 100644 index 0000000..dd49edd --- /dev/null +++ b/app-vim/youcompleteme/youcompleteme-20220113-r1.ebuild @@ -0,0 +1,85 @@ +EAPI="7" +PYTHON_COMPAT=( python3_{9,10} ) +inherit multilib python-single-r1 cmake-utils vim-plugin + +youcompletemev="7684b6c6b49f8d3bdbd17ecdc9ee7d228039808e" +ycmdv="f7ba6e791829c2ad0a3b77bd8e921f2b4c71d7dc" + +KEYWORDS="~amd64 ~x86" +SRC_URI=" + https://github.com/ycm-core/YouCompleteMe/archive/$youcompletemev.tar.gz -> youcompleteme-$youcompletemev.tar.gz + https://github.com/ycm-core/ycmd/archive/$ycmdv.tar.gz -> ycmd-$ycmdv.tar.gz +" + +DESCRIPTION="vim plugin: a code-completion engine for Vim" +HOMEPAGE="http://ycm-core.github.io/YouCompleteMe/" + +LICENSE="GPL-3" +IUSE="+clang" + +COMMON_DEPEND=" + ${PYTHON_DEPS} + dev-cpp/abseil-cpp + clang? ( sys-devel/clang:13 ) + $(python_gen_cond_dep ' + >=dev-libs/boost-1.65:=[python,${PYTHON_USEDEP}] + || ( + app-editors/vim[python,${PYTHON_SINGLE_USEDEP}] + app-editors/gvim[python,${PYTHON_SINGLE_USEDEP}] + ) + ') +" +RDEPEND=" + ${COMMON_DEPEND} + $(python_gen_cond_dep ' + >=dev-python/bottle-0.12.18[${PYTHON_USEDEP}] + >=dev-python/regex-2020.2.20[${PYTHON_USEDEP}] + >=dev-python/jedi-0.16.0[${PYTHON_USEDEP}] + >=dev-python/watchdog-0.10.2[${PYTHON_USEDEP}] + ') +" +DEPEND=" + ${COMMON_DEPEND} +" + +S="${WORKDIR}/YouCompleteMe-$youcompletemev" +CMAKE_IN_SOURCE_BUILD=1 +CMAKE_USE_DIR=${S}/third_party/ycmd/cpp + +VIM_PLUGIN_HELPFILES="${PN}" + +src_prepare() { + for third_party_module in ycmd ; do + rm -r "${S}"/third_party/${third_party_module} || die "Failed to remove third party module ${third_party_module}" + done + mv ${WORKDIR}/ycmd-$ycmdv ${S}/third_party/ycmd + cmake-utils_src_prepare + default +} + +src_configure() { + local mycmakeargs=( + -DUSE_CLANG_COMPLETER=$(usex clang) + -DUSE_SYSTEM_LIBCLANG=$(usex clang) + -DPATH_TO_LLVM_ROOT=$(clang-13 --version | grep ^InstalledDir: | cut -d: -f2 | xargs dirname) + -DUSE_SYSTEM_ABSEIL=ON + -DPython3_LIBRARY=$SYSROOT/usr/$(get_libdir)/lib$EPYTHON.so + -DPython3_EXECUTABLE=$SYSROOT/usr/bin/$EPYTHON + -DPython3_INCLUDE_DIR=$SYSROOT/usr/include/$EPYTHON + ) + cmake-utils_src_configure +} + +src_install() { + dodoc *.md third_party/ycmd/*.md + rm -r *.md *.sh COPYING.txt third_party/ycmd/cpp || die + rm -r third_party/ycmd/{*.md,*.sh} || die + rm -r test || die + find python third_party/ycmd -depth -name '*test*' -exec rm -r {} + || die + find python third_party/ycmd -depth -name '*examples*' -exec rm -r {} + || die + + vim-plugin_src_install + + python_optimize "${ED}" + python_fix_shebang "${ED}" +} diff --git a/app-vim/youcompleteme/youcompleteme-20220113.ebuild b/app-vim/youcompleteme/youcompleteme-20220113.ebuild deleted file mode 100644 index 6eba953..0000000 --- a/app-vim/youcompleteme/youcompleteme-20220113.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -EAPI="7" -PYTHON_COMPAT=( python3_{9,10} ) -inherit multilib python-single-r1 cmake-utils vim-plugin - -youcompletemev="7684b6c6b49f8d3bdbd17ecdc9ee7d228039808e" -ycmdv="f7ba6e791829c2ad0a3b77bd8e921f2b4c71d7dc" - -KEYWORDS="~amd64 ~x86" -SRC_URI=" - https://github.com/ycm-core/YouCompleteMe/archive/$youcompletemev.tar.gz -> youcompleteme-$youcompletemev.tar.gz - https://github.com/ycm-core/ycmd/archive/$ycmdv.tar.gz -> ycmd-$ycmdv.tar.gz -" - -DESCRIPTION="vim plugin: a code-completion engine for Vim" -HOMEPAGE="http://ycm-core.github.io/YouCompleteMe/" - -LICENSE="GPL-3" -IUSE="+clang" - -COMMON_DEPEND=" - ${PYTHON_DEPS} - dev-cpp/abseil-cpp - clang? ( sys-devel/clang:13 ) - $(python_gen_cond_dep ' - >=dev-libs/boost-1.65:=[python,${PYTHON_MULTI_USEDEP}] - || ( - app-editors/vim[python,${PYTHON_SINGLE_USEDEP}] - app-editors/gvim[python,${PYTHON_SINGLE_USEDEP}] - ) - ') -" -RDEPEND=" - ${COMMON_DEPEND} - $(python_gen_cond_dep ' - >=dev-python/bottle-0.12.18[${PYTHON_MULTI_USEDEP}] - >=dev-python/regex-2020.2.20[${PYTHON_MULTI_USEDEP}] - >=dev-python/jedi-0.16.0[${PYTHON_MULTI_USEDEP}] - >=dev-python/watchdog-0.10.2[${PYTHON_MULTI_USEDEP}] - ') -" -DEPEND=" - ${COMMON_DEPEND} -" - -S="${WORKDIR}/YouCompleteMe-$youcompletemev" -CMAKE_IN_SOURCE_BUILD=1 -CMAKE_USE_DIR=${S}/third_party/ycmd/cpp - -VIM_PLUGIN_HELPFILES="${PN}" - -src_prepare() { - for third_party_module in ycmd ; do - rm -r "${S}"/third_party/${third_party_module} || die "Failed to remove third party module ${third_party_module}" - done - mv ${WORKDIR}/ycmd-$ycmdv ${S}/third_party/ycmd - cmake-utils_src_prepare - default -} - -src_configure() { - local mycmakeargs=( - -DUSE_CLANG_COMPLETER=$(usex clang) - -DUSE_SYSTEM_LIBCLANG=$(usex clang) - -DPATH_TO_LLVM_ROOT=$(clang-13 --version | grep ^InstalledDir: | cut -d: -f2 | xargs dirname) - -DUSE_SYSTEM_ABSEIL=ON - -DPython3_LIBRARY=$SYSROOT/usr/$(get_libdir)/lib$EPYTHON.so - -DPython3_EXECUTABLE=$SYSROOT/usr/bin/$EPYTHON - -DPython3_INCLUDE_DIR=$SYSROOT/usr/include/$EPYTHON - ) - cmake-utils_src_configure -} - -src_install() { - dodoc *.md third_party/ycmd/*.md - rm -r *.md *.sh COPYING.txt third_party/ycmd/cpp || die - rm -r third_party/ycmd/{*.md,*.sh} || die - rm -r test || die - find python third_party/ycmd -depth -name '*test*' -exec rm -r {} + || die - find python third_party/ycmd -depth -name '*examples*' -exec rm -r {} + || die - - vim-plugin_src_install - - python_optimize "${ED}" - python_fix_shebang "${ED}" -} -- cgit v1.2.3