6 files changed, 4 insertions, 477 deletions
diff --git a/app-vim/youcompleteme/Manifest b/app-vim/youcompleteme/Manifest
index c970080..85772e2 100644
--- a/app-vim/youcompleteme/Manifest
+++ b/app-vim/youcompleteme/Manifest
@@ -1,23 +1,7 @@
-DIST gocode-110f355028eeaf1987863e9921eda6692a4a9d7c.tar.gz 67052 SHA256 654a706d0bdfc8bb317de7ed88addbe2737cb30f39319e12a1b191649e2d0bc2 SHA512 85b7289786ece493a339f94cedb3fe4b50319dd610084ac83c260c91f2d6bf5b65d511e4cb5342b5228bc33276749dd58155c3b45b34e77a0266ff04bd932981 WHIRLPOOL 5f4a8f1d5e16336e73d5048f348610e327544680228b643139d6a5b7bfbaa462d40833d1f900df2dd27af62e7286d85d1890b35dbe8f6bff562d66a3bca087f8
 DIST gocode-843b7a63f621bb441274849d58671870adf1a5ce.tar.gz 89519 SHA256 ee2f7ddf96e087bc5785e8402c69d282337532238a161fcedc22db6acdd02c6b SHA512 3dffd92bf024279a4b2a5b6f1c9df3adb9fa143d5efc259df528201dfaa38bca9d6b2b1518a1d51ceb0e45ef22844f9301d3a37b6b5c40d4d32bbe9c7f5336ed WHIRLPOOL 9320c53574fb5f8d64857c512ea0dbb9a352c157a233d0b4237f799ef499a78f06ac5affa374616b061f1fed52a188237103cb6ff27247b9a3138edbbf4d8f4e
-DIST gocode-93093563812be3e6679f590e1caaf8627abeb16e.tar.gz 83909 SHA256 fce46ddf4ca84d1fc5f781130b112be4bbb2cc98648d1844fed247075d97e726 SHA512 10adbe8f6fbb402201276cb0f256ba5dcf61e7c129bcd938c131d5592a5413baeaed1c5e5b25c3d3b1f29c721b678fc76fc89990a1cc959bcca79d19e4affc57 WHIRLPOOL c7751d3ece884c027c03e0673245346916b0ce68736f23a6e2f00c42e2a9eb099740fa0c38ebf4d21b2c32a7acf88741e63fdf4b972e778a19960c1c41316c07
 DIST omnisharp-server-e1902915c6790bcec00b8d551199c8a3537d33c9.tar.gz 3005049 SHA256 d516429beb8047686d71a9de0cb949bc21ef342d50d3dc493acf08be0ec04913 SHA512 47b6083016d9865708b3deaf44f3742f276d5aa13c3a310b9aa432650df18d35bed62668a90f1aba52fbe84fb7471dd885c34e351b859607d7221ae074290fde WHIRLPOOL 9d18c49fcb797b6fc22b5d3de00115b916e533aee1ad2a1c06e384cf2267afbcd1fedb3c33852a723aae0b0a7f67f8eb122a159113acac679848709d0611b9ea
 DIST python-frozendict-b27053e4d11f5891319fd29eda561c130ba3112a.tar.gz 2192 SHA256 c6d7aafa881a949157ec08eac7a6c474720e34b053e3a05d9d657885923f6089 SHA512 f943e17e9ad5de31c1c8971e26a45cd61e972cbca31ce26e03285070728364e27edab4549532128a51bbcae38a5166ce8ea6e700069d242b0971f8004fb280f4 WHIRLPOOL cf8821c0ef924199b82936f13078c482e595ecafa47b2e1c1cf66ff8d3b4dc3362e790ef8efcdd11cac797a324ab6a089b731aade9327a0ab98b39972b6abae2
