gentoo resync : 22.05.2021

4 files changed, 324 insertions, 2 deletions

diff --git a/dev-db/mysql-connector-c++/Manifest b/dev-db/mysql-connector-c++/Manifest
index 795e49dd1a9a..60ae546372a9 100644
--- a/dev-db/mysql-connector-c++/Manifest
+++ b/dev-db/mysql-connector-c++/Manifest
@@ -3,6 +3,7 @@ AUX mysql-connector-c++-1.1.6-fix-cmake.patch 762 BLAKE2B 4cecebd2cb075c6e1af7ab
 AUX mysql-connector-c++-8.0.19-fix-build.patch 9695 BLAKE2B c3334f74160a9b1148a588c7190db6f3a79fe70530d921428b7d86ec02f01324cf02c4130cd8d0cf42ecc4ccaccbecf90ffe0ac1cf8b265ea5cd9dea1046f30f SHA512 3d726b70a270e56ab38e8cebe5eb0186c4d0293dbd72844914ca9ef20674f20bc0fb4d2f0c449da77e4e6a81cc3ae454447a7983468d386e73f946dccd4a20cc
 AUX mysql-connector-c++-8.0.22-fix-build.patch 10143 BLAKE2B c1bafd2ba9ad454bc02d2ebaa581ff735c1f43a557680ee3cd2378cbfc6a5673b9cec976acfc79796fcbcf292383725e1687b6042fc81e16c996d2165e9244ea SHA512 97cb6429fbf2d6df1b8a0f91e21ad9c894cd287aa9c89d2873cd3397fad33a9821d856e68108adaaab713d579b2fb9cf6f783f3b3fc5a96d32c6ba8a63bd1c23
 AUX mysql-connector-c++-8.0.24-gcc11-numeric_limits.patch 348 BLAKE2B 509e869dcfffd58d92512277ff6ea148f430cca4eb9bd9a8b929641b7f876586c012aa324bdc7b475fc61dcf38bbc4edf16ab65bbe1fc0b9b15f6d19acd25743 SHA512 be18797ab0015580e21cf480938025c38c42cdf4e6aaca4c08ecb22d44932d44778c3a51488a3620915d4933b43aa75de737e2a386d449cb0b9d25ae245d5c68
+AUX mysql-connector-c++-8.0.25-fix-mysqlclient-static-binding.patch 9557 BLAKE2B eda1794a808a2bfd43a044fe05abe93d41ddf98b917e4ff22dce7d795fe62c4d53f102bbcecf5b0c2ccdcf92f49ff100f6586c1c2131ba492b0a7095f202967b SHA512 963cb123e813e8eb305210f4804b5c67bfe2ebf670c85bddfbff8d3df7b60825cecf004d2e9b45ec38abe9af9f118c88b1d121d3290cae49557208ccb309da48
 DIST mysql-connector-c++-1.1.12.tar.gz 518615 BLAKE2B 386a4753ca3f03999a49a89507da1b1172b3db89797c38403fee4eea86e7108a5e4f91f24a17de86d585c2a3d9e5742a117fa84d9b14aad649f938a597f3dae9 SHA512 d7e132dbc2efda4a77f8ae00c24006a1ade1d0a50f22d89ece453505e6d206427ee7988df29c0d6ef8b396ad6b8d326b6d263a1d4fa08ef5db0966fb4f1479f4
 DIST mysql-connector-c++-8.0.19-src.tar.gz 3137484 BLAKE2B 82a2900b0daa00bcfd72d562818ada25fe15901991a896a46ecdd9304e03066c4e7a3804287540559df1c74dbd1b3983b450ab783ee8cb7f0d7ec152f3cdc6b0 SHA512 5987ae31cda3a5db18ceded201ccbe66263b8ab7665ceacf70af6bb6b99130377b40514b96644b0768fd809b36ee02580520923c11c1edecccc75da15d7bb0bd
 DIST mysql-connector-c++-8.0.20-src.tar.gz 3774428 BLAKE2B a06114432ab21c36fd0b3b91df2382198b2a48871e8e0bfd8c7a94729ed0e29f33599c078c97670fe9d744b13042db52fb89de2294c75eae670a77112d11d251 SHA512 3edb7c3d4ccf218a3f76afcf83a6d233b7accd236c05105ab3f7a6610cfd8809a78c78142c82fb60fb0931d2ae0f0f8fdc3ce9caf5f0cde7ef54067a7e20270b
