Remove old ycm, stablize current

5 files changed, 2 insertions, 349 deletions

diff --git a/app-vim/youcompleteme/Manifest b/app-vim/youcompleteme/Manifest
index 348bf7d..99287ab 100644
--- a/app-vim/youcompleteme/Manifest
+++ b/app-vim/youcompleteme/Manifest
@@ -2,14 +2,6 @@ DIST gocode-416643789f088aa5077f667cecde7f966131f6be.tar.gz 93109 BLAKE2B c40db1
 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-0e999dbee209ea79a522259816ce3a68b7d6cddc.tar.gz 3750159 BLAKE2B 62b5ed54b27de73e28e65e8cf657098197905b9168ce2374c8fd1bddbc87da5ea5bf2f4614c5cd2864ed0077641159eb7aa38c9a6b476c4e8737fe5a2c7dfa1a SHA512 684663e0fc02ff9e64cd8d0d17e5602f6a5a300dd9e5eacd9ee633e1efc5fd3e90c5697b8cfa2aa4b603b6610ee25ee185b598ba2df6c6b3e987d30de9f7bd8e
-DIST ycmd-3db4f3b2d723007c46891c11fce53a0dc4363493.tar.gz 3713062 BLAKE2B 396371d99d30594598b728b7fb6ce15b83087ea48fe2941d759486f3672b6b40fa20a40e42b9644fe622962247ccb9d390b27fc82110710d9266f262e31fde6c SHA512 5059e71d3a63a8a8f15b2178113239b3a92c56bf240e099ad33287352fd2338dfe8a968e8f5849197c43d68a2d0edd5fb88fd4b4835d73ec1b5dd495a319d981
 DIST ycmd-4dfa50eb5873c071b446f25b17cbad066164b339.tar.gz 4550802 BLAKE2B de11b0cbb7618971f013ad9bfc425db43f955e8489b8c75c08abbedcb93da8faeb75afbfcc29b84b6238e2da2ec5775198083d03a9867a79d76b0dcdaccba155 SHA512 6233940eacf7592f7164b833f93a784bc39dd8a467e4df08b1433a63bebc405b63b41a1e534dfefd24b5a06faf0e5cdc52467b4cb87d475fd24d66d15c12c770
 DIST youcompleteme-25ebc0b9abb1b135c809ee850085a0305cbc5533.tar.gz 291574 BLAKE2B 99f03166cf6c5192e63c307b8c5558589ea877df74a595694f3169982b0ae2939d24fac469e80b476e23d99bf800ebc0b2e8795f1cf4b4a1c18bdd21f25e9bdb SHA512 6abf0696fcd9472d33071a890411bc0f19ba939a2c2a9d2a60480404759e19c3fd93d9eaa916dcd6c777bd8f8f0d02efac89efefca6219ea7b34c93555101115
