gentoo resync : 17.07.2021

5 files changed, 22 insertions, 6 deletions

diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index aaa0069bf5a7..6f22b6b52183 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -2,6 +2,7 @@ AUX mongodb-4.2.0-fix-scons.patch 1174 BLAKE2B 748de9efdb743c836ccb26239d4b3e736
 AUX mongodb-4.2.10-no-compass.patch 2151 BLAKE2B 724bf4e50c608f2336fcf587c78e68c713fb9b1469c5cf1203f1b155961daa16612ca13fd1fdc10326ebb587c7f339333f92f76d7c770fc043125cc1f931a594 SHA512 a13bea0614dfeb4fe2d81ad0448ecf2364ddd79a9d025f011fbd39c6da5a654e616424f91f7f88c32b00c780d9bc88c497f573b3f1b9a04849c67c4671a26c8d
 AUX mongodb-4.4.1-boost.patch 761 BLAKE2B 45295d05d23a8c2d72e333b14f06c40d32ff6c0610a244f71303fabf0bf0851d3a8a8c3df9f72aa7363a48a0b44bae45d81422970398f8b4f9753bab3dcf793a SHA512 504ec9a4e41f5e1c1a069d64e0958b260a3a8506d17638e62ddf6f1cd873b835f33a588b779e4851d63351faef4be1e0f4720e86f389128d062909b58fdb9aa2
 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.1-no-compass.patch 1976 BLAKE2B e9bd55a6978309754ca112afc450eec218971314d2382fc03149dba8e584928870cfda84fca75736e1013481b4e5615cf2ec9df8ad0a8dda3f5a5b40da8fe997 SHA512 3a1495fbf79fcd9ff18bf457a0193d3d29a2a7c1c4886625dbc2fa2eaa9460f8fd96eee8b7c9d70bc7a9d1af9816f71dd347eccf837eff58da2daf4e11e15380
 AUX mongodb-4.4.1-unwind-gcc10.patch 386 BLAKE2B 45d1d7a84dfe99dde60ca27244b1c1b5f128b56cf57ebc4f5d75aa4c222a9434102b4bc0ba10193c5b40ea054d108f85c80144fcc03678d18b8e4c11036c5556 SHA512 d12af064ac2e57f8a173fec05b94391fa394fb144284afb1050c9c50ca714b226ee484e0984c5d4122e8470551e939302c1ee2121a17a9d2c583f942af0704e9
 AUX mongodb.conf-r3 722 BLAKE2B c053bf101f5e3e38cc68f2bcbe7fb66ed9e55da9382d2412a497d68b478573390eddc5f284f76d56ca4792fe6241f6d1273a6585a98f96a1cb20530499a15904 SHA512 ef193bfed673477aa0e868114bd52be6675492c164f218c71ccd02c4a620b5c4799ea1d18df0c3f2b364027b9f25e60ac4475bb216b25e1dc10bfd00a9f5d45d
@@ -19,7 +20,7 @@ DIST mongodb-src-r4.4.2.tar.gz 49816559 BLAKE2B 0e51302e7e414de9fef74872e44c8de1
 DIST mongodb-src-r4.4.4.tar.gz 49942905 BLAKE2B 8aa9813e87e216899b3c609b413ce6915d6ddf30faea3c0ecda2a14476fc6b08024614fa7b20e1703b5908759459e88e5e302539c27525c2359233743aa7dcda SHA512 a999528a8a6bf4bf0b8ff8f5169b1aadb3c4dab9c7d936c59d66f238b864fad6e8fb6a1b9ec27f395fca95152ee020f96a8c1cf8960a48de3ce5141f8dda7d88
 EBUILD mongodb-4.2.11.ebuild 4726 BLAKE2B 96668733887275f32dd52ef11fb0dbee680b7781b7c8d035b0b18608c813e7bb3cefb373911878b1e74d0f2798f1824414aeddb5c89daabaf2a7ab318ab7a0d8 SHA512 1dbf5e936a1fc05ed8031c5188566431ea156c2af835da3733965c48c26e862b8f2aab4e732657e2a03e455155e4b6822bcc651e5406acc8584b959d7bd71fde
 EBUILD mongodb-4.2.12.ebuild 4727 BLAKE2B ed78acf75ea3960ff6ba13c816e1a5e8b73696d083b45f596c4d31954467726d9e6096ce7f30b5a80a60dcd9b6ee99972cf83ed23fced789b9e4d8d29c9845a1 SHA512 6e8b9e847ffc3605d8a895c9b8701623159a3ede97cb45a1dc429e401c2cb3582e009333b4552d31e2246f1ff4d8a2dffe89d2eb54e4d99fe1315b6603c508b0
