commit: fce0a8364980742ed17fd52ed5f2564324ff2f26 Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> AuthorDate: Mon May 3 08:03:14 2021 +0000 Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> CommitDate: Mon May 3 08:04:36 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fce0a836
dev-db/mysql: remove libressl support Package-Manager: Portage-3.0.18, Repoman-3.0.2 Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org> dev-db/mysql/mysql-5.7.27-r2.ebuild | 17 ++++------------- dev-db/mysql/mysql-5.7.29-r1.ebuild | 17 ++++------------- dev-db/mysql/mysql-5.7.30-r1.ebuild | 16 ++++------------ dev-db/mysql/mysql-5.7.31.ebuild | 16 ++++------------ dev-db/mysql/mysql-5.7.32.ebuild | 16 ++++------------ dev-db/mysql/mysql-5.7.33.ebuild | 16 ++++------------ dev-db/mysql/mysql-5.7.34.ebuild | 16 ++++------------ dev-db/mysql/mysql-8.0.19-r2.ebuild | 9 +++------ dev-db/mysql/mysql-8.0.20-r1.ebuild | 8 +++----- dev-db/mysql/mysql-8.0.21-r1.ebuild | 8 +++----- dev-db/mysql/mysql-8.0.22.ebuild | 8 +++----- dev-db/mysql/mysql-8.0.23.ebuild | 8 +++----- dev-db/mysql/mysql-8.0.24.ebuild | 8 +++----- 13 files changed, 46 insertions(+), 117 deletions(-) diff --git a/dev-db/mysql/mysql-5.7.27-r2.ebuild b/dev-db/mysql/mysql-5.7.27-r2.ebuild index 98a59f769bd..e1cf579b3c7 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 1d1fd598dd9..a68c2ae2ff7 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 59e0d821600..8df5b377bb6 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 514e06d3091..c5a202eecc1 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 6c3a7183a83..c68d1e4cd86 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 0296a2135fc..6a24a16ccfe 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 da6fe570622..0e825dede97 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 60dd2a3f27b..f979bb9020f 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 4545a1eec02..70c3c6e5e87 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 b3a4bf5a2ad..d63f3416d34 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 18586043f65..1c0cd3052d7 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 89c21bd9a66..4de06f95e60 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 a76d3a37969..608252f5a96 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]
