| 1 |
commit: 402558f75d5bc0b68ebbbcbb4ba6787ddd56cd24 |
| 2 |
Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Mar 25 21:48:03 2019 +0000 |
| 4 |
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Mar 25 21:48:35 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=402558f7 |
| 7 |
|
| 8 |
app-editors/gvim: apply #669306 fix to gvim ebuilds. |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/669306 |
| 11 |
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org> |
| 12 |
Package-Manager: Portage-2.3.51, Repoman-2.3.11 |
| 13 |
|
| 14 |
app-editors/gvim/{gvim-9999.ebuild => gvim-8.1.0648-r1.ebuild} | 7 +++++-- |
| 15 |
app-editors/gvim/gvim-9999.ebuild | 4 +++- |
| 16 |
2 files changed, 8 insertions(+), 3 deletions(-) |
| 17 |
|
| 18 |
diff --git a/app-editors/gvim/gvim-9999.ebuild b/app-editors/gvim/gvim-8.1.0648-r1.ebuild |
| 19 |
similarity index 97% |
| 20 |
copy from app-editors/gvim/gvim-9999.ebuild |
| 21 |
copy to app-editors/gvim/gvim-8.1.0648-r1.ebuild |
| 22 |
index f7f10ea790e..d72e8f30be7 100644 |
| 23 |
--- a/app-editors/gvim/gvim-9999.ebuild |
| 24 |
+++ b/app-editors/gvim/gvim-8.1.0648-r1.ebuild |
| 25 |
@@ -1,4 +1,4 @@ |
| 26 |
-# Copyright 1999-2018 Gentoo Authors |
| 27 |
+# Copyright 1999-2019 Gentoo Authors |
| 28 |
# Distributed under the terms of the GNU General Public License v2 |
| 29 |
|
| 30 |
EAPI=6 |
| 31 |
@@ -31,7 +31,6 @@ REQUIRED_USE=" |
| 32 |
" |
| 33 |
|
| 34 |
RDEPEND=" |
| 35 |
- ~app-editors/vim-core-${PV} |
| 36 |
>=app-eselect/eselect-vi-1.1 |
| 37 |
>=sys-libs/ncurses-5.2-r2:0= |
| 38 |
x11-libs/libICE |
| 39 |
@@ -78,6 +77,8 @@ DEPEND="${RDEPEND} |
| 40 |
virtual/pkgconfig |
| 41 |
nls? ( sys-devel/gettext ) |
| 42 |
" |
| 43 |
+# temporarily use PDEPEND to allow upgrades past icon file collision, bug #673880 |
| 44 |
+PDEPEND="~app-editors/vim-core-${PV}" |
| 45 |
|
| 46 |
S=${WORKDIR}/vim-${PV} |
| 47 |
|
| 48 |
@@ -198,6 +199,8 @@ src_configure() { |
| 49 |
$(use_enable perl perlinterp) |
| 50 |
$(use_enable python pythoninterp) |
| 51 |
$(use_enable python python3interp) |
| 52 |
+ $(use_with python python-command $(type -P $(eselect python show --python2))) |
| 53 |
+ $(use_with python python3-command $(type -P $(eselect python show --python3))) |
| 54 |
$(use_enable racket mzschemeinterp) |
| 55 |
$(use_enable ruby rubyinterp) |
| 56 |
$(use_enable selinux) |
| 57 |
|
| 58 |
diff --git a/app-editors/gvim/gvim-9999.ebuild b/app-editors/gvim/gvim-9999.ebuild |
| 59 |
index f7f10ea790e..59218d3f5dc 100644 |
| 60 |
--- a/app-editors/gvim/gvim-9999.ebuild |
| 61 |
+++ b/app-editors/gvim/gvim-9999.ebuild |
| 62 |
@@ -1,4 +1,4 @@ |
| 63 |
-# Copyright 1999-2018 Gentoo Authors |
| 64 |
+# Copyright 1999-2019 Gentoo Authors |
| 65 |
# Distributed under the terms of the GNU General Public License v2 |
| 66 |
|
| 67 |
EAPI=6 |
| 68 |
@@ -198,6 +198,8 @@ src_configure() { |
| 69 |
$(use_enable perl perlinterp) |
| 70 |
$(use_enable python pythoninterp) |
| 71 |
$(use_enable python python3interp) |
| 72 |
+ $(use_with python python-command $(type -P $(eselect python show --python2))) |
| 73 |
+ $(use_with python python3-command $(type -P $(eselect python show --python3))) |
| 74 |
$(use_enable racket mzschemeinterp) |
| 75 |
$(use_enable ruby rubyinterp) |
| 76 |
$(use_enable selinux) |
Archives