[gentoo-commits] repo/gentoo:master commit in: app-vim/youcompleteme/

[Patrice Clement]

commit:     aec6adfc61844214ff8e58aa6c3f106eac73bb47
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Fri Mar  3 14:08:11 2017 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Fri Mar  3 14:08:25 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aec6adfc

app-vim/youcompleteme: remove directory module only if it exists.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 app-vim/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 eb184f02196..6ae3c704451 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
 }