gentoo resync : 12.03.2021

8 files changed, 6 insertions, 199 deletions

diff --git a/dev-util/checkbashisms/Manifest b/dev-util/checkbashisms/Manifest
index 529e4bcb8f9a..84bfd96868ef 100644
--- a/dev-util/checkbashisms/Manifest
+++ b/dev-util/checkbashisms/Manifest
@@ -1,14 +1,5 @@
-AUX checkbashisms-2.18.6-command-vV.patch 1155 BLAKE2B a9255aab4b358c09a211c06bc1f2357c9eb653a1d05b18f9be87e7bca47c251dd2ed9a841fd4d5e46fbf82632e2fed50d86f5e2de8a4edbe09a6e0c819e9dc7f SHA512 91f002981b918e35fff1ca9cb30a5b3f5a56f392d0222a3cce3ee1215bce529e58ff938c049e6823975825f8ebfc2d0da583fe1c360ad849b1a306aa09ef013f
-DIST devscripts_2.19.7.tar.xz 847488 BLAKE2B b3c76d9b0899c01f08d0432f8de0a65d1434afffd35eda33b6c7f442796c2165cdb316290d41313876cd5ef8108e0bba03d173dd52c139908672a6f3d6902588 SHA512 6e31862bc8f0d43678341f40ec527d76cdccc2e6e50c231eb7c6a1eb442f48b6c62e94126644224e9fdbef583be3166e2c7cc65ea15de4a7c20605089b708eb7
-DIST devscripts_2.20.1.tar.xz 854932 BLAKE2B b9523b2882625b66c7972db7c10f7d3f6055cb791b5697f92fc0e362c1b2a89ac26fc2a45739989ae9f9981c956d90ceefd514645649d1b7fca6d7eeaff9df7d SHA512 6e9505f491bf87df6c0ac384cbf307959fd86e3aea1aecd7e70e88bbe57757035612235bad0244dc7aeedcf964605508f7fd5db582b410dd715380a064389d1d
-DIST devscripts_2.20.2.tar.xz 854948 BLAKE2B ca36f2d8d4f3d975479134d02ee4c035f7f32e087be523560c2c06d7625047fcf78d0428d1e4addcfa38a299befdd23b88ab3fbbef2028f67f8b7c9f8851c29f SHA512 d9147604a718582a19c036a040c62612427163146048dbf9e3665545072e8132d08f51dccfd3f0a01453c0405a0326dad8f83afd10270eec5c69fa0612cb8510
-DIST devscripts_2.20.3.tar.xz 859612 BLAKE2B 074905e621234c60e26a014831a021b51f5f8fbdac4d6fa3a17aa98f994b4c171404a2326f5b00565f365469b41f1c7e5f03b6efa29f809b51bbabde209cafc2 SHA512 6d86deeecff82fc16df7d978678f5b88293164688078bf0732a7e6b844cf8845868be31c107518cf43b8dbcbadcd12a9691585f5725abd397f63ff9456fbdd8f
-DIST devscripts_2.20.4.tar.xz 860604 BLAKE2B 05c486ed024964ec03f9e5396e739389010a2c51a4d01be14b4959aa86bd09ca426bbfbfa7657c87e54aec8497fbfc90064073310fb1af916b32142ff63d3137 SHA512 49e9ae38ca3682f399a17f2108a7ee15198dc955d8c7c4c1b043456c19cb35b47b6116de9a2cfaccbdd7560e79426ca0953674e5a89ac226d21af2c1cf847e5c
 DIST devscripts_2.20.5.tar.xz 881976 BLAKE2B 3d4079d3268b3b9bfacdd0a4afcfee5390bdbf4660038306611d9c24e7b5c6453eff5f24d938c9764a17336475cd60615919adaa11dcf47495d930cd4b3b4e09 SHA512 fbd372a62758e3d2872f37bfd93d9b169d0cc745719057078378949c4d01b4fb27830ae501fe45b06b30a869e8afc853d8477419bb2f46d7fd62749f54981ec0
