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

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xF8DBDADE

3 files changed, 60 insertions, 41 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/Manifest b/app-vim/youcompleteme/Manifest
index 7c69a0184d53..da64ef367fe1 100644
--- a/app-vim/youcompleteme/Manifest
+++ b/app-vim/youcompleteme/Manifest
@@ -3,17 +3,17 @@ Hash: SHA256
 
 DIST youcompleteme-20130910.tar.xz 2340104 SHA256 00906c92ba3c0f113c73398997008d9c8b3f31d617f5da233f25174a6d488bac SHA512 c1022a27ced00e8ba8e9aa25029a0032805331cf0f80342aaaf9d7d4ec7780a098ffbd315068f19f6c98b00c4b4b43e59c7fa40070057e097ca40f6398b53b6b WHIRLPOOL 867c3f0c08473246c52377bdb9ac52b96af1d1b3a970cb087784e54082afe19e6549c54bb37f460d379b5fac8f5f7aa4bccb1e24b0984a98c08750469ff518c6
 EBUILD youcompleteme-20130910.ebuild 2030 SHA256 6fee30a332cdef0a5dc104d9abae1e96eb4ab078fc4b8415267458daf5d26e51 SHA512 d69146fc660f034a84b93be54004f37b528cc0ec832b564586cb93a65a77474f38436b3ec11fbea3c7800bce6be8a1c3be1ead160e0ed55a4f3a2445674bd430 WHIRLPOOL e6f2a0a7ad185ef395f53a0db7cdcbe06f6017eaa19fc9ff3a554a993b669808d8d9c1a0d20e63fdb78f37c3657bba68394a86f6f4bdd1f3424b313f76576f70
-EBUILD youcompleteme-99999999.ebuild 2030 SHA256 177b936258a2406a3e7eb5b8301fc166241f584a1faacf017d299c26291f94c3 SHA512 f763b668272a04bd48e8434ce289cf11ad2bace42d79215b2c47cf552c0c894038e733872afbd17f6330b904d5acbb78ed3b79155d696b778f97f1472fb7dbd5 WHIRLPOOL 21dca2f699a69653027eaf390d127203c095fde4c6b506bcf0caefe7f27fab4fa2d2f64c59c07e5103791cfabfcb276a4c72d9cb0d460ee892c56be95f7bca8d
-MISC ChangeLog 614 SHA256 68f1cd8d9ab272f419313435b4b15addeda815b022efa5be1b6c7c34eb8b490b SHA512 8b50702684fcab5a2afeec87a46d9661d21664d007c45efd087f9f103dbe951a2ec84a019e0e1c5e30db3e8fad3df8b698762f455c66886e4cd5ee10d5253dbd WHIRLPOOL 16834d314382d7bd28b01865e7503f090bd1da32d09c46850d3255206b2a560e98297c79919405e25d01a2c1bbb9142b5f56aba0ce136e4a5fa1c38e2482acc7
+EBUILD youcompleteme-99999999.ebuild 2856 SHA256 2503f9b9ba62bcdb33ff6df3193becc3251592c8c7842d51802e0ec20dadc802 SHA512 52cb5b812396a47310415aeb864bcb698cc2814c9fd033694b3a62f5742e30f2f51236a322bce234e3961652bafcf23f2a9e996710889f28dfefed0ee8692c7c WHIRLPOOL a5200721062476fbbb89f13df01d36beda2bea66084624049daaff1a6bd7877d2c04379c6bdbcd7aa46f210931e46ea9ba919f7183fc5013018b16be868e424f
+MISC ChangeLog 775 SHA256 86e903f0099a11518253dadf9a9a28f75cda9a98b91ff4b9d942bbf86b6523e9 SHA512 d5b2a16ef53d9896e829da15ca79f44cbd2c6fc6e8e284b5835d1095f1e64903458ef015808b1f8f34a0d111b20c4ed285c8f5948ba15fa18bb9415a7e4ca3ae WHIRLPOOL 2b3bce2224d73c8f9cc81095d4fef3edca58596bffc09b407475768dfb17e7222efc6c21b662cc6db2ad4f9b2a7ad48db129aada99a8046883e302ad73ff4211
 MISC metadata.xml 276 SHA256 b4ec72c8b7d1d246c01602b5d087df5428f1fec5e00415d5d81536aadb689f19 SHA512 34603f768f01063b5911cf35d4d0d29130ecbf5e1bda8a15992a095a948409296ff2bfa3ce75735cc3c8a577959b3ffd49ccd32022c1aedb2d118dd9c4bb72a6 WHIRLPOOL 52cda40fe2f06f25183ddd54c9854527caed8c280325b36282d5d9fa1eefcf603b0cf3c56bd87cac847b53c27ec96857aa393b236407d1bd1d9d47cc4fae49dc
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.21 (GNU/Linux)
+Version: GnuPG v2
 
-iQEcBAEBCAAGBQJSLvdTAAoJEEqz6FtPBkyjKoQH/iCurvGdYuUEslBvD5vQqluy
-1oGCLKQHhXi9dy87XibIysUugsbMTVGFyiL+hmaidFY4n5sXavdBBGLICrPqA6dp
-kuHix5lUJQQFXUsCvBcjgdgMHjtfk+sQIoNIuAtZJ7ccquF/QGat53qDt8YTNL+m
-vF9+4dScwvcqo43uWyolhugw1FIK70aThKmo2Zi93ap0U9JEzdv5ofQWWg8psE/y
-oiDH5k+VMVVVyu2zTcElZhz0745dnNuqW1W5NkS6cmmIuJyHjlzolr2OZTJEIRyo
-OrUoVNzqRh8uH9Es6rUDSK4av5ayFW+pL+Do/Ed772OxPRX5GJHShtIJAddbJz4=
-=FMux
+iQEcBAEBCAAGBQJTl2IBAAoJEAmJmMX429rebIYIALcoXt5YI2QWVOqSBE/x0Rnp
+eGQn0xfXRmWt6t6+ZOA61FUILKJ+h0y57jfKgnxYQL/5RZsiRx4E1z0dT+5/NzY0
+5cZGdDWZcwcl2FmF8fAgD6FlF3JtinmUFGF0UZH9OPD+1GTQvpRsfiqFYBJda40X
+xYefk4Oih+CzMkRt/SDH+re/jNdyQ437sXOeZxpG9lRfmXMe6Tnmfa85vgVe3TOc
+NJkB3io9nbVGuB93sgAwJ7TowTCJAMScAaIW9ZgQ6MuOHK/EPw5VDEpAtk8vajj0
+6nemZ7r9njNH2XWDuwTgOOD0/T3CuBB51Z+Z72XQwdbljgwERpVTjmRRcQKaDr0=
+=euS8
 -----END PGP SIGNATURE-----
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
-}