From aec6adfc61844214ff8e58aa6c3f106eac73bb47 Mon Sep 17 00:00:00 2001 From: Patrice Clement Date: Fri, 3 Mar 2017 15:08:11 +0100 Subject: [PATCH] app-vim/youcompleteme: remove directory module only if it exists. Package-Manager: Portage-2.3.3, Repoman-2.3.1 --- .../youcompleteme/youcompleteme-99999999.ebuild | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/app-vim/youcompleteme/youcompleteme-99999999.ebuild b/app-vim/youcompleteme/youcompleteme-99999999.ebuild index eb184f021961..6ae3c704451b 100644 --- a/app-vim/youcompleteme/youcompleteme-99999999.ebuild +++ b/app-vim/youcompleteme/youcompleteme-99999999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -56,15 +56,21 @@ CMAKE_USE_DIR=${S}/third_party/ycmd/cpp VIM_PLUGIN_HELPFILES="${PN}" src_prepare() { - if ! use test ; then + if ! use test; then sed -i '/^add_subdirectory( tests )/d' third_party/ycmd/cpp/ycm/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}" + if [[ -d "${third_party_module}" ]]; then + rm -r "${S}"/third_party/${third_party_module} || die "Failed to remove third party module ${third_party_module}" + fi done + # Argparse is included in python 2.7 for third_party_module in argparse bottle jedi waitress sh requests; do - rm -r "${S}"/third_party/ycmd/third_party/${third_party_module} || die "Failed to remove third party module ${third_party_module}" + if [[ -d "${third_party_module}" ]]; then + rm -r "${S}"/third_party/ycmd/third_party/${third_party_module} || die "Failed to remove third party module ${third_party_module}" + fi done } -- 2.26.2