1 |
commit: f5c5a12eca23ebbbe9274d6b6e1988ad9cd7c45e |
2 |
Author: Tim Harder <radhermit <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Dec 28 22:17:41 2018 +0000 |
4 |
Commit: Tim Harder <radhermit <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Dec 28 22:24:09 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5c5a12e |
7 |
|
8 |
app-editors/gvim: use PDEPEND to allow upgrades past icon file collision |
9 |
|
10 |
Closes: https://bugs.gentoo.org/673880 |
11 |
|
12 |
Signed-off-by: Tim Harder <radhermit <AT> gentoo.org> |
13 |
|
14 |
app-editors/gvim/gvim-8.1.0648.ebuild | 3 ++- |
15 |
1 file changed, 2 insertions(+), 1 deletion(-) |
16 |
|
17 |
diff --git a/app-editors/gvim/gvim-8.1.0648.ebuild b/app-editors/gvim/gvim-8.1.0648.ebuild |
18 |
index f7f10ea790e..8f762952181 100644 |
19 |
--- a/app-editors/gvim/gvim-8.1.0648.ebuild |
20 |
+++ b/app-editors/gvim/gvim-8.1.0648.ebuild |
21 |
@@ -31,7 +31,6 @@ REQUIRED_USE=" |
22 |
" |
23 |
|
24 |
RDEPEND=" |
25 |
- ~app-editors/vim-core-${PV} |
26 |
>=app-eselect/eselect-vi-1.1 |
27 |
>=sys-libs/ncurses-5.2-r2:0= |
28 |
x11-libs/libICE |
29 |
@@ -78,6 +77,8 @@ DEPEND="${RDEPEND} |
30 |
virtual/pkgconfig |
31 |
nls? ( sys-devel/gettext ) |
32 |
" |
33 |
+# temporarily use PDEPEND to allow upgrades past icon file collision, bug #673880 |
34 |
+PDEPEND="~app-editors/vim-core-${PV}" |
35 |
|
36 |
S=${WORKDIR}/vim-${PV} |