gentoo resync : 23.06.2018

8 files changed, 80 insertions, 14 deletions

diff --git a/app-vim/Manifest.gz b/app-vim/Manifest.gz
index 356a03c35639..e966fcbac7ef 100644
--- a/app-vim/Manifest.gz
+++ b/app-vim/Manifest.gz
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']))
diff --git a/app-vim/perl-support/Manifest b/app-vim/perl-support/Manifest
index 433ded32e03f..10dcef145d16 100644
--- a/app-vim/perl-support/Manifest
+++ b/app-vim/perl-support/Manifest
@@ -1,5 +1,5 @@
 DIST perl-support-5.3.2.tar.bz2 178598 BLAKE2B d02aae9d65e9f0d5274cbeb44db1ed7de844ef87fa73fd8bfe8c27ccd27584e1937d9a0a824e6f10013554c8259307ebd73d3f188b98897709b1d5d2a03ca548 SHA512 1eff321b0c5184b58737e79de379fbe431b32fbe5a140914b950d024ee9b512393b46cf4e45cafe50289ee9f9d4747984534efeade399882a17237a1a1ca1161
 DIST perl-support-5.4.tar.gz 267155 BLAKE2B 1144623092164bcf436e789d2ea587c08916aafd1514facf28696b23035feeacada610c8f9d4f9c45f29bdea32b9f9b7a3151b918cf08839e10caadb0485cc9d SHA512 d9d06ea2299be6135b5423aa7f062874736d7aa8118428a9abcd20c53eea410f0d384d0a79324e5ad0101105aa0aa10eb23f031084f34908f879633e5d18c795
 EBUILD perl-support-5.3.2.ebuild 681 BLAKE2B 9ed6690671cb926f850511b18506c35ca5367e3f5c8e7b3708733f82943ea2e6488da5a56ea2a29a6748a267c0ee15007ff92898cdc06e69a3910b098534cfcf SHA512 069bbb143cf6e0355525270078027dafe93e7a3db18ada114f0bac594e28b7d10e367a517d4f7cfa68719c63e9dc6619df384c039949bc1585d723482ffaefd8
-EBUILD perl-support-5.4.ebuild 1368 BLAKE2B 2b71df81416e3a993a020f8b47f4aed9e66afef55474ff2de0cc28b262dcd016154995ac6b1bcc4c7a921dd6d516f382a1205ec78997fc3f800672d1ba2c6ac3 SHA512 d7188ebef916ff9ddf8432af61dc2a84469fb8c143308db9bf975e0adb326b7522883017a34eac4c0230e3e56b2f5f79df3a52b5f1a987a36a375268652223b8
+EBUILD perl-support-5.4.ebuild 1367 BLAKE2B 2bbe788dfa2684dd654109b3244e0418758c5367af94537f45aa43800c17c35a0edb9a634cc4c5a07f757205b687dc8e8513aab493797a2678e6a473edf03f6d SHA512 b88d24ad64021c37d07fc2889ba0c501b2a9bd7694d2f31df31a91b93734808145c99d26b1f78e3e5dd9fcca6669cec8cf60e65eedbde71865825d48e0c7aaaa
 MISC metadata.xml 342 BLAKE2B 833b0fbd6f25308df363e08b01459c646084cee5c00d9dd0e83fdf08ff71543de4f3a4244f0ce2c1a838b9ae8a387ad693a228c50add92a790ee948ff582f9a6 SHA512 9d55373f4445d1bf4f3dd7db2c3b7973321fc2f461254d21f9968bea94ff8a8511129232fe4a30d3aacd723209d70566cb3ae1594efe0f28873f3bcee7b009f1
diff --git a/app-vim/perl-support/perl-support-5.4.ebuild b/app-vim/perl-support/perl-support-5.4.ebuild
index 2755cfce0c02..740c39da3f61 100644
--- a/app-vim/perl-support/perl-support-5.4.ebuild
+++ b/app-vim/perl-support/perl-support-5.4.ebuild
@@ -8,7 +8,7 @@ DESCRIPTION="vim plugin: Perl-IDE - Write and run Perl scripts using menus and h
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=556"
 SRC_URI="https://github.com/WolfgangMehner/perl-support/archive/version-${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2 GPL-2+"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~x86-macos"
 
 VIM_PLUGIN_HELPFILES="perlsupport.txt"
 
