From 9b351438c2c0225a2653e25b85dd8dc541be01a6 Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Wed, 14 Mar 2018 19:16:57 +0000 Subject: Use Clang/LLVM 6 now --- app-vim/youcompleteme/Manifest | 2 +- .../youcompleteme/youcompleteme-20170902-r1.ebuild | 116 +++++++++++++++++++++ .../youcompleteme/youcompleteme-20170902.ebuild | 116 --------------------- 3 files changed, 117 insertions(+), 117 deletions(-) create mode 100644 app-vim/youcompleteme/youcompleteme-20170902-r1.ebuild delete mode 100644 app-vim/youcompleteme/youcompleteme-20170902.ebuild diff --git a/app-vim/youcompleteme/Manifest b/app-vim/youcompleteme/Manifest index 0a4d4f4..1e5764c 100644 --- a/app-vim/youcompleteme/Manifest +++ b/app-vim/youcompleteme/Manifest @@ -4,4 +4,4 @@ DIST python-frozendict-b27053e4d11f5891319fd29eda561c130ba3112a.tar.gz 2192 BLAK DIST requests-futures-98712e7d0f6be2a090b6fda2a925f85e63656b58.tar.gz 4550 BLAKE2B 8ac1b79dd283ea99093eeaa693a10afddf5ce877263f848b6bb11f2ddd0984937b95f368007efb885ac5cd262aecba5c93c194a48d19283df14a0bdae90a9b46 SHA512 38f0c86ab8f74f4f48a6b4279c5d83580f5486a59b71d4d7009835e3f4e8fcbe07e188d0920de9b223d7c88592998c93e6c66f8aae19d22cf4a31705e066e54c DIST ycmd-6463774035e61a660ad9150a592b8829eb37fd10.tar.gz 3367942 BLAKE2B 291e5b2fcbac523b7ef8d9efa2a758206d284c205df7414062d30900679e6202687346ec7d4be6f26041ba672e4769bf5214fa89dcd56a2a31649dfc1fa25f0a SHA512 45257e06c7199a6001531ffd8b9d978afee0a51356023fcad413400a8a7919bbf4f6ba2e0f4fdfae90080c08aa5c9075001275f3c74bd3c908649b2a5b042940 DIST youcompleteme-65765ef32b0288b35a022373f8e04c66b7764b2b.tar.gz 261562 BLAKE2B 6d15ff3f5514d26760eb1ab5c7a03dcbabe0480a669895a76af25151cc0fa437e1e36bd027b166794097372e874c7626e30a29791360b59553b74c51b34d4c60 SHA512 ec1e432d5582d501cbc1fef53373ad40090c562b15640675f76ae39f2bc973f97fca3f5f600874992242236bb52abd4baf2fdf987d36535654ae357b30ebf5a6 -EBUILD youcompleteme-20170902.ebuild 3803 BLAKE2B 3697910aa717e9633302f92c1367eddffc4b10e38df50dc7260ec970a04c896b1b4f1123319af6474073d144310f0950f302b09bfd758f3f1e1a9e483a9983b5 SHA512 95c964b3baf9961990b7edd434fa4aed854698430d5ad8f2e0012fde9d9e285856a857e931bf0237862514df7c8de1d8c9098442a8e9196aa094b35955fbc7b2 +EBUILD youcompleteme-20170902-r1.ebuild 3803 BLAKE2B 5b65bb9a984442929631801b553b8c54c36d95a0590efd98e0b0d6ce0b1bbde84fe6bd2462165d4fcc08889f3db992ce692f9e980e282d110bcfe08fdf398009 SHA512 1735de0885552e96f32305e0ac4533332e86cf777878dfdff154aff718c6059c2a6e571f66bb2167748fdb7370eb1edec107efceb82494bc378abf45226b112b diff --git a/app-vim/youcompleteme/youcompleteme-20170902-r1.ebuild b/app-vim/youcompleteme/youcompleteme-20170902-r1.ebuild new file mode 100644 index 0000000..571c5cf --- /dev/null +++ b/app-vim/youcompleteme/youcompleteme-20170902-r1.ebuild @@ -0,0 +1,116 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +PYTHON_COMPAT=( python3_{4,5,6} ) +inherit multilib python-single-r1 cmake-utils vim-plugin + +youcompletemev="65765ef32b0288b35a022373f8e04c66b7764b2b" +ycmdv="6463774035e61a660ad9150a592b8829eb37fd10" +reqfuv="98712e7d0f6be2a090b6fda2a925f85e63656b58" +pfdv="b27053e4d11f5891319fd29eda561c130ba3112a" +ossv="e1902915c6790bcec00b8d551199c8a3537d33c9" +gocodev="843b7a63f621bb441274849d58671870adf1a5ce" + +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[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 +} + +src_configure() { + local mycmakeargs=( + $(cmake-utils_use_use clang CLANG_COMPLETER) + $(cmake-utils_use_use clang SYSTEM_LIBCLANG) + -DUSE_PYTHON2=OFF + -DBoost_PYTHON3_LIBRARY_RELEASE=/usr/lib/libboost_${EPYTHON/3/-3}.so + -DPATH_TO_LLVM_ROOT=/usr/lib/llvm/6 + -DUSE_SYSTEM_BOOST=ON + -DUSE_SYSTEM_GMOCK=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-20170902.ebuild b/app-vim/youcompleteme/youcompleteme-20170902.ebuild deleted file mode 100644 index d7e58fe..0000000 --- a/app-vim/youcompleteme/youcompleteme-20170902.ebuild +++ /dev/null @@ -1,116 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -PYTHON_COMPAT=( python3_{4,5,6} ) -inherit multilib python-single-r1 cmake-utils vim-plugin - -youcompletemev="65765ef32b0288b35a022373f8e04c66b7764b2b" -ycmdv="6463774035e61a660ad9150a592b8829eb37fd10" -reqfuv="98712e7d0f6be2a090b6fda2a925f85e63656b58" -pfdv="b27053e4d11f5891319fd29eda561c130ba3112a" -ossv="e1902915c6790bcec00b8d551199c8a3537d33c9" -gocodev="843b7a63f621bb441274849d58671870adf1a5ce" - -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:4 ) - dev-libs/boost[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 -} - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_use clang CLANG_COMPLETER) - $(cmake-utils_use_use clang SYSTEM_LIBCLANG) - -DUSE_PYTHON2=OFF - -DBoost_PYTHON3_LIBRARY_RELEASE=/usr/lib/libboost_${EPYTHON/3/-3}.so - -DPATH_TO_LLVM_ROOT=/usr/lib/llvm/4 - -DUSE_SYSTEM_BOOST=ON - -DUSE_SYSTEM_GMOCK=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