YCM bump and switch to clang8

3 files changed, 119 insertions, 3 deletions

diff --git a/app-vim/youcompleteme/Manifest b/app-vim/youcompleteme/Manifest
index 83be484..7796cd0 100644
--- a/app-vim/youcompleteme/Manifest
+++ b/app-vim/youcompleteme/Manifest
@@ -5,8 +5,11 @@ DIST requests-futures-98712e7d0f6be2a090b6fda2a925f85e63656b58.tar.gz 4550 BLAKE
 DIST requests-futures-d9d21ac63904dc0a668e0f073503f85a534460f4.tar.gz 6742 BLAKE2B fe72f9d8cf5148500da18bb22ed5a5e8c6f80ca2a9dd5487c501acfa9e0e12bd3c615750a9a7c519dccab07d6101fafabc8d8242c8c0b5da6b4b61a1ff6c8a48 SHA512 e0ec8bffc5d710cd098643ec315b176e80223893528754c85f5ea8dc74a539e8ea2d429de5ff727a6fac9f163d47f9b089edcf8c3d0c7939184d162a3b6afe7e
 DIST ycmd-0e999dbee209ea79a522259816ce3a68b7d6cddc.tar.gz 3750159 BLAKE2B 62b5ed54b27de73e28e65e8cf657098197905b9168ce2374c8fd1bddbc87da5ea5bf2f4614c5cd2864ed0077641159eb7aa38c9a6b476c4e8737fe5a2c7dfa1a SHA512 684663e0fc02ff9e64cd8d0d17e5602f6a5a300dd9e5eacd9ee633e1efc5fd3e90c5697b8cfa2aa4b603b6610ee25ee185b598ba2df6c6b3e987d30de9f7bd8e
 DIST ycmd-3db4f3b2d723007c46891c11fce53a0dc4363493.tar.gz 3713062 BLAKE2B 396371d99d30594598b728b7fb6ce15b83087ea48fe2941d759486f3672b6b40fa20a40e42b9644fe622962247ccb9d390b27fc82110710d9266f262e31fde6c SHA512 5059e71d3a63a8a8f15b2178113239b3a92c56bf240e099ad33287352fd2338dfe8a968e8f5849197c43d68a2d0edd5fb88fd4b4835d73ec1b5dd495a319d981
+DIST ycmd-4dfa50eb5873c071b446f25b17cbad066164b339.tar.gz 4550802 BLAKE2B de11b0cbb7618971f013ad9bfc425db43f955e8489b8c75c08abbedcb93da8faeb75afbfcc29b84b6238e2da2ec5775198083d03a9867a79d76b0dcdaccba155 SHA512 6233940eacf7592f7164b833f93a784bc39dd8a467e4df08b1433a63bebc405b63b41a1e534dfefd24b5a06faf0e5cdc52467b4cb87d475fd24d66d15c12c770
+DIST youcompleteme-25ebc0b9abb1b135c809ee850085a0305cbc5533.tar.gz 291574 BLAKE2B 99f03166cf6c5192e63c307b8c5558589ea877df74a595694f3169982b0ae2939d24fac469e80b476e23d99bf800ebc0b2e8795f1cf4b4a1c18bdd21f25e9bdb SHA512 6abf0696fcd9472d33071a890411bc0f19ba939a2c2a9d2a60480404759e19c3fd93d9eaa916dcd6c777bd8f8f0d02efac89efefca6219ea7b34c93555101115
 DIST youcompleteme-c9ff2177377a85515b7e081966685f3c46a33eca.tar.gz 281863 BLAKE2B 26625d245db2fea42838e8f8cee7fdff3d14a97a84a3a82ef317978ffedd8ab1c77120ac2acc0aad917ae3a97999c431bfc70cd1ed0639aaacb39e1622e56ef6 SHA512 69bf67117cc9a66e0b613ee7dce962f0e1f668c1bc785bbaf0527309970fc32606c5a43b13493163dae28ba96f90028d9c09fd7f33246216bd4be81ade870d1b
 DIST youcompleteme-ccc06c2c423e7ee7008f7439ff99c604d474cec1.tar.gz 286814 BLAKE2B af87fd800c57d53c9719465c8c7b0c380e8563ef8f16fe60455b8321c4a6389192616f7dc63e3b32a9bdc6a412840a0431df2884b693d02db76ea3d3e8663020 SHA512 45fd32b4384134ab7c1b15c152e0fb72a8cfe508644115036aafca9e16058c2b8cc076622153de7193a1167e1b60d6c44561cbc2225a15bdc5f04d28ce35e727
 EBUILD youcompleteme-20180610-r1.ebuild 3653 BLAKE2B c49503fe3a2584d0d71fc3f7e0738b667928d6379188273aac803ca2d689222a956146bd0544db5ba8a7f801da14f493ebc749d0094041b427d1863ecc808171 SHA512 e0b0e3203a23fe0e0d38c1f738a1fbe212549338bbd0dd76ff2eb4daad5545dbdc791236b9888a551d0db61abafb83d0f32f136bba3be328bef753005dfd866f
 EBUILD youcompleteme-20180610.ebuild 3653 BLAKE2B 1108265b0c9adeca1a8346f4c1a340f06e64ac28b2499ee8d1bd50f3a5502c2f93335a544f3d0c4ddec032b285ab121fda45a207e7759aafa64684cf89841180 SHA512 7d817acb5c57ffa547688b996151bebb20c89c98d2405258d5a2f117cb26de97097224c1a3ae13a16698da5daa36a90855322267deabbc05b8676861c185939d
