From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 9078358973 for ; Fri, 22 Jan 2016 21:03:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 31A3721C060; Fri, 22 Jan 2016 21:03:29 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A15B321C05E for ; Fri, 22 Jan 2016 21:03:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B51FC340A7B for ; Fri, 22 Jan 2016 21:03:17 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 70FCD10BE for ; Fri, 22 Jan 2016 21:03:12 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1453496583.c84c428b7d8795b6063f490739b76bab774668b7.jlec@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-vim/youcompleteme/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-vim/youcompleteme/youcompleteme-20130910.ebuild app-vim/youcompleteme/youcompleteme-99999999.ebuild X-VCS-Directories: app-vim/youcompleteme/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: c84c428b7d8795b6063f490739b76bab774668b7 X-VCS-Branch: master Date: Fri, 22 Jan 2016 21:03:12 +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: b9fbb236-a7a2-450e-87ff-c10881007418 X-Archives-Hash: 5ba7420cba841c4669d3243da635738b commit: c84c428b7d8795b6063f490739b76bab774668b7 Author: Justin Lecher gentoo org> AuthorDate: Fri Jan 22 20:36:10 2016 +0000 Commit: Justin Lecher gentoo org> CommitDate: Fri Jan 22 21:03:03 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c84c428b app-vim/youcompleteme: Use egit_clean to clean workdir * Add missing die Package-Manager: portage-2.2.27 Signed-off-by: Justin Lecher gentoo.org> app-vim/youcompleteme/youcompleteme-20130910.ebuild | 20 +++++++++----------- app-vim/youcompleteme/youcompleteme-99999999.ebuild | 14 ++++++++------ 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/app-vim/youcompleteme/youcompleteme-20130910.ebuild b/app-vim/youcompleteme/youcompleteme-20130910.ebuild index cb098b8..4defa4f 100644 --- a/app-vim/youcompleteme/youcompleteme-20130910.ebuild +++ b/app-vim/youcompleteme/youcompleteme-20130910.ebuild @@ -1,10 +1,12 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI=5 + PYTHON_COMPAT=( python2_7 ) -inherit multilib python-single-r1 cmake-utils vim-plugin + +inherit eutils multilib python-single-r1 cmake-utils vim-plugin if [[ ${PV} == 9999* ]] ; then EGIT_REPO_URI="git://github.com/Valloric/YouCompleteMe.git" @@ -54,14 +56,14 @@ src_configure() { src_test() { # TODO: use system gmock/gtest - cd "${S}"/cpp + cd "${S}"/cpp || die emake ycm_core_tests cd ycm/tests || die LD_LIBRARY_PATH="${EROOT}"/usr/$(get_libdir)/llvm \ "${S}"/cpp/ycm/tests/ycm_core_tests || die - cd "${S}"/python/ycm - nosetests || die + cd "${S}"/python/ycm || die + nosetests --verbose || die } src_install() { @@ -79,10 +81,6 @@ src_install() { pkg_postinst() { vim-plugin_pkg_postinst - if [[ -z ${REPLACING_VERSIONS} ]] ; then - elog - elog "optional dependencies:" - elog " dev-python/jedi (better python autocompletion)" - elog - fi + [[ -z ${REPLACING_VERSIONS} ]] && \ + optfeature "better python autocompletion" dev-python/jedi } diff --git a/app-vim/youcompleteme/youcompleteme-99999999.ebuild b/app-vim/youcompleteme/youcompleteme-99999999.ebuild index aef2bf0..5a68855 100644 --- a/app-vim/youcompleteme/youcompleteme-99999999.ebuild +++ b/app-vim/youcompleteme/youcompleteme-99999999.ebuild @@ -1,10 +1,12 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI=5 + PYTHON_COMPAT=( python2_7 ) -inherit multilib python-single-r1 cmake-utils vim-plugin + +inherit eutils multilib python-single-r1 cmake-utils vim-plugin if [[ ${PV} == 9999* ]] ; then EGIT_REPO_URI="git://github.com/Valloric/YouCompleteMe.git" @@ -78,16 +80,16 @@ src_configure() { } src_test() { - cd "${S}/third_party/ycmd/cpp/ycm/tests" + cd "${S}/third_party/ycmd/cpp/ycm/tests" || die LD_LIBRARY_PATH="${EROOT}"/usr/$(get_libdir)/llvm \ ./ycm_core_tests || die - cd "${S}"/python/ycm + cd "${S}"/python/ycm || die local dirs=( "${S}"/third_party/*/ "${S}"/third_party/ycmd/third_party/*/ ) local -x PYTHONPATH=${PYTHONPATH}:$(IFS=:; echo "${dirs[*]}") - nosetests || die + nosetests --verbose || die } src_install() { @@ -95,7 +97,7 @@ src_install() { 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 - find "${S}" -name '.git*' -exec rm -rf {} + || die + egit_clean rm third_party/ycmd/libclang.so || die vim-plugin_src_install