Remove old ycm and stablise current

3 files changed, 2 insertions, 123 deletions

diff --git a/app-vim/youcompleteme/Manifest b/app-vim/youcompleteme/Manifest
index 205bad4..a5ec765 100644
--- a/app-vim/youcompleteme/Manifest
+++ b/app-vim/youcompleteme/Manifest
@@ -1,12 +1,7 @@
 DIST gocode-416643789f088aa5077f667cecde7f966131f6be.tar.gz 93109 BLAKE2B c40db19594e7876ab86ab3e67a51d985b9fbd7f38e578f7ccc1bfd4d23dc45d5875d4421aebeaa61851b49ba0cc1f522f18bcdf7438ffae841acddba51620163 SHA512 6dfbed0b47843b6251c86c13b3d6cd741c7745d32c39129cb4ba0e1aa8696d9ddb7bc60c4a1a20092764f89ff5fcde58327612486da8322930d5c0d2a7984765
-DIST gocode-843b7a63f621bb441274849d58671870adf1a5ce.tar.gz 89519 BLAKE2B b11a0cabe96dc9e051baf9831d8778f0a537654520f0b54070ad9f6c563d5db13a813f36e304ade23c38cf541066ca9d0f7755f3f4da8f8877a1cdd62b47a046 SHA512 3dffd92bf024279a4b2a5b6f1c9df3adb9fa143d5efc259df528201dfaa38bca9d6b2b1518a1d51ceb0e45ef22844f9301d3a37b6b5c40d4d32bbe9c7f5336ed
 DIST omnisharp-server-e1902915c6790bcec00b8d551199c8a3537d33c9.tar.gz 3005049 BLAKE2B 07c7a06c3d2b75a6df7b6bc6e2e26dc1dbab1af1e98018db14177a82304eb48160bb4dd25f0d6d1af5a50725e6d1b8365932a5ff575d2c08be87997f2ee58397 SHA512 47b6083016d9865708b3deaf44f3742f276d5aa13c3a310b9aa432650df18d35bed62668a90f1aba52fbe84fb7471dd885c34e351b859607d7221ae074290fde
 DIST python-frozendict-b27053e4d11f5891319fd29eda561c130ba3112a.tar.gz 2192 BLAKE2B 58518ec7185c29d04448552e0dda147ad59c857c1e29f6384dab9a65c030678c6f350f7930f5878094e4fed03e4670df81be3bcb17f9233b55d8d51769621048 SHA512 f943e17e9ad5de31c1c8971e26a45cd61e972cbca31ce26e03285070728364e27edab4549532128a51bbcae38a5166ce8ea6e700069d242b0971f8004fb280f4
-DIST requests-futures-98712e7d0f6be2a090b6fda2a925f85e63656b58.tar.gz 4550 BLAKE2B 8ac1b79dd283ea99093eeaa693a10afddf5ce877263f848b6bb11f2ddd0984937b95f368007efb885ac5cd262aecba5c93c194a48d19283df14a0bdae90a9b46 SHA512 38f0c86ab8f74f4f48a6b4279c5d83580f5486a59b71d4d7009835e3f4e8fcbe07e188d0920de9b223d7c88592998c93e6c66f8aae19d22cf4a31705e066e54c
 DIST requests-futures-d9d21ac63904dc0a668e0f073503f85a534460f4.tar.gz 6742 BLAKE2B fe72f9d8cf5148500da18bb22ed5a5e8c6f80ca2a9dd5487c501acfa9e0e12bd3c615750a9a7c519dccab07d6101fafabc8d8242c8c0b5da6b4b61a1ff6c8a48 SHA512 e0ec8bffc5d710cd098643ec315b176e80223893528754c85f5ea8dc74a539e8ea2d429de5ff727a6fac9f163d47f9b089edcf8c3d0c7939184d162a3b6afe7e
-DIST ycmd-6463774035e61a660ad9150a592b8829eb37fd10.tar.gz 3367942 BLAKE2B 291e5b2fcbac523b7ef8d9efa2a758206d284c205df7414062d30900679e6202687346ec7d4be6f26041ba672e4769bf5214fa89dcd56a2a31649dfc1fa25f0a SHA512 45257e06c7199a6001531ffd8b9d978afee0a51356023fcad413400a8a7919bbf4f6ba2e0f4fdfae90080c08aa5c9075001275f3c74bd3c908649b2a5b042940
 DIST ycmd-ee23a7ca17aafbcf344f51334d115e9bb89ea844.tar.gz 3798903 BLAKE2B 4d343e7ccc03b2a74f505fff5a2aabaab14221fd754474c3e20a5072a44808c66339d6b0e916631443eca5e7bb2a3f7a394d15721f93b12c409c2c0e1d7fdcea SHA512 5992d6bfa4dbb6806e6c8ea9cf1e74568cc5273d26652cb1bb70c3ae3ac27a65765b1ec838845442b55d82350c67bd9d311316ae9f8f757f740081dc8c099143
