gentoo Easter resync : 12.04.2020

3 files changed, 2 insertions, 46 deletions

diff --git a/app-vim/gentoo-syntax/Manifest b/app-vim/gentoo-syntax/Manifest
index 27b90fc9d1bc..077ac87b9151 100644
--- a/app-vim/gentoo-syntax/Manifest
+++ b/app-vim/gentoo-syntax/Manifest
@@ -1,6 +1,4 @@
-DIST gentoo-syntax-20191127.tar.bz2 18635 BLAKE2B 79db829602df5795e32c44db71e28cfcda06ef014e9d5e5cf47d6f7fcb0b054c46caef1bb594c4fceae318df8a8cd0c6a619771ae5438eb21deed530842ce53d SHA512 654b69cf55719b9c254c376364f404c393189ec70d7b8a9284349774e00118fb636dbfefa86eb57220a49a5a7324e9f0484879d69afb199bb1c8ae7f0b5e591e
 DIST gentoo-syntax-20200120.tar.bz2 18593 BLAKE2B c29dd3b3896bdb78e5c07b40474434c5ba6fa8b3a89f8ec237136d0474e8eaace8a72c7e3974ff63eaa24d3e57a1e61785bfc7889a93f7263ef9387caa651936 SHA512 ab57707b4a44f33c085a39eb745ca206312d84ca49680e24a462eb75d65cc37694a545f4a31b4ee2919d0f6b30276ce25f6caa7e20782511c7534bf2319e8a4f
-EBUILD gentoo-syntax-20191127.ebuild 1269 BLAKE2B 674e3275cd8cfc3ef228f2dba58cad7fe9beff17dd9b942dac839c2db36f19f1f5df457046931d972529036b231f05308f6ecae1a406fff975e9b6c7e3f3036b SHA512 30986bb0aa17e0ac348bf3dae95e102a3d74811a7d3fc5502ee2bec245658571022a156596d3e2c29a3294222c36305c6888a8f78e5a1c7f06d7afc31f1c58a9
-EBUILD gentoo-syntax-20200120.ebuild 1280 BLAKE2B 01ca8d12e6f0d3828e8efbc0bdb0e8cdcd902966044044911ad0e4204611bc92b20c19dd169000e1163c5e5cbaa0e6989b73464c142a5659a46e71cb850f8960 SHA512 c790cc5dda54ec29dda14a663e761b9b63da26efade0b5da67e3bd02869d47e9589ef5a53971b3a3567ab72bf6728651619a5cef5df34c243c599fc5189967be
+EBUILD gentoo-syntax-20200120.ebuild 1267 BLAKE2B 2125cad7c17742c180b62a1c2d70e4a74f39dc1382e18e47a9939fcf01eb6b70394f291a829eeae90a040efd1064bc872733fd3dcc62933f26a65ca9912ea5e3 SHA512 d6f8a3f65159d2fc82053a418c85e467cb1491799358ad90bf6b1247cf7503fabeffee1e316de4f74a272467bd3cff7a1b0a6e737ca7a40981331ebce96978b6
 EBUILD gentoo-syntax-99999999.ebuild 1087 BLAKE2B 9b7c64f1ec0215aa53e39c0c4db8352c47b19ee89a894dc95ef4a867415337ff901befaadf2ce468804e4167410c1d034002ca476c90925096875b3dc27b8868 SHA512 5f0e991bcc491e807ea86d89c47dcc8d6879c35d0f42d191a4e2cd4d40f117022e70cfb92503184e638273daed9780363066d07667c138592be1e1b6f4435b99
 MISC metadata.xml 585 BLAKE2B 7f904a47ab12627ae911fa96328c50af2cb16b785fa0b60cace8a586b17de344625b749b52ef6b89b4751aba74bc25339b3e6c9105ee47d15b5c6539b5d902ee SHA512 dfed3c4c2b3697b00896591dc4b23eb6433ce77b4aaaab05119ca0b11e355e321b2cf5f0ab5e0b2dd075abd1a266908e07b80846a11d50f17155d7ab35e6c742
diff --git a/app-vim/gentoo-syntax/gentoo-syntax-20191127.ebuild b/app-vim/gentoo-syntax/gentoo-syntax-20191127.ebuild
deleted file mode 100644
index 6971fe843bc1..000000000000
--- a/app-vim/gentoo-syntax/gentoo-syntax-20191127.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~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-20200120.ebuild b/app-vim/gentoo-syntax/gentoo-syntax-20200120.ebuild
index 8390f974fc5c..da8ce1cf391a 100644
--- a/app-vim/gentoo-syntax/gentoo-syntax-20200120.ebuild
+++ b/app-vim/gentoo-syntax/gentoo-syntax-20200120.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 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~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 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~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"