gentoo resync : 16.02.1018

8 files changed, 15 insertions, 43 deletions

diff --git a/app-vim/Manifest.gz b/app-vim/Manifest.gz
index 7a310fa05f90..dbf469b96b9f 100644
--- a/app-vim/Manifest.gz
+++ b/app-vim/Manifest.gz
diff --git a/app-vim/conque/Manifest b/app-vim/conque/Manifest
index 8d79a689d211..2ddb75d2bbd2 100644
--- a/app-vim/conque/Manifest
+++ b/app-vim/conque/Manifest
@@ -1,4 +1,3 @@
 DIST conque_2.3.tar.gz 52195 BLAKE2B 31546d8e0797525cd05a4663f3598a11cbb5dd7dcc6fabf181d277e2cab88593e1458f5e646688e9e46a8d01952eb1383f358454200d59634c40920b93b7db9e SHA512 b69c0564ccaf897ee2f18d0769877986e67006cf33dbefe2bbc85261726372f09669d19aa118de58ccfb847cc8b7e670e25c030128eec665e1cecf0a96cb4b89
-EBUILD conque-2.3-r1.ebuild 679 BLAKE2B 2fe441d1398c14d2be1db505bf128f08a458d1a51e735abd5dcb5f01af41d7ae0c6524a7a98a59d54db59f712814e95a8806ef2eedd3ccedae7f24ea03341f5d SHA512 25dd890235046296654394595c91e7db6dcf91820aa44c040162942d0d621d89c796bcab6e77f1d65d4b348fac14077993b12275831b2d704c474d7e656d9f1f
-EBUILD conque-2.3.ebuild 554 BLAKE2B 64ef39e65fcd02562ef840487f3a5805971ed9c138db084cd0249d7be7ed0e33e8baae8f9b0ce4d5203bd9c6f1208786de3e63880dabb8394fa6b80f6c051c8e SHA512 c1934cab70cb7d9be06247e853ac5b32f7f131177b862639e90cfa35a2267ba7fa1773b5607bef7affc361a5f381d35e800da1dc65f4a9a6097bc40587740efc
+EBUILD conque-2.3-r1.ebuild 674 BLAKE2B 7487bbf948910ae3bf0d3650e292f7fa24e893f10722992b3cdfd9818bd95c1b7de8d230562555b0464fab294ca6cdc7e2f7035c4ebd17e219786f29eab19ba5 SHA512 d7d63b347b4bda5586c76989b6e7400e2d6733b8cf0918c298d2f5b97c90d1a52470f300602ef991cfb5c029738863fc667362450984fe67f9f51a093d3f892c
 MISC metadata.xml 325 BLAKE2B d9e43a221c8ce8ec5a6cdfbed4c1d76cbebc9922587a1414a9bd09a14dbe1462ce2bad738ca2fa74e21686e20dc1c05a6dac2faf91abe29beb4ccc046e2014c1 SHA512 6bbcbd15af2e070d8b377cb9ce8d267b4321c895375a874d77cc85f6d9ec5aee8787415f3799b93801aa748d10a15e64968dab7ace10d9f19d48c252d2b2e4a3
diff --git a/app-vim/conque/conque-2.3-r1.ebuild b/app-vim/conque/conque-2.3-r1.ebuild
index 93ff4281f401..30e8ff46f598 100644
--- a/app-vim/conque/conque-2.3-r1.ebuild
+++ b/app-vim/conque/conque-2.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -12,7 +12,7 @@ DESCRIPTION="vim plugin: Run interactive commands inside a Vim buffer"
 HOMEPAGE="https://code.google.com/p/conque/"
 SRC_URI="https://${PN}.googlecode.com/files/${MY_P}.tar.gz"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="|| ( app-editors/vim[python,${PYTHON_USEDEP}] app-editors/gvim[python,${PYTHON_USEDEP}] )
diff --git a/app-vim/conque/conque-2.3.ebuild b/app-vim/conque/conque-2.3.ebuild
deleted file mode 100644
index c16c2d156302..000000000000
--- a/app-vim/conque/conque-2.3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-VIM_PLUGIN_VIM_VERSION="7.1"
-
-inherit vim-plugin
-
-MY_P="${PN}_${PV}"
-DESCRIPTION="vim plugin: Run interactive commands inside a Vim buffer"
-HOMEPAGE="https://code.google.com/p/conque/"
-SRC_URI="https://${PN}.googlecode.com/files/${MY_P}.tar.gz"
-LICENSE="MIT"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="|| ( app-editors/vim[python] app-editors/gvim[python] )
-	>=dev-lang/python-2.3"
-
-VIM_PLUGIN_HELPFILES="ConqueTerm"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/app-vim/eselect-syntax/Manifest b/app-vim/eselect-syntax/Manifest
index 8ef3442e4b93..ba989917dc04 100644
--- a/app-vim/eselect-syntax/Manifest
+++ b/app-vim/eselect-syntax/Manifest
@@ -1,3 +1,3 @@
 DIST eselect-syntax-20070506.tar.bz2 3006 BLAKE2B 2ad4175a678e03870ef59166e06ec41d4cc5fb6c8fd34b8b066b06eea17747416e19bdfdacfe68ea63341ac7284b47d2d3efe5d700c4602ae2429ffe81f1f825 SHA512 8206d445eb1a3097cbcf9821e5437033887f3b588a85c70fd849b000f18f06492498864992325da09de767af0303a118001b4f3d39249e28c8d944bc0c329de0