-DIST youcompleteme-65765ef32b0288b35a022373f8e04c66b7764b2b.tar.gz 261562 BLAKE2B 6d15ff3f5514d26760eb1ab5c7a03dcbabe0480a669895a76af25151cc0fa437e1e36bd027b166794097372e874c7626e30a29791360b59553b74c51b34d4c60 SHA512 ec1e432d5582d501cbc1fef53373ad40090c562b15640675f76ae39f2bc973f97fca3f5f600874992242236bb52abd4baf2fdf987d36535654ae357b30ebf5a6
 DIST youcompleteme-788c293aee78c6ab60cbc06bbc3339e7b2bff98f.tar.gz 280642 BLAKE2B 89337eae38f39417b011ffd15a607155e55d275ce6e3c9ffe86c9018ff085d4a7fd93174cb2b586d15fe80267f85594ca3361f9a0b87c80be32c6c7428bf1f7d SHA512 c433f47782306ec0b9c14f19da645541236ad0fdda8ad411a1aa6bfc3d05b693761428f103a14ebe93cfe659e3009778017afb4240987c8916e995d723469af0
-EBUILD youcompleteme-20170902-r1.ebuild 3803 BLAKE2B 5b65bb9a984442929631801b553b8c54c36d95a0590efd98e0b0d6ce0b1bbde84fe6bd2462165d4fcc08889f3db992ce692f9e980e282d110bcfe08fdf398009 SHA512 1735de0885552e96f32305e0ac4533332e86cf777878dfdff154aff718c6059c2a6e571f66bb2167748fdb7370eb1edec107efceb82494bc378abf45226b112b
-EBUILD youcompleteme-20180321.ebuild 3582 BLAKE2B bcd205d00ba2b0be3b345b12f18a1a1bc166ac8c9707c26eb9c546815df8fafe6991e4ea125d866d2394866a5d4589f63232032b68a8e5460502ff491caa18e3 SHA512 138eda413af37c8814a138e7b10869a4465c5c37cb48569b833015afcb59f71174e23a8bc86ccf61828572922896f429e1a7dcaef82c1b99d880cd1b1fba1423
+EBUILD youcompleteme-20180321.ebuild 3591 BLAKE2B 8b7ef2d667db45c77c63c9ce798ab7dff7e591aa58522dbb5448a40b5649991e38e36f1606e66c530c1f0e403130f64514e82f98b0fb1b9dd3b1914e46e4c236 SHA512 884a58b16cc8b19e8599b9f87a5695267566d2a4a4e7e4eff0b8bdd80ecc003c6e0b34fece19e99e6fd42b69ea7fc50cd02d15d952a9877c7e89d601be211020
diff --git a/app-vim/youcompleteme/youcompleteme-20170902-r1.ebuild b/app-vim/youcompleteme/youcompleteme-20170902-r1.ebuild
deleted file mode 100644
index 571c5cf..0000000
--- a/app-vim/youcompleteme/youcompleteme-20170902-r1.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,5,6} )
-inherit multilib python-single-r1 cmake-utils vim-plugin
-
-youcompletemev="65765ef32b0288b35a022373f8e04c66b7764b2b"
-ycmdv="6463774035e61a660ad9150a592b8829eb37fd10"
-reqfuv="98712e7d0f6be2a090b6fda2a925f85e63656b58"
-pfdv="b27053e4d11f5891319fd29eda561c130ba3112a"
-ossv="e1902915c6790bcec00b8d551199c8a3537d33c9"
-gocodev="843b7a63f621bb441274849d58671870adf1a5ce"
-
-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/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:6 )
-	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_${EPYTHON/3/-3}.so
-		-DPATH_TO_LLVM_ROOT=/usr/lib/llvm/6
-		-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-20180321.ebuild b/app-vim/youcompleteme/youcompleteme-20180321.ebuild
index e7960bc..d1b6e93 100644
--- a/app-vim/youcompleteme/youcompleteme-20180321.ebuild
+++ b/app-vim/youcompleteme/youcompleteme-20180321.ebuild
@@ -9,7 +9,7 @@ pfdv="b27053e4d11f5891319fd29eda561c130ba3112a"
 ossv="e1902915c6790bcec00b8d551199c8a3537d33c9"
 gocodev="416643789f088aa5077f667cecde7f966131f6be"
 
-KEYWORDS=""
+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