Stablize old, add new YCM

3 files changed, 90 insertions, 2 deletions

diff --git a/app-vim/youcompleteme/Manifest b/app-vim/youcompleteme/Manifest
index 1d37d59..a24b051 100644
--- a/app-vim/youcompleteme/Manifest
+++ b/app-vim/youcompleteme/Manifest
@@ -1,3 +1,6 @@
 DIST ycmd-2ee41000a28fb6b2ae00985c231896b6d072af86.tar.gz 3021422 BLAKE2B 9b87da0a5389d1e1eb76a4ab41f387c83c0818d788f8a1be0167ea2b9e73354c5ddf930a1cd263704d5146bb2ea0c49e4b573c4b5abbafc82e600b218c86c114 SHA512 d3072a6d3606c34f2af4cf43f8d5be2599e4e5617418a70e73a5c0be642efccdd8de9b872e7ffa43318501803f15b6f54ae69549d61689b9a8aaca86a8747f45
+DIST ycmd-45bc1c51ff28d66c510ad90388307e1f596a20a2.tar.gz 3047730 BLAKE2B 272ce3763897d8fd0ce2a64e33b8fd6f4ee8ec34855d964c0095d598e1e7bf050c7b7a8cbb26e1f5300779e14d8f36bfcd3acc66d67a955752e1e33c0064f1df SHA512 74030bcd6f822d288134f652c49acb730755facedc61dbfcc8255a340eb5f9fdd54412c716d12a68de6acaf3cc976e985ec9b3d4466679193153844dccbe4e6a
+DIST youcompleteme-49ced5a30ad7778178fd44703665a8ef3329e592.tar.gz 326351 BLAKE2B 5015f40ef2c100a752ed796591a15b14468b2a24f612a73e4bef56fd61fe5dcb2e491a53c4f54955e03e09bf767fb60e051b9d72f42f5944ee3aeced029e78e3 SHA512 0969788270999f2caa632530b56486eae06b7fe70a5c9c3bf60793702ed1e6d45eb109a5be1996eb53b36386ec9e7c72bbb7ac177f3d1075bc6415c043f56445
 DIST youcompleteme-d4343e8384ffb25d70a9ebc966bbf1277735567c.tar.gz 317812 BLAKE2B a2270da6ee19e715d2d927a2f38564d0f39e37e6cd0692b4ce43b60ef8f9b254ceb6ecd6a0cf70ad0f6cbbe0234825a69e28e02528d889092c3f01bf1102fe5e SHA512 038afbd42e84f215386bcbc29f264283dafd5f30b69b6467c34a71dc4b9cb9d528ae0ecc0d94fe86b2beee960b030f884327024fb54980c72d09421882444652
-EBUILD youcompleteme-20220909-r2.ebuild 2346 BLAKE2B f48f2792d8a406d4c7307403a7fd280b2ba89978f6add6d11039892330601ebde9d3826af46ce7711d49475343242c016033acfa265d37cbca08df112e55ed8e SHA512 122c9ea34571f81947b68a7999c0245f8748d07fb5cf673536e300932606b67ef6897bc63564f5d1ce8bebf2ec4f5066c6b60c60e7553d8099225bbd1a8a35e7
+EBUILD youcompleteme-20220909-r2.ebuild 2344 BLAKE2B 0ef5043fb908f1db79c88add95e18b3f08804da1aacf74013845cb2493f1d389b3a8a8739c53db29926eea2431f7eb7d3bb9bb9f2883635b61b3fea941f5cbd2 SHA512 2821d218d1ca2837e8c19ee5f8813463cb2f6e30f71b5f81aaca83d2809758fb09c6456527df9d0ef877d765bba2de1f9d4cc64fa26717d6bff3dfe948385419
+EBUILD youcompleteme-20230612.ebuild 2346 BLAKE2B 7a4a807fd7890b49342e20f508163bbe05ab4c8af58c9942c3d96e6f02d9b8204dab219ee73a48c6706b69144a84f4865cd50708e84b3ecb8e8a713cfacb0133 SHA512 a97624321ab143f38d1af1037b5ca1892f0c1fe3fcfb956dcfde11188a4a8df469ba1b38fc094c2442b880826f07e62e9803fec611b703f832a62c241cd28400
diff --git a/app-vim/youcompleteme/youcompleteme-20220909-r2.ebuild b/app-vim/youcompleteme/youcompleteme-20220909-r2.ebuild
index e1833bf..72c76d4 100644
--- a/app-vim/youcompleteme/youcompleteme-20220909-r2.ebuild
+++ b/app-vim/youcompleteme/youcompleteme-20220909-r2.ebuild
@@ -5,7 +5,7 @@ inherit llvm multilib python-single-r1 cmake vim-plugin
 youcompletemev="d4343e8384ffb25d70a9ebc966bbf1277735567c"
 ycmdv="2ee41000a28fb6b2ae00985c231896b6d072af86"
 
-KEYWORDS="~amd64 ~x86"
+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
diff --git a/app-vim/youcompleteme/youcompleteme-20230612.ebuild b/app-vim/youcompleteme/youcompleteme-20230612.ebuild
new file mode 100644
index 0000000..18ee9ea
--- /dev/null
+++ b/app-vim/youcompleteme/youcompleteme-20230612.ebuild
@@ -0,0 +1,85 @@
+EAPI="8"
+PYTHON_COMPAT=( python3_{9,10,11} )
+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}"
+}