gentoo resync : 29.01.2021

5 files changed, 12 insertions, 174 deletions

diff --git a/kde-frameworks/syntax-highlighting/Manifest b/kde-frameworks/syntax-highlighting/Manifest
index b73e7189dd1c..b39ae1820b07 100644
--- a/kde-frameworks/syntax-highlighting/Manifest
+++ b/kde-frameworks/syntax-highlighting/Manifest
@@ -1,9 +1,8 @@
-AUX syntax-highlighting-5.77.0-bash-zsh-fix.patch 6963 BLAKE2B 9d78a32f3ee42f9861c0bc58c0d0c006b051f415bbc4874ee0fe89952d5557b846581be7c0390f551230598e001e71cc45cb667f5eee68cb57061fa9eb16cbe4 SHA512 1a9b8e67dab8eb7b1eafa0d37c4bf2dfdd15f0bfff17f1380bb7771eebd17b8ce33bc684e2c3b5514fde17064af8d77f96d44895836bf1889593c241079a20a8
-AUX syntax-highlighting-5.77.0-bash-zsh-version.patch 2125 BLAKE2B b12c649b444595caee9bc28b3991c66b4c11260c55b56900894a922e53fc2aea46f1a374f7fe0787967619f98c7862db6645c5e2f02053f7a25da688f9c80b92 SHA512 1dc6b08f651f647e5442de9bfb91babec5f2bfdfdd1da9dc1809a58e0b7750b9e7ba1e60279fb7c99e66a0a5a9d291ec136cd4183b156b37ce1a9f7581257eac
 DIST syntax-highlighting-5.77.0-bash-zsh-fixes.patch.xz 91824 BLAKE2B 4d201e62aecc7126f11d52ef2d68c308e61f7e167312270baf093eab379a7d95efaa38fec604701ad0fc15e8e050191a00a4075dac488c957fabe4dc4994065f SHA512 598eb3ed82f2bd072750730e6f9492d821a63cc2ebb4877e83aa482597a6cfb50ac721945f5c176c45d75de970dfba3c79f0e048db9076d7451743e672512c97
+DIST syntax-highlighting-5.77.0-bash-zsh-fixes.tar.xz 95008 BLAKE2B 9fe2a2121687070f176633334ddb853f4d34ab6a5dbdff69f081d8a79785dfb1b989feb564f6a7304a6c008e4a79df8091e3e89b3afe6c5f8e6b1ead676f7bfe SHA512 e2ea8caeb75f8cf2b98060f44d39db4019cdca9b318dc7d34b538fb98659a8f98b0771a89ddaf57d35f9a33e9643dabf4eb16ce218538f1680df4e306640bdfc
 DIST syntax-highlighting-5.77.0.tar.xz 2145120 BLAKE2B de91836509fd6264fe0b79f1a7153c4d581913870ec207bd4d69ce24c5d00d92e49ebc70d147715a732626805cf68045be6490ff6ae7e199454c53a4c82ec2dd SHA512 057e9be24608cd856ee8aea355ddc63da9a11d50c388ae303e1f34cdf3a7ac99c592de51e0f04fa2254246ad796ced5029117b22ca71420b6089139d827a31b9
 DIST syntax-highlighting-5.78.0.tar.xz 2201352 BLAKE2B 6cd72e85d43d5061a490da6ff13f16c6e3ad2decd4efc65b8a5ec82f1815102bab0a546cd929a8ce82bccc163a809efb8cc5c82ecba98a410d0debef16b47884 SHA512 e9d47f69a14a890a4c5c0e9c33cce51fa6fef93d5c50b565b4d6e2d1978cddd8ffb4239534ddb02decf75190ec3b5446ca387901cda9f27f59088b6853c76843
 EBUILD syntax-highlighting-5.77.0-r1.ebuild 702 BLAKE2B 31ebfd8db51b156d515477ae8d0fa4783287fde242b0d9bcc99bc9b5438980c83e5692bc653e3402b65504e333539cf33cf71a9bc68c80b53afefb983b9d0d02 SHA512 1fb527d9ffa2e1a343d7527a7bd8f6827296862639017f225fe20580ce287687f192a3d04ea0ec255e57aa6e67f92d3ae8685ef03720a7523d2245cc52c6782d
