From 1e8f5b6e1c02f9f698e2c2dcf899c1359bca7195 Mon Sep 17 00:00:00 2001 From: layman Date: Fri, 15 Jun 2018 20:32:48 -0700 Subject: [PATCH] version bump youcompleteme --- app-vim/youcompleteme/Manifest | 11 +- .../youcompleteme-20180615.ebuild | 203 ++++++++++++++++++ ...build => youcompleteme-99999999-r4.ebuild} | 2 +- 3 files changed, 210 insertions(+), 6 deletions(-) create mode 100644 app-vim/youcompleteme/youcompleteme-20180615.ebuild rename app-vim/youcompleteme/{youcompleteme-99999999-r3.ebuild => youcompleteme-99999999-r4.ebuild} (98%) diff --git a/app-vim/youcompleteme/Manifest b/app-vim/youcompleteme/Manifest index c1bea1c..ce37bf6 100644 --- a/app-vim/youcompleteme/Manifest +++ b/app-vim/youcompleteme/Manifest @@ -1,5 +1,6 @@ -EBUILD youcompleteme-20171216.ebuild 5200 SHA256 807928d3802a0c209cb2dd7a09317f2308533b09b4a9d1705f9266285a227411 SHA512 aea9aed2f1e31d4c434c62cde1159ea1d0312c8da1f9337950fd0b1f2b5804d2d2e6e00eb913cbd26b8fafcd14b069abe5868b53d8c8803b68eede3a5ec3efbf WHIRLPOOL 30884247f37967360e3b5fc4f1ecc2a5d6e53ba6ea5f41567ceb09fb3fd55890a5b50954916a0ad37e2722db71161b01ae09fd211c5f15e45382b8944dc6ff7a -EBUILD youcompleteme-20180219-r1.ebuild 6069 SHA256 63b0431e3d0ae5258ef40dccc9ec1d0a6f4806182cf0cd0a84184616d1638e74 SHA512 0c7e99dbe67a747986b3200023ee5f6d8e1981cfa9eae733b6146525804b8df1c4077e5fbe1c496d3b72ae4fa0004e2457fe0a0ba652f2222b2c9d59006c9366 WHIRLPOOL a17272f093935fea7df78ef9c4f11e06b884fec3d1f6a385012b5f8696d35b0d462cb846d5cb0d0cc1800580e9de4623d34d485734e42b4f2ea8f34fbf9cf7a4 -EBUILD youcompleteme-99999999-r3.ebuild 6014 SHA256 d8347ae54655bedf358465365402be4f07f14df1731d9a1828531393fb19a77d SHA512 002b8b6cbbc372e44b25e0b58b76a94ba0947d7b6809b608f41293c8f18505fe35e7b1a927b9c566c2296c4591896ed088b7916635111152d1a2a1555192a989 WHIRLPOOL 4db94d306414ae9e73da00d7869d031d8faef6ea753ac3d0317b8059bfa2ea71ef24eaf5e1320ce9b5bc4bb1ce2dd445b6e94ef3522c7987b750defee5c29fd9 -MISC README.md 1017 SHA256 b5741d484ae2b303937e0bd50ca913dd367dd846d1b211bada7db583541f1a57 SHA512 fb8d02d90df215addc2b13e60975a3d1e41d3cca945294ca1a3013ab337b7dcd834151aabb7712036fb13189a53e69b14a531110cc3820431416cd620404d08f WHIRLPOOL 0f832da37bf55242f006dff821648d68f3ce4329031e5fd1eb56fd57ded3769b86f83d65ac247f81636cfe5b8dc39e9ca97669ae4baa393c75f9a0d98822d901 -MISC metadata.xml 672 SHA256 f6bdb38b04c3e0025a5727ede31d34a7fce98c2182cdbc4069d283edc284b5af SHA512 8cff7a413256f2fed659c9757c6162970d35544ba665c023f3d555b1203d812a3b9caa4e3163a2e708192aaa986435d0f246c76569e30801116ade112a453a70 WHIRLPOOL 636b153ca1e56963eb25f612ab0f0a15173035fc28421da820985075e3da7d1805ed2268e328ba1ca3cc88769d674cfaf495a597bce1b3252e0be56d598bdae3 +EBUILD youcompleteme-20171216.ebuild 5200 BLAKE2B ca4be6ec38f19dc370e5efe2b7662a0bd476f6af053857541a22838939fb6abf247e68da2bad02744375be25358b77dd12d43ceb33eb644fd1c6bccecb0beec3 SHA512 aea9aed2f1e31d4c434c62cde1159ea1d0312c8da1f9337950fd0b1f2b5804d2d2e6e00eb913cbd26b8fafcd14b069abe5868b53d8c8803b68eede3a5ec3efbf +EBUILD youcompleteme-20180219-r1.ebuild 6069 BLAKE2B 72ad68dba3ed3dccd5b87e1618bb8ae25f35974437d019620c810aacd23a743bd92760e7d7efee613174c4d47137d0d073f652958a46cc6cb1c8d4abecb5c38e SHA512 0c7e99dbe67a747986b3200023ee5f6d8e1981cfa9eae733b6146525804b8df1c4077e5fbe1c496d3b72ae4fa0004e2457fe0a0ba652f2222b2c9d59006c9366 +EBUILD youcompleteme-20180615.ebuild 6057 BLAKE2B 65f50bd5fa433949357eeae0f5f2fd354ee1273fe941f9d89b9608bd689199db22839e1da374037b4f13f2be794ce8dc7f3737422aa9d6b57d5da36dc46e8548 SHA512 026a0a04f5835f0d7ccca0434bacae97fc18d7576e7a34524d373970f5bc09ecdf010e255fc8ca615b985f2f3e0fe9a3d765bd116a3457e6812ecc78eb0ed26a +EBUILD youcompleteme-99999999-r3.ebuild 6014 BLAKE2B 4140be51a234ecd1f08e53c59c0af698c80eeb98df85df94499f5f3813e2d03289c0e7eca414ed1693e328099f27f033fe7c868b66465adf24134d22f2a92a5e SHA512 002b8b6cbbc372e44b25e0b58b76a94ba0947d7b6809b608f41293c8f18505fe35e7b1a927b9c566c2296c4591896ed088b7916635111152d1a2a1555192a989 +MISC README.md 1017 BLAKE2B b3ceff351a191e710ae7b9d55602a1a6d1858c403b61d5bcde8c1aac2203093ee15994ced762e9fc996e4b88e65f8f73fd0fd1e27dc5b7fe032291a75b3a53fe SHA512 fb8d02d90df215addc2b13e60975a3d1e41d3cca945294ca1a3013ab337b7dcd834151aabb7712036fb13189a53e69b14a531110cc3820431416cd620404d08f +MISC metadata.xml 672 BLAKE2B 27d98400640fe6befc7cc4f35803af907c631d7204b24cafe2f799d528fbfda3be5e1fb2e9dbf93ebc72a66e0ac5a0a7e3c164bb29596a8bde3b1ec2579bed8a SHA512 8cff7a413256f2fed659c9757c6162970d35544ba665c023f3d555b1203d812a3b9caa4e3163a2e708192aaa986435d0f246c76569e30801116ade112a453a70 diff --git a/app-vim/youcompleteme/youcompleteme-20180615.ebuild b/app-vim/youcompleteme/youcompleteme-20180615.ebuild new file mode 100644 index 0000000..4519a79 --- /dev/null +++ b/app-vim/youcompleteme/youcompleteme-20180615.ebuild @@ -0,0 +1,203 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python2_7 ) + +inherit eutils cmake-utils git-r3 multilib python-single-r1 vim-plugin + +DESCRIPTION="vim plugin: a code-completion engine for Vim" +HOMEPAGE="https://valloric.github.io/YouCompleteMe/" +EGIT_REPO_URI="https://github.com/Valloric/YouCompleteMe.git" +EGIT_COMMIT="e49f817bfe7a7400efcc0b6527188ff6395f996f" +SRC_URI="" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="clang +doc test mono go rust nodejs" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +COMMON_DEPEND=" + ${PYTHON_DEPS} + clang? ( >=sys-devel/clang-3.8:= ) + mono? ( dev-lang/mono ) + go? ( dev-lang/go ) + rust? ( dev-lang/rust + app-vim/rust-vim + ) + nodejs? ( net-libs/nodejs ) + 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}] + virtual/python-futures[${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 + ) +" + +CMAKE_IN_SOURCE_BUILD=1 +CMAKE_USE_DIR=${S}/third_party/ycmd/cpp + +VIM_PLUGIN_HELPFILES="${PN}" + +src_prepare() { + default + + if ! use test ; then + sed -i '/^add_subdirectory( tests )/d' third_party/ycmd/cpp/ycm/CMakeLists.txt || die + fi + for third_party_module in pythonfutures; do + rm -r "${S}"/third_party/${third_party_module} || die "Failed to remove third party module ${third_party_module}" + done + # Argparse is included in python 2.7 + for third_party_module in bottle python-future requests waitress; do + rm -r "${S}"/third_party/ycmd/third_party/${third_party_module} || die "Failed to remove third party module ${third_party_module}" + done + rm -r "${S}"/third_party/ycmd/third_party/JediHTTP/vendor || die "Failed to remove third_party/ycmd/third_party/JediHTTP/vendor" + rm -r "${S}"/third_party/ycmd/cpp/BoostParts || die "Failed to remove bundled boost" + +} + +src_configure() { + local mycmakeargs=( + -DUSE_CLANG_COMPLETER="$(usex clang)" + -DUSE_SYSTEM_LIBCLANG="$(usex clang)" + -DUSE_SYSTEM_BOOST=ON + -DUSE_SYSTEM_GMOCK=ON + ) + cmake-utils_src_configure +} + +src_compile() { + cmake-utils_src_compile + + if use rust; + then + cd "${S}"/third_party/ycmd/third_party/racerd || die "no dir third_party/racerd" + cargo build --release || die "cargo build failed" + fi + + if use mono; + then + cd "${S}/third_party/ycmd/third_party/OmniSharpServer" || die "failed cd to OmniSharpServer" + xbuild /property:Configuration=Release || die "xbuild command failed" + fi + + if use go; + then + cd "${S}/third_party/ycmd/third_party/gocode" || die "failed cd to gocode" + go build || die "failed to go build gocode" + cd "${S}/third_party/ycmd/third_party/godef" || die "failed cd to godef" + go build || die "failed to go build godef" + fi + + if use nodejs; + then + cd "${S}/third_party/ycmd/third_party/tern_runtime" || die "no dir third_party/tern_runtime" + npm install --production --python=python2 || die "npm install failed" + fi + +} + +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 --verbose || die +} + +src_install() { + + if use rust; + then + cd "${S}/third_party/ycmd/third_party/racerd" || die "racerd target wasn't built" + for f in $(ls -a | tail -n +3 | grep -v target) + do + rm -rf "${f}" + done + cd "${S}/third_party/ycmd/third_party/racerd/target/release" || die "racerd target wasn't built" + for f in $(ls -a | tail -n +3 | grep -v '^racerd$') + do + rm -rf "${f}" + done + fi + + if use mono; + then + cd "${S}/third_party/ycmd/third_party/OmniSharpServer" + for f in $(ls -a | tail -n +3 | grep -v '^OmniSharp$') + do + rm -rf "${f}" + done + cd "${S}/third_party/ycmd/third_party/OmniSharpServer/OmniSharp" + for f in $(ls -a | tail -n +3 | grep -v '^bin$') + do + rm -rf "${f}" + done + fi + + if use go; + then + cd "${S}/third_party/ycmd/third_party/gocode" + for f in $(ls -a | tail -n +3 | grep -v '^gocode$') + do + rm -rf "${f}" + done + cd "${S}/third_party/ycmd/third_party/godef" + for f in $(ls -a | tail -n +3 | grep -v '^godef$') + do + rm -rf "${f}" + done + fi + + cd "${S}" + use doc && dodoc *.md third_party/ycmd/*.md + rm -r *.md *.sh *.py* *.ini *.yml COPYING.txt ci third_party/ycmd/cpp third_party/ycmd/ci third_party/ycmd/ycmd/tests third_party/ycmd/examples/samples || die + rm -r third_party/ycmd/{*.md,*.sh,*.yml,.coveragerc,.gitignore,.gitmodules,.travis.yml,build.*,*.txt,run_tests.*,*.ini,update*} || die + find python -name *test* -exec rm -rf {} + || die + egit_clean + use clang && (rm third_party/ycmd/libclang.so* || die) + + vim-plugin_src_install + + use mono || rm -rf "${D}/usr/share/vim/vimfiles/third_party/ycmd/third_party/OmniSharpServer" + use rust || rm -rf "${D}/usr/share/vim/vimfiles/third_party/ycmd/third_party/racerd" + use rust || rm -rf "${D}/usr/share/vim/vimfiles/third_party/ycmd/ycmd/completers/rust" + use go || rm -rf "${D}/usr/share/vim/vimfiles/third_party/ycmd/third_party/gocode" + use go || rm -rf "${D}/usr/share/vim/vimfiles/third_party/ycmd/third_party/godef" + use go || rm -rf "${D}/usr/share/vim/vimfiles/third_party/ycmd/ycmd/completers/go" + use nodejs || rm -rf "${D}/usr/share/vim/vimfiles/third_party/ycmd/third_party/tern_runtime" + use nodejs || rm -rf "${D}/usr/share/vim/vimfiles/third_party/ycmd/ycmd/completers/javascript" + find "${D}" -name .gitignore -exec rm -rf {} + || die + find "${D}" -name .travis.yml -exec rm -rf {} + || die + find "${D}" -name README.rst -exec rm -rf {} + || die + + python_optimize "${ED}" + python_fix_shebang "${ED}" +} diff --git a/app-vim/youcompleteme/youcompleteme-99999999-r3.ebuild b/app-vim/youcompleteme/youcompleteme-99999999-r4.ebuild similarity index 98% rename from app-vim/youcompleteme/youcompleteme-99999999-r3.ebuild rename to app-vim/youcompleteme/youcompleteme-99999999-r4.ebuild index ae20814..c84a2a5 100644 --- a/app-vim/youcompleteme/youcompleteme-99999999-r3.ebuild +++ b/app-vim/youcompleteme/youcompleteme-99999999-r4.ebuild @@ -178,7 +178,7 @@ src_install() { cd "${S}" use doc && dodoc *.md third_party/ycmd/*.md rm -r *.md *.sh *.py* *.ini *.yml COPYING.txt ci third_party/ycmd/cpp third_party/ycmd/ci third_party/ycmd/ycmd/tests third_party/ycmd/examples/samples || die - rm -r third_party/ycmd/{*.md,*.sh,*.yml,.coveragerc,.gitignore,.gitmodules,.travis.yml,build.*,*.txt,run_tests.*,*.ini,update*,Vagrantfile} || die + rm -r third_party/ycmd/{*.md,*.sh,*.yml,.coveragerc,.gitignore,.gitmodules,.travis.yml,build.*,*.txt,run_tests.*,*.ini,update*} || die find python -name *test* -exec rm -rf {} + || die egit_clean use clang && (rm third_party/ycmd/libclang.so* || die)