gentoo resync : 25.11.2020

11 files changed, 370 insertions, 173 deletions

diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index 4e23c0584dcd..8690b442f871 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -1,15 +1,17 @@
-AUX rspamd-2.5-unbundle-lua.patch 3169 BLAKE2B 77ff33b618a824008da0d4d71a79c252bacbfc48a7fa8f288cfdf901883498a6bcdb2acc21959c9c49aabf4e2b2f6445eb7f9b906a008f31e54a9deb730946d0 SHA512 02b59ade0a715c9d7875fb154129724a9e4f392f31928e1c460bd720de0ffb649883c8d29480f8ac09d8cb69281a8395547cb0f6a082a9b422de7adb81469bb0
+AUX rspamd-2.5-replxx-gcc10.patch 280 BLAKE2B 56d8ffde0ac9ba834ef65df2ccc8107f3237c215d715e099a8d3a7796a1667b2692b215ecb63f47cdd1d2beda2f1a2a4b8f8b44609d1377789e207fdbf907d87 SHA512 62969886d6c4d27cb658eee5e40d740d7e3cb8625aa5a74ef67898c1cc4d9c65d01d2bee4290d7108cd215c076cd950c6e0dbbbea0b714de442ed662e0ee68f2
+AUX rspamd-2.5-unbundle-lua.patch 1367 BLAKE2B 91b1e48a8d75cf4ff2fe796fb45c202fdd0dfae8e08a0c2d43c167dcceb81fd13629bd198e3c909eac85a6e939ac6b68127f3cdf32ed5bfb57e970527d39d449 SHA512 41d424da356e68a2c15e7e863525128cb837b78a839954addf39260971f18ab65cc076b8b55cda2f75522b503592208647ac06b0dfa490e8b2a5540cab63cd99
 AUX rspamd-2.5-unbundle-snowball.patch 758 BLAKE2B 4e419c4e70d5726309c17ca759b8917feb2d52842cde06453821a8b1964ed8165a5f3536ab917a8362b44b40858d1660ae7c7887fee513e9e6fb681d24589255 SHA512 5257921bdeb5febef99feebd03d291aad009a6b8a44c325305532bae7aec35456042b4813338f175c4a59aa80cce3178118d9e1e4bc5a500f42e5364c06a4dda
 AUX rspamd-2.5-unbundle-zstd.patch 4191 BLAKE2B 3d053efdfbf66dfd793b20d00a534bf5d46f5a85c48f432a45d17781be960db916bb28decd92c089d5bca734edb18559f552590ad804f27c494a2342a52b8606 SHA512 afdbfb264243bdc27c8010c9a2b89a855d16054d445c82a13656f505550670f7ab978008c0900c9d04144677b043976101d882e6deb9a32215110e0d96e74179
+AUX rspamd-2.6-unbundle-lua.patch 1344 BLAKE2B 0d5e07043f5bff29ef484e7708cd3b0fda36e500c6846772c6299fd43499e46c0f453c873c89a82a48b7402e6cbb5cd2d20f4547d831d490ceac99f0aecc7926 SHA512 1c95ce0b6cca05671d3dee9b373dfaf0be1dae45702b5e1165c482141b8b87c367bd5cfbf482309c00872468b379a2a82034d6983ec219e6ef18ae50d4ce48a2
+AUX rspamd-2.6-unbundle-zstd.patch 4085 BLAKE2B aba3487956b3a92296adffc748775ef88dfbbd8595fde5c50e33e67a9d6d517e8f73dc22a288aee73b4131b8c49f84968b9e6aa5c697c7e7a0a68b7f938cac38 SHA512 9c9a2ac7bd25fdc9dd2ae6aebd18a1a88358b5de0f2b7bb63b7af5c405125e0517df0869e6007f79c87d5f650395589f543581c189b91d1cbc1e8ab76c2df0ee
+AUX rspamd-9999-unbundle-zstd.patch 4040 BLAKE2B 5ea99146c979337aaeb1e9cc1bacbec07478dc65dfd3902ae54153ca64bb0035340fbea0604ad089b5ad503a76b9199028376ec90c7e179013b75b6b3f3de8f2 SHA512 6e6b5080195295c7d9e442eedcabb11bd0c9879a38c1b0dc26bf5e5b2f3665a46ef86b5e95582a68d2df922db862db3cd46a555b9c97a7fefb72a79373a02b19
 AUX rspamd-r1.logrotate 305 BLAKE2B 58e816e54fd0a7e977dd2f6dcf97617c188888ffea66769ef60ce799f980e2814221734fee7b47c93790a5bbfecbb2f315f93c84bec9dd29b0f80c15e1b9e349 SHA512 0515d31a890058194106d9b8960d77909914986e73619dede751be2efb9592a41f90f15599310b5d6d027c3a203df412c8379ade7df09ecdfd4dcf43bfff4fa7
 AUX rspamd-r7.init 1357 BLAKE2B 90227e0980397a256e6136cac4a4a4d143130d82a211bfd4894d5f8deb85113e0b219e6453257d548ec3d80de24241e6ecfc2b0a4178cb344c8c6549d96e549b SHA512 89a079d32b7d8c5a037c7bb2ab6825624ce89ea4b25893bcf6f49befc0c7b924b51d48b30bf61c4b3ea5bc3ccbaba16664c7df52236debda0bdb58f1adf8867a
 AUX rspamd.conf 908 BLAKE2B 9d8c310c00990f47012e9d1710fbb7567ae5b0e92a411d3fb2696bfb32b70c31ceeaded873f06c759a471d534fb872656907e73ee095150fae384de4df6e9946 SHA512 753011de167af9261cc67676357aadf34d0b160d343a20d5efe8b3389e8a604775b7a6abbaad3174acae7df5579b52b4ba8a0a714419084befedfa96a3a8a9b1
 AUX rspamd.tmpfile 33 BLAKE2B 3ce0f8ab29a2ca259023f90b12799d8c7f0f099a98ef1eb4abe3b3d3e6046d362dae9efc723dd675dff8f1c1df9d05c09e539fcd251382cd9fc5e92351ece8a9 SHA512 1c7e6b79a05cdf9a886c6e233417a0d7b398a1e27ddd3b19c3a595afd50e502a7fd7c09a3499cb9fe6e0291b8493d150550b094c8bf6e2221b71915239c72ef8
