Gentoo Archives: gentoo-commits

From: Patrice Clement <monsieurp@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-editors/vim/
Date: Tue, 09 Apr 2019 12:06:24
Message-Id: 1554811557.dc2922087a4a0d6693caf57201179fb183a593de.monsieurp@gentoo
1 commit: dc2922087a4a0d6693caf57201179fb183a593de
2 Author: Dan Robertson <daniel.robertson <AT> starlab <DOT> io>
3 AuthorDate: Fri Apr 5 16:12:45 2019 +0000
4 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
5 CommitDate: Tue Apr 9 12:05:57 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc292208
7
8 app-editors/vim: vim-pager needs -minimal.
9
10 The vimpager command will not work with app-editors/vim-core[minimal] or
11 app-editors/vim[minimal]. Do not allow the vim-pager USE flag to be
12 enabled if either is enabled.
13
14 Signed-off-by: Dan Robertson <daniel.robertson <AT> starlab.io>
15 Closes: https://github.com/gentoo/gentoo/pull/11601
16 Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
17
18 app-editors/vim/vim-8.1.0648-r1.ebuild | 2 ++
19 app-editors/vim/vim-9999.ebuild | 2 ++
20 2 files changed, 4 insertions(+)
21
22 diff --git a/app-editors/vim/vim-8.1.0648-r1.ebuild b/app-editors/vim/vim-8.1.0648-r1.ebuild
23 index 3d5b9ee9dbd..8ce3e2d1c2e 100644
24 --- a/app-editors/vim/vim-8.1.0648-r1.ebuild
25 +++ b/app-editors/vim/vim-8.1.0648-r1.ebuild
26 @@ -27,6 +27,7 @@ IUSE="X acl cscope debug gpm lua luajit minimal nls perl python racket ruby seli
27 REQUIRED_USE="
28 luajit? ( lua )
29 python? ( ${PYTHON_REQUIRED_USE} )
30 + vim-pager? ( !minimal )
31 "
32
33 RDEPEND="
34 @@ -57,6 +58,7 @@ DEPEND="
35 ${RDEPEND}
36 sys-devel/autoconf
37 nls? ( sys-devel/gettext )
38 + vim-pager? ( app-editors/vim-core[-minimal] )
39 "
40
41 pkg_setup() {
42
43 diff --git a/app-editors/vim/vim-9999.ebuild b/app-editors/vim/vim-9999.ebuild
44 index 7f5fd67a23e..08ce8d409f4 100644
45 --- a/app-editors/vim/vim-9999.ebuild
46 +++ b/app-editors/vim/vim-9999.ebuild
47 @@ -51,12 +51,14 @@ RDEPEND="
48 selinux? ( sys-libs/libselinux )
49 tcl? ( dev-lang/tcl:0= )
50 X? ( x11-libs/libXt )
51 + vim-pager? ( !minimal )
52 "
53
54 DEPEND="
55 ${RDEPEND}
56 sys-devel/autoconf
57 nls? ( sys-devel/gettext )
58 + vim-pager? ( app-editors/vim-core[-minimal] )
59 "
60
61 pkg_setup() {