From 3337e7a630fd8f537f8ee1ccd16679c1ecacf130 Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Sun, 10 Jun 2018 13:25:42 +0100 Subject: YCM bump --- app-vim/youcompleteme/Manifest | 6 +- .../youcompleteme/youcompleteme-20180321.ebuild | 111 -------------------- .../youcompleteme/youcompleteme-20180610.ebuild | 113 +++++++++++++++++++++ 3 files changed, 116 insertions(+), 114 deletions(-) delete mode 100644 app-vim/youcompleteme/youcompleteme-20180321.ebuild create mode 100644 app-vim/youcompleteme/youcompleteme-20180610.ebuild diff --git a/app-vim/youcompleteme/Manifest b/app-vim/youcompleteme/Manifest index eba7f81..d84bc2a 100644 --- a/app-vim/youcompleteme/Manifest +++ b/app-vim/youcompleteme/Manifest @@ -2,6 +2,6 @@ DIST gocode-416643789f088aa5077f667cecde7f966131f6be.tar.gz 93109 BLAKE2B c40db1 DIST omnisharp-server-e1902915c6790bcec00b8d551199c8a3537d33c9.tar.gz 3005049 BLAKE2B 07c7a06c3d2b75a6df7b6bc6e2e26dc1dbab1af1e98018db14177a82304eb48160bb4dd25f0d6d1af5a50725e6d1b8365932a5ff575d2c08be87997f2ee58397 SHA512 47b6083016d9865708b3deaf44f3742f276d5aa13c3a310b9aa432650df18d35bed62668a90f1aba52fbe84fb7471dd885c34e351b859607d7221ae074290fde DIST python-frozendict-b27053e4d11f5891319fd29eda561c130ba3112a.tar.gz 2192 BLAKE2B 58518ec7185c29d04448552e0dda147ad59c857c1e29f6384dab9a65c030678c6f350f7930f5878094e4fed03e4670df81be3bcb17f9233b55d8d51769621048 SHA512 f943e17e9ad5de31c1c8971e26a45cd61e972cbca31ce26e03285070728364e27edab4549532128a51bbcae38a5166ce8ea6e700069d242b0971f8004fb280f4 DIST requests-futures-d9d21ac63904dc0a668e0f073503f85a534460f4.tar.gz 6742 BLAKE2B fe72f9d8cf5148500da18bb22ed5a5e8c6f80ca2a9dd5487c501acfa9e0e12bd3c615750a9a7c519dccab07d6101fafabc8d8242c8c0b5da6b4b61a1ff6c8a48 SHA512 e0ec8bffc5d710cd098643ec315b176e80223893528754c85f5ea8dc74a539e8ea2d429de5ff727a6fac9f163d47f9b089edcf8c3d0c7939184d162a3b6afe7e -DIST ycmd-ee23a7ca17aafbcf344f51334d115e9bb89ea844.tar.gz 3798903 BLAKE2B 4d343e7ccc03b2a74f505fff5a2aabaab14221fd754474c3e20a5072a44808c66339d6b0e916631443eca5e7bb2a3f7a394d15721f93b12c409c2c0e1d7fdcea SHA512 5992d6bfa4dbb6806e6c8ea9cf1e74568cc5273d26652cb1bb70c3ae3ac27a65765b1ec838845442b55d82350c67bd9d311316ae9f8f757f740081dc8c099143 -DIST youcompleteme-788c293aee78c6ab60cbc06bbc3339e7b2bff98f.tar.gz 280642 BLAKE2B 89337eae38f39417b011ffd15a607155e55d275ce6e3c9ffe86c9018ff085d4a7fd93174cb2b586d15fe80267f85594ca3361f9a0b87c80be32c6c7428bf1f7d SHA512 c433f47782306ec0b9c14f19da645541236ad0fdda8ad411a1aa6bfc3d05b693761428f103a14ebe93cfe659e3009778017afb4240987c8916e995d723469af0 -EBUILD youcompleteme-20180321.ebuild 3593 BLAKE2B 84132e1a41c6b56e9e8b30d312402d7fe5d1c879736995598ef4521c06303a9bd53d84de4c64dadfbefd589e7ac1036c4cc45982f79377f4c545c21a743149de SHA512 62f72911b58f0b0ed6e5334e6b132a939d404002629a57c5243932152f8b4d5fbd197f706e737d46d2fb6b1159350dea4ac3538a685d542c1b952663f8b1cae3 +DIST ycmd-3db4f3b2d723007c46891c11fce53a0dc4363493.tar.gz 3713062 BLAKE2B 396371d99d30594598b728b7fb6ce15b83087ea48fe2941d759486f3672b6b40fa20a40e42b9644fe622962247ccb9d390b27fc82110710d9266f262e31fde6c SHA512 5059e71d3a63a8a8f15b2178113239b3a92c56bf240e099ad33287352fd2338dfe8a968e8f5849197c43d68a2d0edd5fb88fd4b4835d73ec1b5dd495a319d981 +DIST youcompleteme-c9ff2177377a85515b7e081966685f3c46a33eca.tar.gz 281863 BLAKE2B 26625d245db2fea42838e8f8cee7fdff3d14a97a84a3a82ef317978ffedd8ab1c77120ac2acc0aad917ae3a97999c431bfc70cd1ed0639aaacb39e1622e56ef6 SHA512 69bf67117cc9a66e0b613ee7dce962f0e1f668c1bc785bbaf0527309970fc32606c5a43b13493163dae28ba96f90028d9c09fd7f33246216bd4be81ade870d1b +EBUILD youcompleteme-20180610.ebuild 3653 BLAKE2B 456f567f6bd6656e1d6ade329a5f8b7b8a3cfe3d5470e0b2c64d46049ad8db4917a78ced37ea9b38e8490d24f33aa11833e85e25206ce0c5ac0ff9f8541f5191 SHA512 d3edeef6406fa97d35f8dbc82b241db3dfd2e9b27f7efe70b4657a2221880bc0c1b051d8b98beb60b0636a9f3d0fecb7144050cd04b80fb7433f0ea750fe175f diff --git a/app-vim/youcompleteme/youcompleteme-20180321.ebuild b/app-vim/youcompleteme/youcompleteme-20180321.ebuild deleted file mode 100644 index 357bc7d..0000000 --- a/app-vim/youcompleteme/youcompleteme-20180321.ebuild +++ /dev/null @@ -1,111 +0,0 @@ -EAPI=6 -PYTHON_COMPAT=( python3_{4,5,6} ) -inherit multilib python-single-r1 cmake-utils vim-plugin - -youcompletemev="788c293aee78c6ab60cbc06bbc3339e7b2bff98f" -ycmdv="ee23a7ca17aafbcf344f51334d115e9bb89ea844" -reqfuv="d9d21ac63904dc0a668e0f073503f85a534460f4" -pfdv="b27053e4d11f5891319fd29eda561c130ba3112a" -ossv="e1902915c6790bcec00b8d551199c8a3537d33c9" -gocodev="416643789f088aa5077f667cecde7f966131f6be" - -KEYWORDS="amd64 x86" -SRC_URI=" - https://github.com/Valloric/YouCompleteMe/archive/$youcompletemev.tar.gz -> youcompleteme-$youcompletemev.tar.gz - https://github.com/Valloric/ycmd/archive/$ycmdv.tar.gz -> ycmd-$ycmdv.tar.gz - https://github.com/ross/requests-futures/archive/$reqfuv.tar.gz -> requests-futures-$reqfuv.tar.gz - https://github.com/slezica/python-frozendict/archive/$pfdv.tar.gz -> python-frozendict-$pfdv.tar.gz - csharp? ( https://github.com/OmniSharp/omnisharp-server/archive/$ossv.tar.gz -> omnisharp-server-$ossv.tar.gz ) - go? ( https://github.com/nsf/gocode/archive/$gocodev.tar.gz -> gocode-$gocodev.tar.gz ) -" - -DESCRIPTION="vim plugin: a code-completion engine for Vim" -HOMEPAGE="http://valloric.github.io/YouCompleteMe/" - -LICENSE="GPL-3" -IUSE="+clang test go csharp" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -COMMON_DEPEND=" - ${PYTHON_DEPS} - clang? ( sys-devel/clang:6 ) - >=dev-libs/boost-1.66:=[python,threads,${PYTHON_USEDEP}] - || ( - app-editors/vim[python,${PYTHON_USEDEP}] - app-editors/gvim[python,${PYTHON_USEDEP}] - ) -" -RDEPEND=" - ${COMMON_DEPEND} - dev-python/bottle[${PYTHON_USEDEP}] - dev-python/future[${PYTHON_USEDEP}] - dev-python/jedi[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - dev-python/sh[${PYTHON_USEDEP}] - dev-python/waitress[${PYTHON_USEDEP}] -" -DEPEND=" - ${COMMON_DEPEND} - test? ( - >=dev-python/mock-1.0.1[${PYTHON_USEDEP}] - >=dev-python/nose-1.3.0[${PYTHON_USEDEP}] - dev-cpp/gmock - dev-cpp/gtest - ) -" - -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 pythonfutures requests-futures; 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 - use csharp && mv ${WORKDIR}/omnisharp-server-$ossv ${S}/third_party/ycmd/third_party/omnisharp-server - mv ${WORKDIR}/python-frozendict-$pfdv ${S}/third_party/ycmd/third_party/python-frozendict - use go && mv ${WORKDIR}/gocode-$gocodev ${S}/third_party/ycmd/third_party/gocode - mv ${WORKDIR}/requests-futures-$reqfuv ${S}/third_party/request-futures - default -} - -src_configure() { - local mycmakeargs=( - -DUSE_CLANG_COMPLETER=$(usex clang) - -DUSE_SYSTEM_LIBCLANG=$(usex clang) - -DUSE_PYTHON2=OFF - -DPATH_TO_LLVM_ROOT=/usr/lib/llvm/6 - -DUSE_SYSTEM_BOOST=ON - ) - cmake-utils_src_configure -} - -src_test() { - cd "${S}/third_party/ycmd/cpp/ycm/tests" - LD_LIBRARY_PATH="${EROOT}"/usr/$(get_libdir)/llvm \ - ./ycm_core_tests || die - - cd "${S}"/python/ycm - - local dirs=( "${S}"/third_party/*/ "${S}"/third_party/ycmd/third_party/*/ ) - local -x PYTHONPATH=${PYTHONPATH}:$(IFS=:; echo "${dirs[*]}") - - nosetests || die -} - -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 - find python third_party/ycmd -depth -name '*test*' -exec rm -r {} + || die - find python third_party/ycmd -depth -name '*examples*' -exec rm -r {} + || die - rm third_party/ycmd/libclang.so.* || die - - vim-plugin_src_install - - python_optimize "${ED}" - python_fix_shebang "${ED}" -} diff --git a/app-vim/youcompleteme/youcompleteme-20180610.ebuild b/app-vim/youcompleteme/youcompleteme-20180610.ebuild new file mode 100644 index 0000000..b8caca6 --- /dev/null +++ b/app-vim/youcompleteme/youcompleteme-20180610.ebuild @@ -0,0 +1,113 @@ +EAPI=6 +PYTHON_COMPAT=( python3_{4,5,6} ) +inherit multilib python-single-r1 cmake-utils vim-plugin + +youcompletemev="c9ff2177377a85515b7e081966685f3c46a33eca" +ycmdv="3db4f3b2d723007c46891c11fce53a0dc4363493" +reqfuv="d9d21ac63904dc0a668e0f073503f85a534460f4" +pfdv="b27053e4d11f5891319fd29eda561c130ba3112a" +ossv="e1902915c6790bcec00b8d551199c8a3537d33c9" +gocodev="416643789f088aa5077f667cecde7f966131f6be" + +KEYWORDS="~amd64 ~x86" +SRC_URI=" + https://github.com/Valloric/YouCompleteMe/archive/$youcompletemev.tar.gz -> youcompleteme-$youcompletemev.tar.gz + https://github.com/Valloric/ycmd/archive/$ycmdv.tar.gz -> ycmd-$ycmdv.tar.gz + https://github.com/ross/requests-futures/archive/$reqfuv.tar.gz -> requests-futures-$reqfuv.tar.gz + https://github.com/slezica/python-frozendict/archive/$pfdv.tar.gz -> python-frozendict-$pfdv.tar.gz + csharp? ( https://github.com/OmniSharp/omnisharp-server/archive/$ossv.tar.gz -> omnisharp-server-$ossv.tar.gz ) + go? ( https://github.com/nsf/gocode/archive/$gocodev.tar.gz -> gocode-$gocodev.tar.gz ) +" + +DESCRIPTION="vim plugin: a code-completion engine for Vim" +HOMEPAGE="http://valloric.github.io/YouCompleteMe/" + +LICENSE="GPL-3" +IUSE="+clang test go csharp" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +COMMON_DEPEND=" + ${PYTHON_DEPS} + clang? ( sys-devel/clang:6 ) + >=dev-libs/boost-1.66:=[python,threads,${PYTHON_USEDEP}] + || ( + app-editors/vim[python,${PYTHON_USEDEP}] + app-editors/gvim[python,${PYTHON_USEDEP}] + ) +" +RDEPEND=" + ${COMMON_DEPEND} + dev-python/bottle[${PYTHON_USEDEP}] + dev-python/future[${PYTHON_USEDEP}] + dev-python/jedi[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] + dev-python/sh[${PYTHON_USEDEP}] + dev-python/waitress[${PYTHON_USEDEP}] +" +DEPEND=" + ${COMMON_DEPEND} + test? ( + >=dev-python/mock-1.0.1[${PYTHON_USEDEP}] + >=dev-python/nose-1.3.0[${PYTHON_USEDEP}] + dev-cpp/gmock + dev-cpp/gtest + ) +" + +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 pythonfutures requests-futures; 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 + use csharp && mv ${WORKDIR}/omnisharp-server-$ossv ${S}/third_party/ycmd/third_party/omnisharp-server + mv ${WORKDIR}/python-frozendict-$pfdv ${S}/third_party/ycmd/third_party/python-frozendict + use go && mv ${WORKDIR}/gocode-$gocodev ${S}/third_party/ycmd/third_party/gocode + mv ${WORKDIR}/requests-futures-$reqfuv ${S}/third_party/request-futures + cmake-utils_src_prepare + default +} + +src_configure() { + local mycmakeargs=( + -DUSE_CLANG_COMPLETER=$(usex clang) + -DUSE_CLANG_TIDY=$(usex clang) + -DUSE_SYSTEM_LIBCLANG=$(usex clang) + -DUSE_PYTHON2=OFF + -DPATH_TO_LLVM_ROOT=/usr/lib/llvm/6 + -DUSE_SYSTEM_BOOST=ON + ) + cmake-utils_src_configure +} + +src_test() { + cd "${S}/third_party/ycmd/cpp/ycm/tests" + LD_LIBRARY_PATH="${EROOT}"/usr/$(get_libdir)/llvm \ + ./ycm_core_tests || die + + cd "${S}"/python/ycm + + local dirs=( "${S}"/third_party/*/ "${S}"/third_party/ycmd/third_party/*/ ) + local -x PYTHONPATH=${PYTHONPATH}:$(IFS=:; echo "${dirs[*]}") + + nosetests || die +} + +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 + find python third_party/ycmd -depth -name '*test*' -exec rm -r {} + || die + find python third_party/ycmd -depth -name '*examples*' -exec rm -r {} + || die + rm third_party/ycmd/libclang.so.* || die + + vim-plugin_src_install + + python_optimize "${ED}" + python_fix_shebang "${ED}" +} -- cgit v1.2.3