gentoo resync : 23.06.2018

3 files changed, 65 insertions, 4 deletions

diff --git a/app-vim/easytags/Manifest b/app-vim/easytags/Manifest
index ac0501a50a63..b31c1c84faf9 100644
--- a/app-vim/easytags/Manifest
+++ b/app-vim/easytags/Manifest
@@ -1,3 +1,4 @@
+AUX easytags-3.11-fix-ctags-detection.patch 2964 BLAKE2B eafaddd9877d8732eeace0197ab29cedba38a89a1f7c4e1fb2192cb075bc7a4541e6a5e5448a8944a7f6a0b47fb1cd481035529d6b11d5508df35089f2e85865 SHA512 f3ef6cfce5cbbebc4d33fc5f6fe0b7df037c9ec80da6f4a2b29bccb15e00b385719e654238f6becea1372900ac5f9e5e6d6af481537dde12c03cda24ee49e674
 DIST easytags-3.11.tar.gz 40572 BLAKE2B a6b228743f493bd467aff6685b6799de7e4862d384e14c81a084d7a211cf165d62cf902415a3c98a69858eded64c606bd4565f6e0c43fab7c078ba81d0ec5217 SHA512 9c1985a02b2718315d825ed29c06cbf78050e693893a9a7530a774031cbe9e6a27ee1dc91878950a1fbcaf7ea685faeb799d1e5b218b9ce25718783409f66130
-EBUILD easytags-3.11.ebuild 928 BLAKE2B 1a265f3688de91c1fe3cf67fb1420490cb349be070b3747a77a2402f672a9ab555d9a124e2c61070a96388e6cc8d4a1cf259b7075772b542d751e89e2aeda9b4 SHA512 1d303ae9bb1a8f031dae2fb6f8131c672d3e4bda3e534909e3d4a0fc6d98e10256d585f0644b5eac19140368cf4f164c529a85bd76f25773b3b55c6ed9b139a3
+EBUILD easytags-3.11.ebuild 1018 BLAKE2B d212a9b22864eb361299c7b0303409165dc12fb1d67067d6199f57c071d5cf8ff608d9273da3cb5317bda3d691c88ba2102bb90cebf1e8d5c5b4170ab830fdde SHA512 d4de90b1b1da0f94d5254b7917fa3c0df2b47da5c02b7f285a1e5cdfe8974e3029c45f41ea680c9e7990161914a525a2fad1774c8572586a0d1d3b0cfa0d622c
 MISC metadata.xml 342 BLAKE2B 5e7e191544a04bc4ae28e482deef1c44c8ee11f6afe01d9ed6b138364f771411e341b5827e92bdfeae1edffdc166979c72a53034886530b0cdb55e34d9c2ce6e SHA512 0f4fbbedc023ccccc74ef8e020c3a90a0ccb0184164a52dd733699c5d4bf729d09478ea87fda093197679f7b44b3c1b64d3c64845d91d3fb92f9e3a1eab8fc78
diff --git a/app-vim/easytags/easytags-3.11.ebuild b/app-vim/easytags/easytags-3.11.ebuild
index e7ddf382b0fb..79b37e481e5a 100644
--- a/app-vim/easytags/easytags-3.11.ebuild
+++ b/app-vim/easytags/easytags-3.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,15 +14,21 @@ LICENSE="MIT"
 KEYWORDS="amd64 x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-RDEPEND="${PYTHON_DEPS}
+RDEPEND="
+	${PYTHON_DEPS}
 	>=app-vim/vim-misc-1.17.6
 	dev-util/ctags"
 
 VIM_PLUGIN_HELPFILES="${PN}.txt"
 
-S=${WORKDIR}/vim-${P}
+S="${WORKDIR}/vim-${P}"
+
+PATCHES=(
+    "${FILESDIR}/${P}-fix-ctags-detection.patch"
+)
 
 src_prepare() {
+	epatch "${PATCHES[@]}"
 	# remove unnecessary files
 	rm addon-info.json INSTALL.md README.md || die
 }
