gentoo resync : 18.11.2018

5 files changed, 6 insertions, 79 deletions

diff --git a/dev-util/checkbashisms/Manifest b/dev-util/checkbashisms/Manifest
index 5b06fb7ff54e..f8741b0183ed 100644
--- a/dev-util/checkbashisms/Manifest
+++ b/dev-util/checkbashisms/Manifest
@@ -1,9 +1,6 @@
-AUX checkbashisms-2.15.9-command-vV.patch 1269 BLAKE2B 78225d721d72871dd5512f2adc3f2d6e12c6aef55c5b712f925ecd4555eb5ebc26b865f17ee02181f1b01aa22b4cee8ff66afbfbbc69e1b337c7a6bacf129dcc SHA512 7b7966b2c5fc672b0a83f7949076af536a56e910853374b2ee876ad5032f847bd87c7d10c7836d9699e2a4412709b02f5769685acd392e94704549de639ea995
 AUX checkbashisms-2.18.6-command-vV.patch 1155 BLAKE2B a9255aab4b358c09a211c06bc1f2357c9eb653a1d05b18f9be87e7bca47c251dd2ed9a841fd4d5e46fbf82632e2fed50d86f5e2de8a4edbe09a6e0c819e9dc7f SHA512 91f002981b918e35fff1ca9cb30a5b3f5a56f392d0222a3cce3ee1215bce529e58ff938c049e6823975825f8ebfc2d0da583fe1c360ad849b1a306aa09ef013f
-DIST devscripts_2.18.2.tar.xz 729456 BLAKE2B f620edf67f67e84697677117294b9d8bc90db30fe1e228d5043179d1ae1e65f10f7299870bef3ff920312fd7103abd6c5f0296055776318640a3a9535ec006c7 SHA512 a68e9eccb5662b1ae0860b3f6cdc812a3105df83cd36f4b98b339ba1637a165f45b06acfb9dbadcf1055b65a4d5aa0780c1b921ed422ed1f0334735adadf4b6a
-DIST devscripts_2.18.4.tar.xz 740128 BLAKE2B c43867b79904ebb72fbe0f65e0c5a49100dfe435f867afc3c3f40b33dabba25a5cb07cd9e27780b0198da4800a17be3f2de6ea8aad504b281b79dd1df59baaed SHA512 91a0ab2fa1f8d884d79f62d5cc8170c885c24af51de321a41f2111fe0fbc0fd8394e5fb3825eeee14d8090968be35761080a40cb55339b09522219d974f63897
 DIST devscripts_2.18.6.tar.xz 756772 BLAKE2B 70bdc87336558a6953fc91408fdb7e639f6fc60f8e698548d34aabd6384c2a1d67b871064f3679842c7629b2f84a3abe8612dfe3924552488a0b3e54ec0ca10c SHA512 6bbd5ab2ac522bf4201cf57cc481d3885dd26b0a57338812b5a7ae10ca4575a2942b84b6bd05934898551eae7263ed28f0f7d8d295d055aa5c80111da1531014
