From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DF8111382C5 for ; Mon, 3 May 2021 07:47:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2FED9E0814; Mon, 3 May 2021 07:47:59 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 020E8E0814 for ; Mon, 3 May 2021 07:47:58 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7E52434097F for ; Mon, 3 May 2021 07:47:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E193063D for ; Mon, 3 May 2021 07:47:55 +0000 (UTC) From: "Mikle Kolyada" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mikle Kolyada" Message-ID: <1620027996.8710c2bcd278a1d8fc656ccc289a84f3ea2df646.zlogene@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-db/mariadb/mariadb-10.2.22-r2.ebuild dev-db/mariadb/mariadb-10.2.32-r3.ebuild dev-db/mariadb/mariadb-10.2.34.ebuild dev-db/mariadb/mariadb-10.2.35.ebuild dev-db/mariadb/mariadb-10.2.36.ebuild dev-db/mariadb/mariadb-10.2.37-r3.ebuild dev-db/mariadb/mariadb-10.3.23-r3.ebuild dev-db/mariadb/mariadb-10.3.25.ebuild dev-db/mariadb/mariadb-10.3.26.ebuild dev-db/mariadb/mariadb-10.3.27.ebuild dev-db/mariadb/mariadb-10.3.28-r3.ebuild dev-db/mariadb/mariadb-10.4.13-r3.ebuild dev-db/mariadb/mariadb-10.4.15.ebuild dev-db/mariadb/mariadb-10.4.16.ebuild dev-db/mariadb/mariadb-10.4.17.ebuild dev-db/mariadb/mariadb-10.4.18-r3.ebuild dev-db/mariadb/mariadb-10.5.6.ebuild dev-db/mariadb/mariadb-10.5.7.ebuild dev-db/mariadb/mariadb-10.5.8.ebuild dev-db/mariadb/mariadb-10.5.9-r5.ebuild X-VCS-Directories: dev-db/mariadb/ X-VCS-Committer: zlogene X-VCS-Committer-Name: Mikle Kolyada X-VCS-Revision: 8710c2bcd278a1d8fc656ccc289a84f3ea2df646 X-VCS-Branch: master Date: Mon, 3 May 2021 07:47:55 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: add23a47-9e5a-481f-a313-e2073dabc5e6 X-Archives-Hash: a2cf4a3a78c221d653427bd320f3be0f commit: 8710c2bcd278a1d8fc656ccc289a84f3ea2df646 Author: Mikle Kolyada gentoo org> AuthorDate: Mon May 3 07:46:36 2021 +0000 Commit: Mikle Kolyada gentoo org> CommitDate: Mon May 3 07:46:36 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8710c2bc dev-db/mariadb: remove libressl support Package-Manager: Portage-3.0.18, Repoman-3.0.2 Signed-off-by: Mikle Kolyada gentoo.org> dev-db/mariadb/mariadb-10.2.22-r2.ebuild | 10 ++++------ dev-db/mariadb/mariadb-10.2.32-r3.ebuild | 8 +++----- dev-db/mariadb/mariadb-10.2.34.ebuild | 8 +++----- dev-db/mariadb/mariadb-10.2.35.ebuild | 8 +++----- dev-db/mariadb/mariadb-10.2.36.ebuild | 8 +++----- dev-db/mariadb/mariadb-10.2.37-r3.ebuild | 8 +++----- dev-db/mariadb/mariadb-10.3.23-r3.ebuild | 8 +++----- dev-db/mariadb/mariadb-10.3.25.ebuild | 8 +++----- dev-db/mariadb/mariadb-10.3.26.ebuild | 8 +++----- dev-db/mariadb/mariadb-10.3.27.ebuild | 8 +++----- dev-db/mariadb/mariadb-10.3.28-r3.ebuild | 8 +++----- dev-db/mariadb/mariadb-10.4.13-r3.ebuild | 8 +++----- dev-db/mariadb/mariadb-10.4.15.ebuild | 8 +++----- dev-db/mariadb/mariadb-10.4.16.ebuild | 8 +++----- dev-db/mariadb/mariadb-10.4.17.ebuild | 8 +++----- dev-db/mariadb/mariadb-10.4.18-r3.ebuild | 8 +++----- dev-db/mariadb/mariadb-10.5.6.ebuild | 8 +++----- dev-db/mariadb/mariadb-10.5.7.ebuild | 8 +++----- dev-db/mariadb/mariadb-10.5.8.ebuild | 8 +++----- dev-db/mariadb/mariadb-10.5.9-r5.ebuild | 8 +++----- 20 files changed, 61 insertions(+), 101 deletions(-) diff --git a/dev-db/mariadb/mariadb-10.2.22-r2.ebuild b/dev-db/mariadb/mariadb-10.2.22-r2.ebuild index aca4c6dfa4c..9da7717b745 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 5220f19266b..90d4e0ae97e 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 aa85215bd84..906f4db9f25 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 fc25a535a83..81166142aa7 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 8673125864b..e710a0d553a 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 a815c35193e..2622cb71a80 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 49287ca1614..523a0c907d1 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 73c8f3fa447..4b560041aa1 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 c5f1eaf4279..c2089d951e6 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 c3d7f8e6067..700176d0f57 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 b9722ab6f77..995a619bc5c 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 cd815bfe019..4e128c050da 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 fd371add014..753ddd9b8a8 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 87e0f3285c3..a4b2fc06a1f 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 983375442a0..0abf3fccea7 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 5fad8a38238..1c922e47c71 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 707286c11f4..5bcad73cf9f 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 8f9f6778b6c..a48f286d522 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 e2bdf78cecd..550c14700ef 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 27accfb1aa1..35a14850bf6 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