-EBUILD youcompleteme-20190115.ebuild 3666 BLAKE2B 1c5e91520449bd33d6725dc3d2c55f8fab49f68c9c5895d928d5d233749af1ea590c098f764afef0d2f0b8a3c81ad1df1ff5d13303e0f62b34db4dbd29582027 SHA512 1a11a2a0f74a5da14e98fb2f4b2dfdb362ad433da575f04ceb86ef61ebbae5785f4ed2b9b6801e77bd252431c6780dbc5ff6fbb41443c5ac0ec234a1467a0745
+EBUILD youcompleteme-20190115.ebuild 3666 BLAKE2B e544ae3d166edfbb76fd10f6408d16cc379950c48120f41ad353389912f3400591536e0305482202990d031518b4dcd122bbd40c2fe73bea87c644f0fdc4c6f3 SHA512 033e6fc94a51e890765fd9184b456aca25116c410c2286b971271d3d84e0f5c81026cc6e12a10e3916136093291cb0227f63b2766d8d3f1b3c5bfddc822e95f4
+EBUILD youcompleteme-20190321.ebuild 3688 BLAKE2B 706b8e65933e24e0036df11f8661a8b99a69e68a88bfabfe397e7bd45f607500af9dc7474c68508d5e92d926d01f5a853acc1602cc3af1ed7afaa3793c104425 SHA512 d7243dd08a86dd46672f3427992b444e12312200f1236fa6a4aedd92886efde1b3db241b11907e5eeb4dcc85acb7dd8d5c62f0fa711a5182588937386f8eec10
diff --git a/app-vim/youcompleteme/youcompleteme-20190115.ebuild b/app-vim/youcompleteme/youcompleteme-20190115.ebuild
index 5da77f2..ccef83e 100644
--- a/app-vim/youcompleteme/youcompleteme-20190115.ebuild
+++ b/app-vim/youcompleteme/youcompleteme-20190115.ebuild
@@ -28,7 +28,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 COMMON_DEPEND="
 	${PYTHON_DEPS}
-	clang? ( sys-devel/clang:7 )
+	clang? ( sys-devel/clang:8 )
 	>=dev-libs/boost-1.65:=[python,threads,${PYTHON_USEDEP}]
 	|| (
 		app-editors/vim[python,${PYTHON_USEDEP}]
@@ -79,7 +79,7 @@ src_configure() {
 		-DUSE_CLANG_COMPLETER=$(usex clang)
 		-DUSE_SYSTEM_LIBCLANG=$(usex clang)
 		-DUSE_PYTHON2=OFF
-		-DPATH_TO_LLVM_ROOT=/usr/lib/llvm/7
+		-DPATH_TO_LLVM_ROOT=/usr/lib/llvm/8
 		-DUSE_SYSTEM_BOOST=ON
 	)
 	cmake-utils_src_configure
diff --git a/app-vim/youcompleteme/youcompleteme-20190321.ebuild b/app-vim/youcompleteme/youcompleteme-20190321.ebuild
new file mode 100644
index 0000000..18df4a9
--- /dev/null
+++ b/app-vim/youcompleteme/youcompleteme-20190321.ebuild
@@ -0,0 +1,113 @@
+EAPI=6
+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}"
+}