3 files changed, 9 insertions, 122 deletions
diff --git a/app-vim/youcompleteme/Manifest b/app-vim/youcompleteme/Manifest
index fa8b856..32bbd21 100644
--- a/app-vim/youcompleteme/Manifest
+++ b/app-vim/youcompleteme/Manifest
@@ -1,13 +1,7 @@
 AUX remove-python2-support.patch 199204 BLAKE2B 570bd01ae3e8a89c367194329f09738748a64b88b958dc085f91ff42a3a2f1751194905658c8b1d7ff5362869280952d9fec3ed022a0377a2399422e9b25fd70 SHA512 afccbce17d4f5a6605e11c4af65f2f3f89fd70aa689cfd9bfa4aceb08414f0b66ba822d362183499dda42f35996ebc15b478d8bdb348de21a1ad8ccb4651592d
-DIST gocode-416643789f088aa5077f667cecde7f966131f6be.tar.gz 93109 BLAKE2B c40db19594e7876ab86ab3e67a51d985b9fbd7f38e578f7ccc1bfd4d23dc45d5875d4421aebeaa61851b49ba0cc1f522f18bcdf7438ffae841acddba51620163 SHA512 6dfbed0b47843b6251c86c13b3d6cd741c7745d32c39129cb4ba0e1aa8696d9ddb7bc60c4a1a20092764f89ff5fcde58327612486da8322930d5c0d2a7984765
 DIST gocode-5bee97b488366fd20b054d0861b89834ff5bbfb2.tar.gz 97152 BLAKE2B 4d5e4e6c2cc46348def3cc7700c47f73ac678ce31671d41d4ce37942477a66a65160a2c9d4fb4c6431d46ed2937d67290a6e6565e73b973862da431cbb281ba7 SHA512 9b1e81635a0b168d6e242afb69c47ec95ea9ccca3b039f54193591e9ea2bf09c914765bbf989adfa0ac55e3aab4007eae5fcee8ab28fe695ef87be71a884a4d6
 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-148451a06781d8196e5fb7e0e2bca7a765368ff1.tar.gz 7823 BLAKE2B 6ae2d74849f99a44a449caff70f065d8548d773224b39da661edb880a4eb84aa97da62bd72178b8713cb58ec5deb599fa7eb371fe90669fafc1e42611ada31d1 SHA512 396b02c202f0aa748df02afd8d04b72a2426932e55dde599a82fe134aa585b105267299899c12577f82d43479c56b95d257476010b8d7808817705c1e94a1781
-DIST requests-futures-98712e7d0f6be2a090b6fda2a925f85e63656b58.tar.gz 4550 BLAKE2B 8ac1b79dd283ea99093eeaa693a10afddf5ce877263f848b6bb11f2ddd0984937b95f368007efb885ac5cd262aecba5c93c194a48d19283df14a0bdae90a9b46 SHA512 38f0c86ab8f74f4f48a6b4279c5d83580f5486a59b71d4d7009835e3f4e8fcbe07e188d0920de9b223d7c88592998c93e6c66f8aae19d22cf4a31705e066e54c
-DIST ycmd-4dfa50eb5873c071b446f25b17cbad066164b339.tar.gz 4550802 BLAKE2B de11b0cbb7618971f013ad9bfc425db43f955e8489b8c75c08abbedcb93da8faeb75afbfcc29b84b6238e2da2ec5775198083d03a9867a79d76b0dcdaccba155 SHA512 6233940eacf7592f7164b833f93a784bc39dd8a467e4df08b1433a63bebc405b63b41a1e534dfefd24b5a06faf0e5cdc52467b4cb87d475fd24d66d15c12c770
 DIST ycmd-d3378ca3a3103535c14b104cb916dcbcdaf93eeb.tar.gz 4504015 BLAKE2B f79a3616c9ea2789cd10dd7e1d2b60d651c1f592b213cc0806f92ba12a115ddb3408ac7565e9e486c827ee87a8d4518c55a029f73d518749d3cfa0cd01cd5f00 SHA512 c4af6810995262a5c145ca8eeed9bf92c6ac204ac507f27571b68ed3258affae5734b5edfccdc6ae5f7fa310e1dbf9f74f2681d9c6d774685469ee314ada2573
 DIST youcompleteme-124661f218e80b96c1f9f3d124e99f9a2fd2d83b.tar.gz 317144 BLAKE2B 6fc1d421a41e13923dd677deeabda9b5350c526558acae53d1e38eba4f911ba8d99c28f9b60fcbadd36452fdf985e1c01d456d14ffdb6e86c4bd3fcf38567939 SHA512 7442ad4b72f7782f055ae9ed9e94221a579448f3aaf7054246218e50ab0b19a4f451239a0c67e3c59c27e6e9d8a005273d8524f1acc8f1f855eb14c1b0731078
