gentoo resync : 25.01.2019

10 files changed, 13 insertions, 56 deletions

diff --git a/app-vim/Manifest.gz b/app-vim/Manifest.gz
index 07272ad3e39e..2a904cfcec99 100644
--- a/app-vim/Manifest.gz
+++ b/app-vim/Manifest.gz
diff --git a/app-vim/calendar/Manifest b/app-vim/calendar/Manifest
index 07b2fa30ae38..70d2d6b651ce 100644
--- a/app-vim/calendar/Manifest
+++ b/app-vim/calendar/Manifest
@@ -1,3 +1,3 @@
 DIST calendar-2.9.tar.bz2 11070 BLAKE2B 9c137d6975f3978776e8739dfa0697a6fd9f1828c0903ec529008d6c272e2226418e7f175149f048feecd405235501a88967fd6fa4dc6413eabec4021d675bca SHA512 8d1c29cb1e7b8189447d60bb5e8940b7ed52837c9039bd8ff8e3ce19c5fd7a9a8060291bb8a0c0bd2a2bb677fce388bb7f807f25358f3903c28b07c715ae1a07
-EBUILD calendar-2.9.ebuild 320 BLAKE2B 56d5aa88b5a00b580e2415197df7734c503ea10b84cd0998d116dd88f872dfa867968f897d87161c6731d8a6c9df84994c403493441f96cc4475be0c06ff3cf4 SHA512 728f07ee715dae3c00771ef7ef78c4e7f03d5ae940bb77d34b32c8b6b3c1dbdf5d1322f1e93ed8d171f99d4c19e10ecb357950f7927fe0e87364f39014057ca9
+EBUILD calendar-2.9-r1.ebuild 317 BLAKE2B ff18c838ae0fb02963871931c9b820ddd6be4770edbe5e3104842305d0264360feb6fd84b897b3898c28dcc8b96b22cf545957ead046e5c468a579d91d12455b SHA512 47ed341fd029d23442a243d2d4d71eedeaf696a383daa55a21ff2d0f4a8be7f1105d09fef1d1fac4cc9df004812760c11e968327e72626fc5fd9bf334382bf00
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/calendar/calendar-2.9.ebuild b/app-vim/calendar/calendar-2.9-r1.ebuild
index d8ec95a7f8c4..0e28ebd3dd1f 100644
--- a/app-vim/calendar/calendar-2.9.ebuild
+++ b/app-vim/calendar/calendar-2.9-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=5
+EAPI=6
 
 inherit vim-plugin
 
diff --git a/app-vim/easy-align/Manifest b/app-vim/easy-align/Manifest
index f8fe5d8d2030..cfeda9db9331 100644
--- a/app-vim/easy-align/Manifest
+++ b/app-vim/easy-align/Manifest
@@ -1,3 +1,3 @@
 DIST easy-align-2.10.0.tar.gz 20056 BLAKE2B 3319cfc84147a3cfb0c7109dbb9116c94b734da528623944e2546667ac45e5d912e404c8c94df963002e7789760ba8fa7023e98cf22c1201bedbe8f667b1d13d SHA512 4a6a46db96b78d830fc0191b77b2226e9c1a2de585b731d1997f69ee31c8c76038ceb14f18e13f30fee00b5ce9ca7aed4241db06cac303b8ae903a856e4baabd
-EBUILD easy-align-2.10.0.ebuild 551 BLAKE2B e802d9157674c57d00f502f4e17babf34bfd039f2df5890b64ff91ef87fa312d11c784b14d65d9f006d9f18fe8a31f20b3101f37c74c10fa66c3e023e8cc0909 SHA512 d7cc1c6432630f3db2342c64d04d660506c3d2b721865dcbae625ec945ffdb0a2b93bcac5cb4f5ae7503466018beccede4f492ddd56e2d1f0f59ac6c26a0eb03
+EBUILD easy-align-2.10.0-r1.ebuild 548 BLAKE2B 42ec66cdf2c1928022db3bd3a303648ca713ba0d37caadfe0bda61730cfc2b543a2cb64f98c0d8516ef81f8dc62f8431b7545dbac4d63f9b8a0f2fd3a298ed5b SHA512 9b125304a6ac3ad18971635e49b423ba3d5f8a469f01e9f521218c9c6dca68aa6e30a42fe90b078e64c4b484a4bb12c63f424f331352f7009c5417f17e3b6463
 MISC metadata.xml 347 BLAKE2B 21be1fa0f775c2734cede9e1e5ffd6bd2a23681a16a6361689a927ae4871ed3df26592c87da7e8e8771242fdf496baa0647fee36d007c356e60bd190d2a9ba62 SHA512 4b687e38ddec009ffc0ab3effb0f1d4d46d8a576812b73f3526bf13f0facef23525b75765ac7c56e9c541d66b0cbdb1f3f46a0907d3688f91576cd0a6bb67c92
