Tidy and bump youcompleteme

4 files changed, 119 insertions, 23 deletions

diff --git a/app-vim/youcompleteme/Manifest b/app-vim/youcompleteme/Manifest
index 9d765b6..9bdb078 100644
--- a/app-vim/youcompleteme/Manifest
+++ b/app-vim/youcompleteme/Manifest
@@ -1,4 +1,3 @@
-AUX a6aa425894d5816946e5a59997de5e4c27c975a9.patch 1061 SHA256 8f96934e358373c339f483fbb30e9ec983010093a1131796cf956c621bc5ae9d SHA512 9016beef48b9a69ce2e563ad8fb9fcf79a017d1f3595303ddb78796a7b98e02503dd72158f88e440de1f5401909bb702e1004d5ad8078f1e9e6641010454fce6 WHIRLPOOL 41b58297d06918846099785bd3efb2783ea6c4b8a624e8625c4c1f1d62d5a219a52c6e5877a1c305c3f545a360828f67f0e12aa07434d455e960b46a912d44b8
 DIST gocode-110f355028eeaf1987863e9921eda6692a4a9d7c.tar.gz 67052 SHA256 654a706d0bdfc8bb317de7ed88addbe2737cb30f39319e12a1b191649e2d0bc2 SHA512 85b7289786ece493a339f94cedb3fe4b50319dd610084ac83c260c91f2d6bf5b65d511e4cb5342b5228bc33276749dd58155c3b45b34e77a0266ff04bd932981 WHIRLPOOL 5f4a8f1d5e16336e73d5048f348610e327544680228b643139d6a5b7bfbaa462d40833d1f900df2dd27af62e7286d85d1890b35dbe8f6bff562d66a3bca087f8
 DIST gocode-93093563812be3e6679f590e1caaf8627abeb16e.tar.gz 83909 SHA256 fce46ddf4ca84d1fc5f781130b112be4bbb2cc98648d1844fed247075d97e726 SHA512 10adbe8f6fbb402201276cb0f256ba5dcf61e7c129bcd938c131d5592a5413baeaed1c5e5b25c3d3b1f29c721b678fc76fc89990a1cc959bcca79d19e4affc57 WHIRLPOOL c7751d3ece884c027c03e0673245346916b0ce68736f23a6e2f00c42e2a9eb099740fa0c38ebf4d21b2c32a7acf88741e63fdf4b972e778a19960c1c41316c07
 DIST omnisharp-server-e1902915c6790bcec00b8d551199c8a3537d33c9.tar.gz 3004637 SHA256 1d7c03280605f6a820297806b10fcbe60c8df3b0d9668f4f7cbf894d6054eef3 SHA512 bf4f85af145f931084423dcc69d9a19a9c8202b3141e9186c6a332f6fcb6f74ee7a6868227a3fe35a701dad9c3805830cb6d11692b84705fb856450a43b1dba0 WHIRLPOOL 8d643f816820bfbd0e4561229cb10dedebb832bc8c7a06095fd3a68834a06fce240e66c50882994103080ab569ac79afd5f179dc9a7b12c3e3890ad6780aa097
@@ -6,7 +5,10 @@ DIST python-frozendict-b27053e4d11f5891319fd29eda561c130ba3112a.tar.gz 2192 SHA2
 DIST requests-futures-98712e7d0f6be2a090b6fda2a925f85e63656b58.tar.gz 4550 SHA256 38138e40c0c3d2b7672dee3e1c8e08dd59fc41f517eb9c7cb3c238e566a9257c SHA512 38f0c86ab8f74f4f48a6b4279c5d83580f5486a59b71d4d7009835e3f4e8fcbe07e188d0920de9b223d7c88592998c93e6c66f8aae19d22cf4a31705e066e54c WHIRLPOOL 38e2bbdea5d2da13a9749f633956e0ed32e0c6b97d416d115e04092c23c79bdc8c9484cdb7f68ecc03487d4b2df7dd07ad0152a936f29e1ed75863adef1f7fdd
 DIST ycmd-63c3d992a2db8d189cd78a25a70c87348726fc52.tar.gz 4248682 SHA256 5642697c42dfb78e985cee60d3808df0fa805d41455d1f1c122f27a9644cc0dd SHA512 96dc4235e79e8af38328489874d4019211b479e6935198d833cf1cee0febe95376dbf1443f247ba60f8d278cefeb71708b1328e685af2ffc70b3dac4a806a7c5 WHIRLPOOL d517e96e5e3d1b11bcc7302d4546664af08b9f900bd07eb306ffc89eade0113f3b65c2da02bcd6fb5133ce4fc94aafba5b36bf25e9353c212d2fdf673f07c142
 DIST ycmd-b46b8f09e33ccb6c70dfd02bba879c0b77fff4d5.tar.gz 3978618 SHA256 942a8408edd7a9c753858327b54beebed0c5c533cfc9bbe3e999733757234469 SHA512 50edcc17b916a80d1b35ffa8d7d3cca455e08d6b4a4f5db95a1d350bf80b9a397f07d4b0316b8c4a7e2d4db3c00691b89acd594f7ff43ba1f0be1e341983a5a3 WHIRLPOOL d2951653fcaddba5f78969847d3f19d1d336baf026ff3c0bb5d207c4791f213c3c6809f6be56aa2a3c31604ba5f92791a094c1d4fb9841ddf72c0387bd31f4a1
