gentoo resync : 04.05.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-05-04 22:28:33 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-05-04 22:28:33 +0100
commit: a978c074e4272bb901fbe4a10de0a7b2af574f17 (patch)
tree: 8c764c1cc0576389ce22abd317bceba71ea5732d /dev-db
parent: 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (diff)
105 files changed, 441 insertions, 1413 deletions
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 93d4274cfb4e..9c0a07ea944a 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/cpp-driver/Manifest b/dev-db/cpp-driver/Manifest
index 0fb66ad7ce3a..5bee6c338839 100644
--- a/dev-db/cpp-driver/Manifest
+++ b/dev-db/cpp-driver/Manifest
@@ -1,5 +1,5 @@
 DIST cpp-driver-2.11.0.tar.gz 9392387 BLAKE2B 37d6063b33cd9821faa15d0eb8cb7e87d3a57a58384cf60dd623f94c9246250ba00c3303d9e0ca586f5455d449c9749058e9ed5dcb06d736591329b252bc1ffc SHA512 c8ccb3b10895c3e8f3bcf9543dff233a45c468b1b5e9c9c848d651b13c1b3f76cd0edd20fbff8e6e093767e1a2c8d360447496f1ef4370c1776d3fad28a9b3a3
 DIST cpp-driver-2.9.0.tar.gz 9178108 BLAKE2B 22c51d050dc65303dd6b584f0a89e510905bf084ff5e45a543666675a4e0b904c11895c9a7dd3d0df2fb12c1e2e58e8530c4113706c8b2548adb0b6f9431419c SHA512 45c6d58b1d287d142c9d7d6b1e28114683648a3634f44b185208fa44da64d4c8a9d485b3956a0cf7429e96f74faa588de832de30265dfa17782ca90e8163a0c1
-EBUILD cpp-driver-2.11.0.ebuild 613 BLAKE2B ef569879f623a411b2e92060b2b6b3854e6a1ab3e58cc89b00f980bc3d15225d0a21582d731bdf53498eb7adc604a0d9db95251f3d54ee2f08fa27088ba2ce2c SHA512 63d19c7b45eebb4099d206cb5ada28fa9adcc52297ad7b07016cc929022a72edd4e8ad50a88dd02b3d8fcca84901d716386e64f2f6aabbbaa5dd714d55f8a761
-EBUILD cpp-driver-2.9.0.ebuild 625 BLAKE2B ab741c2ba9d2039bbc1743d6315c8374e148b0e3fc37ef62b50514eb628ec5d53915363347b85e76a5cd0e50a491f770692c7445ef743a65aaced9087ff33096 SHA512 46374aa29a2a0d2bd213cec83ca1a4ebd24704d5ecebaff334d1c81d501937aab164640f8ce5dbb17c26c3d367f6eedaf50e0a5dbec9bac98bac28e177da85c5
+EBUILD cpp-driver-2.11.0.ebuild 552 BLAKE2B c7576df4a2f79e8052c6abd3d1236eaa731c9e6e5f5b68cec1d6533e93584e4addf5b8639e4b03f7de2da3adfe64fe27196fe51d4ca1844d4af293a67d4b9bac SHA512 60f4d050e118ad6aaf8d0dd579a9ad7b46cf446e246cc236969c763c1f544b8d89983530692e14bd82670e2c369ebe68e204dbfbbbee98521e13e907695b74d5
+EBUILD cpp-driver-2.9.0.ebuild 564 BLAKE2B 1971009533686c792e9ba33fe04df488f7e1b7924aefbf08cc65aba261a23d857a4babe92726a10e04d472beb5286c7dec8bf9297e11dbb7ffd9317742a330ce SHA512 e9d2c5e9368e30797157b3555d67a19d5214243e66d5803f73d77492474d5f386798cf999e78232440850b1a94da909e1a28916f1a9a86a4a140ec9ae55e9a5e
 MISC metadata.xml 706 BLAKE2B 8acb71ef303196e20bcd2cd4f7ef8e3d1d0a865dd06cf1a1e393ecce618a456c4b4e338c04a5e7d03a98fc3b885cf6b293337a8910d121f7e54bed25508a4c41 SHA512 6088ea69f298ba254779116d0e0a12946554da18a9e6b2e8b638de0f579a830fdbd17d3ac4d9f2c4f69bed02875997686d1b1fd4d01707235f6355c5cfeb7b10
diff --git a/dev-db/cpp-driver/cpp-driver-2.11.0.ebuild b/dev-db/cpp-driver/cpp-driver-2.11.0.ebuild
index 60a578597de1..d9088c8dee8d 100644
--- a/dev-db/cpp-driver/cpp-driver-2.11.0.ebuild
+++ b/dev-db/cpp-driver/cpp-driver-2.11.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,13 +12,12 @@ SRC_URI="https://github.com/datastax/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="libressl ssl"
+IUSE="ssl"
 
 RDEPEND="
 	dev-libs/libuv:=
 	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
+		dev-libs/openssl:0=
 	)"
 DEPEND="${RDEPEND}"
 
diff --git a/dev-db/cpp-driver/cpp-driver-2.9.0.ebuild b/dev-db/cpp-driver/cpp-driver-2.9.0.ebuild
index 961a2bbec060..69593833d3b5 100644
--- a/dev-db/cpp-driver/cpp-driver-2.9.0.ebuild
+++ b/dev-db/cpp-driver/cpp-driver-2.9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,13 +12,12 @@ SRC_URI="https://github.com/datastax/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="libressl ssl"
+IUSE="ssl"
 
 RDEPEND="
 	dev-libs/libuv:=
 	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
+		dev-libs/openssl:0=
 	)"
 DEPEND="${RDEPEND}"
 
diff --git a/dev-db/freetds/Manifest b/dev-db/freetds/Manifest
index 8d97022cefc3..80c957242d33 100644
--- a/dev-db/freetds/Manifest
+++ b/dev-db/freetds/Manifest
@@ -1,3 +1,3 @@
 DIST freetds-dev.1.2.18.tar.gz 3406990 BLAKE2B f0134ee0a322cb9e7a7fefbf9e85c60b826318b546febde78e53d5ec22dc2c8e269b7e830da6d84267d16a2dc2cf367a54354765017a40e07af2c3c6be54676e SHA512 315f40ba0d97281f852ec99fac457ec4b2a30879a2384bfa2d7c680aad6c056b6ae23fc192c18db4fba75caff552ef86de7bbfc5d7b608ea5a12531bf9eadc4c
-EBUILD freetds-1.2.18.ebuild 1634 BLAKE2B 13b90106cbe5666c3202e6fa59897accd4077adb8868288cbc389e593cfceeddda9500decf7e7a955ed2d77c852a9a89d0018dec45bafe8ef2ccf4a9055e88bc SHA512 84f5965abfc6b4ae12d496e51ed8a6569936f054d3ba7040929f5e4eaf4e2c11a211179afba1c0a54763a4c81ccf7b7bb9bdfb1a3f6c41e24a6f39378bf58ef7
+EBUILD freetds-1.2.18.ebuild 1625 BLAKE2B 0f2e83255054643737d7021e29308dece9ff46a4547ffbd4fcdc26f72ab2004e27933a36fd6885a195f6111dcd27aa1a8fba6ce1f8452938ee736d0c3bd4f3bf SHA512 abc829cd14841936fe471efb82367b1047e8fd418f0ea5e83b3d41befef7c6f1a2ef37464f8576dafd175f1a3815dd4fc463734ef0c9a938de844a8b3d4a3c4e
 MISC metadata.xml 251 BLAKE2B 632781bc9fafff55239abb98f5b98cd2dfb01f5f8949dec160ef1007a7cfd513ff9f630157acb90efa4d03183cf9fecd5965d79a46ceea694961ff120dc3486c SHA512 8b481bb37df703c67035739c99511a846fa86d497f4d2bb7a8b86a9409cabcfce2b4c0011828c9e42077234ac1ab4af96c2f0c01dd6e7e65ac93b6f75c0779a1
diff --git a/dev-db/freetds/freetds-1.2.18.ebuild b/dev-db/freetds/freetds-1.2.18.ebuild
index 1efdc86b1872..b865247ced52 100644
--- a/dev-db/freetds/freetds-1.2.18.ebuild
+++ b/dev-db/freetds/freetds-1.2.18.ebuild
@@ -15,7 +15,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos"
 
-IUSE="debug gnutls iconv kerberos libressl mssql iodbc odbc ssl static-libs"
+IUSE="debug gnutls iconv kerberos mssql iodbc odbc ssl static-libs"
 # iODBC and unixODBC are mutually-exclusive choices for
 # the ODBC driver manager. Future versions of FreeTDS
 # will throw an error if you specify both.
diff --git a/dev-db/mariadb-connector-c/Manifest b/dev-db/mariadb-connector-c/Manifest
index 67c3d5d1af6c..d090987ecf95 100644
--- a/dev-db/mariadb-connector-c/Manifest
+++ b/dev-db/mariadb-connector-c/Manifest
@@ -3,7 +3,7 @@ AUX mariadb-connector-c-3.1.11-fix-flow-control-statement.patch 401 BLAKE2B b5b2
 AUX mariadb-connector-c-3.1.3-fix-pkconfig-file.patch 616 BLAKE2B 650c5a794da6d3d0095a823917704d52a5f16c349ce7017b93b1bebfec01287929470a89a2e4aec2f9f7cd5135368e43f2a2e89257c0d7042b878e1806ede8aa SHA512 fe621abedaf81d1fa367c52f69ccce1765757db8d9f412aa40b440d7e51d4de3785a90150e76893f7066b1ba656eb1bad020465e58adae13f08245b839bde4de
 DIST mariadb-connector-c-3.1.11-src.tar.gz 752342 BLAKE2B 5bee575bffdceb1eff60b7ba3fa334882cf2b2a12446cd6c52663cc5ce2e179bcd19c8452e9bdae3877ac7e9e08f4f6a974d136170c399439c42e1759d226c84 SHA512 2da3a5e438037dde2b9fafb07c084c742983ff4ce18f06cf7a34836aace5317cdb2ddb1bca63143367f5ae827c988d99ee20e8f598fabdb06190d9e2191eb3f4
 DIST mariadb-connector-c-3.1.12-src.tar.gz 966702 BLAKE2B 8187199f43ccb6f92ea9df61a1f62e48dbef4744cda9a5e865f71038e47a65dea3ed094dd76d81d0d8d357a8d611a9770590a3504c297ea30f59f285ab511d17 SHA512 a46e8ec976c28e227a72f09c15c92126d178b422a92a4c90fd52c8053604c3309aeb3bd098dc63fbd0d87059d5360c8b63d76e61a1152e7a3e7145e13681453d
-EBUILD mariadb-connector-c-3.1.11.ebuild 2424 BLAKE2B 2ae4017bac08e0edb7055067dc8fa6c29c0b5952e1f31bc3804805e7546967ff31ab56fb0fbe7c329f22e9b00038d4643742ad1d56194c7661e93f1697c5d5a7 SHA512 39e86243d3d0b7ffb09c59b91232832e1e85f364cf0404edfa2da9fff118977cf6cbd4dedde671e572de24dd725e4152adafa2ae24161fd80e9adbd0b49ccfab
-EBUILD mariadb-connector-c-3.1.12.ebuild 2230 BLAKE2B 22095eeee4f14aebcb685f8de10da17b2c701ca08b454d113b3241c12c971a899e9524345ad08746025f5d8261350ce53c00bf6eaea04130124779bc563f6b26 SHA512 d4774cfc234ec67c5df8472427462a80fe16528a6c6f19c1f13f1a73d15bca86d9481a7f1978cb13b111ddab75305ace6fbe79c1def910df62c9eaacc18e1168
-EBUILD mariadb-connector-c-9999.ebuild 2236 BLAKE2B 14a278c900328c79745b077916976220dbbfa47535616b77056240e409f6341eabe72ec00247328a8a05a385865f984cb4c851d9de8c04f4a74cf5ae28a7b14a SHA512 ff3afb663809098ff3ffe4e0eb8ab4b289664c6cd34fbbd10625203823fe11aa1ee91e011410bc49e98d637a47d0b8e6b3edc6e85a03b1915681dc6960d14c64
+EBUILD mariadb-connector-c-3.1.11.ebuild 2342 BLAKE2B f05cf03899e4bef23a6c4180b67cf0b13e265a34724af4dcc4d62fad1aeea2ad792f10c3d87f0e82d7a1c70988fc0ab4ec04387cf2a09bfaadef90a804209efb SHA512 03cac48f19450158b1a3a077f1b1eb07019cc54fa824b7f79d1d271627cdd921f228727e35af9d57872f6be6c36a34d875826473e9948681d9317a2505257000
+EBUILD mariadb-connector-c-3.1.12.ebuild 2148 BLAKE2B a6328dd0a6416691513398220dda45e3fa4a3f857c5f908f11b06095252e02e15102708181af2aef2e809045ec4fa7617e379517499b27ee3dfb98aaf0cfd98b SHA512 9762c0c60084675e61e5843c7b113ba3809d8f60c082ebc3e0c4a167683cc71cb321de8633fcbe52faf0e4ef9c05e50efb7c8ee3ca6b9b0544e06fa5c89ca890
+EBUILD mariadb-connector-c-9999.ebuild 2154 BLAKE2B af5f36e6b872a597fad0d8b2256a0307df3da04842bf6d535db8bae486d2dcbac666b911c655daaf5dd6b5ff874f37b13353b5adab0bdeedfa4c27a9f7cd11b7 SHA512 00cd17a20ed49b4df3a10a86f31d2551da967567f11bae6ded9b9be8a6b8cc85eff1dcda34aa320e51c6c7d23150e1975c1cf34bbc7900259492f7ff927c72ad
 MISC metadata.xml 243 BLAKE2B f247f748a23e4cda2f518ad7e4e53b9027ff08ec62289010e6dfc8cd2ad49412430c4095e80f2156c8e6f1226bcda0163b4faae83759550f79e9998928398713 SHA512 7c227a1fadd8d61aae9baabeb5d964c93fe0c4d82fb838c83fe0360cf38b24bebf51037726f13188ecd8f52c335368a693b81e74d79ba949576a6dbcb54887a9
diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.11.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.11.ebuild
index c6da89cae390..26a82a1b2447 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.11.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.11.ebuild
@@ -28,7 +28,7 @@ HOMEPAGE="https://mariadb.org/"
 LICENSE="LGPL-2.1"
 
 SLOT="0/3"
-IUSE="+curl gnutls kerberos libressl +ssl static-libs test"
+IUSE="+curl gnutls kerberos +ssl static-libs test"
 
 RESTRICT="!test? ( test )"
 
@@ -40,8 +40,7 @@ DEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}]
 	ssl? (
 		gnutls? ( >=net-libs/gnutls-3.3.24:0=[${MULTILIB_USEDEP}] )
 		!gnutls? (
-			libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
-			!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
+			dev-libs/openssl:0=[${MULTILIB_USEDEP}]
 		)
 	)
 	"
diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.12.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.12.ebuild
index e4d90aeaa555..6798a698ba71 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.12.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.12.ebuild
@@ -28,7 +28,7 @@ HOMEPAGE="https://mariadb.org/"
 LICENSE="LGPL-2.1"
 
 SLOT="0/3"
-IUSE="+curl gnutls kerberos libressl +ssl static-libs test"
+IUSE="+curl gnutls kerberos +ssl static-libs test"
 
 RESTRICT="!test? ( test )"
 
@@ -40,8 +40,7 @@ DEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}]
 	ssl? (
 		gnutls? ( >=net-libs/gnutls-3.3.24:0=[${MULTILIB_USEDEP}] )
 		!gnutls? (
-			libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
-			!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
+			dev-libs/openssl:0=[${MULTILIB_USEDEP}]
 		)
 	)
 	"
diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild
index 7a4723936d30..c5a4f38b4f7e 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild
@@ -28,7 +28,7 @@ HOMEPAGE="https://mariadb.org/"
 LICENSE="LGPL-2.1"
 
 SLOT="0/3"
-IUSE="+curl gnutls kerberos libressl +ssl static-libs test"
+IUSE="+curl gnutls kerberos +ssl static-libs test"
 
 RESTRICT="!test? ( test )"
 
@@ -40,8 +40,7 @@ DEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}]
 	ssl? (
 		gnutls? ( >=net-libs/gnutls-3.3.24:0=[${MULTILIB_USEDEP}] )
 		!gnutls? (
-			libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
-			!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
+			dev-libs/openssl:0=[${MULTILIB_USEDEP}]
 		)
 	)
 	"
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index d082e7907878..6998994275a5 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -43,24 +43,24 @@ DIST mariadb-10.5.8.tar.gz 88206163 BLAKE2B eaaddaf240102428a23602655920bdf543d2
 DIST mariadb-10.5.9-patches-05.tar.xz 17120 BLAKE2B a6ea7c3ba3718e9667510db9fdfcedb3fa4a6a2da89f1c49f9a419c84191af9bf6148815afa836e31f47d752cafdaefdd98b530c29c849fa86af4ff0be9732ea SHA512 e39393505d5c5d45b3352d15b9e10a02a1057d5eb381335953c5dfca312791976be9e0e3b2adb6536a2f5cc6f00f01b9379a17806a029a9b73eb674a2a1fb583
 DIST mariadb-10.5.9.tar.gz 88639930 BLAKE2B 512c3fb0541bbeb19878979104f7858ce18ce67187507c8395798cfc9ffe92bd83e39bd47251419363600348a85716406286bd27b3c28662ea63e8ec761a4e01 SHA512 d23d5bf8510b3c36a6521fb3244cf323ef0f5d100ba379ed7b5bbc2acae1765a5b46c17bd929f0b27b28923eb1b5975314abdf7ffb96905cf7a93a5c8837294e
 DIST mysql-extras-20190305-2052Z.tar.bz2 331304 BLAKE2B 1d2c35a961159fa5ce9ee6699fce943f5a5b5cf60b11c9bb4bcccee4943f4508a9eb6d01050c642353ac592ce1a6b421abf2a1bebc706c44c4c8a36aa698ec43 SHA512 ae63403320e010acbb92f8aec6da8ed4f267cef0bad37147d594076fd94571de7f98bfc2afbe94af5d716f58d57696fd958b1e13e20e87052f252ed4a188cd3c
-EBUILD mariadb-10.2.22-r2.ebuild 32479 BLAKE2B cdb02077582e1f1e0f6c1739b43cfc28e8d03eb96c2c63d992fda2dd1a7da26baaaa8847cec4c6acd57ab0c54359d979015fec16a5faed2b3e4dc7c311eead68 SHA512 94d355a6789b3b44ef71137369d5e7dc0efa02efbfb656c989da0397332a69260031b53d17a93ccee97b3ce07201dcc7d009e500e04ff916619647e2ea14e964
-EBUILD mariadb-10.2.32-r3.ebuild 33782 BLAKE2B 675dcec5874d2f025b4d9c38e36b9c9f9315b6e7c794d981c9fd2af43a7f5034bd6f7b483f4036f2e44c33598a1420c3890080a5f20db2527f6de34384c80145 SHA512 b37cbd80f63ff62a616ff39d5a9cf39cd5ec072114bac68f98da9ac31f8d5eca12a56f870e49dac7578eb2fb77eab5b54c7c7102d42fd76e0cf53502d51c476c
-EBUILD mariadb-10.2.34.ebuild 33912 BLAKE2B 0cf9492ea67e37883f4cbdd6060f0e44c5e045934500cd7482e8bd22b929879ab2b9e607ed724dbf28fc5fa61e82374ffe41adebfac1f54dba7266f0f2d9cfec SHA512 cdcdde796878493c0cc314688e5d24c44786e4a39654fae6ad0066385fd15643cb076cf6459844d92a3037b3fe1c2baa9e384e8a5525cf16575347027bc613a6
-EBUILD mariadb-10.2.35.ebuild 33971 BLAKE2B 4c278c61d7497f3d8f9c69c90582411a2ec14f57d7865afc1932f2e07d897a2e9ee4388c53e16fffe4c001d09bfb12b16891f81b36c57556cea59f02b5159f06 SHA512 f42bdee8fe233b585f23a71b445b3ce2b4053e55833cd78957f77195b9fa407c575fcd0bcb035de9fd4018fbe7b6337a2a53c04099cb62b862cb8f5df6ec6add
-EBUILD mariadb-10.2.36.ebuild 33966 BLAKE2B e0bc3edc8eaf181d8e69e047353e46f9d1973d10108968c4b29f1e61d980a55492518f9fd27a93d8f9bdd63d2e64b3e828d19995ca5d322cfd19d5519a0bc5bd SHA512 d4b79a214f2823d5074288d359223468df2fa22caa69dc86d9f404267f21ff6b366dcaa4c23f35f7c5a76e381588c572cfcacfae16f8ce8c31940ded7e411afb
-EBUILD mariadb-10.2.37-r3.ebuild 41669 BLAKE2B f1696c334320731c4bd064f5cd8437a5f3571e50e7b9bbf0fff4bd6a900c0199ae178975f602f61cf13e9a273697ba6f138a606954108ca27a0b1b358d382de3 SHA512 533e279c550562dcac6d75866158b763fa704771baa992c928fb9dadaa7744cce4e4457ada36938fbec1574059bbcb212c8a220d1da25a226cf530f2d385a9d9
-EBUILD mariadb-10.3.23-r3.ebuild 33535 BLAKE2B 90d0236994e8a13ab0b38e5e6dc052967b1fcb5442babfea78e032b46ce9051c2a01cc9383caae286d24a1ca80a5d74367574125b4500116804a432ea56bdcfa SHA512 f061844f10c320275febd82136bef72b1deb495b03f1cf5faa0550dfd6f7d677c46e0c296d505efb678d1e829b5f628b98af0e4bea64383167f553bb9c40a327
-EBUILD mariadb-10.3.25.ebuild 33425 BLAKE2B c072e3713ca3dad00b1397d824fa8a04f68e38d875db46dd2527bddccc374dc8977e25e99d1ed7cd6504911a6e934b930667aa869ca394c7e01aa4b10b189c64 SHA512 673ed5a913c69bc86915c424bd221babc9639e17c704309e82feff8d0d509ce59b4345556bc5e8680662f8bd070d0cc84a7ad43d472ac680a19fe01683ce263f
-EBUILD mariadb-10.3.26.ebuild 33484 BLAKE2B 4b06603235ff2c01bae85db60240fe27e6c7ada074f0626033d6737e307674e99fb01ca2f49c32a4b370d364423f678f6a2c7af515f66bfb848d3d9c5e5e361d SHA512 64986ed9f33e393d75936f877c35a4e53d9e37718eb414a9cdd90322553f12e5ada3b1b0f99f49772728a601d81ac52cf628abc4d4b274b8fa636e5c365ad133
-EBUILD mariadb-10.3.27.ebuild 33479 BLAKE2B c3ad220e76779a7ea17fdadee68cc0d8880ada6ee0df78bab327dee5d6fa762552174c38c69f9a639c50901f3de67be320e7c3a62116afbd3d6bd79ac2572b5e SHA512 d94cf965c4a2af570f899beb4ac98d65292459f9f0ea4db26731d20ef5d78d897b1740d82c6ad61e93997f8a25e43f1d2fa6f1bedfe16c4614a4f01ce188e49e
-EBUILD mariadb-10.3.28-r3.ebuild 41201 BLAKE2B 111b4ffea7492981982b84657c6913c68b0cdea67a647ca9af13f03191edc92acb6cff7a813fb1c1ff7fb53d9cd7bf2d8c5b48cf3af45735ac87f45b22999f3f SHA512 a63df40b531acf9d1a11976d06e2bd5d30433fab2da699e1131b0fc4ef77f8ea54fa3351110465d5d3717bb306ef1563d35501c6ca8be320a30a36afb8a4e3fc
-EBUILD mariadb-10.4.13-r3.ebuild 34099 BLAKE2B e8e055d85f8bdb2d278d5ecdcd78c7ec27b0e7760a4ae395624283ce75000cc6db26e29a784334ccfbf20dea63509df778da7b7b0f53c74169307dfe816f3e56 SHA512 c6fa64eb68089f606b5b225b762bdebad5cc9650ad3ca94fd2c2d35e8945dc36d0e354a5fecbcb00f33699f6ff74048389f28b7f8f103836fb2b49428007d127
-EBUILD mariadb-10.4.15.ebuild 34130 BLAKE2B 23e17c379bcf4b8b388b8c0f44d332b9a8e4fc3dfe98f8f6c98d4135f509cf08f22022a140cbe47a3fe18b3ea772d8675c77ad5ed5cebe84b6c8bdfdabd081f8 SHA512 8b13080b4547f60bc9dfe092caf35d8ec44227919213edc2f80a4445446306f7e9ee7cbea7ebec054c697ceee2acb90e6af0a58bcc1b5279c679b8d74feaf3f4
-EBUILD mariadb-10.4.16.ebuild 34263 BLAKE2B ca00223bd452d01f101cf60c1f91ee6c65cffa7f6873590d6f0807a6fc7ae3712ab14634a4b4115c79e437add7d25855569e7d2a5ea45e30087e1a2b7816d769 SHA512 40140335a8ffce7389fbab8ce4acc610466feaf2798cff1798ba1bb6c5ec9ce5244f01e53a2ea717002abecf6a602bcc244369e12920eca1adb9fc78fbc63a20
-EBUILD mariadb-10.4.17.ebuild 34258 BLAKE2B 305bc236a9e044b34272681ebee9d2b4a199d905a05ff40812e3616908745c45820f4222240d3e07bddad8d8db5f0e2f20f082491ee7643865535854131c8628 SHA512 1aeabf3cf0f287a2780b5eabe7efc61c11374909d8797344cde0e0bd60b4027f2652c568f6e57099110ad2db3b91730edab90a12bd85c3a5c5ea6f30ab6736af
-EBUILD mariadb-10.4.18-r3.ebuild 41758 BLAKE2B c9dbc9ac6afbfa4b17ce25c12e59de1293e24528169a65042c40e14adc0e1be7baf930c11d37b724a67b4776e2f8cedd2bcf81610fbff838a1d82c933f1f2656 SHA512 830ec17a255ebdd062046166a654ddc9b3068243789b2257df18d5de59846bd5a1943ccc02a1845ea74139358c96fc565ee95e8bd5571d8f9fab0851b3a30ef5
-EBUILD mariadb-10.5.6.ebuild 33558 BLAKE2B 99623b62d5b0c6578f658bb7e1f5b713d59ff587eb95522d28834d1721538c38486f53c15335f42fc48c9814f965c9b028038cc796cc0893e3213b7f48fd11b4 SHA512 fb4013c674716962bb075c0c410b07e26d9d75baed841e237cf827a38994ce2c98b3fc07578071ead4c51cfe7b59564cc4e2a43a7d415983f56fa722d6311076
-EBUILD mariadb-10.5.7.ebuild 33691 BLAKE2B 84108be4efeecf9544c727420e0bc1cdff72edd2c19d332fd9d5a31b1962780d74c75a93c8d230554e03c6c1b2bfdc89e7ef8d0cd936c04e1e8a61bbe62fda68 SHA512 eb19dae5ec6b535030f20a3b9ba2bdfb5e7d855188cf4c39a1a2f16d432c710c1883deb1f1252d1b176ca577129bc8d31c1f9f2a2f0e2d020d07fa0b5e8f9ce0
-EBUILD mariadb-10.5.8.ebuild 33691 BLAKE2B c633321db0b12350ecac0efc53b9a06cf1d71ff43c3057e58afc299280d60d0118a5fd3cba9b6186ce5f753a36d6d11b27912cfdb4ac1891d35f79eef5e4c51d SHA512 b9bd51575a3703df33321c30e70143c94d8466e3f046fa0516e719df3cc7dccd1d60f0ce2c417ff0575de41afecab955d546b2b3fed1ae2cede2d8fc994448f8
-EBUILD mariadb-10.5.9-r5.ebuild 41256 BLAKE2B b568c948e7b600c374196586b84d0225c585a0bb9c9772f4865574c91f2ff818d0c449cba8bc1fce6ac4357457d13d1a1e9e87af3ac5c1f51c96fa8be447d6fb SHA512 58e0216208f64829dd66795939a4bdfbd502d4e678727ee51ded36af3b0486b3c6133441b35ef62ba4d4aec8cefffddbd926dcda6e66f3cd685185150ad41021
-MISC metadata.xml 2735 BLAKE2B 961d1d49f7a6f5b90c731ce710c27e11bd2a1d996de9ae0adbabecd5823053e815397b5930797b66d94e1e767fbcba83fbb25fd002a1b2d346235cb24b6a2c3a SHA512 85a7ca20443ed2630f7ff8da19d74d9f415cd9d8dde25300eb1d6ed44b4d0c73bc34a149bf0471748933aa0200e14ced48c009b99d71a737e38283ed754b75c9
+EBUILD mariadb-10.2.22-r2.ebuild 32315 BLAKE2B b9183e2e160163b3a3b186975f0e4585b982ce143710cd19c2f8f92cdcf8f9662ee030271a3edf825e7532fcb9e31ce1a286e90e66e94ee8eea815f7c39c041d SHA512 4bb7ef86f27b53323a72c017efcf15ca2d1a90a6fecd88b8234a85c6f095edeaf11744af95f336a5b37f620f7944256958f5b4543d4657439a827c5e3eb6bfd0
+EBUILD mariadb-10.2.32-r3.ebuild 33618 BLAKE2B c9f924641af200d6d8003a17a1957259f16afe200c5a9abb9e010eac1bfd8a841d961c768adc67efe85237cce4ecf9100baf5dc13b252f522df6cd52c670ca58 SHA512 9ef436d76eca6064224ef124a4c5d421d952ddc8e2caec6abbca9b02e601c17c3a54ce46ac1df3498dffdca2de7e7169c644659b3e173825fa7be976a5838d16
+EBUILD mariadb-10.2.34.ebuild 33748 BLAKE2B 4dee3db71121d7def075565402634c367f9f8dd6c89ec11a9b1ba627adc7a852d227e576681b99b413fe23de4e479c2c644b97d84f2b33c05ef67109c519387e SHA512 71e783e629845ee3438b144ab364d64a5f8a82e5b2b6df40371c1d2c07cec6e2e470476e5faf1b9e6529c39277b14da2572208499d2ce3026498f5c54a9724e0
+EBUILD mariadb-10.2.35.ebuild 33806 BLAKE2B 21ff73af7ab337ceeebec5a660fed44fbd124660e214a8f1accf7f8463ee1b1f0b175876cd6dbd3c42e34e0b06a4831344b87266606061c578144a10be5136e9 SHA512 9ca3d6e2a6651ff3b01ac7670d45dc0b56672c3ba63501dfd132defa39e0b1ec948c2dc4c04c872bce98b020411312fbe3303a91b6d862ebdf17c0f159ee8f5a
+EBUILD mariadb-10.2.36.ebuild 33802 BLAKE2B 951616432079ee5e54eaafc8ae1e2e893eeed6b78e0d82f0f600c00eefaa17af32d5280c89c28c377f9f96b930a3d2219062fd9d0214e1addaa612c1c4c0f5af SHA512 551aefbe395f7c35150b59abfd72643316f11fac00116c3119f0b2ffee63afa9d82b3d335455c3cbe402283f98c67966d2767a6d9759db262f8b461a6b956967
+EBUILD mariadb-10.2.37-r3.ebuild 41505 BLAKE2B c72e7fd67c44884cbbb19777e51822abafb598e61ed7f6934d45a8bf20858a6577317852dd642b7cf7caff69d42bfc0eb3dcc0d879652769c1e34d97894ffb2c SHA512 6703492272ef7da489164ff17f4ce1e3802032c16d51eade850ba4caa7222ff3fac55967d5174a7164cca2362c9187743c3e67f79282f601e0f6042bdb37008f
+EBUILD mariadb-10.3.23-r3.ebuild 33371 BLAKE2B 0bcf4c198170f65d1fbbf2fef3e37e8cc6a70645988bdaef58e1569b1d0da4ede4a1b5673b4c23624b6aa7231114703959ef57f1a8d652d828104f6122cf32a1 SHA512 203b646a7bbdac1aace671830b0c77b56dd5a507131914f7c52b4be3b9501e3fb0005aa8886b249b57e73c1a6e003342611968f599b4da7b4c4ccc29862ce92c
+EBUILD mariadb-10.3.25.ebuild 33261 BLAKE2B ca786256bc87dd9f4488c47cafa4ccb015203d8d52cd07a4f88ca3900231711d065d097ca4bba6d25eb49bb3bac2dd38283e8d18534b269a7370e8e401ad083b SHA512 d7f2a91c67d6a6ffe2f9a2f7b760c6ec91b6cb16d1b30de3b6c85cf4ff9d20064d07deff280150098797e61008a908094ff93d8e59f87319a666d0e2433af977
+EBUILD mariadb-10.3.26.ebuild 33320 BLAKE2B 7eca76a2c5b15dbe6074a387a747c97c8ed2eb98239cc74d5e9f629831839273fd4eaba1babb729640123cacab421eebc5634949a4b2602d017a3146482a5c33 SHA512 02e4406fcfa20cd6899eba47dbc33c5c94991cb01977e99e33433e0a87a1f92b261dfb76939d6aab8c12aaf127d9d8a572539fc85d2ab6a5b1dffa841978b07c
+EBUILD mariadb-10.3.27.ebuild 33315 BLAKE2B dddcb00e569ab38a470fc69932fa1974b18e78e3bc5315dd99281a8b3b491eed9078844abb0c21d4b60e4abbb3e2a1c9468ffbb7414f34410c1b8fa748dff2cd SHA512 da81a47686f868cb881711cfd14736a98ee21fa23a5cb1a7a034f4efef9d36021cac376af976301fb6170e665140a6a04b065f7ad21801d7533609be416f66d4
+EBUILD mariadb-10.3.28-r3.ebuild 41037 BLAKE2B b57fe4df2bbca5c9c1433bc1718447efa4d499c5700734203897aa2bbb48a5ba48f1a84789d06bf879e6fd558e8699d8a2feffa9e680117c74e925eff70adfd9 SHA512 5f67b938748f65f07b101391a3c07296513ccd93d4733198f62faa51701c16d27ebc4f2deb44ae166baed9ab5e72896b661fce6f73a154adbc5f76032bc9267a
+EBUILD mariadb-10.4.13-r3.ebuild 33935 BLAKE2B 74eb39d6fec14db04ca11891db579ffec0245794eae688119b74b3e6ca6fecd362494132d3fc64ffd6780e70cc1e0432dc5b98c925decf12f57b3c3648ecec93 SHA512 d48420d78d7357c8c3fe492a0c45380823246ad29ff71b8c5f8ac164089723d78dc8cc6169127247f699c1404199b6d996788583c3d4f48bcd603cb91f9a6ee4
+EBUILD mariadb-10.4.15.ebuild 33966 BLAKE2B 7102c4c5010816fb80199b030218ec7d57b3e7867dacab26cfbefd415e159cd098a51988a78da7cf691d986596112ea6432c823bc791be538ea13ba12fcb7a55 SHA512 94d386d0af525b59d33deca8dcc0af1deb0328218ff371151fcd876d5b0ec586d062ee64391d74c3259e72c6b3ce55eebf6ec8f75bb3fe684136459d472f5e72
+EBUILD mariadb-10.4.16.ebuild 34099 BLAKE2B 88476cfc7a91578451236805dc2d73ecd83535dd7114d5f9bea673fbecad5798b46c0b5a471e0d3b6a00b63a3b05ca01320f2002214e8e4b212ce9116ae35abc SHA512 6d9417fc8d7992dda73b544fdb73b1be24bcfae1de138f84b4560ec7336ad8694b98bab2de3349f477c54865e51d899645f08a9643baf39e17d573b31119c77f
+EBUILD mariadb-10.4.17.ebuild 34094 BLAKE2B 62c8a5485a629e07c61fa493f0852da45d8512f3465da758816c7bbed7844ef59a99ec821cff9378fc6bed05f3588f757727fc0c1eedb0e39f2684662f5e7e98 SHA512 9c1daebbeaea6d7feb31f30e0576d2e1188f1fce35f15914b6cc51748bc0057642a975c536a35714ea075302427dbbc45ae2cd33470af84be2f9b122bc95554e
+EBUILD mariadb-10.4.18-r3.ebuild 41594 BLAKE2B 9e3c6f1794df4e08dd99363acd40a3568d46fa188ca03ce32e8bbf8353ae17d0ee20263166cf56b2d55eb0f0f78dad1dc8137688e812cc421cd3136a810aa6a7 SHA512 4660aac0f5b3f97c1931a6cf3a25278d03e5f34454c8fd686d730fe87edf39ddbd445b352b24e7824dc6a572a03fb8b99f867dcf38032e33f05cd85a6419ff12
+EBUILD mariadb-10.5.6.ebuild 33394 BLAKE2B 827ff099c532ac7b1f5c8e7e0a43ede4631acfb94c980d155657073a65badbfeb61b8ad268195edd53c3da53c01beed7082510874baf6cfa7f80b5555ae7cdc5 SHA512 6a10bad9c77180e0e1782540aa0cd9cececac0136aa1ee56a76f3912446642455c8075a554e270fd8836518931468e1838e4cfd2ecd4f3e108123a335fde888b
+EBUILD mariadb-10.5.7.ebuild 33527 BLAKE2B 87a9477900678bc034505cfd9a91b0a4929e214d0771d6ac3a33e4a0125650f276eecba4cb94a729f79b5684962b70eb43403869181d387a80b541437c5da86b SHA512 9cd732e738711482490eaa64b3e277cdb9a3929168458c29af605a5c4cea9352a23370ef681097db7deeff1c79297aa13708b49bd038b452a27744a2a9fcbe82
+EBUILD mariadb-10.5.8.ebuild 33527 BLAKE2B 6961f96df00829edb22c9b27a7f4d679b22e7f426348aaef7a1fea89fed789444277eee38a4f48542337cc4bf475aeb1b21db6f72e7c8a22532b0ffe59b1e619 SHA512 648e491fe28240a835254e2f5681ac826d8a0862db584a2c3bba612e07f49e815faa27bb31d9c41049d382426e40ee662ac83ef88343318ff73c9b8333c8195c
+EBUILD mariadb-10.5.9-r5.ebuild 41092 BLAKE2B 8bde28f7f5a3ef726b8bc77f62cc7da65c061699d76b98692d8434866cf4e9c9b8278ddad852ffedce939a57cc34ae3fed72c7c3663b760aa5c835739dcbc569 SHA512 17815ddb3321640897ea839193c324b9c68c56eb666e3d575babebaafb595b6d29a57bfd77bf0a6ed918a5e14c26462fb772dd7adb186957553209a5ef5b142d
+MISC metadata.xml 2625 BLAKE2B 649e3bfdce49ed2352d31849a7d4547e0eeee23fab8ee58705fab62f8e1dee1874885027897bcb2895def5dcfeeea66caa69f83161ac1cfd19154a8712bdf573 SHA512 edbbfc7be64f124c0969f7de67337ba0b579292837d10e18da56b7e4e1cca88a36ac304e7c2625d9ae2bcf625d632a707f9813a0382242fc3d59d384b5b7bd54
diff --git a/dev-db/mariadb/mariadb-10.2.22-r2.ebuild b/dev-db/mariadb/mariadb-10.2.22-r2.ebuild
index aca4c6dfa4c3..9da7717b745d 100644
--- a/dev-db/mariadb/mariadb-10.2.22-r2.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.22-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -29,13 +29,12 @@ DESCRIPTION="An enhanced, drop-in replacement for MySQL"
 LICENSE="GPL-2 LGPL-2.1+"
 SLOT="10.2/${SUBSLOT:-0}"
 IUSE="+backup bindist client-libs cracklib debug extraengine galera innodb-lz4
