From 15557363f5c958f42eb40a6b3de47d3c813b84aa Mon Sep 17 00:00:00 2001
From: Lars Wendler <polynomial-c@gentoo.org>
Date: Tue, 9 Oct 2018 14:27:36 +0200
Subject: [PATCH] dev-util/checkbashisms: Bump to version 2.18.6

Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
---
 dev-util/checkbashisms/Manifest               |  1 +
 .../checkbashisms/checkbashisms-2.18.6.ebuild | 40 +++++++++++++++++++
 .../checkbashisms-2.18.6-command-vV.patch     | 30 ++++++++++++++
 3 files changed, 71 insertions(+)
 create mode 100644 dev-util/checkbashisms/checkbashisms-2.18.6.ebuild
 create mode 100644 dev-util/checkbashisms/files/checkbashisms-2.18.6-command-vV.patch

diff --git a/dev-util/checkbashisms/Manifest b/dev-util/checkbashisms/Manifest
index e7f16d6dd06b..fd32a4adb333 100644
--- a/dev-util/checkbashisms/Manifest
+++ b/dev-util/checkbashisms/Manifest
@@ -1,3 +1,4 @@
 DIST devscripts_2.18.2.tar.xz 729456 BLAKE2B f620edf67f67e84697677117294b9d8bc90db30fe1e228d5043179d1ae1e65f10f7299870bef3ff920312fd7103abd6c5f0296055776318640a3a9535ec006c7 SHA512 a68e9eccb5662b1ae0860b3f6cdc812a3105df83cd36f4b98b339ba1637a165f45b06acfb9dbadcf1055b65a4d5aa0780c1b921ed422ed1f0334735adadf4b6a
 DIST devscripts_2.18.3.tar.xz 731708 BLAKE2B bbd993b6dac144dd9a9e696133d1613fc88ca7fa31debf8478bb0a8232b811b9c6cdcf0989db29f478958f500c5f885e382700c0ea451675721254cdd4d42797 SHA512 3fcd2ff4eb97fbc8d8f768ca11f03b96de0f2ab0b8824e089556695c65521cf2e8e2d532968c07292818c8cd7ea93adaa508b40aebafbbf744bd6b78d249321b
 DIST devscripts_2.18.4.tar.xz 740128 BLAKE2B c43867b79904ebb72fbe0f65e0c5a49100dfe435f867afc3c3f40b33dabba25a5cb07cd9e27780b0198da4800a17be3f2de6ea8aad504b281b79dd1df59baaed SHA512 91a0ab2fa1f8d884d79f62d5cc8170c885c24af51de321a41f2111fe0fbc0fd8394e5fb3825eeee14d8090968be35761080a40cb55339b09522219d974f63897
+DIST devscripts_2.18.6.tar.xz 756772 BLAKE2B 70bdc87336558a6953fc91408fdb7e639f6fc60f8e698548d34aabd6384c2a1d67b871064f3679842c7629b2f84a3abe8612dfe3924552488a0b3e54ec0ca10c SHA512 6bbd5ab2ac522bf4201cf57cc481d3885dd26b0a57338812b5a7ae10ca4575a2942b84b6bd05934898551eae7263ed28f0f7d8d295d055aa5c80111da1531014
diff --git a/dev-util/checkbashisms/checkbashisms-2.18.6.ebuild b/dev-util/checkbashisms/checkbashisms-2.18.6.ebuild
new file mode 100644
index 000000000000..16cbdc16f649
--- /dev/null
+++ b/dev-util/checkbashisms/checkbashisms-2.18.6.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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.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/files/checkbashisms-2.18.6-command-vV.patch b/dev-util/checkbashisms/files/checkbashisms-2.18.6-command-vV.patch
new file mode 100644
index 000000000000..44455e3097b0
--- /dev/null
+++ b/dev-util/checkbashisms/files/checkbashisms-2.18.6-command-vV.patch
@@ -0,0 +1,30 @@
+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
+
-- 
2.26.2