summaryrefslogtreecommitdiff
path: root/dev-db/mongodb
diff options
context:
space:
mode:
Diffstat (limited to 'dev-db/mongodb')
-rw-r--r--dev-db/mongodb/Manifest21
-rw-r--r--dev-db/mongodb/files/mongodb-4.4.1-fix-scons.patch33
-rw-r--r--dev-db/mongodb/files/mongodb-4.4.10-boost-1.79.patch71
-rw-r--r--dev-db/mongodb/files/mongodb-4.4.10-no-force-lld.patch29
-rw-r--r--dev-db/mongodb/files/mongodb-4.4.29-boost-1.85.patch146
-rw-r--r--dev-db/mongodb/files/mongodb-4.4.8-no-compass.patch43
-rw-r--r--dev-db/mongodb/files/mongodb-5.0.2-boost-1.79.patch4
-rw-r--r--dev-db/mongodb/files/mongodb-5.0.26-boost-1.85-extra.patch16
-rw-r--r--dev-db/mongodb/files/mongodb-5.0.26-boost-1.85.patch9
-rw-r--r--dev-db/mongodb/files/mongodb-5.0.26-scons.patch27
-rw-r--r--dev-db/mongodb/files/mongodb-5.0.30-gcc-11.patch12
-rw-r--r--dev-db/mongodb/files/mongodb-5.0.30-gcc-15.patch13
-rw-r--r--dev-db/mongodb/metadata.xml1
-rw-r--r--dev-db/mongodb/mongodb-5.0.26.ebuild2
-rw-r--r--dev-db/mongodb/mongodb-5.0.30.ebuild (renamed from dev-db/mongodb/mongodb-4.4.29.ebuild)88
15 files changed, 138 insertions, 377 deletions
diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index b1b5ef91198b..5b9f73f1700b 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -1,19 +1,18 @@
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.29-boost-1.85.patch 6375 BLAKE2B eaa71784a169732d4721772cb1063c7a21972ebe093ded7e2a75067622973202d08ca755354eec8fadd8b1590ac606916af42854501f59a229886c28dd2b8489 SHA512 700ba936904d6d53973401858d1ffcdd614388ee9e03a9dd875f56b97427f5214483cc1c7a2f3f7d03d8334c05f39e74e2d64e8317f5b230e8d47b7d9563cb46
AUX mongodb-4.4.29-no-enterprise.patch 969 BLAKE2B b6c607ed7054c74c1c1e29da53292be41bfb690a770fddf9239d9752dec5a87def42488f05295ec505c2cc5f0418358fa51658b9318604c53ae6a3a75d903f8c SHA512 6e84db876022c21c1fcff8c9f88d4ff7375ebb8b37ab0dd445d1697484a1344098bfbffd82b3da7f2f8c2f926c4f403f2ffce9d67ef46b894f3a9f0b981aba10
-AUX mongodb-4.4.8-no-compass.patch 1598 BLAKE2B af1944476041b3e5ea317f52adfced103f5b103484a4de4bb2a2d07ffcbc8b18a975f543e042c3563f1d46978496482ce7de653de8e4b943ef6ecf6e501d9f52 SHA512 0b8f5d085831180dec72ff81a37b4d537e550c8ea80d970b4af1ea6bc66b60ba957ff6506d2e21b9e5bc77b9812251dda33fae8a7c0cac4086141b5fb8ff4190
AUX mongodb-5.0.16-arm64-assert.patch 636 BLAKE2B 443b16404e8a13c7d1ce1a77b72960a40b8a366bae321af9047c1070142f2461a0fd5e813d2a4b3fcbe3b390e5f28f15bc7396ec13d48753a1cdf1cf3043c4b6 SHA512 24851bee5d93783df6f8a605b7d85d78d591bb2361aca4dbecef901c368a92f96661a9c860c98142224a94aa9dca90c6baa2feb58cfab58adc23e2e8b69ba91c
-AUX mongodb-5.0.2-boost-1.79.patch 2059 BLAKE2B 9edc95c6894e968b87b94d551a8d19017874d22f284cb00b75f4d6b090b9b0632e3dd68a4227be2ceec429635d47fc04f9aaf120544dec7d772751cf79387e37 SHA512 785367fafca3689e9441dcab64a8222156479d1ece2cde834fa44a90cfdecb9c21d6f41798b0ae0d04219d72eeced52f058e2afbf47eac184a143f3119653562
+AUX mongodb-5.0.2-boost-1.79.patch 2025 BLAKE2B 432c6b569b44c020acbd1e1422a88ecfc945d05894dce1621570a7eba80cece1a53e4db808eb9db41282b2dee7dfc1557a870e67d656fa311da6196521b9dd44 SHA512 8281f49ab26612581157c53747c001bebfb64d96cc685de1ed37fc661a12096a0dfe95907d13e30e7c316da0447a327cd6ec676ff8ae77bac39f8d7871fe2008
AUX mongodb-5.0.2-fix-scons.patch 1298 BLAKE2B e2f77fa965328e61c2e5dcdbfce7317a2323aacd997c7b24cba570bd9909cad8dfd864208d2a33f3d9603c97dc1ad1218a8a83f0a1aecc129e25b54f22fba710 SHA512 a76f7eb91d63bed994f1bf15f4222f72290a4debfaf2da8cb17a593c616e7e919b9c7929fb05f47028854a7cc53264aa053198cbfdbbe182772dd8a994bc6a76
AUX mongodb-5.0.2-no-compass.patch 307 BLAKE2B 7386de453e7349662a1a6ae3f4735ed7519e02ff84444fd38b719d5ba5396fc9000fa83f924e385522e522de8b3330d7b4d7b1c1bcdca51d4fcce0738714b86d SHA512 07fe714a4256c13449e1e764c88d5051773aa9397228085a8d581cde91477dff2c3dc70ba801eb559af76ff19abf205d32c9510606a9bb26cebb33f68822e607
AUX mongodb-5.0.2-skip-no-exceptions.patch 552 BLAKE2B e499cc0f0885e09b2c18ddb8ac5fb85a2bfa3c9a81d1b877b20f1fc8b1908df26faf330e386d688e6ea163e81e404170454d840539146d7d313b3dc8b7753c2e SHA512 6750b5d8427616b290d285959c0c43a28409349ae7b52153d524590a8a38c26c283acc25b82410853b5c87a4c74927cf5844580778d1ef4378cd1b035844dc97
AUX mongodb-5.0.2-skip-reqs-check.patch 766 BLAKE2B 907dbab7e19cb159d5f7df36c725415612290889192bd1118fc445ee86d0bc58a03d4ff92d71d7c2c18e6c480fb542d8880980e3ed499ebbeae113a0b4c360d3 SHA512 29d4ff6de3a89c39ed0e3c54aa1e17fc3466ceb69dfbcfc62109ea2666ca98458b7b23ac82e4b5c9be77d5d82c69d5b213670b3a3367b13c3b8cab06cfacf4c2
-AUX mongodb-5.0.26-boost-1.85.patch 5997 BLAKE2B 1ce29e4589889a24c04a6b705ef83fa4ada74c25bae1f394f82225eb9a199d116630f394ab614315801f460756e8061f00c5c2d20086dbcea7d3fb887a4d3a13 SHA512 a4058ac0faf80ac5928969f85171d99718a20df4336a150e7d8e0ec98ce35632a599df2f2b36e0a1a6976da7c331770648ff91687054338b2d89e4b4a38f1c92
+AUX mongodb-5.0.26-boost-1.85-extra.patch 881 BLAKE2B 4bc63a233072b24e65e5398896098781d7d89ba172d0b2984dfa3f5ac2f18de5ded366c4412c27e664d09cf38d804dfaad44479d79301f7b0878d94eb14e8aa3 SHA512 d2bca1299546bc20d5aa284e0f629d5d097afc784109f2a7c29e5c95964e8e95a903de5070014f54dcad6578c2ec324afed2540c30ba3a5fb6522947c5b619f8
+AUX mongodb-5.0.26-boost-1.85.patch 5442 BLAKE2B df405e23e9ca851b0dfe3571162572ae5051b20d95a3e06db3ec5b83dfc499d7bb247b9982ebfc1d348b29095f0ad17b52b51d9a4050f058166c87ea653e3e9f SHA512 0dd079d67b9ff74cfe23cf08b6666f2dd33fb42d80a50e82278f3d0062b7044c72a4807f0358595046bc611ad3f072843d2bb53f365bf7ac20533125ef96c1d5
+AUX mongodb-5.0.26-scons.patch 1088 BLAKE2B 4a002585e961dfff7d402dedcca3f33a4eb3caae3c75e57326edb0bdbcda4ef8aaa9da23af7b04e5948a6487c9e95bd4de11a3f2bf778897b71966b72fc1bdf7 SHA512 deb5bd514218a9b1741e167b03254aa29799db568d7b82f4dfddda54785b16f2fa158a563c70b36354a05eb2033dc64f1e6b8370953dfbc7685fd9bea7e50a81
+AUX mongodb-5.0.30-gcc-11.patch 278 BLAKE2B eabab39fef0898032b51c45c42a01d95543c2ea710b6d3fb078c36f121df6c860dba34981d1dcdd4e24dd647bf80a0c13c421262a03301680644cbf9a0440715 SHA512 68549ca0be043aaffc0c4773b4ca892a43f356686434cbed4dab7da86f596b2a2a5e160f1242c197b53c40c3c627497c7dacfe05b3d729e42a07f55bd1011e4c
+AUX mongodb-5.0.30-gcc-15.patch 635 BLAKE2B 8cf10d5265a717465d8dacec51f59d2bbd191a722dfdf1979e6e7072d1704a6c04a0a61323d9ec0c829f87dc1a4a6c6ed9507baaaabdcfbb684ed22184132e41 SHA512 57e5f4c7490be8589b1292a519d1f571ee0817faee6e5f1c89a8bb786d9b7678682295cd0b6597441eaa693a6b34751cedc354bf37efacdc3f473651139a2015
AUX mongodb-5.0.5-boost-1.81-extra.patch 279 BLAKE2B e851be4110cc65533ec35bdc80fccba53cdccd1e88608f72eeb8ac00fd110d2a1e977638ff69b7bd91e4d58b559f558c25f33488b0ed9e5a2a9c7d817ed87736 SHA512 bef7b01b7a543bc938a640e4fe28d3cabe17690b1051566a42327dfbc7a56401125a677823193fe1059a74f4aadb585b5b1eb560f2c137c80c35a9fef0ced63d
AUX mongodb-5.0.5-no-force-lld.patch 2647 BLAKE2B 7759b2a1172e93ce92f5e528236946a2da691362864053f1fe26c61e7332bbc755daebc501d51a51a679661e29c0158277a8e984ad5500aee934e070543a9ccc SHA512 76c6e9aaf86fb62f3d9b887160971390541be5e9c99172ad281d455436f17fc7b7b74120726505d5307371964930261f5348e54e5240bd8a66296b0d210db0e2
AUX mongodb.conf-r3 722 BLAKE2B c053bf101f5e3e38cc68f2bcbe7fb66ed9e55da9382d2412a497d68b478573390eddc5f284f76d56ca4792fe6241f6d1273a6585a98f96a1cb20530499a15904 SHA512 ef193bfed673477aa0e868114bd52be6675492c164f218c71ccd02c4a620b5c4799ea1d18df0c3f2b364027b9f25e60ac4475bb216b25e1dc10bfd00a9f5d45d
@@ -24,8 +23,8 @@ 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-4.4.29.gh.tar.gz 51651007 BLAKE2B 9e9bd08ce87659fcf788964ec1bff80baef5bb9c2f5bd4968588511d289b9baf9fc68812f72ee89f90fb557dcc8d2ecbb3f607ca8e31c2212ec9633c0b99da37 SHA512 3c32a918c8b5587b04ee9263788c250a9bbd64f34ed2c19939e78607456215697966e596c2cfd160604b629188e4bdf3fff071db268bb3c25de3077a7c2ef335
DIST mongodb-5.0.26.gh.tar.gz 57252091 BLAKE2B a4663a4dbac90118b56646816b178680a6bd99be6abb582fdfdb662c8ddf14eb9db18ed97260a37b2d04bf11715e6cfaa34bb12c4f4b08426e3afa90908f0b3c SHA512 efd56649006bb61070a2f255e8d843e4ddab33562ec9454afe55848dcc3ce8ee90431f70c9362b14e52c4a49a162ea3075a869a6fd71f63efdd5f4358703fea4
-EBUILD mongodb-4.4.29.ebuild 5435 BLAKE2B 4abc86c22c3ed26ab58922fa7b0b2ebbd81b9e79186a04099074d3e4025c890ca47ddde5633fe11b63da564ae9519a2fe893ef3c3e5bd67ec27eed1f91f472d3 SHA512 53c8311906ac7bbcda7598f039230fef9a89f887ded063b009c77eda8b422349df3b85fa84b964c0e2b9a81d77618f7ad534a702fdfdf963c6911e1a1d529adf
-EBUILD mongodb-5.0.26.ebuild 6000 BLAKE2B 1bf2679641b9239c7410be674ac8156dc223f405d69fe3d09baf14c9360284a47631886dd1d1d26b48b5b780479d0effdac2596198880effe504e2aca6b58854 SHA512 a469a5f06dcef9aee138478172e0b3e1d5dafe154447bb1b4c4cfbbb6018d7b0e6566e31b4ab7c38a7ebe784d503297bd1f06b31248f749f846fa57a3e0a01d9
-MISC metadata.xml 931 BLAKE2B 7ac7f9f4c2f048262d980577ef99c4a4200b805ea32976309bc68abaa7d0afc6818d1a24351b4850a7855f6f3e73bd0fd8241326c8a81484815342ba85c2e3ea SHA512 86fc063b5759fe7af2dd288897b8bff77e0d64a934abee3a68c0e0fb4454d67f0ced71e092257004885e375f2f17fd50577bacff802882d2dedff8306cfdf3d2
+DIST mongodb-5.0.30.gh.tar.gz 57312372 BLAKE2B 72b026115cf3c8b1b81857bc5bffcd5b72bae4b581a7ada598bc7bbe594f264f581212159788113c5709ab751dd8a57943a3cc9b78f0d31aeb50375fa1da2c28 SHA512 97642da12cf199fa3f17825b1eb20e4d9bc1f65c8950f54b36347af11b6964cdd2007d11b01147d0c253077ef14121de52517c1739b433b49a9cbbe2596d9d05
+EBUILD mongodb-5.0.26.ebuild 6091 BLAKE2B f126f2893212f71568c1527041c546bca9c523a7c2d1b8d9b1da69cda75a236db479f1c75e77f7d82e5583e262bb33b1dd4c474dbeebed80ad24746374397e81 SHA512 357b5bb2f97f1e38fd3d3031de0e3d9f37292c62e765307524cfb117bef2575ad2504d1a6867862865e120c6a216433e20c8d98332f221221085406eea1af175
+EBUILD mongodb-5.0.30.ebuild 6113 BLAKE2B d3422572bbeade18fdc11eb74d144e09ce503d3018e9e35247edb6beaa75f3e1a4f9b139aada1ff112bb35f57e57a0d5a06a20ebde19c7f95dfacb099545fc97 SHA512 b552052cdc288814b293fa9fbc7027dce4df876eb0e669b1cbde2833769d7807f63f419483dda1d3afcb1ba24587d71d07d479735bfabc8abde27116a7bb4c15
+MISC metadata.xml 990 BLAKE2B 59df82d7c6895609ad70e11bac3aec67c2cb76c5221e71c853cd09c77783acf720bf5ccfae1e998e03cfc15b88560dc30b71ee35ed19a971c39bb840aa622391 SHA512 1c05e1ff3cabed908f254b5166e7396a7b85c63e3589025048d9537c395d3b753706f0c5cb5c09a6766cd8e9d586981eaeb342bfc6a6d14eedcd47da00a2401c
diff --git a/dev-db/mongodb/files/mongodb-4.4.1-fix-scons.patch b/dev-db/mongodb/files/mongodb-4.4.1-fix-scons.patch
deleted file mode 100644
index 8b9d5d6d9fa2..000000000000
--- a/dev-db/mongodb/files/mongodb-4.4.1-fix-scons.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/SConstruct b/SConstruct
-index 89c044ab..a6d02072 100644
---- a/SConstruct
-+++ b/SConstruct
-@@ -2064,7 +2064,6 @@ if env.TargetOSIs('posix'):
- env.Append( CCFLAGS=["-fno-omit-frame-pointer",
- "-fno-strict-aliasing",
- "-fasynchronous-unwind-tables",
-- "-ggdb" if not env.TargetOSIs('emscripten') else "-g",
- "-pthread",
- "-Wall",
- "-Wsign-compare",
-@@ -2076,6 +2075,9 @@ if env.TargetOSIs('posix'):
- 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'] )
-
-@@ -2096,8 +2098,8 @@ if env.TargetOSIs('posix'):
-
- 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.4.10-boost-1.79.patch b/dev-db/mongodb/files/mongodb-4.4.10-boost-1.79.patch
deleted file mode 100644
index 601141e8d416..000000000000
--- a/dev-db/mongodb/files/mongodb-4.4.10-boost-1.79.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-https://bugs.gentoo.org/844235
---- a/src/mongo/db/auth/security_key_test.cpp
-+++ b/src/mongo/db/auth/security_key_test.cpp
-@@ -30,6 +30,7 @@
- #include "mongo/platform/basic.h"
-
- #include <boost/filesystem.hpp>
-+#include <boost/filesystem/fstream.hpp>
-
- #include "mongo/base/string_data.h"
- #include "mongo/db/auth/authorization_manager.h"
---- a/src/mongo/db/storage/storage_repair_observer.cpp
-+++ b/src/mongo/db/storage/storage_repair_observer.cpp
-@@ -41,6 +41,7 @@
- #include <sys/types.h>
- #endif
-
-+#include <boost/filesystem/fstream.hpp>
- #include <boost/filesystem/path.hpp>
-
- #include "mongo/db/dbhelpers.h"
---- a/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine_test.cpp
-+++ b/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine_test.cpp
-@@ -34,6 +34,7 @@
- #include "mongo/db/storage/kv/kv_engine_test_harness.h"
-
- #include <boost/filesystem.hpp>
-+#include <boost/filesystem/fstream.hpp>
- #include <boost/filesystem/path.hpp>
- #include <memory>
-
---- a/src/mongo/db/storage/wiredtiger/wiredtiger_util.cpp
-+++ b/src/mongo/db/storage/wiredtiger/wiredtiger_util.cpp
-@@ -36,6 +36,7 @@
- #include <limits>
-
- #include <boost/filesystem.hpp>
-+#include <boost/filesystem/fstream.hpp>
- #include <boost/filesystem/path.hpp>
-
- #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 <boost/filesystem.hpp>
-+#include <boost/filesystem/fstream.hpp>
- #include <fstream>
-
- #include "mongo/bson/bson_validate.h"
---- a/src/mongo/util/processinfo_linux.cpp
-+++ b/src/mongo/util/processinfo_linux.cpp
-@@ -36,6 +36,7 @@
- #include <iostream>
- #include <malloc.h>
- #include <pcrecpp.h>
-+#include <fstream>
- #include <sched.h>
- #include <stdio.h>
- #include <sys/mman.h>
---- a/src/mongo/util/stacktrace_threads.cpp
-+++ b/src/mongo/util/stacktrace_threads.cpp
-@@ -36,6 +36,7 @@
- #include <array>
- #include <atomic>
- #include <boost/filesystem.hpp>
-+#include <boost/filesystem/fstream.hpp>
- #include <cctype>
- #include <cstdint>
- #include <cstdlib>
diff --git a/dev-db/mongodb/files/mongodb-4.4.10-no-force-lld.patch b/dev-db/mongodb/files/mongodb-4.4.10-no-force-lld.patch
deleted file mode 100644
index 471f3e226820..000000000000
--- a/dev-db/mongodb/files/mongodb-4.4.10-no-force-lld.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Don't automagically force lld > gold > bfd. Leave it up to the user.
-
-In particular, avoids issues with LTO enabled (via the flag/scons option)
-where using GCC as compiler, as lld can't do LTO with GCC.
-
-https://bugs.gentoo.org/769986
---- a/SConstruct
-+++ b/SConstruct
-@@ -3109,20 +3109,6 @@ def doConfigure(myenv):
- myenv.Append( CCFLAGS=["/Zc:inline"])
-
- if myenv.ToolchainIs('gcc', 'clang'):
-- # This tells clang/gcc to use the gold linker if it is available - we prefer the gold linker
-- # because it is much faster. Don't use it if the user has already configured another linker
-- # selection manually.
-- if not any(flag.startswith('-fuse-ld=') for flag in env['LINKFLAGS']):
--
-- # lld has problems with separate debug info on some platforms. See:
-- # - https://bugzilla.mozilla.org/show_bug.cgi?id=1485556
-- # - https://bugzilla.mozilla.org/show_bug.cgi?id=1485556
-- if get_option('separate-debug') == 'off':
-- if not AddToLINKFLAGSIfSupported(myenv, '-fuse-ld=lld'):
-- AddToLINKFLAGSIfSupported(myenv, '-fuse-ld=gold')
-- else:
-- AddToLINKFLAGSIfSupported(myenv, '-fuse-ld=gold')
--
- # Usually, --gdb-index is too expensive in big static binaries, but for dynamic
- # builds it works well.
- if link_model.startswith("dynamic"):
diff --git a/dev-db/mongodb/files/mongodb-4.4.29-boost-1.85.patch b/dev-db/mongodb/files/mongodb-4.4.29-boost-1.85.patch
deleted file mode 100644
index 92831264b4e3..000000000000
--- a/dev-db/mongodb/files/mongodb-4.4.29-boost-1.85.patch
+++ /dev/null
@@ -1,146 +0,0 @@
-https://bugs.gentoo.org/932251#c7
---- a/src/mongo/db/initialize_server_global_state.cpp 2024-02-13 00:46:45.000000000 -0800
-+++ b/src/mongo/db/initialize_server_global_state.cpp 2024-06-05 01:07:27.035053336 -0700
-@@ -34,7 +34,7 @@
- #include "mongo/db/initialize_server_global_state.h"
- #include "mongo/db/initialize_server_global_state_gen.h"
-
--#include <boost/filesystem/operations.hpp>
-+#include <boost/filesystem.hpp>
- #include <fmt/format.h>
- #include <iostream>
- #include <memory>
-@@ -346,7 +346,7 @@
- << "\" should name a file, not a directory.");
- }
-
-- if (!serverGlobalParams.logAppend && boost::filesystem::is_regular(absoluteLogpath)) {
-+ if (!serverGlobalParams.logAppend && boost::filesystem::is_regular_file(absoluteLogpath)) {
- std::string renameTarget = absoluteLogpath + "." + terseCurrentTime(false);
- boost::system::error_code ec;
- boost::filesystem::rename(absoluteLogpath, renameTarget, ec);
-
-
---- a/src/mongo/db/startup_warnings_mongod.cpp 2024-02-13 00:46:45.000000000 -0800
-+++ b/src/mongo/db/startup_warnings_mongod.cpp 2024-06-05 01:09:36.740158960 -0700
-@@ -34,6 +34,7 @@
- #include "mongo/db/startup_warnings_mongod.h"
-
- #include <boost/filesystem/operations.hpp>
-+#include <boost/filesystem/exception.hpp>
- #include <fstream>
- #ifndef _WIN32
- #include <sys/resource.h>
-
-
---- a/src/mongo/db/storage/storage_engine_lock_file_posix.cpp 2024-06-05 00:46:38.374648451 -0700
-+++ b/src/mongo/db/storage/storage_engine_lock_file_posix.cpp 2024-06-05 00:47:33.178731500 -0700
-@@ -55,7 +55,7 @@
- // if called without a fully qualified path it asserts; that makes mongoperf fail.
- // so make a warning. need a better solution longer term.
- // massert(40389, str::stream() << "Couldn't find parent dir for file: " << file.string(),);
-- if (!file.has_branch_path()) {
-+ if (!file.has_parent_path()) {
- LOGV2(22274,
- "warning flushMyDirectory couldn't find parent dir for file: {file}",
- "flushMyDirectory couldn't find parent dir for file",
-@@ -64,7 +64,7 @@
- }
-
-
-- boost::filesystem::path dir = file.branch_path(); // parent_path in new boosts
-+ boost::filesystem::path dir = file.parent_path(); // parent_path in new boosts
-
- LOGV2_DEBUG(22275, 1, "flushing directory {dir_string}", "dir_string"_attr = dir.string());
-
-
---- a/src/mongo/db/storage/storage_engine_metadata.cpp 2024-02-13 00:46:45.000000000 -0800
-+++ b/src/mongo/db/storage/storage_engine_metadata.cpp 2024-06-05 01:26:46.904273382 -0700
-@@ -220,7 +220,7 @@
- // if called without a fully qualified path it asserts; that makes mongoperf fail.
- // so make a warning. need a better solution longer term.
- // massert(13652, str::stream() << "Couldn't find parent dir for file: " << file.string(),);
-- if (!file.has_branch_path()) {
-+ if (!file.has_parent_path()) {
- LOGV2(22283,
- "warning flushMyDirectory couldn't find parent dir for file: {file}",
- "flushMyDirectory couldn't find parent dir for file",
-@@ -229,7 +229,7 @@
- }
-
-
-- boost::filesystem::path dir = file.branch_path(); // parent_path in new boosts
-+ boost::filesystem::path dir = file.parent_path(); // parent_path in new boosts
-
- LOGV2_DEBUG(22284, 1, "flushing directory {dir_string}", "dir_string"_attr = dir.string());
-
-
---- a/src/mongo/shell/shell_utils_launcher.cpp 2024-02-13 00:46:45.000000000 -0800
-+++ b/src/mongo/shell/shell_utils_launcher.cpp 2024-06-05 01:29:45.140048809 -0700
-@@ -39,6 +39,7 @@
- #include <boost/iostreams/stream.hpp>
- #include <boost/iostreams/stream_buffer.hpp>
- #include <boost/iostreams/tee.hpp>
-+#include <boost/filesystem.hpp>
- #include <cctype>
- #include <fcntl.h>
- #include <fmt/format.h>
-@@ -907,26 +908,26 @@
- boost::filesystem::directory_iterator i(from);
- while (i != end) {
- boost::filesystem::path p = *i;
-- if (p.leaf() == "metrics.interim" || p.leaf() == "metrics.interim.temp") {
-+ if (p.filename() == "metrics.interim" || p.filename() == "metrics.interim.temp") {
- // Ignore any errors for metrics.interim* files as these may disappear during copy
- boost::system::error_code ec;
-- boost::filesystem::copy_file(p, to / p.leaf(), ec);
-+ boost::filesystem::copy_file(p, to / p.filename(), ec);
- if (ec) {
- LOGV2_INFO(22814,
- "Skipping copying of file from '{from}' to "
- "'{to}' due to: {error}",
- "Skipping copying of file due to error"
- "from"_attr = p.generic_string(),
-- "to"_attr = (to / p.leaf()).generic_string(),
-+ "to"_attr = (to / p.filename()).generic_string(),
- "error"_attr = ec.message());
- }
-- } else if (p.leaf() != "mongod.lock" && p.leaf() != "WiredTiger.lock") {
-+ } else if (p.filename() != "mongod.lock" && p.filename() != "WiredTiger.lock") {
- if (boost::filesystem::is_directory(p)) {
-- boost::filesystem::path newDir = to / p.leaf();
-+ boost::filesystem::path newDir = to / p.filename();
- boost::filesystem::create_directory(newDir);
- copyDir(p, newDir);
- } else {
-- boost::filesystem::copy_file(p, to / p.leaf());
-+ boost::filesystem::copy_file(p, to / p.filename());
- }
- }
- ++i;
-
-
---- a/src/mongo/scripting/engine.cpp 2024-02-13 00:46:45.000000000 -0800
-+++ b/src/mongo/scripting/engine.cpp 2024-06-05 00:59:57.488909335 -0700
-@@ -34,6 +34,7 @@
- #include "mongo/scripting/engine.h"
-
- #include <boost/filesystem/operations.hpp>
-+#include <boost/filesystem/directory.hpp>
- #include <cctype>
-
- #include "mongo/client/dbclient_base.h"
-
-
---- a/src/mongo/shell/shell_utils_launcher.h 2024-02-13 00:46:45.000000000 -0800
-+++ b/src/mongo/shell/shell_utils_launcher.h 2024-06-05 01:04:44.286162623 -0700
-@@ -29,7 +29,7 @@
-
- #pragma once
-
--#include <boost/filesystem/convenience.hpp>
-+#include <boost/filesystem/path.hpp>
- #include <map>
- #include <sstream>
- #include <string>
-
diff --git a/dev-db/mongodb/files/mongodb-4.4.8-no-compass.patch b/dev-db/mongodb/files/mongodb-4.4.8-no-compass.patch
deleted file mode 100644
index 0755705ed55f..000000000000
--- a/dev-db/mongodb/files/mongodb-4.4.8-no-compass.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff --git a/src/mongo/SConscript b/src/mongo/SConscript
-index 62fbfc02..5be336f7 100644
---- a/src/mongo/SConscript
-+++ b/src/mongo/SConscript
-@@ -841,30 +841,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'):
-- compass_script = "Install-Compass.ps1"
--
--compass_installer = f"$BUILD_DIR/mongo/installer/compass/{compass_script}"
--
--distBinaries.append(compass_installer)
--
--if not hygienic:
-- compass_script_installer = env.Install("$DESTDIR/bin", compass_installer)
--else:
-- compass_script_installer = env.AutoInstall(
-- target='$PREFIX_BINDIR',
-- source=[
-- compass_installer,
-- ],
-- AIB_COMPONENT='dist',
-- AIB_ROLE='runtime',
-- )
--
--if env.TargetOSIs('posix'):
-- env.AddPostAction( compass_script_installer, 'chmod 755 $TARGET' )
-- env.AddPostAction( compass_installer, 'chmod 755 $TARGET' )
--
- if not hygienic:
- server_archive = env.Command(
- target='#/${SERVER_ARCHIVE}',
-@@ -878,7 +854,6 @@ if not hygienic:
- '--transform $BUILD_DIR/mongo/stripped/db/modules/enterprise=$SERVER_DIST_BASENAME/bin',
- '--transform $BUILD_DIR/mongo/stripped=$SERVER_DIST_BASENAME/bin',
- '--transform $BUILD_DIR/mongo=$SERVER_DIST_BASENAME/bin',
-- '--transform src/mongo/installer/compass=$SERVER_DIST_BASENAME/bin',
- '${TEMPFILE(SOURCES[1:])}'
- ],
- ),
diff --git a/dev-db/mongodb/files/mongodb-5.0.2-boost-1.79.patch b/dev-db/mongodb/files/mongodb-5.0.2-boost-1.79.patch
index 39c76bacf426..de4c11ea2844 100644
--- a/dev-db/mongodb/files/mongodb-5.0.2-boost-1.79.patch
+++ b/dev-db/mongodb/files/mongodb-5.0.2-boost-1.79.patch
@@ -37,8 +37,8 @@ https://bugs.gentoo.org/844235
#include <boost/filesystem.hpp>
+#include <boost/filesystem/fstream.hpp>
#include <boost/filesystem/path.hpp>
-
- #include "mongo/base/simple_string_data_comparator.h"
+ #include <pcrecpp.h>
+
--- a/src/mongo/shell/shell_utils_extended.cpp
+++ b/src/mongo/shell/shell_utils_extended.cpp
@@ -37,6 +37,7 @@
diff --git a/dev-db/mongodb/files/mongodb-5.0.26-boost-1.85-extra.patch b/dev-db/mongodb/files/mongodb-5.0.26-boost-1.85-extra.patch
new file mode 100644
index 000000000000..b3e3aab0c901
--- /dev/null
+++ b/dev-db/mongodb/files/mongodb-5.0.26-boost-1.85-extra.patch
@@ -0,0 +1,16 @@
+https://bugs.gentoo.org/932251
+https://github.com/mongodb/mongo/commit/f8e4be7f6da71f978b2aa9991febb4c7ad89c903#diff-010644a9158d28e5745762753c7ce454444c9fb9ab4c684e9f2fdcff50c6f539
+https://bugs.gentoo.org/932251#c3
+
+--- a/src/mongo/db/initialize_server_global_state.cpp
++++ b/src/mongo/db/initialize_server_global_state.cpp
+@@ -328,7 +328,7 @@
+ << "\" should name a file, not a directory.");
+ }
+
+- if (!serverGlobalParams.logAppend && boost::filesystem::is_regular(absoluteLogpath)) {
++ if (!serverGlobalParams.logAppend && boost::filesystem::is_regular_file(absoluteLogpath)) {
+ std::string renameTarget = absoluteLogpath + "." + terseCurrentTimeForFilename();
+ boost::system::error_code ec;
+ boost::filesystem::rename(absoluteLogpath, renameTarget, ec);
+
diff --git a/dev-db/mongodb/files/mongodb-5.0.26-boost-1.85.patch b/dev-db/mongodb/files/mongodb-5.0.26-boost-1.85.patch
index 71da50fe21eb..23bd6f75ffaa 100644
--- a/dev-db/mongodb/files/mongodb-5.0.26-boost-1.85.patch
+++ b/dev-db/mongodb/files/mongodb-5.0.26-boost-1.85.patch
@@ -13,15 +13,6 @@ https://bugs.gentoo.org/932251#c3
#include <fmt/format.h>
#include <iostream>
#include <memory>
-@@ -328,7 +328,7 @@
- << "\" should name a file, not a directory.");
- }
-
-- if (!serverGlobalParams.logAppend && boost::filesystem::is_regular(absoluteLogpath)) {
-+ if (!serverGlobalParams.logAppend && boost::filesystem::is_regular_file(absoluteLogpath)) {
- std::string renameTarget = absoluteLogpath + "." + terseCurrentTimeForFilename();
- boost::system::error_code ec;
- boost::filesystem::rename(absoluteLogpath, renameTarget, ec);
--- a/src/mongo/db/startup_warnings_mongod.cpp
+++ b/src/mongo/db/startup_warnings_mongod.cpp
@@ -34,6 +34,7 @@
diff --git a/dev-db/mongodb/files/mongodb-5.0.26-scons.patch b/dev-db/mongodb/files/mongodb-5.0.26-scons.patch
new file mode 100644
index 000000000000..2bb9c527ab2d
--- /dev/null
+++ b/dev-db/mongodb/files/mongodb-5.0.26-scons.patch
@@ -0,0 +1,27 @@
+https://jira.mongodb.org/browse/SERVER-94430 Upstream respond:
+
+> we intentionally do not ingest the environment PATH as this makes build
+> reproducibility and hermiticity much harder. Instead, you should set the
+> absolute paths to the tools you want to use on the command line, instead of
+> relying on the PATH.
+
+Gentoo bug https://bugs.gentoo.org/829340
+
+In Gentoo, we have LLVM slotted and we put clang in /usr/lib/llvm/18/bin (or
+whatever), not in /usr/bin, and if upstream strip PATH and construct it
+themselves, they surely won't contain this location.
+
+So we add PATH backup for scons.
+diff --git a/SConstruct b/SConstruct
+index 3d831c9..f07feeb 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -1201,7 +1201,7 @@ envDict = dict(BUILD_ROOT=buildDir,
+ if get_option('build-tools') == 'next':
+ SCons.Tool.DefaultToolpath.insert(0, os.path.abspath('site_scons/site_tools/next'))
+
+-env = Environment(variables=env_vars, **envDict)
++env = Environment(variables=env_vars, ENV={'PATH': os.environ['PATH']}, **envDict)
+ del envDict
+
+ if get_option('cache-signature-mode') == 'validate':
diff --git a/dev-db/mongodb/files/mongodb-5.0.30-gcc-11.patch b/dev-db/mongodb/files/mongodb-5.0.30-gcc-11.patch
new file mode 100644
index 000000000000..a99b79b2d929
--- /dev/null
+++ b/dev-db/mongodb/files/mongodb-5.0.30-gcc-11.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/768339
+
+--- a/src/mongo/db/exec/plan_stats.h
++++ b/src/mongo/db/exec/plan_stats.h
+@@ -33,6 +33,7 @@
+ #include <cstdlib>
+ #include <string>
+ #include <vector>
++#include <optional>
+
+ #include "mongo/db/index/multikey_paths.h"
+ #include "mongo/db/jsobj.h"
diff --git a/dev-db/mongodb/files/mongodb-5.0.30-gcc-15.patch b/dev-db/mongodb/files/mongodb-5.0.30-gcc-15.patch
new file mode 100644
index 000000000000..e2234734abcd
--- /dev/null
+++ b/dev-db/mongodb/files/mongodb-5.0.30-gcc-15.patch
@@ -0,0 +1,13 @@
+https://github.com/abseil/abseil-cpp/commit/809e5de7b92950849289236a5a09e9cb4f32c7b9
+diff --git a/src/third_party/abseil-cpp-master/abseil-cpp/absl/container/internal/container_memory.h b/src/third_party/abseil-cpp-master/abseil-cpp/absl/container/internal/container_memory.h
+index e67529ecb6e..d777480d604 100644
+--- a/src/third_party/abseil-cpp-master/abseil-cpp/absl/container/internal/container_memory.h
++++ b/src/third_party/abseil-cpp-master/abseil-cpp/absl/container/internal/container_memory.h
+@@ -17,6 +17,7 @@
+
+ #include <cassert>
+ #include <cstddef>
++#include <cstdint>
+ #include <memory>
+ #include <new>
+ #include <tuple>
diff --git a/dev-db/mongodb/metadata.xml b/dev-db/mongodb/metadata.xml
index 1f55f5a2d2d2..c8d28f354f2b 100644
--- a/dev-db/mongodb/metadata.xml
+++ b/dev-db/mongodb/metadata.xml
@@ -18,6 +18,7 @@
<flag name="tools">Install the MongoDB tools (mongoimport, mongodump...) from <pkg>app-admin/mongo-tools</pkg></flag>
</use>
<upstream>
+ <remote-id type="cpe">cpe:/a:mongodb:mongodb</remote-id>
<remote-id type="github">mongodb/mongo</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-db/mongodb/mongodb-5.0.26.ebuild b/dev-db/mongodb/mongodb-5.0.26.ebuild
index efb618e4f155..63bff8b4aa91 100644
--- a/dev-db/mongodb/mongodb-5.0.26.ebuild
+++ b/dev-db/mongodb/mongodb-5.0.26.ebuild
@@ -75,6 +75,8 @@ PATCHES=(
"${FILESDIR}/${PN}-5.0.16-arm64-assert.patch"
"${FILESDIR}/${PN}-4.4.29-no-enterprise.patch"
"${FILESDIR}/${PN}-5.0.26-boost-1.85.patch"
+ "${FILESDIR}/${PN}-5.0.26-boost-1.85-extra.patch"
+ "${FILESDIR}/${PN}-5.0.26-scons.patch"
)
python_check_deps() {
diff --git a/dev-db/mongodb/mongodb-4.4.29.ebuild b/dev-db/mongodb/mongodb-5.0.30.ebuild
index 7c004e0b2b0a..0305a184fa0f 100644
--- a/dev-db/mongodb/mongodb-4.4.29.ebuild
+++ b/dev-db/mongodb/mongodb-5.0.30.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
SCONS_MIN_VERSION="3.3.1"
CHECKREQS_DISK_BUILD="2400M"
@@ -19,22 +19,27 @@ DESCRIPTION="A high-performance, open source, schema-free document-oriented data
HOMEPAGE="https://www.mongodb.com"
SRC_URI="https://github.com/mongodb/mongo/archive/refs/tags/${MY_PV}.tar.gz -> ${P}.gh.tar.gz"
S="${WORKDIR}/${MY_P}"
+
LICENSE="Apache-2.0 SSPL-1"
SLOT="0"
KEYWORDS="~amd64 ~arm64 -riscv"
-IUSE="debug kerberos ssl test +tools"
-RESTRICT="!test? ( test )"
+CPU_FLAGS="cpu_flags_x86_avx"
+IUSE="debug kerberos mongosh ssl +tools ${CPU_FLAGS}"
+
+# https://github.com/mongodb/mongo/wiki/Test-The-Mongodb-Server
+# resmoke needs python packages not yet present in Gentoo
+RESTRICT="test"
RDEPEND="acct-group/mongodb
acct-user/mongodb
- >=app-arch/snappy-1.1.3:=
+ >=app-arch/snappy-1.1.7:=
+ app-arch/zstd:=
>=dev-cpp/yaml-cpp-0.6.2:=
dev-libs/boost:=[nls]
>=dev-libs/libpcre-8.42[cxx]
- app-arch/zstd:=
dev-libs/snowball-stemmer:=
net-misc/curl
- >=sys-libs/zlib-1.2.11:=
+ >=sys-libs/zlib-1.2.12:=
kerberos? ( dev-libs/cyrus-sasl[kerberos] )
ssl? (
>=dev-libs/openssl-1.0.1g:0=
@@ -46,32 +51,36 @@ DEPEND="${RDEPEND}
debug? ( dev-debug/valgrind )"
BDEPEND="
$(python_gen_any_dep '
- test? ( dev-python/pymongo[${PYTHON_USEDEP}] dev-python/requests[${PYTHON_USEDEP}] )
>=dev-build/scons-3.1.1[${PYTHON_USEDEP}]
dev-python/cheetah3[${PYTHON_USEDEP}]
dev-python/psutil[${PYTHON_USEDEP}]
dev-python/pyyaml[${PYTHON_USEDEP}]
')
"
-PDEPEND="tools? ( >=app-admin/mongo-tools-100 )"
+PDEPEND="
+ mongosh? ( app-admin/mongosh-bin )
+ tools? ( >=app-admin/mongo-tools-100 )
+"
PATCHES=(
- "${FILESDIR}/${PN}-4.4.1-fix-scons.patch"
- "${FILESDIR}/${PN}-4.4.8-no-compass.patch"
"${FILESDIR}/${PN}-4.4.1-boost.patch"
- "${FILESDIR}/${PN}-4.4.1-gcc11.patch"
- "${FILESDIR}/${PN}-4.4.10-boost-1.79.patch"
- "${FILESDIR}/${PN}-4.4.10-no-force-lld.patch"
+ "${FILESDIR}/${PN}-5.0.30-gcc-11.patch"
+ "${FILESDIR}/${PN}-5.0.2-fix-scons.patch"
+ "${FILESDIR}/${PN}-5.0.2-no-compass.patch"
+ "${FILESDIR}/${PN}-5.0.2-skip-no-exceptions.patch"
+ "${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"
- "${FILESDIR}/${P}-no-enterprise.patch"
- "${FILESDIR}/${PN}-4.4.29-boost-1.85.patch"
+ "${FILESDIR}/${PN}-5.0.5-boost-1.81-extra.patch"
+ "${FILESDIR}/${PN}-5.0.16-arm64-assert.patch"
+ "${FILESDIR}/${PN}-4.4.29-no-enterprise.patch"
+ "${FILESDIR}/${PN}-5.0.26-boost-1.85.patch"
+ "${FILESDIR}/${PN}-5.0.26-boost-1.85-extra.patch"
+ "${FILESDIR}/${PN}-5.0.30-gcc-15.patch"
)
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 -b ">=dev-build/scons-3.1.1[${PYTHON_USEDEP}]" &&
python_has_version -b "dev-python/cheetah3[${PYTHON_USEDEP}]" &&
python_has_version -b "dev-python/psutil[${PYTHON_USEDEP}]" &&
@@ -79,13 +88,21 @@ python_check_deps() {
}
pkg_pretend() {
+ # Bug 809692 + 890294
+ if use amd64 && ! use cpu_flags_x86_avx; then
+ ewarn "MongoDB 5.0 requires use of the AVX instruction set."
+ ewarn "This ebuild will use --experimental-optimization=-sandybridge which"
+ ewarn "will result in an experimental build of MongoDB as per upstream."
+ ewarn "https://docs.mongodb.com/v5.0/administration/production-notes/"
+ fi
+
if [[ -n ${REPLACING_VERSIONS} ]]; then
- if ver_test "$REPLACING_VERSIONS" -lt 4.2; then
- ewarn "To upgrade from a version earlier than the 4.2-series, you must"
+ if ver_test "$REPLACING_VERSIONS" -lt 4.4; then
+ ewarn "To upgrade from a version earlier than the 4.4-series, you must"
ewarn "successively upgrade major releases until you have upgraded"
- ewarn "to 4.2-series. Then upgrade to 4.4 series."
+ ewarn "to 4.4-series. Then upgrade to 5.0 series."
else
- ewarn "Be sure to set featureCompatibilityVersion to 4.2 before upgrading."
+ ewarn "Be sure to set featureCompatibilityVersion to 4.4 before upgrading."
fi
fi
}
@@ -94,7 +111,7 @@ src_prepare() {
default
# remove bundled libs
- rm -r src/third_party/{boost-*,pcre-*,scons-*,snappy-*,yaml-cpp-*,zlib-*} || die
+ rm -r src/third_party/{boost,pcre-*,snappy-*,yaml-cpp,zlib-*} || die
# remove compass
rm -r src/mongo/installer/compass || die
@@ -114,9 +131,11 @@ src_configure() {
VERBOSE=1
VARIANT_DIR=gentoo
MONGO_VERSION="${PV}"
- MONGO_GIT_HASH="f4dda329a99811c707eb06d05ad023599f9be263"
+ MONGO_GIT_HASH="966efda23d779a86c76c34e1b13e561d68f2bb37"
--disable-warnings-as-errors
+ --force-jobs # Reapply #906897, fix #935274
+ --jobs="$(makeopts_jobs)"
--use-system-boost
--use-system-pcre
--use-system-snappy
@@ -127,14 +146,23 @@ src_configure() {
)
use arm64 && scons_opts+=( --use-hardware-crc32=off ) # Bug 701300
+ use amd64 && scons_opts+=( --experimental-optimization=-sandybridge ) # Bug 890294
use debug && scons_opts+=( --dbg=on )
use kerberos && scons_opts+=( --use-sasl-client )
- use ssl && scons_opts+=( --ssl )
+
+ scons_opts+=( --ssl=$(usex ssl on off) )
# Needed to avoid forcing FORTIFY_SOURCE
# Gentoo's toolchain applies these anyway
scons_opts+=( --runtime-hardening=off )
+ # gold is an option here but we don't really do that anymore
+ if tc-ld-is-lld; then
+ scons_opts+=( --linker=lld )
+ else
+ scons_opts+=( --linker=bfd )
+ fi
+
# respect mongoDB upstream's basic recommendations
# see bug #536688 and #526114
if ! use debug; then
@@ -146,13 +174,7 @@ src_configure() {
}
src_compile() {
- PREFIX="${EPREFIX}/usr" escons "${scons_opts[@]}" --nostrip install-core
-}
-
-# 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}"
+ PREFIX="${EPREFIX}/usr" ./buildscripts/scons.py "${scons_opts[@]}" install-devcore || die
}
src_install() {
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-22 21:51:58 +0000