diff --git a/app-vim/youcompleteme/Manifest b/app-vim/youcompleteme/Manifest index 3aae04c..9a8c98f 100644 --- a/app-vim/youcompleteme/Manifest +++ b/app-vim/youcompleteme/Manifest @@ -1,5 +1,5 @@ -EBUILD youcompleteme-20190711.ebuild 4509 BLAKE2B 058948c4ca4775eb3f28a0050786531dab2def34db5bfb8d6db079d4afc2fa44972298671cd00ca43d42c024ecc01a22ddb35ac1717880375a593a0b4fa964ca SHA512 03acb47def96841ed78607b0416cc3e7fb06ebdf956d916fa63e4c816d658aa5f95751015e28141bf58e89ec960f05fb9d42e934aeeb749a4f588480fde1417d EBUILD youcompleteme-20190717.ebuild 4722 BLAKE2B 90f0337736cd40a8521d9f788189dc091c3bf6164bdbd8a053d0881302d4e23892a690c4e56ebe5841103e5ed09eb0f4e8530c7305c65596d9512ccc7c30d829 SHA512 3f1d40e845b5c53cda1ffcab4ae44634e632cf21beb7ba4571984c3680b9ccaa662d97783b13acb969ee78593e43b3258ed1b30c63be8b5c78aff458b0819fbf EBUILD youcompleteme-20190728.ebuild 5020 BLAKE2B a5fc3d1a67c4ac06487cef1c0659fb8bb408273523600042878c4e81d983c66ef7a235262431a0d64dd13b053623b416c44a02caad21820c6031188e19b7ef24 SHA512 3d0a4fd3702922c8d134eada91445c680ba2e2f3d6f9384385a424d1dc1086c95be051ad5981748df19bd7d9568fb22846c0ad6a8c2eb9cc9c6de4d86be90147 +EBUILD youcompleteme-20190814.ebuild 5020 BLAKE2B 8cfb1440ebd6a384ccd923be1f23507c504702b45e8c04ec5b239c4ecf3f0e373806b024a796d870f6a152dbc66762137d79661c9ff3304c6532305ed4500a23 SHA512 bac253719999ee98bb67c2628065465f04c5153f978f173d0c99b36668b5e368db723bff1d838d04228ab415589f65be5684e38832c5be5148ebbb72b778e9b1 MISC README.md 1017 BLAKE2B b3ceff351a191e710ae7b9d55602a1a6d1858c403b61d5bcde8c1aac2203093ee15994ced762e9fc996e4b88e65f8f73fd0fd1e27dc5b7fe032291a75b3a53fe SHA512 fb8d02d90df215addc2b13e60975a3d1e41d3cca945294ca1a3013ab337b7dcd834151aabb7712036fb13189a53e69b14a531110cc3820431416cd620404d08f MISC metadata.xml 684 BLAKE2B ad2a46ec4665b4530aeca2821030dec6a7eccb020b65f61a79b58b2bff959f4964e44d81c3e2914ed344758bc1b80e18bd166ae638339d67b5360b9473804f0d SHA512 b9d20edf383cd83dfefaa2d46811c876de7b02985d5d8c86645d0e787f243710100d85adaf24311ef0c9020aace0a41083f4443134009f2b6533d8e2ba2887b9 diff --git a/app-vim/youcompleteme/youcompleteme-20190711.ebuild b/app-vim/youcompleteme/youcompleteme-20190814.ebuild similarity index 81% rename from app-vim/youcompleteme/youcompleteme-20190711.ebuild rename to app-vim/youcompleteme/youcompleteme-20190814.ebuild index 54cb706..91470eb 100644 --- a/app-vim/youcompleteme/youcompleteme-20190711.ebuild +++ b/app-vim/youcompleteme/youcompleteme-20190814.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="04c3505129cd80b92f1b6177dca8aecc55cb0760" +EGIT_COMMIT="afd69b382844315812fd48912eaa9fa47cba3a8d" SRC_URI="" EGIT_SUBMODULES=( 'third_party/ycmd' @@ -20,15 +20,15 @@ EGIT_SUBMODULES=( LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="clang +doc test go nodejs +neovim" +IUSE="clang +doc test go tern +neovim typescript" REQUIRED_USE="${PYTHON_REQUIRED_USE}" COMMON_DEPEND=" ${PYTHON_DEPS} clang? ( >=sys-devel/clang-7.0:= ) go? ( dev-lang/go ) - ) - nodejs? ( net-libs/nodejs ) + tern? ( net-libs/nodejs ) + typescript? ( net-libs/nodejs ) neovim? ( app-editors/neovim[python] ) dev-libs/boost[python,threads,${PYTHON_USEDEP}] || ( @@ -98,10 +98,14 @@ src_compile() { go build || die "failed to go build gocode GOPATH is $GOPATH" fi - if use nodejs; + if use tern; then cd "${S}/third_party/ycmd/third_party/tern_runtime" || die "no dir third_party/tern_runtime" npm install --production --python=python3 || die "npm install failed" + fi + + if use typescript; + then mkdir -p "${S}/third_party/ycmd/third_party/tsserver" || die "no dir third_party/tsserver" npm install -g --prefix third_party/tsserver typescript --python=python3 fi @@ -134,8 +138,10 @@ src_install() { cd "${S}" use doc && dodoc *.md third_party/ycmd/*.md - rm -r *.md *.sh *.py* *.ini *.yml COPYING.txt third_party/ycmd/cpp third_party/ycmd/ci 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 + # rm -r *.md *.sh *.py* *.ini *.yml COPYING.txt third_party/ycmd/cpp third_party/ycmd/ci third_party/ycmd/examples/samples || die + rm -r *.md *.sh *.py* *.ini *.yml COPYING.txt 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 + rm -r third_party/ycmd/{*.md,*.sh,*.yml,.coveragerc,.gitignore,.gitmodules,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 @@ -145,8 +151,16 @@ src_install() { 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" + if ! use tern; + then + if ! use typescript; + then + rm -rf "${D}/usr/share/vim/vimfiles/third_party/ycmd/third_party/tern_runtime" + rm -rf "${D}/usr/share/vim/vimfiles/third_party/ycmd/ycmd/completers/javascript" + fi + fi + # use tern || 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