-	innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 libressl mroonga
+	innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 mroonga
 	numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx
 	sst-rsync sst-mariabackup sst-xtrabackup static systemd systemtap tcmalloc
 	test tokudb xml yassl"
 
-# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
-RESTRICT="!bindist? ( bindist ) !test? ( test ) libressl? ( test )"
+RESTRICT="!bindist? ( bindist ) !test? ( test )"
 
 REQUIRED_USE="jdbc? ( extraengine server !static )
 	server? ( tokudb? ( jemalloc !tcmalloc ) )
@@ -82,8 +81,7 @@ COMMON_DEPEND="
 	kerberos? ( virtual/krb5 )
 	yassl? ( net-libs/gnutls:0= )
 	!yassl? (
-		!libressl? ( >=dev-libs/openssl-1.0.0:0= )
-		libressl? ( dev-libs/libressl:0= )
+		>=dev-libs/openssl-1.0.0:0=
 	)
 	sys-libs/ncurses:0=
 	!bindist? (
diff --git a/dev-db/mariadb/mariadb-10.2.32-r3.ebuild b/dev-db/mariadb/mariadb-10.2.32-r3.ebuild
index 5220f19266bd..90d4e0ae97e2 100644
--- a/dev-db/mariadb/mariadb-10.2.32-r3.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.32-r3.ebuild
@@ -22,13 +22,12 @@ DESCRIPTION="An enhanced, drop-in replacement for MySQL"
 LICENSE="GPL-2 LGPL-2.1+"
 SLOT="10.2/${SUBSLOT:-0}"
 IUSE="+backup bindist client-libs cracklib debug extraengine galera innodb-lz4
-	innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 libressl mroonga
+	innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 mroonga
 	numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx
 	sst-rsync sst-mariabackup sst-xtrabackup static systemd systemtap tcmalloc
 	test tokudb xml yassl"
 
-# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
-RESTRICT="!bindist? ( bindist ) libressl? ( test ) !test? ( test )"
+RESTRICT="!bindist? ( bindist ) !test? ( test )"
 
 REQUIRED_USE="jdbc? ( extraengine server !static )
 	server? ( tokudb? ( jemalloc !tcmalloc ) )
@@ -57,8 +56,7 @@ COMMON_DEPEND="
 	kerberos? ( virtual/krb5 )
 	yassl? ( net-libs/gnutls:0= )
 	!yassl? (
-		!libressl? ( >=dev-libs/openssl-1.0.0:0= )
-		libressl? ( dev-libs/libressl:0= )
+		>=dev-libs/openssl-1.0.0:0=
 	)
 	sys-libs/ncurses:0=
 	!bindist? (
diff --git a/dev-db/mariadb/mariadb-10.2.34.ebuild b/dev-db/mariadb/mariadb-10.2.34.ebuild
index aa85215bd84c..906f4db9f256 100644
--- a/dev-db/mariadb/mariadb-10.2.34.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.34.ebuild
@@ -20,13 +20,12 @@ DESCRIPTION="An enhanced, drop-in replacement for MySQL"
 LICENSE="GPL-2 LGPL-2.1+"
 SLOT="10.2/${SUBSLOT:-0}"
 IUSE="+backup bindist client-libs cracklib debug extraengine galera innodb-lz4
-	innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 libressl mroonga
+	innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 mroonga
 	numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx
 	sst-rsync sst-mariabackup sst-xtrabackup static systemd systemtap tcmalloc
 	test tokudb xml yassl"
 
-# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
-RESTRICT="!bindist? ( bindist ) libressl? ( test ) !test? ( test )"
+RESTRICT="!bindist? ( bindist ) !test? ( test )"
 
 REQUIRED_USE="jdbc? ( extraengine server !static )
 	server? ( tokudb? ( jemalloc !tcmalloc ) )
@@ -55,8 +54,7 @@ COMMON_DEPEND="
 	kerberos? ( virtual/krb5 )
 	yassl? ( net-libs/gnutls:0= )
 	!yassl? (
-		!libressl? ( >=dev-libs/openssl-1.0.0:0= )
-		libressl? ( dev-libs/libressl:0= )
+		>=dev-libs/openssl-1.0.0:0=
 	)
 	sys-libs/ncurses:0=
 	!bindist? (
diff --git a/dev-db/mariadb/mariadb-10.2.35.ebuild b/dev-db/mariadb/mariadb-10.2.35.ebuild
index fc25a535a833..81166142aa7e 100644
--- a/dev-db/mariadb/mariadb-10.2.35.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.35.ebuild
@@ -20,13 +20,12 @@ DESCRIPTION="An enhanced, drop-in replacement for MySQL"
 LICENSE="GPL-2 LGPL-2.1+"
 SLOT="10.2/${SUBSLOT:-0}"
 IUSE="+backup bindist client-libs cracklib debug extraengine galera innodb-lz4
-	innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 libressl mroonga
+	innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 mroonga
 	numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx
 	sst-rsync sst-mariabackup sst-xtrabackup static systemd systemtap tcmalloc
 	test tokudb xml yassl"
 
-# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
-RESTRICT="!bindist? ( bindist ) libressl? ( test ) !test? ( test )"
+RESTRICT="!bindist? ( bindist ) test? ( test )"
 
 REQUIRED_USE="jdbc? ( extraengine server !static )
 	server? ( tokudb? ( jemalloc !tcmalloc ) )
@@ -55,8 +54,7 @@ COMMON_DEPEND="
 	kerberos? ( virtual/krb5 )
 	yassl? ( net-libs/gnutls:0= )
 	!yassl? (
-		!libressl? ( >=dev-libs/openssl-1.0.0:0= )
-		libressl? ( dev-libs/libressl:0= )
+		>=dev-libs/openssl-1.0.0:0=
 	)
 	sys-libs/ncurses:0=
 	!bindist? (
diff --git a/dev-db/mariadb/mariadb-10.2.36.ebuild b/dev-db/mariadb/mariadb-10.2.36.ebuild
index 8673125864b6..e710a0d553aa 100644
--- a/dev-db/mariadb/mariadb-10.2.36.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.36.ebuild
@@ -20,13 +20,12 @@ DESCRIPTION="An enhanced, drop-in replacement for MySQL"
 LICENSE="GPL-2 LGPL-2.1+"
 SLOT="10.2/${SUBSLOT:-0}"
 IUSE="+backup bindist client-libs cracklib debug extraengine galera innodb-lz4
-	innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 libressl mroonga
+	innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 mroonga
 	numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx
 	sst-rsync sst-mariabackup sst-xtrabackup static systemd systemtap tcmalloc
 	test tokudb xml yassl"
 
-# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
-RESTRICT="!bindist? ( bindist ) libressl? ( test ) !test? ( test )"
+RESTRICT="!bindist? ( bindist ) !test? ( test )"
 
 REQUIRED_USE="jdbc? ( extraengine server !static )
 	server? ( tokudb? ( jemalloc !tcmalloc ) )
@@ -55,8 +54,7 @@ COMMON_DEPEND="
 	kerberos? ( virtual/krb5 )
 	yassl? ( net-libs/gnutls:0= )
 	!yassl? (
-		!libressl? ( >=dev-libs/openssl-1.0.0:0= )
-		libressl? ( dev-libs/libressl:0= )
+		>=dev-libs/openssl-1.0.0:0=
 	)
 	sys-libs/ncurses:0=
 	!bindist? (
diff --git a/dev-db/mariadb/mariadb-10.2.37-r3.ebuild b/dev-db/mariadb/mariadb-10.2.37-r3.ebuild
index a815c35193ed..2622cb71a80b 100644
--- a/dev-db/mariadb/mariadb-10.2.37-r3.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.37-r3.ebuild
@@ -20,13 +20,12 @@ DESCRIPTION="An enhanced, drop-in replacement for MySQL"
 LICENSE="GPL-2 LGPL-2.1+"
 SLOT="10.2/${SUBSLOT:-0}"
 IUSE="+backup bindist client-libs cracklib debug extraengine galera innodb-lz4
-	innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 libressl mroonga
+	innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 mroonga
 	numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx
 	sst-rsync sst-mariabackup sst-xtrabackup static systemd systemtap tcmalloc
 	test tokudb xml yassl"
 
-# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
-RESTRICT="!bindist? ( bindist ) libressl? ( test ) !test? ( test )"
+RESTRICT="!bindist? ( bindist ) !test? ( test )"
 
 REQUIRED_USE="jdbc? ( extraengine server !static )
 	server? ( tokudb? ( jemalloc !tcmalloc ) )
@@ -55,8 +54,7 @@ COMMON_DEPEND="
 	kerberos? ( virtual/krb5 )
 	yassl? ( net-libs/gnutls:0= )
 	!yassl? (
-		!libressl? ( >=dev-libs/openssl-1.0.0:0= )
-		libressl? ( dev-libs/libressl:0= )
+		>=dev-libs/openssl-1.0.0:0=
 	)
 	sys-libs/ncurses:0=
 	!bindist? (
diff --git a/dev-db/mariadb/mariadb-10.3.23-r3.ebuild b/dev-db/mariadb/mariadb-10.3.23-r3.ebuild
index 49287ca1614b..523a0c907d14 100644
--- a/dev-db/mariadb/mariadb-10.3.23-r3.ebuild
+++ b/dev-db/mariadb/mariadb-10.3.23-r3.ebuild
@@ -22,13 +22,12 @@ DESCRIPTION="An enhanced, drop-in replacement for MySQL"
 LICENSE="GPL-2 LGPL-2.1+"
 SLOT="10.3/${SUBSLOT:-0}"
 IUSE="+backup bindist client-libs cracklib debug extraengine galera innodb-lz4
-	innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 libressl mroonga
+	innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 mroonga
 	numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx
 	sst-rsync sst-mariabackup static systemd systemtap tcmalloc
 	test tokudb xml yassl"
 
-# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
-RESTRICT="!bindist? ( bindist ) libressl? ( test ) !test? ( test )"
+RESTRICT="!bindist? ( bindist ) !test? ( test )"
 
 REQUIRED_USE="jdbc? ( extraengine server !static )
 	server? ( tokudb? ( jemalloc !tcmalloc ) )
@@ -57,8 +56,7 @@ COMMON_DEPEND="
 	kerberos? ( virtual/krb5 )
 	yassl? ( net-libs/gnutls:0= )
 	!yassl? (
-		!libressl? ( >=dev-libs/openssl-1.0.0:0= )
-		libressl? ( dev-libs/libressl:0= )
+		>=dev-libs/openssl-1.0.0:0=
 	)
 	sys-libs/ncurses:0=
 	!bindist? (
diff --git a/dev-db/mariadb/mariadb-10.3.25.ebuild b/dev-db/mariadb/mariadb-10.3.25.ebuild
index 73c8f3fa4471..4b560041aa19 100644
--- a/dev-db/mariadb/mariadb-10.3.25.ebuild
+++ b/dev-db/mariadb/mariadb-10.3.25.ebuild
@@ -20,13 +20,12 @@ DESCRIPTION="An enhanced, drop-in replacement for MySQL"
 LICENSE="GPL-2 LGPL-2.1+"
 SLOT="10.3/${SUBSLOT:-0}"
 IUSE="+backup bindist client-libs cracklib debug extraengine galera innodb-lz4
-	innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 libressl mroonga
+	innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 mroonga
 	numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx
 	sst-rsync sst-mariabackup static systemd systemtap tcmalloc
 	test tokudb xml yassl"
 
-# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
-RESTRICT="!bindist? ( bindist ) libressl? ( test ) !test? ( test )"
+RESTRICT="!bindist? ( bindist ) !test? ( test )"
 
 REQUIRED_USE="jdbc? ( extraengine server !static )
 	server? ( tokudb? ( jemalloc !tcmalloc ) )
@@ -55,8 +54,7 @@ COMMON_DEPEND="
 	kerberos? ( virtual/krb5 )
 	yassl? ( net-libs/gnutls:0= )
 	!yassl? (
-		!libressl? ( >=dev-libs/openssl-1.0.0:0= )
-		libressl? ( dev-libs/libressl:0= )
+		>=dev-libs/openssl-1.0.0:0=
 	)
 	sys-libs/ncurses:0=
 	!bindist? (
diff --git a/dev-db/mariadb/mariadb-10.3.26.ebuild b/dev-db/mariadb/mariadb-10.3.26.ebuild
index c5f1eaf4279c..c2089d951e6c 100644
--- a/dev-db/mariadb/mariadb-10.3.26.ebuild
+++ b/dev-db/mariadb/mariadb-10.3.26.ebuild
@@ -20,13 +20,12 @@ DESCRIPTION="An enhanced, drop-in replacement for MySQL"
 LICENSE="GPL-2 LGPL-2.1+"
 SLOT="10.3/${SUBSLOT:-0}"
 IUSE="+backup bindist client-libs cracklib debug extraengine galera innodb-lz4
-	innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 libressl mroonga
+	innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 mroonga
 	numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx
 	sst-rsync sst-mariabackup static systemd systemtap tcmalloc
 	test tokudb xml yassl"
 
-# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
-RESTRICT="!bindist? ( bindist ) libressl? ( test ) !test? ( test )"
+RESTRICT="!bindist? ( bindist ) !test? ( test )"
 
 REQUIRED_USE="jdbc? ( extraengine server !static )
 	server? ( tokudb? ( jemalloc !tcmalloc ) )
@@ -55,8 +54,7 @@ COMMON_DEPEND="
 	kerberos? ( virtual/krb5 )
 	yassl? ( net-libs/gnutls:0= )
 	!yassl? (
-		!libressl? ( >=dev-libs/openssl-1.0.0:0= )
-		libressl? ( dev-libs/libressl:0= )
+		>=dev-libs/openssl-1.0.0:0=
 	)
 	sys-libs/ncurses:0=
 	!bindist? (
diff --git a/dev-db/mariadb/mariadb-10.3.27.ebuild b/dev-db/mariadb/mariadb-10.3.27.ebuild
index c3d7f8e60673..700176d0f579 100644
--- a/dev-db/mariadb/mariadb-10.3.27.ebuild
+++ b/dev-db/mariadb/mariadb-10.3.27.ebuild
@@ -20,13 +20,12 @@ DESCRIPTION="An enhanced, drop-in replacement for MySQL"
 LICENSE="GPL-2 LGPL-2.1+"
 SLOT="10.3/${SUBSLOT:-0}"
 IUSE="+backup bindist client-libs cracklib debug extraengine galera innodb-lz4
-	innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 libressl mroonga
+	innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 mroonga
 	numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx
 	sst-rsync sst-mariabackup static systemd systemtap tcmalloc
 	test tokudb xml yassl"
 
-# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
-RESTRICT="!bindist? ( bindist ) libressl? ( test ) !test? ( test )"
+RESTRICT="!bindist? ( bindist ) !test? ( test )"
 
 REQUIRED_USE="jdbc? ( extraengine server !static )
 	server? ( tokudb? ( jemalloc !tcmalloc ) )
@@ -55,8 +54,7 @@ COMMON_DEPEND="
 	kerberos? ( virtual/krb5 )
 	yassl? ( net-libs/gnutls:0= )
 	!yassl? (
-		!libressl? ( >=dev-libs/openssl-1.0.0:0= )
-		libressl? ( dev-libs/libressl:0= )
+		>=dev-libs/openssl-1.0.0:0=
 	)
 	sys-libs/ncurses:0=
 	!bindist? (
diff --git a/dev-db/mariadb/mariadb-10.3.28-r3.ebuild b/dev-db/mariadb/mariadb-10.3.28-r3.ebuild
index b9722ab6f774..995a619bc5cc 100644
--- a/dev-db/mariadb/mariadb-10.3.28-r3.ebuild
+++ b/dev-db/mariadb/mariadb-10.3.28-r3.ebuild
@@ -20,13 +20,12 @@ DESCRIPTION="An enhanced, drop-in replacement for MySQL"
 LICENSE="GPL-2 LGPL-2.1+"
 SLOT="10.3/${SUBSLOT:-0}"
 IUSE="+backup bindist client-libs cracklib debug extraengine galera innodb-lz4
-	innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 libressl mroonga
+	innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 mroonga
 	numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx
 	sst-rsync sst-mariabackup static systemd systemtap tcmalloc
 	test tokudb xml yassl"
 
-# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
-RESTRICT="!bindist? ( bindist ) libressl? ( test ) !test? ( test )"
+RESTRICT="!bindist? ( bindist ) !test? ( test )"
 
 REQUIRED_USE="jdbc? ( extraengine server !static )
 	server? ( tokudb? ( jemalloc !tcmalloc ) )
@@ -55,8 +54,7 @@ COMMON_DEPEND="
 	kerberos? ( virtual/krb5 )
 	yassl? ( net-libs/gnutls:0= )
 	!yassl? (
-		!libressl? ( >=dev-libs/openssl-1.0.0:0= )
-		libressl? ( dev-libs/libressl:0= )
+		>=dev-libs/openssl-1.0.0:0=
 	)
 	sys-libs/ncurses:0=
 	!bindist? (
diff --git a/dev-db/mariadb/mariadb-10.4.13-r3.ebuild b/dev-db/mariadb/mariadb-10.4.13-r3.ebuild
index cd815bfe0192..4e128c050daf 100644
--- a/dev-db/mariadb/mariadb-10.4.13-r3.ebuild
+++ b/dev-db/mariadb/mariadb-10.4.13-r3.ebuild
@@ -20,13 +20,12 @@ DESCRIPTION="An enhanced, drop-in replacement for MySQL"
 LICENSE="GPL-2 LGPL-2.1+"
 SLOT="10.4/${SUBSLOT:-0}"
 IUSE="+backup bindist cracklib debug extraengine galera innodb-lz4
-	innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 libressl mroonga
+	innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 mroonga
 	numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx
 	sst-rsync sst-mariabackup static systemd systemtap tcmalloc
 	test tokudb xml yassl"
 
-# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
-RESTRICT="!bindist? ( bindist ) libressl? ( test ) !test? ( test )"
+RESTRICT="!bindist? ( bindist ) !test? ( test )"
 
 REQUIRED_USE="jdbc? ( extraengine server !static )
 	server? ( tokudb? ( jemalloc !tcmalloc ) )
@@ -55,8 +54,7 @@ COMMON_DEPEND="
 	kerberos? ( virtual/krb5 )
 	yassl? ( net-libs/gnutls:0= )
 	!yassl? (
-		!libressl? ( >=dev-libs/openssl-1.0.0:0= )
-		libressl? ( dev-libs/libressl:0= )
+		>=dev-libs/openssl-1.0.0:0=
 	)
 	sys-libs/ncurses:0=
 	!bindist? (
diff --git a/dev-db/mariadb/mariadb-10.4.15.ebuild b/dev-db/mariadb/mariadb-10.4.15.ebuild
index fd371add0140..753ddd9b8a80 100644
--- a/dev-db/mariadb/mariadb-10.4.15.ebuild
+++ b/dev-db/mariadb/mariadb-10.4.15.ebuild
@@ -20,13 +20,12 @@ DESCRIPTION="An enhanced, drop-in replacement for MySQL"
 LICENSE="GPL-2 LGPL-2.1+"
 SLOT="10.4/${SUBSLOT:-0}"
 IUSE="+backup bindist cracklib debug extraengine galera innodb-lz4
-	innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 libressl mroonga
+	innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 mroonga
 	numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx
 	sst-rsync sst-mariabackup static systemd systemtap tcmalloc
 	test tokudb xml yassl"
 
-# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
-RESTRICT="!bindist? ( bindist ) libressl? ( test ) !test? ( test )"
+RESTRICT="!bindist? ( bindist ) !test? ( test )"
 
 REQUIRED_USE="jdbc? ( extraengine server !static )
 	server? ( tokudb? ( jemalloc !tcmalloc ) )
@@ -55,8 +54,7 @@ COMMON_DEPEND="
 	kerberos? ( virtual/krb5 )
 	yassl? ( net-libs/gnutls:0= )
 	!yassl? (
-		!libressl? ( >=dev-libs/openssl-1.0.0:0= )
-		libressl? ( dev-libs/libressl:0= )
+		>=dev-libs/openssl-1.0.0:0=
 	)
 	sys-libs/ncurses:0=
 	!bindist? (
diff --git a/dev-db/mariadb/mariadb-10.4.16.ebuild b/dev-db/mariadb/mariadb-10.4.16.ebuild
index 87e0f3285c30..a4b2fc06a1f4 100644
--- a/dev-db/mariadb/mariadb-10.4.16.ebuild
+++ b/dev-db/mariadb/mariadb-10.4.16.ebuild
@@ -20,13 +20,12 @@ DESCRIPTION="An enhanced, drop-in replacement for MySQL"
 LICENSE="GPL-2 LGPL-2.1+"
 SLOT="10.4/${SUBSLOT:-0}"
 IUSE="+backup bindist cracklib debug extraengine galera innodb-lz4
-	innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 libressl mroonga
+	innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 mroonga
 	numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx
 	sst-rsync sst-mariabackup static systemd systemtap tcmalloc
 	test tokudb xml yassl"
 
-# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
-RESTRICT="!bindist? ( bindist ) libressl? ( test ) !test? ( test )"
+RESTRICT="!bindist? ( bindist ) !test? ( test )"
 
 REQUIRED_USE="jdbc? ( extraengine server !static )
 	server? ( tokudb? ( jemalloc !tcmalloc ) )
@@ -55,8 +54,7 @@ COMMON_DEPEND="
 	kerberos? ( virtual/krb5 )
 	yassl? ( net-libs/gnutls:0= )
 	!yassl? (
-		!libressl? ( >=dev-libs/openssl-1.0.0:0= )
-		libressl? ( dev-libs/libressl:0= )
+		>=dev-libs/openssl-1.0.0:0=
 	)
 	sys-libs/ncurses:0=
 	!bindist? (
diff --git a/dev-db/mariadb/mariadb-10.4.17.ebuild b/dev-db/mariadb/mariadb-10.4.17.ebuild
index 983375442a02..0abf3fccea70 100644
--- a/dev-db/mariadb/mariadb-10.4.17.ebuild
+++ b/dev-db/mariadb/mariadb-10.4.17.ebuild
@@ -20,13 +20,12 @@ DESCRIPTION="An enhanced, drop-in replacement for MySQL"
 LICENSE="GPL-2 LGPL-2.1+"
 SLOT="10.4/${SUBSLOT:-0}"
 IUSE="+backup bindist cracklib debug extraengine galera innodb-lz4
-	innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 libressl mroonga
+	innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 mroonga
 	numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx
 	sst-rsync sst-mariabackup static systemd systemtap tcmalloc
 	test tokudb xml yassl"
 
-# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
-RESTRICT="!bindist? ( bindist ) libressl? ( test ) !test? ( test )"
+RESTRICT="!bindist? ( bindist ) !test? ( test )"
 
 REQUIRED_USE="jdbc? ( extraengine server !static )
 	server? ( tokudb? ( jemalloc !tcmalloc ) )
@@ -55,8 +54,7 @@ COMMON_DEPEND="
 	kerberos? ( virtual/krb5 )
 	yassl? ( net-libs/gnutls:0= )
 	!yassl? (
-		!libressl? ( >=dev-libs/openssl-1.0.0:0= )
-		libressl? ( dev-libs/libressl:0= )
+		>=dev-libs/openssl-1.0.0:0=
 	)
 	sys-libs/ncurses:0=
 	!bindist? (
diff --git a/dev-db/mariadb/mariadb-10.4.18-r3.ebuild b/dev-db/mariadb/mariadb-10.4.18-r3.ebuild
index 5fad8a38238e..1c922e47c714 100644
--- a/dev-db/mariadb/mariadb-10.4.18-r3.ebuild
+++ b/dev-db/mariadb/mariadb-10.4.18-r3.ebuild
@@ -20,13 +20,12 @@ DESCRIPTION="An enhanced, drop-in replacement for MySQL"
 LICENSE="GPL-2 LGPL-2.1+"
 SLOT="10.4/${SUBSLOT:-0}"
 IUSE="+backup bindist cracklib debug extraengine galera innodb-lz4
-	innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 libressl mroonga
+	innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 mroonga
 	numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx
 	sst-rsync sst-mariabackup static systemd systemtap tcmalloc
 	test tokudb xml yassl"
 
-# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
-RESTRICT="!bindist? ( bindist ) libressl? ( test ) !test? ( test )"
+RESTRICT="!bindist? ( bindist ) !test? ( test )"
 
 REQUIRED_USE="jdbc? ( extraengine server !static )
 	server? ( tokudb? ( jemalloc !tcmalloc ) )
@@ -55,8 +54,7 @@ COMMON_DEPEND="
 	kerberos? ( virtual/krb5 )
 	yassl? ( net-libs/gnutls:0= )
 	!yassl? (
-		!libressl? ( >=dev-libs/openssl-1.0.0:0= )
-		libressl? ( dev-libs/libressl:0= )
+		>=dev-libs/openssl-1.0.0:0=
 	)
 	sys-libs/ncurses:0=
 	!bindist? (
diff --git a/dev-db/mariadb/mariadb-10.5.6.ebuild b/dev-db/mariadb/mariadb-10.5.6.ebuild
index 707286c11f4c..5bcad73cf9f3 100644
--- a/dev-db/mariadb/mariadb-10.5.6.ebuild
+++ b/dev-db/mariadb/mariadb-10.5.6.ebuild
@@ -20,13 +20,12 @@ DESCRIPTION="An enhanced, drop-in replacement for MySQL"
 LICENSE="GPL-2 LGPL-2.1+"
 SLOT="10.5/${SUBSLOT:-0}"
 IUSE="+backup bindist columnstore cracklib debug extraengine galera innodb-lz4
-	innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 libressl mroonga
+	innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 mroonga
 	numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx
 	sst-rsync sst-mariabackup static systemd systemtap s3 tcmalloc
 	test xml yassl"
 
-# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
-RESTRICT="!bindist? ( bindist ) libressl? ( test ) !test? ( test )"
+RESTRICT="!bindist? ( bindist ) !test? ( test )"
 
 REQUIRED_USE="jdbc? ( extraengine server !static )
 	?? ( tcmalloc jemalloc )
@@ -84,8 +83,7 @@ COMMON_DEPEND="
 	tcmalloc? ( dev-util/google-perftools:0= )
 	yassl? ( net-libs/gnutls:0= )
 	!yassl? (
-		!libressl? ( >=dev-libs/openssl-1.0.0:0= )
-		libressl? ( dev-libs/libressl:0= )
+		>=dev-libs/openssl-1.0.0:0=
 	)
 "
 BDEPEND="virtual/yacc
diff --git a/dev-db/mariadb/mariadb-10.5.7.ebuild b/dev-db/mariadb/mariadb-10.5.7.ebuild
index 8f9f6778b6c1..a48f286d522c 100644
--- a/dev-db/mariadb/mariadb-10.5.7.ebuild
+++ b/dev-db/mariadb/mariadb-10.5.7.ebuild
@@ -20,13 +20,12 @@ DESCRIPTION="An enhanced, drop-in replacement for MySQL"
 LICENSE="GPL-2 LGPL-2.1+"
 SLOT="10.5/${SUBSLOT:-0}"
 IUSE="+backup bindist columnstore cracklib debug extraengine galera innodb-lz4
-	innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 libressl mroonga
+	innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 mroonga
 	numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx
 	sst-rsync sst-mariabackup static systemd systemtap s3 tcmalloc
 	test xml yassl"
 
-# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
-RESTRICT="!bindist? ( bindist ) libressl? ( test ) !test? ( test )"
+RESTRICT="!bindist? ( bindist ) !test? ( test )"
 
 REQUIRED_USE="jdbc? ( extraengine server !static )
 	?? ( tcmalloc jemalloc )
@@ -84,8 +83,7 @@ COMMON_DEPEND="
 	tcmalloc? ( dev-util/google-perftools:0= )
 	yassl? ( net-libs/gnutls:0= )
 	!yassl? (
-		!libressl? ( >=dev-libs/openssl-1.0.0:0= )
-		libressl? ( dev-libs/libressl:0= )
+		>=dev-libs/openssl-1.0.0:0=
 	)
 "
 BDEPEND="virtual/yacc
diff --git a/dev-db/mariadb/mariadb-10.5.8.ebuild b/dev-db/mariadb/mariadb-10.5.8.ebuild
index e2bdf78cecd9..550c14700ef6 100644
--- a/dev-db/mariadb/mariadb-10.5.8.ebuild
+++ b/dev-db/mariadb/mariadb-10.5.8.ebuild
@@ -20,13 +20,12 @@ DESCRIPTION="An enhanced, drop-in replacement for MySQL"
 LICENSE="GPL-2 LGPL-2.1+"
 SLOT="10.5/${SUBSLOT:-0}"
 IUSE="+backup bindist columnstore cracklib debug extraengine galera innodb-lz4
-	innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 libressl mroonga
+	innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 mroonga
 	numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx
 	sst-rsync sst-mariabackup static systemd systemtap s3 tcmalloc
 	test xml yassl"
 
-# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
-RESTRICT="!bindist? ( bindist ) libressl? ( test ) !test? ( test )"
+RESTRICT="!bindist? ( bindist ) !test? ( test )"
 
 REQUIRED_USE="jdbc? ( extraengine server !static )
 	?? ( tcmalloc jemalloc )
@@ -84,8 +83,7 @@ COMMON_DEPEND="
 	tcmalloc? ( dev-util/google-perftools:0= )
 	yassl? ( net-libs/gnutls:0= )
 	!yassl? (
-		!libressl? ( >=dev-libs/openssl-1.0.0:0= )
-		libressl? ( dev-libs/libressl:0= )
+		>=dev-libs/openssl-1.0.0:0=
 	)
 "
 BDEPEND="virtual/yacc
diff --git a/dev-db/mariadb/mariadb-10.5.9-r5.ebuild b/dev-db/mariadb/mariadb-10.5.9-r5.ebuild
index 27accfb1aa15..35a14850bf6e 100644
--- a/dev-db/mariadb/mariadb-10.5.9-r5.ebuild
+++ b/dev-db/mariadb/mariadb-10.5.9-r5.ebuild
@@ -20,13 +20,12 @@ DESCRIPTION="An enhanced, drop-in replacement for MySQL"
 LICENSE="GPL-2 LGPL-2.1+"
 SLOT="10.5/${SUBSLOT:-0}"
 IUSE="+backup bindist columnstore cracklib debug extraengine galera innodb-lz4
-	innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 libressl mroonga
+	innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 mroonga
 	numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx
 	sst-rsync sst-mariabackup static systemd systemtap s3 tcmalloc
 	test xml yassl"
 
-# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
-RESTRICT="!bindist? ( bindist ) libressl? ( test ) !test? ( test )"
+RESTRICT="!bindist? ( bindist ) !test? ( test )"
 
 REQUIRED_USE="jdbc? ( extraengine server !static )
 	?? ( tcmalloc jemalloc )
@@ -84,8 +83,7 @@ COMMON_DEPEND="
 	tcmalloc? ( dev-util/google-perftools:0= )
 	yassl? ( net-libs/gnutls:0= )
 	!yassl? (
-		!libressl? ( >=dev-libs/openssl-1.0.0:0= )
-		libressl? ( dev-libs/libressl:0= )
+		>=dev-libs/openssl-1.0.0:0=
 	)
 "
 BDEPEND="virtual/yacc
diff --git a/dev-db/mariadb/metadata.xml b/dev-db/mariadb/metadata.xml
index 74d8b5649ce9..2222ef15894b 100644
--- a/dev-db/mariadb/metadata.xml
+++ b/dev-db/mariadb/metadata.xml
@@ -16,7 +16,6 @@
   <flag name="innodb-snappy">Enables snappy compression methods for InnoDB/XtraDB using <pkg>app-arch/snappy</pkg></flag>
   <flag name="jdbc">Enable the CONNECT engine to access foreign databases via JDBC</flag>
   <flag name="latin1">Use LATIN1 encoding instead of UTF8</flag>
-  <flag name="libressl">Enable SSL connections and crypto functions using <pkg>dev-libs/libressl</pkg></flag>
   <flag name="mroonga">Add support for the Mroonga engine for interfacing with the Groonga text search</flag>
   <flag name="numa">Enable NUMA support using sys-process/numactl (NUMA kernel support is also required)</flag>
   <flag name="oqgraph">Add support for the Open Query GRAPH engine</flag>
diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index 5a1f809acb8f..aaa0069bf5a7 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -17,9 +17,9 @@ DIST mongodb-src-r4.2.12.tar.gz 61855596 BLAKE2B 2114c3b6e7a941c566cf631e06b0f85
 DIST mongodb-src-r4.4.1.tar.gz 49644743 BLAKE2B 7d84998c69b9b55164ebab04b49c38a4113a0f58d431612389ec37eb044fba1adf9284e9d4454bd40bb7a071fd042308a5cd350129d6d52480412cf6b868ec2b SHA512 16aa66995ea8cfe0cc47b96c1c5643a28ab47fc9f27bd93404cf572944ab30492df7c9255553f918b353cd7157a6ccde9ac6f58bfba322fb52c2d7409c6fb9b0
 DIST mongodb-src-r4.4.2.tar.gz 49816559 BLAKE2B 0e51302e7e414de9fef74872e44c8de1f5682cb3cac0aa7a02e3c1ee3084669ea647d1e574e8a76a3b6b2f34aa4ef693c8d1f3fa025ec3072eff7b7c408b94e5 SHA512 bbf59ed97a8718576c469c696d5331c122f63528dad950fd415b00269c2fa5e6949b372c575e2504c2a58b145bae485172b25000000481662e6543bc3127252a
 DIST mongodb-src-r4.4.4.tar.gz 49942905 BLAKE2B 8aa9813e87e216899b3c609b413ce6915d6ddf30faea3c0ecda2a14476fc6b08024614fa7b20e1703b5908759459e88e5e302539c27525c2359233743aa7dcda SHA512 a999528a8a6bf4bf0b8ff8f5169b1aadb3c4dab9c7d936c59d66f238b864fad6e8fb6a1b9ec27f395fca95152ee020f96a8c1cf8960a48de3ce5141f8dda7d88
-EBUILD mongodb-4.2.11.ebuild 4787 BLAKE2B b9aa3049df6ebac95cf923504e933e7a268cbf88cc9e5198202f3252feeee907ff001978c99f1a3d6bc450b93c9750a1f438c4453aac443f2997cd908e88d93c SHA512 f2b51e6e0490f2ed79979888add6fcdbb54da8e963374f6ef9954393781df6c7c51cff25f72ed3379606e78f083dcc869b8e2d68663d38595f3dd179708f8299
-EBUILD mongodb-4.2.12.ebuild 4788 BLAKE2B 115775a207a79fa87ffef40fc2dc366661fa4c11c250a9fe233df17691bfb2e88f4c8f40713690bf55c560d76c6686493c3b14b0b392356e646c5ae7de591f1e SHA512 3ae507c6c302079b205691c13166984dbefd51e2a0dbf6252179ac26f0eed71ca60bc8aa5b7c7b33a024669290a138553ae4800799df8659d6f00139db451dde
-EBUILD mongodb-4.4.1.ebuild 4873 BLAKE2B 9c0f2c502e255275f4a10f9e4304626a77000079d865ffa62cedf534d0962bce76e529ec3f442f550d90c2ab73abfb13686595cdb6e9121c57a036a54673fe63 SHA512 5047b0b34f5a62b69ec2197724f3bc0a3ec6310f887d95bda695448e72e708a7308799ce65128e146fdb5a42918acb8ea2efb6d3fcdf983c5318019baef8225a
-EBUILD mongodb-4.4.2.ebuild 4828 BLAKE2B 9ef6309cda268a3ffeb0a911995ba315dd7b46125f86dd3dc993a0cd6fedff247ccddffe1453391a26031b1e42b07fd5cb7946894a5d2663478ed4ea210a463a SHA512 5ac4a24121572c858f63e251d701e95cc79c4baacdb24ec6026746a60e77fe164205f67fde38fce24ded3e560c56f0e5e2601366c32b6dae80f9b12b934cd6a7
-EBUILD mongodb-4.4.4.ebuild 4828 BLAKE2B 9ef6309cda268a3ffeb0a911995ba315dd7b46125f86dd3dc993a0cd6fedff247ccddffe1453391a26031b1e42b07fd5cb7946894a5d2663478ed4ea210a463a SHA512 5ac4a24121572c858f63e251d701e95cc79c4baacdb24ec6026746a60e77fe164205f67fde38fce24ded3e560c56f0e5e2601366c32b6dae80f9b12b934cd6a7
+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
 MISC metadata.xml 824 BLAKE2B d7e131d6292b092deb2001bbd6f3d6f6a908f57a064f36f64429696849633ae5ff8dee36604e9952a90ef160b834c56f91d085be7c67a6f9a973c83875bf426c SHA512 cc3555829b1587640259c30c8ede022846ad60993d064ba43d16b28ef5b4a46e5b1fad6818826d4668f0738d27a43f29c5ec769fd647076828e275b5d325e748
diff --git a/dev-db/mongodb/mongodb-4.2.11.ebuild b/dev-db/mongodb/mongodb-4.2.11.ebuild
index da7eb86efd32..48f015bc5d9f 100644
--- a/dev-db/mongodb/mongodb-4.2.11.ebuild
+++ b/dev-db/mongodb/mongodb-4.2.11.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
 LICENSE="Apache-2.0 SSPL-1"
 SLOT="0"
 KEYWORDS="amd64 ~arm64"
-IUSE="debug kerberos libressl lto ssl test +tools"
+IUSE="debug kerberos lto ssl test +tools"
 RESTRICT="!test? ( test )"
 
 RDEPEND="acct-group/mongodb
@@ -36,8 +36,7 @@ RDEPEND="acct-group/mongodb
 	>=sys-libs/zlib-1.2.11:=
 	kerberos? ( dev-libs/cyrus-sasl[kerberos] )
 	ssl? (
-		!libressl? ( >=dev-libs/openssl-1.0.1g:0= )
-		libressl? ( dev-libs/libressl:0= )
+		>=dev-libs/openssl-1.0.1g:0=
 	)"
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
diff --git a/dev-db/mongodb/mongodb-4.2.12.ebuild b/dev-db/mongodb/mongodb-4.2.12.ebuild
index 0c574bfd2752..11df6a441e4a 100644
--- a/dev-db/mongodb/mongodb-4.2.12.ebuild
+++ b/dev-db/mongodb/mongodb-4.2.12.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
 LICENSE="Apache-2.0 SSPL-1"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64"
-IUSE="debug kerberos libressl lto ssl test +tools"
+IUSE="debug kerberos lto ssl test +tools"
 RESTRICT="!test? ( test )"
 
 RDEPEND="acct-group/mongodb
@@ -36,8 +36,7 @@ RDEPEND="acct-group/mongodb
 	>=sys-libs/zlib-1.2.11:=
 	kerberos? ( dev-libs/cyrus-sasl[kerberos] )
 	ssl? (
-		!libressl? ( >=dev-libs/openssl-1.0.1g:0= )
-		libressl? ( dev-libs/libressl:0= )
+		>=dev-libs/openssl-1.0.1g:0=
 	)"
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
diff --git a/dev-db/mongodb/mongodb-4.4.1.ebuild b/dev-db/mongodb/mongodb-4.4.1.ebuild
index a94bd93f246b..b26fac9d1d8d 100644
--- a/dev-db/mongodb/mongodb-4.4.1.ebuild
+++ b/dev-db/mongodb/mongodb-4.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -21,7 +21,7 @@ SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
 LICENSE="Apache-2.0 SSPL-1"
 SLOT="0"
 KEYWORDS="amd64 ~arm64"
-IUSE="debug kerberos libressl lto ssl test +tools"
+IUSE="debug kerberos lto ssl test +tools"
 RESTRICT="!test? ( test )"
 
 RDEPEND="acct-group/mongodb
@@ -36,8 +36,7 @@ RDEPEND="acct-group/mongodb
 	>=sys-libs/zlib-1.2.11:=
 	kerberos? ( dev-libs/cyrus-sasl[kerberos] )
 	ssl? (
-		!libressl? ( >=dev-libs/openssl-1.0.1g:0= )
-		libressl? ( dev-libs/libressl:0= )
+		>=dev-libs/openssl-1.0.1g:0=
 	)"
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
diff --git a/dev-db/mongodb/mongodb-4.4.2.ebuild b/dev-db/mongodb/mongodb-4.4.2.ebuild
index 24d855cd1a1a..1d0c36c3853c 100644
--- a/dev-db/mongodb/mongodb-4.4.2.ebuild
+++ b/dev-db/mongodb/mongodb-4.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -21,7 +21,7 @@ SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
 LICENSE="Apache-2.0 SSPL-1"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64"
-IUSE="debug kerberos libressl lto ssl test +tools"
+IUSE="debug kerberos lto ssl test +tools"
 RESTRICT="!test? ( test )"
 
 RDEPEND="acct-group/mongodb
@@ -36,8 +36,7 @@ RDEPEND="acct-group/mongodb
 	>=sys-libs/zlib-1.2.11:=
 	kerberos? ( dev-libs/cyrus-sasl[kerberos] )
 	ssl? (
-		!libressl? ( >=dev-libs/openssl-1.0.1g:0= )
-		libressl? ( dev-libs/libressl:0= )
+		>=dev-libs/openssl-1.0.1g:0=
 	)"
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
diff --git a/dev-db/mongodb/mongodb-4.4.4.ebuild b/dev-db/mongodb/mongodb-4.4.4.ebuild
index 24d855cd1a1a..1d0c36c3853c 100644
--- a/dev-db/mongodb/mongodb-4.4.4.ebuild
+++ b/dev-db/mongodb/mongodb-4.4.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -21,7 +21,7 @@ SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
 LICENSE="Apache-2.0 SSPL-1"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64"
-IUSE="debug kerberos libressl lto ssl test +tools"
+IUSE="debug kerberos lto ssl test +tools"
 RESTRICT="!test? ( test )"
 
 RDEPEND="acct-group/mongodb
@@ -36,8 +36,7 @@ RDEPEND="acct-group/mongodb
 	>=sys-libs/zlib-1.2.11:=
 	kerberos? ( dev-libs/cyrus-sasl[kerberos] )
 	ssl? (
-		!libressl? ( >=dev-libs/openssl-1.0.1g:0= )
-		libressl? ( dev-libs/libressl:0= )
+		>=dev-libs/openssl-1.0.1g:0=
 	)"
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
diff --git a/dev-db/mysql++/Manifest b/dev-db/mysql++/Manifest
index bb1c1a68c16e..e34fdad2f5fc 100644
--- a/dev-db/mysql++/Manifest
+++ b/dev-db/mysql++/Manifest
@@ -2,5 +2,7 @@ AUX mysql++-3.2.1-gold.patch 196 BLAKE2B d4bd1e259cdd8a4c52f0900ddc42a0001156f94
 AUX mysql++-3.2.4-only-unit-tests.patch 331 BLAKE2B d3bee079ad466aa3f2e21d831a4ee77959c8a1f2d1ea9124f17dd081a7d39a99433c9c8dba10a8638fe72f4e0ccd8cf02751c3b036c9082a1351374a19e089e4 SHA512 02bb7a370a3f7eafd9111c01e6073a71d33f53d59eb7d8e04a40415ab2fc88011a1b2c79cba455b976b03613597d49f9256cdacfb3b984767959a707bf3ba7b0
 AUX mysql++-3.2.5-as-needed.patch 18594 BLAKE2B 39baa700bd643205974e1e96e48f0595eb001421a6701e8905a6f2f9394b93ee1d107d984cb2df99ac8b65a97651c152fee15d2c75a56e917a488ccf3b755159 SHA512 6ece46847bccbf9612d1575eafe995f48133860c942b7acd99cd459dcd3a4964bf767b7c1963596d1c68e6738eae2fa07b699a4ec775547ee6905fa682e383f3
 DIST mysql++-3.2.5.tar.gz 4748218 BLAKE2B ffceddb360cf6f0f38b7647f68e52ad9b659642c598c2aab7736813bf61d07316900d843749c2f9f4c753bd2087711ca712cc430f12b3a475c63ae3e5b11aff7 SHA512 5fa042a350322fa74afa28dc5e53f15cad32517001ab817493bf0d13a64e6559712f5e61184ef38a97bc8fe69f8732aaf436bc5d1663e4873f8baebee2e00892
+DIST mysql++-3.3.0.tar.gz 4635623 BLAKE2B 0d5bb3dc7eeee92d10eb82b0537a7caff7faec2f330bb3081790b63544caa2e6967aaaf2adc8f68b9b0854da8f0374eda73d4ced50d77fbc119f83fec84376e3 SHA512 cd50f9edc9531b385d91d70aa292629dc7b839fd296f07db470f37c4748617c5c2dba647adf8965d70e2788e9264288d8ca941a6dcd8d08ff7d838e7947e6465
 EBUILD mysql++-3.2.5.ebuild 1689 BLAKE2B 02ab642e69128f159ae66a288fbf651cd9c6176ebe1eaf2f26c9276b0235082c3bcda507ead81b812d41ed4bf8e9f327f9cae7b558af29cf72b401d1f6b59012 SHA512 cf1451689bb7509e58358e49ad526b94b89997756d420a23f4592fe3372974e9f243a9cdd7dd28db4db020e121eab2419ce45f2ccb1bece30c2d6876526201b7
+EBUILD mysql++-3.3.0.ebuild 1655 BLAKE2B 3afa80f70427946b354c622c63423549f8b94ae966bd94c794be6a6498390b4a0549f58463f45886c5079e832ab3dadd828e9c67f6fe2f60743bc574868f61e8 SHA512 5dadf754a857e839759d455c0736a7f037a9e08bbede29515a23332fce0a17594e51b55a936ffd18430bec8615bec501533879dc5b2b3aa617744da40835fdcc
 MISC metadata.xml 239 BLAKE2B c4d6706d083b72927d239f41a644a4009c054c1c1a388af7733d3a2daf47d354009eb472573304a6be272601f05535297bcd9ceaea811a741cd905577ffe53d1 SHA512 e6e2fafe2f503db1d12e3d2368a99631ee8d014b7ea802d9879e7e3e2c0f9378675fffccd78ed09b914ae781ac3902567b1a53a721906e3ea63ceb51d0a1654b
diff --git a/dev-db/mysql++/mysql++-3.3.0.ebuild b/dev-db/mysql++/mysql++-3.3.0.ebuild
new file mode 100644
index 000000000000..8e4e26e8bd4c
--- /dev/null
+++ b/dev-db/mysql++/mysql++-3.3.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools libtool flag-o-matic
+
+DESCRIPTION="C++ API interface to the MySQL database"
+HOMEPAGE="https://tangentsoft.net/mysql++/"
+SRC_URI="https://www.tangentsoft.net/mysqlpp/releases/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0/3"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+IUSE="doc"
+
+RDEPEND="|| ( dev-db/mysql-connector-c dev-db/mariadb-connector-c )"
+DEPEND="${RDEPEND}"
+DOCS=( CREDITS.txt CONTRIBUTING.md doc/ssqls-pretty )
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.2.1-gold.patch
+	"${FILESDIR}"/${PN}-3.2.4-only-unit-tests.patch
+)
+
+src_prepare() {
+	# Bug filed upstream about deprecated std::auto_ptr
+	append-cxxflags $(test-flags-CXX -Wno-deprecated-declarations)
+	# Bad symlink for libtool in the archive
+	rm "${S}/ltmain.sh" || die
+
+	default
+
+	# we don't use eautoreconf to avoid dev-util/bakefile
+	_elibtoolize --auto-ltdl --install --copy --force
+	elibtoolize
+
+	# Current MySQL libraries are always with threads and slowly being removed
+	sed -i -e "s/mysqlclient_r/mysqlclient/" "${S}/configure" || die
+	rm "${S}/doc/"README-*-RPM.txt || die
+}
+
+src_configure() {
+	local myconf=(
+		--enable-thread-check
+		--with-mysql="${EPREFIX}/usr"
+		--with-mysql-lib="${EPREFIX}$(mysql_config --variable=pkglibdir)"
+		--with-mysql-include="${EPREFIX}$(mysql_config --variable=pkgincludedir)"
+	)
+	econf "${myconf[@]}"
+}
+
+src_test() {
+	ONLY_UNIT_TESTS=1 "${S}"/dtest || die
+}
+
+src_install() {
+	default
+	# install the docs and HTML pages
+	use doc && dodoc -r doc/pdf/ doc/refman/ doc/userman/ doc/html/
+}
diff --git a/dev-db/mysql-cluster/Manifest b/dev-db/mysql-cluster/Manifest
index 17ae7287b06b..61533f14cf02 100644
--- a/dev-db/mysql-cluster/Manifest
+++ b/dev-db/mysql-cluster/Manifest
@@ -5,7 +5,7 @@ DIST mysql-cluster-gpl-7.2.34.tar.gz 25114728 BLAKE2B b9337cf8ae6742c58f92ae64b8
 DIST mysql-cluster-gpl-7.3.22.tar.gz 41356026 BLAKE2B 055a3f8590f0e2e53f8620244bd2ca7d619ab5549de7b33c4d41d2fabd260d98eaabdc0169488a6d018bcafc4458433e21b65025827998a31e9abc1deb5101ae SHA512 ccb9f3429e6ccb2dbb53d98f54abeae3c3128e65dc69c41918324630fef665f48d3c3af2d60bf1cce4e28c492e525c6bbc32cc8a39a9ea47988184adeafd5bd3
 DIST mysql-cluster-gpl-7.4.21.tar.gz 41718490 BLAKE2B 4578e477b345c85ccf12e4ea79893dda9b33bf35722ff8c6d706f150d8506d07b5e49a8e69e37cb3c8ff449832c80f72430924559b4a6d209d11d31cc2a67ca4 SHA512 48f475806608c0f6e0c45cc9c3b3851678153e17cf5c74114b2ca7a75eee455798c8decb857738eecb3fe664930e378e1d399509a954a7073802285eb87801b5
 DIST mysql-extras-20190121-0015Z.tar.bz2 330807 BLAKE2B d5beae3d5a493e01d57130f835cd0d7dcbf53af389f9b933446ab43b86f96c85b5858a7a56ffe882ee63371ab96f0226e04f710dfb119ddd91b5c5685d0999bc SHA512 2f092b8e1e2f836d19e4663d383be876d498bca0ee005a690f48ba1797e9e5b648c4a15c36885faa286ce12a49386bf2898940e19eb1d288e7ee084968821a05
-EBUILD mysql-cluster-7.2.34.ebuild 25565 BLAKE2B b7078cad7b6a074ef349e8186a854397270bd2f07e9190e8d43420fa972e56d30df5083041052e73bfcb149b38490a4451f33be89fbe38c8a48ed7df4624b1cc SHA512 e21777d337ac4a5245322b1149b16aeda9b87e88dc884e307f70a0d67657e3fe8ff5d4a2a80d54158eeda9f412a781eed1654a556f2bcf02f3e9f7ba675ae3c5
-EBUILD mysql-cluster-7.3.22.ebuild 26021 BLAKE2B 58405a45bf041018f155f20bdd43f3e1919974921311b489935e4ac37f56e442648ab8f58795c1274983b906a253f0f97444871ff10dc19f50ef6fffa2a80e63 SHA512 786e179f84b206ff51361e12f461098400a8bc553ac3986397491dcbccea47799602221a90b102244ca13981c575fb706c69d5cb3d0b650cd92bb28955487ebb
-EBUILD mysql-cluster-7.4.21.ebuild 26021 BLAKE2B 5dc4e9382892630f825dc07735dc64084cb6c204630607850e6f436cc12b64c48c8116d25b5bc706e313158d672584cd5b1b010ac26c8e860c1d57377d8f9340 SHA512 da9036473459491f2f6c0e91f370c7fb0d5dab7b889768be88cda46372233f2546e28c2a75907dafc6cdcacc2cfc98e93d7c6284a947fcbb3307fc70e411c856
-MISC metadata.xml 1248 BLAKE2B 02eec2cf13c1d1ec71d92a3a6e15a65966e3a6de1595f5027159e8eb6c6c67a38994fe7c051746ff9f820138c51f21afd46214c0a686e9e107668b3eaba9950d SHA512 ce4c1b021cf1d5381c4523b9c047ce3a580ea807cfa81557d398ef5bf92bb0d30d1145d0fde299f1dbab8837b09731eea1767a864964ec9d66393096e61661f5
+EBUILD mysql-cluster-7.2.34.ebuild 25253 BLAKE2B 8e11f13fc932e847ff9727597ae21c6c3285f6a2834f3df0ae9b7a3c66e321ebea77752ae82e82dab837569db987fa3b6b142934dcfb837bae832a898cb9d756 SHA512 cac4e4db56cc39316cd9cb516cdd69de24a9622aa09f75c3224c9668df0622318cc53c659412becc0a301750c6da0113c8ca36dedb6fda90b728c2fdc07d35be
+EBUILD mysql-cluster-7.3.22.ebuild 25709 BLAKE2B 31bf348240afdd8bd94fc7b2dd4c9f0ad9db18e18eda871320f2eba9c9c0beab841ad3b051202dfaedcca91000fd1d3929c1717a0fdcdc5b695c5158cb30015c SHA512 0dad574f9eab20450078dbc6094c40961855f34d2992927f742bac258f62d43f70a6924fbeed3da185809c1ed578539b3ffd1fbf2c05a2cad16f71d8c0736c6a
+EBUILD mysql-cluster-7.4.21.ebuild 25709 BLAKE2B b00417ed38df0304a4976eec949ec277c1e1f1a92ba406a7750f4fba24865950575d2ef919c2801e03e186beb33c32a3fcbdc1ba63122c0b9825322652d559e7 SHA512 71a9fcd958d7d8a4a8c67f31439ad7fca3fe4694497039abca39a4dd24db645fbf9c62c6167447912eae21397fcb8f105e544862856affc9410c61b1d678e388
+MISC metadata.xml 1138 BLAKE2B 04b798f7c631682ba123338226c0c2932d5ca89827a390b96a1b63cc8690a2bcbbe6922e50c81cc3a32edaacaecda0c253b33f3efabc541d5fe6937788728020 SHA512 ccfa5aba6c89cc7885d54001bdcb9d978646d1cd002125bb4356891dc15b69c4f2785c21956f6df5420672067ff577dd66e3cfcca1b2cab2623a356e0386ebb3
diff --git a/dev-db/mysql-cluster/metadata.xml b/dev-db/mysql-cluster/metadata.xml
index c82ebfd6fc59..13a8c6dcbb33 100644
--- a/dev-db/mysql-cluster/metadata.xml
+++ b/dev-db/mysql-cluster/metadata.xml
@@ -9,7 +9,6 @@
   <flag name="client-libs">Build the client libraries from the server package instead of the C Connector packages (not recommended)</flag>
   <flag name="extraengine">Add support for alternative storage engines (Archive, CSV, Blackhole, Federated(X), Partition)</flag>
   <flag name="latin1">Use LATIN1 encoding instead of UTF8</flag>
-  <flag name="libressl">Enable SSL connections and crypto functions using <pkg>dev-libs/libressl</pkg></flag>
   <flag name="numa">Enable NUMA support using <pkg>sys-process/numactl</pkg> (NUMA kernel support is also required)</flag>
   <flag name="profiling">Add support for statement profiling (requires USE=community).</flag>
   <flag name="server">Build the server program</flag>
diff --git a/dev-db/mysql-cluster/mysql-cluster-7.2.34.ebuild b/dev-db/mysql-cluster/mysql-cluster-7.2.34.ebuild
index bd54a6729ec9..31bc6c2f2198 100644
--- a/dev-db/mysql-cluster/mysql-cluster-7.2.34.ebuild
+++ b/dev-db/mysql-cluster/mysql-cluster-7.2.34.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -24,12 +24,11 @@ HOMEPAGE="https://mysql.com/"
 DESCRIPTION="An enhanced, drop-in replacement for MySQL"
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="bindist client-libs debug extraengine java jemalloc latin1 libressl
+IUSE="bindist client-libs debug extraengine java jemalloc latin1
 	+perl profiling selinux +server	static static-libs systemtap tcmalloc
 	test yassl"
 
-# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
-RESTRICT="!bindist? ( bindist ) !test? ( test ) libressl? ( test )"
+RESTRICT="!bindist? ( bindist ) !test? ( test )"
 
 REQUIRED_USE="?? ( tcmalloc jemalloc )
 	static? ( yassl )"
@@ -78,8 +77,7 @@ COMMON_DEPEND="
 	tcmalloc? ( dev-util/google-perftools:0= )
 	systemtap? ( >=dev-util/systemtap-1.3:0= )
 	!yassl? (
-		!libressl? ( dev-libs/openssl:0= !>=dev-libs/openssl-1.1 )
-		libressl? ( dev-libs/libressl:0= )
+		dev-libs/openssl:0= !>=dev-libs/openssl-1.1
 	)
 	>=sys-libs/zlib-1.2.3:0=
 	sys-libs/ncurses:0=
@@ -196,11 +194,6 @@ src_prepare() {
 		echo > "${S}/support-files/SELinux/CMakeLists.txt" || die
 	fi
 
-	if use libressl ; then
-		sed -i 's/OPENSSL_MAJOR_VERSION STREQUAL "1"/OPENSSL_MAJOR_VERSION STREQUAL "2"/' \
-			"${S}/cmake/ssl.cmake" || die
-	fi
-
 	local plugin
 	local server_plugins=( semisync )
 	local test_plugins=( audit_null daemon_example fulltext )
diff --git a/dev-db/mysql-cluster/mysql-cluster-7.3.22.ebuild b/dev-db/mysql-cluster/mysql-cluster-7.3.22.ebuild
index 7969b44c5892..fdbc2cad350a 100644
--- a/dev-db/mysql-cluster/mysql-cluster-7.3.22.ebuild
+++ b/dev-db/mysql-cluster/mysql-cluster-7.3.22.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -24,12 +24,11 @@ HOMEPAGE="https://mysql.com/"
 DESCRIPTION="An enhanced, drop-in replacement for MySQL"
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="client-libs debug extraengine jemalloc latin1 libressl numa
+IUSE="client-libs debug extraengine jemalloc latin1 numa
 	+perl profiling selinux +server	static static-libs systemtap tcmalloc
 	test yassl"
 
-# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
-RESTRICT="!test? ( test ) libressl? ( test )"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="?? ( tcmalloc jemalloc )
 	static? ( yassl )"
@@ -80,8 +79,7 @@ COMMON_DEPEND="
 	tcmalloc? ( dev-util/google-perftools:0= )
 	systemtap? ( >=dev-util/systemtap-1.3:0= )
 	!yassl? (
-		!libressl? ( >=dev-libs/openssl-1.0.0:0= )
-		libressl? ( dev-libs/libressl:0= )
+		>=dev-libs/openssl-1.0.0:0=
 	)
 	>=sys-libs/zlib-1.2.3:0=
 	sys-libs/ncurses:0=
@@ -197,11 +195,6 @@ src_prepare() {
 		echo > "${S}/support-files/SELinux/CMakeLists.txt" || die
 	fi
 
-	if use libressl ; then
-		sed -i 's/OPENSSL_MAJOR_VERSION STREQUAL "1"/OPENSSL_MAJOR_VERSION STREQUAL "2"/' \
-			"${S}/cmake/ssl.cmake" || die
-	fi
-
 	local plugin
 	local server_plugins=( semisync )
 	local test_plugins=( audit_null daemon_example fulltext )
diff --git a/dev-db/mysql-cluster/mysql-cluster-7.4.21.ebuild b/dev-db/mysql-cluster/mysql-cluster-7.4.21.ebuild
index ad252c1349b3..d78696ae60ea 100644
--- a/dev-db/mysql-cluster/mysql-cluster-7.4.21.ebuild
+++ b/dev-db/mysql-cluster/mysql-cluster-7.4.21.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -24,12 +24,11 @@ HOMEPAGE="https://mysql.com/"
 DESCRIPTION="An enhanced, drop-in replacement for MySQL"
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="client-libs debug extraengine jemalloc latin1 libressl numa
+IUSE="client-libs debug extraengine jemalloc latin1 numa
 	+perl profiling selinux +server	static static-libs systemtap tcmalloc
 	test yassl"
 
-# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
-RESTRICT="!test? ( test ) libressl? ( test )"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="?? ( tcmalloc jemalloc )
 	static? ( yassl )"
@@ -80,8 +79,7 @@ COMMON_DEPEND="
 	tcmalloc? ( dev-util/google-perftools:0= )
 	systemtap? ( >=dev-util/systemtap-1.3:0= )
 	!yassl? (
-		!libressl? ( >=dev-libs/openssl-1.0.0:0= )
-		libressl? ( dev-libs/libressl:0= )
+		>=dev-libs/openssl-1.0.0:0=
 	)
 	>=sys-libs/zlib-1.2.3:0=
 	sys-libs/ncurses:0=
@@ -197,11 +195,6 @@ src_prepare() {
 		echo > "${S}/support-files/SELinux/CMakeLists.txt" || die
 	fi
 
-	if use libressl ; then
-		sed -i 's/OPENSSL_MAJOR_VERSION STREQUAL "1"/OPENSSL_MAJOR_VERSION STREQUAL "2"/' \
-			"${S}/cmake/ssl.cmake" || die
-	fi
-
 	local plugin
 	local server_plugins=( semisync )
 	local test_plugins=( audit_null daemon_example fulltext )
diff --git a/dev-db/mysql-connector-c++/Manifest b/dev-db/mysql-connector-c++/Manifest
index 994488b4e83c..53c3abe89f8d 100644
--- a/dev-db/mysql-connector-c++/Manifest
+++ b/dev-db/mysql-connector-c++/Manifest
@@ -1,8 +1,6 @@
 AUX mysql-connector-c++-1.1.11-fix-mariadb.patch 1939 BLAKE2B 4ca552777bfcb8671e5dc0213c411f9e1e8fbcbeb0f9f3369572c82ba03304a9df2ab98725b1fb3a365a63e4c8ed9d3d86332c54ffcb14210469b3d6078d89da SHA512 3d02972b57a0c2a544edef9ec5050c82f9214a7013e941cdc13a8f0742b7608812f33bc0c84367e70ea556562efb653297730ce5fc8d928458c5af1d71f3f60a
 AUX mysql-connector-c++-1.1.6-fix-cmake.patch 762 BLAKE2B 4cecebd2cb075c6e1af7ab74a84132f41beeeb202d4d286038b05cbbb202cef709e7114563bdbee12aab4e6a738a9e23bbb9455fc1ce0f906d952af4e0042f05 SHA512 c4c89b398aa88a9e7b4ed4cf42b055b79670dc70685775afd1ef2d683e5b3754575c831a6083ef0d097431e796513597e1daf7737e3ade710abad917f63ed32f
 AUX mysql-connector-c++-8.0.19-fix-build.patch 9695 BLAKE2B c3334f74160a9b1148a588c7190db6f3a79fe70530d921428b7d86ec02f01324cf02c4130cd8d0cf42ecc4ccaccbecf90ffe0ac1cf8b265ea5cd9dea1046f30f SHA512 3d726b70a270e56ab38e8cebe5eb0186c4d0293dbd72844914ca9ef20674f20bc0fb4d2f0c449da77e4e6a81cc3ae454447a7983468d386e73f946dccd4a20cc
-AUX mysql-connector-c++-8.0.19-fix-libressl-support.patch 3358 BLAKE2B 795c9f313d2495c3fee01066c7116fa3272a162b7401359657256d1adfb24d236049bbad6016e763de2a62ec9b6ccc93546eccffc457ae0bafca29b2c7e21b5d SHA512 d7b4b1424a6fd237ad0e7bd5648b156f770e352ec8fb3edfa6dfb767ebbe73e8ebc186b327e8543aa7bc12b7bc6081fae225a6ff0e153e25bb76900142adaa31
-AUX mysql-connector-c++-8.0.20-fix-libressl-support.patch 3299 BLAKE2B a78d87ed7d483ac04b6676214941048d17c40215aa248dfda152c2d149469ce8595fb4b76f26a96f965e001ca58db95b7d4a4f50607076178ee4d57008626657 SHA512 529b1a6a3b0ecc7861601e665c494602d4b362d7259f93738e422c428416720d38185f2dd959e456d367e31442ecf046a266fc2dbef39cd3a29e439eca0ae266
 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
 DIST mysql-connector-c++-1.1.12.tar.gz 518615 BLAKE2B 386a4753ca3f03999a49a89507da1b1172b3db89797c38403fee4eea86e7108a5e4f91f24a17de86d585c2a3d9e5742a117fa84d9b14aad649f938a597f3dae9 SHA512 d7e132dbc2efda4a77f8ae00c24006a1ade1d0a50f22d89ece453505e6d206427ee7988df29c0d6ef8b396ad6b8d326b6d263a1d4fa08ef5db0966fb4f1479f4
@@ -12,11 +10,11 @@ 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
-EBUILD mysql-connector-c++-1.1.12-r1.ebuild 1636 BLAKE2B e0e977f956845c46bc99a003b5e74fe5d085e1d5e2b9648474f27028b0d99b1764438fb07da8008c3fdef677fc35310342ad2988ada1f54a8c7a9583f5904a41 SHA512 5a80daba3b6038b57c284e409284106b19bcbb426fc2ba56d73d3c65fbad4343d150e7714782f558a94160dec90482cd88426ba5771bafc02300fa722b065778
-EBUILD mysql-connector-c++-8.0.19.ebuild 1067 BLAKE2B 8407348e0e4da0ea8acca8ec0caa33a0c2e863c9a95d6951ce500b6306b77687e76ca867eeeb580dc5e9b8a9df3dff7ca0a8cb8ae95403a9a117d50d2dc8d869 SHA512 83d72ab1104a0ebd014d8b3e1f475944f16a18dc4836386e3ebf7b16df547f35cf7db42c586411fcef80ec6273f15a0f9531b197eaecb991a62301d9a9d3ff4b
-EBUILD mysql-connector-c++-8.0.20.ebuild 1070 BLAKE2B bd6b438aa0a660bc19a50695ed77fa5f952aabfb6ff1996244eed5846476bb0c725cf2d4899105c88f1409725ebe80970655ac4f51b7012d1fccc3539a69a062 SHA512 d54363d3172c98ef6d500a336fc98c8d8abdd28e443e09e2ce50e85353c374cdd95739b9d6ab636d4aad3a8647bca1eb99329a761a10ff3ffb2040c1ec3796e8
-EBUILD mysql-connector-c++-8.0.21.ebuild 1055 BLAKE2B 7a85e4631367e2a34989a8fc998d80d87c5b6b0220296e7f2f75121766db9c10f66b8838e633c0fc51b43c8314e3521a7cbc1fc0ed2a6fec87e67a6a18b0e91c SHA512 7661f1404a55a3342d90c26fbc36e0f1dc060301f82aadf4b814eedfdeeb7a9698f05e3ab8c552b1be03490e6a4591ac36ca28a7a60604a98844a9136ae063cc
-EBUILD mysql-connector-c++-8.0.22.ebuild 1055 BLAKE2B 38dbc920d1e67aa065f6f8dfef6c56a515df757c8939e5f893941e66ae2ad361e350abbbe51b824ab4e24017dd55b0a68f588f99d0cb6d74b8713ddbbea10734 SHA512 1390b0edd15b93ec2446278ff70c043fb4ea2a1311e66099b5e7d558d1de2a6698e59ca609c933319c51a47c042a1724faef0eb70dc25a1e7fc5e19cd668e836
-EBUILD mysql-connector-c++-8.0.23.ebuild 1056 BLAKE2B 6e375f9088ffa5441e3468407238182d664fd62c080f4f8d15eb2c51268723ef4dd1cd7eb36c77fc3a24c389b13a5aca0d72f97bef340664dd3cfb607e09ed67 SHA512 764d0a1f4fbb0eac47c44a47786c27317b8dca15d42448e35f98f211a07495b4b4f56c2445ed43ad7be75d07a1a438f797b0ecec4917f72ecf32d7953289003f
-EBUILD mysql-connector-c++-8.0.24.ebuild 1113 BLAKE2B 5b8f216b60a96a407efe4188abef512223717d6a847bf4b1b0367796c44ace03c45f2d27fd91a82b703d11242b4320390bc246d7ad8d6a4d4b2c1d46376aacf7 SHA512 0fdb2c8d469328e0c949a1611a7ce784b870cfe989fbc1c01b1f33f49b31f7d1ca68515da689b0ccba3a842a3f1e9ac800d80b51679c36697d3ce97f0d38de57
+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 1000 BLAKE2B abcddf5543739bfef6a0df54a2ceb7e902620f8912777d9b12588a8fc3aa9c109f4b9a981e18483f2cd8bb33906b00b59bda3ff77563ac6a92aa18388c4b48d1 SHA512 e6b734d9af7d10d76c7c65795d77016e5e196c6a74ca0ba871ed2856fecdb519fd0505bd8debbb3cfd4a542078d6de62f217626d3a30aeeb0faddfce26be4714
 MISC metadata.xml 378 BLAKE2B 43fdbbc8d3b6ef99e51da96ddfefbdeaa70ef5fcb2fc6067305f75f75b7ee2fd21b79ca76704d8752bf59ae057b28efb187b063770964246f93fea629b58b467 SHA512 c6e545fb60d306792421ea26a937aaa6aea53d2a4100c9cafe78cf695c9dd0620cf3e770d43ff42749ae42bbe3a35212407ea84edee9af2dcb0255c2b763ddfc
diff --git a/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.19-fix-libressl-support.patch b/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.19-fix-libressl-support.patch
deleted file mode 100644
index fc6eb777063e..000000000000
--- a/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.19-fix-libressl-support.patch
+++ /dev/null
@@ -1,89 +0,0 @@
---- a/cdk/cmake/DepFindSSL.cmake
-+++ b/cdk/cmake/DepFindSSL.cmake
-@@ -88,7 +88,7 @@ function(main)
- 
-   set(OPENSSL_LIB_DIR "${OPENSSL_LIB_DIR}" CACHE INTERNAL "")
- 
--  if(NOT OPENSSL_VERSION_MAJOR EQUAL 1)
-+  if(NOT OPENSSL_VERSION_MAJOR VERSION_GREATER_EQUAL 1)
-     message(SEND_ERROR "OpenSSL version 1.x is required but version ${OPENSSL_VERSION} was found")
-   else()
-     message(STATUS "Using OpenSSL version: ${OPENSSL_VERSION}")
-@@ -182,42 +182,33 @@ function(find_openssl)
-   set(OPENSSL_INCLUDE_DIR "${OPENSSL_INCLUDE_DIR}" PARENT_SCOPE)
-   message("-- found OpenSSL headers at: ${OPENSSL_INCLUDE_DIR}")
- 
--
-   # Verify version number. Version information looks like:
--  #   #define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.1a  20 Nov 2018"
--
-+  #   #define OPENSSL_VERSION_NUMBER 0x1000103fL
-+  # Encoded as MNNFFPPS: major minor fix patch status
-   FILE(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h"
-     OPENSSL_VERSION_NUMBER
--    REGEX "#[ ]*define[\t ]+OPENSSL_VERSION_TEXT"
-+    REGEX "^#[ ]*define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x[0-9].*"
-   )
--
--  #message("== OPENSSL_VERSION_NUMBER: ${OPENSSL_VERSION_NUMBER}")
-   STRING(REGEX REPLACE
--    "^.*OPENSSL_VERSION_TEXT[\t ]+\"OpenSSL[\t ]([0-9]+)\\.([0-9]+)\\.([0-9]+)([a-z]*)[\t ].*$"
--    "\\1;\\2;\\3;\\4"
--    version_list "${OPENSSL_VERSION_NUMBER}"
-+    "^.*OPENSSL_VERSION_NUMBER[\t ]+0x([0-9]).*$" "\\1"
-+    OPENSSL_VERSION_MAJOR "${OPENSSL_VERSION_NUMBER}"
-+  )
-+  STRING(REGEX REPLACE
-+    "^.*OPENSSL_VERSION_NUMBER[\t ]+0x[0-9]([0-9][0-9]).*$" "\\1"
-+    OPENSSL_VERSION_MINOR "${OPENSSL_VERSION_NUMBER}"
-+  )
-+  STRING(REGEX REPLACE
-+    "^.*OPENSSL_VERSION_NUMBER[\t ]+0x[0-9][0-9][0-9]([0-9][0-9]).*$" "\\1"
-+    OPENSSL_VERSION_FIX "${OPENSSL_VERSION_NUMBER}"
-   )
--  #message("-- OPENSSL_VERSION: ${version_list}")
--
--  list(GET version_list 0 OPENSSL_VERSION_MAJOR)
--  math(EXPR OPENSSL_VERSION_MAJOR ${OPENSSL_VERSION_MAJOR})
--
--  list(GET version_list 1 OPENSSL_VERSION_MINOR)
--  math(EXPR OPENSSL_VERSION_MINOR ${OPENSSL_VERSION_MINOR})
--
--  list(GET version_list 2 OPENSSL_VERSION_FIX)
--  math(EXPR OPENSSL_VERSION_FIX ${OPENSSL_VERSION_FIX})
--
--  list(GET version_list 3 OPENSSL_VERSION_PATCH)
--
--
- 
-   set(OPENSSL_VERSION
--    "${OPENSSL_VERSION_MAJOR}.${OPENSSL_VERSION_MINOR}.${OPENSSL_VERSION_FIX}${OPENSSL_VERSION_PATCH}"
-+    "${OPENSSL_VERSION_MAJOR}.${OPENSSL_VERSION_MINOR}.${OPENSSL_VERSION_FIX}"
-     PARENT_SCOPE
-   )
-   set(OPENSSL_VERSION_MAJOR ${OPENSSL_VERSION_MAJOR} PARENT_SCOPE)
- 
-+  CHECK_SYMBOL_EXISTS(TLS1_3_VERSION "openssl/tls1.h" HAVE_TLS1_3_VERSION)
- 
-   find_library(OPENSSL_LIBRARY
-     NAMES ssl ssleay32 ssleay32MD libssl
---- a/cdk/foundation/connection_openssl.cc
-+++ b/cdk/foundation/connection_openssl.cc
-@@ -211,7 +211,7 @@ static void throw_ssl_error(SSL* tls, int err)
-   case SSL_ERROR_WANT_CONNECT:
-   case SSL_ERROR_WANT_ACCEPT:
-   case SSL_ERROR_WANT_X509_LOOKUP:
--# if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+# if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
-   case SSL_ERROR_WANT_ASYNC:
-   case SSL_ERROR_WANT_ASYNC_JOB:
- # endif
-@@ -387,7 +387,7 @@ void TLS_helper::setup(SSL_CTX *ctx)
- 
-   SSL_CTX_set_cipher_list(ctx, m_cipher_list.c_str());
- 
--#if OPENSSL_VERSION_NUMBER>=0x1010100fL
-+#if HAVE_TLS1_3_VERSION
- 
-   /*
-     Note: If TLSv1.3 is not enabled, there is no need to restrict
diff --git a/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.20-fix-libressl-support.patch b/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.20-fix-libressl-support.patch
deleted file mode 100644
index f2ae0d02ed7f..000000000000
--- a/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.20-fix-libressl-support.patch
+++ /dev/null
@@ -1,88 +0,0 @@
---- a/cdk/cmake/DepFindSSL.cmake
-+++ b/cdk/cmake/DepFindSSL.cmake
-@@ -88,7 +88,7 @@ function(main)
- 
-   set(OPENSSL_LIB_DIR "${OPENSSL_LIB_DIR}" CACHE INTERNAL "")
- 
--  if(NOT OPENSSL_VERSION_MAJOR EQUAL 1)
-+  if(NOT OPENSSL_VERSION_MAJOR VERSION_GREATER_EQUAL 1)
-     message(SEND_ERROR "OpenSSL version 1.x is required but version ${OPENSSL_VERSION} was found")
-   else()
-     message(STATUS "Using OpenSSL version: ${OPENSSL_VERSION}")
-@@ -184,41 +184,35 @@ function(find_openssl)
- 
- 
-   # Verify version number. Version information looks like:
--  #   #define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.1a  20 Nov 2018"
-+  #   #define OPENSSL_VERSION_NUMBER 0x1000103fL
-+  # Encoded as MNNFFPPS: major minor fix patch status
- 
-   FILE(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h"
-     OPENSSL_VERSION_NUMBER
--    REGEX "#[ ]*define[\t ]+OPENSSL_VERSION_TEXT"
-+    REGEX "^#[ ]*define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x[0-9].*"
-   )
- 
--  #message("== OPENSSL_VERSION_NUMBER: ${OPENSSL_VERSION_NUMBER}")
--  # define OPENSSL_VERSION_TEXT "OpenSSL 1.1.1d-freebsd 10 Sep 2019"
-   STRING(REGEX REPLACE
--    "^.*OPENSSL_VERSION_TEXT[\t ]+\"OpenSSL[\t ]([0-9]+)\\.([0-9]+)\\.([0-9]+)([a-z]|)[\t \\-].*$"
--    "\\1;\\2;\\3;\\4"
--    version_list "${OPENSSL_VERSION_NUMBER}"
-+    "^.*OPENSSL_VERSION_NUMBER[\t ]+0x([0-9]).*$" "\\1"
-+    OPENSSL_VERSION_MAJOR "${OPENSSL_VERSION_NUMBER}"
-+  )
-+  STRING(REGEX REPLACE
-+    "^.*OPENSSL_VERSION_NUMBER[\t ]+0x[0-9]([0-9][0-9]).*$" "\\1"
-+    OPENSSL_VERSION_MINOR "${OPENSSL_VERSION_NUMBER}"
-+  )
-+  STRING(REGEX REPLACE
-+    "^.*OPENSSL_VERSION_NUMBER[\t ]+0x[0-9][0-9][0-9]([0-9][0-9]).*$" "\\1"
-+    OPENSSL_VERSION_FIX "${OPENSSL_VERSION_NUMBER}"
-   )
--  #message("-- OPENSSL_VERSION: ${version_list}")
--
--  list(GET version_list 0 OPENSSL_VERSION_MAJOR)
--  math(EXPR OPENSSL_VERSION_MAJOR ${OPENSSL_VERSION_MAJOR})
--
--  list(GET version_list 1 OPENSSL_VERSION_MINOR)
--  math(EXPR OPENSSL_VERSION_MINOR ${OPENSSL_VERSION_MINOR})
--
--  list(GET version_list 2 OPENSSL_VERSION_FIX)
--  math(EXPR OPENSSL_VERSION_FIX ${OPENSSL_VERSION_FIX})
--
--  list(GET version_list 3 OPENSSL_VERSION_PATCH)
--
- 
- 
-   set(OPENSSL_VERSION
--    "${OPENSSL_VERSION_MAJOR}.${OPENSSL_VERSION_MINOR}.${OPENSSL_VERSION_FIX}${OPENSSL_VERSION_PATCH}"
-+    "${OPENSSL_VERSION_MAJOR}.${OPENSSL_VERSION_MINOR}.${OPENSSL_VERSION_FIX}"
-     PARENT_SCOPE
-   )
-   set(OPENSSL_VERSION_MAJOR ${OPENSSL_VERSION_MAJOR} PARENT_SCOPE)
- 
-+  CHECK_SYMBOL_EXISTS(TLS1_3_VERSION "openssl/tls1.h" HAVE_TLS1_3_VERSION)
- 
-   find_library(OPENSSL_LIBRARY
-     NAMES ssl ssleay32 ssleay32MD libssl
---- a/cdk/foundation/connection_openssl.cc
-+++ b/cdk/foundation/connection_openssl.cc
-@@ -211,7 +211,7 @@ static void throw_ssl_error(SSL* tls, int err)
-   case SSL_ERROR_WANT_CONNECT:
-   case SSL_ERROR_WANT_ACCEPT:
-   case SSL_ERROR_WANT_X509_LOOKUP:
--# if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+# if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
-   case SSL_ERROR_WANT_ASYNC:
-   case SSL_ERROR_WANT_ASYNC_JOB:
- # endif
-@@ -387,7 +387,7 @@ void TLS_helper::setup(SSL_CTX *ctx)
- 
-   SSL_CTX_set_cipher_list(ctx, m_cipher_list.c_str());
- 
--#if OPENSSL_VERSION_NUMBER>=0x1010100fL
-+#if HAVE_TLS1_3_VERSION
- 
-   /*
-     Note: If TLSv1.3 is not enabled, there is no need to restrict
diff --git a/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.12-r1.ebuild b/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.12-r1.ebuild
index 8ba7f35606be..a80ceec4db35 100644
--- a/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.12-r1.ebuild
+++ b/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.12-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -13,12 +13,11 @@ SRC_URI="https://dev.mysql.com/get/Downloads/${URI_DIR}/${P}.tar.gz"
 LICENSE="Artistic GPL-2"
 SLOT="0/7"
 KEYWORDS="amd64 arm ~arm64 ppc ppc64 sparc x86"
-IUSE="debug examples gcov libressl static-libs"
+IUSE="debug examples gcov static-libs"
 
 DEPEND="dev-db/mysql-connector-c:=
 	dev-libs/boost:=
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
+	dev-libs/openssl:0=
 	!<dev-db/mysql-connector-c-6.1.8"
 RDEPEND="${DEPEND}"
 
diff --git a/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.19.ebuild b/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.19.ebuild
index 1e2ef79a9a73..b02bf3f85f04 100644
--- a/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.19.ebuild
+++ b/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.19.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -14,7 +14,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"
-IUSE="+legacy libressl"
+IUSE="+legacy"
 
 RDEPEND="
 	dev-libs/protobuf:=
@@ -22,14 +22,13 @@ RDEPEND="
 		dev-libs/boost:=
 		>=dev-db/mysql-connector-c-6.1.8:=
 	)
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )"
+	dev-libs/openssl:0=
+"
 DEPEND="${RDEPEND}"
 S="${WORKDIR}/${P}-src"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-8.0.19-fix-build.patch
-	"${FILESDIR}"/${PN}-8.0.19-fix-libressl-support.patch
 )
 
 src_configure() {
diff --git a/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.20.ebuild b/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.20.ebuild
index fcacc48a0540..bad1c840c8f7 100644
--- a/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.20.ebuild
+++ b/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -14,7 +14,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"
-IUSE="+legacy libressl"
+IUSE="+legacy"
 
 RDEPEND="
 	dev-libs/protobuf:=
@@ -22,14 +22,13 @@ RDEPEND="
 		dev-libs/boost:=
 		>=dev-db/mysql-connector-c-6.1.8:=
 	)
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )"
+	dev-libs/openssl:0=
+	"
 DEPEND="${RDEPEND}"
 S="${WORKDIR}/${P}-src"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-8.0.19-fix-build.patch
-	"${FILESDIR}"/${PN}-8.0.20-fix-libressl-support.patch
 )
 
 src_configure() {
diff --git a/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.21.ebuild b/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.21.ebuild
index 679e73b030ff..40911b8f9442 100644
--- a/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.21.ebuild
+++ b/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.21.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -14,7 +14,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"
-IUSE="+legacy libressl"
+IUSE="+legacy"
 
 RDEPEND="
 	dev-libs/protobuf:=
@@ -22,14 +22,13 @@ RDEPEND="
 		dev-libs/boost:=
 		>=dev-db/mysql-connector-c-6.1.8:=
 	)
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )"
+	dev-libs/openssl:0=
+"
 DEPEND="${RDEPEND}"
 S="${WORKDIR}/${P}-src"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-8.0.19-fix-build.patch
-	"${FILESDIR}"/${PN}-8.0.20-fix-libressl-support.patch
 )
 
 src_configure() {
diff --git a/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.22.ebuild b/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.22.ebuild
index 3f0eadd2941b..99d319d98c90 100644
--- a/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.22.ebuild
+++ b/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.22.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -14,7 +14,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"
-IUSE="+legacy libressl"
+IUSE="+legacy"
 
 RDEPEND="
 	dev-libs/protobuf:=
@@ -22,14 +22,13 @@ RDEPEND="
 		dev-libs/boost:=
 		>=dev-db/mysql-connector-c-6.1.8:=
 	)
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )"
+	dev-libs/openssl:0=
+	"
 DEPEND="${RDEPEND}"
 S="${WORKDIR}/${P}-src"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-8.0.22-fix-build.patch
-	"${FILESDIR}"/${PN}-8.0.20-fix-libressl-support.patch
 )
 
 src_configure() {
diff --git a/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.23.ebuild b/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.23.ebuild
index a48f5e390114..629a5b274f44 100644
--- a/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.23.ebuild
+++ b/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.23.ebuild
@@ -14,7 +14,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"
-IUSE="+legacy libressl"
+IUSE="+legacy"
 
 RDEPEND="
 	dev-libs/protobuf:=
@@ -22,14 +22,13 @@ RDEPEND="
 		dev-libs/boost:=
 		>=dev-db/mysql-connector-c-6.1.8:=
 	)
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )"
+	dev-libs/openssl:0=
+	"
 DEPEND="${RDEPEND}"
 S="${WORKDIR}/${P}-src"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-8.0.22-fix-build.patch
-	"${FILESDIR}"/${PN}-8.0.20-fix-libressl-support.patch
 )
 
 src_configure() {
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 8edd7e9d054c..a7c6ee2c2274 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
@@ -14,7 +14,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"
-IUSE="+legacy libressl"
+IUSE="+legacy"
 
 RDEPEND="
 	dev-libs/protobuf:=
@@ -22,14 +22,13 @@ RDEPEND="
 		dev-libs/boost:=
 		>=dev-db/mysql-connector-c-6.1.8:=
 	)
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )"
+	dev-libs/openssl:0=
+	"
 DEPEND="${RDEPEND}"
 S="${WORKDIR}/${P}-src"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-8.0.22-fix-build.patch
-	"${FILESDIR}"/${PN}-8.0.20-fix-libressl-support.patch
 	"${FILESDIR}"/${PN}-8.0.24-gcc11-numeric_limits.patch
 )
 
diff --git a/dev-db/mysql-connector-c/Manifest b/dev-db/mysql-connector-c/Manifest
index babad7db4bcd..4c116ff42a62 100644
--- a/dev-db/mysql-connector-c/Manifest
+++ b/dev-db/mysql-connector-c/Manifest
@@ -1,11 +1,9 @@
 AUX mysql-connector-c-8.0.19-do-not-install-comp_err.patch 307 BLAKE2B 864c07e9d4fb9a38ac418476f4b7738caa1f2a5dc633ad5921859793983c7b42acd87263ce2703df5a8c7d3bc3d7a60efb28a3ff17c311d89cc7b12edd22574f SHA512 cbb9be24a67a649b68230fe3482063d2d16fb629233e070289eb1ab0011bd8c43b0c056e4b6ca430a62ce0e8f47bb9490cb6746b7dc3fe06a05670b078cd084f
-AUX mysql-connector-c-8.0.21-libressl.patch 13288 BLAKE2B 5aad519f99103e579356d89ae92dda1e2496268cebdfe8dd3797138a5efe03370365225581399bb2373b847f61e2b4be726d940cde624d3cdda94b5c69904a3a SHA512 f4d057ce159153133e100c71c65f75bd558ba1ea914cd878023dc4e4a628d63b60d0ac671a97d26863b3f48c3dc8984317bb09362378c3b96b8ed47f08c1f6ea
 AUX mysql-connector-c-8.0.22-always-build-decompress-utilities.patch 534 BLAKE2B 15bef04f750b5f373d8c5f39690e90be482bfea66430234befc777e9d84d0060d20e1290798ddacbf0e9f0f8db45ba0318d88b61aec3fd1e859285cefff446ef SHA512 7ae81f4fe020c12e45eba041dcca921fa93f42a12d8c8d840b1bec819c00de8b780a792e99cdc3cae55eef74c911de3087b6583d6213913b36428b96f0e1c3af
-AUX mysql-connector-c-8.0.23-libressl.patch 13374 BLAKE2B 991f1e921c3f06937c682ed5f111f1cc94a763010120c5b779bed3f4246b598e6cc7d514c6c7ce0e1783b160afd27b081ab13cfd94aa99dd43d6c4b3f32a6164 SHA512 936a9b5861c08afc4ab7db069a0dbe586ce364b0581508d726a4fb98a687badcf027f45805e0dfe82cc007f0c6c380f7f4436cb3d9023a01d797bbcf71646616
 DIST mysql-boost-8.0.22.tar.gz 285934450 BLAKE2B 1ba0c9bb9a0cb74af4842d3b746f8b690c122cfbf2c6d5201ce95e59a257427a8683dd8d5c2be31dfe9ece4761366c1287fa7b841c45db222725bf76b0639bc6 SHA512 792f2ada93ec67a4679228478c6b798e81d9e9f6d13c7f4977cb7682738a4aae3cb483294edc6b2fde16c3960e51af8786216c063ab500840afd39a609e4b612
 DIST mysql-boost-8.0.23.tar.gz 291039175 BLAKE2B 3a7d3e05c774085d6078d0d3effd58d2df47521615356a2aa5efc2ea2ef8457e19ad57a054926ccff0a4752ca71d0464daa7fe9a3ac6c1b1d3bd86a9a82dfc58 SHA512 b8c2e2ac772b7b730f8b3bac7a5afb205da173b3639500606e7d1fac74832a0134027951855a2dc81af015e6158c924927ad63b9e1f2e7c823d45d4c4961c3f8
 DIST mysql-boost-8.0.24.tar.gz 290263082 BLAKE2B a29f42b63c68b13fbe7433c7734e1269a1961c10cdd78cc1b9459a32fd833b5efc49e4ad70c3099d265f6e3b69596754e3947568d13104c52ba0d97fa1f1ddc3 SHA512 ad8510614251c056f0963f8e51b9ed5e75452ccbf2728254d662fcc3a7ee1bdc177d1d34e958ddc31c7e6b5b3af9377ef2d9cbdc0353676b3026619673447deb
-EBUILD mysql-connector-c-8.0.22.ebuild 2905 BLAKE2B 43f29fcbf984ac4cf6f8bf5faa9ec07ee3a9698b4b2dc0b4a2d9e277d26ea2fc443c64038db58d4043f0685c74f6310e1a8b40c0755af0f780c3eccb324fd408 SHA512 25d7bdaba59eb79d0a0dd9e72580b01233aa6885f7c225cb33813017b3e824eb19ace5cdf0421098b895a1c770700444ebbc8dd1fc8e398fb15948b3dfd23936
-EBUILD mysql-connector-c-8.0.23-r1.ebuild 3109 BLAKE2B 061ffdc701798e2e6b743b3fb22827a82bdf79bf69abdf458a4774f08a5afe5b861db5aee923c49ea134f652994583f0195878dba0fbd8468d65b262b09cea75 SHA512 f4890724a0a9e488f2a3d1751b331d57dfa617fb6e72f2669df7fe3f391b00313bb555203491f5a587e1eba8cba52a21e301a8e4a73b4a7f268beb9f0b56b4bf
-EBUILD mysql-connector-c-8.0.24.ebuild 3112 BLAKE2B 9633ef06c3bad96bb8b57fe1598f6a62e15d33651e8fa57e6ceaecca5a618b7f9ea28361ef17806eccde0081d10eec0658b195488ad0dabff9767c2771b5b26d SHA512 aeb9b2fcc6d9d4aba65ac01900f8cf5fd9cce93613528ec1a1981e868074ef45abb3bf70915b42804b728695a915b46cbbd6e37a45db2c13832ea1a850e4452d
+EBUILD mysql-connector-c-8.0.22.ebuild 2782 BLAKE2B a03af99dd8eb16b78a7b891b9eb6c79a893edef92410b614722f2857ee21d1b519f93f74842d89b56ef50d628abd4873c00b59b4fcc06f1606319c078c2b89f6 SHA512 7dbf5e4d22d5d000e702809b2356bbe842da16b1bb61aa7d8fc3fd62f56449f5d893f377cb9a4b5b4b7019679a05f20aa67fd570caa4d9ccf27dccdc9c549df4
+EBUILD mysql-connector-c-8.0.23-r1.ebuild 2986 BLAKE2B a7f75b2115e7e4f8caf06ba5a81d6227214178d9b70c12007f13615ea55d75c1918b6d38e9e47f5caa4dde3539df10c8a21a9fedf9b325cc82ed2a875a346467 SHA512 b916eaa8cf6a4d3b39e65ae531324b9c13fcc4a65fd69ebe6d9b476f220ffefa542d6e5c7f835a83d283b751119f84c81fef234a6b2d164e4cd91dffecef13c3
+EBUILD mysql-connector-c-8.0.24.ebuild 2989 BLAKE2B dd477388ac1abc078e65a9342456d1e84753ea7a8e02b3b93d610a90da3eacd630b6f43075cbdd1cd51781ef3c202bc0f1f4eea83064a629912ed571a73f31c8 SHA512 26808c1e0051cf7e3c92a74e61ca32c99b71a136fc407b7b058457c141807b7c08fe3b23f6b9b8035006d9bdf011dfc2041040ea14e3348b8c1318a5391165bc
 MISC metadata.xml 239 BLAKE2B c4d6706d083b72927d239f41a644a4009c054c1c1a388af7733d3a2daf47d354009eb472573304a6be272601f05535297bcd9ceaea811a741cd905577ffe53d1 SHA512 e6e2fafe2f503db1d12e3d2368a99631ee8d014b7ea802d9879e7e3e2c0f9378675fffccd78ed09b914ae781ac3902567b1a53a721906e3ea63ceb51d0a1654b
diff --git a/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.21-libressl.patch b/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.21-libressl.patch
deleted file mode 100644
index 78f3e78fd6d4..000000000000
--- a/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.21-libressl.patch
+++ /dev/null
@@ -1,356 +0,0 @@
-From 4aadff7b08f6a69160a44c1742d5a12fb5abc059 Mon Sep 17 00:00:00 2001
-From: Thomas Deutschmann <whissi@gentoo.org>
-Date: Thu, 30 Apr 2020 20:01:48 +0200
-Subject: [PATCH 5/5] Add LibreSSL support
-
-Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
----
- cmake/ssl.cmake                               |  5 +++--
- mysys/my_md5.cc                               |  2 ++
- .../bindings/xcom/xcom/xcom_ssl_transport.cc  |  6 +++++-
- plugin/x/client/xconnection_impl.cc           |  4 ++++
- router/src/http/src/tls_client_context.cc     |  2 +-
- router/src/http/src/tls_context.cc            |  9 ++++++--
- router/src/http/src/tls_server_context.cc     |  3 ++-
- sql-common/client.cc                          |  2 ++
- sql/mysqld.cc                                 |  4 +++-
- sql/sys_vars.cc                               | 21 +++++++++++++++++--
- vio/viossl.cc                                 |  8 +++----
- vio/viosslfactories.cc                        |  2 ++
- 12 files changed, 54 insertions(+), 14 deletions(-)
-
-diff --git a/cmake/ssl.cmake b/cmake/ssl.cmake
-index 52feadeaa..3b8332695 100644
---- a/cmake/ssl.cmake
-+++ b/cmake/ssl.cmake
-@@ -222,13 +222,14 @@ MACRO (MYSQL_CHECK_SSL)
-         OPENSSL_FIX_VERSION "${OPENSSL_VERSION_NUMBER}"
-         )
-     ENDIF()
--    IF("${OPENSSL_MAJOR_VERSION}.${OPENSSL_MINOR_VERSION}.${OPENSSL_FIX_VERSION}" VERSION_GREATER "1.1.0")
-+    CHECK_SYMBOL_EXISTS(TLS1_3_VERSION "openssl/tls1.h" HAVE_TLS1_3_VERSION)
-+    IF(HAVE_TLS1_3_VERSION)
-        ADD_DEFINITIONS(-DHAVE_TLSv13)
-     ENDIF()
-     IF(OPENSSL_INCLUDE_DIR AND
-        OPENSSL_LIBRARY   AND
-        CRYPTO_LIBRARY      AND
--       OPENSSL_MAJOR_VERSION STREQUAL "1"
-+       OPENSSL_MAJOR_VERSION VERSION_GREATER_EQUAL "1"
-       )
-       SET(OPENSSL_FOUND TRUE)
-       FIND_PROGRAM(OPENSSL_EXECUTABLE openssl
-diff --git a/mysys/my_md5.cc b/mysys/my_md5.cc
-index dea997b25..531696329 100644
---- a/mysys/my_md5.cc
-+++ b/mysys/my_md5.cc
-@@ -56,7 +56,9 @@ static void my_md5_hash(unsigned char *digest, unsigned const char *buf,
- int compute_md5_hash(char *digest, const char *buf, int len) {
-   int retval = 0;
-   int fips_mode = 0;
-+#ifndef LIBRESSL_VERSION_NUMBER
-   fips_mode = FIPS_mode();
-+#endif
-   /* If fips mode is ON/STRICT restricted method calls will result into abort,
-    * skipping call. */
-   if (fips_mode == 0) {
-diff --git a/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_ssl_transport.cc b/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_ssl_transport.cc
-index 8bf63ce14..02f91b44e 100644
---- a/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_ssl_transport.cc
-+++ b/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_ssl_transport.cc
-@@ -325,6 +325,7 @@ error:
-   return 1;
- }
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- #define OPENSSL_ERROR_LENGTH 512
- static int configure_ssl_fips_mode(const uint fips_mode) {
-   int rc = -1;
-@@ -348,6 +349,7 @@ static int configure_ssl_fips_mode(const uint fips_mode) {
- EXIT:
-   return rc;
- }
-+#endif
- 
- static int configure_ssl_ca(SSL_CTX *ssl_ctx, const char *ca_file,
-                             const char *ca_path) {
-@@ -544,10 +546,12 @@ int xcom_init_ssl(const char *server_key_file, const char *server_cert_file,
-   int verify_server = SSL_VERIFY_NONE;
-   int verify_client = SSL_VERIFY_NONE;
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
-   if (configure_ssl_fips_mode(ssl_fips_mode) != 1) {
-     G_ERROR("Error setting the ssl fips mode");
-     goto error;
-   }
-+#endif
- 
-   SSL_library_init();
-   SSL_load_error_strings();
-@@ -611,7 +615,7 @@ error:
- void xcom_cleanup_ssl() {
-   if (!xcom_use_ssl()) return;
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-   ERR_remove_thread_state(0);
- #endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
- }
-diff --git a/plugin/x/client/xconnection_impl.cc b/plugin/x/client/xconnection_impl.cc
-index 13bc6794e..5223169db 100644
---- a/plugin/x/client/xconnection_impl.cc
-+++ b/plugin/x/client/xconnection_impl.cc
-@@ -498,6 +498,7 @@ XError Connection_impl::get_ssl_error(const int error_id) {
-   return XError(CR_SSL_CONNECTION_ERROR, buffer);
- }
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- /**
-   Set fips mode in openssl library,
-   When we set fips mode ON/STRICT, it will perform following operations:
-@@ -537,6 +538,7 @@ int set_fips_mode(const uint32_t fips_mode,
- EXIT:
-   return rc;
- }
-+#endif
- 
- XError Connection_impl::activate_tls() {
-   if (nullptr == m_vio) return get_socket_error(SOCKET_ECONNRESET);
-@@ -547,12 +549,14 @@ XError Connection_impl::activate_tls() {
-   if (!m_context->m_ssl_config.is_configured())
-     return XError{CR_SSL_CONNECTION_ERROR, ER_TEXT_TLS_NOT_CONFIGURATED, true};
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
-   char err_string[OPENSSL_ERROR_LENGTH] = {'\0'};
-   if (set_fips_mode(
-           static_cast<uint32_t>(m_context->m_ssl_config.m_ssl_fips_mode),
-           err_string) != 1) {
-     return XError{CR_SSL_CONNECTION_ERROR, err_string, true};
-   }
-+#endif
-   auto ssl_ctx_flags = process_tls_version(
-       details::null_when_empty(m_context->m_ssl_config.m_tls_version));
- 
-diff --git a/router/src/http/src/tls_client_context.cc b/router/src/http/src/tls_client_context.cc
-index 297ceee30..7c1157289 100644
---- a/router/src/http/src/tls_client_context.cc
-+++ b/router/src/http/src/tls_client_context.cc
-@@ -54,7 +54,7 @@ void TlsClientContext::verify(TlsVerify verify) {
- 
- void TlsClientContext::cipher_suites(const std::string &ciphers) {
- // TLSv1.3 ciphers are controlled via SSL_CTX_set_ciphersuites()
--#if OPENSSL_VERSION_NUMBER >= ROUTER_OPENSSL_VERSION(1, 1, 1)
-+#ifdef TLS1_3_VERSION
-   if (1 != SSL_CTX_set_ciphersuites(ssl_ctx_.get(), ciphers.c_str())) {
-     throw TlsError("set-cipher-suites");
-   }
-diff --git a/router/src/http/src/tls_context.cc b/router/src/http/src/tls_context.cc
-index 60ed7e6ca..388ef8f28 100644
---- a/router/src/http/src/tls_context.cc
-+++ b/router/src/http/src/tls_context.cc
-@@ -91,7 +91,7 @@ static int o11x_version(TlsVersion version) {
-       return TLS1_1_VERSION;
-     case TlsVersion::TLS_1_2:
-       return TLS1_2_VERSION;
--#if OPENSSL_VERSION_NUMBER >= ROUTER_OPENSSL_VERSION(1, 1, 1)
-+#ifdef TLS1_3_VERSION
-     case TlsVersion::TLS_1_3:
-       return TLS1_3_VERSION;
- #endif
-@@ -120,9 +120,11 @@ void TlsContext::version_range(TlsVersion min_version, TlsVersion max_version) {
-   switch (min_version) {
-     default:
-       // unknown, leave all disabled
-+#ifdef TLS1_3_VERSION
-       // fallthrough
-     case TlsVersion::TLS_1_3:
-       opts |= SSL_OP_NO_TLSv1_2;
-+#endif
-       // fallthrough
-     case TlsVersion::TLS_1_2:
-       opts |= SSL_OP_NO_TLSv1_1;
-@@ -170,8 +172,10 @@ TlsVersion TlsContext::min_version() const {
-       return TlsVersion::TLS_1_1;
-     case TLS1_2_VERSION:
-       return TlsVersion::TLS_1_2;
-+#ifdef TLS1_3_VERSION
-     case TLS1_3_VERSION:
-       return TlsVersion::TLS_1_3;
-+#endif
-     case 0:
-       return TlsVersion::AUTO;
-     default:
-@@ -230,7 +234,8 @@ TlsContext::InfoCallback TlsContext::info_callback() const {
- }
- 
- int TlsContext::security_level() const {
--#if OPENSSL_VERSION_NUMBER >= ROUTER_OPENSSL_VERSION(1, 1, 0)
-+#if OPENSSL_VERSION_NUMBER >= ROUTER_OPENSSL_VERSION(1, 1, 0) && \
-+    !defined(LIBRESSL_VERSION_NUMBER)
-   return SSL_CTX_get_security_level(ssl_ctx_.get());
- #else
-   return 0;
-diff --git a/router/src/http/src/tls_server_context.cc b/router/src/http/src/tls_server_context.cc
-index 0f4472419..707d7de86 100644
---- a/router/src/http/src/tls_server_context.cc
-+++ b/router/src/http/src/tls_server_context.cc
-@@ -167,7 +167,8 @@ void TlsServerContext::init_tmp_dh(const std::string &dh_params) {
-     }
- 
-   } else {
--#if OPENSSL_VERSION_NUMBER >= ROUTER_OPENSSL_VERSION(1, 1, 0)
-+#if OPENSSL_VERSION_NUMBER >= ROUTER_OPENSSL_VERSION(1, 1, 0) && \
-+    !defined(LIBRESSL_VERSION_NUMBER)
-     dh2048.reset(DH_get_2048_256());
- #else
-     /*
-diff --git a/sql-common/client.cc b/sql-common/client.cc
-index ffb136b5b..8a0c7b834 100644
---- a/sql-common/client.cc
-+++ b/sql-common/client.cc
-@@ -7766,6 +7766,7 @@ int STDCALL mysql_options(MYSQL *mysql, enum mysql_option option,
-         return 1;
-       break;
-     case MYSQL_OPT_SSL_FIPS_MODE: {
-+#if !defined(LIBRESSL_VERSION_NUMBER)
-       char ssl_err_string[OPENSSL_ERROR_LENGTH] = {'\0'};
-       ENSURE_EXTENSIONS_PRESENT(&mysql->options);
-       mysql->options.extension->ssl_fips_mode = *static_cast<const uint *>(arg);
-@@ -7777,6 +7778,7 @@ int STDCALL mysql_options(MYSQL *mysql, enum mysql_option option,
-             "Set Fips mode ON/STRICT failed, detail: '%s'.", ssl_err_string);
-         return 1;
-       }
-+#endif
-     } break;
-     case MYSQL_OPT_SSL_MODE:
-       ENSURE_EXTENSIONS_PRESENT(&mysql->options);
-diff --git a/sql/mysqld.cc b/sql/mysqld.cc
-index 682e8d5ae..96a922d7a 100644
---- a/sql/mysqld.cc
-+++ b/sql/mysqld.cc
-@@ -5109,7 +5109,7 @@ static int init_thread_environment() {
- 
- static PSI_memory_key key_memory_openssl = PSI_NOT_INSTRUMENTED;
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- #define FILE_LINE_ARGS
- #else
- #define FILE_LINE_ARGS , const char *, int
-@@ -5143,12 +5143,14 @@ static void init_ssl() {
- }
- 
- static int init_ssl_communication() {
-+#ifndef LIBRESSL_VERSION_NUMBER
-   char ssl_err_string[OPENSSL_ERROR_LENGTH] = {'\0'};
-   int ret_fips_mode = set_fips_mode(opt_ssl_fips_mode, ssl_err_string);
-   if (ret_fips_mode != 1) {
-     LogErr(ERROR_LEVEL, ER_SSL_FIPS_MODE_ERROR, ssl_err_string);
-     return 1;
-   }
-+#endif
-   if (TLS_channel::singleton_init(&mysql_main, mysql_main_channel, opt_use_ssl,
-                                   &server_main_callback, opt_initialize))
-     return 1;
-diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc
-index 5b1a82d2f..4e2dff865 100644
---- a/sql/sys_vars.cc
-+++ b/sql/sys_vars.cc
-@@ -4474,6 +4474,7 @@ static Sys_var_ulong Sys_max_execution_time(
-     HINT_UPDATEABLE SESSION_VAR(max_execution_time), CMD_LINE(REQUIRED_ARG),
-     VALID_RANGE(0, ULONG_MAX), DEFAULT(0), BLOCK_SIZE(1));
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- static bool update_fips_mode(sys_var *, THD *, enum_var_type) {
-   char ssl_err_string[OPENSSL_ERROR_LENGTH] = {'\0'};
-   if (set_fips_mode(opt_ssl_fips_mode, ssl_err_string) != 1) {
-@@ -4484,15 +4485,31 @@ static bool update_fips_mode(sys_var *, THD *, enum_var_type) {
-     return false;
-   }
- }
-+#endif
-+
-+#if defined(LIBRESSL_VERSION_NUMBER)
-+static const char *ssl_fips_mode_names[] = {"OFF", 0};
-+#else
-+static const char *ssl_fips_mode_names[] = {"OFF", "ON", "STRICT", 0};
-+#endif
- 
--static const char *ssl_fips_mode_names[] = {"OFF", "ON", "STRICT", nullptr};
- static Sys_var_enum Sys_ssl_fips_mode(
-     "ssl_fips_mode",
-     "SSL FIPS mode (applies only for OpenSSL); "
-+#ifndef LIBRESSL_VERSION_NUMBER
-     "permitted values are: OFF, ON, STRICT",
-+#else
-+    "permitted values are: OFF",
-+#endif
-     GLOBAL_VAR(opt_ssl_fips_mode), CMD_LINE(REQUIRED_ARG, OPT_SSL_FIPS_MODE),
-     ssl_fips_mode_names, DEFAULT(0), NO_MUTEX_GUARD, NOT_IN_BINLOG,
--    ON_CHECK(nullptr), ON_UPDATE(update_fips_mode), nullptr);
-+    ON_CHECK(NULL),
-+#ifndef LIBRESSL_VERSION_NUMBER
-+    ON_UPDATE(update_fips_mode),
-+#else
-+    ON_UPDATE(NULL),
-+#endif
-+    NULL);
- 
- static Sys_var_bool Sys_auto_generate_certs(
-     "auto_generate_certs",
-diff --git a/vio/viossl.cc b/vio/viossl.cc
-index 0e9594741..3a589c64b 100644
---- a/vio/viossl.cc
-+++ b/vio/viossl.cc
-@@ -45,7 +45,7 @@
-   BIO_set_callback_ex was added in openSSL 1.1.1
-   For older openSSL, use the deprecated BIO_set_callback.
- */
--#if OPENSSL_VERSION_NUMBER >= 0x10101000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10101000L && !defined(LIBRESSL_VERSION_NUMBER)
- #define HAVE_BIO_SET_CALLBACK_EX
- #endif
- 
-@@ -634,8 +634,8 @@ static int ssl_do(struct st_VioSSLFd *ptr, Vio *vio, long timeout,
- 
- #if !defined(DBUG_OFF)
-     {
--      STACK_OF(SSL_COMP) *ssl_comp_methods = nullptr;
--      ssl_comp_methods = SSL_COMP_get_compression_methods();
-+      STACK_OF(SSL_COMP) *ssl_comp_methods = NULL;
-+      ssl_comp_methods = (STACK_OF(SSL_COMP) *)SSL_COMP_get_compression_methods();
-       n = sk_SSL_COMP_num(ssl_comp_methods);
-       DBUG_PRINT("info", ("Available compression methods:\n"));
-       if (n == 0)
-@@ -643,7 +643,7 @@ static int ssl_do(struct st_VioSSLFd *ptr, Vio *vio, long timeout,
-       else
-         for (j = 0; j < n; j++) {
-           SSL_COMP *c = sk_SSL_COMP_value(ssl_comp_methods, j);
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-           DBUG_PRINT("info", ("  %d: %s\n", c->id, c->name));
- #else  /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-           DBUG_PRINT("info",
-diff --git a/vio/viosslfactories.cc b/vio/viosslfactories.cc
-index 6c04029cc..f27221463 100644
---- a/vio/viosslfactories.cc
-+++ b/vio/viosslfactories.cc
-@@ -473,6 +473,7 @@ void ssl_start() {
-   }
- }
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- /**
-   Set fips mode in openssl library,
-   When we set fips mode ON/STRICT, it will perform following operations:
-@@ -526,6 +527,7 @@ EXIT:
-   @returns openssl current fips mode
- */
- uint get_fips_mode() { return FIPS_mode(); }
-+#endif
- 
- long process_tls_version(const char *tls_version) {
-   const char *separator = ",";
--- 
-2.27.0
-
diff --git a/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.23-libressl.patch b/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.23-libressl.patch
deleted file mode 100644
index 06681d940dd8..000000000000
--- a/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.23-libressl.patch
+++ /dev/null
@@ -1,356 +0,0 @@
-From 262f0b8bdc86a755041c19c11b6067afce28dae1 Mon Sep 17 00:00:00 2001
-From: Thomas Deutschmann <whissi@gentoo.org>
-Date: Thu, 30 Apr 2020 20:01:48 +0200
-Subject: [PATCH 5/6] Add LibreSSL support
-
-Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
----
- cmake/ssl.cmake                               |  5 +++--
- mysys/my_md5.cc                               |  2 ++
- .../bindings/xcom/xcom/xcom_ssl_transport.cc  |  6 +++++-
- plugin/x/client/xconnection_impl.cc           |  4 ++++
- router/src/harness/src/tls_client_context.cc  |  2 +-
- router/src/harness/src/tls_context.cc         |  9 ++++++--
- router/src/harness/src/tls_server_context.cc  |  3 ++-
- sql-common/client.cc                          |  2 ++
- sql/mysqld.cc                                 |  4 +++-
- sql/sys_vars.cc                               | 21 +++++++++++++++++--
- vio/viossl.cc                                 |  8 +++----
- vio/viosslfactories.cc                        |  2 ++
- 12 files changed, 54 insertions(+), 14 deletions(-)
-
-diff --git a/cmake/ssl.cmake b/cmake/ssl.cmake
-index 52feadeaa..3b8332695 100644
---- a/cmake/ssl.cmake
-+++ b/cmake/ssl.cmake
-@@ -222,13 +222,14 @@ MACRO (MYSQL_CHECK_SSL)
-         OPENSSL_FIX_VERSION "${OPENSSL_VERSION_NUMBER}"
-         )
-     ENDIF()
--    IF("${OPENSSL_MAJOR_VERSION}.${OPENSSL_MINOR_VERSION}.${OPENSSL_FIX_VERSION}" VERSION_GREATER "1.1.0")
-+    CHECK_SYMBOL_EXISTS(TLS1_3_VERSION "openssl/tls1.h" HAVE_TLS1_3_VERSION)
-+    IF(HAVE_TLS1_3_VERSION)
-        ADD_DEFINITIONS(-DHAVE_TLSv13)
-     ENDIF()
-     IF(OPENSSL_INCLUDE_DIR AND
-        OPENSSL_LIBRARY   AND
-        CRYPTO_LIBRARY      AND
--       OPENSSL_MAJOR_VERSION STREQUAL "1"
-+       OPENSSL_MAJOR_VERSION VERSION_GREATER_EQUAL "1"
-       )
-       SET(OPENSSL_FOUND TRUE)
-       FIND_PROGRAM(OPENSSL_EXECUTABLE openssl
-diff --git a/mysys/my_md5.cc b/mysys/my_md5.cc
-index dea997b25..531696329 100644
---- a/mysys/my_md5.cc
-+++ b/mysys/my_md5.cc
-@@ -56,7 +56,9 @@ static void my_md5_hash(unsigned char *digest, unsigned const char *buf,
- int compute_md5_hash(char *digest, const char *buf, int len) {
-   int retval = 0;
-   int fips_mode = 0;
-+#ifndef LIBRESSL_VERSION_NUMBER
-   fips_mode = FIPS_mode();
-+#endif
-   /* If fips mode is ON/STRICT restricted method calls will result into abort,
-    * skipping call. */
-   if (fips_mode == 0) {
-diff --git a/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_ssl_transport.cc b/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_ssl_transport.cc
-index 8bf63ce14..02f91b44e 100644
---- a/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_ssl_transport.cc
-+++ b/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_ssl_transport.cc
-@@ -325,6 +325,7 @@ error:
-   return 1;
- }
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- #define OPENSSL_ERROR_LENGTH 512
- static int configure_ssl_fips_mode(const uint fips_mode) {
-   int rc = -1;
-@@ -348,6 +349,7 @@ static int configure_ssl_fips_mode(const uint fips_mode) {
- EXIT:
-   return rc;
- }
-+#endif
- 
- static int configure_ssl_ca(SSL_CTX *ssl_ctx, const char *ca_file,
-                             const char *ca_path) {
-@@ -544,10 +546,12 @@ int xcom_init_ssl(const char *server_key_file, const char *server_cert_file,
-   int verify_server = SSL_VERIFY_NONE;
-   int verify_client = SSL_VERIFY_NONE;
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
-   if (configure_ssl_fips_mode(ssl_fips_mode) != 1) {
-     G_ERROR("Error setting the ssl fips mode");
-     goto error;
-   }
-+#endif
- 
-   SSL_library_init();
-   SSL_load_error_strings();
-@@ -611,7 +615,7 @@ error:
- void xcom_cleanup_ssl() {
-   if (!xcom_use_ssl()) return;
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-   ERR_remove_thread_state(0);
- #endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
- }
-diff --git a/plugin/x/client/xconnection_impl.cc b/plugin/x/client/xconnection_impl.cc
-index a78371098..9d3a7b436 100644
---- a/plugin/x/client/xconnection_impl.cc
-+++ b/plugin/x/client/xconnection_impl.cc
-@@ -498,6 +498,7 @@ XError Connection_impl::get_ssl_error(const int error_id) {
-   return XError(CR_SSL_CONNECTION_ERROR, buffer);
- }
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- /**
-   Set fips mode in openssl library,
-   When we set fips mode ON/STRICT, it will perform following operations:
-@@ -537,6 +538,7 @@ int set_fips_mode(const uint32_t fips_mode,
- EXIT:
-   return rc;
- }
-+#endif
- 
- XError Connection_impl::activate_tls() {
-   if (nullptr == m_vio) return get_socket_error(SOCKET_ECONNRESET);
-@@ -547,12 +549,14 @@ XError Connection_impl::activate_tls() {
-   if (!m_context->m_ssl_config.is_configured())
-     return XError{CR_SSL_CONNECTION_ERROR, ER_TEXT_TLS_NOT_CONFIGURATED, true};
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
-   char err_string[OPENSSL_ERROR_LENGTH] = {'\0'};
-   if (set_fips_mode(
-           static_cast<uint32_t>(m_context->m_ssl_config.m_ssl_fips_mode),
-           err_string) != 1) {
-     return XError{CR_SSL_CONNECTION_ERROR, err_string, true};
-   }
-+#endif
-   auto ssl_ctx_flags = process_tls_version(
-       details::null_when_empty(m_context->m_ssl_config.m_tls_version));
- 
-diff --git a/router/src/harness/src/tls_client_context.cc b/router/src/harness/src/tls_client_context.cc
-index c14b1cb18..81a9425ca 100644
---- a/router/src/harness/src/tls_client_context.cc
-+++ b/router/src/harness/src/tls_client_context.cc
-@@ -61,7 +61,7 @@ stdx::expected<void, std::error_code> TlsClientContext::verify(
- stdx::expected<void, std::error_code> TlsClientContext::cipher_suites(
-     const std::string &ciphers) {
- // TLSv1.3 ciphers are controlled via SSL_CTX_set_ciphersuites()
--#if OPENSSL_VERSION_NUMBER >= ROUTER_OPENSSL_VERSION(1, 1, 1)
-+#ifdef TLS1_3_VERSION
-   if (1 != SSL_CTX_set_ciphersuites(ssl_ctx_.get(), ciphers.c_str())) {
-     return stdx::make_unexpected(make_tls_error());
-   }
-diff --git a/router/src/harness/src/tls_context.cc b/router/src/harness/src/tls_context.cc
-index e0b97bf2d..8b64b1d01 100644
---- a/router/src/harness/src/tls_context.cc
-+++ b/router/src/harness/src/tls_context.cc
-@@ -115,7 +115,7 @@ static int o11x_version(TlsVersion version) {
-       return TLS1_1_VERSION;
-     case TlsVersion::TLS_1_2:
-       return TLS1_2_VERSION;
--#if OPENSSL_VERSION_NUMBER >= ROUTER_OPENSSL_VERSION(1, 1, 1)
-+#ifdef TLS1_3_VERSION
-     case TlsVersion::TLS_1_3:
-       return TLS1_3_VERSION;
- #endif
-@@ -145,9 +145,11 @@ stdx::expected<void, std::error_code> TlsContext::version_range(
-   switch (min_version) {
-     default:
-       // unknown, leave all disabled
-+#ifdef TLS1_3_VERSION
-       // fallthrough
-     case TlsVersion::TLS_1_3:
-       opts |= SSL_OP_NO_TLSv1_2;
-+#endif
-       // fallthrough
-     case TlsVersion::TLS_1_2:
-       opts |= SSL_OP_NO_TLSv1_1;
-@@ -197,8 +199,10 @@ TlsVersion TlsContext::min_version() const {
-       return TlsVersion::TLS_1_1;
-     case TLS1_2_VERSION:
-       return TlsVersion::TLS_1_2;
-+#ifdef TLS1_3_VERSION
-     case TLS1_3_VERSION:
-       return TlsVersion::TLS_1_3;
-+#endif
-     case 0:
-       return TlsVersion::AUTO;
-     default:
-@@ -257,7 +261,8 @@ TlsContext::InfoCallback TlsContext::info_callback() const {
- }
- 
- int TlsContext::security_level() const {
--#if OPENSSL_VERSION_NUMBER >= ROUTER_OPENSSL_VERSION(1, 1, 0)
-+#if OPENSSL_VERSION_NUMBER >= ROUTER_OPENSSL_VERSION(1, 1, 0) && \
-+    !defined(LIBRESSL_VERSION_NUMBER)
-   return SSL_CTX_get_security_level(ssl_ctx_.get());
- #else
-   return 0;
-diff --git a/router/src/harness/src/tls_server_context.cc b/router/src/harness/src/tls_server_context.cc
-index c8fc2b5a0..76775e2a0 100644
---- a/router/src/harness/src/tls_server_context.cc
-+++ b/router/src/harness/src/tls_server_context.cc
-@@ -169,7 +169,8 @@ stdx::expected<void, std::error_code> TlsServerContext::init_tmp_dh(
-     }
- 
-   } else {
--#if OPENSSL_VERSION_NUMBER >= ROUTER_OPENSSL_VERSION(1, 1, 0)
-+#if OPENSSL_VERSION_NUMBER >= ROUTER_OPENSSL_VERSION(1, 1, 0) && \
-+    !defined(LIBRESSL_VERSION_NUMBER)
-     dh2048.reset(DH_get_2048_256());
- #else
-     /*
-diff --git a/sql-common/client.cc b/sql-common/client.cc
-index 79f301fe6..b5e1d126c 100644
---- a/sql-common/client.cc
-+++ b/sql-common/client.cc
-@@ -7987,6 +7987,7 @@ int STDCALL mysql_options(MYSQL *mysql, enum mysql_option option,
-         return 1;
-       break;
-     case MYSQL_OPT_SSL_FIPS_MODE: {
-+#if !defined(LIBRESSL_VERSION_NUMBER)
-       char ssl_err_string[OPENSSL_ERROR_LENGTH] = {'\0'};
-       ENSURE_EXTENSIONS_PRESENT(&mysql->options);
-       mysql->options.extension->ssl_fips_mode = *static_cast<const uint *>(arg);
-@@ -7998,6 +7999,7 @@ int STDCALL mysql_options(MYSQL *mysql, enum mysql_option option,
-             "Set Fips mode ON/STRICT failed, detail: '%s'.", ssl_err_string);
-         return 1;
-       }
-+#endif
-     } break;
-     case MYSQL_OPT_SSL_MODE:
-       ENSURE_EXTENSIONS_PRESENT(&mysql->options);
-diff --git a/sql/mysqld.cc b/sql/mysqld.cc
-index cde636761..266a8c3bb 100644
---- a/sql/mysqld.cc
-+++ b/sql/mysqld.cc
-@@ -5035,7 +5035,7 @@ static int init_thread_environment() {
- 
- static PSI_memory_key key_memory_openssl = PSI_NOT_INSTRUMENTED;
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- #define FILE_LINE_ARGS
- #else
- #define FILE_LINE_ARGS , const char *, int
-@@ -5069,12 +5069,14 @@ static void init_ssl() {
- }
- 
- static int init_ssl_communication() {
-+#ifndef LIBRESSL_VERSION_NUMBER
-   char ssl_err_string[OPENSSL_ERROR_LENGTH] = {'\0'};
-   int ret_fips_mode = set_fips_mode(opt_ssl_fips_mode, ssl_err_string);
-   if (ret_fips_mode != 1) {
-     LogErr(ERROR_LEVEL, ER_SSL_FIPS_MODE_ERROR, ssl_err_string);
-     return 1;
-   }
-+#endif
-   if (TLS_channel::singleton_init(&mysql_main, mysql_main_channel, opt_use_ssl,
-                                   &server_main_callback, opt_initialize))
-     return 1;
-diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc
-index 2df3271ff..90942eef0 100644
---- a/sql/sys_vars.cc
-+++ b/sql/sys_vars.cc
-@@ -4614,6 +4614,7 @@ static Sys_var_ulong Sys_max_execution_time(
-     HINT_UPDATEABLE SESSION_VAR(max_execution_time), CMD_LINE(REQUIRED_ARG),
-     VALID_RANGE(0, ULONG_MAX), DEFAULT(0), BLOCK_SIZE(1));
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- static bool update_fips_mode(sys_var *, THD *, enum_var_type) {
-   char ssl_err_string[OPENSSL_ERROR_LENGTH] = {'\0'};
-   if (set_fips_mode(opt_ssl_fips_mode, ssl_err_string) != 1) {
-@@ -4624,15 +4625,31 @@ static bool update_fips_mode(sys_var *, THD *, enum_var_type) {
-     return false;
-   }
- }
-+#endif
-+
-+#if defined(LIBRESSL_VERSION_NUMBER)
-+static const char *ssl_fips_mode_names[] = {"OFF", 0};
-+#else
-+static const char *ssl_fips_mode_names[] = {"OFF", "ON", "STRICT", 0};
-+#endif
- 
--static const char *ssl_fips_mode_names[] = {"OFF", "ON", "STRICT", nullptr};
- static Sys_var_enum Sys_ssl_fips_mode(
-     "ssl_fips_mode",
-     "SSL FIPS mode (applies only for OpenSSL); "
-+#ifndef LIBRESSL_VERSION_NUMBER
-     "permitted values are: OFF, ON, STRICT",
-+#else
-+    "permitted values are: OFF",
-+#endif
-     GLOBAL_VAR(opt_ssl_fips_mode), CMD_LINE(REQUIRED_ARG, OPT_SSL_FIPS_MODE),
-     ssl_fips_mode_names, DEFAULT(0), NO_MUTEX_GUARD, NOT_IN_BINLOG,
--    ON_CHECK(nullptr), ON_UPDATE(update_fips_mode), nullptr);
-+    ON_CHECK(NULL),
-+#ifndef LIBRESSL_VERSION_NUMBER
-+    ON_UPDATE(update_fips_mode),
-+#else
-+    ON_UPDATE(NULL),
-+#endif
-+    NULL);
- 
- static Sys_var_bool Sys_auto_generate_certs(
-     "auto_generate_certs",
-diff --git a/vio/viossl.cc b/vio/viossl.cc
-index 0e9594741..3a589c64b 100644
---- a/vio/viossl.cc
-+++ b/vio/viossl.cc
-@@ -45,7 +45,7 @@
-   BIO_set_callback_ex was added in openSSL 1.1.1
-   For older openSSL, use the deprecated BIO_set_callback.
- */
--#if OPENSSL_VERSION_NUMBER >= 0x10101000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10101000L && !defined(LIBRESSL_VERSION_NUMBER)
- #define HAVE_BIO_SET_CALLBACK_EX
- #endif
- 
-@@ -634,8 +634,8 @@ static int ssl_do(struct st_VioSSLFd *ptr, Vio *vio, long timeout,
- 
- #if !defined(DBUG_OFF)
-     {
--      STACK_OF(SSL_COMP) *ssl_comp_methods = nullptr;
--      ssl_comp_methods = SSL_COMP_get_compression_methods();
-+      STACK_OF(SSL_COMP) *ssl_comp_methods = NULL;
-+      ssl_comp_methods = (STACK_OF(SSL_COMP) *)SSL_COMP_get_compression_methods();
-       n = sk_SSL_COMP_num(ssl_comp_methods);
-       DBUG_PRINT("info", ("Available compression methods:\n"));
-       if (n == 0)
-@@ -643,7 +643,7 @@ static int ssl_do(struct st_VioSSLFd *ptr, Vio *vio, long timeout,
-       else
-         for (j = 0; j < n; j++) {
-           SSL_COMP *c = sk_SSL_COMP_value(ssl_comp_methods, j);
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-           DBUG_PRINT("info", ("  %d: %s\n", c->id, c->name));
- #else  /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-           DBUG_PRINT("info",
-diff --git a/vio/viosslfactories.cc b/vio/viosslfactories.cc
-index 21c3510da..70e7d8f8b 100644
---- a/vio/viosslfactories.cc
-+++ b/vio/viosslfactories.cc
-@@ -472,6 +472,7 @@ void ssl_start() {
-   }
- }
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- /**
-   Set fips mode in openssl library,
-   When we set fips mode ON/STRICT, it will perform following operations:
-@@ -525,6 +526,7 @@ EXIT:
-   @returns openssl current fips mode
- */
- uint get_fips_mode() { return FIPS_mode(); }
-+#endif
- 
- long process_tls_version(const char *tls_version) {
-   const char *separator = ",";
--- 
-2.30.0
-
diff --git a/dev-db/mysql-connector-c/mysql-connector-c-8.0.22.ebuild b/dev-db/mysql-connector-c/mysql-connector-c-8.0.22.ebuild
index b6cc7e4f6d80..0cd2c65693f6 100644
--- a/dev-db/mysql-connector-c/mysql-connector-c-8.0.22.ebuild
+++ b/dev-db/mysql-connector-c/mysql-connector-c-8.0.22.ebuild
@@ -16,15 +16,14 @@ SRC_URI="https://dev.mysql.com/get/Downloads/MySQL-8.0/mysql-boost-${PV}.tar.gz"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 
 SLOT="0/21"
-IUSE="ldap libressl static-libs"
+IUSE="ldap static-libs"
 
 RDEPEND="
 	>=app-arch/lz4-0_p131:=[${MULTILIB_USEDEP}]
 	app-arch/zstd:=[${MULTILIB_USEDEP}]
 	sys-libs/zlib:=[${MULTILIB_USEDEP}]
 	ldap? ( dev-libs/cyrus-sasl:=[${MULTILIB_USEDEP}] )
-	libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
-	!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
+	dev-libs/openssl:0=[${MULTILIB_USEDEP}]
 	"
 DEPEND="${RDEPEND}"
 
@@ -44,7 +43,6 @@ S="${WORKDIR}/mysql-${PV}"
 PATCHES=(
 	"${FILESDIR}"/${PN}-8.0.22-always-build-decompress-utilities.patch
 	"${FILESDIR}"/${PN}-8.0.19-do-not-install-comp_err.patch
-	"${FILESDIR}"/${PN}-8.0.21-libressl.patch
 )
 
 src_prepare() {
diff --git a/dev-db/mysql-connector-c/mysql-connector-c-8.0.23-r1.ebuild b/dev-db/mysql-connector-c/mysql-connector-c-8.0.23-r1.ebuild
index 4923fe57f0c3..d90ed6a38415 100644
--- a/dev-db/mysql-connector-c/mysql-connector-c-8.0.23-r1.ebuild
+++ b/dev-db/mysql-connector-c/mysql-connector-c-8.0.23-r1.ebuild
@@ -25,15 +25,14 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0/21"
-IUSE="ldap libressl static-libs"
+IUSE="ldap static-libs"
 
 RDEPEND="
 	>=app-arch/lz4-0_p131:=[${MULTILIB_USEDEP}]
 	app-arch/zstd:=[${MULTILIB_USEDEP}]
 	sys-libs/zlib:=[${MULTILIB_USEDEP}]
 	ldap? ( dev-libs/cyrus-sasl:=[${MULTILIB_USEDEP}] )
-	libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
-	!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
+	dev-libs/openssl:0=[${MULTILIB_USEDEP}]
 "
 DEPEND="${RDEPEND}"
 
@@ -51,7 +50,6 @@ DOCS=( README )
 PATCHES=(
 	"${FILESDIR}"/${PN}-8.0.22-always-build-decompress-utilities.patch
 	"${FILESDIR}"/${PN}-8.0.19-do-not-install-comp_err.patch
-	"${FILESDIR}"/${PN}-8.0.23-libressl.patch
 )
 
 src_prepare() {
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 adbf8b74bd42..337984117ad6 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
@@ -25,15 +25,14 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0/21"
-IUSE="ldap libressl static-libs"
+IUSE="ldap static-libs"
 
 RDEPEND="
 	>=app-arch/lz4-0_p131:=[${MULTILIB_USEDEP}]
 	app-arch/zstd:=[${MULTILIB_USEDEP}]
 	sys-libs/zlib:=[${MULTILIB_USEDEP}]
 	ldap? ( dev-libs/cyrus-sasl:=[${MULTILIB_USEDEP}] )
-	libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
-	!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
+	dev-libs/openssl:0=[${MULTILIB_USEDEP}]
 "
 DEPEND="${RDEPEND}"
 
@@ -51,7 +50,6 @@ DOCS=( README )
 PATCHES=(
 	"${FILESDIR}"/${PN}-8.0.22-always-build-decompress-utilities.patch
 	"${FILESDIR}"/${PN}-8.0.19-do-not-install-comp_err.patch
-	"${FILESDIR}"/${PN}-8.0.23-libressl.patch
 )
 
 src_prepare() {
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 242c47275151..da9132b1f7c8 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -29,17 +29,17 @@ DIST mysql-boost-8.0.24.tar.gz 290263082 BLAKE2B a29f42b63c68b13fbe7433c7734e126
 DIST mysql-extras-20190822-1908Z.tar.bz2 338830 BLAKE2B bc197f8e541206548d8982814e82e028d699ba9c41aec8d5191bcc46581f7880ed2741dbe2206fde44a5e8d8d54bbcf40efbd0709b357636c4c8fdb2ccc3a7bb SHA512 be469e55f7e9966638600d6836a44258c74e5600240fafe2d79eaeebe7d1695b043678184b5d18ee9946f28154bc2529586a7f860b510180a30c82454ed575c8
 DIST mysql-extras-20200125-1945Z.tar.bz2 344906 BLAKE2B 0e87875efbc221ded43d6f080dc7dce4277b676b538950120c94b962e51d054093286486e5d83ea3e38e1b2d0b12cf81873df50e1cebbe4cff33b54297e6a17a SHA512 5fcc5d372998db2b8aef32661ff71290791c20c1195a6210ca79c0fda12008906e665f9dc878d3df5a38a95e23ff05b910daa861002c17a1b6de71ef0520bee1
 DIST mysql-extras-20200317-0103Z.tar.bz2 344905 BLAKE2B c4c8bb2acea16663ab32cf291d0a2d52af04448a507ad3a6dc22dfdef4d6ba427582d66e5923d05cd51565286f85c8df5ccabef9a67a4a500574d21e1f708f27 SHA512 d1d34817faf0a1271f906213eea9081c204d745b14f96166f17d5c60a29ec58c05926e7216f135b6e9d5df2ceab373f10fc4e6a652514d99ba34a336571dce1f
-EBUILD mysql-5.7.27-r2.ebuild 31711 BLAKE2B 661d546b00e43b779570db72de23dc1e613dc07c30d2c4a77f413471c6d9e821b5ab9e9b7947adf8e26d449996f9e229368b1944819cd38b36810fda0156aa57 SHA512 7670ae735ab67f3ac4dde0da323204072ba4742bb58bf51cb06c39f291c23f2d6a127d18b8c6f451367b4932d83c063b31e959008aa9ffcef0c76376a9a463a0
-EBUILD mysql-5.7.29-r1.ebuild 31447 BLAKE2B 59b57240696f86ef2f0badaf7b75889e53afd735c659090365a794a8b3cb77c4b1210f6adf7ba473f44492cfa9c715aab2dced7e127a62cd0089f2fe001b4e91 SHA512 e3c6d86d9b8d889f381f3f2d943077557b83bdd678c7a769a22f670d62ac8145a48bd0ab78b41bd3624f9a1100ede5dff1517d51b8b62859e8b4a28019016041
-EBUILD mysql-5.7.30-r1.ebuild 30672 BLAKE2B d2033739b36d23a02dd61c3c876efdbe444073e37a9bf2fd9c2f8400a04b33768d4017838a59bfa622de46ce808755e1a7889ee27de7c1479de6c12d467cbd66 SHA512 a94a679d9269d3c0291d7380c8917f53991387ddbf2fd7ae9f4124ecd0616fb52ab1b59d8675f850d1d8dd50819c8d3509fc2a7f6073f4ae2c3770a87fce1fcd
-EBUILD mysql-5.7.31.ebuild 37540 BLAKE2B bc9955fd55d1628ae1ac9a5518ec860564060ab5144872ac64e2c7251cd65d4d9ff124bb97a45b707b9abd502adc48e4c5d5ccfee8eec54de1f3d792f09adb9b SHA512 7011c0e06a84ba75ac14f52db2f43113a7b41102da9436e7bbe3e7577db99260949bbeb2dc4f474345d2415a908f64e3cd8093b0857e1414b1e58a0a47f553cf
-EBUILD mysql-5.7.32.ebuild 37582 BLAKE2B 3bfc1b63f0ee120c46bf58878180554fdbc4a7030363aab9ce10c25a04c82870e9b471c0883de4f9d34add6869b699b518b1e40f80a1cfbf6ebd4addaffc4492 SHA512 15a630779de70023e6defa80ffb26e75778700d6dff1a5b6e8bf962772d16ad3800ee6664e592bb0f9b63f809bc7934d41a13c78350a2d530707220b1bdf07c6
-EBUILD mysql-5.7.33.ebuild 37797 BLAKE2B 3cb4244483f7947c31380b0603895fb214234dfc0dbbe9aa27be45a4fa758eaf40e4ffb4fd9ad2df51b5dbd4abded4058465ddaef38fe64b331047a16dc729c1 SHA512 1f0f28b8c24fea27e5714fdd629171089f33350c97e0b8f9166bd2bc32b31cc78adeae1de865b1178fde92fdca4e7ad20b4b7c172c9b9a591720c9c558cd71fb
-EBUILD mysql-5.7.34.ebuild 37868 BLAKE2B 2b4294aeb9b8152741b17351df9c7f9cedddfd80cbdcf0da83f75e106f91aaef4d3f3eabb596f39d144ae2762fab447968cdbd9cd2adbe343b1ea89aa140b9c6 SHA512 f83a32eb4e191ddfcb9b4371f44ade7ebc46c5ea60ee3350440456cf42bc2dbbb691f91048d4ab3f306181640dfb282df21c7e1ebe3ba2e4c53e3b2cfad073b3
-EBUILD mysql-8.0.19-r2.ebuild 37938 BLAKE2B e2e73a2d1ab9ffa6c52374eef4738db94c87353100c4b40afcf6b20e83e872070c50520f694ab1b11c282c1db8c780201260faad41ea646492ad90989c8dc688 SHA512 41f443c5b2cf7a76f902d59ddc66a574a73c4898dbd14aa5dd73a004f48c9b8754e41ee73f2fa1856cec52cf667e647f82a742bfda5c013a733614fc64e8bd91
-EBUILD mysql-8.0.20-r1.ebuild 37206 BLAKE2B 3556c8fb3ea88b893b3612fc313ab5c771afc490218c27405b6b9dd3255d6d5a2c6e602ceac44ed7cbf6f8f7443fcc8afcf6c456ce8b5ac273e2b5569a56e8bb SHA512 982906ddc660441f855b3ab59aaf981fbbf1a6ac1c54be0d7ea1d1019279f265579d3d1d1e2781c8f4c8af60befc5e998d36c09fd6a9abc64655fb80f530c0bb
-EBUILD mysql-8.0.21-r1.ebuild 38157 BLAKE2B 800cc8a5b52e3b465afe98a26668d04c73e449a5bd611dd53406db351f31e09ca8153b1a2dd52b900e23f3c63fbacd4e22711defc761907582a79eb134533677 SHA512 5b22b6ce8ef86454b59b03bf084a23a7fd7d45a51c441337d25c380eb10c2ddf474fcf2145c9e40afb2b8f9025c1efd937985d66ee3fbb91ca6332c62950edab
-EBUILD mysql-8.0.22.ebuild 37596 BLAKE2B 95680e1c45c4277b483d83696c73c5e78f2ba53395a42330fed37dd1da7f9d5cbdd1343b8db6189406937a74553c5612e3d1cb9e57a6913f38fab6f4b1d0f849 SHA512 135c5abf427f9569e0f406758facf03bd4d1d2f3257ddae683978ecdc70aa8554b29b70041761a8db0e321cf9c85320fedc30477f8c2c5ff47af2e58d3e7a684
-EBUILD mysql-8.0.23.ebuild 37738 BLAKE2B 81426ae92d8ff36fb3ef4aadd880a66a7615fca71bd026770859350b60604a02645c5f2c1b326ad7789536778672e7d161990716e928e0574d48d98eeac954a9 SHA512 40c8bf0f737442191895671dbd1b5cc31bd522a6a113f52f398854d7faa77347acba33af7c4780e6e54c24f7ef62f4a116be7a7b7fb65c01c791d6649c0d309b
-EBUILD mysql-8.0.24.ebuild 38205 BLAKE2B 7b3d133231d4c1bdaba3524899c19fe52e0107061c8896684630f69ee3cc7eb1bbed466e53c44818b0bdfee4fc9075bb8d14d7b5fc1e846f2367acd17f0b1702 SHA512 83865d44353f8e861de0b0e2dde2081719c3f50c1983d32770cdc0fd7c170732236774c1bbb63a6434c9e27650b3b961f637644df12b8352af5a542d37cf8f36
-MISC metadata.xml 1470 BLAKE2B 09754bc9a1cf5584588c4f69700919fd72a860175ae1c045ce90a644a1360d5abccedd5b2649e16fcd189e82df659ceb96fd71ab2aeccdac6256af4f80e46a0d SHA512 d96f6a133611f50b80116221e2586eff899210255efac58d9f6ef7ccd0ee0854a3322b4d4d1db15b3b2e410525f5d73e43f52a833f3ce358f6708b88b3cf00c7
+EBUILD mysql-5.7.27-r2.ebuild 31243 BLAKE2B aa4ee6c81da3bd44706da720d7fe5b374773cdffbdde47293dac9dcaa936c047cf6f257940befcd97127c34730a2982e728e2469d5d00080ba4ba5a924624842 SHA512 99ce1c2b6e278eb56ab6eaf28135eda1024b7bf9b804dcd3ad0f803de3eec3da2190e83c9a4d0ec873392ef31520ad497a11445c4facea46e823f87610badbd6
+EBUILD mysql-5.7.29-r1.ebuild 30981 BLAKE2B 388d8ed498058c273524b4bbe4b442b3b10c378131f7cee0fffa5b98e711ea75cc8a7fa13a8e87b8b057246eff298446d49b6e8078628a0b6243b33e02fd7aa4 SHA512 73eac7555ba20eb74599120c8379684e92bd0787930aa1e29b64b6af0a7adccff096531384770936beb998317c8d96f3e3be6909982904b6d22d4c765eeceffc
+EBUILD mysql-5.7.30-r1.ebuild 30275 BLAKE2B 784fd18e9808de17affd5925f06042606aadfe13df5ab40172e57bb2b5881c3bcbde381451f988125181a6eb4da2e8040276b524ac546f950a6f3c1f8115354e SHA512 7df4a9594376f0efac3534b5ceb8be9b17659379ac8569b945a2716a74afa51780a124625f0ed5c389039d80a59c6a0f7f50fc1c2128043dcd4b5cdd073d2372
+EBUILD mysql-5.7.31.ebuild 37143 BLAKE2B ba9576ecbc8e486af3dcd1b7319dbae4dec7d44c4a70ac45cdcfeb58ba4e271abf6d3695f16759c10242015ca2837e484106ccc3e0668b08fbab24b71da6e32d SHA512 edf56d1e97af8641a030a6e85a0933111ce448a345146a3a374a2ad047ade4ff8ab3bd51a6a006f53b5d486893de18b836b9351c1c96fe5a8be0ab796e67eddc
+EBUILD mysql-5.7.32.ebuild 37185 BLAKE2B 13be67482bf1e3e7171b9ce7468d51c1f67dc469f61c4ec18de94548e1077bb31fb7848feecd3761b3549fb4afbfaff6a128223b0bc516b0b4601edb4729468a SHA512 e457f6cc626d3ed452d772bba59428d60eed2c40d2d7fa52a9ab91538123e332d8c86b1a1da8217f1bd81c807c459d4397d237ac04c2e22f37a2e9e775878fc9
+EBUILD mysql-5.7.33.ebuild 37400 BLAKE2B 9245b583265b65125d35d6d52c317c547ded926243c0d7d430e7739c27efc2148e40c968aa55eed964c3064c4f4df82ddeacfc180d47e62e51c5707bc7984311 SHA512 dba99a3536f75fced834e3eb9da03ae5e0f026409165cf805295f216b7e3bc2d153927f7716d1cc52bf4f1f1d88fa834383a25d16ca263e036c01f07db7935f9
+EBUILD mysql-5.7.34.ebuild 37471 BLAKE2B 0627ac23815e67d6f31b0ad1cecca4df7a5b9e06f4d43661a924881617df01d3268a2d3306c39b6ec92b57aacaad31a5db348c2575a9b363cb89ee0f5b064209 SHA512 712bbe401ca81f8fa668d42a78a1de7fdf2bc9a092071e6cebb038c04862b995c07e7e745c2730dd9601abb346d928f0a2291c7bdb63fc99bed25b6ed030fbb6
+EBUILD mysql-8.0.19-r2.ebuild 37706 BLAKE2B c8c70f4ec09c2c7fbfbdc76aa6362a0c553c1b8ae8b13edd12d2f3a0a52ab12e692c13f706813d7eb9bda5f49fc9b932fc832213056bb985c2821ec86309892a SHA512 13d96f95cdf1df2367272a1c5352501a95779b8e9c411103d55f90e6035e7b4893cf208fb92e60c1cf3df3d1ab8c6ad48a89b1096705d7f126b8462915fc2998
+EBUILD mysql-8.0.20-r1.ebuild 37043 BLAKE2B e05d79b543cda0f4ad5a4f1fe9ed72dcec32382704e41aded18e57b6c8a0f85dbe71f58d30a97a9631919272c443e85d22b269d5adedd5f01a8b004f88cfccbd SHA512 4eb892d96d3177e7aa518f1fd49aa156eab70da90cce58d2e180c1e87c8b79cb45314c5a6e52185e3fa9b5566a4be8054a37d63338c9ff5d730fe81747e45737
+EBUILD mysql-8.0.21-r1.ebuild 37994 BLAKE2B ca5f8588d0acafb0a323d92922e6a98fdaa4e41bc587f9815b6afce50d03915e8e674d243952ddc6d56e93fbb2255679536ee8d982bdfea394880631819c8d1f SHA512 eab92d18be2c4d2c2192480a66ba547b7cb94b6c903c13fc4f697f2d6eae06bbdc194c4bf07beb337aebdbdcbc8e779bfdfeb0e7d8af1721521acb54c3c8129d
+EBUILD mysql-8.0.22.ebuild 37433 BLAKE2B 7d047acfdde052e6745869ae3dc3536cc4f6d171bc04c18aaf7ce7773f2bb840f3b826ed091d6b89aa0af1167e372aa6fdcae0328a9591eb0de0e74465f9aea8 SHA512 2e7cb6a55376f03757e14d08801be88ac07ca7ec7d2afa23c73da44cd72a9f7a02212f310176de4fae076421e363b29b29b251ec98057ad54ad7ca6ea313d3f4
+EBUILD mysql-8.0.23.ebuild 37575 BLAKE2B 135ee2f924ab3b50a73ee6366ee9b84815cb81944c9be9ae48c3ed643e6f288d7b2541f6feafa3bffefa28e75b81eaead199704b93b6c3e4e02a158cea868b0b SHA512 3f0dbca7e24b4c696d5970657bb7b405878e6330a6fb26815707d5a3bee7117ab0f1434ecc799515790870544f92973a31eb871363926b5d3be4b9617484decd
+EBUILD mysql-8.0.24.ebuild 38042 BLAKE2B e9b5740a3deb1f8608e5320e850741b1ea7fb88b23c7335629e6d16e6c8c2ac15cb99179237b78a7874d6d18338833c4638c6664d3a37a73ee1d007929c9ea3d SHA512 cf3e974c346a479a4d63dfd0fc4c0559fa3c4508b7d65643fe762ae733ccce91aa1ecc753575c7eb2325a3f2e860a02e77a433eb978fa27765a543ad0536f687
+MISC metadata.xml 1360 BLAKE2B abb7dcadad78c58d6bc6a56e34795903309f1b506e49b00b09f06e9ae1cbb9a5d246295b9c351353ecc08f157a64f421072dae9c7b0d43ce93cde21d3917489e SHA512 2f676f17cff8fb79b58ec7baec00bddc9e3247ca0bd8c8202bccb08f3e8ceacd682db742b38bf73d667e84b9671d085deae1682221e684443466218c6a9fb759
diff --git a/dev-db/mysql/metadata.xml b/dev-db/mysql/metadata.xml
index e4197ced880b..600b98915782 100644
--- a/dev-db/mysql/metadata.xml
+++ b/dev-db/mysql/metadata.xml
@@ -15,7 +15,6 @@ dev-db/mariadb
   <flag name="client-libs">Build the client libraries from the server package instead of the C Connector packages (not recommended)</flag>
   <flag name="experimental">Build experimental features aka "rapid" plugins</flag>
   <flag name="latin1">Use LATIN1 encoding instead of UTF8</flag>
-  <flag name="libressl">Enable SSL connections and crypto functions using <pkg>dev-libs/libressl</pkg></flag>
   <flag name="numa">Enable NUMA support using <pkg>sys-process/numactl</pkg> (NUMA kernel support is also required)</flag>
   <flag name="profiling">Add support for statement profiling (requires USE=community).</flag>
   <flag name="router">Build the MySQL router program</flag>
diff --git a/dev-db/mysql/mysql-5.7.27-r2.ebuild b/dev-db/mysql/mysql-5.7.27-r2.ebuild
index 98a59f769bd2..e1cf579b3c79 100644
--- a/dev-db/mysql/mysql-5.7.27-r2.ebuild
+++ b/dev-db/mysql/mysql-5.7.27-r2.ebuild
@@ -26,11 +26,10 @@ HOMEPAGE="https://www.mysql.com/"
 DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
 LICENSE="GPL-2"
 SLOT="5.7/18"
-IUSE="cjk client-libs cracklib debug experimental jemalloc latin1 libressl numa +perl profiling
+IUSE="cjk client-libs cracklib debug experimental jemalloc latin1 numa +perl profiling
 	selinux +server static static-libs systemtap tcmalloc test yassl"
 
-# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
-RESTRICT="!test? ( test ) libressl? ( test )"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="?? ( tcmalloc jemalloc ) static? ( yassl )"
 
@@ -55,7 +54,6 @@ PATCHES=(
 	"${MY_PATCH_DIR}"/20007_all_cmake-debug-werror-5.7.patch
 	"${MY_PATCH_DIR}"/20009_all_mysql_myodbc_symbol_fix-5.7.10.patch
 	"${MY_PATCH_DIR}"/20018_all_mysql-5.7.26-without-clientlibs-tools.patch
-	"${MY_PATCH_DIR}"/20018_all_mysql-5.7.25-fix-libressl-support.patch
 	"${MY_PATCH_DIR}"/20018_all_mysql-5.7.23-add-missing-gcc-8-fix.patch
 	"${MY_PATCH_DIR}"/20018_all_mysql-5.7.23-fix-grant_user_lock-a-root.patch
 	"${MY_PATCH_DIR}"/20018_all_mysql-5.7.23-round-off-test-values-for-same-output-on-all-architectures.patch
@@ -94,12 +92,10 @@ COMMON_DEPEND="net-misc/curl:=
 	tcmalloc? ( dev-util/google-perftools:0= )
 	!yassl? (
 		client-libs? (
-			!libressl? ( >=dev-libs/openssl-1.0.0:0=[${MULTILIB_USEDEP},static-libs?] )
-			libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP},static-libs?] )
+			>=dev-libs/openssl-1.0.0:0=[${MULTILIB_USEDEP},static-libs?]
 		)
 		!client-libs? (
-			!libressl? ( >=dev-libs/openssl-1.0.0:0= )
-			libressl? ( dev-libs/libressl:0= )
+			>=dev-libs/openssl-1.0.0:0=
 		)
 	)
 "
@@ -309,11 +305,6 @@ src_prepare() {
 		man/zlib_decompress.1 \
 		|| die
 
-	if use libressl ; then
-		sed -i 's/OPENSSL_MAJOR_VERSION STREQUAL "1"/OPENSSL_MAJOR_VERSION STREQUAL "2"/' \
-			"${S}/cmake/ssl.cmake" || die
-	fi
-
 	sed -i 's~ADD_SUBDIRECTORY(storage/ndb)~~' CMakeLists.txt || die
 }
 
diff --git a/dev-db/mysql/mysql-5.7.29-r1.ebuild b/dev-db/mysql/mysql-5.7.29-r1.ebuild
index 1d1fd598dd93..a68c2ae2ff7c 100644
--- a/dev-db/mysql/mysql-5.7.29-r1.ebuild
+++ b/dev-db/mysql/mysql-5.7.29-r1.ebuild
@@ -26,11 +26,10 @@ HOMEPAGE="https://www.mysql.com/"
 DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
 LICENSE="GPL-2"
 SLOT="5.7/18"
-IUSE="cjk client-libs cracklib debug experimental jemalloc latin1 libressl numa +perl profiling
+IUSE="cjk client-libs cracklib debug experimental jemalloc latin1 numa +perl profiling
 	selinux +server static static-libs systemtap tcmalloc test"
 
-# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
-RESTRICT="!test? ( test ) libressl? ( test )"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="?? ( tcmalloc jemalloc )"
 
@@ -55,7 +54,6 @@ PATCHES=(
 	"${MY_PATCH_DIR}"/20007_all_cmake-debug-werror-5.7.patch
 	"${MY_PATCH_DIR}"/20009_all_mysql_myodbc_symbol_fix-5.7.10.patch
 	"${MY_PATCH_DIR}"/20018_all_mysql-5.7.29-without-clientlibs-tools.patch
-	"${MY_PATCH_DIR}"/20018_all_mysql-5.7.29-fix-libressl-support.patch
 	"${MY_PATCH_DIR}"/20018_all_mysql-5.7.23-fix-grant_user_lock-a-root.patch
 	"${MY_PATCH_DIR}"/20018_all_mysql-5.7.23-round-off-test-values-for-same-output-on-all-architectures.patch
 	"${MY_PATCH_DIR}"/20018_all_mysql-5.7.25-fix-build-without-server.patch
@@ -91,12 +89,10 @@ COMMON_DEPEND="net-misc/curl:=
 	systemtap? ( >=dev-util/systemtap-1.3:0= )
 	tcmalloc? ( dev-util/google-perftools:0= )
 	client-libs? (
-		!libressl? ( >=dev-libs/openssl-1.0.0:0=[${MULTILIB_USEDEP},static-libs?] )
-		libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP},static-libs?] )
+		>=dev-libs/openssl-1.0.0:0=[${MULTILIB_USEDEP},static-libs?]
 	)
 	!client-libs? (
-		!libressl? ( >=dev-libs/openssl-1.0.0:0= )
-		libressl? ( dev-libs/libressl:0= )
+		>=dev-libs/openssl-1.0.0:0=
 	)
 "
 DEPEND="${COMMON_DEPEND}
@@ -305,11 +301,6 @@ src_prepare() {
 		man/zlib_decompress.1 \
 		|| die
 
-	if use libressl ; then
-		sed -i 's/OPENSSL_MAJOR_VERSION STREQUAL "1"/OPENSSL_MAJOR_VERSION STREQUAL "2"/' \
-			"${S}/cmake/ssl.cmake" || die
-	fi
-
 	sed -i 's~ADD_SUBDIRECTORY(storage/ndb)~~' CMakeLists.txt || die
 }
 
diff --git a/dev-db/mysql/mysql-5.7.30-r1.ebuild b/dev-db/mysql/mysql-5.7.30-r1.ebuild
index 59e0d821600f..8df5b377bb6f 100644
--- a/dev-db/mysql/mysql-5.7.30-r1.ebuild
+++ b/dev-db/mysql/mysql-5.7.30-r1.ebuild
@@ -22,11 +22,10 @@ HOMEPAGE="https://www.mysql.com/"
 DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
 LICENSE="GPL-2"
 SLOT="5.7/18"
-IUSE="cjk client-libs cracklib debug experimental jemalloc latin1 libressl numa +perl profiling
+IUSE="cjk client-libs cracklib debug experimental jemalloc latin1 numa +perl profiling
 	selinux +server static static-libs systemtap tcmalloc test"
 
-# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
-RESTRICT="!test? ( test ) libressl? ( test )"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="?? ( tcmalloc jemalloc )"
 
@@ -66,12 +65,10 @@ COMMON_DEPEND="net-misc/curl:=
 	systemtap? ( >=dev-util/systemtap-1.3:0= )
 	tcmalloc? ( dev-util/google-perftools:0= )
 	client-libs? (
-		!libressl? ( >=dev-libs/openssl-1.0.0:0=[${MULTILIB_USEDEP},static-libs?] )
-		libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP},static-libs?] )
+		>=dev-libs/openssl-1.0.0:0=[${MULTILIB_USEDEP},static-libs?]
 	)
 	!client-libs? (
-		!libressl? ( >=dev-libs/openssl-1.0.0:0= )
-		libressl? ( dev-libs/libressl:0= )
+		>=dev-libs/openssl-1.0.0:0=
 	)
 "
 DEPEND="${COMMON_DEPEND}
@@ -280,11 +277,6 @@ src_prepare() {
 		man/zlib_decompress.1 \
 		|| die
 
-	if use libressl ; then
-		sed -i 's/OPENSSL_MAJOR_VERSION STREQUAL "1"/OPENSSL_MAJOR_VERSION STREQUAL "2"/' \
-			"${S}/cmake/ssl.cmake" || die
-	fi
-
 	sed -i 's~ADD_SUBDIRECTORY(storage/ndb)~~' CMakeLists.txt || die
 }
 
diff --git a/dev-db/mysql/mysql-5.7.31.ebuild b/dev-db/mysql/mysql-5.7.31.ebuild
index 514e06d3091d..c5a202eecc1c 100644
--- a/dev-db/mysql/mysql-5.7.31.ebuild
+++ b/dev-db/mysql/mysql-5.7.31.ebuild
@@ -20,11 +20,10 @@ HOMEPAGE="https://www.mysql.com/"
 DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
 LICENSE="GPL-2"
 SLOT="5.7/18"
-IUSE="cjk client-libs cracklib debug experimental jemalloc latin1 libressl numa +perl profiling
+IUSE="cjk client-libs cracklib debug experimental jemalloc latin1 numa +perl profiling
 	selinux +server static static-libs systemtap tcmalloc test"
 
-# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
-RESTRICT="!test? ( test ) libressl? ( test )"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="?? ( tcmalloc jemalloc )"
 
@@ -41,14 +40,12 @@ COMMON_DEPEND="
 	sys-libs/ncurses:0=
 	client-libs? (
 		>=sys-libs/zlib-1.2.3:0=[${MULTILIB_USEDEP},static-libs?]
-		!libressl? ( >=dev-libs/openssl-1.0.0:0=[${MULTILIB_USEDEP},static-libs?] )
-		libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP},static-libs?] )
+		>=dev-libs/openssl-1.0.0:0=[${MULTILIB_USEDEP},static-libs?]
 	)
 	!client-libs? (
 		dev-db/mysql-connector-c[${MULTILIB_USEDEP},static-libs?]
 		>=sys-libs/zlib-1.2.3:0=
-		!libressl? ( >=dev-libs/openssl-1.0.0:0= )
-		libressl? ( dev-libs/libressl:0= )
+		>=dev-libs/openssl-1.0.0:0=
 	)
 	server? (
 		>=app-arch/lz4-0_p131:=
@@ -253,11 +250,6 @@ src_prepare() {
 		man/zlib_decompress.1 \
 		|| die
 
-	if use libressl ; then
-		sed -i 's/OPENSSL_MAJOR_VERSION STREQUAL "1"/OPENSSL_MAJOR_VERSION STREQUAL "2"/' \
-			"${S}/cmake/ssl.cmake" || die
-	fi
-
 	sed -i 's~ADD_SUBDIRECTORY(storage/ndb)~~' CMakeLists.txt || die
 
 	cmake_src_prepare
diff --git a/dev-db/mysql/mysql-5.7.32.ebuild b/dev-db/mysql/mysql-5.7.32.ebuild
index 6c3a7183a83d..c68d1e4cd86d 100644
--- a/dev-db/mysql/mysql-5.7.32.ebuild
+++ b/dev-db/mysql/mysql-5.7.32.ebuild
@@ -20,11 +20,10 @@ HOMEPAGE="https://www.mysql.com/"
 DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
 LICENSE="GPL-2"
 SLOT="5.7/18"
-IUSE="cjk client-libs cracklib debug experimental jemalloc latin1 libressl numa +perl profiling
+IUSE="cjk client-libs cracklib debug experimental jemalloc latin1 numa +perl profiling
 	selinux +server static static-libs systemtap tcmalloc test"
 
-# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
-RESTRICT="!test? ( test ) libressl? ( test )"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="?? ( tcmalloc jemalloc )"
 
@@ -41,14 +40,12 @@ COMMON_DEPEND="
 	sys-libs/ncurses:0=
 	client-libs? (
 		>=sys-libs/zlib-1.2.3:0=[${MULTILIB_USEDEP},static-libs?]
-		!libressl? ( >=dev-libs/openssl-1.0.0:0=[${MULTILIB_USEDEP},static-libs?] )
-		libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP},static-libs?] )
+		>=dev-libs/openssl-1.0.0:0=[${MULTILIB_USEDEP},static-libs?]
 	)
 	!client-libs? (
 		dev-db/mysql-connector-c[${MULTILIB_USEDEP},static-libs?]
 		>=sys-libs/zlib-1.2.3:0=
-		!libressl? ( >=dev-libs/openssl-1.0.0:0= )
-		libressl? ( dev-libs/libressl:0= )
+		>=dev-libs/openssl-1.0.0:0=
 	)
 	server? (
 		>=app-arch/lz4-0_p131:=
@@ -253,11 +250,6 @@ src_prepare() {
 		man/zlib_decompress.1 \
 		|| die
 
-	if use libressl ; then
-		sed -i 's/OPENSSL_MAJOR_VERSION STREQUAL "1"/OPENSSL_MAJOR_VERSION STREQUAL "2"/' \
-			"${S}/cmake/ssl.cmake" || die
-	fi
-
 	sed -i 's~ADD_SUBDIRECTORY(storage/ndb)~~' CMakeLists.txt || die
 
 	cmake_src_prepare
diff --git a/dev-db/mysql/mysql-5.7.33.ebuild b/dev-db/mysql/mysql-5.7.33.ebuild
index 0296a2135fc5..6a24a16ccfe2 100644
--- a/dev-db/mysql/mysql-5.7.33.ebuild
+++ b/dev-db/mysql/mysql-5.7.33.ebuild
@@ -20,11 +20,10 @@ HOMEPAGE="https://www.mysql.com/"
 DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
 LICENSE="GPL-2"
 SLOT="5.7/18"
-IUSE="cjk client-libs cracklib debug experimental jemalloc latin1 libressl numa +perl profiling
+IUSE="cjk client-libs cracklib debug experimental jemalloc latin1 numa +perl profiling
 	selinux +server static static-libs systemtap tcmalloc test"
 
-# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
-RESTRICT="!test? ( test ) libressl? ( test )"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="?? ( tcmalloc jemalloc )"
 
@@ -41,14 +40,12 @@ COMMON_DEPEND="
 	sys-libs/ncurses:0=
 	client-libs? (
 		>=sys-libs/zlib-1.2.3:0=[${MULTILIB_USEDEP},static-libs?]
-		!libressl? ( >=dev-libs/openssl-1.0.0:0=[${MULTILIB_USEDEP},static-libs?] )
-		libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP},static-libs?] )
+		>=dev-libs/openssl-1.0.0:0=[${MULTILIB_USEDEP},static-libs?]
 	)
 	!client-libs? (
 		dev-db/mysql-connector-c[${MULTILIB_USEDEP},static-libs?]
 		>=sys-libs/zlib-1.2.3:0=
-		!libressl? ( >=dev-libs/openssl-1.0.0:0= )
-		libressl? ( dev-libs/libressl:0= )
+		>=dev-libs/openssl-1.0.0:0=
 	)
 	server? (
 		>=app-arch/lz4-0_p131:=
@@ -253,11 +250,6 @@ src_prepare() {
 		man/zlib_decompress.1 \
 		|| die
 
-	if use libressl ; then
-		sed -i 's/OPENSSL_MAJOR_VERSION STREQUAL "1"/OPENSSL_MAJOR_VERSION STREQUAL "2"/' \
-			"${S}/cmake/ssl.cmake" || die
-	fi
-
 	sed -i 's~ADD_SUBDIRECTORY(storage/ndb)~~' CMakeLists.txt || die
 
 	cmake_src_prepare
diff --git a/dev-db/mysql/mysql-5.7.34.ebuild b/dev-db/mysql/mysql-5.7.34.ebuild
index da6fe5706221..0e825dede97b 100644
--- a/dev-db/mysql/mysql-5.7.34.ebuild
+++ b/dev-db/mysql/mysql-5.7.34.ebuild
@@ -20,11 +20,10 @@ HOMEPAGE="https://www.mysql.com/"
 DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
 LICENSE="GPL-2"
 SLOT="5.7/18"
-IUSE="cjk client-libs cracklib debug experimental jemalloc latin1 libressl numa +perl profiling
+IUSE="cjk client-libs cracklib debug experimental jemalloc latin1 numa +perl profiling
 	selinux +server static static-libs systemtap tcmalloc test"
 
-# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
-RESTRICT="!test? ( test ) libressl? ( test )"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="?? ( tcmalloc jemalloc )"
 
@@ -41,14 +40,12 @@ COMMON_DEPEND="
 	sys-libs/ncurses:0=
 	client-libs? (
 		>=sys-libs/zlib-1.2.3:0=[${MULTILIB_USEDEP},static-libs?]
-		!libressl? ( >=dev-libs/openssl-1.0.0:0=[${MULTILIB_USEDEP},static-libs?] )
-		libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP},static-libs?] )
+		>=dev-libs/openssl-1.0.0:0=[${MULTILIB_USEDEP},static-libs?]
 	)
 	!client-libs? (
 		dev-db/mysql-connector-c[${MULTILIB_USEDEP},static-libs?]
 		>=sys-libs/zlib-1.2.3:0=
-		!libressl? ( >=dev-libs/openssl-1.0.0:0= )
-		libressl? ( dev-libs/libressl:0= )
+		>=dev-libs/openssl-1.0.0:0=
 	)
 	server? (
 		>=app-arch/lz4-0_p131:=
@@ -253,11 +250,6 @@ src_prepare() {
 		man/zlib_decompress.1 \
 		|| die
 
-	if use libressl ; then
-		sed -i 's/OPENSSL_MAJOR_VERSION STREQUAL "1"/OPENSSL_MAJOR_VERSION STREQUAL "2"/' \
-			"${S}/cmake/ssl.cmake" || die
-	fi
-
 	sed -i 's~ADD_SUBDIRECTORY(storage/ndb)~~' CMakeLists.txt || die
 
 	cmake_src_prepare
diff --git a/dev-db/mysql/mysql-8.0.19-r2.ebuild b/dev-db/mysql/mysql-8.0.19-r2.ebuild
index 60dd2a3f27bc..f979bb9020ff 100644
--- a/dev-db/mysql/mysql-8.0.19-r2.ebuild
+++ b/dev-db/mysql/mysql-8.0.19-r2.ebuild
@@ -29,11 +29,10 @@ HOMEPAGE="https://www.mysql.com/"
 DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
 LICENSE="GPL-2"
 SLOT="8.0"
-IUSE="cjk cracklib debug jemalloc latin1 libressl numa +perl profiling
+IUSE="cjk cracklib debug jemalloc latin1 numa +perl profiling
 	router selinux +server tcmalloc test"
 
-# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
-RESTRICT="!test? ( test ) libressl? ( test )"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="?? ( tcmalloc jemalloc )
 	cjk? ( server )
@@ -64,7 +63,6 @@ PATCHES=(
 	"${MY_PATCH_DIR}"/20007_all_cmake-debug-werror-8.0.18.patch
 	"${MY_PATCH_DIR}"/20018_all_mysql-5.7.23-fix-grant_user_lock-a-root.patch
 	"${MY_PATCH_DIR}"/20018_all_mysql-8.0.19-without-clientlibs-tools.patch
-	"${MY_PATCH_DIR}"/20018_all_mysql-8.0.19-fix-libressl-support.patch
 	"${MY_PATCH_DIR}"/20018_all_mysql-8.0.19-fix-events_bugs-test.patch
 )
 
@@ -74,8 +72,7 @@ COMMON_DEPEND="
 	>=app-arch/lz4-0_p131:=
 	sys-libs/ncurses:0=
 	>=sys-libs/zlib-1.2.3:0=
-	libressl? ( dev-libs/libressl:0= )
-	!libressl? ( >=dev-libs/openssl-1.0.0:0= )
+	>=dev-libs/openssl-1.0.0:0=
 	server? (
 		dev-libs/icu:=
 		dev-libs/libevent:=
diff --git a/dev-db/mysql/mysql-8.0.20-r1.ebuild b/dev-db/mysql/mysql-8.0.20-r1.ebuild
index 4545a1eec02b..70c3c6e5e878 100644
--- a/dev-db/mysql/mysql-8.0.20-r1.ebuild
+++ b/dev-db/mysql/mysql-8.0.20-r1.ebuild
@@ -23,11 +23,10 @@ HOMEPAGE="https://www.mysql.com/"
 DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
 LICENSE="GPL-2"
 SLOT="8.0"
-IUSE="cjk cracklib debug jemalloc latin1 libressl numa +perl profiling
+IUSE="cjk cracklib debug jemalloc latin1 numa +perl profiling
 	router selinux +server tcmalloc test"
 
-# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
-RESTRICT="!test? ( test ) libressl? ( test )"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="?? ( tcmalloc jemalloc )
 	cjk? ( server )
@@ -49,8 +48,7 @@ COMMON_DEPEND="
 	>=app-arch/lz4-0_p131:=
 	sys-libs/ncurses:0=
 	>=sys-libs/zlib-1.2.3:0=
-	libressl? ( dev-libs/libressl:0= )
-	!libressl? ( >=dev-libs/openssl-1.0.0:0= )
+	>=dev-libs/openssl-1.0.0:0=
 	server? (
 		dev-libs/icu:=
 		dev-libs/libevent:=
diff --git a/dev-db/mysql/mysql-8.0.21-r1.ebuild b/dev-db/mysql/mysql-8.0.21-r1.ebuild
index b3a4bf5a2ad2..d63f3416d34e 100644
--- a/dev-db/mysql/mysql-8.0.21-r1.ebuild
+++ b/dev-db/mysql/mysql-8.0.21-r1.ebuild
@@ -23,11 +23,10 @@ HOMEPAGE="https://www.mysql.com/"
 DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
 LICENSE="GPL-2"
 SLOT="8.0"
-IUSE="cjk cracklib debug jemalloc latin1 libressl numa +perl profiling
+IUSE="cjk cracklib debug jemalloc latin1 numa +perl profiling
 	router selinux +server tcmalloc test"
 
-# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
-RESTRICT="!test? ( test ) libressl? ( test )"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="?? ( tcmalloc jemalloc )
 	cjk? ( server )
@@ -50,8 +49,7 @@ COMMON_DEPEND="
 	app-arch/zstd:=
 	sys-libs/ncurses:0=
 	>=sys-libs/zlib-1.2.3:0=
-	libressl? ( dev-libs/libressl:0= )
-	!libressl? ( >=dev-libs/openssl-1.0.0:0= )
+	>=dev-libs/openssl-1.0.0:0=
 	server? (
 		dev-libs/icu:=
 		dev-libs/libevent:=[ssl]
diff --git a/dev-db/mysql/mysql-8.0.22.ebuild b/dev-db/mysql/mysql-8.0.22.ebuild
index 18586043f65e..1c0cd3052d7f 100644
--- a/dev-db/mysql/mysql-8.0.22.ebuild
+++ b/dev-db/mysql/mysql-8.0.22.ebuild
@@ -23,11 +23,10 @@ HOMEPAGE="https://www.mysql.com/"
 DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
 LICENSE="GPL-2"
 SLOT="8.0"
-IUSE="cjk cracklib debug jemalloc latin1 libressl numa +perl profiling
+IUSE="cjk cracklib debug jemalloc latin1 numa +perl profiling
 	router selinux +server tcmalloc test"
 
-# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
-RESTRICT="!test? ( test ) libressl? ( test )"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="?? ( tcmalloc jemalloc )
 	cjk? ( server )
@@ -50,8 +49,7 @@ COMMON_DEPEND="
 	app-arch/zstd:=
 	sys-libs/ncurses:0=
 	>=sys-libs/zlib-1.2.3:0=
-	libressl? ( dev-libs/libressl:0= )
-	!libressl? ( >=dev-libs/openssl-1.0.0:0= )
+	>=dev-libs/openssl-1.0.0:0=
 	server? (
 		dev-libs/icu:=
 		dev-libs/libevent:=[ssl,threads]
diff --git a/dev-db/mysql/mysql-8.0.23.ebuild b/dev-db/mysql/mysql-8.0.23.ebuild
index 89c21bd9a666..4de06f95e603 100644
--- a/dev-db/mysql/mysql-8.0.23.ebuild
+++ b/dev-db/mysql/mysql-8.0.23.ebuild
@@ -23,11 +23,10 @@ HOMEPAGE="https://www.mysql.com/"
 DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
 LICENSE="GPL-2"
 SLOT="8.0"
-IUSE="cjk cracklib debug jemalloc latin1 libressl numa +perl profiling
+IUSE="cjk cracklib debug jemalloc latin1 numa +perl profiling
 	router selinux +server tcmalloc test"
 
-# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
-RESTRICT="!test? ( test ) libressl? ( test )"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="?? ( tcmalloc jemalloc )
 	cjk? ( server )
@@ -50,8 +49,7 @@ COMMON_DEPEND="
 	app-arch/zstd:=
 	sys-libs/ncurses:0=
 	>=sys-libs/zlib-1.2.3:0=
-	libressl? ( dev-libs/libressl:0= )
-	!libressl? ( >=dev-libs/openssl-1.0.0:0= )
+	>=dev-libs/openssl-1.0.0:0=
 	server? (
 		dev-libs/icu:=
 		dev-libs/libevent:=[ssl,threads]
diff --git a/dev-db/mysql/mysql-8.0.24.ebuild b/dev-db/mysql/mysql-8.0.24.ebuild
index a76d3a37969f..608252f5a966 100644
--- a/dev-db/mysql/mysql-8.0.24.ebuild
+++ b/dev-db/mysql/mysql-8.0.24.ebuild
@@ -23,11 +23,10 @@ HOMEPAGE="https://www.mysql.com/"
 DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
 LICENSE="GPL-2"
 SLOT="8.0"
-IUSE="cjk cracklib debug jemalloc latin1 libressl numa +perl profiling
+IUSE="cjk cracklib debug jemalloc latin1 numa +perl profiling
 	router selinux +server tcmalloc test"
 
-# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
-RESTRICT="!test? ( test ) libressl? ( test )"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="?? ( tcmalloc jemalloc )
 	cjk? ( server )
@@ -50,8 +49,7 @@ COMMON_DEPEND="
 	app-arch/zstd:=
 	sys-libs/ncurses:0=
 	>=sys-libs/zlib-1.2.3:0=
-	libressl? ( dev-libs/libressl:0= )
-	!libressl? ( >=dev-libs/openssl-1.0.0:0= )
+	>=dev-libs/openssl-1.0.0:0=
 	server? (
 		dev-libs/icu:=
 		dev-libs/libevent:=[ssl,threads]
diff --git a/dev-db/percona-server/Manifest b/dev-db/percona-server/Manifest
index 3093cbb3d246..cb6de56af9a3 100644
--- a/dev-db/percona-server/Manifest
+++ b/dev-db/percona-server/Manifest
@@ -4,5 +4,5 @@ AUX my.cnf-8.0.distro-server 1125 BLAKE2B f4d6941aad1fc29e81e6c805ac42f4c8d3c7bc
 DIST boost_1_73_0.tar.bz2 109247910 BLAKE2B 5995ff6ca21f45988b187b94bf743795cca97531baa8355f488be0987b9426289dd85d6ce25b7eb03ccd690109f05ba56252a95bca50505ad9cd66f4e0e234e8 SHA512 86c296511c0766145097625a62bf099c3d155284d250ad6e528e788bc90b2945838498dfe473c6c6c78d1694b6fba8e19f7dee0d064a043841e6231603fff668
 DIST percona-server-8.0.22-13.tar.gz 530806570 BLAKE2B 256e5afa2e3908617c41ffcab591ccdbfd932a8ba3ce25fbf2a0be2cdfa80991b0c2d090c11ffae64e4bb3d8cf9f3011b70974ab22cbab023f6625ac422f3c73 SHA512 9b7a1d06885eb4412361bb3920adc9f050f8da95584eb910c97c8877a433ead04d02f2908e5e9648b1d79cdba677727fdb745377feac3c958339588d5f0cdf2b
 DIST percona-server-8.0.22.13-patches-02.tar.xz 9620 BLAKE2B c04e97ed422719bec5008b668e2ce3ecd5b848338a9f2f2ecd2fc867307b7fce9bae4cb0efd44f9b950f74d7f31394c06248d1c72784e9c0790378e2ea4d7934 SHA512 2476ee2f4096eaee211017609f82cf8fa9817cda6345336f478257711b64b8c37340b482a02f3d0b19e16e01055cf619cdd1b66d5fbfa0fd1d8edbd529c4096f
-EBUILD percona-server-8.0.22.13.ebuild 40052 BLAKE2B ae97d828fdbc4c408c34c0408fa2bc67f730a61acc440a15ab9200d7428c2ca3a4fa534ad02e2351b16ee487733b672bf62bc7c9f226212fc8d3b99280fb8988 SHA512 8174f35c832692bae1a74ff1c113ebffabe7c271492f9e187b5a67ff71e4c88ce0c859b5bc72f4d02f64a2098137b5c32069364a5d2622ace5f08e6cd102cf39
-MISC metadata.xml 1120 BLAKE2B fb5942ab65cb9572c5bf593833c274e82c6f99dda741638efbba4c00c667bda6a9aa290db772cc83a8afe4e5e0ef167b92b449ff54e5a0facdc3ca093e3dc72b SHA512 d603bb674b8458ac00de2fe9ecc8454407e8df44138f4ecb450ea6cd10265ab3aaba78fac6ba2e7b41e454adfd8ba5c0a2541729668170ab48031c352f30bbdd
+EBUILD percona-server-8.0.22.13.ebuild 39889 BLAKE2B 0a5f64db96a74046cf9a100d81b064e8c76215322ccd595f29103654f35b71f9ed60d1e60200f5a2aed105f5ffe72da67d44e76f9b5a3249fd8448478c8b1bab SHA512 b02d0974cfc4fbfeaf017bf0964b0dc34c70252543b5ecd6613bb76e5e3500806408db1ba6b5ebd58b24b2995c4098a0193444948c5daa7b0d71c1c492939d03
+MISC metadata.xml 1010 BLAKE2B 12a73e124af07d102ab0198d6942515f652dadcf7a62cea9180012e0d0ef5dab146a76439650f408bc9f034646c7e6a3337cc843fe711c0cc347864e553f355d SHA512 6459d89a1b50a1344d1ad558ea684a23691c7b0f9e860c056f136d4ebf82a74ce11bafdcff420b7aa41907b3d31d45272d02990cba40cedd50b1d10545f059f0
diff --git a/dev-db/percona-server/metadata.xml b/dev-db/percona-server/metadata.xml
index 4b72b897bda7..4801ce495b3d 100644
--- a/dev-db/percona-server/metadata.xml
+++ b/dev-db/percona-server/metadata.xml
@@ -8,7 +8,6 @@
 <use>
   <flag name="cjk">Add CJK support for InnoDB fulltext search using <pkg>app-text/mecab</pkg></flag>
   <flag name="latin1">Use LATIN1 encoding instead of UTF8</flag>
-  <flag name="libressl">Enable SSL connections and crypto functions using <pkg>dev-libs/libressl</pkg></flag>
   <flag name="numa">Enable NUMA support using <pkg>sys-process/numactl</pkg> (NUMA kernel support is also required)</flag>
   <flag name="profiling">Add support for statement profiling (requires USE=community).</flag>
   <flag name="rocksdb">Add support for RocksDB; a key/value, LSM database optimized for flash storage</flag>
diff --git a/dev-db/percona-server/percona-server-8.0.22.13.ebuild b/dev-db/percona-server/percona-server-8.0.22.13.ebuild
index eea3260fd479..8b514bd03ae3 100644
--- a/dev-db/percona-server/percona-server-8.0.22.13.ebuild
+++ b/dev-db/percona-server/percona-server-8.0.22.13.ebuild
@@ -28,11 +28,10 @@ HOMEPAGE="https://www.percona.com/software/mysql-database/percona-server https:/
 DESCRIPTION="Fully compatible, enhanced and open source drop-in replacement for MySQL"
 LICENSE="GPL-2"
 SLOT="8.0"
-IUSE="cjk cracklib debug jemalloc latin1 ldap libressl numa pam +perl profiling
+IUSE="cjk cracklib debug jemalloc latin1 ldap numa pam +perl profiling
 	rocksdb router selinux +server tcmalloc test tokudb tokudb-backup-plugin"
 
-# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
-RESTRICT="!test? ( test ) libressl? ( test )"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="?? ( tcmalloc jemalloc )
 	cjk? ( server )
@@ -55,8 +54,7 @@ COMMON_DEPEND="
 	app-arch/zstd:=
 	sys-libs/ncurses:0=
 	>=sys-libs/zlib-1.2.3:0=
-	libressl? ( dev-libs/libressl:0= )
-	!libressl? ( >=dev-libs/openssl-1.0.0:0= )
+	>=dev-libs/openssl-1.0.0:0=
 	server? (
 		dev-libs/icu:=
 		dev-libs/libevent:=[ssl,threads]
diff --git a/dev-db/percona-toolkit/Manifest b/dev-db/percona-toolkit/Manifest
index 9df1914dfbd2..11da1e33c7e0 100644
--- a/dev-db/percona-toolkit/Manifest
+++ b/dev-db/percona-toolkit/Manifest
@@ -9,10 +9,12 @@ DIST percona-toolkit-3.0.9.tar.gz 15197340 BLAKE2B 095d8c0b26853caa6d2515de1d8fb
 DIST percona-toolkit-3.1.0.tar.gz 18106856 BLAKE2B 4a08e70a03d80e86e2fd7ba4ac77be9568643faf46bb653ef9e18015b95d36936034369a8adf9de4e09d2ca6cd25a845b140d6dd2c41027597f08d74f328ad26 SHA512 6dd2de997fe9627897dad453277544142cbdcba41bf30de21ee10c292c671bc089df0e299a8e386af082511c57ac53621b8e11f4ae43e98ea41eeca0c76f652f
 DIST percona-toolkit-3.2.1.tar.gz 15521123 BLAKE2B 7f8222a2afe2c0700d8f965bb5f8d2ef99c1136b977454ef04133fa8dfeb0192c49552dfde90a2d4d69116c2ba7c4a998fc330f64546691982946624bf24efef SHA512 17fd9f10d2d5671c3ce75dfeba501b9c34b216844b8d8ceb03fadbfb6396cedb7b672d52af7a831739a417d6fcc5b538b4772ffdb9b55816d94fac87e88ba472
 DIST percona-toolkit-3.3.0.tar.gz 15342520 BLAKE2B fcafede75cf15ad61efe18eac057cedab11e570cc6a17d48345cd046638b6b1c89b8f233f26cd051301ea0d6bdd03996b4007fc09a84cd44464beb3ca7150b70 SHA512 87bb5bcccabf782eafc0e363f3a5d75e9e28d5edd9d4278df5f455c90207296dc9035f85311567bd210109a2796484010d8a11fa4d4a5bee09f228aedb6b3bb2
+DIST percona-toolkit-3.3.1.tar.gz 15348084 BLAKE2B 1bae3bc96144d23d51afca624b4ff4c7d5e118db857b5bf7721b8fa3fbc43e0ed87c52113e694e5defa0c70643a018ce1a7d2e437f097bac407344456f70ca1f SHA512 ee82613e15746820739042d34cf7cac0ba7e9f2825234ba39d7bfb8e0a52ab9b8d23ca47cb6a6afe2525c01f69fc81130a3be67b8a191c98d0d43e960a736cb0
 EBUILD percona-toolkit-2.2.20.ebuild 1213 BLAKE2B 2bcc433599d64b15225e508fa16c50634b34c9963c38fae7d8ac412e730c9566751bfa1c784254018e40b5a6d8fcb6b4e52c2f85df7362d43bcf153282f7766b SHA512 f1b0b8a48e99d616d9a54a5bf6c39a06ef5e6f48992fe3e0584d464d7ed1abc5f6f08a14488cbffd4fcf4d8afe8791112094438baf06a5a4b788a953d539288b
 EBUILD percona-toolkit-3.0.13.ebuild 1325 BLAKE2B c8dc51ce757c3165957190266fa484bf74451644cdc62a464d8276fd6d3523a2b2864caa27b766c7e90b1c02c81d940ebd706e876922020c0feb878eb3083d26 SHA512 152841e2bd6be6e7015be3c929e1ecef678bf4456b9beba1ace9dac5f129e02d7373b460bb445ab0c69e10c351602907d33dcddb14faf624013790f9cfe54753
 EBUILD percona-toolkit-3.0.9.ebuild 1249 BLAKE2B bd743a722e60cade6307bd04c774a77d0e01b2272e82974be486b47d0462120910c1182ba6fc3f7cf268f4ebfa04d432e456f62079010621aeaf6b325c743b54 SHA512 988d423c3125592608caa659543b508dcea2048b0c905a24c924e75894ca7c93924908e49f5c6c2c5d660a7b90a242e558e874849f0793d58a82abec1ad38982
 EBUILD percona-toolkit-3.1.0-r1.ebuild 1389 BLAKE2B 43f48d8cbaa1bebcef5c8d9100f2d270931ee2ac0d5649b1aa66bd2f0fb6c56238d5eb30b5a3d1b2bbe4915470976af3e80f04aa97e173a5214f182d41772953 SHA512 fb554bae9ebc93863faf381a59ab0ce64f41c0374061c34d5b6c34e8728ee771a2c90ea852adb8857211adf52cdfd9e48072fcf079a68c20f3554788775bdffd
 EBUILD percona-toolkit-3.2.1.ebuild 1327 BLAKE2B 721af4c15c6c1bacae62569f8320698899ac7c26d6694790d4457ea65b2ec12c476d2d3d80e42d8f9f589e4aa8d5c81b76c29484e6f9cf68387bf00cbd2e8000 SHA512 c159ad4696e2fe86b012a24ee3a69da0fe7134c248786936d0f1bca1b0e3672825dd10c1ee485d187d26fa3f0870c453fbbf67de89b28cf770ed640fe9b2b265
 EBUILD percona-toolkit-3.3.0.ebuild 1327 BLAKE2B bb75b25d57fdd2994bc049e55e98060645995111384cd47c9d7c9ee21d7813be85e21622af3e95f08912cd1adc18a990376b611f32c2ebabea5a6659d61e5658 SHA512 61683cb1082708ade2edfc15a8e68c42795582891b9c4d930981d76ddd0473bdac64105d3d25b230380067a9ce7ef4453e7558a1bdbad5f3439eac3cfd8aeefd
+EBUILD percona-toolkit-3.3.1.ebuild 1327 BLAKE2B bb75b25d57fdd2994bc049e55e98060645995111384cd47c9d7c9ee21d7813be85e21622af3e95f08912cd1adc18a990376b611f32c2ebabea5a6659d61e5658 SHA512 61683cb1082708ade2edfc15a8e68c42795582891b9c4d930981d76ddd0473bdac64105d3d25b230380067a9ce7ef4453e7558a1bdbad5f3439eac3cfd8aeefd
 MISC metadata.xml 723 BLAKE2B f5150e42397c47b3815de1c9ff8414e12f517501e7075c5fddf3ac800a2c0a654db5d2fccef57609629017713f3a80a81164886b82d16df282601452e1bd5705 SHA512 b0e9ddbbd1834f5867600530e946ce30786ea83e779f62bf894facc0bb3f0fd5a58f6095f0e006d565e04370c89ae4101d9cfb9b7243704118eb7629ae0e0f9e
diff --git a/dev-db/percona-toolkit/percona-toolkit-3.3.1.ebuild b/dev-db/percona-toolkit/percona-toolkit-3.3.1.ebuild
new file mode 100644
index 000000000000..2baf33ca254c
--- /dev/null
+++ b/dev-db/percona-toolkit/percona-toolkit-3.3.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit perl-module
+
+DESCRIPTION="Advanced command-line tools to perform a variety of MySQL and system tasks"
+HOMEPAGE="https://www.percona.com/software/mysql-tools/percona-toolkit"
+SRC_URI="https://www.percona.com/downloads/${PN}/${PV}/source/tarball/${P}.tar.gz"
+
+LICENSE="|| ( GPL-2 Artistic )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+# Package warrants IUSE doc
+IUSE=""
+
+COMMON_DEPEND="dev-perl/DBI
+	dev-perl/DBD-mysql
+	virtual/perl-Time-HiRes"
+RDEPEND="${COMMON_DEPEND}
+	dev-perl/JSON
+	dev-perl/libwww-perl
+	dev-perl/Role-Tiny
+	virtual/perl-File-Path
+	virtual/perl-Getopt-Long
+	virtual/perl-Time-Local
+	virtual/perl-Digest-MD5
+	virtual/perl-IO-Compress
+	virtual/perl-File-Temp
+	virtual/perl-File-Spec
+	virtual/perl-Scalar-List-Utils
+	dev-perl/TermReadKey"
+DEPEND="${COMMON_DEPEND}
+	virtual/perl-ExtUtils-MakeMaker"
+
+# Bug #501904 - CVE-2014-2029
+# sed -i -e '/^=item --\[no\]version-check/,/^default: yes/{/^default: yes/d}' bin/*
+# ^ is *-no-versioncheck.patch
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.0.7-no-versioncheck.patch
+	"${FILESDIR}"/${PN}-3.0.10-slave-delay-fix.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e "s/=> 'percona-toolkit',/=> 'Percona::Toolkit',/g" \
+		Makefile.PL || die
+}
diff --git a/dev-db/percona-xtrabackup/Manifest b/dev-db/percona-xtrabackup/Manifest
index 0ac960d66ec8..8a87d05e6b94 100644
--- a/dev-db/percona-xtrabackup/Manifest
+++ b/dev-db/percona-xtrabackup/Manifest
@@ -4,6 +4,7 @@ AUX percona-xtrabackup-2.4.6-remove-boost-version-check.patch 485 BLAKE2B c9330c
 AUX percona-xtrabackup-8.0.13-remove-rpm.patch 1139 BLAKE2B c2ada7337f6596ac5c37b1ebe7f2324fb4ee43e14ec41cfeb8d861bc2df0614ca1957c9d44cf81530b1f4bac9d6143edc906721aeebfe4551fe37dec9a41ed7b SHA512 99d4e92c5f979b4d3e9edb6ebae73e88f81d5696826d4f477f8cd885d8c54d955c879eed45779aca092facfef7aa29f818cf467c3302a7e8db6ca89fa5e38e28
 AUX percona-xtrabackup-8.0.22-fix-building-against-ICU-68.patch 1094 BLAKE2B 25b43fc6ca621e6f7a93a214580fb491d7c8c4ac7d4fbaca93e521eebb6b63b48e5526cd8aeff4d92c7715416833ed16df4c258ebbd8c5ce8015a0afdd32e11d SHA512 c0b9fe123766b70d324dd9388bd0762e734bc728c3dd8f750f06ac7432a1907fc45aaad7b1c79418446af0c416e962c116a15e17ac7091607df09f2fa04fa555
 AUX percona-xtrabackup-8.0.22-remove-rpm.patch 1086 BLAKE2B fdac1fa3f83cd7b3b82ca7dd443ba9d170051d1b2e92fbb267524b46c8272c28586cce58de6b71eae1372f08fd5e89b0faee567885bc3de7650cb42c4749ec8a SHA512 2362805b7937b9b1922f4d8be86031b58df9c1475c849052727f190ec08b32cbf07bee98ac38fe7a362e8e10fa1dcb4ee16f9bbeb6f36ddfc2931b9f14c05553
+AUX percona-xtrabackup-8.0.23-gcc11.patch 931 BLAKE2B df3465d46495f329015452aa17981323f9981cf43a460c206ccc9730d747881559a058ebafb0960c70689df5ef35d7fc2d2a920199f3e13f52c0ac34b29fffda SHA512 6e5981c5868d5d025cfad0a718804f2006535f3cf55965cd7fbd5ca7a62bc871e2c0bf3638be2b9549121948b0a6fa750c0842970088dc1c489f7ce811e047c1
 DIST boost_1_59_0.tar.gz 83709983 BLAKE2B 8c6676fa05fa401a6ecb3b890d95aceb4421ec48dd0eab38ce8d170c618e177c82dc67a165938f6be1a01daab24ce41888f5442dbc19ad3dd41368a01a6f89e4 SHA512 05fdbe5637543defdbc630b921515425885593d16db14534ed7b9aa60925ade8fb598d50cb894aed6dae688e789047216daa1bf03fa1aeb6b531060d9dae52ae
 DIST boost_1_70_0.tar.gz 116000903 BLAKE2B aefeddf5671295ae46fcfed033cef37cca1c70f88d7d3305636e0add98c277fc8170c7e3e0de58ff83a64389b5b430b81077b6852da5941aa4867845a7b08554 SHA512 3d8800d0aa864fb5484a5339ab75dee9bceca063122108e92d971f1d1295a9f09399b2dd88b117da7f0c4558b4f9fb1494eda1e3035498557bbe90e8f058668f
 DIST boost_1_73_0.tar.bz2 109247910 BLAKE2B 5995ff6ca21f45988b187b94bf743795cca97531baa8355f488be0987b9426289dd85d6ce25b7eb03ccd690109f05ba56252a95bca50505ad9cd66f4e0e234e8 SHA512 86c296511c0766145097625a62bf099c3d155284d250ad6e528e788bc90b2945838498dfe473c6c6c78d1694b6fba8e19f7dee0d064a043841e6231603fff668
@@ -20,5 +21,5 @@ EBUILD percona-xtrabackup-2.4.21.ebuild 1499 BLAKE2B 00e2dcb73eee4fcc85847e8524c
 EBUILD percona-xtrabackup-2.4.22.ebuild 1499 BLAKE2B 00e2dcb73eee4fcc85847e8524c67195d50e53675dfd9e65d2c4e2ad286cdf18416809f185be81256c59fb5908cf5b44893d365c3f0fb535c8025334350c573c SHA512 b436b90f4aa3bd37471c30f3cf23d35327f6d06d67ba4def513e49528fcc6569c22afee356392c877b951c49d60f2235e408ac18e11d61606105bb5ff00aa7a7
 EBUILD percona-xtrabackup-8.0.13.ebuild 1545 BLAKE2B 42ea67173b4c4f462e0acbe4a5ebdf2cae8ea7764df7d5353c73f65dd5d9023a2833e8e8c7baf9b4f8316d5179ea5aa3a7ca1b55eebd88d43fb89cbea333928d SHA512 5967bb6a3e95187d13c4b6995cfd8b151aa1d1fa9c4dadfa1bf0791ff8748a73705a750214115c62c92c41c483d48872e38c7915e82fbc4ef90d79f594a135c2
 EBUILD percona-xtrabackup-8.0.22.15.ebuild 1867 BLAKE2B 626bc0a244a6335f0b8f65ea586e1d26bd2215b239338160f6dcf5a0cb832a810d1a128de7c0599c74fa6c61a8389b002ab9a800d4fd9dfd7ef924d3f32ff0c5 SHA512 d5387d3a5ddf1232786b4d477b404f856484f4d2c9ef4a1b3edc7b4d9f0fb001e18137f0ac597da9ea7c6feed96fe74503126e17d0ff2f890bf12f33ff9c06d9
-EBUILD percona-xtrabackup-8.0.23.16.ebuild 2163 BLAKE2B 0ab36f111f6df3855f9641c35bb5440d532ee54ddf3b257ef7dff03cb1f8c9880753ce20b39d1fecb43f113e1433381432d8ad832b251ef0e9c6034dd16136b4 SHA512 4e95c7c94d2d8743560638a665225e846da34331e6a8e999810c066528aa202d22ccf78cd1f41cdd1547657a002e1a5d48036d6448d34281c4a45471caafd53a
+EBUILD percona-xtrabackup-8.0.23.16.ebuild 2203 BLAKE2B 05977a233a1282cafe6a0b96ec09db50a46e555755115c3c779f4a1ef739b6f45fb9f0d94d4111d3e05416449bdf5adcddee193ac5738eb17d43b84d3d7c6339 SHA512 810fab9b4f41014c9f4c58b8def0c417d2cbd5f87f6812002cb82aadbfae5b7392f8fb03b59b1d1173f2640bee0e1a4821edad7bd8aadc6bac13798f5346d645
 MISC metadata.xml 334 BLAKE2B dcc722d923e0f35bd57d67664edf99e7bc159816aa88b4ea210b72a643326c64ed26082088e0468c2b51670b1bd913e66e5f8a99adcb847b42e7f61e7a354223 SHA512 035813d50369063ec1da627ed05ad625045a52e252441bbd4ada2035913525fb18dbf443a57af587aa0f1f18a4e87168e4b683cd33b701e1f115d7e852a81add
diff --git a/dev-db/percona-xtrabackup/files/percona-xtrabackup-8.0.23-gcc11.patch b/dev-db/percona-xtrabackup/files/percona-xtrabackup-8.0.23-gcc11.patch
new file mode 100644
index 000000000000..83aa6ab78a59
--- /dev/null
+++ b/dev-db/percona-xtrabackup/files/percona-xtrabackup-8.0.23-gcc11.patch
@@ -0,0 +1,41 @@
+--- a/extra/robin-hood-hashing/robin_hood.h
++++ b/extra/robin-hood-hashing/robin_hood.h
+@@ -42,6 +42,7 @@
+ #include <algorithm>
+ #include <cstdlib>
+ #include <cstring>
++#include <limits>
+ #include <functional>
+ #include <memory> // only to support hash of smart pointers
+ #include <stdexcept>
+--- a/include/my_alloc.h
++++ b/include/my_alloc.h
+@@ -32,6 +32,7 @@
+ 
+ #include <string.h>
+ 
++#include <cstdint>
+ #include <memory>
+ #include <new>
+ #include <type_traits>
+--- a/include/mysql/components/services/page_track_service.h
++++ b/include/mysql/components/services/page_track_service.h
+@@ -27,6 +27,7 @@
+ #include <mysql/components/service.h>
+ #include <functional>
+ 
++#include <stddef.h>
+ #include <stdint.h>
+ 
+ #ifdef __cplusplus
+--- a/sql-common/sql_string.cc
++++ b/sql-common/sql_string.cc
+@@ -23,6 +23,7 @@
+ #include "sql_string.h"
+ 
+ #include <algorithm>
++#include <limits>
+ 
+ #include "my_dbug.h"
+ #include "my_macros.h"
+ 
diff --git a/dev-db/percona-xtrabackup/percona-xtrabackup-8.0.23.16.ebuild b/dev-db/percona-xtrabackup/percona-xtrabackup-8.0.23.16.ebuild
index cb198ddf576a..7e7eab27d0e9 100644
--- a/dev-db/percona-xtrabackup/percona-xtrabackup-8.0.23.16.ebuild
+++ b/dev-db/percona-xtrabackup/percona-xtrabackup-8.0.23.16.ebuild
@@ -50,6 +50,7 @@ RDEPEND="
 PATCHES=(
 	"${FILESDIR}"/${PN}-8.0.22-remove-rpm.patch
 	"${FILESDIR}"/${PN}-8.0.22-fix-building-against-ICU-68.patch
+	"${FILESDIR}"/${PN}-8.0.23-gcc11.patch
 )
 
 S="${WORKDIR}/percona-xtrabackup-${MY_PV}"
diff --git a/dev-db/pgpool2/Manifest b/dev-db/pgpool2/Manifest
index 5851b824df1e..cf23f5abe2a0 100644
--- a/dev-db/pgpool2/Manifest
+++ b/dev-db/pgpool2/Manifest
@@ -6,7 +6,7 @@ AUX pgpool2.confd 649 BLAKE2B 1c520c4fa954c7411c1b700c03bf4e39196c599eb239cf8641
 AUX pgpool2.initd 2162 BLAKE2B b04f6b952507b8e4815c7b27f09b59ffe64f6262719c5490377fdbc5f8490cdead18fdbeb0ce8379d9cbd4bbb1aa21221d61853ff49a456a5ef6a8d78f3f5129 SHA512 05dd358d20bae60cfdefd7116b1111288b5a2be6d68a9dc40eaf6ba641524d422f2faac79bd3c629cee4f8b1ca601a9b6e303d4228e538d742ea407b6190ee53
 DIST pgpool-II-4.2.1.tar.gz 4713114 BLAKE2B 207cb3c43e47d40385d6808195561117293e5acec6bc34664ec7a1d8754bf9beb8c5350252a4274d4c50520254089f0e5a5fdfc0faf778186fa8000db6124df2 SHA512 b859a3952f69dd98a3df60b33b801d3bc96b9a11757593795a89751abe558c6baab10a37701d69d415c9da26a16abcdc72e0209e74c62204facfb25cdbc512f8
 DIST pgpool-II-4.2.2.tar.gz 4734840 BLAKE2B 2b4d26991732293e1411d1219f85a8c9ad1dca72c63069381ae1377a02ae215e813356172f3b89b42b9140549c92c76d443b125bb65cbc6abf03d2b99cf18dab SHA512 a147c810cc691fb27b823a813cbd2eaad66822c7c9f5c0f829cc70d4ac65911bbe827640f2dbd8060913276ed97340b52167e4332e9cdf013b6c9bc144c7b5d8
-EBUILD pgpool2-4.2.1.ebuild 2415 BLAKE2B ccfd5c501ba55f3abaa266aec120b2718d2ae453b2adf325f2dd3a14a9d8465e43e7e71e1a522d3473555ddb8cd06ccd8a4e56a33823bf8f0f289cf2922ed05d SHA512 5a6926eac94b21bb85ac2a9403fe1a93fb81ecbd2ba383f58f3ed65abf74fd254e07e45da02de54f1a78158b0f8ad692bb0b1a147cd1938b542b17ed237ff951
-EBUILD pgpool2-4.2.2.ebuild 2417 BLAKE2B b9dba066d09cffb7f1f5c468b62cef045d7608ec60bc2bff6894004836ee2a17ff667e12b45efa831744ecb0da03b4e9ab09a9d79e78e5986b4b1b8fed8d6109 SHA512 054fd496a11f1ea9527090a74a92ed9ef637a17f74a0f68eacbf93719ec76119cfa80f3ff1c57893e6891fb8e3e55be2d80530a5bfdcadeafc718e256f310c8b
-EBUILD pgpool2-9999.ebuild 2492 BLAKE2B 10c0c2e076704a8ebce86ae1c01797ef25809b23f7f4757df2536aa63e1eff4eb6b0789b167760685ac0423e76b878833b642bbc1a1c8afe1bd6cc5dfa6ff3e7 SHA512 6755c3d2ba9260069fec61878f800627a19b7606ad600d703e97c327a6917373bddd677a6daba9fabcbed419766d81917b307c00163c3b2b09622cb252681487
+EBUILD pgpool2-4.2.1.ebuild 2355 BLAKE2B 5a7a4d222ef64748503dcee59c63a619358b044041c04273df4e86f1e03bbb5ba9c1c1f1ebdd469d7d6d42ce056c9fd7fb5909b33841953cae910017f938fe83 SHA512 66402ca2ee7c444946ffc4f546203d071a388614c39788d721b92582d041414f9d44d584e4e56e8730ef5301dd25118c606c5c2a811d870e2ba9e1e6525ab4d3
+EBUILD pgpool2-4.2.2.ebuild 2357 BLAKE2B 6e776a5e5187d384f737c55d2ee442f627fe87a36d6e03cf72ff457f5199f5a2351ddd042c819f1509008fc2bd2aa92dbb94b06fec8f024a9f6da5f9052e8692 SHA512 93ca323b8cb074bd783a89b78e0b8aa392946827169ddc504aa2d19a169ca3b3a0224a11c539fac1858652919ca6dd0d35b5fa4a1c3b435bef684c3cd2f4b847
+EBUILD pgpool2-9999.ebuild 2432 BLAKE2B ac4fc825ba2ffbff373a6afba923ddc13871caeab4376d4ac82bf8a7faebb10ffe09b313f3ae09bc6c4752cfa263c8e692d9bae616ec3ab5ce87cb8c6a8a35f3 SHA512 43088bf9bfa2f837879d7343618c16e7ce38ff669ffb182ea9a4d31615146a68994526d0559173202f5a67e7e313a747d464a2d8e9fde2c28f0423eb8fafe1bc
 MISC metadata.xml 390 BLAKE2B d6a0560051449e95bb43e81589eee966a477a75d7ec8211ae96b15f2d51ce9555181b8640d9d830f2b42f8159989e9126423c6ccbbc2bf2dd8121f4920a87a16 SHA512 ce26ee116c3c7ff77a771294ed07f38d8f940dc380915c339eb4c543d86fa5bde025ba83e70af2b7bf4a1bef1e51957f151131836855e0dae2e1daed73ffae8d
diff --git a/dev-db/pgpool2/pgpool2-4.2.1.ebuild b/dev-db/pgpool2/pgpool2-4.2.1.ebuild
index 8fb09f7c2622..08a1225b8084 100644
--- a/dev-db/pgpool2/pgpool2-4.2.1.ebuild
+++ b/dev-db/pgpool2/pgpool2-4.2.1.ebuild
@@ -17,7 +17,7 @@ SLOT="0"
 
 KEYWORDS="amd64 x86"
 
-IUSE="doc libressl memcached pam ssl static-libs"
+IUSE="doc memcached pam ssl static-libs"
 
 RDEPEND="
 	${POSTGRES_DEP}
@@ -25,8 +25,7 @@ RDEPEND="
 	memcached? ( dev-libs/libmemcached )
 	pam? ( sys-auth/pambase )
 	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
+		dev-libs/openssl:0=
 	)
 "
 DEPEND="${RDEPEND}
diff --git a/dev-db/pgpool2/pgpool2-4.2.2.ebuild b/dev-db/pgpool2/pgpool2-4.2.2.ebuild
index e9e995be4ddb..aa370a2e02b1 100644
--- a/dev-db/pgpool2/pgpool2-4.2.2.ebuild
+++ b/dev-db/pgpool2/pgpool2-4.2.2.ebuild
@@ -17,7 +17,7 @@ SLOT="0"
 
 KEYWORDS="~amd64 ~x86"
 
-IUSE="doc libressl memcached pam ssl static-libs"
+IUSE="doc memcached pam ssl static-libs"
 
 RDEPEND="
 	${POSTGRES_DEP}
@@ -25,8 +25,7 @@ RDEPEND="
 	memcached? ( dev-libs/libmemcached )
 	pam? ( sys-auth/pambase )
 	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
+		dev-libs/openssl:0=
 	)
 "
 DEPEND="${RDEPEND}
diff --git a/dev-db/pgpool2/pgpool2-9999.ebuild b/dev-db/pgpool2/pgpool2-9999.ebuild
index 2b63038d42ff..46ab01e9e550 100644
--- a/dev-db/pgpool2/pgpool2-9999.ebuild
+++ b/dev-db/pgpool2/pgpool2-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ SLOT="0"
 
 KEYWORDS=""
 
-IUSE="doc libressl memcached pam ssl static-libs"
+IUSE="doc memcached pam ssl static-libs"
 
 RDEPEND="
 	${POSTGRES_DEP}
@@ -25,8 +25,7 @@ RDEPEND="
 	memcached? ( dev-libs/libmemcached )
 	pam? ( sys-auth/pambase )
 	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
+		dev-libs/openssl:0=
 	)
 "
 DEPEND="${RDEPEND}
diff --git a/dev-db/postgresql/Manifest b/dev-db/postgresql/Manifest
index f9ee63b9d63d..fca4a4d2ffc5 100644
--- a/dev-db/postgresql/Manifest
+++ b/dev-db/postgresql/Manifest
@@ -18,11 +18,11 @@ DIST postgresql-12.6.tar.bz2 20771172 BLAKE2B 7df8eb901255f56b4574cdd94a5e9d5a90
 DIST postgresql-13.2.tar.bz2 21057276 BLAKE2B 982feffdd98d3f519ff1e790d35ac828710d3ca6cbf935a78bf04011dbc12b4523b451bc7f2421a788a709d1746b2cca9135842bfc1d5048ef5951ed48b20b6a SHA512 6d93cbae8de8637deeccd851fb676a12015e8e1efa6be2424f506f232db535c54b974b11f47ed4578575f90f6de1947b1647f399794b4ec242838efd4c5b2bce
 DIST postgresql-9.5.25.tar.bz2 17923796 BLAKE2B 432e035e78dacddddfd46fd4d04775b61e2e4db9e61945fa5f7e1c3c5ea3516a5e327489b4e57313b0d6ba4f2e20f52a164f96db01aa22b755ff625039f262eb SHA512 621b36d767d2c7eb2e942cb7b26ca7491450fcfd9606114849f7336b4d8a0bc0196badb44da4918e748145d21b6f72ccf1255a1309dff2427da8b39b63fca427
 DIST postgresql-9.6.21.tar.bz2 18990266 BLAKE2B 42a2feaf15b8fd4cfcc028a744a696314f0ce7b22ec6c18c43152d7e4b8149a9d5acd6cf22c1d13643709dd2b3f1de571e2925c7fc501dc361248c99c88e3f42 SHA512 6fba42171cbe4ec24ed250c32cc8f35be70ddfbc6d1ef0df733bbd094b29174ef198db351f6679a26170effe1fed44269dbe9dbdd619bb18be87f5b539f74475
-EBUILD postgresql-10.16.ebuild 13701 BLAKE2B 8dd4d481bfbb767db0e6798cd63d92391078dfa53f133fe768cc277872eb668cedc436523d5e676268730b1bccd477bdd84b44c4f9f1ce39ced6247522fcd69d SHA512 e745965c75c199d47165247f138bba493a9def1d1c2294c0cf34fe89aa1682184c8e636d962af3227cb00f83dbc85257176d9ebada4d2f3b8775fc6ce5108633
-EBUILD postgresql-11.11.ebuild 13651 BLAKE2B 064bdd33545a2e5563a9eb9c335e887f0af6f461797147da9f6876cf3b4f34a43f9b9f0b8ec01b6b3456bef3debd6a8f873ffa37ed1a37b73c5c0add0389ae24 SHA512 873cb830b849d6453786a1342d4fafba8a32815bae19fc03ef495be07b856b6456436aa84893fcdb959c9fca641c747d708cb7fef48647918cf5d9ad722a535e
-EBUILD postgresql-12.6.ebuild 13623 BLAKE2B fd4a8afad1a5dbf1cdceb5b59185220fb5a2e5adfdfd71bfd413c90f73c92d73aa778ca55e7d556686ee077919362edea63bed26db707cf1d61c357920512526 SHA512 b9a6f025da0d9408c1cd5df3d2150c265a599f4c743016292bf5d8c9841bc315ce38100fb10278cc7b74d80edc7815192310be8efb7e7fb05342af90f476ee4f
-EBUILD postgresql-13.2.ebuild 13869 BLAKE2B 1644abb185392b63183e1e949fe9735fa86733e4191716073d12de2fa96538fdf46fc648fdacb6bf06a7b0b4542586ffdcd6b93d7d26fe6a9d22d6377def8d2b SHA512 57dec06a04df5b2cd8847e2dcff6f4a6e643494dd93041a3b75661cf675b15081b2fa9a81bfc3aa89b1769dc474ce0c622a6cb3b4dc4b957242e4419999d327b
-EBUILD postgresql-9.5.25.ebuild 14352 BLAKE2B 384d20f025a4c6a5109e6c56b13fc5f3fe1017f4a3e1574ee4902e5a4fba5ca03b06f32407c6a536810a4faec1327ac857004d581102abe88ed54d14d728fe89 SHA512 fe008861fb16e8c4ba9754c89b7beca9d1173e46dec634cf6bd18f0ea95ab36aa600930fef3168d0e6de38a420c8e1af95a1d99b5eda6d9a9eac74f53099470a
-EBUILD postgresql-9.6.21.ebuild 14574 BLAKE2B ec064e090ccee5ed827f05469a665014937039fe8c9f12c39ab843037bd772de0fdf25fd931ab5aeb3015fbdcde96bccc6c0cd3afc6b8d969712b76052f1f392 SHA512 991a15e030dd85642f16b05cb724c07fd663630b982e7a982d53b35034d56aa067abf2c6f8b1cf5766549a59adfdbf5bbf074b83a983392c170f1e2d39ccb496
-EBUILD postgresql-9999.ebuild 14092 BLAKE2B 125143665bda11dd9f9b090fed94d9ad6fc10e96bd7713b6cddaa8ef9a63395a68b7801e108e2b358752fe2a10ca4b6748981b2a2db8d4eb9786d025bf9d1f61 SHA512 3a5bd27396252f6a5d812530ead9a2f0792ecb6db3cb8e96b389ceed16c085321be52275e0104b935da6f29d6808a1119ddd3d676a61c55e71b9c50bef405bf4
+EBUILD postgresql-10.16.ebuild 13641 BLAKE2B f8f39e70387629a9ec6c6c79bd0e788fcb4dbd27c35408024006110e91730294689fba1ef0ee7462d8f8760014a684044502de14e05cdce26c82f3fbcfe5ee4c SHA512 42ea40a227c0d9ae7b0a7108f3e550704ed841af41646c827a8f882ec5a1d34f4836833b6f3cbce4bf868b15773f29085aed432967d5e3ce88781fdf2c075a25
+EBUILD postgresql-11.11.ebuild 13591 BLAKE2B a48ff96db5fc39a318548524ee066e9bea70e0595edcef59fd42185ad931c4dbff1cc8a98a6b221f05eba06d98e4b0dc510c2648aad99cfbe60f15fcb04efab0 SHA512 cf3e3bd1a184b78f0e0c87a27511129673f312a049e078202a2a006b7902e6de6470bd4c4123feb010fc3edcc04f293e100ac827159b926680d184e44126038e
+EBUILD postgresql-12.6.ebuild 13563 BLAKE2B 24ca44299ba0fbea7370840eddc78684dee81f72af75e47c8a7a8aab265ba8df749ce6033a456b661670f26e4cb630c03d7d50b8135833e7bd61fe686bee6296 SHA512 f71cc195a1c3f020d3643025341d43422c71036d42e58657f38077d2bcb52f6343ca77e1ba276cae453c451220314a71d2b4036491797641ed7f4c92af8a92f4
+EBUILD postgresql-13.2.ebuild 13809 BLAKE2B a62af163ad4cd59a172adafb8bbed6ad347e2ece92328afc0afdf6c2cc83cc4640e8751cc9045e8a8366eac31c09ff3a6031a026fe907a521ec0bdab07fa5ed1 SHA512 75f7f19e325863b9db967d7b41df2b0bf8008be592102d48c6bf60b8ec2d5386c56bc991a6585e5faa1cbb73160991a5d5960e999c3fe8c0c7821f7acaf89bac
+EBUILD postgresql-9.5.25.ebuild 14292 BLAKE2B 058082d2785d84c3b0f3cb428ee58dbf8a567f4d8e91641a4f9a8bc51aa98979ee5020d643278523bb814972172807046377e91831874f67fa89b6cb8dec3c51 SHA512 f0b4dee9eb0819e451934053dad3210e3baae19b0c17765a478cb55c63b5d5eb9352e58652908382bc58354db8189274d6098a92522e68e59bac04dd79901245
+EBUILD postgresql-9.6.21.ebuild 14514 BLAKE2B fb9bd29b970b183c452c4d737a8563307f9e31624808b2f590267ff0111dd65fabba1ba269a88f30348eb1a7d4349f28a224e5d87b3f8be39f6f65380f62fcc9 SHA512 37af2dc2bebde60c14d17864c953d84f8e288df6eac64555c3e4d0920093f430a36596c7f40ac5002b736939bd4c6dcaf9147adb8e2acc6ad2116512cf42833b
+EBUILD postgresql-9999.ebuild 14032 BLAKE2B 69d0dd5e7b7f3df5658f7da4762e95487c52621b2efa88c2303d98e5a0a677074355e740732cf328b1f427c6992a932b3b476202406bc52cc815292c42413c89 SHA512 49ebe8540f3f33022dedf98b2656d3364163fc763631f3e6a7b61eaa3f241656df609746aa09d34c837353aff3ce9c1d528b2dd18cf456a9f09b169762d01839
 MISC metadata.xml 715 BLAKE2B 71b868113676bdbb1996ecc8e3727b0cc16a559c5906e6459a41c330bcb5a5f4b3f4b5c4473a81905713c2f0735f185cd14612c69108b6bb602a7d8a92d6f3ce SHA512 4148c9c11ffaea5d30cd18befb06af914147d41eec4a8f905127f0abc5317ca370a745e0fd51b03c4583efde927fe9c1b3333853e80c2aa3e7677de65cd5d1ba
diff --git a/dev-db/postgresql/postgresql-10.16.ebuild b/dev-db/postgresql/postgresql-10.16.ebuild
index ab16abafe92a..455e434e709d 100644
--- a/dev-db/postgresql/postgresql-10.16.ebuild
+++ b/dev-db/postgresql/postgresql-10.16.ebuild
@@ -20,7 +20,7 @@ LICENSE="POSTGRESQL GPL-2"
 DESCRIPTION="PostgreSQL RDBMS"
 HOMEPAGE="https://www.postgresql.org/"
 
-IUSE="debug doc icu kerberos kernel_linux ldap libressl nls pam perl
+IUSE="debug doc icu kerberos kernel_linux ldap nls pam perl
 	  python +readline selinux +server systemd ssl static-libs tcl
 	  threads uuid xml zlib"
 
@@ -40,10 +40,7 @@ perl? ( >=dev-lang/perl-5.8:= )
 python? ( ${PYTHON_DEPS} )
 readline? ( sys-libs/readline:0= )
 server? ( systemd? ( sys-apps/systemd ) )
-ssl? (
-	!libressl? ( >=dev-libs/openssl-0.9.6-r1:0= )
-	libressl? ( dev-libs/libressl:= )
-)
+ssl? ( >=dev-libs/openssl-0.9.6-r1:0= )
 tcl? ( >=dev-lang/tcl-8:0= )
 xml? ( dev-libs/libxml2 dev-libs/libxslt )
 zlib? ( sys-libs/zlib )
diff --git a/dev-db/postgresql/postgresql-11.11.ebuild b/dev-db/postgresql/postgresql-11.11.ebuild
index 76d8f0069f89..d9a85a984c3b 100644
--- a/dev-db/postgresql/postgresql-11.11.ebuild
+++ b/dev-db/postgresql/postgresql-11.11.ebuild
@@ -20,7 +20,7 @@ LICENSE="POSTGRESQL GPL-2"
 DESCRIPTION="PostgreSQL RDBMS"
 HOMEPAGE="https://www.postgresql.org/"
 
-IUSE="debug doc icu kerberos kernel_linux ldap libressl llvm nls pam
+IUSE="debug doc icu kerberos kernel_linux ldap llvm nls pam
 	  perl python +readline selinux +server systemd ssl static-libs tcl
 	  threads uuid xml zlib"
 
@@ -44,10 +44,7 @@ perl? ( >=dev-lang/perl-5.8:= )
 python? ( ${PYTHON_DEPS} )
 readline? ( sys-libs/readline:0= )
 server? ( systemd? ( sys-apps/systemd ) )
-ssl? (
-	!libressl? ( >=dev-libs/openssl-0.9.6-r1:0= )
-	libressl? ( dev-libs/libressl:= )
-)
+ssl? ( >=dev-libs/openssl-0.9.6-r1:0= )
 tcl? ( >=dev-lang/tcl-8:0= )
 xml? ( dev-libs/libxml2 dev-libs/libxslt )
 zlib? ( sys-libs/zlib )
diff --git a/dev-db/postgresql/postgresql-12.6.ebuild b/dev-db/postgresql/postgresql-12.6.ebuild
index 07087f076155..cc8c01351253 100644
--- a/dev-db/postgresql/postgresql-12.6.ebuild
+++ b/dev-db/postgresql/postgresql-12.6.ebuild
@@ -20,7 +20,7 @@ LICENSE="POSTGRESQL GPL-2"
 DESCRIPTION="PostgreSQL RDBMS"
 HOMEPAGE="https://www.postgresql.org/"
 
-IUSE="debug doc icu kerberos kernel_linux ldap libressl llvm nls pam
+IUSE="debug doc icu kerberos kernel_linux ldap llvm nls pam
 	  perl python +readline selinux +server systemd ssl static-libs tcl
 	  threads uuid xml zlib"
 
@@ -44,10 +44,7 @@ perl? ( >=dev-lang/perl-5.8:= )
 python? ( ${PYTHON_DEPS} )
 readline? ( sys-libs/readline:0= )
 server? ( systemd? ( sys-apps/systemd ) )
-ssl? (
-	!libressl? ( >=dev-libs/openssl-0.9.6-r1:0= )
-	libressl? ( dev-libs/libressl:= )
-)
+ssl? ( >=dev-libs/openssl-0.9.6-r1:0= )
 tcl? ( >=dev-lang/tcl-8:0= )
 xml? ( dev-libs/libxml2 dev-libs/libxslt )
 zlib? ( sys-libs/zlib )
diff --git a/dev-db/postgresql/postgresql-13.2.ebuild b/dev-db/postgresql/postgresql-13.2.ebuild
index 577737a80c7c..59bc6f2685f5 100644
--- a/dev-db/postgresql/postgresql-13.2.ebuild
+++ b/dev-db/postgresql/postgresql-13.2.ebuild
@@ -20,7 +20,7 @@ LICENSE="POSTGRESQL GPL-2"
 DESCRIPTION="PostgreSQL RDBMS"
 HOMEPAGE="https://www.postgresql.org/"
 
-IUSE="debug doc icu kerberos kernel_linux ldap libressl llvm nls pam
+IUSE="debug doc icu kerberos kernel_linux ldap llvm nls pam
 	  perl python +readline selinux +server systemd ssl static-libs tcl
 	  threads uuid xml zlib"
 
@@ -44,10 +44,7 @@ perl? ( >=dev-lang/perl-5.8:= )
 python? ( ${PYTHON_DEPS} )
 readline? ( sys-libs/readline:0= )
 server? ( systemd? ( sys-apps/systemd ) )
-ssl? (
-	!libressl? ( >=dev-libs/openssl-0.9.6-r1:0= )
-	libressl? ( dev-libs/libressl:= )
-)
+ssl? ( >=dev-libs/openssl-0.9.6-r1:0= )
 tcl? ( >=dev-lang/tcl-8:0= )
 xml? ( dev-libs/libxml2 dev-libs/libxslt )
 zlib? ( sys-libs/zlib )
diff --git a/dev-db/postgresql/postgresql-9.5.25.ebuild b/dev-db/postgresql/postgresql-9.5.25.ebuild
index 3c904ec03a9f..5f0e320adeed 100644
--- a/dev-db/postgresql/postgresql-9.5.25.ebuild
+++ b/dev-db/postgresql/postgresql-9.5.25.ebuild
@@ -17,7 +17,7 @@ LICENSE="POSTGRESQL GPL-2"
 DESCRIPTION="PostgreSQL RDBMS"
 HOMEPAGE="https://www.postgresql.org/"
 
-IUSE="debug doc kerberos kernel_linux ldap libressl nls pam perl
+IUSE="debug doc kerberos kernel_linux ldap nls pam perl
 	  -pg-legacytimestamp python +readline selinux +server systemd ssl
 	  static-libs tcl threads uuid xml zlib"
 
@@ -35,10 +35,7 @@ pam? ( sys-libs/pam )
 perl? ( >=dev-lang/perl-5.8:= )
 python? ( ${PYTHON_DEPS} )
 readline? ( sys-libs/readline:0= )
-ssl? (
-	!libressl? ( >=dev-libs/openssl-0.9.6-r1:0= )
-	libressl? ( dev-libs/libressl:= )
-)
+ssl? ( >=dev-libs/openssl-0.9.6-r1:0= )
 tcl? ( >=dev-lang/tcl-8:0= )
 xml? ( dev-libs/libxml2 dev-libs/libxslt )
 zlib? ( sys-libs/zlib )
diff --git a/dev-db/postgresql/postgresql-9.6.21.ebuild b/dev-db/postgresql/postgresql-9.6.21.ebuild
index c11c4e214056..b6150ca0af88 100644
--- a/dev-db/postgresql/postgresql-9.6.21.ebuild
+++ b/dev-db/postgresql/postgresql-9.6.21.ebuild
@@ -20,7 +20,7 @@ LICENSE="POSTGRESQL GPL-2"
 DESCRIPTION="PostgreSQL RDBMS"
 HOMEPAGE="https://www.postgresql.org/"
 
-IUSE="debug doc kerberos kernel_linux ldap libressl nls pam perl
+IUSE="debug doc kerberos kernel_linux ldap nls pam perl
 	  -pg-legacytimestamp python +readline selinux +server systemd ssl
 	  static-libs tcl threads uuid xml zlib"
 
@@ -38,10 +38,7 @@ pam? ( sys-libs/pam )
 perl? ( >=dev-lang/perl-5.8:= )
 python? ( ${PYTHON_DEPS} )
 readline? ( sys-libs/readline:0= )
-ssl? (
-	!libressl? ( >=dev-libs/openssl-0.9.6-r1:0= )
-	libressl? ( dev-libs/libressl:= )
-)
+ssl? ( >=dev-libs/openssl-0.9.6-r1:0= )
 server? ( systemd? ( sys-apps/systemd ) )
 tcl? ( >=dev-lang/tcl-8:0= )
 xml? ( dev-libs/libxml2 dev-libs/libxslt )
diff --git a/dev-db/postgresql/postgresql-9999.ebuild b/dev-db/postgresql/postgresql-9999.ebuild
index c1b8aefe265b..a1b3cb9eb927 100644
--- a/dev-db/postgresql/postgresql-9999.ebuild
+++ b/dev-db/postgresql/postgresql-9999.ebuild
@@ -18,7 +18,7 @@ LICENSE="POSTGRESQL GPL-2"
 DESCRIPTION="PostgreSQL RDBMS"
 HOMEPAGE="https://www.postgresql.org/"
 
-IUSE="debug icu kerberos kernel_linux ldap libressl llvm lz4
+IUSE="debug icu kerberos kernel_linux ldap llvm lz4
 	nls pam perl python +readline selinux server systemd
 	ssl static-libs tcl threads uuid xml zlib"
 
@@ -42,10 +42,7 @@ pam? ( sys-libs/pam )
 perl? ( >=dev-lang/perl-5.8:= )
 python? ( ${PYTHON_DEPS} )
 readline? ( sys-libs/readline:0= )
-ssl? (
-	!libressl? ( >=dev-libs/openssl-0.9.6-r1:0= )
-	libressl? ( dev-libs/libressl:= )
-)
+ssl? ( >=dev-libs/openssl-0.9.6-r1:0= )
 systemd? ( sys-apps/systemd )
 tcl? ( >=dev-lang/tcl-8:0= )
 uuid? ( dev-libs/ossp-uuid )
diff --git a/dev-db/spatialite/Manifest b/dev-db/spatialite/Manifest
index ad0f265f6727..39627376810f 100644
--- a/dev-db/spatialite/Manifest
+++ b/dev-db/spatialite/Manifest
@@ -1,5 +1,5 @@
 DIST libspatialite-4.3.0a.tar.gz 4440660 BLAKE2B 2eb2afb96b096b86be9c30cf71663b7b2839d345b6c418fc8511653ed59d0aeff1756b6b19807140c67128c938e39be66d13088640658d14883c92c438c97251 SHA512 adfd63e8dde0f370b07e4e7bb557647d2bfb5549205b60bdcaaca69ff81298a3d885e7c1ca515ef56dd0aca152ae940df8b5dbcb65bb61ae0a9337499895c3c0
 DIST libspatialite-5.0.1.tar.gz 6372753 BLAKE2B 0fe5b37efac134e3796c96ed012b434ce99547037a44df69d3e98c7ac586c1173faa1fe93c4578e7cc0f47a9f1c539710661bad57f8012c3bdabde427221a842 SHA512 c2552994bc30d69d1e80aa274760f048cd384f71e8350a1e48a47cb8222ba71a1554a69c6534eedde9a09dc582c39c089967bcc1c57bf158cc91a3e7b1840ddf
 EBUILD spatialite-4.3.0a.ebuild 1234 BLAKE2B 13526ec828adbe85fb5e53e0b9e48142c8d26d48ef78b6d070e149da0ee86cc3d4b5cd6b8338377f1ea207d609e33f860b3550650957f22f6bcc2e12fd0f24f2 SHA512 4ed7d7af559d2a779aae76f7bf5a3f91717376ff694eb6b3de6bdeaf7d5414fca5129cec39bd5fdef3673e26129c19ef40db413eb8ee1862618ab3e4e8888de8
-EBUILD spatialite-5.0.1-r1.ebuild 1262 BLAKE2B ada2eff6685997bccaad932eb68da72cfad643e0aeb4c9e84bfc2272eef9a216a9c3790a49fc47702465c21436edd08783684d557f80d2ee5d9f74b683edc7c8 SHA512 a9f36ec0484023f6653dc3d481a5f6379a8d9b868ea76ca7cfa3eba16fbcba9c3c2e70aa6ef78a685fc346ff681f2c05d95cbb994b1bce6f415a4a91d2b2605d
+EBUILD spatialite-5.0.1-r1.ebuild 1261 BLAKE2B 9b7d50b4e7d843fe16988f846ab1729208e6d5e405719d60c13e56c178f3a9d487c73deace1ac0fc8a4210140a1b168499b566e718c3e8e70c3af3c14e37c93f SHA512 2ec8db3361a939594cfa8fb7a3e6e992b1c2cb568fabad5f659d1efc6eb1871a5a36c8640dc114dfbdbdea0fb261dd6a74ab7efdef77e60f6211d490527e1391
 MISC metadata.xml 559 BLAKE2B b128c4425723bb652063fd3ebebcd83de75a44c7a01e5a8b6c6596cad0bcd1a5f86977f4e3b49d2f1945ea83f12f9761ba712d5f1d919338996c7ddf18bc4a66 SHA512 a21438d83d828b52e4fc16f91edd29e6ace87ada9b697cf233b847a6d3a9f5196135769993873f23409f98548bf852a4e89645c2b0eaf57bd8427ff6dcc36111
diff --git a/dev-db/spatialite/spatialite-5.0.1-r1.ebuild b/dev-db/spatialite/spatialite-5.0.1-r1.ebuild
index 99193b09cb9b..97edef9d767c 100644
--- a/dev-db/spatialite/spatialite-5.0.1-r1.ebuild
+++ b/dev-db/spatialite/spatialite-5.0.1-r1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MPL-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86"
 IUSE="+geos iconv +proj test +xls +xml"
 # Further poking required
 RESTRICT="test"
diff --git a/dev-db/sqlcipher/Manifest b/dev-db/sqlcipher/Manifest
index 8dc32be6a753..066917cfd031 100644
--- a/dev-db/sqlcipher/Manifest
+++ b/dev-db/sqlcipher/Manifest
@@ -1,6 +1,5 @@
-AUX sqlcipher-3.4.2-libressl-2.8.patch 490 BLAKE2B 5ac29fbf1370f1ed1a28335d68f86dada605d6362521fbe4eb4decbd215c5eda04d7c62017979de829f46ac37a9f0718d8c748069173f4d0ff591664f51d83da SHA512 bea99e890d78f1b1417f3a81d612388ad3305d30cc576ef5b29d0726459570a231786551fd8ba4cc03ef8fd257ee985ce5933b7f2bcfc15867f6afc2f662f229
 DIST sqlcipher-3.4.2.tar.gz 14743960 BLAKE2B 88ee265b02bb9a42734c2ef93070c8fd8e13d546d7cc85e7fbfd6e6046ccbf2626d75e14b19cbba379c99784c7311d0100de06235b99b4908c60c99890d8d7a2 SHA512 c620bf2b175e404afd60ebe76b5476f5a447ff5fcdfa31bebc3f4bd7f1ebfcd507ee423cd582c9b3d6431d8b57320171492da2586e1a739adb4f440e7443dc03
 DIST sqlcipher-4.0.1.tar.gz 17006324 BLAKE2B 44e8eb4e1230c3625b4fe1b4af608cd8edc25f3c6adf7e11450c8f9ddb7970fea92ff0823f3a1e631d1b0acfbab6cf078c80e4645c535d66de57f1d73b55ff47 SHA512 0fb48326860a10e9849b2f56fae0c310deae124c7203b54d51f92d346782be795d505c29eafbdfb7206f5e7be54c0f7228fe50c45bd9d2b23cca976b263264fc
-EBUILD sqlcipher-3.4.2.ebuild 1507 BLAKE2B 32fd411212dae9b1741e29cd743fa1e7b162b904dcb7118a68ab0b931d00e4c77a55c0f243cfc9517aef474b41f6017148efac0690029541af57e067122ff13b SHA512 ba6e99edf7e9e500c41224edee7858d9ded5adb59ecc88caae9e5f0c32c9dbeb343a73501715ab9c9f9d3a22a849dafb2e8c880b7fb129aec816c25ae0b6bd62
-EBUILD sqlcipher-4.0.1.ebuild 1661 BLAKE2B 569b13cebf390c3257f4b136539e9304cd2375b051be0f932ebb9b2b69fba3c316f5fba71c40b0d0ddcebcb6693c79feb6cb5c99cd6576b5794711acacca3516 SHA512 3123ed4dd6ab2c243bde0189e2343c04bc0381f4e3efe925ce89f994929c325b85d2635cd1e6b653e87c9c8a6960140cec353dec8c1f7c9e3e1cef08e049ae57
+EBUILD sqlcipher-3.4.2.ebuild 1365 BLAKE2B 933d675598bdb8012801b22ad767844968be7610513f4a5fc2aa32924c3ceb643b1ef4489ed93b8b279e4ba7016108ce85bc469b7fae5c6ab2db1ce4790d5720 SHA512 09ddf442ccb84e6be97d3a739fd96e9c41f2719339e73c2c61431e378ca841a0e460f18bb6a33a73141807b1cbd3118cab29024364d2886df84999062341b8de
+EBUILD sqlcipher-4.0.1.ebuild 1581 BLAKE2B 032a1f9743e926ac051241b27c24e762b7e7360aab7eef8f9f137a838f9ff4142eacae709adec0ed37d8b0ddc37a0dbd1556cb88dfba4491938a4d1ddb1a2e8c SHA512 c1ea4418e572a28e240a41e7649ffd84418d50c5943f4c49a8097fe5e7e52cfd25f56827bcaa932695fa800efcc5fd3ee927720247747811296c2991fce14c78
 MISC metadata.xml 341 BLAKE2B f5035fe38770437027936a72b9b7d66854fd6a19cf19f7140e409e8004297ed3da11aab122ba81b2f2b5d82302e8252462a7f185de0a998f79d348dd45e16c7e SHA512 b387658993279fb3c74c7647b36035f5c0e0e3e81a3cf4eab28f3dac19319f0b6958cfa16fab30295e5508c0810d601b0e2899710f57e992886f35c781e37dfa
diff --git a/dev-db/sqlcipher/files/sqlcipher-3.4.2-libressl-2.8.patch b/dev-db/sqlcipher/files/sqlcipher-3.4.2-libressl-2.8.patch
deleted file mode 100644
index da4c55eddfa0..000000000000
--- a/dev-db/sqlcipher/files/sqlcipher-3.4.2-libressl-2.8.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/crypto_openssl.c	2017-12-21 14:31:28.000000000 -0500
-+++ b/src/crypto_openssl.c	2019-02-22 12:33:54.110516410 -0500
-@@ -47,7 +47,7 @@
- static unsigned int openssl_init_count = 0;
- static sqlite3_mutex* openssl_rand_mutex = NULL;
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER < 0x2080000L
- static HMAC_CTX *HMAC_CTX_new(void)
- {
-   HMAC_CTX *ctx = OPENSSL_malloc(sizeof(*ctx));
diff --git a/dev-db/sqlcipher/sqlcipher-3.4.2.ebuild b/dev-db/sqlcipher/sqlcipher-3.4.2.ebuild
index 1f5bdc481350..d67124b09e38 100644
--- a/dev-db/sqlcipher/sqlcipher-3.4.2.ebuild
+++ b/dev-db/sqlcipher/sqlcipher-3.4.2.ebuild
@@ -13,14 +13,13 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 x86"
 
-IUSE="libedit readline libressl static-libs tcl test"
+IUSE="libedit readline static-libs tcl test"
 RESTRICT="!test? ( test )"
 
 # Tcl is always needed by buildsystem
 RDEPEND="
 	libedit? ( dev-libs/libedit[${MULTILIB_USEDEP}] )
-	!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
-	libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+	dev-libs/openssl:0=[${MULTILIB_USEDEP}]
 	readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] )
 	tcl? ( dev-lang/tcl:=[${MULTILIB_USEDEP}] )
 "
@@ -37,9 +36,6 @@ REQUIRED_USE="
 DOCS=( README.md )
 
 src_prepare() {
-	# bug #678502
-	eapply "${FILESDIR}/${P}-libressl-2.8.patch"
-
 	append-cflags -DSQLITE_HAS_CODEC
 	default
 	eautoreconf
diff --git a/dev-db/sqlcipher/sqlcipher-4.0.1.ebuild b/dev-db/sqlcipher/sqlcipher-4.0.1.ebuild
index e82a2ba8a159..9751b1c88489 100644
--- a/dev-db/sqlcipher/sqlcipher-4.0.1.ebuild
+++ b/dev-db/sqlcipher/sqlcipher-4.0.1.ebuild
@@ -13,13 +13,12 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 x86"
 
-IUSE="debug libedit readline libressl static-libs tcl test"
+IUSE="debug libedit readline static-libs tcl test"
 
 # Tcl is always needed by buildsystem
 RDEPEND="
 	libedit? ( dev-libs/libedit[${MULTILIB_USEDEP}] )
-	!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
-	libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+	dev-libs/openssl:0=[${MULTILIB_USEDEP}]
 	readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] )
 	tcl? ( dev-lang/tcl:=[${MULTILIB_USEDEP}] )
 "
diff --git a/dev-db/sqlitestudio/Manifest b/dev-db/sqlitestudio/Manifest
index 1e5895cf34bb..1ac6dde88734 100644
--- a/dev-db/sqlitestudio/Manifest
+++ b/dev-db/sqlitestudio/Manifest
@@ -1,4 +1,3 @@
-AUX sqlitestudio-3.2.1-libressl.patch 1248 BLAKE2B 7500c5231d03a2c1e2006631b77076a0cb6af49609446544f7e3901b748e87a2be03b232ef8f93714220542fff56f48e92c2de39d8a54889d7472b142071c71f SHA512 6fafceed80e8d072d06060f15787d855bfcfb55a502a73655beca043a73c45101bf5d3168781a2579c9e6aee5d924318240c886fe982cb0c833779d57be97405
 DIST sqlitestudio-3.2.1.tar.gz 9405867 BLAKE2B 53cd8465a6140cf17c602094cceef2fdf74f513f33257b22e1a3d7adcb9c78d8eb2cdaff047920836a9d98429ba0025924ce608f2eab97319feabf063de4c9ee SHA512 9c07f0dc50bf35ad04d0cb06cfc1a306d3f0aa9446e7d737c8187c63cb7dd2c44fb4b960693f2c30a15ece3aac0878701874a9ce3cebfe0c6bf48df10814a574
-EBUILD sqlitestudio-3.2.1-r1.ebuild 3812 BLAKE2B 6f9ea8c4bfde3e9c323edb9cac312a1e03731b8e2d9d389e4fb99509107c156115d24023b58c0b62b30afbefd4c6918b8c3a871ecb831dc43ba6dc39bf38b1f1 SHA512 abedf192358de6e4dc06b1852431557a6082940127f0a9f0399573b9364766a5071ca0eeac0c9adf349c62d1df8c7237fca57f82b7c05a31c4a0582ee9a43aa8
+EBUILD sqlitestudio-3.2.1-r1.ebuild 3765 BLAKE2B cf5a0cd2d4a584afc821fd789719ef00fca4abeaa49438ca2278b68e0f73b80ba4066a841cf58fc52db9b4bf632d0201d083c1a8d0905f88f53b2c2a17eb13ad SHA512 9bbbbf39e7a576839bd4524bac04b494819cb6452a6c7aecad27b876b6cf1d0092a099374da64470e2aec96e6f246a2dd4f62ca1ef2e1ec47412caa8c2b3e5b9
 MISC metadata.xml 228 BLAKE2B 4786a830041a969023b1033df82f4ab08478929992d7980c6d43dbeab70734b1fea7aa62c9f66b90eb11839b1087cb85bcb7669045e2982941bc5b924d749791 SHA512 1a90f65c0d92e7fc380993d798f0773c21b35ece69a71743bfef6b4ffaa8695de8fd88e0ba7eaf2b43b3ce4eb1ebcbbeb3e86aa477db5c10fd14f37ea09a857c
diff --git a/dev-db/sqlitestudio/files/sqlitestudio-3.2.1-libressl.patch b/dev-db/sqlitestudio/files/sqlitestudio-3.2.1-libressl.patch
deleted file mode 100644
index 06552942e945..000000000000
--- a/dev-db/sqlitestudio/files/sqlitestudio-3.2.1-libressl.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 64542c8c5cb3ad9249fa353ff4472c405057d743 Mon Sep 17 00:00:00 2001
-From: Stefan Strogin <stefan.strogin@gmail.com>
-Date: Mon, 25 Mar 2019 18:07:13 +0200
-Subject: [PATCH] #3505 Fix compilation with LibreSSL >=2.7.0
-
-HMAC_CTX_{new,free} were provided by LibreSSL 2.7.0.
-Do not redefine them, otherwise it breaks compilation.
-
-Upstream-Status: Accepted
-[https://github.com/pawelsalawa/sqlitestudio/pull/3507]
-Signed-off-by: Stefan Strogin <stefan.strogin@gmail.com>
----
- Plugins/DbSqliteCipher/sqlcipher.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/Plugins/DbSqliteCipher/sqlcipher.c b/Plugins/DbSqliteCipher/sqlcipher.c
-index 4918cb6f..10c4e5a3 100644
---- a/Plugins/DbSqliteCipher/sqlcipher.c
-+++ b/Plugins/DbSqliteCipher/sqlcipher.c
-@@ -21638,7 +21638,8 @@ static unsigned int openssl_external_init = 0;
- static unsigned int openssl_init_count = 0;
- static sqlcipher_sqlite3_mutex* openssl_rand_mutex = NULL;
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
-+    (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
- static HMAC_CTX *HMAC_CTX_new(void)
- {
-   HMAC_CTX *ctx = OPENSSL_malloc(sizeof(*ctx));
--- 
-2.21.0
-
diff --git a/dev-db/sqlitestudio/sqlitestudio-3.2.1-r1.ebuild b/dev-db/sqlitestudio/sqlitestudio-3.2.1-r1.ebuild
index af6ff97a5db8..6b5bc1399b7f 100644
--- a/dev-db/sqlitestudio/sqlitestudio-3.2.1-r1.ebuild
+++ b/dev-db/sqlitestudio/sqlitestudio-3.2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -40,8 +40,6 @@ BDEPEND="
 	dev-qt/linguist-tools:5
 "
 
-PATCHES=( "${FILESDIR}"/${P}-libressl.patch )
-
 S="${WORKDIR}"
 core_build_dir="${S}/output/build"
 plugins_build_dir="${core_build_dir}/Plugins"
author	V3n3RiX <venerix@redcorelinux.org>	2021-05-04 22:28:33 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-05-04 22:28:33 +0100
commit	a978c074e4272bb901fbe4a10de0a7b2af574f17 (patch)
tree	8c764c1cc0576389ce22abd317bceba71ea5732d /dev-db
parent	40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (diff)