Update for moved clang

3 files changed, 2 insertions, 90 deletions

diff --git a/app-vim/youcompleteme/Manifest b/app-vim/youcompleteme/Manifest
index 10d3378..769f750 100644
--- a/app-vim/youcompleteme/Manifest
+++ b/app-vim/youcompleteme/Manifest
@@ -1,6 +1,3 @@
-DIST ycmd-45bc1c51ff28d66c510ad90388307e1f596a20a2.tar.gz 3047730 BLAKE2B 272ce3763897d8fd0ce2a64e33b8fd6f4ee8ec34855d964c0095d598e1e7bf050c7b7a8cbb26e1f5300779e14d8f36bfcd3acc66d67a955752e1e33c0064f1df SHA512 74030bcd6f822d288134f652c49acb730755facedc61dbfcc8255a340eb5f9fdd54412c716d12a68de6acaf3cc976e985ec9b3d4466679193153844dccbe4e6a
 DIST ycmd-8b61f198f9c824ce3ef246e5fd542a2304c9275e.tar.gz 3627019 BLAKE2B dd9649ff48a25004568dab4e4fa72e567f26b554d5b8a64f052c16fe8654a7046bb9c1d7908d313d71f265b0fd58fd06ff7f163edd113c9aa5b3cf0d31b2846a SHA512 03674ab1267e623f6bf551b6c21acfd4d43f184e6a67bff8940941f4406c5aa06c7074d59bada708622bf41ec8b45713e5197d37566e816ed1a6599e49de827b
-DIST youcompleteme-49ced5a30ad7778178fd44703665a8ef3329e592.tar.gz 326351 BLAKE2B 5015f40ef2c100a752ed796591a15b14468b2a24f612a73e4bef56fd61fe5dcb2e491a53c4f54955e03e09bf767fb60e051b9d72f42f5944ee3aeced029e78e3 SHA512 0969788270999f2caa632530b56486eae06b7fe70a5c9c3bf60793702ed1e6d45eb109a5be1996eb53b36386ec9e7c72bbb7ac177f3d1075bc6415c043f56445
 DIST youcompleteme-63ab13e95141c252c545f9a6c7144ced6790d68f.tar.gz 335912 BLAKE2B d2504f8c71091a6947008bdedf46479ec5353f2132ef6047de84ee8d22553c12a43166a45297620bede21875297318b1c8e9ad43a0adaa2a5189571f8e98ce74 SHA512 8119265ea7ced19bc9b2fad540734ee5ee804fb1f0123563499772488f7ea9bd661e0f977c231cb1ed7338490a13774332701b92ebbcc739182d0561c6d7f62c
-EBUILD youcompleteme-20230612.ebuild 2345 BLAKE2B 41cf7eb0657ef4109caf769b94e8336f3dcd0e7d8ecb0559e84cf9662da3ab6038b61d4c90489d10b7ef6945cd8a4eecf71cad24647db268a0a5e90b0a7d128c SHA512 d791edf36b79e796829ad81275d5a5f2253bb2ca8a241d7d82533429b36e5cbbc4dbacf94171695545edd3fe7f69fce4b4e761fefc103ff5469daed00d13fba5
-EBUILD youcompleteme-20240919.ebuild 2347 BLAKE2B 82f71fb338fe5379e639c3f85583bb169a23202711adaa81b5c9353d500bfed7253cab78bd655d192d9df67c8b81596a5082d8c9ccf4c110c2e9c21d724a0eaa SHA512 a77de72c6912fc0187376a1f9deceaf2d40e2d3dc61bab3bbf41e09f821c4f3b26e6861c467df939c0a3287f3744024fe76d65073f12c41c20c69c1a89fc67ea
+EBUILD youcompleteme-20240919-r1.ebuild 2347 BLAKE2B bbfb7a2f77a42cdf77ca2e4e2b2ab97a3d1395a544ad281c07a5e2a1301bce721013fd115a68e26d06b2be876a73fecc1669269c5a1a5cde32ec8542a48eb70c SHA512 9bded763b164af4b9564592f3aaa2a29e84b2ba86d3116b4adcbc8f2fd8171a8bc52be2efa9add148fb1b1861aba4ad6831f517bf26560c52e02e9008c8991f6
diff --git a/app-vim/youcompleteme/youcompleteme-20230612.ebuild b/app-vim/youcompleteme/youcompleteme-20230612.ebuild
deleted file mode 100644
index 7a5bb8e..0000000
--- a/app-vim/youcompleteme/youcompleteme-20230612.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-EAPI="8"
-PYTHON_COMPAT=( python3_{10,11,12} )
-inherit llvm multilib python-single-r1 cmake vim-plugin
-
-youcompletemev="49ced5a30ad7778178fd44703665a8ef3329e592"
-ycmdv="45bc1c51ff28d66c510ad90388307e1f596a20a2"
-
-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:= )
-	$(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_src_prepare
-	default
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_CLANG_COMPLETER=$(usex clang)
-		-DUSE_SYSTEM_LIBCLANG=$(usex clang)
-		-DPATH_TO_LLVM_ROOT=$(get_llvm_prefix)
-		-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_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 third_party python
-
-	python_optimize "${ED}"
-	python_fix_shebang "${ED}"
-}
diff --git a/app-vim/youcompleteme/youcompleteme-20240919.ebuild b/app-vim/youcompleteme/youcompleteme-20240919-r1.ebuild
index 27198c4..4658e8c 100644
--- a/app-vim/youcompleteme/youcompleteme-20240919.ebuild
+++ b/app-vim/youcompleteme/youcompleteme-20240919-r1.ebuild
@@ -20,7 +20,7 @@ IUSE="+clang"
 COMMON_DEPEND="
 	${PYTHON_DEPS}
 	dev-cpp/abseil-cpp:=
-	clang? ( sys-devel/clang:= )
+	clang? ( llvm-core/clang:= )
 	$(python_gen_cond_dep '
 			>=dev-libs/boost-1.65:=[python,${PYTHON_USEDEP}]
 			|| (