diff --git a/app-vim/easy-align/easy-align-2.10.0.ebuild b/app-vim/easy-align/easy-align-2.10.0-r1.ebuild
index e13cbff4ce51..dcb2ed0da094 100644
--- a/app-vim/easy-align/easy-align-2.10.0.ebuild
+++ b/app-vim/easy-align/easy-align-2.10.0-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=5
+EAPI=6
 
 inherit vim-plugin
 
diff --git a/app-vim/gentoo-syntax/Manifest b/app-vim/gentoo-syntax/Manifest
index d7424a736043..30ca0dfe0bef 100644
--- a/app-vim/gentoo-syntax/Manifest
+++ b/app-vim/gentoo-syntax/Manifest
@@ -1,6 +1,4 @@
-DIST gentoo-syntax-20180821.tar.bz2 18361 BLAKE2B 4134fd0a3d75d86f3984f135021063b68588083f191efcb94d7b599460703d6eb501bad7de2aa0cc9cdc4447d73b83e4b36cee2acdd113e7d0a879e1e864e2fb SHA512 09c70ded667b489e03f02e0e72fca32f13a40501a5e319b387967e75f616c7f3dc44ceab3a46b776a509263f58668223eb85d51ba58ca3fbc48e4c05d7345dfc
 DIST gentoo-syntax-20181023.tar.bz2 18299 BLAKE2B ea037425ab00b05e4a52f943817fb264492793c842b6c9250450ab715fafebc55d0b5b95ff49945f62258f2dc70f357eeef3a5d908592c995cdc6e940f2f15af SHA512 a6bd592dd46ad80a4126321826dbbc4c130624027e7e71f0ea87fb164963e980e3ab3e1db1e87ee0ddad602f2ea2e9e7d955a0016c00eb8aef4c01c29057b737
-EBUILD gentoo-syntax-20180821.ebuild 1282 BLAKE2B 6f6542618489fddeb1de17173abefa5915cc6c67f261d99b57358769d70d4607400a767ce7d3230a61158c38ec7ee3b3978cc58e21111ee95a872117d08d2284 SHA512 524b92e9ebd90271c26ad14f46ab716554dd141cd6f368257ee10771fdc5dc14932d831705d3cc89cb5d6a2d5083d00d90ee667426bc3e4a7aeddaedae2f23cd
-EBUILD gentoo-syntax-20181023.ebuild 1283 BLAKE2B 2bd7bc2ad1256759862e6edc8e06885d6a93fc2a5b0d9ac8d92cf98a4c492bc4d1d90c4d605d05b8050e934e235ec4243ea10acf9b4df8831a2f379927eb28de SHA512 cd43a7f59d46317361273fce804183eb58dd67521e1914ceebbcbb1cd77c0366256d4c1c906638f770a2bd25c5121e369c4e023ea8d3cfb19fe2a7ca7bcafe56
+EBUILD gentoo-syntax-20181023.ebuild 1282 BLAKE2B 6f6542618489fddeb1de17173abefa5915cc6c67f261d99b57358769d70d4607400a767ce7d3230a61158c38ec7ee3b3978cc58e21111ee95a872117d08d2284 SHA512 524b92e9ebd90271c26ad14f46ab716554dd141cd6f368257ee10771fdc5dc14932d831705d3cc89cb5d6a2d5083d00d90ee667426bc3e4a7aeddaedae2f23cd
 EBUILD gentoo-syntax-99999999.ebuild 1087 BLAKE2B 9b7c64f1ec0215aa53e39c0c4db8352c47b19ee89a894dc95ef4a867415337ff901befaadf2ce468804e4167410c1d034002ca476c90925096875b3dc27b8868 SHA512 5f0e991bcc491e807ea86d89c47dcc8d6879c35d0f42d191a4e2cd4d40f117022e70cfb92503184e638273daed9780363066d07667c138592be1e1b6f4435b99
 MISC metadata.xml 560 BLAKE2B 21f954af20949469ae0f30a81743d9bdd1114b64b51b640d0da2d294897a885878a13bb1d408c69cd9e1afe936fd02c1ae7170e48a2f5d2280afe525266e448a SHA512 89d979077e4171aece29bd44f3d6ab6a84261dfa8eaa655b5b5d77dc20c5e2ea7cd361002e0f4d8212793449bd86da03e2d2e59bc6d23a158dceca1d60d416fe