diff --git a/app-vim/pyclewn/Manifest b/app-vim/pyclewn/Manifest
index 5bc5fb64da9f..3af0b884e723 100644
--- a/app-vim/pyclewn/Manifest
+++ b/app-vim/pyclewn/Manifest
@@ -1,5 +1,5 @@
 DIST pyclewn-2.0.1.tar.gz 124914 BLAKE2B e1dc12174d2ac640476a36714a8ef221f64db4b19c9509a179bc0cf573200de0f1f888bcc3bb69f433064e2de2d881845099f609468e12ed72e5c547623d44e5 SHA512 996acbedbb7922109925f188efba4c71e83f1823c029f92dc00bb21449f024232ef55df0c74a9fd4bfa7229523ed9ad4301aa9dbb8a3c20424082fc6939f63db
 DIST pyclewn-2.1.tar.gz 129697 BLAKE2B 0dfef92cb36ea9fa89c7f0d85ed45e21c634732fc2d3d888dd792de22529bea86719f8ac8ed870dd5ab00efbfdb08011013a36880781abf9e0c64a62b2aa301a SHA512 346b98a9e37957a5bf97b8901247f56fa8e38bddac38727867773cf4e78e555d6a85848c4c400d1faf1159ba61122cfd4931c95a67e3b2abdfaae7996beb4f1b
 EBUILD pyclewn-2.0.1.ebuild 1057 BLAKE2B 1412bfe77432b791290c9a4d707fcc3c41c17384e4f35fb730d920a3c7dec35f4a7c674e2a107ec952413f88d1eb837c262b9fd9dc35c4c3b104bc29a52fcf83 SHA512 729fe02cffcd975dc3735c5c003bfb8db1d5b1044ff395afb776de09efc0c2dac828cb74600acec811a5e311fa27f096641c03cea19f6bd2d92c2e107f1c271e
-EBUILD pyclewn-2.1-r1.ebuild 1026 BLAKE2B 3cc7c40e73be828f2e2fd9cfa7f8f4baab41c8d0102035ebb6275d187f98580bffaafea7067a9d12415cb15c15d7af258850034b82402bbacbb4f759ba885e83 SHA512 1204f2b6553182b95c7603ea75a7a73ad79322290ea4573edd5962d730f77f34694603a28d34f171516452925ee36741a071103e6d98a226cab40ae3a81956c6
+EBUILD pyclewn-2.1-r1.ebuild 1116 BLAKE2B 4637900400393b6a8eead88bbc54a31360860c0e98345c137ae9d2072b9663d6697ebf36e678d8b28552be2da1cc06705b8cd309b548bdadc1a558d9636a093f SHA512 11ad4ba21d3cb91139a06c03b9eaf1f75c9df67ea777c48244ab8486c04a8b9a9efc7f78353a1871d766302ea277f13d63de8b58a5d9b5d0cfb223485ab1857a
 MISC metadata.xml 499 BLAKE2B 4955bd7a080dc2ae909143477040d191cb48ab4badfd47b6b7c11fd4686139bbbe77475f005e10c3b2bba50d0615b94600a55cda57a7d02ecaaffe1e504219dd SHA512 30b127677f0d5a9afce208e5cbb00c9b98f6d7e771ef273155f9acad764da789e71249289104e8006420cf5ff62075bb7572527150f9b339e0e51cb219c76a81
diff --git a/app-vim/pyclewn/pyclewn-2.1-r1.ebuild b/app-vim/pyclewn/pyclewn-2.1-r1.ebuild
index f21226086046..63b9b959aa2b 100644
--- a/app-vim/pyclewn/pyclewn-2.1-r1.ebuild
+++ b/app-vim/pyclewn/pyclewn-2.1-r1.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
 PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
 inherit eutils vim-plugin distutils-r1
 
 SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
@@ -17,13 +18,17 @@ CDEPEND="|| (
 	>=app-editors/vim-7.3
 	>=app-editors/gvim-7.3[netbeans]
 )"
-DEPEND="${CDEPEND}
-	app-arch/vimball
-"
-RDEPEND="${DEPEND}
+
+DEPEND="
+	${CDEPEND}
+	app-arch/vimball"
+
+RDEPEND="
+	${DEPEND}
+	$(python_gen_cond_dep \
+		'dev-python/pdb-clone[${PYTHON_USEDEP}]' python{2_7,3_5})
 	$(python_gen_cond_dep \
-		'dev-python/trollius[${PYTHON_USEDEP}]' python{2_7,3_3})
-"
+		'dev-python/trollius[${PYTHON_USEDEP}]' python{2_7,3_3})"
 
 SLOT="0"