-DIST rspamd-2.3.tar.gz 4409924 BLAKE2B 825326c8c92b9937be1aed8640acc1c94762bf8de564642e4d1d429025eb9cc7ba943217b35c881c92b888cff0bec68ffae737bfc77ccb02bfc2ebd9d5948bcc SHA512 20fae1b088acafaaaa406980dc10da5efa66680f10ca8f0d262ddc735a0498f2026091806206995430d28ae27a7d348556eb1586a9217a02c39dfcf0f7c6eb95
-DIST rspamd-2.4.tar.gz 4462119 BLAKE2B 073a27dc8ca76ede3928a2bbc1c3908d442e2d70e0cb51fea73f23fea55536f84e8154b7b6423af13002c0bd5cda60ae9948b3c6321a73d365c7fbd6541c3dca SHA512 47d64fdadc1c61642efebe4772add48848a45c8106bf431dacb458d85cdd9bf996ca46bcb75d60cedb15ae72518089e9b3e63a0716d22843f5b9f38d7d86be08
 DIST rspamd-2.5.tar.gz 4490310 BLAKE2B 8d117b1b03e8092d0c724a4da4de23dd145f5b22696aa6b4ef1c208ade28f0d143dd783c9173b6987514b2aef9327ff8fd29eeae5e3da3039d2568384e50a697 SHA512 6068309da98eeb75f95188414b12ce9443aef31200853f820646e70e1dbf2d9d1e2c661a86df2183c175cc01cfb09f6a5c7b8ba358901a56ec6cdb9d9fef4540