-EBUILD syntax-highlighting-5.77.0-r2.ebuild 803 BLAKE2B e3ddcbbacbbcf5413c26b6a55b0d364c0c474c41687080a655fd4d7e26e2377f433c1b43acaef44e310371cba574ff85319e4edbdf506bc154182bd88c80f30a SHA512 a0860f527d684b89486221baeb7566ee766244ee8d8e8f8f15be7d799e32c7e4f5516398b312a538b4c7d1915fba226318400d06614f941b3b35f49dc07a345a
-EBUILD syntax-highlighting-5.78.0-r1.ebuild 630 BLAKE2B 63db421310600183db8612af671075644d4e98375dcc838eb5573c389f4cd5f16d17a33a6eaacdd6fb0dea78affe2db3d6114dc247e503bea0f4d31652fb175b SHA512 33e8463a49ad5770160681a96760af50cfb7fa5ab5c272c5ed6dbe18bab41133f32edb57d68dae6fee2decfda770549af93560d367180e13038d223a158a3a9a
+EBUILD syntax-highlighting-5.77.0-r3.ebuild 694 BLAKE2B 6950b7bb5a5ce43ed7e0fc036aa081ab03dbf1268e047934ad446aeb1da8d0ed71b04976145607002fc4760d2d197d5df99d2fb0d2630a87e98c38a3ec2eb8df SHA512 4f925b469cff2925b86dbeecaa28ef41264fad07286661d5a226b7a6765dca30fdda84c6323eaa9f0449047d271d193191db15f5e54c1f7a37329ca5827efe6e
+EBUILD syntax-highlighting-5.78.0-r2.ebuild 959 BLAKE2B 5dafcb9be5132561744d1807711e9fcd7bcb3a7399f1afc3183e814769f64437aa120883045a04e299d0200cc10780f331175823407173b75953f2d3851e019a SHA512 9713171bb8e112f816e6709419b758c7376f788495251476c256ba2fff94a03b2f6fe6b37d53589aef54fbb0fa2592e3efb87cddf8cbcdcf7ad36ab102a1a37d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/syntax-highlighting/files/syntax-highlighting-5.77.0-bash-zsh-fix.patch b/kde-frameworks/syntax-highlighting/files/syntax-highlighting-5.77.0-bash-zsh-fix.patch
deleted file mode 100644
index 2ec92edb9c8f..000000000000
--- a/kde-frameworks/syntax-highlighting/files/syntax-highlighting-5.77.0-bash-zsh-fix.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-From ba9b3c5e0ed2fb33b9a896ec910590410978befe Mon Sep 17 00:00:00 2001
-From: Jonathan Poelen <jonathan.poelen@gmail.com>
-Date: Mon, 11 Jan 2021 01:29:01 +0100
-Subject: [PATCH] Bash: fix #5: $ at the end of a double quoted string
-
----
- autotests/folding/highlight.sh.fold   | 1 +
- autotests/html/highlight.sh.dark.html | 1 +
- autotests/html/highlight.sh.html      | 1 +
- autotests/input/highlight.sh          | 1 +
- autotests/reference/highlight.sh.ref  | 1 +
- data/syntax/bash.xml                  | 5 +++--
- data/syntax/zsh.xml                   | 3 +--
- 7 files changed, 9 insertions(+), 4 deletions(-)
-
-diff --git a/autotests/folding/highlight.sh.fold b/autotests/folding/highlight.sh.fold
-index 652fef8f..d7a6b210 100644
---- a/autotests/folding/highlight.sh.fold
-+++ b/autotests/folding/highlight.sh.fold
-@@ -16,6 +16,7 @@ echo 'single quoted string'
- echo "double quoted string"
- echo $'string with esc\apes\x0din it'
- echo $"string meant to be translated"
-+echo "$"
- 
- 
- # comments:
-diff --git a/autotests/html/highlight.sh.dark.html b/autotests/html/highlight.sh.dark.html
-index d1d4fb8a..8cbd0929 100644
---- a/autotests/html/highlight.sh.dark.html
-+++ b/autotests/html/highlight.sh.dark.html
-@@ -22,6 +22,7 @@
- <span style="color:#7f8c8d;">echo</span> <span style="color:#f44f4f;">&quot;double quoted string&quot;</span>
- <span style="color:#7f8c8d;">echo</span> <span style="color:#f44f4f;">$'string with esc</span><span style="color:#2980b9;">\a</span><span style="color:#f44f4f;">pes</span><span style="color:#2980b9;">\x0d</span><span style="color:#f44f4f;">in it'</span>
- <span style="color:#7f8c8d;">echo</span> <span style="color:#f44f4f;">$&quot;</span><span style="color:#f44f4f;">string meant to be translated&quot;</span>
-+<span style="color:#7f8c8d;">echo</span> <span style="color:#f44f4f;">&quot;$&quot;</span>
- 
- 
- <span style="color:#7a7c7d;"># comments:</span>
-diff --git a/autotests/html/highlight.sh.html b/autotests/html/highlight.sh.html
-index 5d687d86..d176b1cb 100644
---- a/autotests/html/highlight.sh.html
-+++ b/autotests/html/highlight.sh.html
-@@ -22,6 +22,7 @@
- <span style="color:#644a9b;font-weight:bold;">echo</span> <span style="color:#bf0303;">&quot;double quoted string&quot;</span>
- <span style="color:#644a9b;font-weight:bold;">echo</span> <span style="color:#bf0303;">$'string with esc</span><span style="color:#0057ae;">\a</span><span style="color:#bf0303;">pes</span><span style="color:#0057ae;">\x0d</span><span style="color:#bf0303;">in it'</span>
- <span style="color:#644a9b;font-weight:bold;">echo</span> <span style="color:#bf0303;">$&quot;</span><span style="color:#bf0303;">string meant to be translated&quot;</span>
-+<span style="color:#644a9b;font-weight:bold;">echo</span> <span style="color:#bf0303;">&quot;$&quot;</span>
- 
- 
- <span style="color:#898887;"># comments:</span>
-diff --git a/autotests/input/highlight.sh b/autotests/input/highlight.sh
-index 177e104f..5c2ae7b1 100644
---- a/autotests/input/highlight.sh
-+++ b/autotests/input/highlight.sh
-@@ -16,6 +16,7 @@ echo 'single quoted string'
- echo "double quoted string"
- echo $'string with esc\apes\x0din it'
- echo $"string meant to be translated"
-+echo "$"
- 
- 
- # comments:
-diff --git a/autotests/reference/highlight.sh.ref b/autotests/reference/highlight.sh.ref
-index 181c36af..edaf18ab 100644
---- a/autotests/reference/highlight.sh.ref
-+++ b/autotests/reference/highlight.sh.ref
-@@ -16,6 +16,7 @@
- <Builtin>echo</Builtin><Normal Text> </Normal Text><String DoubleQ>"double quoted string"</String DoubleQ><br/>
- <Builtin>echo</Builtin><Normal Text> </Normal Text><String SingleQ>$'string with esc</String SingleQ><String Escape>\a</String Escape><String SingleQ>pes</String SingleQ><String Escape>\x0d</String Escape><String SingleQ>in it'</String SingleQ><br/>
- <Builtin>echo</Builtin><Normal Text> </Normal Text><String Transl.>$"</String Transl.><String DoubleQ>string meant to be translated"</String DoubleQ><br/>
-+<Builtin>echo</Builtin><Normal Text> </Normal Text><String DoubleQ>"$"</String DoubleQ><br/>
- <Normal Text></Normal Text><br/>
- <Normal Text></Normal Text><br/>
- <Comment># comments:</Comment><br/>
-diff --git a/data/syntax/bash.xml b/data/syntax/bash.xml
-index 3171247b..3b804f90 100644
---- a/data/syntax/bash.xml
-+++ b/data/syntax/bash.xml
-@@ -30,7 +30,7 @@
-         <!ENTITY heredocq "(?|&quot;([^&quot;]+)&quot;|'([^']+)'|\\(.[^&wordseps;&substseps;]*))">
- ]>
- 
--<language name="Bash" version="20" kateversion="5.62" section="Scripts" extensions="*.sh;*.bash;*.ebuild;*.eclass;*.nix;.bashrc;.bash_profile;.bash_login;.profile;PKGBUILD;APKBUILD" mimetype="application/x-shellscript" casesensitive="1" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
-+<language name="Bash" version="21" kateversion="5.62" section="Scripts" extensions="*.sh;*.bash;*.ebuild;*.eclass;*.nix;.bashrc;.bash_profile;.bash_login;.profile;PKGBUILD;APKBUILD" mimetype="application/x-shellscript" casesensitive="1" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
- 
- <!-- (c) 2004 by Wilbert Berendsen (wilbert@kde.nl)
-     Changes by Matthew Woehlke (mw_triad@users.sourceforge.net)
-@@ -943,7 +943,8 @@
-         <DetectChar attribute="Backquote" context="RegularBackq" char="`"/>
-       </context>
-       <context attribute="String DoubleQ" lineEndContext="#stay" name="StringDQDispatchVariables">
--        <IncludeRules context="DispatchVariables"/>
-+        <IncludeRules context="DispatchSubstVariables"/>
-+        <IncludeRules context="DispatchVarnameVariables"/>
-         <DetectChar attribute="String DoubleQ" context="#pop" char="$"/>
-       </context>
-       <context attribute="String DoubleQ" lineEndContext="#pop" name="StringDQEscape">
-diff --git a/data/syntax/zsh.xml b/data/syntax/zsh.xml
-index ada258c8..5aa83290 100644
---- a/data/syntax/zsh.xml
-+++ b/data/syntax/zsh.xml
-@@ -55,7 +55,7 @@
-         <!ENTITY int "(?:[0-9]++(_++[0-9]++)*+)">
-         <!ENTITY exp "(?:[eE][-+]?&int;)">
- ]>
--<language name="Zsh" version="12" kateversion="5.62" section="Scripts" extensions="*.sh;*.zsh;.zshrc;.zprofile;.zlogin;.zlogout;.profile" mimetype="application/x-shellscript" casesensitive="1" author="Jonathan Poelen (jonathan.poelen@gmail.com)" license="MIT">
-+<language name="Zsh" version="13" kateversion="5.62" section="Scripts" extensions="*.sh;*.zsh;.zshrc;.zprofile;.zlogin;.zlogout;.profile" mimetype="application/x-shellscript" casesensitive="1" author="Jonathan Poelen (jonathan.poelen@gmail.com)" license="MIT">
- 
-   <highlighting>
-     <list name="keywords">
-@@ -893,7 +893,6 @@
-       </context>
-       <context attribute="String DoubleQ" lineEndContext="#stay" name="StringDQDispatchVariables">
-         <IncludeRules context="DispatchSubstVariables"/>
--        <Detect2Chars attribute="String SingleQ" context="#pop!StringEsc" char="$" char1="'"/>
-         <IncludeRules context="DispatchVarNameVariables"/>
-         <DetectChar attribute="String DoubleQ" context="#pop" char="$"/>
-       </context>
--- 
-GitLab
-
diff --git a/kde-frameworks/syntax-highlighting/files/syntax-highlighting-5.77.0-bash-zsh-version.patch b/kde-frameworks/syntax-highlighting/files/syntax-highlighting-5.77.0-bash-zsh-version.patch
deleted file mode 100644
index 2a7f2684bfb8..000000000000
--- a/kde-frameworks/syntax-highlighting/files/syntax-highlighting-5.77.0-bash-zsh-version.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 70b56cf8b3d1a85e15d1e09aa8490e5183967de0 Mon Sep 17 00:00:00 2001
-From: Christoph Cullmann <cullmann@kde.org>
-Date: Wed, 30 Dec 2020 17:35:48 +0100
-Subject: [PATCH] increment version
-
----
- data/syntax/bash.xml | 2 +-
- data/syntax/zsh.xml  | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/data/syntax/bash.xml b/data/syntax/bash.xml
-index 676b630d..3171247b 100644
---- a/data/syntax/bash.xml
-+++ b/data/syntax/bash.xml
-@@ -30,7 +30,7 @@
-         <!ENTITY heredocq "(?|&quot;([^&quot;]+)&quot;|'([^']+)'|\\(.[^&wordseps;&substseps;]*))">
- ]>
- 
--<language name="Bash" version="19" kateversion="5.62" section="Scripts" extensions="*.sh;*.bash;*.ebuild;*.eclass;*.nix;.bashrc;.bash_profile;.bash_login;.profile;PKGBUILD;APKBUILD" mimetype="application/x-shellscript" casesensitive="1" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
-+<language name="Bash" version="20" kateversion="5.62" section="Scripts" extensions="*.sh;*.bash;*.ebuild;*.eclass;*.nix;.bashrc;.bash_profile;.bash_login;.profile;PKGBUILD;APKBUILD" mimetype="application/x-shellscript" casesensitive="1" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
- 
- <!-- (c) 2004 by Wilbert Berendsen (wilbert@kde.nl)
-     Changes by Matthew Woehlke (mw_triad@users.sourceforge.net)
-diff --git a/data/syntax/zsh.xml b/data/syntax/zsh.xml
-index 120b345e..ada258c8 100644
---- a/data/syntax/zsh.xml
-+++ b/data/syntax/zsh.xml
-@@ -55,7 +55,7 @@
-         <!ENTITY int "(?:[0-9]++(_++[0-9]++)*+)">
-         <!ENTITY exp "(?:[eE][-+]?&int;)">
- ]>
--<language name="Zsh" version="11" kateversion="5.62" section="Scripts" extensions="*.sh;*.zsh;.zshrc;.zprofile;.zlogin;.zlogout;.profile" mimetype="application/x-shellscript" casesensitive="1" author="Jonathan Poelen (jonathan.poelen@gmail.com)" license="MIT">
-+<language name="Zsh" version="12" kateversion="5.62" section="Scripts" extensions="*.sh;*.zsh;.zshrc;.zprofile;.zlogin;.zlogout;.profile" mimetype="application/x-shellscript" casesensitive="1" author="Jonathan Poelen (jonathan.poelen@gmail.com)" license="MIT">
- 
-   <highlighting>
-     <list name="keywords">
--- 
-2.30.0
-
diff --git a/kde-frameworks/syntax-highlighting/syntax-highlighting-5.78.0-r1.ebuild b/kde-frameworks/syntax-highlighting/syntax-highlighting-5.77.0-r3.ebuild
index 4dabf263ae74..5528791bfb1b 100644
--- a/kde-frameworks/syntax-highlighting/syntax-highlighting-5.78.0-r1.ebuild
+++ b/kde-frameworks/syntax-highlighting/syntax-highlighting-5.77.0-r3.ebuild
@@ -8,8 +8,10 @@ QTMIN=5.15.1
 inherit ecm kde.org
 
 DESCRIPTION="Framework for syntax highlighting"
+SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${P}-bash-zsh-fixes.tar.xz"
+
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="nls"
 
 BDEPEND="
@@ -23,9 +25,7 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.77.0-bash-zsh-fix.patch
-)
+PATCHES=( "${WORKDIR}"/${P}-bash-zsh-fixes )
 
 src_install() {
 	ecm_src_install
diff --git a/kde-frameworks/syntax-highlighting/syntax-highlighting-5.77.0-r2.ebuild b/kde-frameworks/syntax-highlighting/syntax-highlighting-5.78.0-r2.ebuild
index 24d0f786f3e3..95a0b82859d9 100644
--- a/kde-frameworks/syntax-highlighting/syntax-highlighting-5.77.0-r2.ebuild
+++ b/kde-frameworks/syntax-highlighting/syntax-highlighting-5.78.0-r2.ebuild
@@ -8,10 +8,10 @@ QTMIN=5.15.1
 inherit ecm kde.org
 
 DESCRIPTION="Framework for syntax highlighting"
-SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${P}-bash-zsh-fixes.patch.xz"
+SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PN}-5.77.0-bash-zsh-fixes.tar.xz"
 
 LICENSE="MIT"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="nls"
 
 BDEPEND="
@@ -26,9 +26,9 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 PATCHES=(
-	"${WORKDIR}"/${P}-bash-zsh-fixes.patch
-	"${FILESDIR}"/${PN}-5.77.0-bash-zsh-version.patch
-	"${FILESDIR}"/${PN}-5.77.0-bash-zsh-fix.patch
+	"${WORKDIR}/${PN}-5.77.0-bash-zsh-fixes"/0010-Bash-fix-5-at-the-end-of-a-double-quoted-string.patch
+	"${WORKDIR}/${PN}-5.77.0-bash-zsh-fixes"/0011-Bash-fix-in-xy-and-more-Parameter-Expansion-Operator.patch
+	"${WORKDIR}/${PN}-5.77.0-bash-zsh-fixes"/0012-Bash-Zsh-fix-cmd-in-a-case.patch
 )
 
 src_install() {