+DIST ycmd-de3e92aadd421e3a23412101a84d1abbe56afb4d.tar.gz 4267370 SHA256 4f1f0c65194d288ee1b264b5853db45144dc2da07dc0d9c5caf9e1bce3ee608d SHA512 628a7099c5d4c87075c5a5154a79a3308d44d62395b0ce37ff9932161a05ea6f63ef8aa1ef406f883f95152d94beecea574616f7b1f6f61477093aa3e9c33fa1 WHIRLPOOL 038a839e97309de99cc3e23badc6cb29f22f4b28216a8ab52185bb1caeb80ae39b97e4e68be32ad2706353d2935b6fa65b255a1ad14f56afa4a11804c4d95f22
+DIST youcompleteme-6583da75bd7f4ba01be3c9f5ddc7cc6b4d53bb50.tar.gz 258351 SHA256 a34df53cc509903fa2383cc3e4155038ccd5b73222d60af02089074673b2152b SHA512 8ab4f885db77d38b94491611536d779507e9652fb588512e9538c68cc9e3d5c43d2f1e8d909906502998b05ae8a252fc05b11e0cd8850745162ca51c389f3707 WHIRLPOOL 814ce0baeb6e984b89b7cd98121cdb95618d8d07244a4e6af9b0ff5ab9d6d9c883075eaecd4add532a26960e204575f09dbc115bb360d45171cc1e88177875e3
 DIST youcompleteme-a2808ee3ff7e8f4e90f6157f062c2aac6057c087.tar.gz 192130 SHA256 00504bbc84d2072c351bf79a5ebe4c83794ffe916de69acaf4ae730a5c88f9f2 SHA512 f0d3c08de4041089d9f5c5a03177fb0113a83f4bdca17378cd1e3386ebedab4905256d950d69d5351ba6b7518015b5a1a48db8d9afe534d95d7c76bce5b2903b WHIRLPOOL c8cde51ebd6c006c149a7c1552a5306a43d3218e54c0b24f0133bc25841e4989034b749c1fd4cab79d582f0cb9ddbaab6bdbae6f5c2e165fb104b48ffea9609b
 DIST youcompleteme-f27787f2630a0b0cc3ef60685d6188cc13281e7f.tar.gz 249510 SHA256 5bef98e0541b5fa76db10d72aab0cc2f5507b5da423314bf28b8e8936d65233e SHA512 bc9dbc747af397969b87f697dd12b9390122bb776010bb3f5fb04fe7b3a1dceed890644d7769098bc305ecbefcffd96c608630028d3dd0cae0d0e5a40bf46b3e WHIRLPOOL 858041e385596771b05a608cb5581cf90df0294d8845cd240113adc7d7c7d180e570d662150ef0ad558dc66a508dc01ac911be8176d06cb900247ccb247fc9dd
 EBUILD youcompleteme-20150902.ebuild 3573 SHA256 c606acedae74dfd6feb6ccb839df6a717c868de5f499e1e8c6e40dbf51760227 SHA512 625f61076cfbae68f8f7112c0d4f2ba5e508f8083c72288b1ccf404cba772addc6d7f969bdad838a8b91d28f951c2e7c731670d9d516da9091cd7a858c82593f WHIRLPOOL ba7977263aa298f23937396b164ebb1a3d8239c34a5bce7a662a6233252b07d38ce0e45b3f30b235e06664497c1d1b1faf9a49761e30c3b5310f81609ad0fb92