-EBUILD mongodb-4.4.1.ebuild 4812 BLAKE2B 338ca6eaf4962c665e204e9d44f146fbf2001f38bd2f155b9f4dcfdf8605a670bd9ed5fd6b65b74306d13b0ebdf9e587ddc92a6cf7b41fdcb9fc7b15e0b0daf6 SHA512 f4d44914344c3ef0cea98c36b13323012fe6c7d79b1581b29fd6c844a189bb404ea73f10e69f0a14404e2940d38ecbf4f7676266de91c75e7fdcfd36d8025796
-EBUILD mongodb-4.4.2.ebuild 4767 BLAKE2B bd042dd9a7736c7b45ec35281a73cc21998277d136ccd33d08365d255f98e206613bd6885176ddcce25fc475055f264e71ac22102aef919e59edf4888008dd76 SHA512 214daebc1902bad64a44619fdbe4de0c419446e668a6ac60f7d9fb3455cbf8bc30604df39c046228bd3327ad18ddf8f75e453589d0be490c9b3fb7968829a84d
-EBUILD mongodb-4.4.4.ebuild 4767 BLAKE2B bd042dd9a7736c7b45ec35281a73cc21998277d136ccd33d08365d255f98e206613bd6885176ddcce25fc475055f264e71ac22102aef919e59edf4888008dd76 SHA512 214daebc1902bad64a44619fdbe4de0c419446e668a6ac60f7d9fb3455cbf8bc30604df39c046228bd3327ad18ddf8f75e453589d0be490c9b3fb7968829a84d
+EBUILD mongodb-4.4.1.ebuild 4856 BLAKE2B 86aa185d44eea9397c191fe48a72d707e5b24bda578080524abc84ade90ebd6cca161f520263cf86b34e39c72ee57a4f96864876d3cf872d7e7c1e94208c7607 SHA512 698c382d279ca85f9d9bd8e1c03af4989967dbb1ca13f4fe90d1f73004b54f07736cafe46dc8bd34a43177131e7d150cde60ffbc6f5f7c36c1b1ed53999eaa90
+EBUILD mongodb-4.4.2.ebuild 4811 BLAKE2B f94d67a464ac8b2337a9a7a98a6016380d6205a2a9f5584075b85731e97bfd19125b361d21dd74c659ee4015010460162b81e5630cadc7b0b0b71e8709b331f9 SHA512 5471a98f97268856cf99a6e80ae1c916c35f962b191ac0602a16f56074a7560c6b48f6c5a551fcbecd56b1503d161b9854c950146dcb1633756eae5bf2467380
+EBUILD mongodb-4.4.4.ebuild 4811 BLAKE2B f94d67a464ac8b2337a9a7a98a6016380d6205a2a9f5584075b85731e97bfd19125b361d21dd74c659ee4015010460162b81e5630cadc7b0b0b71e8709b331f9 SHA512 5471a98f97268856cf99a6e80ae1c916c35f962b191ac0602a16f56074a7560c6b48f6c5a551fcbecd56b1503d161b9854c950146dcb1633756eae5bf2467380
 MISC metadata.xml 824 BLAKE2B d7e131d6292b092deb2001bbd6f3d6f6a908f57a064f36f64429696849633ae5ff8dee36604e9952a90ef160b834c56f91d085be7c67a6f9a973c83875bf426c SHA512 cc3555829b1587640259c30c8ede022846ad60993d064ba43d16b28ef5b4a46e5b1fad6818826d4668f0738d27a43f29c5ec769fd647076828e275b5d325e748
