1 |
commit: aec6adfc61844214ff8e58aa6c3f106eac73bb47 |
2 |
Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Mar 3 14:08:11 2017 +0000 |
4 |
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Mar 3 14:08:25 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aec6adfc |
7 |
|
8 |
app-vim/youcompleteme: remove directory module only if it exists. |
9 |
|
10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
11 |
|
12 |
app-vim/youcompleteme/youcompleteme-99999999.ebuild | 14 ++++++++++---- |
13 |
1 file changed, 10 insertions(+), 4 deletions(-) |
14 |
|
15 |
diff --git a/app-vim/youcompleteme/youcompleteme-99999999.ebuild b/app-vim/youcompleteme/youcompleteme-99999999.ebuild |
16 |
index eb184f02196..6ae3c704451 100644 |
17 |
--- a/app-vim/youcompleteme/youcompleteme-99999999.ebuild |
18 |
+++ b/app-vim/youcompleteme/youcompleteme-99999999.ebuild |
19 |
@@ -1,4 +1,4 @@ |
20 |
-# Copyright 1999-2016 Gentoo Foundation |
21 |
+# Copyright 1999-2017 Gentoo Foundation |
22 |
# Distributed under the terms of the GNU General Public License v2 |
23 |
|
24 |
EAPI=5 |
25 |
@@ -56,15 +56,21 @@ CMAKE_USE_DIR=${S}/third_party/ycmd/cpp |
26 |
VIM_PLUGIN_HELPFILES="${PN}" |
27 |
|
28 |
src_prepare() { |
29 |
- if ! use test ; then |
30 |
+ if ! use test; then |
31 |
sed -i '/^add_subdirectory( tests )/d' third_party/ycmd/cpp/ycm/CMakeLists.txt || die |
32 |
fi |
33 |
+ |
34 |
for third_party_module in requests pythonfutures; do |
35 |
- rm -r "${S}"/third_party/${third_party_module} || die "Failed to remove third party module ${third_party_module}" |
36 |
+ if [[ -d "${third_party_module}" ]]; then |
37 |
+ rm -r "${S}"/third_party/${third_party_module} || die "Failed to remove third party module ${third_party_module}" |
38 |
+ fi |
39 |
done |
40 |
+ |
41 |
# Argparse is included in python 2.7 |
42 |
for third_party_module in argparse bottle jedi waitress sh requests; do |
43 |
- rm -r "${S}"/third_party/ycmd/third_party/${third_party_module} || die "Failed to remove third party module ${third_party_module}" |
44 |
+ if [[ -d "${third_party_module}" ]]; then |
45 |
+ rm -r "${S}"/third_party/ycmd/third_party/${third_party_module} || die "Failed to remove third party module ${third_party_module}" |
46 |
+ fi |
47 |
done |
48 |
} |