-EBUILD rspamd-2.3.ebuild 2219 BLAKE2B 22b8e199e27f7771ea5a4216b648da72b14f76c31845565fabb76a331e16366dbcc40eee13915db234a77fed03dabb4869cefa6aaf55387c6eeacbaa476dc6da SHA512 88f17ad1f33841d5ac80447ad935a8bf2e108fc7fc89ba70922312979721eaa38cc74bfbde09145f055885a62b7306e664325eee2e434bc1483aacb083e23230
-EBUILD rspamd-2.4.ebuild 2219 BLAKE2B 22b8e199e27f7771ea5a4216b648da72b14f76c31845565fabb76a331e16366dbcc40eee13915db234a77fed03dabb4869cefa6aaf55387c6eeacbaa476dc6da SHA512 88f17ad1f33841d5ac80447ad935a8bf2e108fc7fc89ba70922312979721eaa38cc74bfbde09145f055885a62b7306e664325eee2e434bc1483aacb083e23230
-EBUILD rspamd-2.5.ebuild 2573 BLAKE2B 634e38870b37b9d3d41d38e0101df39ec19fbab7b36d5b3b6db4dd7e321f23260aef04b9c289a1bed77536cd539d824d53820e107a327ac8e673b099f530a9fa SHA512 f2a0934d81ce4ed7ff6383c5017e48bd8b71c07d31eea5fb2e9078639ca4e36fa4526c6c7cfed2a96ccd527a9ac4ffa7e7cbc825d7b1149f21589f40435925d6
-EBUILD rspamd-9999.ebuild 2573 BLAKE2B 634e38870b37b9d3d41d38e0101df39ec19fbab7b36d5b3b6db4dd7e321f23260aef04b9c289a1bed77536cd539d824d53820e107a327ac8e673b099f530a9fa SHA512 f2a0934d81ce4ed7ff6383c5017e48bd8b71c07d31eea5fb2e9078639ca4e36fa4526c6c7cfed2a96ccd527a9ac4ffa7e7cbc825d7b1149f21589f40435925d6
-MISC metadata.xml 751 BLAKE2B 612a7de6326aba8b0319fb58cb7dd8669bc8d2d59e0e606afbe6b202c287e6953023e5a026750866dc015b9a2aa0249be3ccd46b48cf950a78b2cf497bc86147 SHA512 d958864849fa7a74e578046d1d2a7599b0a3e3d8b1d7f9d520833ce1037aff77f39dff49ad1996eb600f3293f23ba84919ab046abddc75490816799ea6865494
+DIST rspamd-2.6.tar.gz 5079444 BLAKE2B acb9d9471d0bb457da33b4d23e3c75ef87ea26a47e6c731bfd5fbbfe28567244e2bc72fd25ca3408db0928dab4e4ab66596e38cf3eff7cb9690eec59d3b62372 SHA512 79e4c1aa763aef753c8d7b2a941ed92b384e96c25e6d1b3bd1321c5acc0ecb934d033a3bf19cb94c89809fd92edec25192cffe97de9e5251681e1a71216b734a
+EBUILD rspamd-2.5-r1.ebuild 2564 BLAKE2B bef0d75d83f85a0736000a9f5b84ffd27d62225d65318b3f3440ea6c7c695fa80922b6b40df58ecaa6daf4a69e2ac822c8becccd7d281ecb3d647d1e3a7564fb SHA512 2fc29c4d2e34f56396be899dc7b6faecf7e47a4321958d7169ed53d018a6d8a090744c1a4d1fa3a1563315e3635208df0c654da88c5a50a30835f8cf6b803251
+EBUILD rspamd-2.6-r2.ebuild 2534 BLAKE2B 4d75dcdc44c51b38be726e6be4dbf51915ae3333bc6c7662303be93531562394495cb2c516fb2c9abd18326f39abf5352c844e3b7d9d67ba94d9e9fe2a387d7f SHA512 fec9a74698ac4df235106c179e619dac1890f82d3489fdf2599db5b7b7c57b7d92926160662599b117844cbca12493a309dcddcd8c4bbfdb25eef582ef9fabfa
+EBUILD rspamd-9999.ebuild 2535 BLAKE2B 8f3e3f5f4e80c667a0181379410dd890ac95d7ee81c7d47334c12f0b49161304270a05eabbf758bec084ee907e1a4e80f05c619c15dc96d91e0908d5540aa6c9 SHA512 9495d0b2474d04d5b0015efc1830da1263a5f1fc3de49605798facc987ef94171befb539bff4389c783db8e5f56e695acf0b7068669d310d30f72383f71e8899
+MISC metadata.xml 639 BLAKE2B 935ca7becc486efc41fa07b224808a67893e8a609819a1d7a299f03689d94ea6c959f0e606896f0bd899294e7a48c48279125f9e8508981aebaa42a55a8eb4a7 SHA512 22cadde54711e1b4b7324fe68dfacc95fac4477910001b99e0423b9735e83f69801580822aa5f6ea6460955eda6fe4cd4702d9c22cfe1b09721203744f556a80
diff --git a/mail-filter/rspamd/files/rspamd-2.5-replxx-gcc10.patch b/mail-filter/rspamd/files/rspamd-2.5-replxx-gcc10.patch
new file mode 100644
index 000000000000..81d7f3de2958
--- /dev/null
+++ b/mail-filter/rspamd/files/rspamd-2.5-replxx-gcc10.patch
@@ -0,0 +1,12 @@
+diff --git a/contrib/replxx/src/io.cxx b/contrib/replxx/src/io.cxx
+index a09886701..8df176d1c 100644
+--- a/contrib/replxx/src/io.cxx
++++ b/contrib/replxx/src/io.cxx
+@@ -3,6 +3,7 @@
+ #include <cstdlib>
+ #include <cstring>
+ #include <array>
++#include <stdexcept>
+ 
+ #ifdef _WIN32
+ 
diff --git a/mail-filter/rspamd/files/rspamd-2.5-unbundle-lua.patch b/mail-filter/rspamd/files/rspamd-2.5-unbundle-lua.patch
index b8deb2d6903b..4a20c8f19d3f 100644
--- a/mail-filter/rspamd/files/rspamd-2.5-unbundle-lua.patch
+++ b/mail-filter/rspamd/files/rspamd-2.5-unbundle-lua.patch
@@ -1,22 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index bbc141170..8e3665c18 100644
+index bbc141170..7fbb1b485 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -112,7 +112,6 @@ INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/"
- 		"${CMAKE_SOURCE_DIR}/contrib/librdns"
- 		"${CMAKE_SOURCE_DIR}/contrib/aho-corasick"
- 		"${CMAKE_SOURCE_DIR}/contrib/lc-btrie"
--		"${CMAKE_SOURCE_DIR}/contrib/lua-lpeg"
- 		"${CMAKE_BINARY_DIR}/src" #Stored in the binary dir
- 		"${CMAKE_BINARY_DIR}/src/libcryptobox")
- 
-@@ -592,16 +591,11 @@ ENDIF()
- ADD_SUBDIRECTORY(contrib/libucl)
- ADD_SUBDIRECTORY(contrib/librdns)
- ADD_SUBDIRECTORY(contrib/aho-corasick)
--ADD_SUBDIRECTORY(contrib/lua-lpeg)
- ADD_SUBDIRECTORY(contrib/t1ha)
- ADD_SUBDIRECTORY(contrib/libev)
+@@ -598,10 +598,6 @@ ADD_SUBDIRECTORY(contrib/libev)
  ADD_SUBDIRECTORY(contrib/kann)
  ADD_SUBDIRECTORY(contrib/fastutf8)
  
@@ -27,27 +13,11 @@ index bbc141170..8e3665c18 100644
  IF (ENABLE_LUA_REPL MATCHES "ON")
  	ADD_SUBDIRECTORY(contrib/replxx)
  	SET(WITH_LUA_REPL 1)
-@@ -700,7 +694,6 @@ INSTALL(FILES "contrib/lua-fun/fun.lua" DESTINATION ${LUALIBDIR})
- INSTALL(FILES "contrib/lua-argparse/argparse.lua" DESTINATION ${LUALIBDIR})
- INSTALL(FILES "contrib/lua-tableshape/tableshape.lua" DESTINATION ${LUALIBDIR})
- INSTALL(FILES "contrib/lua-lupa/lupa.lua" DESTINATION ${LUALIBDIR})
--INSTALL(FILES "contrib/lua-lpeg/lpegre.lua" DESTINATION ${LUALIBDIR})
- 
- # systemd unit
- IF(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND WANT_SYSTEMD_UNITS MATCHES "ON")
 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 9a34d2ac4..54b2e4083 100644