-EBUILD checkbashisms-2.18.2.ebuild 893 BLAKE2B b3c7bc34946290f64a7d4c42ab24f93cb6a3c991baedf308dcee394957f546b8e3ab4d6593c60ce54eb6d66d9fabe499b4a50e772bf8dfd675a04fccc637bcd2 SHA512 22d4192fc8910faab251ac0127eeff9be1a28d42ed849c0a8dc4963d0def30a7b398691016d74f853fdcb785885e4c7beb3c24e8f22441b45394163c405bb1ca
-EBUILD checkbashisms-2.18.4.ebuild 895 BLAKE2B 52481361dbca66b0c706e80bc264dd3a8a15f461819df7ccb188c46d17e3aeb0a5e2de6833912e846ac0e21eae3e857486def02a07b95bf28c0d93822fc11c43 SHA512 f0a1ce1e79e0a480c1d901863a834b177cdc48b1457512f7904b0ec8ca1313767971f75d1f8a466e08f1d22f38a47656a64c372956b430c5131a67d473e6f7d2
-EBUILD checkbashisms-2.18.6.ebuild 892 BLAKE2B 2f56507c4802ab52e4567abb7c99ffab7170d7ffbcea6668bd875daf6311c5eae18d1b5be5a4fad969f82cba515c0ad3f1a2cb81407fddba7efdf39881c1ef36 SHA512 139b93b4a2e705f0a0ed76cd1a340c29419fb54f41a0e74b5a1604f0254b5088b6fe019b19642ece7e3af13ed6aa2b4baa805d91a223b0ecac9d571901b5548f
+DIST devscripts_2.18.9.tar.xz 767964 BLAKE2B bd955545753b52c98b727b13469e34a608a5fc7f54d8e641ed061d88e0a19a0cae22e89d901714a30d186d2725c68de15a25a551409f9cb68b78fb149a7cd104 SHA512 a17d7a25c72a7c558b1b4f536dd5ac76b3e96904ed732cf9a8fd02b5d78765833c6a3aedc5d27e9f399d445da7a06be76bde581c2b63f5c54227d2525ae1cd29
+EBUILD checkbashisms-2.18.6.ebuild 890 BLAKE2B dc319928f16962b09b62a01fe930159deb5989ee5c7c5295ab2a335fd95fa9df2b64c79365a79b6243bfe9f7dce1f2041de3547ef1dafcd6eafca04bc8d73272 SHA512 124a159fd7bb9c030f99c7840d18d4a88c838dcda02417e5a72798f43caf57550f95be8ec19342fa6c4d4f379028efee5c48afe8d777748fe9083e0ee8bb5b49
+EBUILD checkbashisms-2.18.9.ebuild 892 BLAKE2B 2f56507c4802ab52e4567abb7c99ffab7170d7ffbcea6668bd875daf6311c5eae18d1b5be5a4fad969f82cba515c0ad3f1a2cb81407fddba7efdf39881c1ef36 SHA512 139b93b4a2e705f0a0ed76cd1a340c29419fb54f41a0e74b5a1604f0254b5088b6fe019b19642ece7e3af13ed6aa2b4baa805d91a223b0ecac9d571901b5548f
 MISC metadata.xml 433 BLAKE2B b54d1290789d3ce8931f832c8c1ca7a56fbdebe85c0a81c32a929168fdf2d5a7be0dea01881e8fcc583061db1a071d1787723c9342c77a5862e228f0203c178b SHA512 945c3b95a61d4219e98ce5be3aed255cb148867409aca572714e8679bf623ee0c3396966cd80d783ace60bae7e6c01b85fad6c7f7ac9056422d732ed07f54716
diff --git a/dev-util/checkbashisms/checkbashisms-2.18.2.ebuild b/dev-util/checkbashisms/checkbashisms-2.18.2.ebuild
deleted file mode 100644
index bc30ea8cdf00..000000000000
--- a/dev-util/checkbashisms/checkbashisms-2.18.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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://anonscm.debian.org/cgit/collab-maint/devscripts.git"
-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
-	!<dev-util/rpmdevtools-8.3-r1"
-
-S="${WORKDIR}/${MY_P}/scripts"
-
-src_prepare() {
-	default
-
-	eapply -p2 "${FILESDIR}"/${PN}-2.15.9-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.18.6.ebuild b/dev-util/checkbashisms/checkbashisms-2.18.6.ebuild
index 16cbdc16f649..17da65326d1e 100644
--- a/dev-util/checkbashisms/checkbashisms-2.18.6.ebuild
+++ b/dev-util/checkbashisms/checkbashisms-2.18.6.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/checkbashisms-2.18.4.ebuild b/dev-util/checkbashisms/checkbashisms-2.18.9.ebuild
index be58ae776f20..16cbdc16f649 100644
--- a/dev-util/checkbashisms/checkbashisms-2.18.4.ebuild
+++ b/dev-util/checkbashisms/checkbashisms-2.18.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -27,7 +27,7 @@ S="${WORKDIR}/${MY_P}/scripts"
 src_prepare() {
 	default
 
-	eapply -p2 "${FILESDIR}"/${PN}-2.15.9-command-vV.patch
+	eapply -p2 "${FILESDIR}"/${PN}-2.18.6-command-vV.patch
 
 	sed "s@###VERSION###@${PV}@" -i checkbashisms.pl || die
 }
diff --git a/dev-util/checkbashisms/files/checkbashisms-2.15.9-command-vV.patch b/dev-util/checkbashisms/files/checkbashisms-2.15.9-command-vV.patch
deleted file mode 100644
index 662ccdfd2bea..000000000000
--- a/dev-util/checkbashisms/files/checkbashisms-2.15.9-command-vV.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-https://bugs.debian.org/733511
-
-From 50dac50bdfa7ab482bf2277cc1a620a62629c80c Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Tue, 10 Nov 2015 19:39:19 -0500
-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 045328c..fe64a6b 100755
---- a/scripts/checkbashisms.pl
-+++ b/scripts/checkbashisms.pl
-@@ -644,7 +644,7 @@ sub init_hashes {
- 	qr';;?&' =>  q<;;& and ;& special case operators>,
- 	$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>,
-+	$LEADIN . 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"'"'>,
- 	$LEADIN . qr'trap\s+["\']?.*["\']?\s+.*(?:ERR|DEBUG|RETURN)' => q<trap with ERR|DEBUG|RETURN>,
- 	$LEADIN . qr'(?:exit|return)\s+-\d' => q<exit|return with negative status code>,
--- 
-2.6.2
-