@@ -10,11 +11,13 @@ DIST mysql-connector-c++-8.0.21-src.tar.gz 3788740 BLAKE2B 1862b4f2c6e2a2bbe8e30
 DIST mysql-connector-c++-8.0.22-src.tar.gz 3795112 BLAKE2B c5d6f0ebeb4649857f3217a35f3ae885d62be63af4da09815e7eb156538ece4f805578db24bfff3dd44a0e320c025a9936d7edacba69a2786d84dd932c5abb8a SHA512 1975b43fa3f3806cccc685a695f84783164c5b17da10ac14a6013d27c837cc9c63fff01b1ed4b31f22dae60afa68d34ec56ca9c45ca3dac23635e8f0fa845aa4
 DIST mysql-connector-c++-8.0.23-src.tar.gz 3798295 BLAKE2B 923eebbd7f9cde0252c84de4c70863b40c0dd93ad98a93e2ec14c935b2f3f0b0f251828a8bbbd0f23a5ec03491db06020294e19455901d15181c84fec9fb3d7f SHA512 f8eb8842e199d7373f4b55644720ac63b93eb33be19294c433f57aaf556ce1b5752223154194469fa28af52adebe930f0a7b4e8f62df92cc810b545aa7bab928
 DIST mysql-connector-c++-8.0.24-src.tar.gz 3797356 BLAKE2B e509e04f6c93893948c573401188567bcbda91db0e608d53b1795593abf043117e1a525d3abe5c8396068a2ef750582cde15b64412e556e89762d08032abb602 SHA512 5507bc562e8263ee17efb9d4e2f52e471da75e73a1fc4dd1bc0a2ac1c2a593be889c4b042037cf6d3cbff854ae5cc865a8800251da475aed0f31710229af26f1
