Add abseil subslot dep for YCM

3 files changed, 2 insertions, 90 deletions

diff --git a/app-vim/youcompleteme/Manifest b/app-vim/youcompleteme/Manifest
index 9962b1c..fcec79d 100644
--- a/app-vim/youcompleteme/Manifest
+++ b/app-vim/youcompleteme/Manifest
@@ -1,6 +1,3 @@
 DIST ycmd-2ee41000a28fb6b2ae00985c231896b6d072af86.tar.gz 3021422 BLAKE2B 9b87da0a5389d1e1eb76a4ab41f387c83c0818d788f8a1be0167ea2b9e73354c5ddf930a1cd263704d5146bb2ea0c49e4b573c4b5abbafc82e600b218c86c114 SHA512 d3072a6d3606c34f2af4cf43f8d5be2599e4e5617418a70e73a5c0be642efccdd8de9b872e7ffa43318501803f15b6f54ae69549d61689b9a8aaca86a8747f45
-DIST ycmd-d1707c14883ced0e32fcca9c0f5dbd6849b5f751.tar.gz 2992694 BLAKE2B 8f663d87494b7e21333cfd6f5f7c7b4d4ccd2fe73c1a7a4428a041c5f890f3a8fe4f1dcca849a67de16d32534c8d1dc5c3d8d2cf60fccc99e2626079704f1793 SHA512 3548161955db4acbee27a117c9c9a0d4c29297dd02ad7811af3b66be6583683ed1e5fd670e4226fc4be0e0a4aee207dde7ad5e230270daa8cf502b18c3ef6c59
-DIST youcompleteme-d35df6136146b12f3a78f8b8fbdaf55f4e2ee462.tar.gz 310672 BLAKE2B b6030dfcf66321b174ff33a9dac5567a905907a7ccf06bfabe6a85e720c7009058b109173d10d0a77a1c3ffa69c79c3f7e98612ff63d3d8de3c9f8a585361df8 SHA512 a5508a935268bd5000ed85457b2e18571dfa6187d1f9142df2780be715398d498cc02b7e942d1e8be66b2aaa4fd5ca702ed06016eb4ace93f3c682f7ba1e94ef
 DIST youcompleteme-d4343e8384ffb25d70a9ebc966bbf1277735567c.tar.gz 317812 BLAKE2B a2270da6ee19e715d2d927a2f38564d0f39e37e6cd0692b4ce43b60ef8f9b254ceb6ecd6a0cf70ad0f6cbbe0234825a69e28e02528d889092c3f01bf1102fe5e SHA512 038afbd42e84f215386bcbc29f264283dafd5f30b69b6467c34a71dc4b9cb9d528ae0ecc0d94fe86b2beee960b030f884327024fb54980c72d09421882444652
-EBUILD youcompleteme-20220802.ebuild 2393 BLAKE2B fe37ace69f2402d47aeee03ff4e586969f1fcd765c5e46d3b46e9416f560778ab94754bce7d7c9e23ff9c51eab0bc286fb4751e1c0e28f08c03dab3034de4374 SHA512 ecc394ae3caa58631f0cf735e06a72a1b67b441efcd9a6015a8e5f379dabb00179257e3f90f52bd1d31b108a5407d6292105a4f6a9754085076aeb85f2e0120a
-EBUILD youcompleteme-20220909-r1.ebuild 2341 BLAKE2B 5e21f0f69f08cbd78c525144b5bcebb751acf23e79e955d41f93399ef6dcd38488c6c2c02390f55cdda73e39f91e4afc39173a57374ca903ce96a6569714c111 SHA512 5afb26fdac194f07ba560787328204e9807272203a4799d76d6f931552f0e34d4a30b8337974fe10ef1ff20f2ce5195d6c59f9a902dbc56378c423f5fd89ecd3
+EBUILD youcompleteme-20220909-r2.ebuild 2343 BLAKE2B eaab1f1184a04f246c9fcfc21820c11ae9551d0d7f16f7542cc9ac99b8675cba57fd0fbd85a477b6848159c6f7761a162400f37e96231abbcd8bbd0284075098 SHA512 38b6fcb8949c04133d3888404c2e0227c5504aa8c1f74db713420f94c528cba2588518918b36dcb529c4445f8221c5b1c260ed35e969b693c6a36ed3f63192d5
diff --git a/app-vim/youcompleteme/youcompleteme-20220802.ebuild b/app-vim/youcompleteme/youcompleteme-20220802.ebuild
deleted file mode 100644
index 121cd2c..0000000
--- a/app-vim/youcompleteme/youcompleteme-20220802.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-EAPI="8"
-PYTHON_COMPAT=( python3_{9,10} )
-inherit multilib python-single-r1 cmake vim-plugin
-
-youcompletemev="d35df6136146b12f3a78f8b8fbdaf55f4e2ee462"
-ycmdv="d1707c14883ced0e32fcca9c0f5dbd6849b5f751"
-
-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_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_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-20220909-r1.ebuild b/app-vim/youcompleteme/youcompleteme-20220909-r2.ebuild
index 08c95f0..cf67718 100644
--- a/app-vim/youcompleteme/youcompleteme-20220909-r1.ebuild
+++ b/app-vim/youcompleteme/youcompleteme-20220909-r2.ebuild
@@ -19,7 +19,7 @@ IUSE="+clang"
 
 COMMON_DEPEND="
 	${PYTHON_DEPS}
-	dev-cpp/abseil-cpp
+	dev-cpp/abseil-cpp:=
 	clang? ( sys-devel/clang:= )
 	$(python_gen_cond_dep '
 			>=dev-libs/boost-1.65:=[python,${PYTHON_USEDEP}]