gentoo resync : 15.06.2021

3 files changed, 39 insertions, 2 deletions

diff --git a/dev-cpp/clucene/Manifest b/dev-cpp/clucene/Manifest
index b42f006096d3..6933fb436311 100644
--- a/dev-cpp/clucene/Manifest
+++ b/dev-cpp/clucene/Manifest
@@ -1,7 +1,8 @@
 AUX clucene-2.3.3.4-contrib.patch 1697 BLAKE2B 2aebc143ff0dafb2765cb3bd5d8e5183bdcfa7cb51a6109e957650412394796c7825c38dab9f1f9637c436b10714624dcbcfd3b6ab88dbfef9c5de9582e65ccc SHA512 0aa92635949089196e4e7c579e78761e8751987ef5036320a161a4aaa67da3c63756398c903419c76ea0fbdc8a949e871fcb65be98179a9853a24a5a4cacfde3
+AUX clucene-2.3.3.4-fix-clang.patch 2219 BLAKE2B 7572c05d9e2676eedb3aabc8030eea6b97a19af9f02eb1c336b40606105bc89800a8da8ea6f899ef550fa114776133fec962622ac3e337ca0f52fc0305c81bd3 SHA512 f3822c5d127b37fdb0a405a3fa0a2d2a168133da106a222de0311c2074aaacb7d9651a1be7ad7afda44da22cc2c8baa8d5db756aaaef5c344e12d52625e2c2e1
 AUX clucene-2.3.3.4-gcc6.patch 1102 BLAKE2B c7a264585532237d38ad5d06d1e1b96559e47145dc9ecbfe73ec6b8a493fd9c0eef73611305de213e432dd94736dc49dbc140b47d0c65081228989aa21a3fe62 SHA512 367e97d9b5d59bca880d8ec70b37078406f581267a896ff6b35cd3ab21f983f4b21152482bb34fb813e426b4cae14a6d319ccdb08e3bf968de8ece3c28a18722
 AUX clucene-2.3.3.4-gmtime.patch 477 BLAKE2B 0c453684f6850ad7eb2eeff2624a9d23c7ea5f78321447b75acea625add44b7cae8c8c220c8848ed8ac39c66f8329f20e9c60005a1e2d237097771ecb0c2370f SHA512 1c23c08edf5512c29a061e4a8515dfa209151af83e46680842f0aeee1269d529a14fd4a89aab7c25312fd7dbb9daf80912a265d21fcf08ac892a467be4a59a60
 AUX clucene-2.3.3.4-pkgconfig.patch 871 BLAKE2B a108d0c4427159a09d2575b351bedfd38c6305219e01a7927b66aacfcab3587d3c08315f0a7e58a123e6779d2d8fec17fb06127de32dfd5782408cbc5c916ed5 SHA512 afcdf00537c8eb9c75ed569356520551ea194c8edc636f6e82bd0b1ef60e33396c1e2722b895aced2b58358950b3c5c1df2a914295074e9e99485ca6cee21c18
 DIST clucene-core-2.3.3.4.tar.gz 2241498 BLAKE2B e7c02d3976fd8d722a81ad4c6d43363b9af0073aa68edb8303cada495f8b8514cb8c86a85f398f8c9ffc1f78a49c0718cde5af4145c32869572d21e8af633846 SHA512 1c9da9077edcebd46563bd9e47d330518e0b30061016650a759cfe051e9748fdad8932a472b1cca53a6adafed5f41656527271fc5f55ddfcefb558f0d83286b4
-EBUILD clucene-2.3.3.4-r6.ebuild 1511 BLAKE2B 2d8a43ef98ed6ad4e57f7e63442acffb3ee100453f6a41de3d708e0a9ae897a3525b39cfeee3499415625b61b1ebf62ddef0822c405dd3fe8970a953490c6acf SHA512 63ede83997d69c90504ca0297330293d40c472b29a7231b62acd188781b160d9d6a23e043450ebe914f176b41f57865a84b5c649d44d111b0dff71c89a0b56d2
+EBUILD clucene-2.3.3.4-r6.ebuild 1558 BLAKE2B 3b429271b2448f85449e5ca90e7c69250902ac181176605a58792bb0fef8b1514a49c60b4406e8c99c608fb6ed838f7405c10580ea320d6768336cdc4f72b136 SHA512 311c6661d88c03a25eca2cee41483123d519b7390607dad040c116fdf3f527043d03f6d524b22d26cb7550ff3540885f36c9490f5bf3464ac34d970a1a7a248e
 MISC metadata.xml 242 BLAKE2B 42f16f7a7f490260e103b34652b1751b3163c9fa9654b5f8eb155b209d6c57b93634afcb3203b4fdfe45fc8ac2c3e13182750a2ccfd9c8e726bb5d2ea26c69aa SHA512 8408d869c113d8c878e461e3c796233d353df9869af2424361aae629888ee96876cd2a6a00ee8a39ae2069477821c1c9150ca8169723e46167165c39fbc4ba19
