summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2016-01-22 21:36:10 +0100
committerJustin Lecher <jlec@gentoo.org>2016-01-22 22:03:03 +0100
commitc84c428b7d8795b6063f490739b76bab774668b7 (patch)
treecac0ff64a91c8e44f36c09d6bc19c505faa6edf5
parentapp-admin/vault: Use egit_clean to clean workdir (diff)
downloadgentoo-c84c428b7d8795b6063f490739b76bab774668b7.tar.gz
gentoo-c84c428b7d8795b6063f490739b76bab774668b7.tar.bz2
gentoo-c84c428b7d8795b6063f490739b76bab774668b7.zip
app-vim/youcompleteme: Use egit_clean to clean workdir
* Add missing die Package-Manager: portage-2.2.27 Signed-off-by: Justin Lecher <jlec@gentoo.org>
-rw-r--r--app-vim/youcompleteme/youcompleteme-20130910.ebuild20
-rw-r--r--app-vim/youcompleteme/youcompleteme-99999999.ebuild14
2 files changed, 17 insertions, 17 deletions
diff --git a/app-vim/youcompleteme/youcompleteme-20130910.ebuild b/app-vim/youcompleteme/youcompleteme-20130910.ebuild
index cb098b8a707..4defa4ff37e 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 aef2bf09273..5a68855a987 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