| 1 |
commit: 95922d67340b909d7314f73bf6ccc3332f59e794 |
| 2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun May 3 15:20:05 2020 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun May 3 15:20:54 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95922d67 |
| 7 |
|
| 8 |
dev-db/mysql: drop USE=yassl |
| 9 |
|
| 10 |
Link: https://dev.mysql.com/doc/relnotes/mysql/5.7/en/news-5-7-28.html |
| 11 |
Package-Manager: Portage-2.3.99, Repoman-2.3.22 |
| 12 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
| 13 |
|
| 14 |
dev-db/mysql/mysql-5.7.29.ebuild | 27 ++++++++++----------------- |
| 15 |
dev-db/mysql/mysql-5.7.30.ebuild | 27 ++++++++++----------------- |
| 16 |
2 files changed, 20 insertions(+), 34 deletions(-) |
| 17 |
|
| 18 |
diff --git a/dev-db/mysql/mysql-5.7.29.ebuild b/dev-db/mysql/mysql-5.7.29.ebuild |
| 19 |
index dceca6a058f..1bab98a18ca 100644 |
| 20 |
--- a/dev-db/mysql/mysql-5.7.29.ebuild |
| 21 |
+++ b/dev-db/mysql/mysql-5.7.29.ebuild |
| 22 |
@@ -27,12 +27,12 @@ DESCRIPTION="A fast, multi-threaded, multi-user SQL database server" |
| 23 |
LICENSE="GPL-2" |
| 24 |
SLOT="0/18" |
| 25 |
IUSE="cjk client-libs cracklib debug experimental jemalloc latin1 libressl numa +perl profiling |
| 26 |
- selinux +server static static-libs systemtap tcmalloc test yassl" |
| 27 |
+ selinux +server static static-libs systemtap tcmalloc test" |
| 28 |
|
| 29 |
# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests |
| 30 |
RESTRICT="!test? ( test ) libressl? ( test )" |
| 31 |
|
| 32 |
-REQUIRED_USE="?? ( tcmalloc jemalloc ) static? ( yassl )" |
| 33 |
+REQUIRED_USE="?? ( tcmalloc jemalloc )" |
| 34 |
|
| 35 |
KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" |
| 36 |
|
| 37 |
@@ -90,15 +90,13 @@ COMMON_DEPEND="net-misc/curl:= |
| 38 |
) |
| 39 |
systemtap? ( >=dev-util/systemtap-1.3:0= ) |
| 40 |
tcmalloc? ( dev-util/google-perftools:0= ) |
| 41 |
- !yassl? ( |
| 42 |
- client-libs? ( |
| 43 |
- !libressl? ( >=dev-libs/openssl-1.0.0:0=[${MULTILIB_USEDEP},static-libs?] ) |
| 44 |
- libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP},static-libs?] ) |
| 45 |
- ) |
| 46 |
- !client-libs? ( |
| 47 |
- !libressl? ( >=dev-libs/openssl-1.0.0:0= ) |
| 48 |
- libressl? ( dev-libs/libressl:0= ) |
| 49 |
- ) |
| 50 |
+ client-libs? ( |
| 51 |
+ !libressl? ( >=dev-libs/openssl-1.0.0:0=[${MULTILIB_USEDEP},static-libs?] ) |
| 52 |
+ libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP},static-libs?] ) |
| 53 |
+ ) |
| 54 |
+ !client-libs? ( |
| 55 |
+ !libressl? ( >=dev-libs/openssl-1.0.0:0= ) |
| 56 |
+ libressl? ( dev-libs/libressl:0= ) |
| 57 |
) |
| 58 |
" |
| 59 |
DEPEND="${COMMON_DEPEND} |
| 60 |
@@ -362,6 +360,7 @@ multilib_src_configure() { |
| 61 |
### TODO: make this system but issues with UTF-8 prevent it |
| 62 |
-DWITH_EDITLINE=bundled |
| 63 |
-DWITH_ZLIB=system |
| 64 |
+ -DWITH_SSL=system |
| 65 |
-DWITH_LIBWRAP=0 |
| 66 |
-DENABLED_LOCAL_INFILE=1 |
| 67 |
-DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock" |
| 68 |
@@ -379,12 +378,6 @@ multilib_src_configure() { |
| 69 |
mycmakeargs+=( -DINSTALL_MYSQLTESTDIR='' ) |
| 70 |
fi |
| 71 |
|
| 72 |
- if ! use yassl ; then |
| 73 |
- mycmakeargs+=( -DWITH_SSL=system ) |
| 74 |
- else |
| 75 |
- mycmakeargs+=( -DWITH_SSL=bundled ) |
| 76 |
- fi |
| 77 |
- |
| 78 |
if ! use client-libs ; then |
| 79 |
mycmakeargs+=( -DWITHOUT_CLIENTLIBS=YES ) |
| 80 |
fi |
| 81 |
|
| 82 |
diff --git a/dev-db/mysql/mysql-5.7.30.ebuild b/dev-db/mysql/mysql-5.7.30.ebuild |
| 83 |
index ddb4b28d3e1..1207ac15ee6 100644 |
| 84 |
--- a/dev-db/mysql/mysql-5.7.30.ebuild |
| 85 |
+++ b/dev-db/mysql/mysql-5.7.30.ebuild |
| 86 |
@@ -23,12 +23,12 @@ DESCRIPTION="A fast, multi-threaded, multi-user SQL database server" |
| 87 |
LICENSE="GPL-2" |
| 88 |
SLOT="0/18" |
| 89 |
IUSE="cjk client-libs cracklib debug experimental jemalloc latin1 libressl numa +perl profiling |
| 90 |
- selinux +server static static-libs systemtap tcmalloc test yassl" |
| 91 |
+ selinux +server static static-libs systemtap tcmalloc test" |
| 92 |
|
| 93 |
# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests |
| 94 |
RESTRICT="!test? ( test ) libressl? ( test )" |
| 95 |
|
| 96 |
-REQUIRED_USE="?? ( tcmalloc jemalloc ) static? ( yassl )" |
| 97 |
+REQUIRED_USE="?? ( tcmalloc jemalloc )" |
| 98 |
|
| 99 |
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" |
| 100 |
|
| 101 |
@@ -65,15 +65,13 @@ COMMON_DEPEND="net-misc/curl:= |
| 102 |
) |
| 103 |
systemtap? ( >=dev-util/systemtap-1.3:0= ) |
| 104 |
tcmalloc? ( dev-util/google-perftools:0= ) |
| 105 |
- !yassl? ( |
| 106 |
- client-libs? ( |
| 107 |
- !libressl? ( >=dev-libs/openssl-1.0.0:0=[${MULTILIB_USEDEP},static-libs?] ) |
| 108 |
- libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP},static-libs?] ) |
| 109 |
- ) |
| 110 |
- !client-libs? ( |
| 111 |
- !libressl? ( >=dev-libs/openssl-1.0.0:0= ) |
| 112 |
- libressl? ( dev-libs/libressl:0= ) |
| 113 |
- ) |
| 114 |
+ client-libs? ( |
| 115 |
+ !libressl? ( >=dev-libs/openssl-1.0.0:0=[${MULTILIB_USEDEP},static-libs?] ) |
| 116 |
+ libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP},static-libs?] ) |
| 117 |
+ ) |
| 118 |
+ !client-libs? ( |
| 119 |
+ !libressl? ( >=dev-libs/openssl-1.0.0:0= ) |
| 120 |
+ libressl? ( dev-libs/libressl:0= ) |
| 121 |
) |
| 122 |
" |
| 123 |
DEPEND="${COMMON_DEPEND} |
| 124 |
@@ -337,6 +335,7 @@ multilib_src_configure() { |
| 125 |
### TODO: make this system but issues with UTF-8 prevent it |
| 126 |
-DWITH_EDITLINE=bundled |
| 127 |
-DWITH_ZLIB=system |
| 128 |
+ -DWITH_SSL=system |
| 129 |
-DWITH_LIBWRAP=0 |
| 130 |
-DENABLED_LOCAL_INFILE=1 |
| 131 |
-DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock" |
| 132 |
@@ -354,12 +353,6 @@ multilib_src_configure() { |
| 133 |
mycmakeargs+=( -DINSTALL_MYSQLTESTDIR='' ) |
| 134 |
fi |
| 135 |
|
| 136 |
- if ! use yassl ; then |
| 137 |
- mycmakeargs+=( -DWITH_SSL=system ) |
| 138 |
- else |
| 139 |
- mycmakeargs+=( -DWITH_SSL=bundled ) |
| 140 |
- fi |
| 141 |
- |
| 142 |
if ! use client-libs ; then |
| 143 |
mycmakeargs+=( -DWITHOUT_CLIENTLIBS=YES ) |
| 144 |
fi |
Archives