1 |
commit: 428ddb674f51260ca29fe5ff29af2d1260a7ed59 |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Oct 9 02:58:30 2021 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Oct 9 02:58:50 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=428ddb67 |
7 |
|
8 |
app-editors/vim: fix automagic libsodium dependency |
9 |
|
10 |
Closes: https://bugs.gentoo.org/816966 |
11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
12 |
|
13 |
app-editors/vim/metadata.xml | 1 + |
14 |
app-editors/vim/{vim-8.2.3428.ebuild => vim-8.2.3428-r1.ebuild} | 4 +++- |
15 |
app-editors/vim/vim-9999.ebuild | 4 +++- |
16 |
3 files changed, 7 insertions(+), 2 deletions(-) |
17 |
|
18 |
diff --git a/app-editors/vim/metadata.xml b/app-editors/vim/metadata.xml |
19 |
index cd2ce2b6d09..4f3a37faf97 100644 |
20 |
--- a/app-editors/vim/metadata.xml |
21 |
+++ b/app-editors/vim/metadata.xml |
22 |
@@ -6,6 +6,7 @@ |
23 |
<name>Gentoo Vim Project</name> |
24 |
</maintainer> |
25 |
<use> |
26 |
+ <flag name="crypt">Use <pkg>dev-libs/libsodium</pkg> for crypto support</flag> |
27 |
<flag name="cscope">Enable cscope interface</flag> |
28 |
<flag name="ipv6">Enable IPv6 support in channel</flag> |
29 |
<flag name="racket">Enable support for Scheme using <pkg>dev-scheme/racket</pkg></flag> |
30 |
|
31 |
diff --git a/app-editors/vim/vim-8.2.3428.ebuild b/app-editors/vim/vim-8.2.3428-r1.ebuild |
32 |
similarity index 98% |
33 |
rename from app-editors/vim/vim-8.2.3428.ebuild |
34 |
rename to app-editors/vim/vim-8.2.3428-r1.ebuild |
35 |
index fd00866b78b..d15fa2f9dcc 100644 |
36 |
--- a/app-editors/vim/vim-8.2.3428.ebuild |
37 |
+++ b/app-editors/vim/vim-8.2.3428-r1.ebuild |
38 |
@@ -24,7 +24,7 @@ HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim" |
39 |
|
40 |
SLOT="0" |
41 |
LICENSE="vim" |
42 |
-IUSE="X acl cscope debug gpm lua minimal nls perl python racket ruby selinux sound tcl terminal vim-pager" |
43 |
+IUSE="X acl crypt cscope debug gpm lua minimal nls perl python racket ruby selinux sound tcl terminal vim-pager" |
44 |
REQUIRED_USE=" |
45 |
lua? ( ${LUA_REQUIRED_USE} ) |
46 |
python? ( ${PYTHON_REQUIRED_USE} ) |
47 |
@@ -36,6 +36,7 @@ RDEPEND=" |
48 |
>=sys-libs/ncurses-5.2-r2:0= |
49 |
nls? ( virtual/libintl ) |
50 |
acl? ( kernel_linux? ( sys-apps/acl ) ) |
51 |
+ crypt? ( dev-libs/libsodium:= ) |
52 |
cscope? ( dev-util/cscope ) |
53 |
gpm? ( >=sys-libs/gpm-1.19.3 ) |
54 |
lua? ( ${LUA_DEPS} |
55 |
@@ -200,6 +201,7 @@ src_configure() { |
56 |
--with-features=huge |
57 |
$(use_enable sound canberra) |
58 |
$(use_enable acl) |
59 |
+ $(use_enable crypt libsodium) |
60 |
$(use_enable cscope) |
61 |
$(use_enable gpm) |
62 |
$(use_enable nls) |
63 |
|
64 |
diff --git a/app-editors/vim/vim-9999.ebuild b/app-editors/vim/vim-9999.ebuild |
65 |
index fd00866b78b..d15fa2f9dcc 100644 |
66 |
--- a/app-editors/vim/vim-9999.ebuild |
67 |
+++ b/app-editors/vim/vim-9999.ebuild |
68 |
@@ -24,7 +24,7 @@ HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim" |
69 |
|
70 |
SLOT="0" |
71 |
LICENSE="vim" |
72 |
-IUSE="X acl cscope debug gpm lua minimal nls perl python racket ruby selinux sound tcl terminal vim-pager" |
73 |
+IUSE="X acl crypt cscope debug gpm lua minimal nls perl python racket ruby selinux sound tcl terminal vim-pager" |
74 |
REQUIRED_USE=" |
75 |
lua? ( ${LUA_REQUIRED_USE} ) |
76 |
python? ( ${PYTHON_REQUIRED_USE} ) |
77 |
@@ -36,6 +36,7 @@ RDEPEND=" |
78 |
>=sys-libs/ncurses-5.2-r2:0= |
79 |
nls? ( virtual/libintl ) |
80 |
acl? ( kernel_linux? ( sys-apps/acl ) ) |
81 |
+ crypt? ( dev-libs/libsodium:= ) |
82 |
cscope? ( dev-util/cscope ) |
83 |
gpm? ( >=sys-libs/gpm-1.19.3 ) |
84 |
lua? ( ${LUA_DEPS} |
85 |
@@ -200,6 +201,7 @@ src_configure() { |
86 |
--with-features=huge |
87 |
$(use_enable sound canberra) |
88 |
$(use_enable acl) |
89 |
+ $(use_enable crypt libsodium) |
90 |
$(use_enable cscope) |
91 |
$(use_enable gpm) |
92 |
$(use_enable nls) |