| 1 |
commit: 7fc756dd93e378d0c89a5b3e0a0aba9e8c3d8a6e |
| 2 |
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon May 3 08:09:57 2021 +0000 |
| 4 |
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon May 3 08:09:57 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7fc756dd |
| 7 |
|
| 8 |
dev-db/mysql-cluster: remove libressl support |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.18, Repoman-3.0.2 |
| 11 |
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org> |
| 12 |
|
| 13 |
dev-db/mysql-cluster/mysql-cluster-7.2.34.ebuild | 15 ++++----------- |
| 14 |
dev-db/mysql-cluster/mysql-cluster-7.3.22.ebuild | 15 ++++----------- |
| 15 |
dev-db/mysql-cluster/mysql-cluster-7.4.21.ebuild | 15 ++++----------- |
| 16 |
3 files changed, 12 insertions(+), 33 deletions(-) |
| 17 |
|
| 18 |
diff --git a/dev-db/mysql-cluster/mysql-cluster-7.2.34.ebuild b/dev-db/mysql-cluster/mysql-cluster-7.2.34.ebuild |
| 19 |
index bd54a6729ec..31bc6c2f219 100644 |
| 20 |
--- a/dev-db/mysql-cluster/mysql-cluster-7.2.34.ebuild |
| 21 |
+++ b/dev-db/mysql-cluster/mysql-cluster-7.2.34.ebuild |
| 22 |
@@ -1,4 +1,4 @@ |
| 23 |
-# Copyright 1999-2020 Gentoo Authors |
| 24 |
+# Copyright 1999-2021 Gentoo Authors |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
|
| 27 |
EAPI="6" |
| 28 |
@@ -24,12 +24,11 @@ HOMEPAGE="https://mysql.com/" |
| 29 |
DESCRIPTION="An enhanced, drop-in replacement for MySQL" |
| 30 |
LICENSE="GPL-2" |
| 31 |
SLOT="0" |
| 32 |
-IUSE="bindist client-libs debug extraengine java jemalloc latin1 libressl |
| 33 |
+IUSE="bindist client-libs debug extraengine java jemalloc latin1 |
| 34 |
+perl profiling selinux +server static static-libs systemtap tcmalloc |
| 35 |
test yassl" |
| 36 |
|
| 37 |
-# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests |
| 38 |
-RESTRICT="!bindist? ( bindist ) !test? ( test ) libressl? ( test )" |
| 39 |
+RESTRICT="!bindist? ( bindist ) !test? ( test )" |
| 40 |
|
| 41 |
REQUIRED_USE="?? ( tcmalloc jemalloc ) |
| 42 |
static? ( yassl )" |
| 43 |
@@ -78,8 +77,7 @@ COMMON_DEPEND=" |
| 44 |
tcmalloc? ( dev-util/google-perftools:0= ) |
| 45 |
systemtap? ( >=dev-util/systemtap-1.3:0= ) |
| 46 |
!yassl? ( |
| 47 |
- !libressl? ( dev-libs/openssl:0= !>=dev-libs/openssl-1.1 ) |
| 48 |
- libressl? ( dev-libs/libressl:0= ) |
| 49 |
+ dev-libs/openssl:0= !>=dev-libs/openssl-1.1 |
| 50 |
) |
| 51 |
>=sys-libs/zlib-1.2.3:0= |
| 52 |
sys-libs/ncurses:0= |
| 53 |
@@ -196,11 +194,6 @@ src_prepare() { |
| 54 |
echo > "${S}/support-files/SELinux/CMakeLists.txt" || die |
| 55 |
fi |
| 56 |
|
| 57 |
- if use libressl ; then |
| 58 |
- sed -i 's/OPENSSL_MAJOR_VERSION STREQUAL "1"/OPENSSL_MAJOR_VERSION STREQUAL "2"/' \ |
| 59 |
- "${S}/cmake/ssl.cmake" || die |
| 60 |
- fi |
| 61 |
- |
| 62 |
local plugin |
| 63 |
local server_plugins=( semisync ) |
| 64 |
local test_plugins=( audit_null daemon_example fulltext ) |
| 65 |
|
| 66 |
diff --git a/dev-db/mysql-cluster/mysql-cluster-7.3.22.ebuild b/dev-db/mysql-cluster/mysql-cluster-7.3.22.ebuild |
| 67 |
index 7969b44c589..fdbc2cad350 100644 |
| 68 |
--- a/dev-db/mysql-cluster/mysql-cluster-7.3.22.ebuild |
| 69 |
+++ b/dev-db/mysql-cluster/mysql-cluster-7.3.22.ebuild |
| 70 |
@@ -1,4 +1,4 @@ |
| 71 |
-# Copyright 1999-2020 Gentoo Authors |
| 72 |
+# Copyright 1999-2021 Gentoo Authors |
| 73 |
# Distributed under the terms of the GNU General Public License v2 |
| 74 |
|
| 75 |
EAPI="6" |
| 76 |
@@ -24,12 +24,11 @@ HOMEPAGE="https://mysql.com/" |
| 77 |
DESCRIPTION="An enhanced, drop-in replacement for MySQL" |
| 78 |
LICENSE="GPL-2" |
| 79 |
SLOT="0" |
| 80 |
-IUSE="client-libs debug extraengine jemalloc latin1 libressl numa |
| 81 |
+IUSE="client-libs debug extraengine jemalloc latin1 numa |
| 82 |
+perl profiling selinux +server static static-libs systemtap tcmalloc |
| 83 |
test yassl" |
| 84 |
|
| 85 |
-# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests |
| 86 |
-RESTRICT="!test? ( test ) libressl? ( test )" |
| 87 |
+RESTRICT="!test? ( test )" |
| 88 |
|
| 89 |
REQUIRED_USE="?? ( tcmalloc jemalloc ) |
| 90 |
static? ( yassl )" |
| 91 |
@@ -80,8 +79,7 @@ COMMON_DEPEND=" |
| 92 |
tcmalloc? ( dev-util/google-perftools:0= ) |
| 93 |
systemtap? ( >=dev-util/systemtap-1.3:0= ) |
| 94 |
!yassl? ( |
| 95 |
- !libressl? ( >=dev-libs/openssl-1.0.0:0= ) |
| 96 |
- libressl? ( dev-libs/libressl:0= ) |
| 97 |
+ >=dev-libs/openssl-1.0.0:0= |
| 98 |
) |
| 99 |
>=sys-libs/zlib-1.2.3:0= |
| 100 |
sys-libs/ncurses:0= |
| 101 |
@@ -197,11 +195,6 @@ src_prepare() { |
| 102 |
echo > "${S}/support-files/SELinux/CMakeLists.txt" || die |
| 103 |
fi |
| 104 |
|
| 105 |
- if use libressl ; then |
| 106 |
- sed -i 's/OPENSSL_MAJOR_VERSION STREQUAL "1"/OPENSSL_MAJOR_VERSION STREQUAL "2"/' \ |
| 107 |
- "${S}/cmake/ssl.cmake" || die |
| 108 |
- fi |
| 109 |
- |
| 110 |
local plugin |
| 111 |
local server_plugins=( semisync ) |
| 112 |
local test_plugins=( audit_null daemon_example fulltext ) |
| 113 |
|
| 114 |
diff --git a/dev-db/mysql-cluster/mysql-cluster-7.4.21.ebuild b/dev-db/mysql-cluster/mysql-cluster-7.4.21.ebuild |
| 115 |
index ad252c1349b..d78696ae60e 100644 |
| 116 |
--- a/dev-db/mysql-cluster/mysql-cluster-7.4.21.ebuild |
| 117 |
+++ b/dev-db/mysql-cluster/mysql-cluster-7.4.21.ebuild |
| 118 |
@@ -1,4 +1,4 @@ |
| 119 |
-# Copyright 1999-2020 Gentoo Authors |
| 120 |
+# Copyright 1999-2021 Gentoo Authors |
| 121 |
# Distributed under the terms of the GNU General Public License v2 |
| 122 |
|
| 123 |
EAPI="6" |
| 124 |
@@ -24,12 +24,11 @@ HOMEPAGE="https://mysql.com/" |
| 125 |
DESCRIPTION="An enhanced, drop-in replacement for MySQL" |
| 126 |
LICENSE="GPL-2" |
| 127 |
SLOT="0" |
| 128 |
-IUSE="client-libs debug extraengine jemalloc latin1 libressl numa |
| 129 |
+IUSE="client-libs debug extraengine jemalloc latin1 numa |
| 130 |
+perl profiling selinux +server static static-libs systemtap tcmalloc |
| 131 |
test yassl" |
| 132 |
|
| 133 |
-# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests |
| 134 |
-RESTRICT="!test? ( test ) libressl? ( test )" |
| 135 |
+RESTRICT="!test? ( test )" |
| 136 |
|
| 137 |
REQUIRED_USE="?? ( tcmalloc jemalloc ) |
| 138 |
static? ( yassl )" |
| 139 |
@@ -80,8 +79,7 @@ COMMON_DEPEND=" |
| 140 |
tcmalloc? ( dev-util/google-perftools:0= ) |
| 141 |
systemtap? ( >=dev-util/systemtap-1.3:0= ) |
| 142 |
!yassl? ( |
| 143 |
- !libressl? ( >=dev-libs/openssl-1.0.0:0= ) |
| 144 |
- libressl? ( dev-libs/libressl:0= ) |
| 145 |
+ >=dev-libs/openssl-1.0.0:0= |
| 146 |
) |
| 147 |
>=sys-libs/zlib-1.2.3:0= |
| 148 |
sys-libs/ncurses:0= |
| 149 |
@@ -197,11 +195,6 @@ src_prepare() { |
| 150 |
echo > "${S}/support-files/SELinux/CMakeLists.txt" || die |
| 151 |
fi |
| 152 |
|
| 153 |
- if use libressl ; then |
| 154 |
- sed -i 's/OPENSSL_MAJOR_VERSION STREQUAL "1"/OPENSSL_MAJOR_VERSION STREQUAL "2"/' \ |
| 155 |
- "${S}/cmake/ssl.cmake" || die |
| 156 |
- fi |
| 157 |
- |
| 158 |
local plugin |
| 159 |
local server_plugins=( semisync ) |
| 160 |
local test_plugins=( audit_null daemon_example fulltext ) |
Archives