Bump ycm

3 files changed, 140 insertions, 0 deletions

diff --git a/app-vim/youcompleteme/Manifest b/app-vim/youcompleteme/Manifest
index 50ba0bb..0375850 100644
--- a/app-vim/youcompleteme/Manifest
+++ b/app-vim/youcompleteme/Manifest
@@ -1,7 +1,12 @@
+AUX a6aa425894d5816946e5a59997de5e4c27c975a9.patch 1061 SHA256 8f96934e358373c339f483fbb30e9ec983010093a1131796cf956c621bc5ae9d SHA512 9016beef48b9a69ce2e563ad8fb9fcf79a017d1f3595303ddb78796a7b98e02503dd72158f88e440de1f5401909bb702e1004d5ad8078f1e9e6641010454fce6 WHIRLPOOL 41b58297d06918846099785bd3efb2783ea6c4b8a624e8625c4c1f1d62d5a219a52c6e5877a1c305c3f545a360828f67f0e12aa07434d455e960b46a912d44b8
 DIST gocode-110f355028eeaf1987863e9921eda6692a4a9d7c.tar.gz 67052 SHA256 654a706d0bdfc8bb317de7ed88addbe2737cb30f39319e12a1b191649e2d0bc2 SHA512 85b7289786ece493a339f94cedb3fe4b50319dd610084ac83c260c91f2d6bf5b65d511e4cb5342b5228bc33276749dd58155c3b45b34e77a0266ff04bd932981 WHIRLPOOL 5f4a8f1d5e16336e73d5048f348610e327544680228b643139d6a5b7bfbaa462d40833d1f900df2dd27af62e7286d85d1890b35dbe8f6bff562d66a3bca087f8
+DIST gocode-61468c30b06b9e069203f3ef02ca438aa6806253.tar.gz 68021 SHA256 6ce55f385601af4c44d31007e7b6d3da2a94ef986a225d5f3282791835df2a5a SHA512 221e3743ad69d2aab2761de8b8e0cb5971b528975aa962b6e719ff5f80076453634ef41e206b17a2ffe02a37213ff37db1ed50cfff5a7cc688d4e62b4f0c0d81 WHIRLPOOL 39e34b7a1fa20e93dc5350cf96fb42c59059e5538ffb1d8eee9eaefd5bbc43d666115a49b39ff210ed4d5b54db144e82873b6115fece56a0865c6db517c555c4
 DIST omnisharp-server-e1902915c6790bcec00b8d551199c8a3537d33c9.tar.gz 3004637 SHA256 1d7c03280605f6a820297806b10fcbe60c8df3b0d9668f4f7cbf894d6054eef3 SHA512 bf4f85af145f931084423dcc69d9a19a9c8202b3141e9186c6a332f6fcb6f74ee7a6868227a3fe35a701dad9c3805830cb6d11692b84705fb856450a43b1dba0 WHIRLPOOL 8d643f816820bfbd0e4561229cb10dedebb832bc8c7a06095fd3a68834a06fce240e66c50882994103080ab569ac79afd5f179dc9a7b12c3e3890ad6780aa097
 DIST python-frozendict-b27053e4d11f5891319fd29eda561c130ba3112a.tar.gz 2192 SHA256 c6d7aafa881a949157ec08eac7a6c474720e34b053e3a05d9d657885923f6089 SHA512 f943e17e9ad5de31c1c8971e26a45cd61e972cbca31ce26e03285070728364e27edab4549532128a51bbcae38a5166ce8ea6e700069d242b0971f8004fb280f4 WHIRLPOOL cf8821c0ef924199b82936f13078c482e595ecafa47b2e1c1cf66ff8d3b4dc3362e790ef8efcdd11cac797a324ab6a089b731aade9327a0ab98b39972b6abae2
 DIST requests-futures-98712e7d0f6be2a090b6fda2a925f85e63656b58.tar.gz 4550 SHA256 38138e40c0c3d2b7672dee3e1c8e08dd59fc41f517eb9c7cb3c238e566a9257c SHA512 38f0c86ab8f74f4f48a6b4279c5d83580f5486a59b71d4d7009835e3f4e8fcbe07e188d0920de9b223d7c88592998c93e6c66f8aae19d22cf4a31705e066e54c WHIRLPOOL 38e2bbdea5d2da13a9749f633956e0ed32e0c6b97d416d115e04092c23c79bdc8c9484cdb7f68ecc03487d4b2df7dd07ad0152a936f29e1ed75863adef1f7fdd
