| 1 |
commit: bebd23328169e114c2c4c650de47a1f361ed6d6d |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Oct 9 03:49:57 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Oct 9 03:57:07 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bebd2332 |
| 7 |
|
| 8 |
app-editors/gvim: fix automagic libsodium dependency |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/816966 |
| 11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 12 |
|
| 13 |
app-editors/gvim/{gvim-8.2.3428.ebuild => gvim-8.2.3428-r1.ebuild} | 4 +++- |
| 14 |
app-editors/gvim/gvim-9999.ebuild | 6 ++++-- |
| 15 |
app-editors/gvim/metadata.xml | 1 + |
| 16 |
3 files changed, 8 insertions(+), 3 deletions(-) |
| 17 |
|
| 18 |
diff --git a/app-editors/gvim/gvim-8.2.3428.ebuild b/app-editors/gvim/gvim-8.2.3428-r1.ebuild |
| 19 |
similarity index 98% |
| 20 |
rename from app-editors/gvim/gvim-8.2.3428.ebuild |
| 21 |
rename to app-editors/gvim/gvim-8.2.3428-r1.ebuild |
| 22 |
index eac0fc37724..0a202597784 100644 |
| 23 |
--- a/app-editors/gvim/gvim-8.2.3428.ebuild |
| 24 |
+++ b/app-editors/gvim/gvim-8.2.3428-r1.ebuild |
| 25 |
@@ -25,7 +25,7 @@ HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim" |
| 26 |
|
| 27 |
SLOT="0" |
| 28 |
LICENSE="vim" |
| 29 |
-IUSE="acl aqua cscope debug gtk gtk2 lua motif neXt netbeans nls perl python racket ruby selinux session sound tcl" |
| 30 |
+IUSE="acl aqua crypt cscope debug gtk gtk2 lua motif neXt netbeans nls perl python racket ruby selinux session sound tcl" |
| 31 |
REQUIRED_USE=" |
| 32 |
lua? ( ${LUA_REQUIRED_USE} ) |
| 33 |
python? ( ${PYTHON_REQUIRED_USE} ) |
| 34 |
@@ -59,6 +59,7 @@ RDEPEND=" |
| 35 |
) |
| 36 |
) |
| 37 |
) |
| 38 |
+ crypt? ( dev-libs/libsodium:= ) |
| 39 |
cscope? ( dev-util/cscope ) |
| 40 |
lua? ( |
| 41 |
${LUA_DEPS} |
| 42 |
@@ -198,6 +199,7 @@ src_configure() { |
| 43 |
--with-gnome=no |
| 44 |
$(use_enable sound canberra) |
| 45 |
$(use_enable acl) |
| 46 |
+ $(use_enable crypt libsodium) |
| 47 |
$(use_enable cscope) |
| 48 |
$(use_enable netbeans) |
| 49 |
$(use_enable nls) |
| 50 |
|
| 51 |
diff --git a/app-editors/gvim/gvim-9999.ebuild b/app-editors/gvim/gvim-9999.ebuild |
| 52 |
index ecd0b5e0dd0..0a202597784 100644 |
| 53 |
--- a/app-editors/gvim/gvim-9999.ebuild |
| 54 |
+++ b/app-editors/gvim/gvim-9999.ebuild |
| 55 |
@@ -17,7 +17,7 @@ if [[ ${PV} == 9999* ]]; then |
| 56 |
else |
| 57 |
SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz |
| 58 |
https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz" |
| 59 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris" |
| 60 |
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris" |
| 61 |
fi |
| 62 |
|
| 63 |
DESCRIPTION="GUI version of the Vim text editor" |
| 64 |
@@ -25,7 +25,7 @@ HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim" |
| 65 |
|
| 66 |
SLOT="0" |
| 67 |
LICENSE="vim" |
| 68 |
-IUSE="acl aqua cscope debug gtk gtk2 lua motif neXt netbeans nls perl python racket ruby selinux session sound tcl" |
| 69 |
+IUSE="acl aqua crypt cscope debug gtk gtk2 lua motif neXt netbeans nls perl python racket ruby selinux session sound tcl" |
| 70 |
REQUIRED_USE=" |
| 71 |
lua? ( ${LUA_REQUIRED_USE} ) |
| 72 |
python? ( ${PYTHON_REQUIRED_USE} ) |
| 73 |
@@ -59,6 +59,7 @@ RDEPEND=" |
| 74 |
) |
| 75 |
) |
| 76 |
) |
| 77 |
+ crypt? ( dev-libs/libsodium:= ) |
| 78 |
cscope? ( dev-util/cscope ) |
| 79 |
lua? ( |
| 80 |
${LUA_DEPS} |
| 81 |
@@ -198,6 +199,7 @@ src_configure() { |
| 82 |
--with-gnome=no |
| 83 |
$(use_enable sound canberra) |
| 84 |
$(use_enable acl) |
| 85 |
+ $(use_enable crypt libsodium) |
| 86 |
$(use_enable cscope) |
| 87 |
$(use_enable netbeans) |
| 88 |
$(use_enable nls) |
| 89 |
|
| 90 |
diff --git a/app-editors/gvim/metadata.xml b/app-editors/gvim/metadata.xml |
| 91 |
index eb9f0418416..81f9a4724bf 100644 |
| 92 |
--- a/app-editors/gvim/metadata.xml |
| 93 |
+++ b/app-editors/gvim/metadata.xml |
| 94 |
@@ -6,6 +6,7 @@ |
| 95 |
<name>Gentoo Vim Project</name> |
| 96 |
</maintainer> |
| 97 |
<use> |
| 98 |
+ <flag name="crypt">Use <pkg>dev-libs/libsodium</pkg> for crypto support</flag> |
| 99 |
<flag name="cscope">Enable cscope interface</flag> |
| 100 |
<flag name="gtk2">Enable GTK+2 interface</flag> |
| 101 |
<flag name="netbeans">Include netbeans external editor integration support</flag> |
Archives