3 files changed, 6 insertions, 94 deletions
diff --git a/app-vim/youcompleteme/Manifest b/app-vim/youcompleteme/Manifest
index ee80fcc..b53a55b 100644
--- a/app-vim/youcompleteme/Manifest
+++ b/app-vim/youcompleteme/Manifest
@@ -1,6 +1,3 @@
 DIST ycmd-ba5814d3810c21ef9868d70ba7a8c7eef9c1d276.tar.gz 2953728 BLAKE2B 0f28a072c8c155eff5712e90bde46c039b8bd1a739fd1141df1dd9ff8b7aee3bb7e05bd8ce8fb8c84ad549d6b5e477f9036ebbfe61dfeb1846b157c76271786f SHA512 2e86c206d03188f189322039b4fa806861aebf1697e98a05c0ed45a95dfce1c885c67040993a9e2bd70e3113e44313f860bff65ce5cf67eb56be150ff01ce426
-DIST ycmd-f7ba6e791829c2ad0a3b77bd8e921f2b4c71d7dc.tar.gz 2953797 BLAKE2B e56b17c3f9b714eda7a7405c44330b651f578b4d5a5799f0fde0d2a1661d7e513f5265c839c6afa1959188e8c339c8064c58ec7dea35b24872b4b08780f2dd04 SHA512 479a2843904910f150303101843414e9290c279c87e1410665fd84d5e9895e194832d461bae0ef6a7893a2c87df09049405d2a4d36a4a96c115f371e27b82d24
-DIST youcompleteme-7684b6c6b49f8d3bdbd17ecdc9ee7d228039808e.tar.gz 305508 BLAKE2B 9e5f6cae9d288e2b24e503b8df11928dc5cbeaada6b4f24bab0ed93aeb7705ab4b1312e4000091b77eb47561d7cd9b9ffd2442086b57c22fd6dace246ea83a16 SHA512 91a0f004adc371750702af87715e396d885507cf84a9f6120c1f6a865bedc520e7918697d8bdcf1fd6096c7fc32accb7f6f62a60b6c074a3b6089058f6d1ed62
 DIST youcompleteme-e32a82c322c680fa3aeef615874cf049669a360b.tar.gz 306691 BLAKE2B 0ffd62b0045971e46061cdf75af8c22f2b2910bffc081ed4164af0b0debc78a104f2fbe3cdd2e649bf79c7825617129fbb9a64db5dd887c336e7ceeeb808bd92 SHA512 48100388dc77ea81db29d9f068631ea3c366bd96cdb756be6d97c84dbdcfa45d8e0d4bc3b556e7f670d9635c5abbc023c848c0801ee89110ee3656693a0b5de7
