From 09a298bbe23d049e3907f0bade3926841c3307fc Mon Sep 17 00:00:00 2001 From: Nils Freydank Date: Sat, 2 Mar 2019 11:34:33 +0100 Subject: [PATCH] app-vim/riv: Block app-vim/jedi due to an unresolved file colllision Package-Manager: Portage-2.3.62, Repoman-2.3.12 Manifest-Sign-Key: 00EFD31F1B60D5DBADB831C1C0ECE6960E54475B Signed-off-by: Nils Freydank --- ...v-0.792_p20181017.ebuild => riv-0.792_p20181017-r1.ebuild} | 4 +++- app-vim/riv/riv-9999.ebuild | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) rename app-vim/riv/{riv-0.792_p20181017.ebuild => riv-0.792_p20181017-r1.ebuild} (79%) diff --git a/app-vim/riv/riv-0.792_p20181017.ebuild b/app-vim/riv/riv-0.792_p20181017-r1.ebuild similarity index 79% rename from app-vim/riv/riv-0.792_p20181017.ebuild rename to app-vim/riv/riv-0.792_p20181017-r1.ebuild index 92e9b3e..20c29cd 100644 --- a/app-vim/riv/riv-0.792_p20181017.ebuild +++ b/app-vim/riv/riv-0.792_p20181017-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -19,3 +19,5 @@ else fi LICENSE="MIT" +# FIXME: /usr/share/vim/vimfiles/after/syntax/python.vim file collision +DEPEND="!!dev-python/jedi" diff --git a/app-vim/riv/riv-9999.ebuild b/app-vim/riv/riv-9999.ebuild index 92e9b3e..20c29cd 100644 --- a/app-vim/riv/riv-9999.ebuild +++ b/app-vim/riv/riv-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -19,3 +19,5 @@ else fi LICENSE="MIT" +# FIXME: /usr/share/vim/vimfiles/after/syntax/python.vim file collision +DEPEND="!!dev-python/jedi"