-EBUILD eselect-syntax-20070506.ebuild 600 BLAKE2B 7e4e016fdf86bbc5a2d0ea4b01bb43a366b115aeb9413fda25a901d6f81d741954e16a9113901de7a8215d8ae0ca4ad27995a48a5975c77cc3c32db7a6fc9e07 SHA512 5a13ac3d3b433bf0db7a411b8cde3a9fcd1842fde45e0486916f9fcaadcaa5cf63817c2674c2fd1c9d1b16eb77f82e672f074280cce096f8519bcb2e31d06bd1
+EBUILD eselect-syntax-20070506-r1.ebuild 588 BLAKE2B f4b0831c02146604e699ce353a1248c30baaceff882af8921f888f5cf96d629b1ad47269ffb74f3c9b01c59d80f8701f83f72bac0d92637ad9153e441ca81813 SHA512 4900ef5b03dff40debc7c295f133ebb46edb874043f32a23f647f69be6be7c14f3c18b2c9bfce74acfb1673a6e317545a0a6e462a4c189964f238e009918cbcf
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/eselect-syntax/eselect-syntax-20070506.ebuild b/app-vim/eselect-syntax/eselect-syntax-20070506-r1.ebuild
index 2af67ca705c0..06d97fec6eee 100644
--- a/app-vim/eselect-syntax/eselect-syntax-20070506.ebuild
+++ b/app-vim/eselect-syntax/eselect-syntax-20070506-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=6
 
 inherit eutils vim-plugin
 
-DESCRIPTION="vim plugin: Eselect syntax highlighting, filetype and indent settings"
+DESCRIPTION="vim plugin: eselect syntax highlighting, filetype and indent settings"
 HOMEPAGE="https://www.gentoo.org/"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
@@ -15,7 +15,5 @@ KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x8
 DEPEND="!<app-vim/gentoo-syntax-20070506"
 RDEPEND="${DEPEND}"
 
-IUSE=""
-
 VIM_PLUGIN_HELPFILES="${PN}"
 VIM_PLUGIN_MESSAGES="filetype"
diff --git a/app-vim/fluxbox-syntax/Manifest b/app-vim/fluxbox-syntax/Manifest
index ddaa153c465c..b88dfaf2397e 100644
--- a/app-vim/fluxbox-syntax/Manifest
+++ b/app-vim/fluxbox-syntax/Manifest
@@ -1,3 +1,3 @@
 DIST fluxbox-syntax-1.5.tar.bz2 1376 BLAKE2B 2006668a89077febb4ec919354359cae1170156950abb553695d6424cb277bca69a5e8ffa93a9e4b09b990e96f9ee34654d34dc15320140dad589808ef9960dc SHA512 0567af6fe0994ea228ac56c3a26485ba5cce7762e3d70d6dced978e56017f6769072c83ae68125de3e03190562a7a10102bef038c02ae148cf70cc0c5951b8df
-EBUILD fluxbox-syntax-1.5.ebuild 963 BLAKE2B 4356481080d14e8f82ecdd54e39106206a9d17fd512d9c974a85f8928bd5ba12088203b785c70dc56b2e357a712d01a0003d80f6323adfe7eccc917649d946dd SHA512 9c806b238d67c86cd0349861dc857be3be14c235435eac188cf9ee70ff5851f3d67764a129f6724f4778d3e9bfba13e1d6aa657d779e206cd17fd7202d1f1552
+EBUILD fluxbox-syntax-1.5-r1.ebuild 897 BLAKE2B ea7e6b5dc33b1a6ad8ad5c77688d9602461c11b69fd3e4f72b9ac9f619ed5e3fbf5485e2805a03c647d2045b452b57205d2207d138f156a25928b4959eb6d78b SHA512 b45cc6079fa5637af6789f7f614488074125fec3413dd31697fde305408fa406a1bb950cbafe071f48ad6f8404348915224af11127ab7e0b52fe2e7b65b9afbd
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/fluxbox-syntax/fluxbox-syntax-1.5.ebuild b/app-vim/fluxbox-syntax/fluxbox-syntax-1.5-r1.ebuild
index 082606e60e31..1165be5cb0ab 100644
--- a/app-vim/fluxbox-syntax/fluxbox-syntax-1.5.ebuild
+++ b/app-vim/fluxbox-syntax/fluxbox-syntax-1.5-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=6
 
 inherit vim-plugin
 
@@ -9,9 +9,8 @@ DESCRIPTION="vim plugin: fluxbox files syntax and indent"
 HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=679"
 LICENSE="vim"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
-IUSE=""
 
-RDEPEND="${RDEPEND} >=app-vim/genindent-1.0"
+RDEPEND="app-vim/genindent"
 
 VIM_PLUGIN_HELPTEXT=\
 "This plugin provides syntax highlighting and indent settings for fluxbox
@@ -21,11 +20,9 @@ set the filetype using :set filetype=fluxbox if necessary."
 
 VIM_PLUGIN_MESSAGES="filetype"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# no ftdetect file provided. lame...
-	mkdir ftdetect
+src_prepare() {
+	default
+	mkdir ftdetect || die
 	echo "au BufNewFile,BufRead /*/*fluxbox/*menu set filetype=fluxbox" \
-		> ftdetect/fluxbox.vim
+		> ftdetect/fluxbox.vim || die
 }