mirror of
				https://github.com/TrentSPalmer/gentoo-overlay-trent.git
				synced 2025-10-31 01:41:41 -07:00 
			
		
		
		
	update youcompleteme
This commit is contained in:
		| @@ -1,6 +1,5 @@ | |||||||
| EBUILD youcompleteme-20180219-r1.ebuild 6069 BLAKE2B 72ad68dba3ed3dccd5b87e1618bb8ae25f35974437d019620c810aacd23a743bd92760e7d7efee613174c4d47137d0d073f652958a46cc6cb1c8d4abecb5c38e SHA512 0c7e99dbe67a747986b3200023ee5f6d8e1981cfa9eae733b6146525804b8df1c4077e5fbe1c496d3b72ae4fa0004e2457fe0a0ba652f2222b2c9d59006c9366 |  | ||||||
| EBUILD youcompleteme-20180615.ebuild 6057 BLAKE2B 65f50bd5fa433949357eeae0f5f2fd354ee1273fe941f9d89b9608bd689199db22839e1da374037b4f13f2be794ce8dc7f3737422aa9d6b57d5da36dc46e8548 SHA512 026a0a04f5835f0d7ccca0434bacae97fc18d7576e7a34524d373970f5bc09ecdf010e255fc8ca615b985f2f3e0fe9a3d765bd116a3457e6812ecc78eb0ed26a |  | ||||||
| EBUILD youcompleteme-20180807.ebuild 5963 BLAKE2B 502d8ba2209c326b7dad336ea2d95c3033e526e656f835fe2cee5aed862d87a447810198e8477ce3e2521f3e5a42ee917e4a128c0fba8d09cd75dde40ca797e1 SHA512 28459c2b752b6d87883c74db668f2a2320280a66c682e7eac4adb24612ef16d1d4b82bd707756ddfc4913a8c9f7f7c3dafc6ab6eb2dd836755e370d33e1a8945 | EBUILD youcompleteme-20180807.ebuild 5963 BLAKE2B 502d8ba2209c326b7dad336ea2d95c3033e526e656f835fe2cee5aed862d87a447810198e8477ce3e2521f3e5a42ee917e4a128c0fba8d09cd75dde40ca797e1 SHA512 28459c2b752b6d87883c74db668f2a2320280a66c682e7eac4adb24612ef16d1d4b82bd707756ddfc4913a8c9f7f7c3dafc6ab6eb2dd836755e370d33e1a8945 | ||||||
| EBUILD youcompleteme-99999999-r5.ebuild 5908 BLAKE2B 78ba09fccb2c8f7731cd7c4ab7be4f6dd7827d15c49cc01999382463177c18c1539662bf7c5b90bb3b8fab479c8aa710a3157fde4b7d8cadd624540729ddb280 SHA512 b60decf172a19d316391d624fcfd09af080522bc2a7912b304dfddaefb1cf7f5d8aea8bf5e4ffd90b683ac1b3c14589547c67e93e3cc7205b412a28266b409dd | EBUILD youcompleteme-20181113.ebuild 6151 BLAKE2B d1a9fb72aded96ccf16dcf354b4ff36a5d9758a50346af230f974f7d145a70a15a99b0fd4092059f78b07a5ff0be03a1d4c191db92fce805a76e233a658006ba SHA512 f4a5c2ecb54ed1188c308102a5950e6f7bcda3a8db0a972563f1e69139618b2e39ad5aeb36bde1f4f90b74993271389e00319a360fbbe0ad2f3a0c28a73a367c | ||||||
|  | EBUILD youcompleteme-99999999-r6.ebuild 6096 BLAKE2B 9962d2de9ec931bcc2b504a44aa77b89f3479b66c4dbf220bd30bb88a85c342b175e6bad11a8a7af9195b829fd1e8740481ba11e88262b91cc22119cca9ff3ce SHA512 81991f1a56729a69d459dad83e2162532f9519d43a8b0bf7eed5ecf4b0785511229806d8507a12343a6d8da7c2e35d5e4d4706fe86098a93409f11a41f43646d | ||||||
| MISC README.md 1017 BLAKE2B b3ceff351a191e710ae7b9d55602a1a6d1858c403b61d5bcde8c1aac2203093ee15994ced762e9fc996e4b88e65f8f73fd0fd1e27dc5b7fe032291a75b3a53fe SHA512 fb8d02d90df215addc2b13e60975a3d1e41d3cca945294ca1a3013ab337b7dcd834151aabb7712036fb13189a53e69b14a531110cc3820431416cd620404d08f | MISC README.md 1017 BLAKE2B b3ceff351a191e710ae7b9d55602a1a6d1858c403b61d5bcde8c1aac2203093ee15994ced762e9fc996e4b88e65f8f73fd0fd1e27dc5b7fe032291a75b3a53fe SHA512 fb8d02d90df215addc2b13e60975a3d1e41d3cca945294ca1a3013ab337b7dcd834151aabb7712036fb13189a53e69b14a531110cc3820431416cd620404d08f | ||||||
| MISC metadata.xml 672 BLAKE2B 27d98400640fe6befc7cc4f35803af907c631d7204b24cafe2f799d528fbfda3be5e1fb2e9dbf93ebc72a66e0ac5a0a7e3c164bb29596a8bde3b1ec2579bed8a SHA512 8cff7a413256f2fed659c9757c6162970d35544ba665c023f3d555b1203d812a3b9caa4e3163a2e708192aaa986435d0f246c76569e30801116ade112a453a70 | MISC metadata.xml 672 BLAKE2B 27d98400640fe6befc7cc4f35803af907c631d7204b24cafe2f799d528fbfda3be5e1fb2e9dbf93ebc72a66e0ac5a0a7e3c164bb29596a8bde3b1ec2579bed8a SHA512 8cff7a413256f2fed659c9757c6162970d35544ba665c023f3d555b1203d812a3b9caa4e3163a2e708192aaa986435d0f246c76569e30801116ade112a453a70 | ||||||
|   | |||||||
| @@ -1,203 +0,0 @@ | |||||||
| # 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="d0c6b6186e7a9ab7d5e770add3079200a518d908" |  | ||||||
| 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*,Vagrantfile} || 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}" |  | ||||||
| } |  | ||||||
| @@ -3,20 +3,20 @@ | |||||||
| 
 | 
 | ||||||