diff --git a/app-vim/easytags/files/easytags-3.11-fix-ctags-detection.patch b/app-vim/easytags/files/easytags-3.11-fix-ctags-detection.patch
new file mode 100644
index 000000000000..56b24dfe406f
--- /dev/null
+++ b/app-vim/easytags/files/easytags-3.11-fix-ctags-detection.patch
@@ -0,0 +1,54 @@
+From f5746bdfd9942b00c349e53f3f4917ae73bb6797 Mon Sep 17 00:00:00 2001
+From: Mathias Andersson <wraul@dbox.se>
+Date: Thu, 24 Dec 2015 14:24:34 +0100
+Subject: [PATCH] Fix detection of Universal Ctags.
+
+Recently Universal Ctags changed version from 'Development' to '0.0.0'
+which broke the detection.
+---
+ autoload/xolox/easytags.vim | 32 +++++++++++++++++++-------------
+ 1 file changed, 19 insertions(+), 13 deletions(-)
+
+diff --git a/autoload/xolox/easytags.vim b/autoload/xolox/easytags.vim
+index d0dec21..3c85e6a 100644
+--- a/autoload/xolox/easytags.vim
++++ b/autoload/xolox/easytags.vim
+@@ -78,19 +78,25 @@ function! xolox#easytags#check_ctags_compatible(name, min_version) " {{{2
+     call xolox#misc#msg#debug("easytags.vim %s: Command '%s' returned nonzero exit code %i!", g:xolox#easytags#version, a:name, result['exit_code'])
+   else
+     " Extract the version number from the output.
+-    let pattern = '\(Exuberant\|Universal\) Ctags \zs\(\d\+\(\.\d\+\)*\|Development\)'
+-    let g:easytags_ctags_version = matchstr(get(result['stdout'], 0, ''), pattern)
+-    " Deal with development builds.
+-    if g:easytags_ctags_version == 'Development'
+-      call xolox#misc#msg#debug("easytags.vim %s: Assuming development build is compatible ..", g:xolox#easytags#version, a:name)
+-      return 1
+-    endif
+-    " Make sure the version is compatible.
+-    if xolox#misc#version#at_least(a:min_version, g:easytags_ctags_version)
+-      call xolox#misc#msg#debug("easytags.vim %s: Version is compatible! :-)", g:xolox#easytags#version)
+-      return 1
+-    else
+-      call xolox#misc#msg#debug("easytags.vim %s: Version is not compatible! :-(", g:xolox#easytags#version)
++    let pattern = '\(\w\+\) Ctags \(\d\+\(\.\d\+\)*\|Development\)'
++    let match = matchlist(get(result['stdout'], 0, ''), pattern)
++    let g:easytags_ctags_fork = match[1]
++    let g:easytags_ctags_version = match[2]
++    if g:easytags_ctags_fork != '' && g:easytags_ctags_version != ''
++      call xolox#misc#msg#debug("easytags.vim %s: Detected %s Ctags %s", g:xolox#easytags#version, g:easytags_ctags_fork, g:easytags_ctags_version)
++      if g:easytags_ctags_fork == 'Universal'
++        " All versions should be compatible.
++        call xolox#misc#msg#debug("easytags.vim %s: Assuming all versions is compatible ..", g:xolox#easytags#version)
++        return 1
++      elseif g:easytags_ctags_fork == 'Exuberant'
++        " Make sure the version is compatible.
++        if xolox#misc#version#at_least(a:min_version, g:easytags_ctags_version)
++          call xolox#misc#msg#debug("easytags.vim %s: Version is compatible! :-)", g:xolox#easytags#version)
++          return 1
++        else
++          call xolox#misc#msg#debug("easytags.vim %s: Version is not compatible! :-(", g:xolox#easytags#version)
++        endif
++      endif
+     endif
+   endif
+   call xolox#misc#msg#debug("easytags.vim %s: Standard output of command: %s", g:xolox#easytags#version, string(result['stdout']))