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

[Tim Harder]

commit:     4479e366a1cb19fb779342a931ed9eee7374339d
Author:     Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 12 05:28:39 2018 +0000
Commit:     Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Thu Apr 12 05:45:28 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4479e366

app-editors/vim: version bump to 8.0.1699

Move to using ruby-single eclass for ruby deps.

 app-editors/vim/Manifest                                 | 1 +
 app-editors/vim/{vim-9999.ebuild => vim-8.0.1699.ebuild} | 8 +++++---
 app-editors/vim/vim-9999.ebuild                          | 8 +++++---
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/app-editors/vim/Manifest b/app-editors/vim/Manifest
index e389e37e215..1625bab72a6 100644
--- a/app-editors/vim/Manifest
+++ b/app-editors/vim/Manifest
@@ -2,3 +2,4 @@ DIST vim-8.0.0938-gentoo-patches.tar.bz2 2316 BLAKE2B 
05a87f32fc5cc65e7f5e4e5a87
 DIST vim-8.0.1298.tar.gz 13395459 BLAKE2B 
4b6e3c4443cd675dc3727e8609b89c422f66c7d32908b5136ee312d48427568a8236214c85135242269b6575e0e1336b0973395a6372664435f8bae4d7bee843
 SHA512 
7704c493359c1a922f876e4d6f3b4ad265d8ce974a59d51a39e5a4424251105250ffc803bcf6c6750daeb5e6376cbbfd24557b075eacf2b0274d7c432db2f681
 DIST vim-8.0.1428.tar.gz 13415243 BLAKE2B 
88f86c371d0a644212b9e4dc1a15d61244847037f36262a225c361bfc2799b741c128de21ac92bb3fb4a4955894e46d34dc01baa7cbf58f1371d772b36887103
 SHA512 
f635c53c7e2ca808dc1cb424e6e4b16d8c41c66a86c3c7584444dab3d2482904795fea7c071d65862ae6ac6b2b66b7ad5ac832e1e30f4624d46f220c6f41e2e9
 DIST vim-8.0.1645.tar.gz 13535252 BLAKE2B 
a5c7463e85eed12825bdf46d15eb7e7513d62831eba76cbb90af875010b33662b7a6ef2c4c5cecddface415d75e97caf0a670e69835ecd3b4a89704f3b18b905
 SHA512 
367b9e205e776f84fcfbb92725afd5e7aa66898110d46dbea1a33f7b74c239559e829b5104c45360539c8f2b23c375ed59ccea7ee35a5dd10770400d9a7be085
+DIST vim-8.0.1699.tar.gz 13546105 BLAKE2B 
cabf29d5a89c55e2fe3bc5e39eb499412f5907ddf856f8644b466f1e0fbffefff3cd801b6bc5e49e62ffdf8805b0556058b9a913015a9f9fbe1a4f580132fd49
 SHA512 
b0fe8e1dc05fdc3758896caf4746da40988ca7604d77dbe78c47525cbf8f0d7e6c05f690687268eda581009050d4e02e93fb4d30734cbbab4cfd6a8a1488c1e7

diff --git a/app-editors/vim/vim-9999.ebuild 
b/app-editors/vim/vim-8.0.1699.ebuild
similarity index 98%
copy from app-editors/vim/vim-9999.ebuild
copy to app-editors/vim/vim-8.0.1699.ebuild
index 01f04731da4..1fdeedc42c8 100644
--- a/app-editors/vim/vim-9999.ebuild
+++ b/app-editors/vim/vim-8.0.1699.ebuild
@@ -4,8 +4,10 @@
 EAPI=6
 VIM_VERSION="8.0"
 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-PYTHON_REQ_USE=threads
-inherit vim-doc flag-o-matic versionator bash-completion-r1 python-single-r1
+PYTHON_REQ_USE="threads"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
+
+inherit vim-doc flag-o-matic versionator bash-completion-r1 python-single-r1 
ruby-single
 
 if [[ ${PV} == 9999* ]] ; then
        inherit git-r3
@@ -45,7 +47,7 @@ RDEPEND="
        perl? ( dev-lang/perl:= )
        python? ( ${PYTHON_DEPS} )
        racket? ( dev-scheme/racket )
-       ruby? ( || ( dev-lang/ruby:2.5 dev-lang/ruby:2.4 dev-lang/ruby:2.3 
dev-lang/ruby:2.2 ) )
+       ruby? ( ${RUBY_DEPS} )
        selinux? ( sys-libs/libselinux )
        tcl? ( dev-lang/tcl:0= )
        X? ( x11-libs/libXt )

diff --git a/app-editors/vim/vim-9999.ebuild b/app-editors/vim/vim-9999.ebuild
index 01f04731da4..1fdeedc42c8 100644
--- a/app-editors/vim/vim-9999.ebuild
+++ b/app-editors/vim/vim-9999.ebuild
@@ -4,8 +4,10 @@
 EAPI=6
 VIM_VERSION="8.0"
 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-PYTHON_REQ_USE=threads
-inherit vim-doc flag-o-matic versionator bash-completion-r1 python-single-r1
+PYTHON_REQ_USE="threads"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
+
+inherit vim-doc flag-o-matic versionator bash-completion-r1 python-single-r1 
ruby-single
 
 if [[ ${PV} == 9999* ]] ; then
        inherit git-r3
@@ -45,7 +47,7 @@ RDEPEND="
        perl? ( dev-lang/perl:= )
        python? ( ${PYTHON_DEPS} )
        racket? ( dev-scheme/racket )
-       ruby? ( || ( dev-lang/ruby:2.5 dev-lang/ruby:2.4 dev-lang/ruby:2.3 
dev-lang/ruby:2.2 ) )
+       ruby? ( ${RUBY_DEPS} )
        selinux? ( sys-libs/libselinux )
        tcl? ( dev-lang/tcl:0= )
        X? ( x11-libs/libXt )