gentoo resync : 29.12.2022

4 files changed, 43 insertions, 8 deletions

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index ea86fdc851ae..6bedaf6f292f 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -3,10 +3,11 @@ AUX my.cnf-8.0.distro-client 749 BLAKE2B b01b39c85430714b5a4bfb9923c9ed1df99cdce
 AUX my.cnf-8.0.distro-server 1125 BLAKE2B f4d6941aad1fc29e81e6c805ac42f4c8d3c7bc250990a9c432800dbe25b5c31be08d8e3895666b57f21606ffb69e704c57ed2692fd94696b9d325a4442596587 SHA512 82d35b7bc944e5690e1f2670a3d5674845610c2d11d6d8b1c5784ccb3877c6298de70eced3d7c497c0bcaecfa9e339ac43ce0534a97e7d976e950bb1a7f5c75d
 AUX my.cnf.distro-client 637 BLAKE2B b0812e0e03aa9a3b2e55e08b933a0b41b6afd95ded61f4d9d7c34a2d3810ec38520abd0d89e1c6565f61d4cd8a36d653f9f3199b3dd6a91345cdb5ff962685d8 SHA512 74bd1d9a58075d0a6195be1f94db310bcbe8da532b03844e6fa1ff84676e84843fc9adf9aed06b7e4db53c9aa24ef0885d96de0ccfe4c6ad98afe4c145d43f4f
 AUX my.cnf.distro-server 994 BLAKE2B 41dceff58edf748f9f60ac3c0d1682d2fc2f026fc1fd14b4c2dea398814beda3c09aabea04dd3a9e145464524c629e7e69dc257d1245e0a46dd8584b7f685172 SHA512 cf172edc23d3dda49c21af6b8adef8aa13694d8ceecddf1d612d4ae34d00ba53c51ae4ae7ca4d11083eeacb5d862f59a855a9d80e9e448ab8bbf17f42aac2650
+AUX mysql-8.0.27-gcc12.patch 879 BLAKE2B 66346c9bddf7555e732a2ed2a297e46bf39862a1addfb56ec44995b142d47ea1b58f6f5524ff2672902557b948f4606ce992b16681367873bc936370c70ee20a SHA512 b5f6f89a1fdbdb384dc5b66e5730417e49e942ab9855ab1808d893489bd8c1980751a0a433e1f66694a14308c0f4a3244a7bd51929abc3b808a07854be23ea55
 DIST mysql-5.7.36-patches-01.tar.xz 6396 BLAKE2B ed9783f207d40fc220992c4193bdd8e96523f69414daa756f1f30306c1aedff9e96216ba2294a4c41eefbaf39c8bb37784bf1e7cce656c93f829c9cf0682fa6d SHA512 b0fbd41ebb2d32067e6c81707dffa91fece2d368f4b2fa47951492936509972d425b64d7613748c42b31cf9ba9dab697efeff70debe7268855a90d322d3f3158
-DIST mysql-8.0.27-patches-02.tar.xz 7204 BLAKE2B 1a3548f8b48b63a1d38cd9826f8ed2daf3d396276e8887e0a02a73fb91e544e1d0f1da9560351f03d3345d2ea5e8f61e5a9df2bce80558143bd3bc2558372232 SHA512 86c660d67d883fb84e6a38c39994bc30669c18b1d5bdedf908f112c7ebb59f0acf23903e6a81f01de1e6862a8cb779c7b537659ff18b090306eacf668dea47f8
+DIST mysql-8.0.27-patches-03.tar.xz 9864 BLAKE2B 03136477a97a5bff0c5f1cbc7921a77d9b36e148e94f80463f00f0efd1a6859af4595f9cf15aa492bce043fdc9d6c6328bd64102f8b0127eacbc7795b1785ecb SHA512 8c00c8fef2b01389f59138eaa29399d8a9ce7930b6bdfb7689d1d7bf14a32fbb10a2b8dbe91933b805899ef3af0cf0bda704d4be14249991b381054bcc496058
 DIST mysql-boost-5.7.36.tar.gz 52968383 BLAKE2B 4d5e4fcf8d56f4a1d1d54ee889d432ee3265f55ff9c0ecf6fe216e67790a49ed052b94457680daef4cb42df29f14db7b0e678e0f0443c20b7e2324c772c24313 SHA512 a95580efd5b87776ee7f1aae9b50d50d88c70a48c16e7a2d8c6ada0b1cadc5ec6074a859291a65caa1b50a00e08a9e350df342bb0c6ef74edaf21055331c081b
 DIST mysql-boost-8.0.27.tar.gz 292184025 BLAKE2B 177209f3c62b0326ca9d021c751a701dec84c1b15c946ab0a68b1b4cf0620468eb3a1df77a918284007a0fde1aaa6a9767d0baed57936612813ef583df51c35e SHA512 6ef2426c0bee46bdf8e2fa5cb159d5ae19f0bed4f7c9bea9b33e0dd922b568c3c68ca063dcbcd7ea6904aaea31877c10064ea10b4bc63fb40d9f31778e3a7891
