| 1 |
commit: 84bac3d386ac2e3027b0ca66abbef42a61f1eb1b |
| 2 |
Author: Tim Harder <radhermit <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Aug 14 23:39:08 2019 +0000 |
| 4 |
Commit: Tim Harder <radhermit <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Aug 14 23:58:19 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84bac3d3 |
| 7 |
|
| 8 |
app-editors/gvim: version bump to 8.1.1846 |
| 9 |
|
| 10 |
Signed-off-by: Tim Harder <radhermit <AT> gentoo.org> |
| 11 |
|
| 12 |
app-editors/gvim/Manifest | 1 + |
| 13 |
app-editors/gvim/{gvim-9999.ebuild => gvim-8.1.1846.ebuild} | 7 +++++-- |
| 14 |
app-editors/gvim/gvim-9999.ebuild | 4 +++- |
| 15 |
3 files changed, 9 insertions(+), 3 deletions(-) |
| 16 |
|
| 17 |
diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest |
| 18 |
index 6ba358e2d5b..88f7734b453 100644 |
| 19 |
--- a/app-editors/gvim/Manifest |
| 20 |
+++ b/app-editors/gvim/Manifest |
| 21 |
@@ -1,2 +1,3 @@ |
| 22 |
DIST vim-8.0.0938-gentoo-patches.tar.bz2 2316 BLAKE2B 05a87f32fc5cc65e7f5e4e5a87c654b2040ad39f1555ddde7e0e6f473dc8b520916a795406bb6bbeaf5e7ae8748aacebe7a9679461e48802e69417e945eea827 SHA512 a6062be5e6a5c5b437081312df5742353242b5171bf26da04aa6ca216d2b142b2411a88bc1edd460d28e00a59a210c8e1729e801fac6f1efd86bb2e437a56a2b |
| 23 |
DIST vim-8.1.1486.tar.gz 14318109 BLAKE2B 6054df175a32e9ed36873802a4a669cc46e034bac879cb829e45ece53f9440e97cccad47e370ebdef8dc1bb963e8e8c84bd517a3a6561705786dcab7e2368d21 SHA512 0a521d74c60f2a32e8a11e16f256e2e99fb9c00f478cd8d7a9328315abbd445796153f03884ab2b240905260317809a33afb64627b9a71ac8d6db1cbd4026d20 |
| 24 |
+DIST vim-8.1.1846.tar.gz 14415116 BLAKE2B 59c2864519e100f9bc2617dd7b31a8cc17ff20fc87a761eba653e91a70688c3b4a5f05c527acaf6d075830d23c7ef8842595b6558eac2ab5209029153f1adb10 SHA512 d5a5cb7733f3190915e2b1389fea48d119afef27eac6f04ac3967f57e894cab811727a694c6837bb5acef9997cd56018d4b37efeb413c654012aaaea02bf7c7a |
| 25 |
|
| 26 |
diff --git a/app-editors/gvim/gvim-9999.ebuild b/app-editors/gvim/gvim-8.1.1846.ebuild |
| 27 |
similarity index 97% |
| 28 |
copy from app-editors/gvim/gvim-9999.ebuild |
| 29 |
copy to app-editors/gvim/gvim-8.1.1846.ebuild |
| 30 |
index 00fd53abf5c..66d226abb28 100644 |
| 31 |
--- a/app-editors/gvim/gvim-9999.ebuild |
| 32 |
+++ b/app-editors/gvim/gvim-8.1.1846.ebuild |
| 33 |
@@ -24,13 +24,12 @@ HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim" |
| 34 |
|
| 35 |
SLOT="0" |
| 36 |
LICENSE="vim" |
| 37 |
-IUSE="acl aqua cscope debug gtk gtk2 lua luajit motif neXt netbeans nls perl python racket ruby selinux session tcl" |
| 38 |
+IUSE="acl aqua cscope debug gtk gtk2 lua luajit motif neXt netbeans nls perl python racket ruby selinux session sound tcl" |
| 39 |
REQUIRED_USE=" |
| 40 |
python? ( ${PYTHON_REQUIRED_USE} ) |
| 41 |
" |
| 42 |
|
| 43 |
RDEPEND=" |
| 44 |
- ~app-editors/vim-core-${PV} |
| 45 |
>=app-eselect/eselect-vi-1.1 |
| 46 |
>=sys-libs/ncurses-5.2-r2:0= |
| 47 |
x11-libs/libICE |
| 48 |
@@ -69,6 +68,7 @@ RDEPEND=" |
| 49 |
ruby? ( ${RUBY_DEPS} ) |
| 50 |
selinux? ( sys-libs/libselinux ) |
| 51 |
session? ( x11-libs/libSM ) |
| 52 |
+ sound? ( media-libs/libcanberra ) |
| 53 |
tcl? ( dev-lang/tcl:0= ) |
| 54 |
" |
| 55 |
DEPEND="${RDEPEND} |
| 56 |
@@ -76,6 +76,8 @@ DEPEND="${RDEPEND} |
| 57 |
virtual/pkgconfig |
| 58 |
nls? ( sys-devel/gettext ) |
| 59 |
" |
| 60 |
+# temporarily use PDEPEND to allow upgrades past icon file collision, bug #673880 |
| 61 |
+PDEPEND="~app-editors/vim-core-${PV}" |
| 62 |
|
| 63 |
# various failures (bugs #630042 and #682320) |
| 64 |
RESTRICT="test" |
| 65 |
@@ -190,6 +192,7 @@ src_configure() { |
| 66 |
--with-features=huge |
| 67 |
--disable-gpm |
| 68 |
--with-gnome=no |
| 69 |
+ $(use_enable sound canberra) |
| 70 |
$(use_enable acl) |
| 71 |
$(use_enable cscope) |
| 72 |
$(use_enable lua luainterp) |
| 73 |
|
| 74 |
diff --git a/app-editors/gvim/gvim-9999.ebuild b/app-editors/gvim/gvim-9999.ebuild |
| 75 |
index 00fd53abf5c..0f2395ff5c4 100644 |
| 76 |
--- a/app-editors/gvim/gvim-9999.ebuild |
| 77 |
+++ b/app-editors/gvim/gvim-9999.ebuild |
| 78 |
@@ -24,7 +24,7 @@ HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim" |
| 79 |
|
| 80 |
SLOT="0" |
| 81 |
LICENSE="vim" |
| 82 |
-IUSE="acl aqua cscope debug gtk gtk2 lua luajit motif neXt netbeans nls perl python racket ruby selinux session tcl" |
| 83 |
+IUSE="acl aqua cscope debug gtk gtk2 lua luajit motif neXt netbeans nls perl python racket ruby selinux session sound tcl" |
| 84 |
REQUIRED_USE=" |
| 85 |
python? ( ${PYTHON_REQUIRED_USE} ) |
| 86 |
" |
| 87 |
@@ -69,6 +69,7 @@ RDEPEND=" |
| 88 |
ruby? ( ${RUBY_DEPS} ) |
| 89 |
selinux? ( sys-libs/libselinux ) |
| 90 |
session? ( x11-libs/libSM ) |
| 91 |
+ sound? ( media-libs/libcanberra ) |
| 92 |
tcl? ( dev-lang/tcl:0= ) |
| 93 |
" |
| 94 |
DEPEND="${RDEPEND} |
| 95 |
@@ -190,6 +191,7 @@ src_configure() { |
| 96 |
--with-features=huge |
| 97 |
--disable-gpm |
| 98 |
--with-gnome=no |
| 99 |
+ $(use_enable sound canberra) |
| 100 |
$(use_enable acl) |
| 101 |
$(use_enable cscope) |
| 102 |
$(use_enable lua luainterp) |
Archives