-DIST youcompleteme-c9ff2177377a85515b7e081966685f3c46a33eca.tar.gz 281863 BLAKE2B 26625d245db2fea42838e8f8cee7fdff3d14a97a84a3a82ef317978ffedd8ab1c77120ac2acc0aad917ae3a97999c431bfc70cd1ed0639aaacb39e1622e56ef6 SHA512 69bf67117cc9a66e0b613ee7dce962f0e1f668c1bc785bbaf0527309970fc32606c5a43b13493163dae28ba96f90028d9c09fd7f33246216bd4be81ade870d1b
-DIST youcompleteme-ccc06c2c423e7ee7008f7439ff99c604d474cec1.tar.gz 286814 BLAKE2B af87fd800c57d53c9719465c8c7b0c380e8563ef8f16fe60455b8321c4a6389192616f7dc63e3b32a9bdc6a412840a0431df2884b693d02db76ea3d3e8663020 SHA512 45fd32b4384134ab7c1b15c152e0fb72a8cfe508644115036aafca9e16058c2b8cc076622153de7193a1167e1b60d6c44561cbc2225a15bdc5f04d28ce35e727
-EBUILD youcompleteme-20180610-r1.ebuild 3655 BLAKE2B 9a9ea015178781b31ec574440d9d8d507d606b72b3a8893f1162b86631efceb86cd8dbda8b1451df1f1393dba2981b5e35d0f32eae4e6ab9e086dc6179ec1e35 SHA512 f84c22ba306b0e7f4310dbd40b2fc8180b86c210f4b52294620468571becfbd9a0aa91bb8966d1eb3da582658cd651d2afe80e72f118d8236459427876debe22
-EBUILD youcompleteme-20180610.ebuild 3655 BLAKE2B 16ff36a2eb4b7b57c34557e5a1f2f6005d7b9cdc97c452ac4e4de7fe8b535adb69fa67b8cc701298e60ce0333aa6779e5337eaff330c6c339652f589bb5d1604 SHA512 55ca97e31eab5752902c0afa242de10367af1cd3ace847bf71740e62235c4df762b07ddaee4f1da849bd97c66040f179fdc186498b7d0ef19f71c10604771a2b
-EBUILD youcompleteme-20190115.ebuild 3668 BLAKE2B c1ed2ecfab6e289320aef761214e1b5d140200170f7ebe0970d031cd6dcf39ab2b958e7dd38df8d5abb7f3855439da72c81725deb2df90cca59d1ca79d62f88d SHA512 39e208ed16084f1167e419bfcd479387bbec80e8c8ef1290501dd26be10f9682097159370a07fdeb73b34ee7ebfdad21c0837ae37ded76f7be6b18c8ad771887
-EBUILD youcompleteme-20190321.ebuild 3690 BLAKE2B 4e6506e58e17fab2f1f0582be57533fbddce24ea83080af1cea9120eb169acaaa353762c49d06506a37f1b911e7b25988261d0d2611b55b5fc299aa4ef88d629 SHA512 191e43e7ae87cb5b7fdaf5c6f2c9e113449267e13fce6fd464a5b8506e94fb2a70a35b5ed1386d51004c8409562aa08a5a2538637d8f04231f071bf96d79ad0e
+EBUILD youcompleteme-20190321.ebuild 3688 BLAKE2B de7d0893d15b58aab2ce222b139157424d4cdad5058bd0cafb69c7588c25f0ea74def8601e8bc321edc35a27a61b42212055f96a13dabd01d51f2eb289a07fde SHA512 0a61dd4d3478630b79477f0934955b5bf0e80cdbc4407610b9758d05d4857c5b09129d051bce56472809a22d113f2bd9b9c58160e93c590103d65fec1f007437
diff --git a/app-vim/youcompleteme/youcompleteme-20180610-r1.ebuild b/app-vim/youcompleteme/youcompleteme-20180610-r1.ebuild
deleted file mode 100644
index 49cc92a..0000000
--- a/app-vim/youcompleteme/youcompleteme-20180610-r1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-EAPI="7"
-PYTHON_COMPAT=( python3_{4,5,6} )
-inherit multilib python-single-r1 cmake-utils vim-plugin
-
-youcompletemev="c9ff2177377a85515b7e081966685f3c46a33eca"
-ycmdv="3db4f3b2d723007c46891c11fce53a0dc4363493"
-reqfuv="d9d21ac63904dc0a668e0f073503f85a534460f4"
-pfdv="b27053e4d11f5891319fd29eda561c130ba3112a"
-ossv="e1902915c6790bcec00b8d551199c8a3537d33c9"
-gocodev="416643789f088aa5077f667cecde7f966131f6be"
-
-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:7 )
-	>=dev-libs/boost-1.65:=[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
-	cmake-utils_src_prepare
-	default
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_CLANG_COMPLETER=$(usex clang)
-		-DUSE_CLANG_TIDY=$(usex clang)
-		-DUSE_SYSTEM_LIBCLANG=$(usex clang)
-		-DUSE_PYTHON2=OFF
-		-DPATH_TO_LLVM_ROOT=/usr/lib/llvm/7
-		-DUSE_SYSTEM_BOOST=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-20180610.ebuild b/app-vim/youcompleteme/youcompleteme-20180610.ebuild
deleted file mode 100644
index a58cf79..0000000
--- a/app-vim/youcompleteme/youcompleteme-20180610.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-EAPI="7"
-PYTHON_COMPAT=( python3_{4,5,6} )
-inherit multilib python-single-r1 cmake-utils vim-plugin
-
-youcompletemev="c9ff2177377a85515b7e081966685f3c46a33eca"
-ycmdv="3db4f3b2d723007c46891c11fce53a0dc4363493"
-reqfuv="d9d21ac63904dc0a668e0f073503f85a534460f4"
-pfdv="b27053e4d11f5891319fd29eda561c130ba3112a"
-ossv="e1902915c6790bcec00b8d551199c8a3537d33c9"
-gocodev="416643789f088aa5077f667cecde7f966131f6be"
-
-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-1.65:=[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
-	cmake-utils_src_prepare
-	default
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_CLANG_COMPLETER=$(usex clang)
-		-DUSE_CLANG_TIDY=$(usex clang)
-		-DUSE_SYSTEM_LIBCLANG=$(usex clang)
-		-DUSE_PYTHON2=OFF
-		-DPATH_TO_LLVM_ROOT=/usr/lib/llvm/6
-		-DUSE_SYSTEM_BOOST=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-20190115.ebuild b/app-vim/youcompleteme/youcompleteme-20190115.ebuild
deleted file mode 100644
index 00b9434..0000000
--- a/app-vim/youcompleteme/youcompleteme-20190115.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-EAPI="7"
-PYTHON_COMPAT=( python3_{4,5,6} )
-inherit multilib python-single-r1 cmake-utils vim-plugin
-
-youcompletemev="ccc06c2c423e7ee7008f7439ff99c604d474cec1"
-ycmdv="0e999dbee209ea79a522259816ce3a68b7d6cddc"
-reqfuv="98712e7d0f6be2a090b6fda2a925f85e63656b58"
-pfdv="b27053e4d11f5891319fd29eda561c130ba3112a"
-ossv="e1902915c6790bcec00b8d551199c8a3537d33c9"
-gocodev="416643789f088aa5077f667cecde7f966131f6be"
-
-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:8 )
-	>=dev-libs/boost-1.65:=[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
-	rmdir ${S}/third_party/ycmd/third_party/frozendict
-	mv ${WORKDIR}/python-frozendict-$pfdv ${S}/third_party/ycmd/third_party/frozendict
-	use go && mv ${WORKDIR}/gocode-$gocodev ${S}/third_party/ycmd/third_party/gocode
-	mv ${WORKDIR}/requests-futures-$reqfuv ${S}/third_party/requests-futures
-	cmake-utils_src_prepare
-	default
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_CLANG_COMPLETER=$(usex clang)
-		-DUSE_SYSTEM_LIBCLANG=$(usex clang)
-		-DUSE_PYTHON2=OFF
-		-DPATH_TO_LLVM_ROOT=/usr/lib/llvm/8
-		-DUSE_SYSTEM_BOOST=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-20190321.ebuild b/app-vim/youcompleteme/youcompleteme-20190321.ebuild
index fa560be..b5b773f 100644
--- a/app-vim/youcompleteme/youcompleteme-20190321.ebuild
+++ b/app-vim/youcompleteme/youcompleteme-20190321.ebuild
@@ -9,7 +9,7 @@ pfdv="b27053e4d11f5891319fd29eda561c130ba3112a"
 ossv="e1902915c6790bcec00b8d551199c8a3537d33c9"
 gocodev="416643789f088aa5077f667cecde7f966131f6be"
 
-KEYWORDS="~amd64 ~x86"
+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