-EBUILD mysql-5.7.36-r1.ebuild 38616 BLAKE2B 44fd2bac90600f8cd14db336a364ddfb77e0534f93e54ce4c63c8b7ed45bbd38f86d552ee90d6b0535b624bc162ba658b2895bcc18a5ae19e56d23ccd9555093 SHA512 a8d8b85eaf66822c044afdf1477f909867c37cc3b51870c1283fd141c97fd80dbf928befce4edf7638aa4c101b0f8f9d24784d7d7fcc1db3e42a1cd6cd5d4166
-EBUILD mysql-8.0.27.ebuild 40587 BLAKE2B f7ff08bc36100ceaad589cf658e997eadcd55a238fe923fe3509375246905b0e48a5a522275e6ab0813c91d6d3d46196f3d9d053c22bb8a3d1f6fc08c6dd5984 SHA512 fa0d7899e02cb288df28775e7e3d7fa40c97f309633c76aa2a7614aa686fb6e26b50533d512ee1f2889009175e91d82fea380dabe4de43ae43325726a14e063c
+EBUILD mysql-5.7.36-r1.ebuild 38618 BLAKE2B 88cbf474a83eb94fda420147ea1de13018e75662dba65a285d047e42c4c5207ee98b9db30d536549652d6d9b68bb5b965c1328fb9588886a228170dd61d7a175 SHA512 44bc69ac677e4f3f57310ea7c2837ab9bd0b7da046fdb88a2e5f6e65831e081d79051efee50878d3a372db3a9e246a1b90aa9c059cfbb37c7e24e332dcfc3d75
+EBUILD mysql-8.0.27.ebuild 40648 BLAKE2B f1dc5d44098a367e8ca6aa0384b67548b23a320862599b10e3a8786d6a6b1df6ad7710e724b04b4a7b0a6721fa1e60bb2d518832992235eff7a20eb80a3b3a19 SHA512 1be53499c7171a5fad96f6e16dd12b3cd385f74aefc4df6bdf0f11472669f985c4a1feaca5693eb10d2a7ca9a9744265ebfd7518e336bbb21972dd6e432d5da0
 MISC metadata.xml 1265 BLAKE2B ce4c9d4870ab4915abe269b27cba4854c0b5d1f44683ef6e9ed5ad7eb17e0e89b9f0b5ecce77477819afc16d9b769de4d084457b4a10032969d53dd093af209a SHA512 1cd8b25e9f1979ef95babf5a506b3978569e341a031b9e4d52b383166f3311310934338747b05363e11bcdf61f3c76f6a4eff62f7ed949bc151c1ed3c93dae42