+DIST mysql-connector-c++-8.0.25-src.tar.gz 3800065 BLAKE2B 67546b2d7d9de25ccb440c22bd58ee83e6fae78710e6dfa802cb0446bf5be433c56458424f0ee81c9a899bbfd5f464712d2d0b43dceb4205b492c7b1a79f7858 SHA512 44dd7f4296d666801be55642e53cb5181d9b5c3b080306975a48eb6280e555d9b924b42b14b44dffee4c54fab3f662a7b6bb6584d9a1ed710f0026788611c525
 EBUILD mysql-connector-c++-1.1.12-r1.ebuild 1576 BLAKE2B e1835aadf499196ba42dcff6a1671bc32a4224133d68630bea249fb22ef35db6275f448bb1c891e0dcd9934fd66b3a7ebbe9935573f7f85a1d00e2613bab98fb SHA512 983abc70a156b0b0c39bd693c6ac62a149897f3b5bfddd54bc52463a5fa84397692134a16045d640db3d4797d3264803c0563a282495c21f54d4b48390223d39
 EBUILD mysql-connector-c++-8.0.19.ebuild 953 BLAKE2B b5a6d20cf1e7ac2bed882ca26d0ab5c3f83c12c506f61cac9554e0add2b83cae697994f23d289169441bdbecee862da0f4530f40e704f9ff45cda1f84e0fcd9c SHA512 076a5385ed228b5b559f2fe4a4d94498c6ded0389a302d049d6732ccd7b4a78b3e46a7ddfe9689aa624eb09560b8e4ff96414af752d14405c5fb0993e4440da1
 EBUILD mysql-connector-c++-8.0.20.ebuild 957 BLAKE2B cf3c430cbd0454d785eccc3c573d739ed9bd3ed0a6e3047d362ddd738e8abb13f4dcdf9e150ed6130c96a367e34ed260bad22b4b3a301441b69f0ac9c6254e63 SHA512 19bff24bc2d0f5336f705f651f7d9ca834491858d7bee94f7cdd5cde0da12ba1025647d3070f6da55b8442094370a13f1db5b3adb1c92a2a0925c7a931e1a9d8
 EBUILD mysql-connector-c++-8.0.21.ebuild 941 BLAKE2B 47888d50b869e6f62452ca2146ad24ced6fbcda19ef3b6ee2b318e48c88bcb0aa5f1d996ad51ae563360b654ac884f794ea9ab75d83c35dce27c6154dbb2b4d0 SHA512 e8c4cf0a041e985c62d059c7b807e83f4800b57e6b15f650f844971f2f0ffb6bab04d2c3872079d61e86bbb8675c1b6209f09ecab9ce0b229676958ced9a666b
 EBUILD mysql-connector-c++-8.0.22.ebuild 942 BLAKE2B 479d3ce48c9bdecb155bb28c2b054124e716d9a8c4a90e496f4166e31fa7dfa072a0dd4a29cc4a2c67c1e82c9fa6afca900db82ecbcae12378fd73c8ab161e9e SHA512 4b1924e9e2bfcd08db957785c534cb7acfe440cc33c82ea845b74e4d848acc80b1489af5a8358e5102c8621b0169ed79cf9455389ec7133025b69bbf0532ae71
 EBUILD mysql-connector-c++-8.0.23.ebuild 943 BLAKE2B 91199b0deb991b1275377ee17c7ba55241265701c260443c845c6c47432c7cf34ba55b3227b65e234550dac37e08aa359fd5d2cd043951a804b8fdb2a9b4b9a6 SHA512 3fb54ed0135bf6727e5bb7f161947de858abce3589f3ca2c80fa402aed790b4e91e28af248a4e6a33cf78b7da684edc2ff1db6554b5c5ba7027eddeb009f87e8
-EBUILD mysql-connector-c++-8.0.24.ebuild 998 BLAKE2B d5d629e35f034161d962c4112305c3468768d360c89383d306525066e9e6b66842ddb491c7b745c843755ce45b3178e8e74facf5963e16e3a77b22f2cb59fe99 SHA512 1967cd36dba0054324623906a1d7653b2a0d216c669f5812e81e7c3425924f95044967b863f1481f76bb28e217cf83727955388a23c4c8c4e05c8d02d028662d
+EBUILD mysql-connector-c++-8.0.24.ebuild 997 BLAKE2B 184b385509ec362bc962357f9c54dc554d6c1d66500154b6c8243ce2b8d2a01bfeb68d0e1c01c0e8dd98f16ef718b587b407e44a68010ae7bcb6f7583b32285d SHA512 df28ab886f014f30a44898b72f8a12e41bae8bc7109952712d7b44fd451de4b32babc0c5aaaf8142d7f90aa8b07a4f80ffe3d0cf34694be003c6234705acf6cc
+EBUILD mysql-connector-c++-8.0.25.ebuild 1065 BLAKE2B 3ce7ce4ffa616f38f6617e5de99e042281243a938c2a1b21697d386b48adf5a45cb27ee0584d43b2ab781390e614091666b1eeec759f12e22e3214cc9d77736f SHA512 3f2ac9a1dcd5837e95064e4673d6048a09f090a4a04c6eb3b2a8b59d4187f06ed11898f3d3fb9bc4e3946d5cbd78502d859c490d9c2fe4570edc35ae43b470e9
 MISC metadata.xml 378 BLAKE2B 43fdbbc8d3b6ef99e51da96ddfefbdeaa70ef5fcb2fc6067305f75f75b7ee2fd21b79ca76704d8752bf59ae057b28efb187b063770964246f93fea629b58b467 SHA512 c6e545fb60d306792421ea26a937aaa6aea53d2a4100c9cafe78cf695c9dd0620cf3e770d43ff42749ae42bbe3a35212407ea84edee9af2dcb0255c2b763ddfc
