gentoo resync : 12.05.2022

4 files changed, 6 insertions, 54 deletions

diff --git a/app-vim/gentoo-syntax/Manifest b/app-vim/gentoo-syntax/Manifest
index b533216e3733..059570809770 100644
--- a/app-vim/gentoo-syntax/Manifest
+++ b/app-vim/gentoo-syntax/Manifest
@@ -1,8 +1,6 @@
 DIST gentoo-syntax-1.tar.bz2 20223 BLAKE2B 846e07354660b4859cc4131a9fbf4f78d3a2ddeda60fc6a3687b649788a52725602dcd22befa9ab9fe88b173eab1470e569076d587326935efaf40d3aaba5b57 SHA512 1e4d947f0edbf6bd24142d683944f30d43b7e0ca86b90311f2e80516d299d9a634a9842cdc90d98a43e7a693f0dd29b3ff8048256bc3fe688591cc2b84808289
-DIST gentoo-syntax-20211208.tar.bz2 18844 BLAKE2B 52e7025d46f5101f2e1c44afcbf3cba0756a1ec9c626f7af312bb5bbae518645c06c94bfc48822a721e2e3c1ed5f61376e88a074a9688cf4b5b3c352a99c87c9 SHA512 f1cfe2af440f7ed3042cbaa16558cb6df8038f439a2c3e7067f81751a37098854a3afb1653c7c3656ef85ad1874d2db9271429b92a25f494da6ee5c68819e631
-DIST gentoo-syntax-20220220.tar.bz2 19433 BLAKE2B 8f7fbbb56e41f4d682c824deb980035441195785f9ce80fd45808b55cf900c8e0455b5c670f82b1fc639c052792b78de5f0be1142eab853b0cabbd44c6ed0776 SHA512 4b515ca7936a16279c48310d1fa0f58979e35b1d84a2971bdcf4a004784efa3de99619851ac9da5ee0ee77a1f65eb28550d01013cffebd45e39fb70c0136ba12
-EBUILD gentoo-syntax-0.20211208.ebuild 1274 BLAKE2B 5ef76f5a16f1849bfaa45e993ffd9799862c04d643257345c1f84e64797bbabb445a25f6583b144221fe3dee2e8ded2764761dae3d25f00993481edf126f7ef3 SHA512 80ba1eb21d945456b35b58486b6bf9e2977bd94052d24ddf62e1aed0a3d9d3d785290cf2ec7b4e02fdf836973c081df9eb7f99cd155b2a0eae24b0f066b6da42
-EBUILD gentoo-syntax-0.20220220.ebuild 1282 BLAKE2B 1bae86a312e594bcb56a40214cec4ec6e863c4505cb576a70c08540b94854ce24f6f5dc127c06e46b873a67d5c5088a6beb68dd413efa8034ddaee9987f28f87 SHA512 c6897577534a85ae8c3569cf7b0968c17aba1e2f05f122b5331d1421fba1114ddd601f4bf06701b37a50d81cb504261c86702cd9896c9d08fefcce2b32c2b7e4
-EBUILD gentoo-syntax-1.ebuild 1245 BLAKE2B 71ea9ab3c87dd575d19f1f7986907935bf4c79453e81f5cad8d0024d699235ba31fbf46e1744c66415db38a227efd429707e5f0b7db44b338d628629755c282c SHA512 b5051f6010ce59f50ed6d2ff9746634ec7c41bd942e7fb41143dfc73791b2be9009d56c2aea06762428be47a84b9f84ef563b15c262281b198b8ead24a81be67
+DIST gentoo-syntax-2.tar.bz2 20302 BLAKE2B fa15fe5e8ef547dfa402b1742df3d6d38231528bcf6c6836e4d31e81ec2bce55ffa8c10400823c97688304f9dc6324ed3d257939c3077eb29a2fc3c191295604 SHA512 30e8e374382dc736febd1ee8031a7ccc14dfc61feade1815e3366988658189ac8670ff26532436ae608ff66c828e2de7327d0b39db37967206bcd9f418d26ea2
+EBUILD gentoo-syntax-1.ebuild 1237 BLAKE2B 97c0e1be20dbab9458fc99be41cceace51a65d1c6f5a0625c15969f085de2a6fe1c86644c62ee8986e4847990298a7a268f3381f49fe84bef38f3a6fcd4641d9 SHA512 12fabdaa606389dc3bb7b66ae9e4ba8ed483b553afe5024ef634491aa6f27b3e2626134f3203cf29e683444bc468d8a1fe9d8d8e394ba055fb41b77bda398eed
+EBUILD gentoo-syntax-2.ebuild 1252 BLAKE2B efe97f349f322617777896e67c35834a3903c7476a2418a7c48301b6b059e27e8a16774654236f4939e2e193581d6972cb67ec32027ef7c4377eb368d94037a0 SHA512 31708b68942f1ee7c38960c34ebe0601799147632a5dd38645cffa8c2c13c715814f276bfbdc86efe6b0fe34c7f7655037df87ef4651fe95b90b475f1c9afb2b
 EBUILD gentoo-syntax-9999.ebuild 1084 BLAKE2B 5e2edf4d1eddb74486a7ef6c8025a2874591d90d0ff1bb5077781f3c66d43bfbebf0421561a7c730e1baff613776c0962c907aec502a6627d8361034b28e1bf3 SHA512 4af267e60fcf53b736c41232cb44241d2181afd3b38516a6e4a7a7b7ea83db10a4fec7272b362847bf773296f348a2b08503ce757886a14ff08a215ba5341194
 MISC metadata.xml 586 BLAKE2B 9425e6a21617f806a0232c7f0ff75f148dc6855679236c9c2b88270db48161d3bffcb32066b372dc6af9cbac594f9d9dce6447d03fc675c151e75982f86ba598 SHA512 cb343dede228edd5c51dc2b2f6b8a1f09e4847365284218d5eb0c23c675f32fe4ab5025c6671f1dafbb63a87b83763a9caf97b04945329c32a1898123149d04b
diff --git a/app-vim/gentoo-syntax/gentoo-syntax-0.20220220.ebuild b/app-vim/gentoo-syntax/gentoo-syntax-0.20220220.ebuild
deleted file mode 100644
index 3cc000eb8ff3..000000000000
--- a/app-vim/gentoo-syntax/gentoo-syntax-0.20220220.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit vim-plugin
-
-MY_P=${P/0.}
-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/${MY_P}.tar.bz2"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="vim"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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-1.ebuild b/app-vim/gentoo-syntax/gentoo-syntax-1.ebuild
index cc256f13f274..e0439d327e3e 100644
--- a/app-vim/gentoo-syntax/gentoo-syntax-1.ebuild
+++ b/app-vim/gentoo-syntax/gentoo-syntax-1.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 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="ignore-glep31"
 
 VIM_PLUGIN_HELPFILES="gentoo-syntax"
diff --git a/app-vim/gentoo-syntax/gentoo-syntax-0.20211208.ebuild b/app-vim/gentoo-syntax/gentoo-syntax-2.ebuild
index 5676ffe9c190..6a2bb2bc0937 100644
--- a/app-vim/gentoo-syntax/gentoo-syntax-0.20211208.ebuild
+++ b/app-vim/gentoo-syntax/gentoo-syntax-2.ebuild
@@ -5,15 +5,13 @@ EAPI=7
 
 inherit vim-plugin
 
-MY_P=${P/0.}
 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/${MY_P}.tar.bz2"
-S=${WORKDIR}/${MY_P}
+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 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="ignore-glep31"
 
 VIM_PLUGIN_HELPFILES="gentoo-syntax"