diff --git a/dev-db/mysql/files/mysql-8.0.27-gcc12.patch b/dev-db/mysql/files/mysql-8.0.27-gcc12.patch
new file mode 100644
index 000000000000..f4ecb59273a6
--- /dev/null
+++ b/dev-db/mysql/files/mysql-8.0.27-gcc12.patch
@@ -0,0 +1,33 @@
+https://bugs.gentoo.org/840990
+https://bugs.gentoo.org/852737
+--- a/client/logger.cc
++++ b/client/logger.cc
+@@ -27,6 +27,7 @@
+ #include <time.h>
+ #include <iostream>
+ #include <locale>
++#include <memory>
+ 
+ using namespace std;
+ 
+--- a/components/keyrings/common/component_helpers/src/keyring_log_builtins_definition.cc
++++ b/components/keyrings/common/component_helpers/src/keyring_log_builtins_definition.cc
+@@ -25,6 +25,7 @@
+ #include <cstring>
+ #include <iostream>
+ #include <locale>
++#include <memory>
+ #include <sstream>
+ 
+ #include <m_string.h>
+
+--- a/router/src/harness/include/mysql/harness/net_ts/executor.h
++++ b/router/src/harness/include/mysql/harness/net_ts/executor.h
+@@ -35,6 +35,7 @@
+ #include <stdexcept>  // logic_error
+ #include <thread>
+ #include <type_traits>  // decay_t, enable_if
++#include <utility>
+ #include <unordered_map>
+ 
+ #include "my_compiler.h"
diff --git a/dev-db/mysql/mysql-5.7.36-r1.ebuild b/dev-db/mysql/mysql-5.7.36-r1.ebuild
index ecda1ce67a3d..ee5bc3f04468 100644
--- a/dev-db/mysql/mysql-5.7.36-r1.ebuild
+++ b/dev-db/mysql/mysql-5.7.36-r1.ebuild
@@ -1147,7 +1147,7 @@ pkg_config() {
 		log-slave-updates \
 	; do
 		optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}"
-		egrep -sq -- "${optexp}" "${helpfile}" && mysqld_options+=( "${optfull}" )
+		grep -E -sq -- "${optexp}" "${helpfile}" && mysqld_options+=( "${optfull}" )
 	done
 
 	# Prepare timezones, see
diff --git a/dev-db/mysql/mysql-8.0.27.ebuild b/dev-db/mysql/mysql-8.0.27.ebuild
index a6a52bcee87b..18dda6ee1678 100644
--- a/dev-db/mysql/mysql-8.0.27.ebuild
+++ b/dev-db/mysql/mysql-8.0.27.ebuild
@@ -12,12 +12,12 @@ MY_PV="${PV//_pre*}"
 MY_P="${PN}-${MY_PV}"
 
 # Patch version
-PATCH_SET="https://dev.gentoo.org/~whissi/dist/mysql/${PN}-8.0.27-patches-02.tar.xz"
+PATCH_SET=( https://dev.gentoo.org/~{whissi,dlan}/dist/mysql/${PN}-8.0.27-patches-03.tar.xz )
 
 SRC_URI="https://cdn.mysql.com/Downloads/MySQL-8.0/mysql-boost-${MY_PV}.tar.gz
 	https://cdn.mysql.com/archives/mysql-8.0/mysql-boost-${MY_PV}.tar.gz
 	http://downloads.mysql.com/archives/MySQL-8.0/${PN}-boost-${MY_PV}.tar.gz
-	${PATCH_SET}"
+	${PATCH_SET[@]}"
 
 HOMEPAGE="https://www.mysql.com/"
 DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
@@ -37,7 +37,7 @@ REQUIRED_USE="?? ( tcmalloc jemalloc )
 	tcmalloc? ( server )"
 
 # -ppc, -riscv for bug #761715
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips -ppc ppc64 -riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips -ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
 
 # Shorten the path because the socket path length must be shorter than 107 chars
 # and we will run a mysql server during test phase
@@ -170,6 +170,7 @@ src_unpack() {
 
 src_prepare() {
 	eapply "${WORKDIR}"/mysql-patches
+	eapply "${FILESDIR}"/${PN}-8.0.27-gcc12.patch
 
 	# Avoid rpm call which would trigger sandbox, #692368
 	sed -i \
@@ -1084,7 +1085,7 @@ pkg_config() {
 		log-slave-updates \
 	; do
 		optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}"
-		egrep -sq -- "${optexp}" "${helpfile}" && mysqld_options+=( "${optfull}" )
+		grep -E -sq -- "${optexp}" "${helpfile}" && mysqld_options+=( "${optfull}" )
 	done
 
 	# Prepare timezones, see