diff --git a/dev-cpp/clucene/clucene-2.3.3.4-r6.ebuild b/dev-cpp/clucene/clucene-2.3.3.4-r6.ebuild
index c52e641b1f87..45755a6557d1 100644
--- a/dev-cpp/clucene/clucene-2.3.3.4-r6.ebuild
+++ b/dev-cpp/clucene/clucene-2.3.3.4-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -30,6 +30,7 @@ DOCS=(AUTHORS ChangeLog README README.PACKAGE REQUESTS)
 S="${WORKDIR}/${MY_PN}-${PV}"
 
 PATCHES=(
+	"${FILESDIR}"/clucene-2.3.3.4-fix-clang.patch
 	"${FILESDIR}/${P}-contrib.patch"
 	"${FILESDIR}/${P}-pkgconfig.patch"
 	"${FILESDIR}/${P}-gcc6.patch"
diff --git a/dev-cpp/clucene/files/clucene-2.3.3.4-fix-clang.patch b/dev-cpp/clucene/files/clucene-2.3.3.4-fix-clang.patch
new file mode 100644
index 000000000000..f743fa8c4480
--- /dev/null
+++ b/dev-cpp/clucene/files/clucene-2.3.3.4-fix-clang.patch
@@ -0,0 +1,35 @@
+--- /src/core/CLucene/queryParser/QueryParser.cpp.original	2018-08-02 15:11:33.157174224 +0200
++++ /src/core/CLucene/queryParser/QueryParser.cpp	2018-08-02 15:12:33.189175705 +0200
+@@ -79,7 +79,7 @@
+     _T("<RANGEEX_GOOP>")
+ };
+ 
+-const int32_t QueryParser::jj_la1_0[] = {0x180,0x180,0xe00,0xe00,0x1f69f80,0x48000,0x10000,0x1f69000,0x1348000,0x80000,0x80000,0x10000,0x18000000,0x2000000,0x18000000,0x10000,0x80000000,0x20000000,0x80000000,0x10000,0x80000,0x10000,0x1f68000};
++const int32_t QueryParser::jj_la1_0[] = {0x180,0x180,0xe00,0xe00,0x1f69f80,0x48000,0x10000,0x1f69000,0x1348000,0x80000,0x80000,0x10000,0x18000000,0x2000000,0x18000000,0x10000,(int32_t)0x80000000,0x20000000,(int32_t)0x80000000,0x10000,0x80000,0x10000,0x1f68000};
+ const int32_t QueryParser::jj_la1_1[] = {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x1,0x0,0x0,0x0,0x0};
+ 
+ struct QueryParser::JJCalls {
+--- /src/core/CLucene/queryParser/QueryParserTokenManager.cpp.original	2018-08-02 15:14:27.104178515 +0200
++++ /src/core/CLucene/queryParser/QueryParserTokenManager.cpp	2018-08-02 15:15:10.399179583 +0200
+@@ -15,9 +15,9 @@
+ 
+ CL_NS_DEF(queryParser)
+ 
+-const int64_t QueryParserTokenManager::jjbitVec2[]={0x0L, 0x0L, _ILONGLONG(0xffffffffffffffff), _ILONGLONG(0xffffffffffffffff)};
++const int64_t QueryParserTokenManager::jjbitVec2[]={0x0L, 0x0L, (int64_t)_ILONGLONG(0xffffffffffffffff), (int64_t)_ILONGLONG(0xffffffffffffffff)};
+ const int64_t QueryParserTokenManager::jjbitVec0[] = {
+-	_ILONGLONG(0xfffffffffffffffe), _ILONGLONG(0xffffffffffffffff), _ILONGLONG(0xffffffffffffffff), _ILONGLONG(0xffffffffffffffff)
++	(int64_t)_ILONGLONG(0xfffffffffffffffe), (int64_t)_ILONGLONG(0xffffffffffffffff), (int64_t)_ILONGLONG(0xffffffffffffffff), (int64_t)_ILONGLONG(0xffffffffffffffff)
+ };
+ const int32_t QueryParserTokenManager::jjnextStates[]={
+ 		15, 17, 18, 29, 32, 23, 33, 30, 20, 21, 32, 23, 33, 31, 34, 27,
+--- /src/core/CLucene/document/DateTools.cpp.original	2018-08-02 15:20:28.903187441 +0200
++++ /src/core/CLucene/document/DateTools.cpp	2018-08-02 15:20:35.441187602 +0200
+@@ -8,6 +8,7 @@
+ 
+ #include "DateTools.h"
+ #include "CLucene/util/Misc.h"
++#include <time.h>
+ 
+ CL_NS_USE(util)
+ CL_NS_DEF(document)