diff --git a/dev-db/mongodb/files/mongodb-4.4.1-gcc11.patch b/dev-db/mongodb/files/mongodb-4.4.1-gcc11.patch
new file mode 100644
index 000000000000..a6ff02dcf66f
--- /dev/null
+++ b/dev-db/mongodb/files/mongodb-4.4.1-gcc11.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"
+ 
diff --git a/dev-db/mongodb/mongodb-4.4.1.ebuild b/dev-db/mongodb/mongodb-4.4.1.ebuild
index b26fac9d1d8d..15407a2446fa 100644
--- a/dev-db/mongodb/mongodb-4.4.1.ebuild
+++ b/dev-db/mongodb/mongodb-4.4.1.ebuild
@@ -57,6 +57,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-4.4.1-no-compass.patch"
 	"${FILESDIR}/${PN}-4.4.1-unwind-gcc10.patch"
 	"${FILESDIR}/${PN}-4.4.1-boost.patch"
+	"${FILESDIR}/${PN}-4.4.1-gcc11.patch"
 )
 
 S="${WORKDIR}/${MY_P}"
@@ -130,7 +131,7 @@ src_configure() {
 }
 
 src_compile() {
-	PREFIX="${ED}"/usr escons "${scons_opts[@]}" --nostrip install-core
+	PREFIX="${EPREFIX}/usr" escons "${scons_opts[@]}" --nostrip install-core
 }
 
 # FEATURES="test -usersandbox" emerge dev-db/mongodb
diff --git a/dev-db/mongodb/mongodb-4.4.2.ebuild b/dev-db/mongodb/mongodb-4.4.2.ebuild
index 1d0c36c3853c..c3ffcfa93d4c 100644
--- a/dev-db/mongodb/mongodb-4.4.2.ebuild
+++ b/dev-db/mongodb/mongodb-4.4.2.ebuild
@@ -56,6 +56,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-4.4.1-fix-scons.patch"
 	"${FILESDIR}/${PN}-4.4.1-no-compass.patch"
 	"${FILESDIR}/${PN}-4.4.1-boost.patch"
+	"${FILESDIR}/${PN}-4.4.1-gcc11.patch"
 )
 
 S="${WORKDIR}/${MY_P}"
@@ -129,7 +130,7 @@ src_configure() {
 }
 
 src_compile() {
-	PREFIX="${ED}"/usr escons "${scons_opts[@]}" --nostrip install-core
+	PREFIX="${EPREFIX}/usr" escons "${scons_opts[@]}" --nostrip install-core
 }
 
 # FEATURES="test -usersandbox" emerge dev-db/mongodb
diff --git a/dev-db/mongodb/mongodb-4.4.4.ebuild b/dev-db/mongodb/mongodb-4.4.4.ebuild
index 1d0c36c3853c..c3ffcfa93d4c 100644
--- a/dev-db/mongodb/mongodb-4.4.4.ebuild
+++ b/dev-db/mongodb/mongodb-4.4.4.ebuild
@@ -56,6 +56,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-4.4.1-fix-scons.patch"
 	"${FILESDIR}/${PN}-4.4.1-no-compass.patch"
 	"${FILESDIR}/${PN}-4.4.1-boost.patch"
+	"${FILESDIR}/${PN}-4.4.1-gcc11.patch"
 )
 
 S="${WORKDIR}/${MY_P}"
@@ -129,7 +130,7 @@ src_configure() {
 }
 
 src_compile() {
-	PREFIX="${ED}"/usr escons "${scons_opts[@]}" --nostrip install-core
+	PREFIX="${EPREFIX}/usr" escons "${scons_opts[@]}" --nostrip install-core
 }
 
 # FEATURES="test -usersandbox" emerge dev-db/mongodb