-EBUILD checkbashisms-2.19.7.ebuild 842 BLAKE2B be6ec30a86a521baba5ffea3003dd5e77973c71b83409d91448638c8a33de24f1e4ac5daf00dc215f124c8c3628868f735f3ee41f4d59054f899b18d3a49c8d4 SHA512 39a3a939f89146e7c1f673f7123ace5580b2f9ef31b254a3174f4ad9911a6bc46293bad1850e872f05d4ed798e16530fbbc0059b8b5279086c35a6a2d443d6a2
-EBUILD checkbashisms-2.20.1.ebuild 844 BLAKE2B 32ae094871d3c8854b76228ff850385b7ad6ef8acc540adf30daec20890014ff3ce9c28ff60a36172293b9349b765bf8a88f98e36cc064282862e5ccca5d78bd SHA512 69ae2da6c4f081fc81fe7a216f0d3f852a68ceb6ff54c2041130008bdc9cd1ba7cfe639cf4cf15f867dc024507d8a57f92a9d126bd3e7caf754f2e55564e717a
-EBUILD checkbashisms-2.20.2.ebuild 844 BLAKE2B 32ae094871d3c8854b76228ff850385b7ad6ef8acc540adf30daec20890014ff3ce9c28ff60a36172293b9349b765bf8a88f98e36cc064282862e5ccca5d78bd SHA512 69ae2da6c4f081fc81fe7a216f0d3f852a68ceb6ff54c2041130008bdc9cd1ba7cfe639cf4cf15f867dc024507d8a57f92a9d126bd3e7caf754f2e55564e717a
-EBUILD checkbashisms-2.20.3.ebuild 787 BLAKE2B 6bda04ce6fdbdbade2d28bef48d153adb73aa5f385b6cbcbe83966240cbfb2576372d0fa1ba7acd2c977376129ab8b1c9d4691c0882467f96d949fcae1842fad SHA512 67e1df0ec01650605b34329d075db5fe3489cd6f6b9907f52f17583727d86e2aa743f4fc123328207194f8259e220a4caaa6ec7dbbabec58fb4965ce4becf251
-EBUILD checkbashisms-2.20.4.ebuild 785 BLAKE2B d0a5bf4112c10c3b46ae63320bcc6a5503bf07215353d5ef5dcd86a30b5028418cbb94b48e79f3846a664ec8a65a7075193c8a2ec52d9b699557709cdc982ce1 SHA512 d112b95caa864ae6faa7d09f3f13d8f758ad6603d19abc1882926de0d132eadde4f28033b773b53289cb5246616b6bee7e53dae5a359edba7ce31d0e1cc22ee9
-EBUILD checkbashisms-2.20.5.ebuild 787 BLAKE2B 6bda04ce6fdbdbade2d28bef48d153adb73aa5f385b6cbcbe83966240cbfb2576372d0fa1ba7acd2c977376129ab8b1c9d4691c0882467f96d949fcae1842fad SHA512 67e1df0ec01650605b34329d075db5fe3489cd6f6b9907f52f17583727d86e2aa743f4fc123328207194f8259e220a4caaa6ec7dbbabec58fb4965ce4becf251
+DIST devscripts_2.21.1.tar.xz 887812 BLAKE2B 3eac4adfe1dfc85ffcc5b9f30ec29377f253596c2377bb81456c20848aae7376fce6b24c5c9b75d284ca7f46251db13e3ff89d1efc1f312229d93883b09d07df SHA512 5bcdd1cc8138e2e1aab2efd948cc104aee138b64e93059e929d8365afe1a1a92fac88586186ab53294d17104c661f2e29102bdcdd55f1b73d24be287615207ad
+EBUILD checkbashisms-2.20.5.ebuild 785 BLAKE2B d0a5bf4112c10c3b46ae63320bcc6a5503bf07215353d5ef5dcd86a30b5028418cbb94b48e79f3846a664ec8a65a7075193c8a2ec52d9b699557709cdc982ce1 SHA512 d112b95caa864ae6faa7d09f3f13d8f758ad6603d19abc1882926de0d132eadde4f28033b773b53289cb5246616b6bee7e53dae5a359edba7ce31d0e1cc22ee9
+EBUILD checkbashisms-2.21.1.ebuild 787 BLAKE2B 114c5210a05e634ac2ebffb2c8e7ab771602a1475fba145a0cfa3fe988ef043880aad9aa613ae44a72cafc62e9af03ff928865b3c546425e3a80a166dadca0e1 SHA512 495d4336148137abd41f7d46b038d79d1e563993600616c812e46e77d4b00ac3b1bbda90d0c72bd01db307c835180899bc604edc87b7ab4b59ee1538374a3a7b
 MISC metadata.xml 433 BLAKE2B b54d1290789d3ce8931f832c8c1ca7a56fbdebe85c0a81c32a929168fdf2d5a7be0dea01881e8fcc583061db1a071d1787723c9342c77a5862e228f0203c178b SHA512 945c3b95a61d4219e98ce5be3aed255cb148867409aca572714e8679bf623ee0c3396966cd80d783ace60bae7e6c01b85fad6c7f7ac9056422d732ed07f54716
