gentoo resync : 11.05.2021

3 files changed, 62 insertions, 8 deletions

diff --git a/dev-util/shellcheck/Manifest b/dev-util/shellcheck/Manifest
index bdbbc1d6b962..bbf4c62042c3 100644
--- a/dev-util/shellcheck/Manifest
+++ b/dev-util/shellcheck/Manifest
@@ -1,3 +1,4 @@
-DIST ShellCheck-0.7.1.tar.gz 163288 BLAKE2B efc8c56348ba924baf660ae16d84e023cdd1a5ef8b355b492844ca41aeb3242eb1e5862bea7f12c69fa43cce285a44afaf95125816f62fbe316d9bdca467b1ae SHA512 fc84bd67e30af1378a92c1e378693a2c181e9567d53f2590e76aedb9f607276b90abd2ac83818c36524bd77a480df347af5a0879a925a846f35440ab207fad8a
-EBUILD shellcheck-0.7.1.ebuild 849 BLAKE2B 2365d8fc4a090efeae8d407a4f9bcba47446276bcbfd3e3ec8cca544766651593b5d0ef7963f2f59e520393fe5027331fc0b9dc1679e61b755b208c320610b08 SHA512 b3e2ccb90f1405940aa7a373ba92de9d0329826ba5ed7f7b85c3ff0ec57b4ac1f50a1944fd14c6c5b32666df425c72470795833adec930f83f27905c6fa0d74b
+AUX shellcheck-0.7.2-haddock.patch 2125 BLAKE2B 4e31c5b3a74235af69601ae01c1ad8e3ab5fd334dc55a34e858ce6e5dd81eaef0028750b480a81b8b9abca31f670c2952d3a67464ffbb03271d5ae9b50e21555 SHA512 f9e94857c5ca6e082a03dc7aa60cb07d95e55d114cec10e2db6a47e3ad1e0035cc5befb9e84062590b365baea5246fc6366dcc06fa9f48020f7e3d460d168338
+DIST ShellCheck-0.7.2.tar.gz 173937 BLAKE2B ac5b6c4aec9a9bb736e1218726780e9f97775ad5f144e5862daf24a88fe0bf24404b58880638e03ceeb02ff5ca84027727ebd637a82f8ae272dc18bc14d5c532 SHA512 ec77038763b3520deef3838d0f51f06bc3d755945f519b19be09765b3122f0251f00cd4907cb60c38612161b0c03f73025e0f52b3c47e22855f0b0e3ff5f81c5
+EBUILD shellcheck-0.7.2.ebuild 883 BLAKE2B c8e396834e75fb1de51f618893e47afae3ca8b437def1a03bbeb1e895d408e542ec29f04c0b2c7d9f4740d8d157327af48eead9380299b7992ab925d80314c43 SHA512 adfa31b075abbdd1641e91081c3500c39d2581f9df6d6eccb1e193f811bf3ac32b5c0d8defc681372b42289f4f47f8f39c63382985698f8817173ec2733d508a
 MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-util/shellcheck/files/shellcheck-0.7.2-haddock.patch b/dev-util/shellcheck/files/shellcheck-0.7.2-haddock.patch
new file mode 100644
index 000000000000..db6297064bad
--- /dev/null
+++ b/dev-util/shellcheck/files/shellcheck-0.7.2-haddock.patch
@@ -0,0 +1,53 @@
+From 9e60b3ea841bcaf48780bfcfc2e44aa6563a62de Mon Sep 17 00:00:00 2001
+From: Vidar Holen <spam@vidarholen.net>
+Date: Thu, 22 Apr 2021 22:17:51 -0700
+Subject: [PATCH] Fix haddock failures (fixes #2216)
+
+---
+ src/ShellCheck/Analytics.hs | 12 ++++++------
+ test/buildtest              |  2 ++
+ 2 files changed, 8 insertions(+), 6 deletions(-)
+
+--- a/src/ShellCheck/Analytics.hs
++++ b/src/ShellCheck/Analytics.hs
+@@ -4155,11 +4155,11 @@ checkEqualsInCommand params originalToken =
+                     _ | "===" `isPrefixOf` s -> borderMsg (getId originalToken)
+                     _ -> prefixMsg (getId cmd)
+ 
+-            -- $var==42
++            -- '$var==42'
+             _ | "==" `isInfixOf` s ->
+                 badComparisonMsg (getId cmd)
+ 
+-            -- ${foo[x]}=42 and $foo=42
++            -- '${foo[x]}=42' and '$foo=42'
+             [T_DollarBraced id braced l] | "=" `isPrefixOf` s -> do
+                 let variableStr = concat $ oversimplify l
+                 let variableReference = getBracedReference variableStr
+@@ -4172,22 +4172,22 @@ checkEqualsInCommand params originalToken =
+                                 && "]" `isSuffixOf` variableModifier
+ 
+                 case () of
+-                    -- $foo=bar should already have caused a parse-time SC1066
++                    -- '$foo=bar' should already have caused a parse-time SC1066
+                     -- _ | not braced && isPlain ->
+                     --    return ()
+ 
+                     _ | variableStr == "" -> -- Don't try to fix ${}=foo
+                         genericMsg (getId cmd)
+ 
+-                    -- $#=42 or ${#var}=42
++                    -- '$#=42' or '${#var}=42'
+                     _ | "#" `isPrefixOf` variableStr ->
+                         genericMsg (getId cmd)
+ 
+-                    -- ${0}=42
++                    -- '${0}=42'
+                     _ | variableStr == "0" ->
+                         assign0Msg id $ fixWith [replaceToken id params "BASH_ARGV0"]
+ 
+-                    -- $2=2
++                    -- '$2=2'
+                     _ | isPositional ->
+                         positionalMsg id
+ 
diff --git a/dev-util/shellcheck/shellcheck-0.7.1.ebuild b/dev-util/shellcheck/shellcheck-0.7.2.ebuild
index 357bb0ecd576..012df314142a 100644
--- a/dev-util/shellcheck/shellcheck-0.7.1.ebuild
+++ b/dev-util/shellcheck/shellcheck-0.7.2.ebuild
@@ -1,15 +1,16 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-# ebuild generated by hackport 0.6.4.9999
+# ebuild generated by hackport 0.6.7.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
 
 MY_PN="ShellCheck"
 MY_P="${MY_PN}-${PV}"
+S="${WORKDIR}/${MY_P}"
 
 DESCRIPTION="Shell script analysis tool"
 HOMEPAGE="https://www.shellcheck.net/"
@@ -18,7 +19,6 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 RDEPEND="dev-haskell/aeson:=[profile?]
 	>=dev-haskell/diff-0.2.0:=[profile?]
@@ -26,10 +26,10 @@ RDEPEND="dev-haskell/aeson:=[profile?]
 	>=dev-haskell/parsec-3.0:=[profile?]
 	>=dev-haskell/quickcheck-2.7.4:2=[template-haskell,profile?]
 	dev-haskell/regex-tdfa:=[profile?]
-	>=dev-lang/ghc-8.0.1:=
+	>=dev-lang/ghc-8.4.3:=
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24.0.0
+	>=dev-haskell/cabal-2.2.0.1
 "
 
-S="${WORKDIR}/${MY_P}"
+PATCHES=("${FILESDIR}"/${P}-haddock.patch)