[gentoo-commits] repo/gentoo:master commit in: app-editors/gvim/

[Tim Harder]

commit:     84bac3d386ac2e3027b0ca66abbef42a61f1eb1b
Author:     Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 14 23:39:08 2019 +0000
Commit:     Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Wed Aug 14 23:58:19 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84bac3d3

app-editors/gvim: version bump to 8.1.1846

Signed-off-by: Tim Harder <radhermit <AT> gentoo.org>

 app-editors/gvim/Manifest                                   | 1 +
 app-editors/gvim/{gvim-9999.ebuild => gvim-8.1.1846.ebuild} | 7 +++++--
 app-editors/gvim/gvim-9999.ebuild                           | 4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest
index 6ba358e2d5b..88f7734b453 100644
--- a/app-editors/gvim/Manifest
+++ b/app-editors/gvim/Manifest
@@ -1,2 +1,3 @@
 DIST vim-8.0.0938-gentoo-patches.tar.bz2 2316 BLAKE2B 
05a87f32fc5cc65e7f5e4e5a87c654b2040ad39f1555ddde7e0e6f473dc8b520916a795406bb6bbeaf5e7ae8748aacebe7a9679461e48802e69417e945eea827
 SHA512 
a6062be5e6a5c5b437081312df5742353242b5171bf26da04aa6ca216d2b142b2411a88bc1edd460d28e00a59a210c8e1729e801fac6f1efd86bb2e437a56a2b
 DIST vim-8.1.1486.tar.gz 14318109 BLAKE2B 
6054df175a32e9ed36873802a4a669cc46e034bac879cb829e45ece53f9440e97cccad47e370ebdef8dc1bb963e8e8c84bd517a3a6561705786dcab7e2368d21
 SHA512 
0a521d74c60f2a32e8a11e16f256e2e99fb9c00f478cd8d7a9328315abbd445796153f03884ab2b240905260317809a33afb64627b9a71ac8d6db1cbd4026d20
+DIST vim-8.1.1846.tar.gz 14415116 BLAKE2B 
59c2864519e100f9bc2617dd7b31a8cc17ff20fc87a761eba653e91a70688c3b4a5f05c527acaf6d075830d23c7ef8842595b6558eac2ab5209029153f1adb10
 SHA512 
d5a5cb7733f3190915e2b1389fea48d119afef27eac6f04ac3967f57e894cab811727a694c6837bb5acef9997cd56018d4b37efeb413c654012aaaea02bf7c7a

diff --git a/app-editors/gvim/gvim-9999.ebuild 
b/app-editors/gvim/gvim-8.1.1846.ebuild
similarity index 97%
copy from app-editors/gvim/gvim-9999.ebuild
copy to app-editors/gvim/gvim-8.1.1846.ebuild
index 00fd53abf5c..66d226abb28 100644
--- a/app-editors/gvim/gvim-9999.ebuild
+++ b/app-editors/gvim/gvim-8.1.1846.ebuild
@@ -24,13 +24,12 @@ HOMEPAGE="https://vim.sourceforge.io/ 
https://github.com/vim/vim";
 
 SLOT="0"
 LICENSE="vim"
-IUSE="acl aqua cscope debug gtk gtk2 lua luajit motif neXt netbeans nls perl 
python racket ruby selinux session tcl"
+IUSE="acl aqua cscope debug gtk gtk2 lua luajit motif neXt netbeans nls perl 
python racket ruby selinux session sound tcl"
 REQUIRED_USE="
        python? ( ${PYTHON_REQUIRED_USE} )
 "
 
 RDEPEND="
-       ~app-editors/vim-core-${PV}
        >=app-eselect/eselect-vi-1.1
        >=sys-libs/ncurses-5.2-r2:0=
        x11-libs/libICE
@@ -69,6 +68,7 @@ RDEPEND="
        ruby? ( ${RUBY_DEPS} )
        selinux? ( sys-libs/libselinux )
        session? ( x11-libs/libSM )
+       sound? ( media-libs/libcanberra )
        tcl? ( dev-lang/tcl:0= )
 "
 DEPEND="${RDEPEND}
@@ -76,6 +76,8 @@ DEPEND="${RDEPEND}
        virtual/pkgconfig
        nls? ( sys-devel/gettext )
 "
+# temporarily use PDEPEND to allow upgrades past icon file collision, bug 
#673880
+PDEPEND="~app-editors/vim-core-${PV}"
 
 # various failures (bugs #630042 and #682320)
 RESTRICT="test"
@@ -190,6 +192,7 @@ src_configure() {
                --with-features=huge
                --disable-gpm
                --with-gnome=no
+               $(use_enable sound canberra)
                $(use_enable acl)
                $(use_enable cscope)
                $(use_enable lua luainterp)

diff --git a/app-editors/gvim/gvim-9999.ebuild 
b/app-editors/gvim/gvim-9999.ebuild
index 00fd53abf5c..0f2395ff5c4 100644
--- a/app-editors/gvim/gvim-9999.ebuild
+++ b/app-editors/gvim/gvim-9999.ebuild
@@ -24,7 +24,7 @@ HOMEPAGE="https://vim.sourceforge.io/ 
https://github.com/vim/vim";
 
 SLOT="0"
 LICENSE="vim"
-IUSE="acl aqua cscope debug gtk gtk2 lua luajit motif neXt netbeans nls perl 
python racket ruby selinux session tcl"
+IUSE="acl aqua cscope debug gtk gtk2 lua luajit motif neXt netbeans nls perl 
python racket ruby selinux session sound tcl"
 REQUIRED_USE="
        python? ( ${PYTHON_REQUIRED_USE} )
 "
@@ -69,6 +69,7 @@ RDEPEND="
        ruby? ( ${RUBY_DEPS} )
        selinux? ( sys-libs/libselinux )
        session? ( x11-libs/libSM )
+       sound? ( media-libs/libcanberra )
        tcl? ( dev-lang/tcl:0= )
 "
 DEPEND="${RDEPEND}
@@ -190,6 +191,7 @@ src_configure() {
                --with-features=huge
                --disable-gpm
                --with-gnome=no
+               $(use_enable sound canberra)
                $(use_enable acl)
                $(use_enable cscope)
                $(use_enable lua luainterp)