From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B07BB139694 for ; Fri, 3 Mar 2017 14:08:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2DFF1E0C89; Fri, 3 Mar 2017 14:08:32 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0A4B3E0C89 for ; Fri, 3 Mar 2017 14:08:31 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A073C341777 for ; Fri, 3 Mar 2017 14:08:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 420545B02 for ; Fri, 3 Mar 2017 14:08:29 +0000 (UTC) From: "Patrice Clement" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Patrice Clement" Message-ID: <1488550105.aec6adfc61844214ff8e58aa6c3f106eac73bb47.monsieurp@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-vim/youcompleteme/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-vim/youcompleteme/youcompleteme-99999999.ebuild X-VCS-Directories: app-vim/youcompleteme/ X-VCS-Committer: monsieurp X-VCS-Committer-Name: Patrice Clement X-VCS-Revision: aec6adfc61844214ff8e58aa6c3f106eac73bb47 X-VCS-Branch: master Date: Fri, 3 Mar 2017 14:08:29 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 7f340a35-6262-4938-bee9-12062e25763c X-Archives-Hash: b0cef1166ce4115ed604e50c4951b224 commit: aec6adfc61844214ff8e58aa6c3f106eac73bb47 Author: Patrice Clement gentoo org> AuthorDate: Fri Mar 3 14:08:11 2017 +0000 Commit: Patrice Clement gentoo 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 }