-DIST python-frozendict-c5d16bafcca7b72ff3e8f40d3a9081e4c9233f1b.tar.gz 2391 SHA256 0db927479d28fc83e28b1bc7eac23ca039bc77263f14c2e9483618fd8557c426 SHA512 2a2fa53b3f33ba957a17186dd81ab2a8e625f0ee36aab359824986374d7af1b094651ab173feab001fafb0fd57f813566634fa2f89f0cd02067cf2066225617c WHIRLPOOL ecc2f956ec500486882e4fbd2c42201f381ef432485e2f3bb0b4d06cd50bcd764508f0fbef6e7339b18e5654f4138c9b8f66d6f39f77b4abaf7d30b093ec5b78
-DIST requests-futures-50db066ac1e735a79f9499659c8ad5f7428269ff.tar.gz 6750 SHA256 5b88b1b4dd73a99cbea847da9f13b62fbdccd2d516814149d309c35f2ef0f299 SHA512 69974239a832bd4d318d07aa3df6858810d5bd915b27d7f3ad3a2903ea005dd7afe35369ea3ae8db563f6510b151f46e1f320f1be5e67752574c2d263a154143 WHIRLPOOL 34f0d9adf55d1b1099c0e20fc24d1dce127f168d35e7ea7c208ef617554d80510683af20090b0b94b132ebdd49c96c1573c9ba997f9b34e5756c8d863ece35a5
 DIST requests-futures-98712e7d0f6be2a090b6fda2a925f85e63656b58.tar.gz 4550 SHA256 38138e40c0c3d2b7672dee3e1c8e08dd59fc41f517eb9c7cb3c238e566a9257c SHA512 38f0c86ab8f74f4f48a6b4279c5d83580f5486a59b71d4d7009835e3f4e8fcbe07e188d0920de9b223d7c88592998c93e6c66f8aae19d22cf4a31705e066e54c WHIRLPOOL 38e2bbdea5d2da13a9749f633956e0ed32e0c6b97d416d115e04092c23c79bdc8c9484cdb7f68ecc03487d4b2df7dd07ad0152a936f29e1ed75863adef1f7fdd
-DIST ycmd-01aaf7abb09af04f1403c3e84266abf30d7784e7.tar.gz 3125309 SHA256 99377c5f6473c5037dc27b0a630ac3b8e337ae3c79004c4c68952662d26b50ba SHA512 49111d764b8df87b47006c20839b6a0c93c36a5e13161a0d4e766f38d97db4de22df6ea8483128921200f319f945e720c09ec62316c9af8a87a043dd944e6141 WHIRLPOOL 035fc5274683b7be43a3a3577db2e5bce61f8cf563ff75493b7abd1ba211edfdae0ede9ef116edc96d789e985efbfa9534607cd3a65608fc0433a9c5747adde5
-DIST ycmd-63c3d992a2db8d189cd78a25a70c87348726fc52.tar.gz 4248843 SHA256 f2203a4feb5f804e4ad563bad612b091ce975ec4c735040d9d51b497eb542084 SHA512 debc3345b861391fa0b8b776707a3672c9f706d5b2420fce596bf6799789f6f654bbf5e3cdd6e5f01a40939a36637223f8de16728a85fbe0a885ec34887fd86b WHIRLPOOL 075ff748fb969e41d4c99cdf9ba85be49dc08a6230b7c98af17635ed6ae8583d2422f47b3087cd38ed7366800329e3e8d4450292ec01e5e0be4e663f77bd6bfa
 DIST ycmd-6463774035e61a660ad9150a592b8829eb37fd10.tar.gz 3367942 SHA256 5796b30ba2a6ec008eae3901c43b64681c45447a069d0f0b029951d4eb2eb872 SHA512 45257e06c7199a6001531ffd8b9d978afee0a51356023fcad413400a8a7919bbf4f6ba2e0f4fdfae90080c08aa5c9075001275f3c74bd3c908649b2a5b042940 WHIRLPOOL f9f0fbe9a96609ba821ee8c7e1b33b83493102ebc6cc179f0ce848245f8985b2183f86c8750ef3555af78fd506f40078f228e78ede0f61f04df244a15320557f
-DIST ycmd-b46b8f09e33ccb6c70dfd02bba879c0b77fff4d5.tar.gz 3979608 SHA256 999651a3842f567c941dfac25dedf82de7aadd19e27977da430358f12a1dfea1 SHA512 d16eaada246c9d45ce9a97b08d62789562fc3572b1b762ed72fdea779f92007470aba7341f917c279c90cc94b5898502e69d8b5063ba128c7ea3c80bd0ecf379 WHIRLPOOL c43e0307edd5abb0077590fe1fb83a6a01663f42c4ba5521002ee316de3af927d00913fe9bf3cac8ab4c6ac8b0abdee3273cd2e3a8dacdd577684ea8f6791292
-DIST ycmd-de3e92aadd421e3a23412101a84d1abbe56afb4d.tar.gz 4267551 SHA256 810cd34382760729efc511de0cd0a2e19318894acc7007faefe54915f97c7b25 SHA512 d325dad66f5e2d4fe638673bba7361c364c3df9c0e8f8737cca4208ac73f698177c88a31ac3067522fa94fe7b8ab0a9e133923c55d175fbc18a5863b31bd990a WHIRLPOOL 4d1c4963711ef25f48f0ad1d765aea68309df987ec776da9727cc55cfd7a573e4e96406308a99dc192b58ad79839481f9afdf0af5b374fd6bb830e156a83a73d
-DIST youcompleteme-6132f0bc50c44b15bd90c26642494da1ab20131f.tar.gz 258204 SHA256 26f214e91c923c9928f469bbbb1b7f47fe3c80c63f23e00d8848aafee6425a64 SHA512 c03db1768ac92ae1758a36276f7a1c887c160ddb2290c6fe17911aa5c5079065282de46ec8b6d88f694c5337b5e4153acde6da173d9da615fa2626c441cb1e22 WHIRLPOOL 573d3e7b6d88e0163d374dd74e68fc64987bd21c7894c3421f0dee34affb83b973c32a4055e3d5fc3c2de1b4056dc719e470dc4a25a2d96de3949dec4724797e
 DIST youcompleteme-65765ef32b0288b35a022373f8e04c66b7764b2b.tar.gz 261562 SHA256 0d2058c3bbdb12a4aa8419f62cf2aa4927ab6c966f2b88e23a1e77af3f1ee085 SHA512 ec1e432d5582d501cbc1fef53373ad40090c562b15640675f76ae39f2bc973f97fca3f5f600874992242236bb52abd4baf2fdf987d36535654ae357b30ebf5a6 WHIRLPOOL a700ed70c3760ee736b3ac03d43b7b3cf6ac0677f321dbbbfe3e88521a29ebf80fd2cc28d457ce0ed4ce69d3d205967469666cb844b091e0d3476146d2cf5ed2
