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>

diff --git a/app-vim/youcompleteme/youcompleteme-20130910.ebuild b/app-vim/youcompleteme/youcompleteme-20130910.ebuild
index cb098b8a7075cb773e7b8c33785af561cafbceb5..4defa4ff37ee63be3470df29e44dabdbd743c23c 100644 (file)
--- 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 aef2bf09273677363330e605ff7e9e048de2ca9d..5a68855a98781a91c252c0cb20d9ebf0cd698b53 100644 (file)
--- 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