+index 9a34d2ac4..59bab5c15 100644
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
-@@ -180,7 +180,6 @@ ENDIF()
- TARGET_LINK_LIBRARIES(rspamd-server rspamd-http-parser)
- TARGET_LINK_LIBRARIES(rspamd-server rspamd-fpconv)
- TARGET_LINK_LIBRARIES(rspamd-server rspamd-cdb)
--TARGET_LINK_LIBRARIES(rspamd-server rspamd-lpeg)
- TARGET_LINK_LIBRARIES(rspamd-server lcbtrie)
- TARGET_LINK_LIBRARIES(rspamd-server rspamd-zstd)
- TARGET_LINK_LIBRARIES(rspamd-server rspamd-fastutf8)
-@@ -189,10 +188,6 @@ IF (ENABLE_CLANG_PLUGIN MATCHES "ON")
+@@ -189,10 +189,6 @@ IF (ENABLE_CLANG_PLUGIN MATCHES "ON")
  	ADD_DEPENDENCIES(rspamd-server rspamd-clang)
  ENDIF()
  
@@ -59,18 +29,10 @@ index 9a34d2ac4..54b2e4083 100644
  	TARGET_LINK_LIBRARIES(rspamd-server stemmer)
  ENDIF()
 diff --git a/src/lua/lua_common.c b/src/lua/lua_common.c
-index ce5fff6c5..509ceeb44 100644
+index ce5fff6c5..bea6dc389 100644
 --- a/src/lua/lua_common.c
 +++ b/src/lua/lua_common.c