| EAPI=6 | EAPI=6 | ||||||
| 
 | 
 | ||||||
| PYTHON_COMPAT=( python2_7 ) | PYTHON_COMPAT=( python3_6 ) | ||||||
| 
 | 
 | ||||||
| inherit eutils cmake-utils git-r3 multilib python-single-r1 vim-plugin | inherit eutils cmake-utils git-r3 multilib python-single-r1 vim-plugin | ||||||
| 
 | 
 | ||||||
| DESCRIPTION="vim plugin: a code-completion engine for Vim" | DESCRIPTION="vim plugin: a code-completion engine for Vim" | ||||||
| HOMEPAGE="https://valloric.github.io/YouCompleteMe/" | HOMEPAGE="https://valloric.github.io/YouCompleteMe/" | ||||||
| EGIT_REPO_URI="https://github.com/Valloric/YouCompleteMe.git" | EGIT_REPO_URI="https://github.com/Valloric/YouCompleteMe.git" | ||||||
| EGIT_COMMIT="e49f817bfe7a7400efcc0b6527188ff6395f996f" | EGIT_COMMIT="faa019aa532475c5028527ffbfe1e910119d663c" | ||||||
| SRC_URI="" | SRC_URI="" | ||||||
| 
 | 
 | ||||||
| LICENSE="GPL-3" | LICENSE="GPL-3" | ||||||
| SLOT="0" | SLOT="0" | ||||||
| KEYWORDS="~amd64 ~x86" | 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}" | REQUIRED_USE="${PYTHON_REQUIRED_USE}" | ||||||
| 
 | 
 | ||||||