-DIST youcompleteme-25ebc0b9abb1b135c809ee850085a0305cbc5533.tar.gz 291574 BLAKE2B 99f03166cf6c5192e63c307b8c5558589ea877df74a595694f3169982b0ae2939d24fac469e80b476e23d99bf800ebc0b2e8795f1cf4b4a1c18bdd21f25e9bdb SHA512 6abf0696fcd9472d33071a890411bc0f19ba939a2c2a9d2a60480404759e19c3fd93d9eaa916dcd6c777bd8f8f0d02efac89efefca6219ea7b34c93555101115
-EBUILD youcompleteme-20190321.ebuild 3688 BLAKE2B de7d0893d15b58aab2ce222b139157424d4cdad5058bd0cafb69c7588c25f0ea74def8601e8bc321edc35a27a61b42212055f96a13dabd01d51f2eb289a07fde SHA512 0a61dd4d3478630b79477f0934955b5bf0e80cdbc4407610b9758d05d4857c5b09129d051bce56472809a22d113f2bd9b9c58160e93c590103d65fec1f007437
-EBUILD youcompleteme-20200203.ebuild 3424 BLAKE2B f6987debc135539e7235ae2b30a96f09066d201c53cf6e7c9b56beb348d20fb1ae8ee74700b0ebc5d4ec8276374806192db21f150b4068d841ace2e5e6fca29c SHA512 440de9a627d2a13372e1dff37cd62196e5ebae7eae49a822554ffb08f32c991cead0fa7f7bb020ed3f7a7d2b10232500fca942cb44e8bbf78f91d2b6c32d3253
+EBUILD youcompleteme-20200203-r1.ebuild 3548 BLAKE2B e2c9aea37b3da2e92f6fd6eeaf2a68cadeddb7d5853948017f054eda71cebd1da561e5df7ece6d5aa635ccb0acf53a915bcc25dba6c8ab70a36088a59f00754f SHA512 08b5c40aa2ac19c832e92a168390b615d35d6d4adc0d5190390eb30856691e7e1652391197572ef1de5c67cb4db63cbff34989bc5aa7592c89c7304e31db0eed
diff --git a/app-vim/youcompleteme/youcompleteme-20190321.ebuild b/app-vim/youcompleteme/youcompleteme-20190321.ebuild
deleted file mode 100644
index b5b773f..0000000
--- a/app-vim/youcompleteme/youcompleteme-20190321.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="25ebc0b9abb1b135c809ee850085a0305cbc5533"
-ycmdv="4dfa50eb5873c071b446f25b17cbad066164b339"
-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/third_party/clang/lib/libclang.so.* || die
-
-	vim-plugin_src_install
-
-	python_optimize "${ED}"
-	python_fix_shebang "${ED}"
-}
diff --git a/app-vim/youcompleteme/youcompleteme-20200203.ebuild b/app-vim/youcompleteme/youcompleteme-20200203-r1.ebuild
index 5fccb53..0935fe0 100644
--- a/app-vim/youcompleteme/youcompleteme-20200203.ebuild
+++ b/app-vim/youcompleteme/youcompleteme-20200203-r1.ebuild
@@ -1,6 +1,6 @@
 EAPI="7"
 PYTHON_COMPAT=( python3_{4,5,6,7,8} )
-inherit multilib python-single-r1 cmake-utils vim-plugin
+inherit multilib python-any-r1 cmake-utils vim-plugin
 
 youcompletemev="124661f218e80b96c1f9f3d124e99f9a2fd2d83b"
 ycmdv="d3378ca3a3103535c14b104cb916dcbcdaf93eeb"
@@ -22,33 +22,39 @@ HOMEPAGE="http://valloric.github.io/YouCompleteMe/"
 
 LICENSE="GPL-3"
 IUSE="+clang test go csharp"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+#REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 COMMON_DEPEND="
 	${PYTHON_DEPS}
 	clang? ( sys-devel/clang:9 )
+        $(python_gen_any_dep '
 	>=dev-libs/boost-1.65:=[python,threads,${PYTHON_USEDEP}]
 	|| (
 		app-editors/vim[python,${PYTHON_USEDEP}]
 		app-editors/gvim[python,${PYTHON_USEDEP}]
 	)
+        ')
 "
 RDEPEND="
 	${COMMON_DEPEND}
+        $(python_gen_any_dep '
 	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? (
+        $(python_gen_any_dep '
 		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
 		>=dev-python/nose-1.3.0[${PYTHON_USEDEP}]
 		dev-cpp/gmock
 		dev-cpp/gtest
+        ')
 	)
 "