-EBUILD youcompleteme-20220113-r1.ebuild 2392 BLAKE2B 478e0dd8ebc2a8c0347cc4b9d5bca793a7d5312a73e90b30042df68aefaa7f39a6fcb3588ae94ed0f61c751a90eb35d5e608f5b5220954e96e49e4300933d900 SHA512 a28ca11d35156949aab9be51044ce29644f5280e3ff1bdd202e23e387f56513d5c8b3816d78700e31cce37ac3aee41f096b309bdf36fa5889b08081de7cbb241
-EBUILD youcompleteme-20220322.ebuild 2392 BLAKE2B 1e151cd6325d4b6a9da2835c3eb61ca5af9c441aeb3932e55aaa0a393a8563cec371467c310ed158cbf2189ca913d207dd124b1bc03b0b58b0accef989c79205 SHA512 69dad55c1c452df8dad93f802e0e53269cf7d9a36f685cf5f2d6924f378951df3941a01663995b694a1c185e067452f8f49adbe81605c9c0dbef10232991f00c
+EBUILD youcompleteme-20220322-r1.ebuild 2393 BLAKE2B d62d3ce5aa0a832d348083c7a8f6d32c492233d74740e471334a4f3f887a8973577f81dc7b71e8cb2b98eac8559bcdfc1c7be76e55c26d92d28a0405baf8e06b SHA512 a21b0a8eaaa9bf283e036e7c4199bdc096777e78d69c3ecf3760492b928ecbeb585f96d3c12cd1642e3dd56d909b2c1d048a2068803b72b01a4c5034e2146669
diff --git a/app-vim/youcompleteme/youcompleteme-20220113-r1.ebuild b/app-vim/youcompleteme/youcompleteme-20220113-r1.ebuild
deleted file mode 100644
index dd49edd..0000000
--- a/app-vim/youcompleteme/youcompleteme-20220113-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-EAPI="7"
-PYTHON_COMPAT=( python3_{9,10} )
-inherit multilib python-single-r1 cmake-utils vim-plugin
-
-youcompletemev="7684b6c6b49f8d3bdbd17ecdc9ee7d228039808e"
-ycmdv="f7ba6e791829c2ad0a3b77bd8e921f2b4c71d7dc"
-
-KEYWORDS="~amd64 ~x86"
-SRC_URI="
-	https://github.com/ycm-core/YouCompleteMe/archive/$youcompletemev.tar.gz -> youcompleteme-$youcompletemev.tar.gz
-	https://github.com/ycm-core/ycmd/archive/$ycmdv.tar.gz -> ycmd-$ycmdv.tar.gz
-"
-
-DESCRIPTION="vim plugin: a code-completion engine for Vim"
-HOMEPAGE="http://ycm-core.github.io/YouCompleteMe/"
-
-LICENSE="GPL-3"
-IUSE="+clang"
-
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	dev-cpp/abseil-cpp
-	clang? ( sys-devel/clang:13 )
-	$(python_gen_cond_dep '
-			>=dev-libs/boost-1.65:=[python,${PYTHON_USEDEP}]
-			|| (
-				app-editors/vim[python,${PYTHON_SINGLE_USEDEP}]
-				app-editors/gvim[python,${PYTHON_SINGLE_USEDEP}]
-			   )
-	')
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	$(python_gen_cond_dep '
-			>=dev-python/bottle-0.12.18[${PYTHON_USEDEP}]
-			>=dev-python/regex-2020.2.20[${PYTHON_USEDEP}]
-			>=dev-python/jedi-0.16.0[${PYTHON_USEDEP}]
-			>=dev-python/watchdog-0.10.2[${PYTHON_USEDEP}]
-	')
-"
-DEPEND="
-	${COMMON_DEPEND}
-"
-
-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 ; 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
-	cmake-utils_src_prepare
-	default
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_CLANG_COMPLETER=$(usex clang)
-		-DUSE_SYSTEM_LIBCLANG=$(usex clang)
-		-DPATH_TO_LLVM_ROOT=$(clang-13 --version  | grep ^InstalledDir: | cut -d: -f2 | xargs dirname)
-		-DUSE_SYSTEM_ABSEIL=ON
-		-DPython3_LIBRARY=$SYSROOT/usr/$(get_libdir)/lib$EPYTHON.so
-		-DPython3_EXECUTABLE=$SYSROOT/usr/bin/$EPYTHON
-		-DPython3_INCLUDE_DIR=$SYSROOT/usr/include/$EPYTHON
-	)
-	cmake-utils_src_configure
-}
-
-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
-	rm -r test || 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
-
-	vim-plugin_src_install
-
-	python_optimize "${ED}"
-	python_fix_shebang "${ED}"
-}
diff --git a/app-vim/youcompleteme/youcompleteme-20220322.ebuild b/app-vim/youcompleteme/youcompleteme-20220322-r1.ebuild
index 72c20cb..1825ff6 100644
--- a/app-vim/youcompleteme/youcompleteme-20220322.ebuild
+++ b/app-vim/youcompleteme/youcompleteme-20220322-r1.ebuild
@@ -1,6 +1,6 @@
-EAPI="7"
+EAPI="8"
 PYTHON_COMPAT=( python3_{9,10} )
-inherit multilib python-single-r1 cmake-utils vim-plugin
+inherit multilib python-single-r1 cmake vim-plugin
 
 youcompletemev="e32a82c322c680fa3aeef615874cf049669a360b"
 ycmdv="ba5814d3810c21ef9868d70ba7a8c7eef9c1d276"
@@ -53,7 +53,7 @@ src_prepare() {
 		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
-	cmake-utils_src_prepare
+	cmake_src_prepare
 	default
 }
 
@@ -67,7 +67,7 @@ src_configure() {
 		-DPython3_EXECUTABLE=$SYSROOT/usr/bin/$EPYTHON
 		-DPython3_INCLUDE_DIR=$SYSROOT/usr/include/$EPYTHON
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
@@ -78,7 +78,7 @@ src_install() {
 	find python third_party/ycmd -depth -name '*test*' -exec rm -r {} + || die
 	find python third_party/ycmd -depth -name '*examples*' -exec rm -r {} + || die
 
-	vim-plugin_src_install
+	vim-plugin_src_install third_party python
 
 	python_optimize "${ED}"
 	python_fix_shebang "${ED}"