-EBUILD youcompleteme-20161024.ebuild 3707 SHA256 edaca51a637f3c5eafd5fcdcfc8f654a227bd77c3ba993b512709dbab20d67e8 SHA512 650c2f454f1f537a1b12f8f0a34d7e56ef28ca99cd11310ba0e1cb905dfbf98378214cf83a1f2bc6e76ef38d2e6f76b86d1524e31e2eba2ff792851a93be9c14 WHIRLPOOL e2182089b5d7e15f4428db55d3bff638d19bd53a7e72e094597919701a4da4c0dd14c39423f1204b089d1b1df2a13de2ce1420a9c325436a5bf58fed902a2f1c
+EBUILD youcompleteme-20161024.ebuild 3707 SHA256 7ade877dfe6dfb77bf434c018424a5be4e0a5ce9e0259c4b2c86b7d708c48b0f SHA512 c6b3d5571d84a53dc22b269cf8bc0883a09099a27f948ab24f0c4b84a0359796ade1616b4c39e3393a5104ad0a282bf1a7adf501f5b728bd98247e9c7082244e WHIRLPOOL d6b604cf8c818c74386038c15bfb77609db6f6def42fa486a73f4f57e6239ee1a9a654a9933b5369ec7bdc5a19acc44fd20a10c57d2531b4ec70e74f7c4ebdb1
+EBUILD youcompleteme-20170314.ebuild 3707 SHA256 12959c29129d0c8cd45517cb81802d046ab6170286d5086c72665fb88c50820e SHA512 3e6806f65f53443ec05a028338bd166006e252bb90f20e2ae5b80703fc547ede87c11f9700b6895006dac9ec8bc6dde0083d6fa3a0fd6d9a2109839ca81ce196 WHIRLPOOL adc4b6a376904a069649e40f62f5c0a74bb459a97527e1603d7d2213d963a42c24217d276c147069ef6945c50a09060b8179f324f6901a4590788b39b324b987
diff --git a/app-vim/youcompleteme/files/a6aa425894d5816946e5a59997de5e4c27c975a9.patch b/app-vim/youcompleteme/files/a6aa425894d5816946e5a59997de5e4c27c975a9.patch
deleted file mode 100644
index a709b3f..0000000
--- a/app-vim/youcompleteme/files/a6aa425894d5816946e5a59997de5e4c27c975a9.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-reverted:
---- b/YouCompleteMe-cb5756943fdd3ba062f101a5aba34acdd34d1356/third_party/ycmd/cpp/ycm/ClangCompleter/TranslationUnit.cpp
-+++ a/YouCompleteMe-cb5756943fdd3ba062f101a5aba34acdd34d1356/third_party/ycmd/cpp/ycm/ClangCompleter/TranslationUnit.cpp
-@@ -93,11 +93,13 @@
-                                  ? &cxunsaved_files[ 0 ] : NULL;
- 
-   // Actually parse the translation unit.
-+  // TODO: Stop stripping argv[0] here and use
-+  // clang_parseTranslationUnit2FullArgv, which is available in libclang 3.8.
-+  CXErrorCode result = clang_parseTranslationUnit2(
--  CXErrorCode result = clang_parseTranslationUnit2FullArgv(
-                          clang_index,
-                          filename.c_str(),
-+                         &pointer_flags[ 1 ],
-+                         pointer_flags.size() - 1,
--                         &pointer_flags[ 0 ],
--                         pointer_flags.size(),
-                          const_cast<CXUnsavedFile *>( unsaved ),
-                          cxunsaved_files.size(),
-                          EditingOptions(),
diff --git a/app-vim/youcompleteme/youcompleteme-20161024.ebuild b/app-vim/youcompleteme/youcompleteme-20161024.ebuild
index db36b9c..21bcecf 100644
--- a/app-vim/youcompleteme/youcompleteme-20161024.ebuild
+++ b/app-vim/youcompleteme/youcompleteme-20161024.ebuild
@@ -32,7 +32,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 COMMON_DEPEND="
 	${PYTHON_DEPS}
-	clang? ( >=sys-devel/clang-3.8 )
+	clang? ( =sys-devel/clang-3.9* )
 	dev-libs/boost[python,threads,${PYTHON_USEDEP}]
 	|| (
 		app-editors/vim[python,${PYTHON_USEDEP}]
diff --git a/app-vim/youcompleteme/youcompleteme-20170314.ebuild b/app-vim/youcompleteme/youcompleteme-20170314.ebuild
new file mode 100644
index 0000000..f375424
--- /dev/null
+++ b/app-vim/youcompleteme/youcompleteme-20170314.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+inherit multilib python-single-r1 cmake-utils vim-plugin
+
+youcompletemev="6583da75bd7f4ba01be3c9f5ddc7cc6b4d53bb50"
+ycmdv="de3e92aadd421e3a23412101a84d1abbe56afb4d"
+reqfuv="98712e7d0f6be2a090b6fda2a925f85e63656b58"
+ossv="e1902915c6790bcec00b8d551199c8a3537d33c9"
+pfdv="b27053e4d11f5891319fd29eda561c130ba3112a"
+gocodev="93093563812be3e6679f590e1caaf8627abeb16e"
+
+KEYWORDS="~amd64"
+SRC_URI="
+	https://github.com/Valloric/YouCompleteMe/archive/$youcompletemev.tar.gz -> youcompleteme-$youcompletemev.tar.gz
+	https://github.com/Valloric/ycmd/archive/$ycmdv.tar.gz -> ycmd-$ycmdv.tar.gz
+	https://github.com/ross/requests-futures/archive/$reqfuv.tar.gz -> requests-futures-$reqfuv.tar.gz
+	csharp? ( https://github.com/OmniSharp/omnisharp-server/archive/$ossv.tar.gz -> omnisharp-server-$ossv.tar.gz )
+	https://github.com/slezica/python-frozendict/archive/$pfdv.tar.gz -> python-frozendict-$pfdv.tar.gz
+	go? ( https://github.com/nsf/gocode/archive/$gocodev.tar.gz -> gocode-$gocodev.tar.gz )
+"
+
+DESCRIPTION="vim plugin: a code-completion engine for Vim"
+HOMEPAGE="http://valloric.github.io/YouCompleteMe/"
+
+LICENSE="GPL-3"
+IUSE="+clang test go csharp"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+	clang? ( =sys-devel/clang-3.9* )
+	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/futures[${PYTHON_USEDEP}]
+	dev-python/jedi[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/sh[${PYTHON_USEDEP}]
+	dev-python/waitress[${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
+	)
+"
+
+S="${WORKDIR}/YouCompleteMe-$youcompletemev"
+CMAKE_IN_SOURCE_BUILD=1
+CMAKE_USE_DIR=${S}/third_party/ycmd/cpp
+
+VIM_PLUGIN_HELPFILES="${PN}"
+
+src_prepare() {
+	for third_party_module in ycmd pythonfutures requests-futures; do
+		rm -r "${S}"/third_party/${third_party_module} || die "Failed to remove third party module ${third_party_module}"
+	done
+	mv ${WORKDIR}/ycmd-$ycmdv ${S}/third_party/ycmd
+	use csharp && mv ${WORKDIR}/omnisharp-server-$ossv ${S}/third_party/ycmd/third_party/omnisharp-server
+	mv ${WORKDIR}/python-frozendict-$pfdv ${S}/third_party/ycmd/third_party/python-frozendict
+	use go && mv ${WORKDIR}/gocode-$gocodev ${S}/third_party/ycmd/third_party/gocode
+	mv ${WORKDIR}/requests-futures-$reqfuv ${S}/third_party/request-futures
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_use clang CLANG_COMPLETER)
+		$(cmake-utils_use_use clang SYSTEM_LIBCLANG)
+		-DUSE_SYSTEM_BOOST=ON
+		-DUSE_SYSTEM_GMOCK=ON
+	)
+	cmake-utils_src_configure
+}
+
+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 || die
+}
+
+src_install() {
+	dodoc *.md third_party/ycmd/*.md
+	rm -r *.md *.sh COPYING.txt third_party/ycmd/cpp || die
+	rm -r third_party/ycmd/{*.md,*.sh} || die
+	find python third_party/ycmd -depth -name '*test*' -exec rm -r {} + || die
+	find python third_party/ycmd -depth -name '*examples*' -exec rm -r {} + || die
+	rm third_party/ycmd/libclang.so.* || die
+
+	vim-plugin_src_install
+
+	python_optimize "${ED}"
+	python_fix_shebang "${ED}"
+}