| COMMON_DEPEND=" | COMMON_DEPEND=" | ||||||
| @@ -28,6 +28,7 @@ COMMON_DEPEND=" | |||||||
| 	        app-vim/rust-vim | 	        app-vim/rust-vim | ||||||
| 	) | 	) | ||||||
| 	nodejs? ( net-libs/nodejs ) | 	nodejs? ( net-libs/nodejs ) | ||||||
|  | 	neovim? ( app-editors/neovim[python] ) | ||||||
| 	dev-libs/boost[python,threads,${PYTHON_USEDEP}] | 	dev-libs/boost[python,threads,${PYTHON_USEDEP}] | ||||||
| 	|| ( | 	|| ( | ||||||
| 		app-editors/vim[python,${PYTHON_USEDEP}] | 		app-editors/vim[python,${PYTHON_USEDEP}] | ||||||
| @@ -39,7 +40,6 @@ RDEPEND=" | |||||||
| 	${COMMON_DEPEND} | 	${COMMON_DEPEND} | ||||||
| 	dev-python/bottle[${PYTHON_USEDEP}] | 	dev-python/bottle[${PYTHON_USEDEP}] | ||||||
| 	dev-python/future[${PYTHON_USEDEP}] | 	dev-python/future[${PYTHON_USEDEP}] | ||||||
| 	dev-python/jedi[${PYTHON_USEDEP}] |  | ||||||
| 	dev-python/requests[${PYTHON_USEDEP}] | 	dev-python/requests[${PYTHON_USEDEP}] | ||||||
| 	dev-python/sh[${PYTHON_USEDEP}] | 	dev-python/sh[${PYTHON_USEDEP}] | ||||||
| 	dev-python/waitress[${PYTHON_USEDEP}] | 	dev-python/waitress[${PYTHON_USEDEP}] | ||||||
| @@ -73,7 +73,6 @@ src_prepare() { | |||||||
| 	for third_party_module in bottle python-future requests waitress; do | 	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}" | 		rm -r "${S}"/third_party/ycmd/third_party/${third_party_module} || die "Failed to remove third party module ${third_party_module}" | ||||||
| 	done | 	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" | 	rm -r "${S}"/third_party/ycmd/cpp/BoostParts || die "Failed to remove bundled boost" | ||||||
| 
 | 
 | ||||||
| } | } | ||||||
| @@ -84,6 +83,7 @@ src_configure() { | |||||||
| 		-DUSE_SYSTEM_LIBCLANG="$(usex clang)" | 		-DUSE_SYSTEM_LIBCLANG="$(usex clang)" | ||||||
| 		-DUSE_SYSTEM_BOOST=ON | 		-DUSE_SYSTEM_BOOST=ON | ||||||
| 		-DUSE_SYSTEM_GMOCK=ON | 		-DUSE_SYSTEM_GMOCK=ON | ||||||
|  | 		-DUSE_PYTHON2=OFF | ||||||
| 	) | 	) | ||||||
| 	cmake-utils_src_configure | 	cmake-utils_src_configure | ||||||
| } | } | ||||||
| @@ -105,10 +105,11 @@ src_compile() { | |||||||
| 
 | 
 | ||||||
| 	if use go; | 	if use go; | ||||||
| 	then | 	then | ||||||
| 		cd "${S}/third_party/ycmd/third_party/gocode" || die "failed cd to gocode" | 		export GOPATH="$GOPATH:${S}/third_party/ycmd/third_party/go" | ||||||
| 		go build || die "failed to go build gocode" | 		cd "${S}/third_party/ycmd/third_party/go/src/github.com/mdempsky/gocode" || die "failed cd to gocode" | ||||||
| 		cd "${S}/third_party/ycmd/third_party/godef" || die "failed cd to godef" | 		go build || die "failed to go build gocode GOPATH is $GOPATH" | ||||||
| 		go build || die "failed to go build godef" | 		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 | 	fi | ||||||
| 
 | 
 | ||||||
| 	if use nodejs; | 	if use nodejs; | ||||||
| @@ -164,12 +165,12 @@ src_install() { | |||||||
| 
 | 
 | ||||||
| 	if use go; | 	if use go; | ||||||
| 	then | 	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$') | 		for f in $(ls -a | tail -n +3 | grep -v '^gocode$') | ||||||
| 		do | 		do | ||||||
| 			rm -rf "${f}" | 			rm -rf "${f}" | ||||||
| 		done | 		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$') | 		for f in $(ls -a | tail -n +3 | grep -v '^godef$') | ||||||
| 		do | 		do | ||||||
| 			rm -rf "${f}" | 			rm -rf "${f}" | ||||||
| @@ -181,6 +182,7 @@ src_install() { | |||||||
| 	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 *.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 | 	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 python -name *test* -exec rm -rf {} + || die | ||||||
|  | 	find third_party/ycmd/third_party -name test -exec rm -rf {} + || die | ||||||
| 	egit_clean | 	egit_clean | ||||||
| 	use clang && (rm third_party/ycmd/libclang.so* || die) | 	use clang && (rm third_party/ycmd/libclang.so* || die) | ||||||
| 
 | 
 | ||||||
| @@ -189,9 +191,8 @@ src_install() { | |||||||
| 	use mono || rm -rf "${D}/usr/share/vim/vimfiles/third_party/ycmd/third_party/OmniSharpServer" | 	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/third_party/racerd" | ||||||
| 	use rust || rm -rf "${D}/usr/share/vim/vimfiles/third_party/ycmd/ycmd/completers/rust" | 	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/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/third_party/tern_runtime" | ||||||
| 	use nodejs || rm -rf "${D}/usr/share/vim/vimfiles/third_party/ycmd/ycmd/completers/javascript" | 	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 .gitignore -exec rm -rf {} + || die | ||||||
| @@ -3,7 +3,7 @@ | |||||||
| 
 | 
 | ||||||
| EAPI=6 | EAPI=6 | ||||||
| 
 | 
 | ||||||
| PYTHON_COMPAT=( python2_7 ) | PYTHON_COMPAT=( python3_6 ) | ||||||
| 
 | 
 | ||||||
| inherit eutils cmake-utils git-r3 multilib python-single-r1 vim-plugin | inherit eutils cmake-utils git-r3 multilib python-single-r1 vim-plugin | ||||||
| 
 | 
 | ||||||
| @@ -15,7 +15,7 @@ SRC_URI="" | |||||||
| LICENSE="GPL-3" | LICENSE="GPL-3" | ||||||
| SLOT="0" | SLOT="0" | ||||||
| KEYWORDS="~amd64 ~x86" | 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}" | REQUIRED_USE="${PYTHON_REQUIRED_USE}" | ||||||
| 
 | 
 | ||||||
| COMMON_DEPEND=" | COMMON_DEPEND=" | ||||||
| @@ -27,6 +27,7 @@ COMMON_DEPEND=" | |||||||
| 	        app-vim/rust-vim | 	        app-vim/rust-vim | ||||||
| 	) | 	) | ||||||
| 	nodejs? ( net-libs/nodejs ) | 	nodejs? ( net-libs/nodejs ) | ||||||
|  | 	neovim? ( app-editors/neovim[python] ) | ||||||
| 	dev-libs/boost[python,threads,${PYTHON_USEDEP}] | 	dev-libs/boost[python,threads,${PYTHON_USEDEP}] | ||||||
| 	|| ( | 	|| ( | ||||||
| 		app-editors/vim[python,${PYTHON_USEDEP}] | 		app-editors/vim[python,${PYTHON_USEDEP}] | ||||||
| @@ -81,6 +82,7 @@ src_configure() { | |||||||
| 		-DUSE_SYSTEM_LIBCLANG="$(usex clang)" | 		-DUSE_SYSTEM_LIBCLANG="$(usex clang)" | ||||||
| 		-DUSE_SYSTEM_BOOST=ON | 		-DUSE_SYSTEM_BOOST=ON | ||||||
| 		-DUSE_SYSTEM_GMOCK=ON | 		-DUSE_SYSTEM_GMOCK=ON | ||||||
|  | 		-DUSE_PYTHON2=OFF | ||||||
| 	) | 	) | ||||||
| 	cmake-utils_src_configure | 	cmake-utils_src_configure | ||||||
| } | } | ||||||
| @@ -102,10 +104,11 @@ src_compile() { | |||||||
| 
 | 
 | ||||||
| 	if use go; | 	if use go; | ||||||
| 	then | 	then | ||||||
| 		cd "${S}/third_party/ycmd/third_party/gocode" || die "failed cd to gocode" | 		export GOPATH="$GOPATH:${S}/third_party/ycmd/third_party/go" | ||||||
| 		go build || die "failed to go build gocode" | 		cd "${S}/third_party/ycmd/third_party/go/src/github.com/mdempsky/gocode" || die "failed cd to gocode" | ||||||
| 		cd "${S}/third_party/ycmd/third_party/godef" || die "failed cd to godef" | 		go build || die "failed to go build gocode GOPATH is $GOPATH" | ||||||
| 		go build || die "failed to go build godef" | 		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 | 	fi | ||||||
| 
 | 
 | ||||||
| 	if use nodejs; | 	if use nodejs; | ||||||
| @@ -161,12 +164,12 @@ src_install() { | |||||||
| 
 | 
 | ||||||
| 	if use go; | 	if use go; | ||||||
| 	then | 	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$') | 		for f in $(ls -a | tail -n +3 | grep -v '^gocode$') | ||||||
| 		do | 		do | ||||||
| 			rm -rf "${f}" | 			rm -rf "${f}" | ||||||
| 		done | 		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$') | 		for f in $(ls -a | tail -n +3 | grep -v '^godef$') | ||||||
| 		do | 		do | ||||||
| 			rm -rf "${f}" | 			rm -rf "${f}" | ||||||
| @@ -187,9 +190,8 @@ src_install() { | |||||||
| 	use mono || rm -rf "${D}/usr/share/vim/vimfiles/third_party/ycmd/third_party/OmniSharpServer" | 	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/third_party/racerd" | ||||||
| 	use rust || rm -rf "${D}/usr/share/vim/vimfiles/third_party/ycmd/ycmd/completers/rust" | 	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/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/third_party/tern_runtime" | ||||||
| 	use nodejs || rm -rf "${D}/usr/share/vim/vimfiles/third_party/ycmd/ycmd/completers/javascript" | 	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 .gitignore -exec rm -rf {} + || die | ||||||
		Reference in New Issue
	
	Block a user