From fa7bb842d7bb211e32ba02c77d59b27d5edcb559 Mon Sep 17 00:00:00 2001 From: layman Date: Wed, 28 Nov 2018 06:37:25 -0800 Subject: [PATCH] youcompleteme bump 21 commits, update clang dependancy version for youcompleteme --- app-vim/youcompleteme/Manifest | 2 +- ...7.ebuild => youcompleteme-20181128.ebuild} | 30 ++++++++++--------- 2 files changed, 17 insertions(+), 15 deletions(-) rename app-vim/youcompleteme/{youcompleteme-20180807.ebuild => youcompleteme-20181128.ebuild} (85%) diff --git a/app-vim/youcompleteme/Manifest b/app-vim/youcompleteme/Manifest index d623e1b..19d7721 100644 --- a/app-vim/youcompleteme/Manifest +++ b/app-vim/youcompleteme/Manifest @@ -1,6 +1,6 @@ -EBUILD youcompleteme-20180807.ebuild 5963 BLAKE2B 502d8ba2209c326b7dad336ea2d95c3033e526e656f835fe2cee5aed862d87a447810198e8477ce3e2521f3e5a42ee917e4a128c0fba8d09cd75dde40ca797e1 SHA512 28459c2b752b6d87883c74db668f2a2320280a66c682e7eac4adb24612ef16d1d4b82bd707756ddfc4913a8c9f7f7c3dafc6ab6eb2dd836755e370d33e1a8945 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-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-20180807.ebuild b/app-vim/youcompleteme/youcompleteme-20181128.ebuild similarity index 85% rename from app-vim/youcompleteme/youcompleteme-20180807.ebuild rename to app-vim/youcompleteme/youcompleteme-20181128.ebuild index 04c2daa..59077ea 100644 --- a/app-vim/youcompleteme/youcompleteme-20180807.ebuild +++ b/app-vim/youcompleteme/youcompleteme-20181128.ebuild @@ -3,31 +3,32 @@ EAPI=6 -PYTHON_COMPAT=( python2_7 ) +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://valloric.github.io/YouCompleteMe/" -EGIT_REPO_URI="https://github.com/Valloric/YouCompleteMe.git" -EGIT_COMMIT="15362d9cb8ec054c929e9a202252825eabe47e58" +HOMEPAGE="https://github.com/Valloric/YouCompleteMe" +EGIT_REPO_URI="https://github.com/Valloric/YouCompleteMe" +EGIT_COMMIT="75bf1738dcac502fa2d04e87116a3ce65249be8c" SRC_URI="" LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="clang +doc test mono go rust nodejs" +IUSE="clang +doc test mono go rust nodejs +neovim" 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 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}] @@ -82,6 +83,7 @@ src_configure() { -DUSE_SYSTEM_LIBCLANG="$(usex clang)" -DUSE_SYSTEM_BOOST=ON -DUSE_SYSTEM_GMOCK=ON + -DUSE_PYTHON2=OFF ) cmake-utils_src_configure } @@ -103,10 +105,11 @@ src_compile() { 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" + 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; @@ -162,12 +165,12 @@ src_install() { if use go; then - cd "${S}/third_party/ycmd/third_party/gocode" + 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/godef" + 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}" @@ -188,9 +191,8 @@ 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 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