commit: 7fc756dd93e378d0c89a5b3e0a0aba9e8c3d8a6e Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> AuthorDate: Mon May 3 08:09:57 2021 +0000 Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> CommitDate: Mon May 3 08:09:57 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7fc756dd
dev-db/mysql-cluster: 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-cluster/mysql-cluster-7.2.34.ebuild | 15 ++++----------- dev-db/mysql-cluster/mysql-cluster-7.3.22.ebuild | 15 ++++----------- dev-db/mysql-cluster/mysql-cluster-7.4.21.ebuild | 15 ++++----------- 3 files changed, 12 insertions(+), 33 deletions(-) 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 bd54a6729ec..31bc6c2f219 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 7969b44c589..fdbc2cad350 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 ad252c1349b..d78696ae60e 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 )