diff --git a/dev-util/checkbashisms/checkbashisms-2.19.7.ebuild b/dev-util/checkbashisms/checkbashisms-2.19.7.ebuild
deleted file mode 100644
index 31676455d318..000000000000
--- a/dev-util/checkbashisms/checkbashisms-2.19.7.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="devscripts"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Perl script to check for commonly used bash features not defined by POSIX"
-HOMEPAGE="https://packages.debian.org/devscripts https://salsa.debian.org/debian/devscripts"
-SRC_URI="mirror://debian/pool/main/d/${MY_PN}/${MY_P/-/_}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-# Requires python packages to check tools we don't need anyway
-RESTRICT="test"
-
-RDEPEND="dev-lang/perl
-	virtual/perl-Getopt-Long"
-
-S="${WORKDIR}/${MY_P}/scripts"
-
-src_prepare() {
-	default
-
-	eapply -p2 "${FILESDIR}"/${PN}-2.18.6-command-vV.patch
-
-	sed "s@###VERSION###@${PV}@" -i checkbashisms.pl || die
-}
-
-src_compile() { :; }
-
-src_install() {
-	newbin ${PN}.pl ${PN}
-	doman ${PN}.1
-}
diff --git a/dev-util/checkbashisms/checkbashisms-2.20.1.ebuild b/dev-util/checkbashisms/checkbashisms-2.20.1.ebuild
deleted file mode 100644
index f81681c580e3..000000000000
--- a/dev-util/checkbashisms/checkbashisms-2.20.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="devscripts"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Perl script to check for commonly used bash features not defined by POSIX"
-HOMEPAGE="https://packages.debian.org/devscripts https://salsa.debian.org/debian/devscripts"
-SRC_URI="mirror://debian/pool/main/d/${MY_PN}/${MY_P/-/_}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# Requires python packages to check tools we don't need anyway
-RESTRICT="test"
-
-RDEPEND="dev-lang/perl
-	virtual/perl-Getopt-Long"
-
-S="${WORKDIR}/${MY_P}/scripts"
-
-src_prepare() {
-	default
-
-	eapply -p2 "${FILESDIR}"/${PN}-2.18.6-command-vV.patch
-
-	sed "s@###VERSION###@${PV}@" -i checkbashisms.pl || die
-}
-
-src_compile() { :; }
-
-src_install() {
-	newbin ${PN}.pl ${PN}
-	doman ${PN}.1
-}
diff --git a/dev-util/checkbashisms/checkbashisms-2.20.2.ebuild b/dev-util/checkbashisms/checkbashisms-2.20.2.ebuild
deleted file mode 100644
index f81681c580e3..000000000000
--- a/dev-util/checkbashisms/checkbashisms-2.20.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="devscripts"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Perl script to check for commonly used bash features not defined by POSIX"
-HOMEPAGE="https://packages.debian.org/devscripts https://salsa.debian.org/debian/devscripts"
-SRC_URI="mirror://debian/pool/main/d/${MY_PN}/${MY_P/-/_}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# Requires python packages to check tools we don't need anyway
-RESTRICT="test"
-
-RDEPEND="dev-lang/perl
-	virtual/perl-Getopt-Long"
-
-S="${WORKDIR}/${MY_P}/scripts"
-
-src_prepare() {
-	default
-
-	eapply -p2 "${FILESDIR}"/${PN}-2.18.6-command-vV.patch
-
-	sed "s@###VERSION###@${PV}@" -i checkbashisms.pl || die
-}
-
-src_compile() { :; }
-
-src_install() {
-	newbin ${PN}.pl ${PN}
-	doman ${PN}.1
-}
diff --git a/dev-util/checkbashisms/checkbashisms-2.20.3.ebuild b/dev-util/checkbashisms/checkbashisms-2.20.3.ebuild
deleted file mode 100644
index 1d567b48dc59..000000000000
--- a/dev-util/checkbashisms/checkbashisms-2.20.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="devscripts"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Perl script to check for commonly used bash features not defined by POSIX"
-HOMEPAGE="https://packages.debian.org/devscripts https://salsa.debian.org/debian/devscripts"
-SRC_URI="mirror://debian/pool/main/d/${MY_PN}/${MY_P/-/_}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# Requires python packages to check tools we don't need anyway
-RESTRICT="test"
-
-RDEPEND="dev-lang/perl
-	virtual/perl-Getopt-Long"
-
-S="${WORKDIR}/${MY_P}/scripts"
-
-src_prepare() {
-	default
-
-	sed "s@###VERSION###@${PV}@" -i checkbashisms.pl || die
-}
-
-src_compile() { :; }
-
-src_install() {
-	newbin ${PN}.pl ${PN}
-	doman ${PN}.1
-}
diff --git a/dev-util/checkbashisms/checkbashisms-2.20.5.ebuild b/dev-util/checkbashisms/checkbashisms-2.20.5.ebuild
index 1d567b48dc59..a2183decd385 100644
--- a/dev-util/checkbashisms/checkbashisms-2.20.5.ebuild
+++ b/dev-util/checkbashisms/checkbashisms-2.20.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="mirror://debian/pool/main/d/${MY_PN}/${MY_P/-/_}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 # Requires python packages to check tools we don't need anyway
diff --git a/dev-util/checkbashisms/checkbashisms-2.20.4.ebuild b/dev-util/checkbashisms/checkbashisms-2.21.1.ebuild
index a2183decd385..f10c85c3af96 100644
--- a/dev-util/checkbashisms/checkbashisms-2.20.4.ebuild
+++ b/dev-util/checkbashisms/checkbashisms-2.21.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://debian/pool/main/d/${MY_PN}/${MY_P/-/_}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 # Requires python packages to check tools we don't need anyway
diff --git a/dev-util/checkbashisms/files/checkbashisms-2.18.6-command-vV.patch b/dev-util/checkbashisms/files/checkbashisms-2.18.6-command-vV.patch
deleted file mode 100644
index 44455e3097b0..000000000000
--- a/dev-util/checkbashisms/files/checkbashisms-2.18.6-command-vV.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-https://bugs.debian.org/733511
-
-From 9c2109e0d16473a7e80961558b112f8071aa5877 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Tue, 9 Oct 2018 14:23:27 +0200
-Subject: [PATCH] checkbashisms: allow `command` to use -v/-V
-
-POSIX permits the -v/-V options:
-http://pubs.opengroup.org/onlinepubs/9699919799/utilities/command.html
-command [-p][-v|-V] command_name
----
- scripts/checkbashisms.pl | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/scripts/checkbashisms.pl b/scripts/checkbashisms.pl
-index 3044634a..60005cd4 100755
---- a/scripts/checkbashisms.pl
-+++ b/scripts/checkbashisms.pl
-@@ -699,7 +699,7 @@ qr'(?:^|\s)(?<func>function\s)?\s*(?:[^<>\(\)\[\]\{\};|\s]*[^<>\(\)\[\]\{\};|\s\
-         $LEADIN . qr'jobs\s'   => q<jobs>,
-  #	$LEADIN . qr'jobs\s+-[^lp]\s' =>  q<'jobs' with option other than -l or -p>,
-         $LEADIN
--          . qr'command\s+-[^p]\s' => q<'command' with option other than -p>,
-+          . qr'command\s+-[^pvV]\s' => q<'command' with option other than -p/-v/-V>,
-         $LEADIN
-           . qr'setvar\s' =>
-           q<setvar 'foo' 'bar' should be eval 'foo="'"$bar"'"'>,
--- 
-2.19.1
-