gentoo resync : 20.03.2022

8 files changed, 57 insertions, 12 deletions

diff --git a/app-vim/Manifest.gz b/app-vim/Manifest.gz
index 0971028785eb..818c4e40b5a5 100644
--- a/app-vim/Manifest.gz
+++ b/app-vim/Manifest.gz
diff --git a/app-vim/eselect-syntax/Manifest b/app-vim/eselect-syntax/Manifest
index c1ad000e0331..1682194373a2 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-r1.ebuild 573 BLAKE2B ce23e0c59f5730f6bb28e0e17e56ec33a965122b1a8da9b1b14a213793ec92f2fd31d587926a7a13fee8686ed49225ea9f35c22df723a081f27093d3be45ae68 SHA512 d00336e246dc8bb54cea796338fe99466ba81316d6a1654d2e37fa4bcec4b1fc864181760826fd6c27207f2532bed04a4906a86c1c958ad45e1543492b58c2ab
+EBUILD eselect-syntax-20070506-r2.ebuild 510 BLAKE2B d83f236d56e7847658772488ef1ae2e326f94c96a6e73886514dca1ef6c931dce1920b2fe98cab98e9c1b3bc3cf7907250fff580111dce0845d98d7697eefd03 SHA512 14a65f9ccba760beb97f9d9e5ad3f6830831e10a02ea764a98abe7d185fa80bada1827e60779741c4019994c77439453b1fe8f4949e641c6d37b3d23bcf6697d
 MISC metadata.xml 250 BLAKE2B 159edb6cbbe3884fd7b328cba2125da0a51b5c0be964e60b708efe1bd040a41abdf16f8dbcfaecb9e6e1073528ac99195a08d7045d433414ec2ba1c94d582761 SHA512 6c29f24b33b8829463103cee99e2cf65cf550aa1d6c60c5a746ca2947a97a052969c8dfb9d12ae8114db0971626f9246cb9e4808d951eeae78321325da1ac32a
diff --git a/app-vim/eselect-syntax/eselect-syntax-20070506-r1.ebuild b/app-vim/eselect-syntax/eselect-syntax-20070506-r2.ebuild
index 931982222d19..9fcace9055b0 100644
--- a/app-vim/eselect-syntax/eselect-syntax-20070506-r1.ebuild
+++ b/app-vim/eselect-syntax/eselect-syntax-20070506-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,8 +12,5 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 LICENSE="vim"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
-DEPEND="!<app-vim/gentoo-syntax-20070506"
-RDEPEND="${DEPEND}"
-
 VIM_PLUGIN_HELPFILES="${PN}"
 VIM_PLUGIN_MESSAGES="filetype"
diff --git a/app-vim/gentoo-syntax/Manifest b/app-vim/gentoo-syntax/Manifest
index 4c572a1db013..b533216e3733 100644
--- a/app-vim/gentoo-syntax/Manifest
+++ b/app-vim/gentoo-syntax/Manifest
@@ -1,6 +1,8 @@
+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-20220126.tar.bz2 19267 BLAKE2B c18f50e29f4aa75e4cc8d629b5086de3cef629b99454389bfe5eecbc61288e4344921360a2d64ea021be7f0269178e6348abf0d1481e0fc8b88e16a16fb73215 SHA512 bbedf2bf98eaf7b80abac2e6a66dcbba2f5024f1a4327535e5d956c4c034fa9be0395a36784a576caeaee81df27eb153687238388bfc2aeaf210498d8377c99d
-EBUILD gentoo-syntax-20211208.ebuild 1237 BLAKE2B e4376fc40d3d7c829e253383c0744e4369d312657a539b5d82387128c50c2ae35431207171d9f9a312e7350485c7f2c417d07c665fa345b5193964489a1727f5 SHA512 e692cfa8d4e37e9bfa6bea96c7948e1230a6ebf7bdb7601980e3f918fdec8e69d7e7273e6979ea3ac36446c2c7040e79e09e42d185e8e915d00286cd6c693521
-EBUILD gentoo-syntax-20220126.ebuild 1245 BLAKE2B 71ea9ab3c87dd575d19f1f7986907935bf4c79453e81f5cad8d0024d699235ba31fbf46e1744c66415db38a227efd429707e5f0b7db44b338d628629755c282c SHA512 b5051f6010ce59f50ed6d2ff9746634ec7c41bd942e7fb41143dfc73791b2be9009d56c2aea06762428be47a84b9f84ef563b15c262281b198b8ead24a81be67
-EBUILD gentoo-syntax-99999999.ebuild 1084 BLAKE2B cbe1d6aa8eca271a997dec67ba8ba3725e3c50d97ff2f1f18c169bd3ea84ed568390ffef00742d20748dec2ec9b98468a119fc10b62bd55cd05e0506227e58cd SHA512 e59ceccbaaeb0947a66c079380269acd431d9694a20b851c13d5772a610306db1ddb04e8d8173ad5b84723077dae034a60ac7d53ba448ae00e816fdc03dc9f61
+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
+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-20211208.ebuild b/app-vim/gentoo-syntax/gentoo-syntax-0.20211208.ebuild
index 9a1891798a14..5676ffe9c190 100644
--- a/app-vim/gentoo-syntax/gentoo-syntax-20211208.ebuild
+++ b/app-vim/gentoo-syntax/gentoo-syntax-0.20211208.ebuild
@@ -1,13 +1,15 @@
-# Copyright 1999-2021 Gentoo Authors
+# 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/${P}.tar.bz2"
+SRC_URI="https://gitweb.gentoo.org/proj/gentoo-syntax.git/snapshot/${MY_P}.tar.bz2"
+S=${WORKDIR}/${MY_P}
 
 LICENSE="vim"
 SLOT="0"
diff --git a/app-vim/gentoo-syntax/gentoo-syntax-0.20220220.ebuild b/app-vim/gentoo-syntax/gentoo-syntax-0.20220220.ebuild
new file mode 100644
index 000000000000..3cc000eb8ff3
--- /dev/null
+++ b/app-vim/gentoo-syntax/gentoo-syntax-0.20220220.ebuild
@@ -0,0 +1,44 @@
+# 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-20220126.ebuild b/app-vim/gentoo-syntax/gentoo-syntax-1.ebuild
index cc256f13f274..cc256f13f274 100644
--- a/app-vim/gentoo-syntax/gentoo-syntax-20220126.ebuild
+++ b/app-vim/gentoo-syntax/gentoo-syntax-1.ebuild
diff --git a/app-vim/gentoo-syntax/gentoo-syntax-99999999.ebuild b/app-vim/gentoo-syntax/gentoo-syntax-9999.ebuild
index 84646c286bac..a5cb9329196a 100644
--- a/app-vim/gentoo-syntax/gentoo-syntax-99999999.ebuild
+++ b/app-vim/gentoo-syntax/gentoo-syntax-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7