From d897af505afa85942967dd218e3005a4ad906e5a Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 31 Dec 2022 02:18:46 +0000 Subject: gentoo auto-resync : 31:12:2022 - 02:18:46 --- dev-db/Manifest.gz | Bin 15589 -> 15587 bytes dev-db/mongodb/Manifest | 12 +- dev-db/mongodb/files/mongodb-4.2.0-fix-scons.patch | 30 -- .../mongodb/files/mongodb-4.2.15-no-compass.patch | 45 --- .../mongodb/files/mongodb-4.2.17-boost-1.79.patch | 41 --- .../mongodb/files/mongodb-4.4.10-boost-1.81.patch | 317 +++++++++++++++++++++ dev-db/mongodb/mongodb-4.2.17-r2.ebuild | 184 ------------ dev-db/mongodb/mongodb-4.2.23.ebuild | 183 ------------ dev-db/mongodb/mongodb-4.4.10-r1.ebuild | 1 + dev-db/mongodb/mongodb-5.0.5-r2.ebuild | 1 + 10 files changed, 322 insertions(+), 492 deletions(-) delete mode 100644 dev-db/mongodb/files/mongodb-4.2.0-fix-scons.patch delete mode 100644 dev-db/mongodb/files/mongodb-4.2.15-no-compass.patch delete mode 100644 dev-db/mongodb/files/mongodb-4.2.17-boost-1.79.patch create mode 100644 dev-db/mongodb/files/mongodb-4.4.10-boost-1.81.patch delete mode 100644 dev-db/mongodb/mongodb-4.2.17-r2.ebuild delete mode 100644 dev-db/mongodb/mongodb-4.2.23.ebuild (limited to 'dev-db') diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz index 8f81541cfae2..9b06489f4144 100644 Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest index 2534ebda5be8..385ce6860681 100644 --- a/dev-db/mongodb/Manifest +++ b/dev-db/mongodb/Manifest @@ -1,10 +1,8 @@ -AUX mongodb-4.2.0-fix-scons.patch 1174 BLAKE2B 748de9efdb743c836ccb26239d4b3e73632f19846e2c765e5a9fb6fa6c0bcfaf6cc31a63ba0ce54edf5c8a9d0923efd31ddf81fbc7196386d827f59a50b0b352 SHA512 6f971e8b4140068402b5e8cc738fbff1b54645f97e2f463fec37b124c7b93b8302fae25f9ea1f7f3261c93270e662e4cd876db3f092111e3bde0fcbc3eea33c4 -AUX mongodb-4.2.15-no-compass.patch 1714 BLAKE2B a0d6941a903c2c0f6e5a950a3b66b4601384e9a58057d2b226177097b0be18d16a4ec568d801217ef5b59729807e3ee02321546f83d633ce33a9a0ff89c1f76b SHA512 db11af020a110c34da6f47d6918cf34a7910ee2aaf38feedc2ac262fa50e0ada95a8b4a9d481fd2a1b503f1d99085c5e8a5a3e42f6c8d3f0a6c40a97052525a7 -AUX mongodb-4.2.17-boost-1.79.patch 1157 BLAKE2B d093b75fcd5b6bead41d50cb10820658ca09042c5405570b3470a81e595de600de7fdf95de748c89cdb3a79e256595e8e12e1d89d0967eb3060f957f6676f3af SHA512 4c314db03aa3e62cd00fcb18ef90ca072fdb0fd84b4fb823623766d908adec008d8a071832c16da0a763c05781d6fc6de1f691c25e73bc1ea79be0697f99e87c AUX mongodb-4.4.1-boost.patch 692 BLAKE2B 11679603d9f32b68369edb54d819449bf7a5e0ed263c18c90677b2d37702630f6542f4220989641b4e2826adcf24fe11f72e9e14a7e3e54ec7b77676b186fc8c SHA512 c5af45844fb67ca3a1da3831954ca27713efeda34d5e95c4457c424129305eed407f60df024766ce2614c0c5047a4c78d003f55b0da1289557fcf581913397f6 AUX mongodb-4.4.1-fix-scons.patch 1192 BLAKE2B 3fbb203ca07e1057cb53d1404eb118120990aad339143b5a5fa1e28b528d54dab4be201b82ebd483697485cc90f874db55323f1ae65a6a348f93004dfb23984f SHA512 b26f4d02ee22718278718b8baf20bd57cee7290fe2313a11c629234f29018effdeb1614bd01a98ff5cb62b6a0242acf3f553ea57277327c0d25092c4d80469cc AUX mongodb-4.4.1-gcc11.patch 250 BLAKE2B b92bcd6acee092f9da84005a0abc7c6b4ff12411b1bab9e550c794dff7dd7e8f520f5412b70aa030d26778168efc95adace864653eb43ba89109d415e23c5168 SHA512 10b099b09650119e075a4c6e926cc3538f7227df772af6b8eeeb33726fed41f2010f85fa6906b866705602b84a5baff92c557ef27ba1d4a6c862c40fcc4e7bbe AUX mongodb-4.4.10-boost-1.79.patch 2071 BLAKE2B b00dfba23f2928793ace34abf26989b6bebe00a6484f36eab114b8612bf509123161925f0ccad04bdafd05c3c30ffb2cdea18303c8473dd3e62e422b73a92c53 SHA512 6bad4c75d8da261ce1e36a3648f0758cd9564eefeacbc2ce7c48ccf68e1f069058daaa9d1a6aa60925330ca50d3a712fda4ffaf2d90a0c6af428993283039a83 +AUX mongodb-4.4.10-boost-1.81.patch 13467 BLAKE2B 970163a8084893190ca52e31577b2900d90ee6238ed496cefcdcd51590c6bcb4ae2e620d012ba101c022954d2d5ebd03b13eb2e7f26e8ce68c772d62470adbdc SHA512 62f4802a26398ffb17ac289d9e9de4044b753ece694785d3462f406391abdcfd16ff281959b4e4fb6751cc9247da7a4c55e8fa48eb90fd681eed724fedcb03e9 AUX mongodb-4.4.10-no-force-lld.patch 1401 BLAKE2B da5798d94f01a821a0d008fab71c90fe6055faca1020259ea3d385ec3a2af28f8b90bdb9daf2bb43e60028ea47ba733a649831584a53596c2e908c0db0a0f755 SHA512 07cdd61e92cf61be0646900c55dab753009d1cc18151c429dd7fdfd22f0b8836a0d51fc184f4459530397893f8863c5d12594ceea6d1fd2e90f98aba832d651a AUX mongodb-4.4.8-no-compass.patch 1598 BLAKE2B af1944476041b3e5ea317f52adfced103f5b103484a4de4bb2a2d07ffcbc8b18a975f543e042c3563f1d46978496482ce7de653de8e4b943ef6ecf6e501d9f52 SHA512 0b8f5d085831180dec72ff81a37b4d537e550c8ea80d970b4af1ea6bc66b60ba957ff6506d2e21b9e5bc77b9812251dda33fae8a7c0cac4086141b5fb8ff4190 AUX mongodb-5.0.2-boost-1.79.patch 2059 BLAKE2B 9edc95c6894e968b87b94d551a8d19017874d22f284cb00b75f4d6b090b9b0632e3dd68a4227be2ceec429635d47fc04f9aaf120544dec7d772751cf79387e37 SHA512 785367fafca3689e9441dcab64a8222156479d1ece2cde834fa44a90cfdecb9c21d6f41798b0ae0d04219d72eeced52f058e2afbf47eac184a143f3119653562 @@ -23,15 +21,11 @@ AUX mongodb.service-r1 239 BLAKE2B 4e2da934120da54034e2dd030cdd349e7fa9a22293f3d AUX mongos.conf-r2 648 BLAKE2B 420bebfafc1ef4af4b90580077a803fe30f37d63eca6509e7381ca5fcf4e5bc31e136dfc72b653b4d942fdeda058f9fcecc3dcbec9c61e2c82ac3324b9fc0f44 SHA512 5aa8ced8d83572358e008c0df45dbe72a2e9c0003c9f49514d6b91bf9b75d4fb48b189ffe00d14e5675679943a05215a9873c5c9bde9ab1be4ed4813e75714e3 AUX mongos.confd-r3 470 BLAKE2B 9cf6f201d337430901d957a5a0811ff11ac2e81814aac2120c5018e6ec4c38b5ca22d19caea593834416c63609c69a8294227fb6b30200b41dfb29799cc5c1b4 SHA512 952fb9cf5d3eeea2006b101e23142e408c98d66d1f4f868f6ea5a4df6a6331ddcbcbdfb24f4b031c1a8c42652141a3684073b96dfc0b3fbd21dc6b5bcf0e36cb AUX mongos.initd-r3 422 BLAKE2B 90872d0d8cdc5e33e3eebee848f58a2db0511d48b496ba9318117b74ad9265ead53a21b7d1790729a62d61839099bee315ace8ff3646c01e096a943c2251bf88 SHA512 bf5897614d59c6b4e72529b126408a62ea37d9e9368e5ff69c8fcf2bad3ec09065cff09467f82117a892c51090018706d2f38c03cb9a974a61a49bd9efa0f144 -DIST mongodb-src-r4.2.17.tar.gz 62216350 BLAKE2B 48169685a25fe00b5a1985bce1e65e13d1dc9c0a56ece6b9c735d8cd212d9c0c5e2912d593bdda351cceda49c8ed7962db42ca37814f88e0bf927066a2d8241b SHA512 ad5448aa6ea232746fdbc7107bd642e827fb7b9182c075f204722e7f625cbc83e7b0a199d2feb56bf27a8851bb38f9740abf0b38c022ddc92e676e7a2d81aef6 -DIST mongodb-src-r4.2.23.tar.gz 62276834 BLAKE2B bb3dfee47ece9a5cc43e10a322b7191709d32bcfcb9659b08a6412d60a83eaf2d8bc4b5784e99d8fc95be643498212d512a11dc93052f02086456a2d2e565da3 SHA512 5c0b341b0700af9f3682e63912569dd4063d8cff85c35f9e19d5882291f62bb1a56f85666278fe38f1bd7f06a46b8423c5e90969be5bb595281d883256c8def4 DIST mongodb-src-r4.4.10.tar.gz 50636024 BLAKE2B 4b840e1a17b3fcba32d30c649d981b1e2b1d5dd98deab99be599fd5d2aa70b75ff4225542d8da095ec4cb4615f9ccccfa455129d71ed39549efde0a025d7dac4 SHA512 afc04f90e03ec64fd74bdfe2bf33aaa5fc148811af91a8437dfb81fd3a784eedd80128886db99e247ec7e09dc5a73cf34f908ab927942648e15c8f12af6b64e2 DIST mongodb-src-r4.4.8.tar.gz 50492854 BLAKE2B 4776b17e88104879ea69468ff277b07dc317d936654bb26c69750e0aaf8f51bea73994e7fc4841228d8506db392e0454b5fd16257071b86a2e4ad34e90f33632 SHA512 9b0cd81c9c731255a6c079c040ed342a51a72e3ea72047d3ae959c0afde50b0cdb1fcfe7fcbea30c449a3618a09d213752277cee6eb9bc0a55915b9229543606 DIST mongodb-src-r5.0.5.tar.gz 54862473 BLAKE2B aafa693da904177a11067603f3835e2ee69abcdb206c2d36983633baa6008b861efeb590880098557e224cd7d6ac8fb23e4e9c63724d76bf90422862c99cdfe9 SHA512 318e58285c8a88fc3a4467ba8c1e6487a2aec403db02c50dbdb53df9a6671b9ea2417c8ee8212b205d642327d0d4bdd76f4bc9543c47e53115dfb981ef73f63e -EBUILD mongodb-4.2.17-r2.ebuild 5062 BLAKE2B ab63f1a1059cc674390fad7c4e99869d4b1444f46663f5f9909eb0403530b9d852e8a44264979ddd729ddc62a8f53ee42947b94612b27f2d47ba2379560e9cb5 SHA512 ee8d4941459daadd03fe64a4f809b1abecaf70daaaae701ddee649b5c95a756e1e11b27471f1394b63da4165f814549379761c4f914787a2efdf1e59da1309bb -EBUILD mongodb-4.2.23.ebuild 5019 BLAKE2B 28c100b28fbf4cfc36f61c4785186d84033158ead641aad67f3da3911bda8dd2e0afb076d53fc024587ada87b9ecfcbd4ce71cfb8faffef9ea3c80bb14362a6e SHA512 0837039f24d737060d9111e47f1003a14557d7c053d69c2f6199805a5f2e7e2f218c88148ac5d90901b12e5fe17d8777431380f43e4fc09fb78b3f68d92e9cbe -EBUILD mongodb-4.4.10-r1.ebuild 5162 BLAKE2B 424240dfb4564eed94c0ab18c936ca5f02cbe8838833cd8f4b4f8c6ca6c5a270e269995715a1d55f3e59e74503d369a3ec25d4e6b96da8eb4e53faba15f5e151 SHA512 8b5980a67d93b0f693c85824b1d5271fee0112157252cf040e8f741822660072185745f272a1043208181d08f5ac8f991cfeb78d400d6dcf3f2d68b3a8abacc9 +EBUILD mongodb-4.4.10-r1.ebuild 5207 BLAKE2B da5ea9d8bfc65693a41de30ef15e5d6696b14125fba39ab434844584ddc0b1f9109a3639e92960a603ff7ab731f3d7f0d44b64181bfa43d89d7859865dd8dd8d SHA512 0fc85564401be8339cdde1b80d062cf10d34bd9b1bc70089b1dafa59f095270e3d40b152af08a83346e118caa27448a6b669a56628c8b8c8615ceddec40311bb EBUILD mongodb-4.4.8-r1.ebuild 4903 BLAKE2B c602d42d89270459366686525694272cd54787fd754ddc6b00701c8de5ddbdf0519bef71a0c71d59e70d9b0e3b97c62c4280cb6737600f88ef8a5b94bba4f483 SHA512 ef2172a0bd7b8d8d8c9dc5ae0300dc0ac0c314f13ae21b746fd2379491b3cd24d1af5cce7e109729f32afbf9f4bc29bfff4333ace1fb0480c92b7eed3aa1b62c EBUILD mongodb-4.4.8-r2.ebuild 4924 BLAKE2B 5d86b73af2fdb8acda610b78d86f7c03df78cc1e5b7402b387c7b9ae949ed80acdaad7b9ba8f46009c0297bd0bde4b254c26ce8ef093bcc0d4dfe512ccc6d716 SHA512 e93418f15093950e6818dd5bad0b5f0d6ac83cd5cfc13b50068cd6ef71ef2ac2781488652f38f00adcffbdc02e09e7edc7830380c5f4e2707bf26f7ed85d3b61 -EBUILD mongodb-5.0.5-r2.ebuild 5171 BLAKE2B d0f783a8f02de46c9f3e3b585865816444ccfee092208cf8aa35a7039f42f0f1b4b8aa0f615132fde96c6899611b5d5e8542b979d6fd87bac8e6e76d36e032b7 SHA512 d0fb3ce5d87590504403fc93eeb34f6adff2b803c7bf3b1ffe20a43cf728a623e9be426575d9118fab491f1de4edd1343d211ff80f526d3323ec4dd2687f0573 +EBUILD mongodb-5.0.5-r2.ebuild 5216 BLAKE2B 0d4adaca474756a00050a3b01998d1984ff7edd1cbfdc509b04df8b6a2a5d44af6088e05273a2acbb641192bf6b8c16f042a75bcff704e1680dd2c61ed8fdc04 SHA512 446051d44c18fe1056c571184b0e7035f4fcebdb3ab5e72555785ad4fe07d941d5a68e716db12ae911e3b41cc4ea9f68f6b286b67f1be42a606dba65e48ab9da MISC metadata.xml 919 BLAKE2B 59d8c500d1b14701caa3feef86c2377c3a2cb870bc218f8aaf993ddcf22f0b75e3b34715446900b6aaf03404387b67c5a23df3d47a64cc7b280a6bfc93f6de45 SHA512 af222eae62fc327ac2ff9f8bf2727ab8f1199a0aabb7fa9a1bd229bd817b9260fe6357ae0ca9d7184bcbc865e2a91195c84efecb430436a0bdb207910850cdda diff --git a/dev-db/mongodb/files/mongodb-4.2.0-fix-scons.patch b/dev-db/mongodb/files/mongodb-4.2.0-fix-scons.patch deleted file mode 100644 index 3c929df6f964..000000000000 --- a/dev-db/mongodb/files/mongodb-4.2.0-fix-scons.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- a/SConstruct 2019-08-21 09:25:00.980260318 +0200 -+++ b/SConstruct 2019-08-21 09:27:53.653601283 +0200 -@@ -1858,7 +1858,6 @@ - # -Winvalid-pch Warn if a precompiled header (see Precompiled Headers) is found in the search path but can't be used. - env.Append( CCFLAGS=["-fno-omit-frame-pointer", - "-fno-strict-aliasing", -- "-ggdb" if not env.TargetOSIs('emscripten') else "-g", - "-pthread", - "-Wall", - "-Wsign-compare", -@@ -1870,6 +1869,8 @@ - env.Append( CCFLAGS=["-Werror"] ) - - env.Append( CXXFLAGS=["-Woverloaded-virtual"] ) -+ env.Append( CXXFLAGS=os.environ['CXXFLAGS'] ) -+ env.Append( LINKFLAGS=os.environ['LDFLAGS'] ) - if env.ToolchainIs('clang'): - env.Append( CXXFLAGS=['-Werror=unused-result'] ) - -@@ -1890,8 +1891,8 @@ - - env.Append( LIBS=[] ) - -- #make scons colorgcc friendly -- for key in ('HOME', 'TERM'): -+ #make scons colorgcc, distcc, ccache friendly -+ for key in ('HOME', 'PATH', 'TERM'): - try: - env['ENV'][key] = os.environ[key] - except KeyError: diff --git a/dev-db/mongodb/files/mongodb-4.2.15-no-compass.patch b/dev-db/mongodb/files/mongodb-4.2.15-no-compass.patch deleted file mode 100644 index de2eda82f213..000000000000 --- a/dev-db/mongodb/files/mongodb-4.2.15-no-compass.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff --git a/src/mongo/SConscript b/src/mongo/SConscript -index 0379fcb0..1aabddba 100644 ---- a/src/mongo/SConscript -+++ b/src/mongo/SConscript -@@ -808,32 +808,6 @@ for full_dir, archive_dir in list(env["ARCHIVE_ADDITION_DIR_MAP"].items()): - for target in env["DIST_BINARIES"]: - installBinary(env, "db/modules/" + target) - --compass_script = "install_compass" --if env.TargetOSIs('windows'): -- # On windows the .in needs to be explicitly added to the file. -- compass_script = "Install-Compass.ps1" -- --compass_installer = f"#/src/mongo/installer/compass/{compass_script}" -- --distBinaries.append(compass_installer) -- --if not hygienic: -- compass_script_installer = env.Install("$INSTALL_DIR/bin", compass_installer) --else: -- compass_script_installer = env.AutoInstall( -- 'bin', -- source=[ -- compass_installer, -- ], -- INSTALL_ALIAS=[ -- 'tools', -- ], -- ) -- --if env.TargetOSIs('posix'): -- env.AddPostAction( compass_script_installer, 'chmod 755 $TARGET' ) -- env.AddPostAction( compass_installer, 'chmod 755 $TARGET' ) -- - # "dist" target is valid only when --use-new-tools is specified - # Attempts to build release artifacts without tools must fail - if has_option("use-new-tools"): -@@ -851,7 +825,6 @@ if has_option("use-new-tools"): - '--transform $BUILD_DIR/mongo=$SERVER_DIST_BASENAME/bin', - '--transform $BUILD_DIR/mongo/stripped/src/mongo-tools=$SERVER_DIST_BASENAME/bin', - '--transform src/mongo-tools=$SERVER_DIST_BASENAME/bin', -- '--transform src/mongo/installer/compass=$SERVER_DIST_BASENAME/bin', - '${TEMPFILE(SOURCES[1:])}' - ], - ), diff --git a/dev-db/mongodb/files/mongodb-4.2.17-boost-1.79.patch b/dev-db/mongodb/files/mongodb-4.2.17-boost-1.79.patch deleted file mode 100644 index b86efa142f5c..000000000000 --- a/dev-db/mongodb/files/mongodb-4.2.17-boost-1.79.patch +++ /dev/null @@ -1,41 +0,0 @@ -https://bugs.gentoo.org/844235 ---- a/src/mongo/util/processinfo_linux.cpp -+++ b/src/mongo/util/processinfo_linux.cpp -@@ -51,6 +51,7 @@ - #endif - - #include -+#include - #include - #include - #include ---- a/src/mongo/db/storage/wiredtiger/wiredtiger_util.cpp -+++ b/src/mongo/db/storage/wiredtiger/wiredtiger_util.cpp -@@ -36,6 +36,7 @@ - #include - - #include -+#include - #include - - #include "mongo/base/simple_string_data_comparator.h" ---- a/src/mongo/shell/shell_utils_extended.cpp -+++ b/src/mongo/shell/shell_utils_extended.cpp -@@ -37,6 +37,7 @@ - #endif - - #include -+#include - #include - - #include "mongo/scripting/engine.h" ---- a/src/mongo/db/storage/storage_repair_observer.cpp -+++ b/src/mongo/db/storage/storage_repair_observer.cpp -@@ -41,6 +41,7 @@ - #include - #endif - -+#include - #include - - #include "mongo/db/dbhelpers.h" diff --git a/dev-db/mongodb/files/mongodb-4.4.10-boost-1.81.patch b/dev-db/mongodb/files/mongodb-4.4.10-boost-1.81.patch new file mode 100644 index 000000000000..331f0c5b922a --- /dev/null +++ b/dev-db/mongodb/files/mongodb-4.4.10-boost-1.81.patch @@ -0,0 +1,317 @@ +https://bugs.gentoo.org/887037 + +Workaround https://github.com/boostorg/container/commit/99091420ae553b27345e04279fd19fe24fb684c1 +in Boost 1.81. + +Upstream s2 (as in real upstream, not MongoDB) has deviated substantially +from the version vendored. +--- a/src/third_party/s2/base/stl_decl_msvc.h ++++ b/src/third_party/s2/base/stl_decl_msvc.h +@@ -118,8 +118,8 @@ namespace msvchash { + class hash_multimap; + } // end namespace msvchash + +-using msvchash::hash_set; +-using msvchash::hash_map; ++using msvchash::hash_set = my_hash_set; ++using msvchash::hash_map = my_hash_map; + using msvchash::hash; + using msvchash::hash_multimap; + using msvchash::hash_multiset; +--- a/src/third_party/s2/base/stl_decl_osx.h ++++ b/src/third_party/s2/base/stl_decl_osx.h +@@ -68,8 +68,8 @@ using std::string; + + using namespace std; + using __gnu_cxx::hash; +-using __gnu_cxx::hash_set; +-using __gnu_cxx::hash_map; ++using __gnu_cxx::hash_set = my_hash_set; ++using __gnu_cxx::hash_map = my_hash_map; + using __gnu_cxx::select1st; + + /* On Linux (and gdrive on OSX), this comes from places like +--- a/src/third_party/s2/hash.h ++++ b/src/third_party/s2/hash.h +@@ -2,10 +2,10 @@ + #define THIRD_PARTY_S2_HASH_H_ + + #include +-#define hash_map std::unordered_map ++#define my_hash_map std::unordered_map + + #include +-#define hash_set std::unordered_set ++#define my_hash_set std::unordered_set + + #define HASH_NAMESPACE_START namespace std { + #define HASH_NAMESPACE_END } +--- a/src/third_party/s2/s2_test.cc ++++ b/src/third_party/s2/s2_test.cc +@@ -10,7 +10,7 @@ using std::reverse; + + #include + #include +-using __gnu_cxx::hash_set; ++using __gnu_cxx::hash_set = my_hash_map; + + #include "s2.h" + #include "base/logging.h" +@@ -709,8 +709,8 @@ TEST(S2, Frames) { + #if 0 + TEST(S2, S2PointHashSpreads) { + int kTestPoints = 1 << 16; +- hash_set set; +- hash_set points; ++ my_hash_set set; ++ my_hash_set points; + hash hasher; + S2Point base = S2Point(1, 1, 1); + for (int i = 0; i < kTestPoints; ++i) { +@@ -733,7 +733,7 @@ TEST(S2, S2PointHashCollapsesZero) { + double minus_zero = -zero; + EXPECT_NE(*reinterpret_cast(&zero), + *reinterpret_cast(&minus_zero)); +- hash_map map; ++ my_hash_map map; + S2Point zero_pt(zero, zero, zero); + S2Point minus_zero_pt(minus_zero, minus_zero, minus_zero); + +--- a/src/third_party/s2/s2cellid_test.cc ++++ b/src/third_party/s2/s2cellid_test.cc +@@ -10,7 +10,7 @@ using std::reverse; + + #include + #include +-using __gnu_cxx::hash_map; ++using __gnu_cxx::hash_map = my_hash_map; + + #include + #include +@@ -170,7 +170,7 @@ TEST(S2CellId, Tokens) { + static const int kMaxExpandLevel = 3; + + static void ExpandCell(S2CellId const& parent, vector* cells, +- hash_map* parent_map) { ++ my_hash_map* parent_map) { + cells->push_back(parent); + if (parent.level() == kMaxExpandLevel) return; + int i, j, orientation; +@@ -194,7 +194,7 @@ static void ExpandCell(S2CellId const& parent, vector* cells, + + TEST(S2CellId, Containment) { + // Test contains() and intersects(). +- hash_map parent_map; ++ my_hash_map parent_map; + vector cells; + for (int face = 0; face < 6; ++face) { + ExpandCell(S2CellId::FromFacePosLevel(face, 0, 0), &cells, &parent_map); +--- a/src/third_party/s2/s2loop.cc ++++ b/src/third_party/s2/s2loop.cc +@@ -120,7 +120,7 @@ bool S2Loop::IsValid(string* err) const { + } + } + // Loops are not allowed to have any duplicate vertices. +- hash_map vmap; ++ my_hash_map vmap; + for (int i = 0; i < num_vertices(); ++i) { + if (!vmap.insert(make_pair(vertex(i), i)).second) { + VLOG(2) << "Duplicate vertices: " << vmap[vertex(i)] << " and " << i; +--- a/src/third_party/s2/s2polygon.cc ++++ b/src/third_party/s2/s2polygon.cc +@@ -117,7 +117,7 @@ HASH_NAMESPACE_END + bool S2Polygon::IsValid(const vector& loops, string* err) { + // If a loop contains an edge AB, then no other loop may contain AB or BA. + if (loops.size() > 1) { +- hash_map > edges; ++ my_hash_map > edges; + for (size_t i = 0; i < loops.size(); ++i) { + S2Loop* lp = loops[i]; + for (int j = 0; j < lp->num_vertices(); ++j) { +--- a/src/third_party/s2/s2polygonbuilder.cc ++++ b/src/third_party/s2/s2polygonbuilder.cc +@@ -175,7 +175,7 @@ S2Loop* S2PolygonBuilder::AssembleLoop(S2Point const& v0, S2Point const& v1, + // This ensures that only CCW loops are constructed when possible. + + vector path; // The path so far. +- hash_map index; // Maps a vertex to its index in "path". ++ my_hash_map index; // Maps a vertex to its index in "path". + path.push_back(v0); + path.push_back(v1); + index[v1] = 1; +@@ -361,7 +361,7 @@ void S2PolygonBuilder::BuildMergeMap(PointIndex* index, MergeMap* merge_map) { + + // First, we build the set of all the distinct vertices in the input. + // We need to include the source and destination of every edge. +- hash_set vertices; ++ my_hash_set vertices; + for (EdgeSet::const_iterator i = edges_->begin(); i != edges_->end(); ++i) { + vertices.insert(i->first); + VertexSet const& vset = i->second; +@@ -370,7 +370,7 @@ void S2PolygonBuilder::BuildMergeMap(PointIndex* index, MergeMap* merge_map) { + } + + // Build a spatial index containing all the distinct vertices. +- for (hash_set::const_iterator i = vertices.begin(); ++ for (my_hash_set::const_iterator i = vertices.begin(); + i != vertices.end(); ++i) { + index->Insert(*i); + } +@@ -378,7 +378,7 @@ void S2PolygonBuilder::BuildMergeMap(PointIndex* index, MergeMap* merge_map) { + // Next, we loop through all the vertices and attempt to grow a maximial + // mergeable group starting from each vertex. + vector frontier, mergeable; +- for (hash_set::const_iterator vstart = vertices.begin(); ++ for (my_hash_set::const_iterator vstart = vertices.begin(); + vstart != vertices.end(); ++vstart) { + // Skip any vertices that have already been merged with another vertex. + if (merge_map->find(*vstart) != merge_map->end()) continue; +--- a/src/third_party/s2/s2polygonbuilder.h ++++ b/src/third_party/s2/s2polygonbuilder.h +@@ -262,7 +262,7 @@ class S2PolygonBuilder { + // current position to a new position, and also returns a spatial index + // containing all of the vertices that do not need to be moved. + class PointIndex; +- typedef hash_map MergeMap; ++ typedef my_hash_map MergeMap; + void BuildMergeMap(PointIndex* index, MergeMap* merge_map); + + // Moves a set of vertices from old to new positions. +@@ -282,7 +282,7 @@ class S2PolygonBuilder { + // once. We could have also used a multiset >, + // but this representation is a bit more convenient. + typedef multiset VertexSet; +- typedef hash_map EdgeSet; ++ typedef my_hash_map EdgeSet; + scoped_ptr edges_; + + // Unique collection of the starting (first) vertex of all edges, +--- a/src/third_party/s2/s2regioncoverer.cc ++++ b/src/third_party/s2/s2regioncoverer.cc +@@ -321,7 +321,7 @@ void S2RegionCoverer::GetInteriorCellUnion(S2Region const& region, + + void S2RegionCoverer::FloodFill( + S2Region const& region, S2CellId const& start, vector* output) { +- hash_set all; ++ my_hash_set all; + vector frontier; + output->clear(); + all.insert(start); +--- a/src/third_party/s2/s2regioncoverer_test.cc ++++ b/src/third_party/s2/s2regioncoverer_test.cc +@@ -11,7 +11,7 @@ using std::swap; + using std::reverse; + + #include +-using __gnu_cxx::hash_map; ++using __gnu_cxx::hash_map = my_hash_map; + + #include + using std::priority_queue; +@@ -65,7 +65,7 @@ static void CheckCovering(S2RegionCoverer const& coverer, + vector const& covering, + bool interior) { + // Keep track of how many cells have the same coverer.min_level() ancestor. +- hash_map min_level_cells; ++ my_hash_map min_level_cells; + for (int i = 0; i < covering.size(); ++i) { + int level = covering[i].level(); + EXPECT_GE(level, coverer.min_level()); +@@ -76,7 +76,7 @@ static void CheckCovering(S2RegionCoverer const& coverer, + if (covering.size() > coverer.max_cells()) { + // If the covering has more than the requested number of cells, then check + // that the cell count cannot be reduced by using the parent of some cell. +- for (hash_map::const_iterator i = min_level_cells.begin(); ++ for (my_hash_map::const_iterator i = min_level_cells.begin(); + i != min_level_cells.end(); ++i) { + EXPECT_EQ(i->second, 1); + } +--- a/src/third_party/s2/strings/split.cc ++++ b/src/third_party/s2/strings/split.cc +@@ -156,7 +156,7 @@ struct simple_insert_iterator { + // SplitStringToIterator{Using|AllowEmpty}(). + template + struct simple_hash_map_iterator { +- typedef hash_map hashmap; ++ typedef my_hash_map hashmap; + hashmap* t; + bool even; + typename hashmap::iterator curr; +@@ -246,8 +246,8 @@ void SplitStringAllowEmpty(const string& full, const char* delim, + } + + void SplitStringToHashsetAllowEmpty(const string& full, const char* delim, +- hash_set* result) { +- simple_insert_iterator > it(result); ++ my_hash_set* result) { ++ simple_insert_iterator > it(result); + SplitStringToIteratorAllowEmpty(full, delim, 0, it); + } + +@@ -258,7 +258,7 @@ void SplitStringToSetAllowEmpty(const string& full, const char* delim, + } + + void SplitStringToHashmapAllowEmpty(const string& full, const char* delim, +- hash_map* result) { ++ my_hash_map* result) { + simple_hash_map_iterator it(result); + SplitStringToIteratorAllowEmpty(full, delim, 0, it); + } +@@ -352,8 +352,8 @@ void SplitStringUsing(const string& full, + } + + void SplitStringToHashsetUsing(const string& full, const char* delim, +- hash_set* result) { +- simple_insert_iterator > it(result); ++ my_hash_set* result) { ++ simple_insert_iterator > it(result); + SplitStringToIteratorUsing(full, delim, it); + } + +@@ -364,7 +364,7 @@ void SplitStringToSetUsing(const string& full, const char* delim, + } + + void SplitStringToHashmapUsing(const string& full, const char* delim, +- hash_map* result) { ++ my_hash_map* result) { + simple_hash_map_iterator it(result); + SplitStringToIteratorUsing(full, delim, it); + } +--- a/src/third_party/s2/strings/split.h ++++ b/src/third_party/s2/strings/split.h +@@ -41,7 +41,7 @@ using namespace std; + void SplitStringAllowEmpty(const string& full, const char* delim, + vector* res); + void SplitStringToHashsetAllowEmpty(const string& full, const char* delim, +- hash_set* res); ++ my_hash_set* res); + void SplitStringToSetAllowEmpty(const string& full, const char* delim, + set* res); + // The even-positioned (0-based) components become the keys for the +@@ -50,7 +50,7 @@ void SplitStringToSetAllowEmpty(const string& full, const char* delim, + // if the key was already present in the hash table, or will be the + // empty string if the key is a newly inserted key. + void SplitStringToHashmapAllowEmpty(const string& full, const char* delim, +- hash_map* result); ++ my_hash_map* result); + + // ---------------------------------------------------------------------- + // SplitStringUsing() +@@ -66,7 +66,7 @@ void SplitStringToHashmapAllowEmpty(const string& full, const char* delim, + void SplitStringUsing(const string& full, const char* delim, + vector* res); + void SplitStringToHashsetUsing(const string& full, const char* delim, +- hash_set* res); ++ my_hash_set* res); + void SplitStringToSetUsing(const string& full, const char* delim, + set* res); + // The even-positioned (0-based) components become the keys for the +@@ -75,7 +75,7 @@ void SplitStringToSetUsing(const string& full, const char* delim, + // if the key was already present in the hash table, or will be the + // empty string if the key is a newly inserted key. + void SplitStringToHashmapUsing(const string& full, const char* delim, +- hash_map* result); ++ my_hash_map* result); + + // ---------------------------------------------------------------------- + // SplitOneIntToken() diff --git a/dev-db/mongodb/mongodb-4.2.17-r2.ebuild b/dev-db/mongodb/mongodb-4.2.17-r2.ebuild deleted file mode 100644 index a0cb6465d289..000000000000 --- a/dev-db/mongodb/mongodb-4.2.17-r2.ebuild +++ /dev/null @@ -1,184 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8..10} ) - -SCONS_MIN_VERSION="2.5.0" -CHECKREQS_DISK_BUILD="2400M" -CHECKREQS_DISK_USR="512M" -CHECKREQS_MEMORY="1024M" - -inherit check-reqs flag-o-matic multiprocessing pax-utils python-any-r1 scons-utils systemd toolchain-funcs - -MY_P=${PN}-src-r${PV/_rc/-rc} - -DESCRIPTION="A high-performance, open source, schema-free document-oriented database" -HOMEPAGE="https://www.mongodb.com" -SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz" - -LICENSE="Apache-2.0 SSPL-1" -SLOT="0" -KEYWORDS="amd64 ~arm64" -IUSE="debug kerberos lto ssl test +tools" -RESTRICT="!test? ( test )" - -RDEPEND="acct-group/mongodb - acct-user/mongodb - >=app-arch/snappy-1.1.3:= - >=dev-cpp/yaml-cpp-0.6.2:= - dev-libs/boost:= - >=dev-libs/libpcre-8.42[cxx] - app-arch/zstd:= - dev-libs/snowball-stemmer:= - net-libs/libpcap - >=sys-libs/zlib-1.2.11:= - kerberos? ( dev-libs/cyrus-sasl[kerberos] ) - ssl? ( - >=dev-libs/openssl-1.0.1g:0= - )" -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - sys-libs/ncurses:0= - sys-libs/readline:0= - debug? ( dev-util/valgrind )" -BDEPEND=" - $(python_gen_any_dep ' - test? ( dev-python/pymongo[${PYTHON_USEDEP}] dev-python/requests[${PYTHON_USEDEP}] ) - >=dev-util/scons-2.5.0[${PYTHON_USEDEP}] - dev-python/cheetah3[${PYTHON_USEDEP}] - dev-python/psutil[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - ') -" -PDEPEND="tools? ( >=app-admin/mongo-tools-${PV} )" - -PATCHES=( - "${FILESDIR}/${PN}-4.2.0-fix-scons.patch" - "${FILESDIR}/${PN}-4.4.1-gcc11.patch" - "${FILESDIR}/${PN}-4.2.15-no-compass.patch" - "${FILESDIR}/${PN}-5.0.2-glibc-2.34.patch" - "${FILESDIR}/${PN}-4.2.17-boost-1.79.patch" -) - -S="${WORKDIR}/${MY_P}" - -python_check_deps() { - if use test; then - python_has_version "dev-python/pymongo[${PYTHON_USEDEP}]" || return 1 - python_has_version "dev-python/requests[${PYTHON_USEDEP}]" || return 1 - fi - - python_has_version ">=dev-util/scons-2.5.0[${PYTHON_USEDEP}]" && - python_has_version "dev-python/cheetah3[${PYTHON_USEDEP}]" && - python_has_version "dev-python/psutil[${PYTHON_USEDEP}]" && - python_has_version "dev-python/pyyaml[${PYTHON_USEDEP}]" -} - -pkg_pretend() { - if [[ -n ${REPLACING_VERSIONS} ]]; then - if ver_test "$REPLACING_VERSIONS" -lt 4.0; then - ewarn "To upgrade from a version earlier than the 4.0-series, you must" - ewarn "successively upgrade major releases until you have upgraded" - ewarn "to 4.0-series. Then upgrade to 4.2 series." - else - ewarn "Be sure to set featureCompatibilityVersion to 4.0 before upgrading." - fi - fi -} - -src_prepare() { - default - - # remove bundled libs - rm -r src/third_party/{boost-*,pcre-*,scons-*,snappy-*,yaml-cpp-*,zlib-*,zstandard-*} || die - - # remove compass - rm -r src/mongo/installer/compass || die -} - -src_configure() { - # https://github.com/mongodb/mongo/wiki/Build-Mongodb-From-Source - # --use-system-icu fails tests - # --use-system-tcmalloc is strongly NOT recommended: - scons_opts=( - AR="$(tc-getAR)" - CC="$(tc-getCC)" - CXX="$(tc-getCXX)" - - --disable-warnings-as-errors - --use-system-boost - --use-system-pcre - --use-system-snappy - --use-system-stemmer - --use-system-yaml - --use-system-zlib - --use-system-zstd - ) - - use arm64 && scons_opts+=( --use-hardware-crc32=off ) # Bug 701300 - use debug && scons_opts+=( --dbg=on ) - use kerberos && scons_opts+=( --use-sasl-client ) - use lto && scons_opts+=( --lto=on ) - use ssl && scons_opts+=( --ssl ) - - # Needed to avoid forcing FORTIFY_SOURCE - # Gentoo's toolchain applies these anyway - scons_opts+=( --runtime-hardening=off ) - - # respect mongoDB upstream's basic recommendations - # see bug #536688 and #526114 - if ! use debug; then - filter-flags '-m*' - filter-flags '-O?' - fi - - default -} - -src_compile() { - escons "${scons_opts[@]}" core tools -} - -# FEATURES="test -usersandbox" emerge dev-db/mongodb -src_test() { - ewarn "Tests may hang with FEATURES=usersandbox" - "${EPYTHON}" ./buildscripts/resmoke.py run --dbpathPrefix=test --suites core --jobs=$(makeopts_jobs) || die "Tests failed with ${EPYTHON}" -} - -src_install() { - escons "${scons_opts[@]}" --nostrip install --prefix="${ED}"/usr - - doman debian/mongo*.1 - dodoc README docs/building.md - - newinitd "${FILESDIR}/${PN}.initd-r3" ${PN} - newconfd "${FILESDIR}/${PN}.confd-r3" ${PN} - newinitd "${FILESDIR}/mongos.initd-r3" mongos - newconfd "${FILESDIR}/mongos.confd-r3" mongos - - insinto /etc - newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf - newins "${FILESDIR}/mongos.conf-r2" mongos.conf - - systemd_newunit "${FILESDIR}/${PN}.service-r1" "${PN}.service" - - insinto /etc/logrotate.d/ - newins "${FILESDIR}/${PN}.logrotate" ${PN} - - # see bug #526114 - pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos} - - local x - for x in /var/{lib,log}/${PN}; do - diropts -m0750 -o mongodb -g mongodb - keepdir "${x}" - done -} - -pkg_postinst() { - ewarn "Make sure to read the release notes and follow the upgrade process:" - ewarn " https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/" - ewarn " https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/#upgrade-procedures" -} diff --git a/dev-db/mongodb/mongodb-4.2.23.ebuild b/dev-db/mongodb/mongodb-4.2.23.ebuild deleted file mode 100644 index a56c83d47041..000000000000 --- a/dev-db/mongodb/mongodb-4.2.23.ebuild +++ /dev/null @@ -1,183 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8..10} ) - -SCONS_MIN_VERSION="2.5.0" -CHECKREQS_DISK_BUILD="2400M" -CHECKREQS_DISK_USR="512M" -CHECKREQS_MEMORY="1024M" - -inherit check-reqs flag-o-matic multiprocessing pax-utils python-any-r1 scons-utils systemd toolchain-funcs - -MY_P=${PN}-src-r${PV/_rc/-rc} - -DESCRIPTION="A high-performance, open source, schema-free document-oriented database" -HOMEPAGE="https://www.mongodb.com" -SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz" - -LICENSE="Apache-2.0 SSPL-1" -SLOT="0" -KEYWORDS="~amd64 ~arm64" -IUSE="debug kerberos lto ssl test +tools" -RESTRICT="!test? ( test )" - -RDEPEND="acct-group/mongodb - acct-user/mongodb - >=app-arch/snappy-1.1.3:= - >=dev-cpp/yaml-cpp-0.6.2:= - dev-libs/boost:= - >=dev-libs/libpcre-8.42[cxx] - app-arch/zstd:= - dev-libs/snowball-stemmer:= - net-libs/libpcap - >=sys-libs/zlib-1.2.11:= - kerberos? ( dev-libs/cyrus-sasl[kerberos] ) - ssl? ( - >=dev-libs/openssl-1.0.1g:0= - )" -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - sys-libs/ncurses:0= - sys-libs/readline:0= - debug? ( dev-util/valgrind )" -BDEPEND=" - $(python_gen_any_dep ' - test? ( dev-python/pymongo[${PYTHON_USEDEP}] dev-python/requests[${PYTHON_USEDEP}] ) - >=dev-util/scons-2.5.0[${PYTHON_USEDEP}] - dev-python/cheetah3[${PYTHON_USEDEP}] - dev-python/psutil[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - ') -" -PDEPEND="tools? ( >=app-admin/mongo-tools-${PV} )" - -PATCHES=( - "${FILESDIR}/${PN}-4.2.0-fix-scons.patch" - "${FILESDIR}/${PN}-4.4.1-gcc11.patch" - "${FILESDIR}/${PN}-4.2.15-no-compass.patch" - "${FILESDIR}/${PN}-4.2.17-boost-1.79.patch" -) - -S="${WORKDIR}/${MY_P}" - -python_check_deps() { - if use test; then - python_has_version "dev-python/pymongo[${PYTHON_USEDEP}]" || return 1 - python_has_version "dev-python/requests[${PYTHON_USEDEP}]" || return 1 - fi - - python_has_version ">=dev-util/scons-2.5.0[${PYTHON_USEDEP}]" && - python_has_version "dev-python/cheetah3[${PYTHON_USEDEP}]" && - python_has_version "dev-python/psutil[${PYTHON_USEDEP}]" && - python_has_version "dev-python/pyyaml[${PYTHON_USEDEP}]" -} - -pkg_pretend() { - if [[ -n ${REPLACING_VERSIONS} ]]; then - if ver_test "$REPLACING_VERSIONS" -lt 4.0; then - ewarn "To upgrade from a version earlier than the 4.0-series, you must" - ewarn "successively upgrade major releases until you have upgraded" - ewarn "to 4.0-series. Then upgrade to 4.2 series." - else - ewarn "Be sure to set featureCompatibilityVersion to 4.0 before upgrading." - fi - fi -} - -src_prepare() { - default - - # remove bundled libs - rm -r src/third_party/{boost-*,pcre-*,scons-*,snappy-*,yaml-cpp-*,zlib-*,zstandard-*} || die - - # remove compass - rm -r src/mongo/installer/compass || die -} - -src_configure() { - # https://github.com/mongodb/mongo/wiki/Build-Mongodb-From-Source - # --use-system-icu fails tests - # --use-system-tcmalloc is strongly NOT recommended: - scons_opts=( - AR="$(tc-getAR)" - CC="$(tc-getCC)" - CXX="$(tc-getCXX)" - - --disable-warnings-as-errors - --use-system-boost - --use-system-pcre - --use-system-snappy - --use-system-stemmer - --use-system-yaml - --use-system-zlib - --use-system-zstd - ) - - use arm64 && scons_opts+=( --use-hardware-crc32=off ) # Bug 701300 - use debug && scons_opts+=( --dbg=on ) - use kerberos && scons_opts+=( --use-sasl-client ) - use lto && scons_opts+=( --lto=on ) - use ssl && scons_opts+=( --ssl ) - - # Needed to avoid forcing FORTIFY_SOURCE - # Gentoo's toolchain applies these anyway - scons_opts+=( --runtime-hardening=off ) - - # respect mongoDB upstream's basic recommendations - # see bug #536688 and #526114 - if ! use debug; then - filter-flags '-m*' - filter-flags '-O?' - fi - - default -} - -src_compile() { - escons "${scons_opts[@]}" core tools -} - -# FEATURES="test -usersandbox" emerge dev-db/mongodb -src_test() { - ewarn "Tests may hang with FEATURES=usersandbox" - "${EPYTHON}" ./buildscripts/resmoke.py run --dbpathPrefix=test --suites core --jobs=$(makeopts_jobs) || die "Tests failed with ${EPYTHON}" -} - -src_install() { - escons "${scons_opts[@]}" --nostrip install --prefix="${ED}"/usr - - doman debian/mongo*.1 - dodoc README docs/building.md - - newinitd "${FILESDIR}/${PN}.initd-r3" ${PN} - newconfd "${FILESDIR}/${PN}.confd-r3" ${PN} - newinitd "${FILESDIR}/mongos.initd-r3" mongos - newconfd "${FILESDIR}/mongos.confd-r3" mongos - - insinto /etc - newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf - newins "${FILESDIR}/mongos.conf-r2" mongos.conf - - systemd_newunit "${FILESDIR}/${PN}.service-r1" "${PN}.service" - - insinto /etc/logrotate.d/ - newins "${FILESDIR}/${PN}.logrotate" ${PN} - - # see bug #526114 - pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos} - - local x - for x in /var/{lib,log}/${PN}; do - diropts -m0750 -o mongodb -g mongodb - keepdir "${x}" - done -} - -pkg_postinst() { - ewarn "Make sure to read the release notes and follow the upgrade process:" - ewarn " https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/" - ewarn " https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/#upgrade-procedures" -} diff --git a/dev-db/mongodb/mongodb-4.4.10-r1.ebuild b/dev-db/mongodb/mongodb-4.4.10-r1.ebuild index b7037132f4ff..1c0661aee4ae 100644 --- a/dev-db/mongodb/mongodb-4.4.10-r1.ebuild +++ b/dev-db/mongodb/mongodb-4.4.10-r1.ebuild @@ -62,6 +62,7 @@ PATCHES=( "${FILESDIR}/${PN}-5.0.2-glibc-2.34.patch" "${FILESDIR}/${PN}-4.4.10-boost-1.79.patch" "${FILESDIR}/${PN}-4.4.10-no-force-lld.patch" + "${FILESDIR}/${PN}-4.4.10-boost-1.81.patch" ) S="${WORKDIR}/${MY_P}" diff --git a/dev-db/mongodb/mongodb-5.0.5-r2.ebuild b/dev-db/mongodb/mongodb-5.0.5-r2.ebuild index d0b26e5aafbf..d49a2e02c20b 100644 --- a/dev-db/mongodb/mongodb-5.0.5-r2.ebuild +++ b/dev-db/mongodb/mongodb-5.0.5-r2.ebuild @@ -69,6 +69,7 @@ PATCHES=( "${FILESDIR}/${PN}-5.0.2-skip-reqs-check.patch" "${FILESDIR}/${PN}-5.0.2-boost-1.79.patch" "${FILESDIR}/${PN}-5.0.5-no-force-lld.patch" + "${FILESDIR}/${PN}-4.4.10-boost-1.81.patch" ) S="${WORKDIR}/${MY_P}" -- cgit v1.2.3