gentoo resync : 15.12.2017

5 files changed, 7 insertions, 140 deletions

diff --git a/kde-frameworks/syntax-highlighting/Manifest b/kde-frameworks/syntax-highlighting/Manifest
index 08bff3a69d5a..35bfba17b909 100644
--- a/kde-frameworks/syntax-highlighting/Manifest
+++ b/kde-frameworks/syntax-highlighting/Manifest
@@ -1,7 +1,5 @@
-AUX syntax-highlighting-5.37.0-powershell.patch 1174 BLAKE2B f360ec2ada2a5813f683e146dc436c131a6fb91c7fbc49ee5808cd4178b0c83ecce2ec1a1200dec396b09eda3f9dd3db82e54f126ec388b63720713b5b9f7de8 SHA512 c4db6ad2b3390ba3f613d1da0df513206a5424a96252721eae9cd0ef4f07fcf4f60b9af0c7b9436717a8e4f0f5dc2d785f1e03f29c6d780968f0e375a540a1e0
-AUX syntax-highlighting-5.37.0-regexp.patch 4729 BLAKE2B d15c13e25d4848cf6e406457ea40bf5e3449aed83ff08a73986361acbdf6e3de09f71051699006a398707fcf4bd422a9279f4cb060b571e30da31497875801e1 SHA512 228faab9af63806eb763e93c903ee3ea7bc9b16e72588de28e86e4c172ededa2c69b6f70c19f74b0d71339b4af459382b5aa427f3c9c78395f09d22a2aa72101
-DIST syntax-highlighting-5.37.0.tar.xz 1050660 SHA256 e2d075482bc5409646db40374c6caa0b055276e1a5cd8e30065e9f4fd0baa6d0 SHA512 d49f62934283c07c1b6e8fad11b9fa469b21bb55f35ddbc6c28ab29bd79b7cba67a93d0b46abb8b3d86ee7ba7a90ea50a98553aac7bdfe396bc2b010611c24c2 WHIRLPOOL a2cf1c91e69bf028c5b96e4d6121e532d40cca0ba61be7fd5cf16858fde87437fc145aab6ae2c5eedc1559157bd9443f2cd2f4d6cb814adc1e195033bb2013b5
-DIST syntax-highlighting-5.40.0.tar.xz 1108400 SHA256 148dd0d3d091ad5ee352cc528f494a375d89d2812ff31b08c735e0929a358075 SHA512 4e7868ae64e18b7734d7d5b778187951ae01fdd2d2dfaa1a78f8d9c0b9d5c435e30f4bc333dac3ed18f864f3458991144e870bd6a2c5b17c8ee49b61a82c0ccb WHIRLPOOL bfaec46a1f00d82eedde9cc0bdf288f1af7bde68155572e69e17965a0884b7467cc7fa273abf37a4eed85b2e6fa0603d47f3473754098789af7e7129f92c4fe0
-EBUILD syntax-highlighting-5.37.0-r1.ebuild 616 BLAKE2B b8f3cd9fcb3d128c7117a36aea13009e8a45cc3abfa2646683a73b3fb41750b231922b75b61df29ea191a69cedc8ab88bccf283666e9409fa2c70a0ba9206e3b SHA512 fee2713fe0af6bd51af88b73409a8b5abcb54d75dfc98339472c710256dd0a744bb23361b587e41c25681e006639acbbdbc97abb62fef2420d6c993ea5a75014
-EBUILD syntax-highlighting-5.40.0.ebuild 526 BLAKE2B f20221bd65246aef331e29dcb6f4649927d1797b1334efe7c911943919f70aab364a19784289de5066b2f4d0800183e2574b1ff97686307815b0cc3565be70d6 SHA512 705dd1aa205bcd0c99ac61a6b2c856a056e895b1f089df8cc1e5315ca1675bff2e5c7bf8a9759d4fa3216f84d9c7230cf3d806e13c8fc844194fed150acd15cd
+DIST syntax-highlighting-5.40.0.tar.xz 1108400 BLAKE2B 44fd2a5374dd2a28db211fa1d258fe612cd6fe6c72422cd1fbe942d56684a9c4286a947038e105e8e90d1a701bb5df376a3f18aa73e836773690f695a6325152 SHA512 4e7868ae64e18b7734d7d5b778187951ae01fdd2d2dfaa1a78f8d9c0b9d5c435e30f4bc333dac3ed18f864f3458991144e870bd6a2c5b17c8ee49b61a82c0ccb
+DIST syntax-highlighting-5.41.0.tar.xz 1108580 BLAKE2B 1b5a61b45ba6a4900059e5813a92a3a47cf87aacb75094fd0f7b5c13acc6bc6f104ddac00b56cf4694bdaa9a82cc20c2afd16f764b7eb43e16a6a3cd5e68698c SHA512 86ed50766c9c0a3ef9e71421f5e7b9248ab1f28d0ecd424af57d643e613f488e572d001c55c58ab0ef501d6160b2db75dec0b325447132a5f49ff6dc6c52afea
+EBUILD syntax-highlighting-5.40.0.ebuild 525 BLAKE2B 3247f7ee3cb47dac62c1b57f89d4e48f0ffb2b79e40e697d19212740f3b9c3451db1160cfeafde966c549a12db97df940ae9b43b9d0c548439e5c1d050d96976 SHA512 7c54f6c74e1d172d91ec9d9678f8679ea74a135a6050b110c18a31609da75ea42d90fcb336dfca5abce7f2a09a2825a0c9d7e4767b1e368b6c93e0fb3e1d9c7b
+EBUILD syntax-highlighting-5.41.0.ebuild 527 BLAKE2B 70ff39c4e3b13901ccbb68f6b8d93eab92a84607aed27491fcbca8930a752b79ddd8b3f7aaa39fd02ec894e0c5fbc6dcc5f17183f292bede9abc538706b6c133 SHA512 4d70f7d6d9bf1e07e87775dcb20500c54a145765e18a54e357440acf27edaffe371bc4ea062aa60ce9421b2b58cf471aeb545bd4973c2d146afdc98dc23b75ef
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/syntax-highlighting/files/syntax-highlighting-5.37.0-powershell.patch b/kde-frameworks/syntax-highlighting/files/syntax-highlighting-5.37.0-powershell.patch
deleted file mode 100644
index 5da7999dffbd..000000000000
--- a/kde-frameworks/syntax-highlighting/files/syntax-highlighting-5.37.0-powershell.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 26daf7ee5b4a4534d918ed7d9e66d64cb30b0c26 Mon Sep 17 00:00:00 2001
-From: Till Schfer <till2.schaefer@tu-dortmund.de>
-Date: Tue, 22 Aug 2017 18:47:04 +0200
-Subject: fix: plaintext is highlighted as powershell
-
-Summary: see [[ https://bugs.kde.org/show_bug.cgi?id=383848 | Bug 383848 ]]
-
-Reviewers: #framework_syntax_hightlighting, vkrause
-
-Reviewed By: #framework_syntax_hightlighting, vkrause
-
-Subscribers: dhaumann, #framework_syntax_hightlighting
-
-Tags: #frameworks
-
-Differential Revision: https://phabricator.kde.org/D7464
----
- data/syntax/powershell.xml | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/data/syntax/powershell.xml b/data/syntax/powershell.xml
-index 3a38846..2b73cfe 100644
---- a/data/syntax/powershell.xml
-+++ b/data/syntax/powershell.xml
-@@ -1,11 +1,10 @@
- <!DOCTYPE language SYSTEM "language.dtd">
- <language
-   name="PowerShell"
--  version="1"
-+  version="2"
-   kateversion="5.0"
-   extensions="*.ps1;*.ps1m;*.ps1d"
-   section="Scripts"
--  mimetype="text/plain"
-   author="Motoki Kashihara (motoki8791@gmail.com); Michael Lombardi (Michael.T.Lombardi@outlook.com)"
-   casesensitive="0"
-   license="LGPLv2+">
--- 
-cgit v0.11.2
-
diff --git a/kde-frameworks/syntax-highlighting/files/syntax-highlighting-5.37.0-regexp.patch b/kde-frameworks/syntax-highlighting/files/syntax-highlighting-5.37.0-regexp.patch
deleted file mode 100644
index f0a87e6d76df..000000000000
--- a/kde-frameworks/syntax-highlighting/files/syntax-highlighting-5.37.0-regexp.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From ad077e4045e650e1708b6c81d33a14f4a9c99a5d Mon Sep 17 00:00:00 2001
-From: Heiko Becker <heirecka@exherbo.org>
-Date: Wed, 23 Aug 2017 12:28:52 +0200
-Subject: Escape hyphen in rest.xml regular expressions
-
-Summary:
-The unescaped hyphen caused a build failure with pcre2-10.30 due to a broken
-regex: 'syntax-highlighting/data/syntax/rest.xml" line 27 broken regex:
-"^\\s*\\.\\. [w-_\\.]+::(\\s|$)" problem: "range out of order in character
-class" at offset 12'.
-
-The pcre2pattern documentation says this:
-
-"Perl treats a hyphen as a literal if it appears before or after a POSIX class
-(see below) or before or after a character type escape such as as \d or \H.
-However, unless the hyphen is the last character in the class, Perl outputs a
-warning in its warning mode, as this is most likely a user error. As PCRE2 has
-no facility for warning, an error is given in these cases."
-
-Test Plan:
-cmake && make && make test works fine pcre2-10.30, quick look at
-http://docutils.sourceforge.net/FAQ.txt in kate seems fine.
-
-Reviewers: #framework_syntax_hightlighting, kfunk
-
-Subscribers: #frameworks
-
-Tags: #frameworks
-
-BUG: 383632
-
-Differential Revision: https://phabricator.kde.org/D7478
----
- data/syntax/rest.xml | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/data/syntax/rest.xml b/data/syntax/rest.xml
-index 1363965..ccfd08a 100644
---- a/data/syntax/rest.xml
-+++ b/data/syntax/rest.xml
-@@ -11,7 +11,7 @@
-   Copyright 2010 Matt Williams (matt@milliams.com)
-   Copyright 2014 Matthew Woehlke (mw_triad@users.sourceforge.net)
-   -->
--<language name="reStructuredText" extensions="*.rst" section="Markup" mimetype="text/x-rst" version="2" kateversion="2.4" casesensitive="1">
-+<language name="reStructuredText" extensions="*.rst" section="Markup" mimetype="text/x-rst" version="3" kateversion="2.4" casesensitive="1">
- 
-   <highlighting>
- 
-@@ -24,11 +24,11 @@
-         <RegExpr attribute="Citation" context="#stay" String="^\s*\.\. \[[&SimpleReferenceNameChars;]+\]\s" minimal="true" column="0"/>
-         <RegExpr attribute="HyperlinkTarget" context="#stay" String="^\s*(\.\. (__:|_[&SimpleReferenceNameChars; ]+:(\s|$))|__ )" minimal="true" column="0"/>
-         <RegExpr attribute="Code" String="^\s*\.\. code-block::" context="CodeBlock" column="0"/>
--        <RegExpr attribute="Directive" context="#stay" String="^\s*\.\. [\w-_\.]+::(\s|$)" minimal="true" column="0"/>
-+        <RegExpr attribute="Directive" context="#stay" String="^\s*\.\. [\w\-_\.]+::(\s|$)" minimal="true" column="0"/>
-         <RegExpr attribute="Code" String="::$" context="CodeBlock" />
-         <RegExpr attribute="SubstitutionDefinition" context="#stay" String="^\s*\.\. \|[&SimpleReferenceNameChars; ]+\|\s+[&SimpleReferenceNameChars;]+::\s" minimal="true" column="0"/>
-         <RegExpr attribute="Field" String=":(?=([^:]*\\:)*[^:]*:(\s|$))" context="Field" firstNonSpace="true"/>
--        <RegExpr attribute="Comment" context="Comment" String="^(\s*)\.\.\s(?![\w-_\.]+::(\s|$))" column="0"/>
-+        <RegExpr attribute="Comment" context="Comment" String="^(\s*)\.\.\s(?![\w\-_\.]+::(\s|$))" column="0"/>
-       </context>
- 
-       <context name="InlineMarkup" attribute="Normal" lineEndContext="#stay">
-@@ -38,8 +38,8 @@
-         <RegExpr attribute="FootnoteReference" context="#stay" String="&inlinestart;\[[&SimpleReferenceNameChars;]+\]_&inlineend;" minimal="true"/>
-         <RegExpr attribute="HyperlinkReference" context="#stay" String="&inlinestart;`[^\s].*`_&inlineend;" minimal="true"/>
-         <RegExpr attribute="HyperlinkReference" context="#stay" String="&inlinestart;\w+_&inlineend;" minimal="true"/>
--        <RegExpr attribute="InterpretedText" context="TrailingRole" String="&inlinestart;`[^\s].*`(?=:[\w-_\.\+]+:)" minimal="true"/>
--        <RegExpr attribute="Role" String=":[\w-_\.\+]+:(?=`)" context="Role"/>
-+        <RegExpr attribute="InterpretedText" context="TrailingRole" String="&inlinestart;`[^\s].*`(?=:[\w\-_\.\+]+:)" minimal="true"/>
-+        <RegExpr attribute="Role" String=":[\w\-_\.\+]+:(?=`)" context="Role"/>
-       </context>
- 
-       <context name="Field" attribute="Field" lineEndContext="#stay">
-@@ -56,7 +56,7 @@
-         <DetectChar attribute="InterpretedText" char="`" context="#pop!InterpretedText" />
-       </context>
-       <context name="TrailingRole" attribute="Role" lineEndContext="#pop">
--        <RegExpr attribute="Role" String=":[\w-_\.\+]+:" context="#pop"/>
-+        <RegExpr attribute="Role" String=":[\w\-_\.\+]+:" context="#pop"/>
-       </context>
-       <context name="Comment" attribute="Comment" lineEndContext="#stay" dynamic="true">
-         <RegExpr attribute="Code" String="^%1   " context="#stay" column="0" dynamic="true"/>
--- 
-cgit v0.11.2
-
diff --git a/kde-frameworks/syntax-highlighting/syntax-highlighting-5.40.0.ebuild b/kde-frameworks/syntax-highlighting/syntax-highlighting-5.40.0.ebuild
index 3b574cb6da21..2b7371fa38f2 100644
--- a/kde-frameworks/syntax-highlighting/syntax-highlighting-5.40.0.ebuild
+++ b/kde-frameworks/syntax-highlighting/syntax-highlighting-5.40.0.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Framework for syntax highlighting"
 LICENSE="LGPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="nls"
 
 RDEPEND="
diff --git a/kde-frameworks/syntax-highlighting/syntax-highlighting-5.37.0-r1.ebuild b/kde-frameworks/syntax-highlighting/syntax-highlighting-5.41.0.ebuild
index 3d73aef9a630..a4de123cab8b 100644
--- a/kde-frameworks/syntax-highlighting/syntax-highlighting-5.37.0-r1.ebuild
+++ b/kde-frameworks/syntax-highlighting/syntax-highlighting-5.41.0.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Framework for syntax highlighting"
 LICENSE="LGPL-2+ LGPL-2.1+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="nls"
 
 RDEPEND="
@@ -21,12 +21,7 @@ DEPEND="${RDEPEND}
 	nls? ( $(add_qt_dep linguist-tools) )
 "
 
-PATCHES=(
-	"${FILESDIR}/${P}-powershell.patch"
-	"${FILESDIR}/${P}-regexp.patch"
-)
-
 src_install() {
 	kde5_src_install
-	dobin "${BUILD_DIR}"/src/indexer/katehighlightingindexer
+	dobin "${BUILD_DIR}"/bin/katehighlightingindexer
 }