diff --git a/app-vim/youcompleteme/Manifest b/app-vim/youcompleteme/Manifest index 19d7721..d89c88c 100644 --- a/app-vim/youcompleteme/Manifest +++ b/app-vim/youcompleteme/Manifest @@ -1,6 +1,5 @@ -EBUILD youcompleteme-20181113-r2.ebuild 6147 BLAKE2B 7071e378f42486371544692abaaa14fe6ac4a792d87d9212f8f657a37ebcb1cc2582f25d3579e17cbb58156d20c9c0370367512f16e02d7bd10cd0131fd47213 SHA512 d8415db0e839a6568419027102c750ca4dc97c26eeae045ffbe0cfc95b543a5c21b3526ebfbcf784b3901db08136f01902b51fde32f26a24e260cb5c9e3ea5ef -EBUILD youcompleteme-20181124.ebuild 6147 BLAKE2B 7071e378f42486371544692abaaa14fe6ac4a792d87d9212f8f657a37ebcb1cc2582f25d3579e17cbb58156d20c9c0370367512f16e02d7bd10cd0131fd47213 SHA512 d8415db0e839a6568419027102c750ca4dc97c26eeae045ffbe0cfc95b543a5c21b3526ebfbcf784b3901db08136f01902b51fde32f26a24e260cb5c9e3ea5ef EBUILD youcompleteme-20181128.ebuild 6147 BLAKE2B 4562be9887c05f21f8cf32ccd9bc99185700a206b38311f6ff2e1d628fcedc8ffd005ffbbe4383009f66c518b02127762814ce04aa78c3e72fc9fd613803d73a SHA512 25c9396e6aef3412894d0e1ca14bd1d496aafaafdea9e4495b7f355c4d9c5e1de9aa04b5a7665a83fcda6e942eb4dff61dbfed4225d08a08d09ab3ee48eb4254 +EBUILD youcompleteme-20181211.ebuild 6147 BLAKE2B 86da2ce902c679a86fad3495be2d61f24993589b0a36fb08f3be28ff2d396dffdc0bbf0bc7bf46b696cd29d7627c38355b77331e72c260930baf2b2e4f528c5a SHA512 e7f9ae05344a94662376fb9f1e1ef1d311a66d15ac446b5a681426515e0952d9889fc5e9b613c1ca3ea20bfe93022e3b02342b08a18335dc06a1ce720468828e EBUILD youcompleteme-99999999-r6.ebuild 6096 BLAKE2B 9962d2de9ec931bcc2b504a44aa77b89f3479b66c4dbf220bd30bb88a85c342b175e6bad11a8a7af9195b829fd1e8740481ba11e88262b91cc22119cca9ff3ce SHA512 81991f1a56729a69d459dad83e2162532f9519d43a8b0bf7eed5ecf4b0785511229806d8507a12343a6d8da7c2e35d5e4d4706fe86098a93409f11a41f43646d MISC README.md 1017 BLAKE2B b3ceff351a191e710ae7b9d55602a1a6d1858c403b61d5bcde8c1aac2203093ee15994ced762e9fc996e4b88e65f8f73fd0fd1e27dc5b7fe032291a75b3a53fe SHA512 fb8d02d90df215addc2b13e60975a3d1e41d3cca945294ca1a3013ab337b7dcd834151aabb7712036fb13189a53e69b14a531110cc3820431416cd620404d08f MISC metadata.xml 672 BLAKE2B 27d98400640fe6befc7cc4f35803af907c631d7204b24cafe2f799d528fbfda3be5e1fb2e9dbf93ebc72a66e0ac5a0a7e3c164bb29596a8bde3b1ec2579bed8a SHA512 8cff7a413256f2fed659c9757c6162970d35544ba665c023f3d555b1203d812a3b9caa4e3163a2e708192aaa986435d0f246c76569e30801116ade112a453a70 diff --git a/app-vim/youcompleteme/youcompleteme-20181124.ebuild b/app-vim/youcompleteme/youcompleteme-20181124.ebuild deleted file mode 100644 index dad5ccb..0000000 --- a/app-vim/youcompleteme/youcompleteme-20181124.ebuild +++ /dev/null @@ -1,204 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_6 ) - -inherit eutils cmake-utils git-r3 multilib python-single-r1 vim-plugin - -DESCRIPTION="vim plugin: a code-completion engine for Vim" -HOMEPAGE="https://github.com/Valloric/YouCompleteMe" -EGIT_REPO_URI="https://github.com/Valloric/YouCompleteMe" -EGIT_COMMIT="faa019aa532475c5028527ffbfe1e910119d663c" -SRC_URI="" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="clang +doc test mono go rust nodejs +neovim" -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 ) - neovim? ( app-editors/neovim[python] ) - 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/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/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 - -DUSE_PYTHON2=OFF - ) - 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 - export GOPATH="$GOPATH:${S}/third_party/ycmd/third_party/go" - cd "${S}/third_party/ycmd/third_party/go/src/github.com/mdempsky/gocode" || die "failed cd to gocode" - go build || die "failed to go build gocode GOPATH is $GOPATH" - cd "${S}/third_party/ycmd/third_party/go/src/github.com/rogpeppe/godef" || die "failed cd to godef" - go build || die "failed to go build godef GOPATH is $GOPATH" - 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/go/src/github.com/mdempsky/gocode" - for f in $(ls -a | tail -n +3 | grep -v '^gocode$') - do - rm -rf "${f}" - done - cd "${S}/third_party/ycmd/third_party/go/src/github.com/rogpeppe/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 - find third_party/ycmd/third_party -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/ycmd/completers/go" - use go || rm -rf "${D}/usr/share/vim/vimfiles/third_party/ycmd/third_party/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-20181113-r2.ebuild b/app-vim/youcompleteme/youcompleteme-20181211.ebuild similarity index 98% rename from app-vim/youcompleteme/youcompleteme-20181113-r2.ebuild rename to app-vim/youcompleteme/youcompleteme-20181211.ebuild index dad5ccb..2269afb 100644 --- a/app-vim/youcompleteme/youcompleteme-20181113-r2.ebuild +++ b/app-vim/youcompleteme/youcompleteme-20181211.ebuild @@ -10,7 +10,7 @@ inherit eutils cmake-utils git-r3 multilib python-single-r1 vim-plugin DESCRIPTION="vim plugin: a code-completion engine for Vim" HOMEPAGE="https://github.com/Valloric/YouCompleteMe" EGIT_REPO_URI="https://github.com/Valloric/YouCompleteMe" -EGIT_COMMIT="faa019aa532475c5028527ffbfe1e910119d663c" +EGIT_COMMIT="0790dc99b441f3c12fb205faf56054ccf0f4c234" SRC_URI="" LICENSE="GPL-3" @@ -21,7 +21,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" COMMON_DEPEND=" ${PYTHON_DEPS} - clang? ( >=sys-devel/clang-3.8:= ) + clang? ( >=sys-devel/clang-7.0:= ) mono? ( dev-lang/mono ) go? ( dev-lang/go ) rust? ( dev-lang/rust