+DIST ycmd-89e558f7d49b6d9672477c0d1b4df41d33f1c2e7.tar.gz 4031464 SHA256 ef19c24e65a875735318042f5dacca889bdb5b1fff8d956c19250f3de1cb48f2 SHA512 a13982110e03b896d3f783b835b749aff2cc2677030a6e5f70030e55ad347dc733e1a16aa18e80aa0649e4e1758785ca9cb068a944d1686ef283e706d3e917ea WHIRLPOOL cdb58d439c96126bcac0a0e6621ee773d7ff3a05972d9c29546fda6fca1364051372ee78bc70b51215e164b01250d281072dbd641b6722965623a0200edc2c41
 DIST ycmd-b46b8f09e33ccb6c70dfd02bba879c0b77fff4d5.tar.gz 3978618 SHA256 942a8408edd7a9c753858327b54beebed0c5c533cfc9bbe3e999733757234469 SHA512 50edcc17b916a80d1b35ffa8d7d3cca455e08d6b4a4f5db95a1d350bf80b9a397f07d4b0316b8c4a7e2d4db3c00691b89acd594f7ff43ba1f0be1e341983a5a3 WHIRLPOOL d2951653fcaddba5f78969847d3f19d1d336baf026ff3c0bb5d207c4791f213c3c6809f6be56aa2a3c31604ba5f92791a094c1d4fb9841ddf72c0387bd31f4a1
 DIST youcompleteme-a2808ee3ff7e8f4e90f6157f062c2aac6057c087.tar.gz 192130 SHA256 00504bbc84d2072c351bf79a5ebe4c83794ffe916de69acaf4ae730a5c88f9f2 SHA512 f0d3c08de4041089d9f5c5a03177fb0113a83f4bdca17378cd1e3386ebedab4905256d950d69d5351ba6b7518015b5a1a48db8d9afe534d95d7c76bce5b2903b WHIRLPOOL c8cde51ebd6c006c149a7c1552a5306a43d3218e54c0b24f0133bc25841e4989034b749c1fd4cab79d582f0cb9ddbaab6bdbae6f5c2e165fb104b48ffea9609b
+DIST youcompleteme-cb5756943fdd3ba062f101a5aba34acdd34d1356.tar.gz 236322 SHA256 869f613e245fced8d1df535b6c8ae5557b6db817a71e36a892e0c6bd8fae3236 SHA512 257aab13d92155d59ab996f054ad45f51fffcf942fda139837a0d2f254c6f19c6a68ed97e17564f1fd3b3419c2910e3ba73de1ced6ff18acf9de71e8584101a0 WHIRLPOOL 63b162c9f390000ca63325fbaeb55c9da0057cfa0742363ee705738bec932c2081e5bc448ba61ada7a9704b643e13baf88b98fb602c15cef3499c7e0fc182a92
 EBUILD youcompleteme-20150902.ebuild 3573 SHA256 c606acedae74dfd6feb6ccb839df6a717c868de5f499e1e8c6e40dbf51760227 SHA512 625f61076cfbae68f8f7112c0d4f2ba5e508f8083c72288b1ccf404cba772addc6d7f969bdad838a8b91d28f951c2e7c731670d9d516da9091cd7a858c82593f WHIRLPOOL ba7977263aa298f23937396b164ebb1a3d8239c34a5bce7a662a6233252b07d38ce0e45b3f30b235e06664497c1d1b1faf9a49761e30c3b5310f81609ad0fb92
+EBUILD youcompleteme-20160428.ebuild 3648 SHA256 0c2e3adacb073cbe3f84824fe8c513c7c25ccb980bd240319324d369c2039dd3 SHA512 eb4c04ccc64a6affaaae249ac1096703a20d67e817b9b59b657fd26c913dbcc03d37ec849bf4b07a54869afdb2cdec3a93536016109e8c13382986ab49d142a2 WHIRLPOOL dd6cde46dd824d085f86c9062d6f8355c532598bd7d29e21d3858202a72d0c05b93a3ae5b1aba061f7b304aeef4a78288a149a200107ba4ae3e66c9335989be7
diff --git a/app-vim/youcompleteme/files/a6aa425894d5816946e5a59997de5e4c27c975a9.patch b/app-vim/youcompleteme/files/a6aa425894d5816946e5a59997de5e4c27c975a9.patch
new file mode 100644
index 0000000..a709b3f
--- /dev/null
+++ b/app-vim/youcompleteme/files/a6aa425894d5816946e5a59997de5e4c27c975a9.patch
@@ -0,0 +1,20 @@
+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-20160428.ebuild b/app-vim/youcompleteme/youcompleteme-20160428.ebuild
new file mode 100644
index 0000000..3b0d955
--- /dev/null
+++ b/app-vim/youcompleteme/youcompleteme-20160428.ebuild
@@ -0,0 +1,115 @@
+# 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="cb5756943fdd3ba062f101a5aba34acdd34d1356"
+ycmdv="89e558f7d49b6d9672477c0d1b4df41d33f1c2e7"
+reqfuv="98712e7d0f6be2a090b6fda2a925f85e63656b58"
+ossv="e1902915c6790bcec00b8d551199c8a3537d33c9"
+pfdv="b27053e4d11f5891319fd29eda561c130ba3112a"
+gocodev="61468c30b06b9e069203f3ef02ca438aa6806253"
+
+KEYWORDS="~amd64 ~x86"
+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
+	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
+	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"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+	clang? ( >=sys-devel/clang-3.3 )
+	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
+	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
+	mv ${WORKDIR}/gocode-$gocodev ${S}/third_party/ycmd/third_party/gocode
+	mv ${WORKDIR}/requests-futures-$reqfuv ${S}/third_party/request-futures
+
+	epatch ${FILESDIR}/a6aa425894d5816946e5a59997de5e4c27c975a9.patch
+}
+
+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
+	rm third_party/ycmd/libclang.so.3.7 || die
+
+	vim-plugin_src_install
+
+	python_optimize "${ED}"
+	python_fix_shebang "${ED}"
+}