commit: 402558f75d5bc0b68ebbbcbb4ba6787ddd56cd24 Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org> AuthorDate: Mon Mar 25 21:48:03 2019 +0000 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> CommitDate: Mon Mar 25 21:48:35 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=402558f7
app-editors/gvim: apply #669306 fix to gvim ebuilds. Bug: https://bugs.gentoo.org/669306 Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 app-editors/gvim/{gvim-9999.ebuild => gvim-8.1.0648-r1.ebuild} | 7 +++++-- app-editors/gvim/gvim-9999.ebuild | 4 +++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/app-editors/gvim/gvim-9999.ebuild b/app-editors/gvim/gvim-8.1.0648-r1.ebuild similarity index 97% copy from app-editors/gvim/gvim-9999.ebuild copy to app-editors/gvim/gvim-8.1.0648-r1.ebuild index f7f10ea790e..d72e8f30be7 100644 --- a/app-editors/gvim/gvim-9999.ebuild +++ b/app-editors/gvim/gvim-8.1.0648-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=6 @@ -31,7 +31,6 @@ REQUIRED_USE=" " RDEPEND=" - ~app-editors/vim-core-${PV} >=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= x11-libs/libICE @@ -78,6 +77,8 @@ DEPEND="${RDEPEND} virtual/pkgconfig nls? ( sys-devel/gettext ) " +# temporarily use PDEPEND to allow upgrades past icon file collision, bug #673880 +PDEPEND="~app-editors/vim-core-${PV}" S=${WORKDIR}/vim-${PV} @@ -198,6 +199,8 @@ src_configure() { $(use_enable perl perlinterp) $(use_enable python pythoninterp) $(use_enable python python3interp) + $(use_with python python-command $(type -P $(eselect python show --python2))) + $(use_with python python3-command $(type -P $(eselect python show --python3))) $(use_enable racket mzschemeinterp) $(use_enable ruby rubyinterp) $(use_enable selinux) diff --git a/app-editors/gvim/gvim-9999.ebuild b/app-editors/gvim/gvim-9999.ebuild index f7f10ea790e..59218d3f5dc 100644 --- a/app-editors/gvim/gvim-9999.ebuild +++ b/app-editors/gvim/gvim-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=6 @@ -198,6 +198,8 @@ src_configure() { $(use_enable perl perlinterp) $(use_enable python pythoninterp) $(use_enable python python3interp) + $(use_with python python-command $(type -P $(eselect python show --python2))) + $(use_with python python3-command $(type -P $(eselect python show --python3))) $(use_enable racket mzschemeinterp) $(use_enable ruby rubyinterp) $(use_enable selinux)