-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 3710 SHA256 6feae53ddcaaa4133a91a28f483fe10ec01d8e57be4f53192a6933c709518d4b SHA512 bfad7e7a49c131c1666ee4dde7896d0c06af351142e066e3da61d4356c0ac70f50254d38133c6453985fd57361fa7ac368140e1b57bc1ae6dad742d177750298 WHIRLPOOL 722a20b8d7ba7e0c178849aae9301254e02bd99e39a97342e4e54a40d840712b9cd9185a927a109c6251e73e2aae42c2ca82b7b1b9ddfd73b34f351d97e2205a
-EBUILD youcompleteme-20170314.ebuild 3710 SHA256 d022bc3de27e33818cf2160214cc2ac5935f6ee4b842ef46236f6bcb07e5a456 SHA512 0351d9d60476cf5068381440cd679844f309a0045797d60cac4ec3cd8e45c40079db16a4efbe93f6c9f3b089164062f2cafdaf5d7a1c563d92337e82ebc87bab WHIRLPOOL 31bce29282d6b5807ae4cf638610970f9af38eeeb436ea9c81139deb37c3586ee4ea40adfc5749458f70c38ffca57f64534aaa4933dab2fe7281f80f83ad184c
-EBUILD youcompleteme-20170529.ebuild 3792 SHA256 cee056043033441315c41c66da55177877947ef6ddb7b5e093412e9957b1af2a SHA512 e1fe2cb32024e6d84bc6723fe1342b1491a13384a2b3ff590aa79807b8261b594737862d6a79f65158df6faa2446bbea9f582139b333163da8055b4824515dd8 WHIRLPOOL 9d847508d70f5305f322ba7e394cdec11faac50ab2e59b70b38a7b4c37c86d34bfe5a06df80f44dabe608b6ebd560ba908fde1893988b5e358aeb034754ddbf2
-EBUILD youcompleteme-20170902.ebuild 3788 SHA256 95e5fb8178a2593cfdc85aaa37b73a3c418b2332fc956d8314f4e153eaf16dc0 SHA512 07ea04f22a4d27ca24b8b941b2417a2035f4f45c02c4a9b693f583ca84944f5bc5e3bd4c6ddfdfb471e6d686c5a4a1bac9a770f0db6bcfa648e616ae70efd7ec WHIRLPOOL 73efdc22065cfebd870aa90a2ba7c3f1b0bde4ba909984bf58e96ff5aa0331d105dd7c0310ebec6e8a477ab91fce377e87212364e9007856f052d905bc62e853
+EBUILD youcompleteme-20170902.ebuild 3803 SHA256 c8b1259df37026b98acf376ff45e3492fe850857e682c4588111f3346228a568 SHA512 95c964b3baf9961990b7edd434fa4aed854698430d5ad8f2e0012fde9d9e285856a857e931bf0237862514df7c8de1d8c9098442a8e9196aa094b35955fbc7b2 WHIRLPOOL 0a7e34e1b967c23653c40ddcf7823a4c8d97a25e93768976dbb809cf5691f6e453c03c84b22f4ff9a5ab38a2c863103cbc13ce6d8976ff8b898b9e1f354abc51
diff --git a/app-vim/youcompleteme/youcompleteme-20150902.ebuild b/app-vim/youcompleteme/youcompleteme-20150902.ebuild
deleted file mode 100644
index 4bd2a74..0000000
--- a/app-vim/youcompleteme/youcompleteme-20150902.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# 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="a2808ee3ff7e8f4e90f6157f062c2aac6057c087"
-ycmdv="b46b8f09e33ccb6c70dfd02bba879c0b77fff4d5"
-reqfuv="98712e7d0f6be2a090b6fda2a925f85e63656b58"
-ossv="e1902915c6790bcec00b8d551199c8a3537d33c9"
-pfdv="b27053e4d11f5891319fd29eda561c130ba3112a"
-gocodev="110f355028eeaf1987863e9921eda6692a4a9d7c"
-
-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/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 requests 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
-}
-
-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 -name *test* -exec rm -rf {} + || die
-	find "${S}" -name '.git*' -exec rm -rf {} + || die
-	rm third_party/ycmd/libclang.so || die
-
-	vim-plugin_src_install
-
-	python_optimize "${ED}"
-	python_fix_shebang "${ED}"
-}
diff --git a/app-vim/youcompleteme/youcompleteme-20161024.ebuild b/app-vim/youcompleteme/youcompleteme-20161024.ebuild
deleted file mode 100644
index 4e0c624..0000000
--- a/app-vim/youcompleteme/youcompleteme-20161024.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# 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="f27787f2630a0b0cc3ef60685d6188cc13281e7f"
-ycmdv="63c3d992a2db8d189cd78a25a70c87348726fc52"
-reqfuv="98712e7d0f6be2a090b6fda2a925f85e63656b58"
-ossv="e1902915c6790bcec00b8d551199c8a3537d33c9"
-pfdv="b27053e4d11f5891319fd29eda561c130ba3112a"
-gocodev="93093563812be3e6679f590e1caaf8627abeb16e"
-
-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
-	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}"
-}
diff --git a/app-vim/youcompleteme/youcompleteme-20170314.ebuild b/app-vim/youcompleteme/youcompleteme-20170314.ebuild
deleted file mode 100644
index a1f45d8..0000000
--- a/app-vim/youcompleteme/youcompleteme-20170314.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# 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 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
-	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}"
-}
diff --git a/app-vim/youcompleteme/youcompleteme-20170529.ebuild b/app-vim/youcompleteme/youcompleteme-20170529.ebuild
deleted file mode 100644
index 3830f67..0000000
--- a/app-vim/youcompleteme/youcompleteme-20170529.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python3_4 )
-inherit multilib python-single-r1 cmake-utils vim-plugin
-
-youcompletemev="6132f0bc50c44b15bd90c26642494da1ab20131f"
-ycmdv="01aaf7abb09af04f1403c3e84266abf30d7784e7"
-reqfuv="50db066ac1e735a79f9499659c8ad5f7428269ff"
-pfdv="c5d16bafcca7b72ff3e8f40d3a9081e4c9233f1b"
-ossv="e1902915c6790bcec00b8d551199c8a3537d33c9"
-gocodev="843b7a63f621bb441274849d58671870adf1a5ce"
-
-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
-	https://github.com/slezica/python-frozendict/archive/$pfdv.tar.gz -> python-frozendict-$pfdv.tar.gz
-	csharp? ( https://github.com/OmniSharp/omnisharp-server/archive/$ossv.tar.gz -> omnisharp-server-$ossv.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/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_PYTHON2=OFF
-		-DBoost_PYTHON3_LIBRARY_RELEASE=/usr/lib/libboost_python-3.4.so
-		-DPATH_TO_LLVM_ROOT=/usr/lib/llvm/4
-		-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}"
-}
diff --git a/app-vim/youcompleteme/youcompleteme-20170902.ebuild b/app-vim/youcompleteme/youcompleteme-20170902.ebuild
index 90e5a7f..d7e58fe 100644
--- a/app-vim/youcompleteme/youcompleteme-20170902.ebuild
+++ b/app-vim/youcompleteme/youcompleteme-20170902.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-PYTHON_COMPAT=( python3_4 )
+PYTHON_COMPAT=( python3_{4,5,6} )
 inherit multilib python-single-r1 cmake-utils vim-plugin
 
 youcompletemev="65765ef32b0288b35a022373f8e04c66b7764b2b"
@@ -13,7 +13,7 @@ pfdv="b27053e4d11f5891319fd29eda561c130ba3112a"
 ossv="e1902915c6790bcec00b8d551199c8a3537d33c9"
 gocodev="843b7a63f621bb441274849d58671870adf1a5ce"
 
-KEYWORDS="amd64"
+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
@@ -80,7 +80,7 @@ src_configure() {
 		$(cmake-utils_use_use clang CLANG_COMPLETER)
 		$(cmake-utils_use_use clang SYSTEM_LIBCLANG)
 		-DUSE_PYTHON2=OFF
-		-DBoost_PYTHON3_LIBRARY_RELEASE=/usr/lib/libboost_python-3.4.so
+		-DBoost_PYTHON3_LIBRARY_RELEASE=/usr/lib/libboost_${EPYTHON/3/-3}.so
 		-DPATH_TO_LLVM_ROOT=/usr/lib/llvm/4
 		-DUSE_SYSTEM_BOOST=ON
 		-DUSE_SYSTEM_GMOCK=ON