diff --git a/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.25-fix-mysqlclient-static-binding.patch b/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.25-fix-mysqlclient-static-binding.patch
new file mode 100644
index 000000000000..f211f113f04a
--- /dev/null
+++ b/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.25-fix-mysqlclient-static-binding.patch
@@ -0,0 +1,274 @@
+From 774d7bd983a2e12e78a0231c7936a9481bb3df1d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Lu=C3=ADs=20Silva?= <luis.m.silva@oracle.com>
+Date: Thu, 13 May 2021 23:14:57 +0100
+Subject: [PATCH] Bug #32882344: FIX MYSQLCLIENT_STATIC_BINDING=0 BUILD
+
+---
+ driver/nativeapi/libmysql_dynamic_proxy.cpp |  13 ++
+ driver/nativeapi/libmysql_dynamic_proxy.h   | 132 ++++++++++----------
+ driver/nativeapi/mysql_client_api.h         |   2 +
+ 3 files changed, 83 insertions(+), 64 deletions(-)
+
+diff --git a/driver/nativeapi/libmysql_dynamic_proxy.cpp b/driver/nativeapi/libmysql_dynamic_proxy.cpp
+index 4c70074e..9bd4bd99 100644
+--- a/jdbc/driver/nativeapi/libmysql_dynamic_proxy.cpp
++++ b/jdbc/driver/nativeapi/libmysql_dynamic_proxy.cpp
+@@ -512,6 +512,19 @@ LibmysqlDynamicProxy::real_connect_dns_srv(MYSQL * mysql,
+ /* }}} */
+ 
+ 
++/* {{{ LibmysqlDynamicProxy::bind_param() */
++bool
++LibmysqlDynamicProxy::bind_param(MYSQL *mysql, unsigned n_params,
++                                 MYSQL_BIND *binds, const char **names)
++{
++  ptr2mysql_bind_param ptr2_bind_param=
++    symbol_safe_cast<ptr2mysql_bind_param>(GetProcAddr("mysql_bind_param"));
++
++  return (*ptr2_bind_param)(mysql, n_params, binds, names);
++}
++/* }}} */
++
++
+ /* {{{ LibmysqlDynamicProxy::real_escape_string() */
+ unsigned long
+ LibmysqlDynamicProxy::real_escape_string(MYSQL * mysql, char * to, const char * from, unsigned long length)
+diff --git a/driver/nativeapi/libmysql_dynamic_proxy.h b/driver/nativeapi/libmysql_dynamic_proxy.h
+index 93dc9700..e0f00c95 100644
+--- a/jdbc/driver/nativeapi/libmysql_dynamic_proxy.h
++++ b/jdbc/driver/nativeapi/libmysql_dynamic_proxy.h
+@@ -65,67 +65,67 @@ public:
+ 
+   // MySQL C-API calls wrappers
+ 
+-  my_ulonglong affected_rows(MYSQL *);
++  my_ulonglong affected_rows(MYSQL *) override;
+ 
+-  my_bool autocommit(MYSQL * , my_bool);
++  my_bool autocommit(MYSQL * , my_bool) override;
+ 
+-  void close (MYSQL *mysql);
++  void close (MYSQL *mysql) override;
+ 
+-  my_bool commit(MYSQL *mysql);
++  my_bool commit(MYSQL *mysql) override;
+ 
+-  void data_seek(MYSQL_RES *, my_ulonglong);
++  void data_seek(MYSQL_RES *, my_ulonglong) override;
+ 
+-  void debug(const char *);
++  void debug(const char *) override;
+ 
+-  unsigned int mysql_errno(MYSQL *);
++  unsigned int mysql_errno(MYSQL *) override;
+ 
+-  const char *  error(MYSQL *);
++  const char *  error(MYSQL *) override;
+ 
+-  MYSQL_FIELD * fetch_field(MYSQL_RES *);
++  MYSQL_FIELD * fetch_field(MYSQL_RES *) override;
+ 
+-  MYSQL_FIELD * fetch_field_direct(MYSQL_RES *, unsigned int);
++  MYSQL_FIELD * fetch_field_direct(MYSQL_RES *, unsigned int) override;
+ 
+-  unsigned long * fetch_lengths(MYSQL_RES *);
++  unsigned long * fetch_lengths(MYSQL_RES *) override;
+ 
+-  MYSQL_ROW fetch_row(MYSQL_RES *);
++  MYSQL_ROW fetch_row(MYSQL_RES *) override;
+ 
+-  unsigned int field_count(MYSQL *);
++  unsigned int field_count(MYSQL *) override;
+ 
+-  void free_result(MYSQL_RES *);
++  void free_result(MYSQL_RES *) override;
+ 
+-  unsigned long get_client_version();
++  unsigned long get_client_version() override;
+ 
+-  const char *  get_server_info(MYSQL *);
++  const char *  get_server_info(MYSQL *) override;
+ 
+-  unsigned long get_server_version(MYSQL *);
++  unsigned long get_server_version(MYSQL *) override;
+ 
+-  void get_character_set_info(MYSQL *, void *);
++  void get_character_set_info(MYSQL *, void *) override;
+ 
+-  const char * info(MYSQL *);
++  const char * info(MYSQL *) override;
+ 
+-  MYSQL * init(MYSQL *mysql);
++  MYSQL * init(MYSQL *mysql) override;
+ 
+-  int library_init(int, char **, char **);
++  int library_init(int, char **, char **) override;
+ 
+-  void library_end();
++  void library_end() override;
+ 
+-  my_bool more_results(MYSQL *);
++  my_bool more_results(MYSQL *) override;
+ 
+-  int next_result(MYSQL *);
++  int next_result(MYSQL *) override;
+ 
+-  unsigned int num_fields(MYSQL_RES *);
++  unsigned int num_fields(MYSQL_RES *) override;
+ 
+-  my_ulonglong num_rows(MYSQL_RES *);
++  my_ulonglong num_rows(MYSQL_RES *) override;
+ 
+-  int options (MYSQL *, enum mysql_option, const void *);
++  int options (MYSQL *, enum mysql_option, const void *) override;
+ 
+-  int options (MYSQL *, enum mysql_option, const void *, const void *);
++  int options (MYSQL *, enum mysql_option, const void *, const void *) override;
+ 
+-  int get_option (MYSQL *, enum mysql_option, const void *);
++  int get_option (MYSQL *, enum mysql_option, const void *) override;
+ 
+-  int ping(MYSQL *);
++  int ping(MYSQL *) override;
+ 
+-  int query(MYSQL *, const char *);
++  int query(MYSQL *, const char *) override;
+ 
+   MYSQL * real_connect(MYSQL * mysql, const char *  host,
+               const char *  user,
+@@ -133,82 +133,86 @@ public:
+               const char *  db,
+               unsigned int  port,
+               const char *  unix_socket,
+-              unsigned long client_flag);
++              unsigned long client_flag) override;
+ 
+   MYSQL * real_connect_dns_srv(MYSQL * mysql,
+               const char *  host,
+               const char *  user,
+               const char *  passwd,
+               const char *  db,
+-              unsigned long client_flag);
++              unsigned long client_flag) override;
+ 
+-  unsigned long real_escape_string(MYSQL * mysql, char * to, const char * from, unsigned long length);
++  bool bind_param(MYSQL *mysql, unsigned n_params,
++                  MYSQL_BIND *binds, const char **names) override;
+ 
+-  int real_query(MYSQL *, const char *, unsigned long);
+ 
+-  my_bool rollback(MYSQL *);
++  unsigned long real_escape_string(MYSQL * mysql, char * to, const char * from, unsigned long length) override;
+ 
+-  const char * sqlstate(MYSQL *);
++  int real_query(MYSQL *, const char *, unsigned long) override;
++
++  my_bool rollback(MYSQL *) override;
++
++  const char * sqlstate(MYSQL *) override;
+ 
+   my_bool ssl_set(MYSQL * mysql,
+           const char * key,
+           const char * cert,
+           const char * ca,
+           const char * capath,
+-          const char * cipher);
++          const char * cipher) override;
+ 
+-  MYSQL_RES * store_result(MYSQL *);
++  MYSQL_RES * store_result(MYSQL *) override;
+ 
+-  MYSQL_RES * use_result(MYSQL *);
++  MYSQL_RES * use_result(MYSQL *) override;
+ 
+-  unsigned int warning_count(MYSQL *);
++  unsigned int warning_count(MYSQL *) override;
+ 
+   /* Prepared Statement stmt_* functions */
+-  my_ulonglong  stmt_affected_rows  (MYSQL_STMT *);
++  my_ulonglong  stmt_affected_rows  (MYSQL_STMT *) override;
+ 
+-  my_bool stmt_attr_set(MYSQL_STMT *, enum enum_stmt_attr_type, const void *);
++  my_bool stmt_attr_set(MYSQL_STMT *, enum enum_stmt_attr_type, const void *) override;
+ 
+-  my_bool stmt_bind_param(MYSQL_STMT *, MYSQL_BIND *);
++  my_bool stmt_bind_param(MYSQL_STMT *, MYSQL_BIND *) override;
+ 
+-  my_bool stmt_bind_result(MYSQL_STMT *, MYSQL_BIND *);
++  my_bool stmt_bind_result(MYSQL_STMT *, MYSQL_BIND *) override;
+ 
+-  my_bool stmt_close(MYSQL_STMT *);
++  my_bool stmt_close(MYSQL_STMT *) override;
+ 
+-  void stmt_data_seek(MYSQL_STMT *, my_ulonglong);
++  void stmt_data_seek(MYSQL_STMT *, my_ulonglong) override;
+ 
+-  unsigned int stmt_errno(MYSQL_STMT *);
++  unsigned int stmt_errno(MYSQL_STMT *) override;
+ 
+-  const char * stmt_error(MYSQL_STMT *);
++  const char * stmt_error(MYSQL_STMT *) override;
+ 
+-  int stmt_execute(MYSQL_STMT *);
++  int stmt_execute(MYSQL_STMT *) override;
+ 
+-  int stmt_fetch(MYSQL_STMT *);
++  int stmt_fetch(MYSQL_STMT *) override;
+ 
+-  unsigned int stmt_field_count(MYSQL_STMT *);
++  unsigned int stmt_field_count(MYSQL_STMT *) override;
+ 
+-  MYSQL_STMT * stmt_init(MYSQL *);
++  MYSQL_STMT * stmt_init(MYSQL *) override;
+ 
+-  my_ulonglong stmt_num_rows(MYSQL_STMT *);
++  my_ulonglong stmt_num_rows(MYSQL_STMT *) override;
+ 
+-  unsigned long stmt_param_count(MYSQL_STMT *);
++  unsigned long stmt_param_count(MYSQL_STMT *) override;
+ 
+-  int stmt_prepare(MYSQL_STMT *, const char *, unsigned long);
++  int stmt_prepare(MYSQL_STMT *, const char *, unsigned long) override;
+ 
+-  MYSQL_RES * stmt_result_metadata(MYSQL_STMT *);
++  MYSQL_RES * stmt_result_metadata(MYSQL_STMT *) override;
+ 
+-  my_bool stmt_send_long_data (MYSQL_STMT * , unsigned int, const char *, unsigned long);
++  my_bool stmt_send_long_data (MYSQL_STMT * , unsigned int, const char *, unsigned long) override;
+ 
+-  const char * stmt_sqlstate(MYSQL_STMT *);
++  const char * stmt_sqlstate(MYSQL_STMT *) override;
+ 
+-  int stmt_store_result(MYSQL_STMT *);
++  int stmt_store_result(MYSQL_STMT *) override;
+ 
+-  int stmt_next_result(MYSQL_STMT *);
++  int stmt_next_result(MYSQL_STMT *) override;
+ 
+-  bool stmt_free_result(MYSQL_STMT *);
++  bool stmt_free_result(MYSQL_STMT *) override;
+ 
+-  void thread_init();
++  void thread_init() override;
+ 
+-  void thread_end();
++  void thread_end() override;
+ };
+ 
+ } /* namespace NativeAPI */
+diff --git a/driver/nativeapi/mysql_client_api.h b/driver/nativeapi/mysql_client_api.h
+index b738cf9a..fa044c93 100644
+--- a/jdbc/driver/nativeapi/mysql_client_api.h
++++ b/jdbc/driver/nativeapi/mysql_client_api.h
+@@ -111,6 +111,8 @@ typedef MYSQL * (STDCALL *ptr2mysql_real_connect)(MYSQL *, const char *, const c
+ 
+ typedef MYSQL * (STDCALL *ptr2mysql_real_connect_dns_srv)(MYSQL *, const char *, const char *, const char * , const char *, unsigned long);
+ 
++typedef bool (STDCALL *ptr2mysql_bind_param)(MYSQL *mysql, unsigned n_params, MYSQL_BIND *binds, const char **names);
++
+ typedef unsigned long (STDCALL *ptr2mysql_real_escape_string)(MYSQL * mysql, char *, const char *, unsigned long);
+ 
+ typedef int (STDCALL *ptr2mysql_real_query)(MYSQL *, const char *, unsigned long);
+-- 
+2.30.2
+
diff --git a/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.24.ebuild b/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.24.ebuild
index 04d6b4c67116..9aae59fbcac4 100644
--- a/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.24.ebuild
+++ b/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.24.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://dev.mysql.com/get/Downloads/${URI_DIR}/${P}-src.tar.gz"
 
 LICENSE="Artistic GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 ~sparc x86"
 IUSE="+legacy"
 
 RDEPEND="
diff --git a/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.25.ebuild b/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.25.ebuild
new file mode 100644
index 000000000000..1d5c5bd6f516
--- /dev/null
+++ b/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.25.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+CMAKE_MAKEFILE_GENERATOR=emake
+inherit cmake
+
+DESCRIPTION="MySQL database connector for C++ (mimics JDBC 4.0 API)"
+HOMEPAGE="https://dev.mysql.com/downloads/connector/cpp/"
+URI_DIR="Connector-C++"
+SRC_URI="https://dev.mysql.com/get/Downloads/${URI_DIR}/${P}-src.tar.gz"
+
+LICENSE="Artistic GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+legacy"
+
+RDEPEND="
+	dev-libs/protobuf:=
+	legacy? (
+		dev-libs/boost:=
+		>=dev-db/mysql-connector-c-6.1.8:=
+	)
+	dev-libs/openssl:0=
+	"
+DEPEND="${RDEPEND}"
+S="${WORKDIR}/${P}-src"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-8.0.22-fix-build.patch
+	"${FILESDIR}"/${PN}-8.0.24-gcc11-numeric_limits.patch
+	"${FILESDIR}"/${PN}-8.0.25-fix-mysqlclient-static-binding.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_SSL=system
+		-DWITH_JDBC=$(usex legacy ON OFF)
+		$(usex legacy '-DMYSQLCLIENT_STATIC_BINDING=0' '')
+		$(usex legacy '-DMYSQLCLIENT_STATIC_LINKING=0' '')
+	)
+
+	cmake_src_configure
+}