From 4444949d5895136511f4cfe455a34c0a9999820f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20F=C3=B6rster?= <Dessa@gmake.de>
Date: Sat, 21 Dec 2024 04:36:43 +0100
Subject: [PATCH] [dev-db/mongodb] bump 6 series, tree candidate

---
 dev-db/mongodb/Manifest                              |  2 +-
 ...st-1.79.patch => mongodb-6.0.20-boost-1.79.patch} |  0
 ...st-1.85.patch => mongodb-6.0.20-boost-1.85.patch} |  0
 dev-db/mongodb/files/mongodb-6.0.20-gcc-11.patch     | 12 ++++++++++++
 ...0.18-gcc-12.patch => mongodb-6.0.20-gcc-12.patch} |  0
 ...0.18-gcc-13.patch => mongodb-6.0.20-gcc-13.patch} |  0
 ...odb-6.0.20-mozjs-remove-unused-constructor.patch} |  0
 ...patch => mongodb-6.0.20-sconstruct-changes.patch} |  0
 .../{mongodb-6.0.19.ebuild => mongodb-6.0.20.ebuild} | 12 ++++++------
 dev-db/mongodb/mongodb-7.0.15.ebuild                 |  2 +-
 10 files changed, 20 insertions(+), 8 deletions(-)
 rename dev-db/mongodb/files/{mongodb-6.0.18-boost-1.79.patch => mongodb-6.0.20-boost-1.79.patch} (100%)
 rename dev-db/mongodb/files/{mongodb-6.0.18-boost-1.85.patch => mongodb-6.0.20-boost-1.85.patch} (100%)
 create mode 100644 dev-db/mongodb/files/mongodb-6.0.20-gcc-11.patch
 rename dev-db/mongodb/files/{mongodb-6.0.18-gcc-12.patch => mongodb-6.0.20-gcc-12.patch} (100%)
 rename dev-db/mongodb/files/{mongodb-6.0.18-gcc-13.patch => mongodb-6.0.20-gcc-13.patch} (100%)
 rename dev-db/mongodb/files/{mongodb-6.0.19-mozjs-remove-unused-constructor.patch => mongodb-6.0.20-mozjs-remove-unused-constructor.patch} (100%)
 rename dev-db/mongodb/files/{mongodb-6.0.18-sconstruct-changes.patch => mongodb-6.0.20-sconstruct-changes.patch} (100%)
 rename dev-db/mongodb/{mongodb-6.0.19.ebuild => mongodb-6.0.20.ebuild} (95%)

diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index 5bfdd39..3671fb9 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -1,3 +1,3 @@
 DIST mongodb-5.0.30.gh.tar.gz 57312372 BLAKE2B 72b026115cf3c8b1b81857bc5bffcd5b72bae4b581a7ada598bc7bbe594f264f581212159788113c5709ab751dd8a57943a3cc9b78f0d31aeb50375fa1da2c28 SHA512 97642da12cf199fa3f17825b1eb20e4d9bc1f65c8950f54b36347af11b6964cdd2007d11b01147d0c253077ef14121de52517c1739b433b49a9cbbe2596d9d05
-DIST mongodb-6.0.19.gh.tar.gz 87631425 BLAKE2B 94951b278273ecf8e091bdb9cebd9592f579ed9fe630ef7864a91b1ca95a2df20c9080ebfaa6ebffb4c07c002cdc21a2da62575292f9295293b1c25e2d3fb1e9 SHA512 6b53616c25a8a6ff5beca00df6e8bd8f032d17647aab8fd896d1376d4a60030ed9f6db620682308076719ead181931610d9447567f09e7dec2d4005814e1133b
+DIST mongodb-6.0.20.gh.tar.gz 87674161 BLAKE2B 6b900dec8b1ed5d62f77c87f13d7ddee4a03180f1e56f617bee436f7bf083185b3490220c27626293e31ed12c83740485cafdfe68e280a97a4eab51f4a69997c SHA512 77029dd8ae59817cb7b733124e91a9885bcc8b3c11446bc0bc7fcfaa4c8568b3de88e5eebbe4c72054c07107b5845aabe4c0e5f712f60b692c1088ce3e3e28a1
 DIST mongodb-7.0.15.gh.tar.gz 87140137 BLAKE2B e569fa4bbfdc631060071868872da57258ee1b43a6d79efb431baa33c88da405bc52f9b2b95290dbc93bc09b49cb0413b6013bdefba37a4e9acd75fccfe85e77 SHA512 79c7c3651944e37c624f8bfeb79d161b3f3f67ed8243f114f0ed943ced5f9734ef464b15a575ee6d83892728fb2b584fd943ff0dc8576c290a170c374331e6d8