diff --git a/app-vim/gentoo-syntax/gentoo-syntax-20180821.ebuild b/app-vim/gentoo-syntax/gentoo-syntax-20180821.ebuild
deleted file mode 100644
index f1c1d58814db..000000000000
--- a/app-vim/gentoo-syntax/gentoo-syntax-20180821.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit vim-plugin
-
-DESCRIPTION="vim plugin: Gentoo and Portage syntax highlighting"
-HOMEPAGE="https://github.com/gentoo/gentoo-syntax"
-SRC_URI="https://gitweb.gentoo.org/proj/gentoo-syntax.git/snapshot/${P}.tar.bz2"
-
-LICENSE="vim"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="ignore-glep31"
-
-VIM_PLUGIN_HELPFILES="gentoo-syntax"
-VIM_PLUGIN_MESSAGES="filetype"
-
-src_prepare() {
-	default
-	if use ignore-glep31 ; then
-		for f in ftplugin/*.vim ; do
-			ebegin "Removing UTF-8 rules from ${f} ..."
-			sed -i -e 's~\(setlocal fileencoding=utf-8\)~" \1~' ${f} \
-				|| die "waah! bad sed voodoo. need more goats."
-			eend $?
-		done
-	fi
-}
-
-pkg_postinst() {
-	vim-plugin_pkg_postinst
-
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		if use ignore-glep31 1>/dev/null ; then
-			ewarn "You have chosen to disable the rules which ensure GLEP 31"
-			ewarn "compliance. When editing ebuilds, please make sure you get"
-			ewarn "the character set correct."
-		fi
-	fi
-}
diff --git a/app-vim/gentoo-syntax/gentoo-syntax-20181023.ebuild b/app-vim/gentoo-syntax/gentoo-syntax-20181023.ebuild
index a2883aec426f..f1c1d58814db 100644
--- a/app-vim/gentoo-syntax/gentoo-syntax-20181023.ebuild
+++ b/app-vim/gentoo-syntax/gentoo-syntax-20181023.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gitweb.gentoo.org/proj/gentoo-syntax.git/snapshot/${P}.tar.bz2"
 
 LICENSE="vim"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="ignore-glep31"
 
 VIM_PLUGIN_HELPFILES="gentoo-syntax"
diff --git a/app-vim/reload/Manifest b/app-vim/reload/Manifest
index fa711be0bd68..375325e94f9a 100644
--- a/app-vim/reload/Manifest
+++ b/app-vim/reload/Manifest
@@ -1,3 +1,3 @@
 DIST reload-0.6.17.tar.gz 7028 BLAKE2B bb8e843e1092c7e155546da5aea67280ca4b028c037547434f00e15bed29d7fae062289bc8ca506ed9be17674ce63494f72273797ff7022aa95b46405b0a4a63 SHA512 639ffcea9bf94b0a8346850078f59ff332ff6180b042d2c22662d5c637307969644607ca3f19e2648a1ef9a019788ef1f83be52b627ca6784e16d1b7bddc39cd
-EBUILD reload-0.6.17.ebuild 508 BLAKE2B a5642419a143c3b680ee272b26b84915dc48a050eb87db6ea48608a83437603049caa25c37fc8891aeab5d2583d9afd502d4bc73dfe197aab909b732ed1e6db0 SHA512 fa6ca4568cd17547e9e7a3a506911e4cad913ab9008e5b9c0d230a47e46a9ed375ce405d99fa80a25592e9913dbff601679a4aae9b25ad324eded6f7d6833e40
+EBUILD reload-0.6.17-r1.ebuild 516 BLAKE2B 62f6a5394987870a20dc1bffe715f2a8090cb714175fc9cbb39bb9ca856b95acb5b164f0625e4405d46bf41c9d00c5c268eeca4dacb9ab491416225790b934fc SHA512 4b66473ad5ef454338e6fb246c5fc7fc86e57b59e857f6d002d2eff0c18e6f5b1245d2a1bb8ed2aa8e8cc45a747fd44604c7060fbcbc537e4e93b790719c03e1
 MISC metadata.xml 340 BLAKE2B 56fe3809eaede079c4a3000728dad4f75d21b2cf6212517fc45b48e8882d317ba73522e8861dd9e3b94fecbe541d03e48816e69585ee9d667d4401504fc9e08d SHA512 25a88a091f9cb2756f5e28361ec31f79997114271499c3522f47ddd2a86d8dc9bba42e533e004a040b7598dc380ef84480966a1d3641e333f423a810223bc1ec
diff --git a/app-vim/reload/reload-0.6.17.ebuild b/app-vim/reload/reload-0.6.17-r1.ebuild
index b55fba2bf075..b25107b0fb76 100644
--- a/app-vim/reload/reload-0.6.17.ebuild
+++ b/app-vim/reload/reload-0.6.17-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 inherit vim-plugin
 
@@ -15,8 +15,9 @@ RDEPEND=">=app-vim/vim-misc-1.8.5"
 
 VIM_PLUGIN_HELPFILES="${PN}.txt"
 
-S=${WORKDIR}/vim-${P}
+S="${WORKDIR}/vim-${P}"
 
 src_prepare() {
+	default
 	rm addon-info.json *.md || die
 }