-@@ -14,7 +14,6 @@
-  * limitations under the License.
-  */
- #include "lua_common.h"
--#include "lptree.h"
- #include "utlist.h"
- #include "unix-std.h"
- #include "ottery.h"
-@@ -903,10 +902,6 @@ rspamd_lua_wipe_realloc (void *ud,
+@@ -903,10 +903,6 @@ rspamd_lua_wipe_realloc (void *ud,
  	return NULL;
  }
  
@@ -81,7 +43,7 @@ index ce5fff6c5..509ceeb44 100644
  lua_State *
  rspamd_lua_init (bool wipe_mem)
  {
-@@ -961,7 +956,6 @@ rspamd_lua_init (bool wipe_mem)
+@@ -961,7 +957,6 @@ rspamd_lua_init (bool wipe_mem)
  	luaopen_kann (L);
  	luaopen_spf (L);
  #ifndef WITH_LUAJIT
@@ -89,11 +51,3 @@ index ce5fff6c5..509ceeb44 100644
  	lua_settop (L, 0);
  #endif
  
-@@ -971,7 +965,6 @@ rspamd_lua_init (bool wipe_mem)
- 	rspamd_lua_new_class (L, "rspamd{session}", NULL);
- 	lua_pop (L, 1);
- 
--	rspamd_lua_add_preload (L, "lpeg", luaopen_lpeg);
- 	luaopen_ucl (L);
- 	rspamd_lua_add_preload (L, "ucl", luaopen_ucl);
- 
diff --git a/mail-filter/rspamd/files/rspamd-2.6-unbundle-lua.patch b/mail-filter/rspamd/files/rspamd-2.6-unbundle-lua.patch
new file mode 100644
index 000000000000..9278fa8608d7
--- /dev/null
+++ b/mail-filter/rspamd/files/rspamd-2.6-unbundle-lua.patch
@@ -0,0 +1,53 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b794b9dbd..1ba5c085e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -632,10 +632,6 @@ ADD_SUBDIRECTORY(contrib/fastutf8)
+ ADD_SUBDIRECTORY(contrib/google-ced)
+ 
+ 
+-IF (NOT WITH_LUAJIT)
+-	ADD_SUBDIRECTORY(contrib/lua-bit)
+-ENDIF()
+-
+ IF (ENABLE_LUA_REPL MATCHES "ON")
+ 	ADD_SUBDIRECTORY(contrib/replxx)
+ 	SET(WITH_LUA_REPL 1)
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 9a34d2ac4..59bab5c15 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -189,10 +189,6 @@ IF (ENABLE_CLANG_PLUGIN MATCHES "ON")
+ 	ADD_DEPENDENCIES(rspamd-server rspamd-clang)
+ ENDIF()
+ 
+-IF (NOT WITH_LUAJIT)
+-	TARGET_LINK_LIBRARIES(rspamd-server rspamd-bit)
+-ENDIF()
+-
+ IF (ENABLE_SNOWBALL MATCHES "ON")
+ 	TARGET_LINK_LIBRARIES(rspamd-server stemmer)
+ ENDIF()
+diff --git a/src/lua/lua_common.c b/src/lua/lua_common.c
+index b7fcc2034..1d86464da 100644
+--- a/src/lua/lua_common.c
++++ b/src/lua/lua_common.c
+@@ -922,10 +922,6 @@ rspamd_lua_wipe_realloc (void *ud,
+ 	return NULL;
+ }
+ 
+-#ifndef WITH_LUAJIT
+-extern int luaopen_bit(lua_State *L);
+-#endif
+-
+ lua_State *
+ rspamd_lua_init (bool wipe_mem)
+ {
+@@ -981,7 +977,6 @@ rspamd_lua_init (bool wipe_mem)
+ 	luaopen_spf (L);
+ 	luaopen_tensor (L);
+ #ifndef WITH_LUAJIT
+-	rspamd_lua_add_preload (L, "bit", luaopen_bit);
+ 	lua_settop (L, 0);
+ #endif
+ 
diff --git a/mail-filter/rspamd/files/rspamd-2.6-unbundle-zstd.patch b/mail-filter/rspamd/files/rspamd-2.6-unbundle-zstd.patch
new file mode 100644
index 000000000000..1a7f4453c86f
--- /dev/null
+++ b/mail-filter/rspamd/files/rspamd-2.6-unbundle-zstd.patch
@@ -0,0 +1,128 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 90caf4048..e2e5d182c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -198,6 +198,8 @@ ELSE()
+ 		ROOT ${PCRE_ROOT_DIR} MODULES pcre libpcre pcre3 libpcre3)
+ ENDIF()
+ 
++ProcessPackage(ZSTD LIBRARY zstd INCLUDE zstd.h
++	ROOT ${ZSTD_ROOT_DIR} MODULES libzstd)
+ ProcessPackage(SQLITE3 LIBRARY sqlite3 INCLUDE sqlite3.h INCLUDE_SUFFIXES include/sqlite3 include/sqlite
+ 	ROOT ${SQLITE3_ROOT_DIR} MODULES sqlite3 sqlite)
+ ProcessPackage(ICUDATA LIBRARY icudata INCLUDE unicode/ucnv.h
+@@ -615,7 +617,6 @@ ADD_SUBDIRECTORY(contrib/http-parser)
+ ADD_SUBDIRECTORY(contrib/fpconv)
+ ADD_SUBDIRECTORY(contrib/lc-btrie)
+ ADD_SUBDIRECTORY(contrib/libottery)
+-ADD_SUBDIRECTORY(contrib/zstd)
+ IF(ENABLE_SNOWBALL MATCHES "ON")
+ 	ADD_SUBDIRECTORY(contrib/snowball)
+ 	SET(WITH_SNOWBALL 1)
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 54b2e4083..e0e2edd58 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -181,7 +181,6 @@ TARGET_LINK_LIBRARIES(rspamd-server rspamd-http-parser)
+ TARGET_LINK_LIBRARIES(rspamd-server rspamd-fpconv)
+ TARGET_LINK_LIBRARIES(rspamd-server rspamd-cdb)
+ TARGET_LINK_LIBRARIES(rspamd-server lcbtrie)
+-TARGET_LINK_LIBRARIES(rspamd-server rspamd-zstd)
+ TARGET_LINK_LIBRARIES(rspamd-server rspamd-fastutf8)
+ 
+ IF (ENABLE_CLANG_PLUGIN MATCHES "ON")
+diff --git a/src/client/rspamdclient.c b/src/client/rspamdclient.c
+index bcb25672e..48ca58e94 100644
+--- a/src/client/rspamdclient.c
++++ b/src/client/rspamdclient.c
+@@ -19,7 +19,7 @@
+ #include "libserver/http/http_private.h"
+ #include "libserver/protocol_internal.h"
+ #include "unix-std.h"
+-#include "contrib/zstd/zstd.h"
++#include <zstd.h>
+ 
+ #ifdef HAVE_FETCH_H
+ #include <fetch.h>
+diff --git a/src/libserver/cfg_utils.c b/src/libserver/cfg_utils.c
+index 78e3fc79f..40110c693 100644
+--- a/src/libserver/cfg_utils.c
++++ b/src/libserver/cfg_utils.c
+@@ -36,8 +36,7 @@
+ #include "contrib/libottery/ottery.h"
+ #include "contrib/fastutf8/fastutf8.h"
+ 
+-#define ZSTD_STATIC_LINKING_ONLY
+-#include "contrib/zstd/zstd.h"
++#include <zstd.h>
+ 
+ #ifdef HAVE_OPENSSL
+ #include <openssl/rand.h>
+diff --git a/src/libserver/maps/map.c b/src/libserver/maps/map.c
+index 8b9f522b2..8cf03ffd6 100644
+--- a/src/libserver/maps/map.c
++++ b/src/libserver/maps/map.c
+@@ -23,7 +23,7 @@
+ #include "libserver/http/http_connection.h"
+ #include "libserver/http/http_private.h"
+ #include "rspamd.h"
+-#include "contrib/zstd/zstd.h"
++#include <zstd.h>
+ #include "contrib/libev/ev.h"
+ #include "contrib/uthash/utlist.h"
+ 
+diff --git a/src/libserver/protocol.c b/src/libserver/protocol.c
+index 9d1276064..6f0a66fb8 100644
+--- a/src/libserver/protocol.c
++++ b/src/libserver/protocol.c
+@@ -21,7 +21,7 @@
+ #include "worker_private.h"
+ #include "libserver/cfg_file_private.h"
+ #include "libmime/scan_result_private.h"
+-#include "contrib/zstd/zstd.h"
++#include <zstd.h>
+ #include "lua/lua_common.h"
+ #include "unix-std.h"
+ #include "protocol_internal.h"
+diff --git a/src/libserver/task.c b/src/libserver/task.c
+index 53da0dae6..6538abdbf 100644
+--- a/src/libserver/task.c
++++ b/src/libserver/task.c
+@@ -25,7 +25,7 @@
+ #include "stat_api.h"
+ #include "unix-std.h"
+ #include "utlist.h"
+-#include "contrib/zstd/zstd.h"
++#include <zstd.h>
+ #include "libserver/mempool_vars_internal.h"
+ #include "libserver/cfg_file_private.h"
+ #include "libmime/lang_detection.h"
+diff --git a/src/lua/lua_util.c b/src/lua/lua_util.c
+index 0787736d5..21474317a 100644
+--- a/src/lua/lua_util.c
++++ b/src/lua/lua_util.c
+@@ -17,7 +17,7 @@
+ #include "html.h"
+ #include "tokenizers/tokenizers.h"
+ #include "unix-std.h"
+-#include "contrib/zstd/zstd.h"
++#include <zstd.h>
+ #include "contrib/uthash/utlist.h"
+ #include "libmime/email_addr.h"
+ #include "libmime/content_type.h"
+diff --git a/src/rspamd_proxy.c b/src/rspamd_proxy.c
+index 4ed8cfab7..5f8808e40 100644
+--- a/src/rspamd_proxy.c
++++ b/src/rspamd_proxy.c
+@@ -36,7 +36,7 @@
+ #include "libserver/milter.h"
+ #include "libserver/milter_internal.h"
+ #include "libmime/lang_detection.h"
+-#include "contrib/zstd/zstd.h"
++#include <zstd.h>
+ 
+ #include <math.h>
+ 
+-- 
+2.26.2
+
diff --git a/mail-filter/rspamd/files/rspamd-9999-unbundle-zstd.patch b/mail-filter/rspamd/files/rspamd-9999-unbundle-zstd.patch
new file mode 100644
index 000000000000..c42bb8f5d6f2
--- /dev/null
+++ b/mail-filter/rspamd/files/rspamd-9999-unbundle-zstd.patch
@@ -0,0 +1,125 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3b4bd8469..75582513e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -199,6 +199,8 @@ ELSE()
+ 		ROOT ${PCRE_ROOT_DIR} MODULES pcre libpcre pcre3 libpcre3)
+ ENDIF()
+ 
++ProcessPackage(ZSTD LIBRARY zstd INCLUDE zstd.h
++	ROOT ${ZSTD_ROOT_DIR} MODULES libzstd)
+ ProcessPackage(SQLITE3 LIBRARY sqlite3 INCLUDE sqlite3.h INCLUDE_SUFFIXES include/sqlite3 include/sqlite
+ 	ROOT ${SQLITE3_ROOT_DIR} MODULES sqlite3 sqlite)
+ ProcessPackage(ICUDATA LIBRARY icudata INCLUDE unicode/ucnv.h
+@@ -616,7 +618,6 @@ ADD_SUBDIRECTORY(contrib/http-parser)
+ ADD_SUBDIRECTORY(contrib/fpconv)
+ ADD_SUBDIRECTORY(contrib/lc-btrie)
+ ADD_SUBDIRECTORY(contrib/libottery)
+-ADD_SUBDIRECTORY(contrib/zstd)
+ IF(ENABLE_SNOWBALL MATCHES "ON")
+ 	ADD_SUBDIRECTORY(contrib/snowball)
+ 	SET(WITH_SNOWBALL 1)
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 59bab5c15..098329991 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -182,7 +182,6 @@ TARGET_LINK_LIBRARIES(rspamd-server rspamd-fpconv)
+ TARGET_LINK_LIBRARIES(rspamd-server rspamd-cdb)
+ TARGET_LINK_LIBRARIES(rspamd-server rspamd-lpeg)
+ TARGET_LINK_LIBRARIES(rspamd-server lcbtrie)
+-TARGET_LINK_LIBRARIES(rspamd-server rspamd-zstd)
+ TARGET_LINK_LIBRARIES(rspamd-server rspamd-fastutf8)
+ 
+ IF (ENABLE_CLANG_PLUGIN MATCHES "ON")
+diff --git a/src/client/rspamdclient.c b/src/client/rspamdclient.c
+index bcb25672e..48ca58e94 100644
+--- a/src/client/rspamdclient.c
++++ b/src/client/rspamdclient.c
+@@ -19,7 +19,7 @@
+ #include "libserver/http/http_private.h"
+ #include "libserver/protocol_internal.h"
+ #include "unix-std.h"
+-#include "contrib/zstd/zstd.h"
++#include <zstd.h>
+ 
+ #ifdef HAVE_FETCH_H
+ #include <fetch.h>
+diff --git a/src/libserver/cfg_utils.c b/src/libserver/cfg_utils.c
+index e2f886aa6..5b214c09c 100644
+--- a/src/libserver/cfg_utils.c
++++ b/src/libserver/cfg_utils.c
+@@ -36,8 +36,7 @@
+ #include "contrib/libottery/ottery.h"
+ #include "contrib/fastutf8/fastutf8.h"
+ 
+-#define ZSTD_STATIC_LINKING_ONLY
+-#include "contrib/zstd/zstd.h"
++#include <zstd.h>
+ 
+ #ifdef HAVE_OPENSSL
+ #include <openssl/rand.h>
+diff --git a/src/libserver/maps/map.c b/src/libserver/maps/map.c
+index 14792753a..20ca8416e 100644
+--- a/src/libserver/maps/map.c
++++ b/src/libserver/maps/map.c
+@@ -23,7 +23,7 @@
+ #include "libserver/http/http_connection.h"
+ #include "libserver/http/http_private.h"
+ #include "rspamd.h"
+-#include "contrib/zstd/zstd.h"
++#include <zstd.h>
+ #include "contrib/libev/ev.h"
+ #include "contrib/uthash/utlist.h"
+ 
+diff --git a/src/libserver/protocol.c b/src/libserver/protocol.c
+index 31b0308cb..62ba3d833 100644
+--- a/src/libserver/protocol.c
++++ b/src/libserver/protocol.c
+@@ -21,7 +21,7 @@
+ #include "worker_private.h"
+ #include "libserver/cfg_file_private.h"
+ #include "libmime/scan_result_private.h"
+-#include "contrib/zstd/zstd.h"
++#include <zstd.h>
+ #include "lua/lua_common.h"
+ #include "unix-std.h"
+ #include "protocol_internal.h"
+diff --git a/src/libserver/task.c b/src/libserver/task.c
+index e7a83a603..c613fffcc 100644
+--- a/src/libserver/task.c
++++ b/src/libserver/task.c
+@@ -25,7 +25,7 @@
+ #include "stat_api.h"
+ #include "unix-std.h"
+ #include "utlist.h"
+-#include "contrib/zstd/zstd.h"
++#include <zstd.h>
+ #include "libserver/mempool_vars_internal.h"
+ #include "libserver/cfg_file_private.h"
+ #include "libmime/lang_detection.h"
+diff --git a/src/lua/lua_util.c b/src/lua/lua_util.c
+index e879d37af..88451e222 100644
+--- a/src/lua/lua_util.c
++++ b/src/lua/lua_util.c
+@@ -15,7 +15,7 @@
+  */
+ #include "lua_common.h"
+ #include "unix-std.h"
+-#include "contrib/zstd/zstd.h"
++#include <zstd.h>
+ #include "libmime/email_addr.h"
+ #include "libmime/content_type.h"
+ #include "libmime/mime_headers.h"
+diff --git a/src/rspamd_proxy.c b/src/rspamd_proxy.c
+index 3fa5da390..c641fb263 100644
+--- a/src/rspamd_proxy.c
++++ b/src/rspamd_proxy.c
+@@ -36,7 +36,7 @@
+ #include "libserver/milter.h"
+ #include "libserver/milter_internal.h"
+ #include "libmime/lang_detection.h"
+-#include "contrib/zstd/zstd.h"
++#include <zstd.h>
+ 
+ #include <math.h>
+ 
diff --git a/mail-filter/rspamd/metadata.xml b/mail-filter/rspamd/metadata.xml
index c14373f9b6eb..f0f82f46abdb 100644
--- a/mail-filter/rspamd/metadata.xml
+++ b/mail-filter/rspamd/metadata.xml
@@ -6,10 +6,6 @@
     <name>Christian Roessner</name>
   </maintainer>
   <maintainer type="person">
-    <email>djc@gentoo.org</email>
-    <name>Dirkjan Ochtman</name>
-  </maintainer>
-  <maintainer type="person">
     <email>arkamar@atlas.cz</email>
     <name>Petr Vaněk</name>
   </maintainer>
diff --git a/mail-filter/rspamd/rspamd-2.4.ebuild b/mail-filter/rspamd/rspamd-2.4.ebuild
deleted file mode 100644
index 38a8793ea037..000000000000
--- a/mail-filter/rspamd/rspamd-2.4.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake pax-utils systemd tmpfiles
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/rspamd/rspamd.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/rspamd/rspamd/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Rapid spam filtering system"
-HOMEPAGE="https://rspamd.com/ https://github.com/rspamd/rspamd"
-LICENSE="Apache-2.0 Boost-1.0 BSD BSD-1 BSD-2 CC0-1.0 LGPL-3 MIT public-domain unicode ZLIB"
-SLOT="0"
-IUSE="blas cpu_flags_x86_ssse3 jemalloc +jit libressl pcre2"
-
-RDEPEND="
-	acct-group/rspamd
-	acct-user/rspamd
-	dev-db/sqlite:3
-	dev-libs/glib:2
-	dev-libs/icu:=
-	dev-libs/libev
-	dev-libs/libsodium
-	dev-util/ragel
-	net-libs/libnsl
-	sys-apps/file
-	blas? ( sci-libs/openblas )
-	cpu_flags_x86_ssse3? ( dev-libs/hyperscan )
-	jemalloc? ( dev-libs/jemalloc )
-	jit? ( dev-lang/luajit:2 )
-	!jit? ( dev-lang/lua:* )
-	!libressl? ( dev-libs/openssl:0=[-bindist] )
-	libressl? ( dev-libs/libressl:0= )
-	pcre2? ( dev-libs/libpcre2[jit=] )
-	!pcre2? ( dev-libs/libpcre[jit=] )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	cmake_src_prepare
-
-	sed -i -e 's/User=_rspamd/User=rspamd/g' \
-		rspamd.service \
-		|| die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCONFDIR=/etc/rspamd
-		-DRUNDIR=/var/run/rspamd
-		-DDBDIR=/var/lib/rspamd
-		-DLOGDIR=/var/log/rspamd
-		-DENABLE_BLAS=$(usex blas ON OFF)
-		-DENABLE_HYPERSCAN=$(usex cpu_flags_x86_ssse3 ON OFF)
-		-DENABLE_JEMALLOC=$(usex jemalloc ON OFF)
-		-DENABLE_LUAJIT=$(usex jit ON OFF)
-		-DENABLE_PCRE2=$(usex pcre2 ON OFF)
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-
-	newconfd "${FILESDIR}"/rspamd.conf rspamd
-	newinitd "${FILESDIR}/rspamd-r7.init" rspamd
-	systemd_newunit rspamd.service rspamd.service
-
-	newtmpfiles "${FILESDIR}"/${PN}.tmpfile ${PN}.conf
-
-	# Remove mprotect for JIT support
-	if use jit; then
-		pax-mark m "${ED}"/usr/bin/rspamd-* "${ED}"/usr/bin/rspamadm-*
-	fi
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/rspamd-r1.logrotate rspamd
-
-	diropts -o rspamd -g rspamd
-	keepdir /var/{lib,log}/rspamd
-}
-
-pkg_postinst() {
-	tmpfiles_process "${PN}.conf"
-}
diff --git a/mail-filter/rspamd/rspamd-2.5.ebuild b/mail-filter/rspamd/rspamd-2.5-r1.ebuild
index b5d45580a5de..eb97eb1d040b 100644
--- a/mail-filter/rspamd/rspamd-2.5.ebuild
+++ b/mail-filter/rspamd/rspamd-2.5-r1.ebuild
@@ -36,11 +36,9 @@ RDEPEND="
 	jemalloc? ( dev-libs/jemalloc )
 	jit? (
 		dev-lang/luajit:2
-		dev-lua/lpeg[luajit]
 	)
 	!jit? (
 		dev-lang/lua:*
-		dev-lua/lpeg[-luajit]
 		dev-lua/LuaBitOp
 	)
 	!libressl? ( dev-libs/openssl:0=[-bindist] )
@@ -54,6 +52,7 @@ BDEPEND="
 "
 
 PATCHES=(
+	"${FILESDIR}/rspamd-2.5-replxx-gcc10.patch"
 	"${FILESDIR}/rspamd-2.5-unbundle-lua.patch"
 	"${FILESDIR}/rspamd-2.5-unbundle-zstd.patch"
 	"${FILESDIR}/rspamd-2.5-unbundle-snowball.patch"
@@ -62,7 +61,7 @@ PATCHES=(
 src_prepare() {
 	cmake_src_prepare
 
-	rm -vrf contrib/{lua-{bit,lpeg},snowball,zstd} || die
+	rm -vrf contrib/{lua-bit,snowball,zstd} || die
 
 	sed -i -e 's/User=_rspamd/User=rspamd/g' \
 		rspamd.service \
diff --git a/mail-filter/rspamd/rspamd-2.3.ebuild b/mail-filter/rspamd/rspamd-2.6-r2.ebuild
index 38a8793ea037..380080e13fba 100644
--- a/mail-filter/rspamd/rspamd-2.3.ebuild
+++ b/mail-filter/rspamd/rspamd-2.6-r2.ebuild
@@ -14,7 +14,7 @@ else
 fi
 
 DESCRIPTION="Rapid spam filtering system"
-HOMEPAGE="https://rspamd.com/ https://github.com/rspamd/rspamd"
+HOMEPAGE="https://rspamd.com https://github.com/rspamd/rspamd"
 LICENSE="Apache-2.0 Boost-1.0 BSD BSD-1 BSD-2 CC0-1.0 LGPL-3 MIT public-domain unicode ZLIB"
 SLOT="0"
 IUSE="blas cpu_flags_x86_ssse3 jemalloc +jit libressl pcre2"
@@ -22,28 +22,49 @@ IUSE="blas cpu_flags_x86_ssse3 jemalloc +jit libressl pcre2"
 RDEPEND="
 	acct-group/rspamd
 	acct-user/rspamd
+	app-arch/zstd
 	dev-db/sqlite:3
 	dev-libs/glib:2
 	dev-libs/icu:=
 	dev-libs/libev
 	dev-libs/libsodium
-	dev-util/ragel
+	dev-libs/snowball-stemmer
 	net-libs/libnsl
 	sys-apps/file
-	blas? ( sci-libs/openblas )
+	blas? (
+		virtual/blas
+		virtual/lapack
+	)
 	cpu_flags_x86_ssse3? ( dev-libs/hyperscan )
 	jemalloc? ( dev-libs/jemalloc )
-	jit? ( dev-lang/luajit:2 )
-	!jit? ( dev-lang/lua:* )
+	jit? (
+		dev-lang/luajit:2
+	)
+	!jit? (
+		dev-lang/lua:*
+		dev-lua/LuaBitOp
+	)
 	!libressl? ( dev-libs/openssl:0=[-bindist] )
 	libressl? ( dev-libs/libressl:0= )
 	pcre2? ( dev-libs/libpcre2[jit=] )
 	!pcre2? ( dev-libs/libpcre[jit=] )"
 DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/ragel
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/rspamd-2.6-unbundle-lua.patch"
+	"${FILESDIR}/rspamd-2.6-unbundle-zstd.patch"
+	"${FILESDIR}/rspamd-2.5-unbundle-snowball.patch"
+)
 
 src_prepare() {
 	cmake_src_prepare
 
+	rm -vrf contrib/{lua-bit,snowball,zstd} || die
+
 	sed -i -e 's/User=_rspamd/User=rspamd/g' \
 		rspamd.service \
 		|| die
diff --git a/mail-filter/rspamd/rspamd-9999.ebuild b/mail-filter/rspamd/rspamd-9999.ebuild
index b5d45580a5de..e51965b8983e 100644
--- a/mail-filter/rspamd/rspamd-9999.ebuild
+++ b/mail-filter/rspamd/rspamd-9999.ebuild
@@ -31,16 +31,17 @@ RDEPEND="
 	dev-libs/snowball-stemmer
 	net-libs/libnsl
 	sys-apps/file
-	blas? ( sci-libs/openblas )
+	blas? (
+		virtual/blas
+		virtual/lapack
+	)
 	cpu_flags_x86_ssse3? ( dev-libs/hyperscan )
 	jemalloc? ( dev-libs/jemalloc )
 	jit? (
 		dev-lang/luajit:2
-		dev-lua/lpeg[luajit]
 	)
 	!jit? (
 		dev-lang/lua:*
-		dev-lua/lpeg[-luajit]
 		dev-lua/LuaBitOp
 	)
 	!libressl? ( dev-libs/openssl:0=[-bindist] )
@@ -54,15 +55,15 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}/rspamd-2.5-unbundle-lua.patch"
-	"${FILESDIR}/rspamd-2.5-unbundle-zstd.patch"
+	"${FILESDIR}/rspamd-2.6-unbundle-lua.patch"
+	"${FILESDIR}/rspamd-9999-unbundle-zstd.patch"
 	"${FILESDIR}/rspamd-2.5-unbundle-snowball.patch"
 )
 
 src_prepare() {
 	cmake_src_prepare
 
-	rm -vrf contrib/{lua-{bit,lpeg},snowball,zstd} || die
+	rm -vrf contrib/{lua-bit,snowball,zstd} || die
 
 	sed -i -e 's/User=_rspamd/User=rspamd/g' \
 		rspamd.service \