diff --git a/dev-db/mongodb/files/mongodb-6.0.18-boost-1.79.patch b/dev-db/mongodb/files/mongodb-6.0.20-boost-1.79.patch
similarity index 100%
rename from dev-db/mongodb/files/mongodb-6.0.18-boost-1.79.patch
rename to dev-db/mongodb/files/mongodb-6.0.20-boost-1.79.patch
diff --git a/dev-db/mongodb/files/mongodb-6.0.18-boost-1.85.patch b/dev-db/mongodb/files/mongodb-6.0.20-boost-1.85.patch
similarity index 100%
rename from dev-db/mongodb/files/mongodb-6.0.18-boost-1.85.patch
rename to dev-db/mongodb/files/mongodb-6.0.20-boost-1.85.patch
diff --git a/dev-db/mongodb/files/mongodb-6.0.20-gcc-11.patch b/dev-db/mongodb/files/mongodb-6.0.20-gcc-11.patch
new file mode 100644
index 0000000..1250a07
--- /dev/null
+++ b/dev-db/mongodb/files/mongodb-6.0.20-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/exec/plan_stats_visitor.h"
+ #include "mongo/db/index/multikey_paths.h"
diff --git a/dev-db/mongodb/files/mongodb-6.0.18-gcc-12.patch b/dev-db/mongodb/files/mongodb-6.0.20-gcc-12.patch
similarity index 100%
rename from dev-db/mongodb/files/mongodb-6.0.18-gcc-12.patch
rename to dev-db/mongodb/files/mongodb-6.0.20-gcc-12.patch
diff --git a/dev-db/mongodb/files/mongodb-6.0.18-gcc-13.patch b/dev-db/mongodb/files/mongodb-6.0.20-gcc-13.patch
similarity index 100%
rename from dev-db/mongodb/files/mongodb-6.0.18-gcc-13.patch
rename to dev-db/mongodb/files/mongodb-6.0.20-gcc-13.patch
diff --git a/dev-db/mongodb/files/mongodb-6.0.19-mozjs-remove-unused-constructor.patch b/dev-db/mongodb/files/mongodb-6.0.20-mozjs-remove-unused-constructor.patch
similarity index 100%
rename from dev-db/mongodb/files/mongodb-6.0.19-mozjs-remove-unused-constructor.patch
rename to dev-db/mongodb/files/mongodb-6.0.20-mozjs-remove-unused-constructor.patch
diff --git a/dev-db/mongodb/files/mongodb-6.0.18-sconstruct-changes.patch b/dev-db/mongodb/files/mongodb-6.0.20-sconstruct-changes.patch
similarity index 100%
rename from dev-db/mongodb/files/mongodb-6.0.18-sconstruct-changes.patch
rename to dev-db/mongodb/files/mongodb-6.0.20-sconstruct-changes.patch
diff --git a/dev-db/mongodb/mongodb-6.0.19.ebuild b/dev-db/mongodb/mongodb-6.0.20.ebuild
similarity index 95%
rename from dev-db/mongodb/mongodb-6.0.19.ebuild
rename to dev-db/mongodb/mongodb-6.0.20.ebuild
index 21da3c6..a2f68f9 100644
--- a/dev-db/mongodb/mongodb-6.0.19.ebuild
+++ b/dev-db/mongodb/mongodb-6.0.20.ebuild
@@ -66,18 +66,18 @@ PATCHES=(
 	"${FILESDIR}/${PN}-5.0.30-gcc-11.patch"
 	"${FILESDIR}/${PN}-5.0.2-no-compass.patch"
 	"${FILESDIR}/${PN}-5.0.2-skip-reqs-check.patch"
-	"${FILESDIR}/${PN}-6.0.18-boost-1.79.patch"
-	"${FILESDIR}/${PN}-6.0.18-sconstruct-changes.patch"
-	"${FILESDIR}/${PN}-6.0.18-gcc-12.patch"
-	"${FILESDIR}/${PN}-6.0.18-gcc-13.patch"
+	"${FILESDIR}/${PN}-6.0.20-boost-1.79.patch"
+	"${FILESDIR}/${PN}-6.0.20-sconstruct-changes.patch"
+	"${FILESDIR}/${PN}-6.0.20-gcc-12.patch"
+	"${FILESDIR}/${PN}-6.0.20-gcc-13.patch"
 	"${FILESDIR}/${PN}-4.4.10-boost-1.81.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}-6.0.18-boost-1.85.patch"
+	"${FILESDIR}/${PN}-6.0.20-boost-1.85.patch"
 	"${FILESDIR}/${PN}-5.0.30-gcc-15.patch"
 	"${FILESDIR}/${PN}-5.0.26-scons.patch"
-	"${FILESDIR}/${PN}-6.0.19-mozjs-remove-unused-constructor.patch"
+	"${FILESDIR}/${PN}-6.0.20-mozjs-remove-unused-constructor.patch"
 )
 
 python_check_deps() {
diff --git a/dev-db/mongodb/mongodb-7.0.15.ebuild b/dev-db/mongodb/mongodb-7.0.15.ebuild
index 39d1a90..a9ca1a2 100644
--- a/dev-db/mongodb/mongodb-7.0.15.ebuild
+++ b/dev-db/mongodb/mongodb-7.0.15.ebuild
@@ -70,7 +70,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-7.0.15-system-boost.patch"
 	"${FILESDIR}/${PN}-7.0.15-gcc-15.patch"
 	"${FILESDIR}/${PN}-5.0.26-scons.patch"
-	"${FILESDIR}/${PN}-6.0.19-mozjs-remove-unused-constructor.patch"
+	"${FILESDIR}/${PN}-6.0.20-mozjs-remove-unused-constructor.patch"
 )
 
 python_check_deps() {