Switch to system boost, gmock and several python libraries in live ebuild

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key F8DBDADE)

2 files changed, 50 insertions, 31 deletions

diff --git a/app-vim/youcompleteme/ChangeLog b/app-vim/youcompleteme/ChangeLog
index 466730a70e44..0d9cc7a4f02a 100644
--- a/app-vim/youcompleteme/ChangeLog
+++ b/app-vim/youcompleteme/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-vim/youcompleteme
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-vim/youcompleteme/ChangeLog,v 1.2 2013/09/10 10:41:22 radhermit Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-vim/youcompleteme/ChangeLog,v 1.3 2014/06/10 19:52:39 maksbotan Exp $
+
+  10 Jun 2014; Maxim Koltsov <maksbotan@gentoo.org>
+  youcompleteme-99999999.ebuild:
+  Switch to system boost, gmock and several python libraries in live ebuild
 
   10 Sep 2013; Tim Harder <radhermit@gentoo.org> youcompleteme-20130910.ebuild,
   youcompleteme-99999999.ebuild:
@@ -13,4 +17,3 @@
   +youcompleteme-20130910.ebuild, +youcompleteme-99999999.ebuild,
   +metadata.xml:
   Initial import (bug #482040 by hasufell).
-
diff --git a/app-vim/youcompleteme/youcompleteme-99999999.ebuild b/app-vim/youcompleteme/youcompleteme-99999999.ebuild
index eb925f424bcb..c72f843513ec 100644
--- a/app-vim/youcompleteme/youcompleteme-99999999.ebuild
+++ b/app-vim/youcompleteme/youcompleteme-99999999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-vim/youcompleteme/youcompleteme-99999999.ebuild,v 1.2 2013/09/10 10:41:22 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-vim/youcompleteme/youcompleteme-99999999.ebuild,v 1.3 2014/06/10 19:52:39 maksbotan Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_COMPAT=( python2_7 )
 inherit multilib python-single-r1 cmake-utils vim-plugin
 
 if [[ ${PV} == 9999* ]] ; then
@@ -21,68 +21,84 @@ LICENSE="GPL-3"
 IUSE="+clang test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-RDEPEND="${PYTHON_DEPS}
+COMMON_DEPEND="
+	${PYTHON_DEPS}
 	clang? ( >=sys-devel/clang-3.3 )
+	dev-libs/boost[python,threads,${PYTHON_USEDEP}]
 	|| (
 		app-editors/vim[python,${PYTHON_USEDEP}]
 		app-editors/gvim[python,${PYTHON_USEDEP}]
-	)"
-DEPEND="${RDEPEND}
+	)
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	dev-python/bottle[${PYTHON_USEDEP}]
+	dev-python/futures[${PYTHON_USEDEP}]
+	dev-python/jedi[${PYTHON_USEDEP}]
+	dev-python/requests[${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
+	)
+"
 
 CMAKE_IN_SOURCE_BUILD=1
-CMAKE_USE_DIR=${S}/cpp
+CMAKE_USE_DIR=${S}/third_party/ycmd/cpp
 
 VIM_PLUGIN_HELPFILES="${PN}"
 
 src_prepare() {
 	if ! use test ; then
-		sed -i '/^add_subdirectory( tests )/d' cpp/ycm/CMakeLists.txt || die
+		sed -i '/^add_subdirectory( tests )/d' third_party/ycmd/cpp/CMakeLists.txt || die
 	fi
+	for third_party_module in requests pythonfutures; do
+		rm -r "${S}"/third_party/${third_party_module} || die "Failed to remove third party module ${third_party_module}"
+	done
+	# Argparse is included in python 2.7
+	for third_party_module in argparse bottle jedi waitress; do
+		rm -r "${S}"/third_party/ycmd/third_party/${third_party_module} || die "Failed to remove third party module ${third_party_module}"
+	done
 }
 
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_use clang CLANG_COMPLETER)
 		$(cmake-utils_use_use clang SYSTEM_LIBCLANG)
+		-DUSE_SYSTEM_BOOST=ON
+		-DUSE_SYSTEM_GMOCK=ON
 	)
 	cmake-utils_src_configure
 }
 
 src_test() {
-	# TODO: use system gmock/gtest
-	cd "${S}"/cpp
-	emake ycm_core_tests
-	cd ycm/tests || die
+	cd "${S}/third_party/ycmd/cpp/ycm/tests"
 	LD_LIBRARY_PATH="${EROOT}"/usr/$(get_libdir)/llvm \
-		"${S}"/cpp/ycm/tests/ycm_core_tests || die
+		./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
-	rm -r *.md *.sh COPYING.txt cpp || die
+	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 -name *test* -exec rm -rf {} + || die
-	rm python/libclang.so || die
+	find "${S}" -name '.git*' -exec rm -rf {} + || die
+	rm third_party/ycmd/libclang.so || die
 
 	vim-plugin_src_install
 
 	python_optimize "${ED}"
 	python_fix_shebang "${ED}"
 }
-
-pkg_postinst() {
-	vim-plugin_pkg_postinst
-
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog
-		elog "optional dependencies:"
-		elog "  dev-python/jedi (better python autocompletion)"
-		elog
-	fi
-}