commit: b25ad5e7bb9c61dc673d7b29f92ce80dddffd9c8 Author: Brian Evans <grknight <AT> gentoo <DOT> org> AuthorDate: Mon May 21 13:37:18 2018 +0000 Commit: Brian Evans <grknight <AT> gentoo <DOT> org> CommitDate: Mon May 21 13:37:18 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b25ad5e7
dev-db/mariadb: Fix build failures with missing dependencies Closes: https://bugs.gentoo.org/656208 Closes: https://bugs.gentoo.org/655172 Package-Manager: Portage-2.3.38, Repoman-2.3.9 dev-db/mariadb/mariadb-10.2.15.ebuild | 15 ++++++++------- dev-db/mariadb/mariadb-10.3.6_rc.ebuild | 22 +++++++++++----------- 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/dev-db/mariadb/mariadb-10.2.15.ebuild b/dev-db/mariadb/mariadb-10.2.15.ebuild index 4224e6c8ceb..50b76de9c54 100644 --- a/dev-db/mariadb/mariadb-10.2.15.ebuild +++ b/dev-db/mariadb/mariadb-10.2.15.ebuild @@ -80,20 +80,21 @@ COMMON_DEPEND=" jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) - !yassl? ( - client-libs? ( + client-libs? ( >=sys-libs/zlib-1.2.3:0=[${MULTILIB_USEDEP},static-libs?] + kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] ) + yassl? ( net-libs/gnutls:0=[${MULTILIB_USEDEP},static-libs?] ) + !yassl? ( !libressl? ( >=dev-libs/openssl-1.0.0:0=[${MULTILIB_USEDEP},static-libs?] ) libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP},static-libs?] ) ) - !client-libs? ( + ) + !client-libs? ( >=sys-libs/zlib-1.2.3:0= kerberos? ( virtual/krb5 ) + yassl? ( net-libs/gnutls:0= ) + !yassl? ( !libressl? ( >=dev-libs/openssl-1.0.0:0= ) libressl? ( dev-libs/libressl:0= ) ) ) - client-libs? ( >=sys-libs/zlib-1.2.3:0=[${MULTILIB_USEDEP},static-libs?] - kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] ) - ) - !client-libs? ( >=sys-libs/zlib-1.2.3:0= kerberos? ( virtual/krb5 ) ) sys-libs/ncurses:0= !bindist? ( sys-libs/binutils-libs:0= diff --git a/dev-db/mariadb/mariadb-10.3.6_rc.ebuild b/dev-db/mariadb/mariadb-10.3.6_rc.ebuild index 685f4e5bf19..5dce59437dd 100644 --- a/dev-db/mariadb/mariadb-10.3.6_rc.ebuild +++ b/dev-db/mariadb/mariadb-10.3.6_rc.ebuild @@ -81,23 +81,23 @@ COMMON_DEPEND=" jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3: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?] ) - ) - !client-libs? ( - !libressl? ( >=dev-libs/openssl-1.0.0:0= ) - libressl? ( dev-libs/libressl:0= ) - ) - ) client-libs? ( >=sys-libs/zlib-1.2.3:0=[${MULTILIB_USEDEP},static-libs?] kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] ) + yassl? ( net-libs/gnutls:0=[${MULTILIB_USEDEP},static-libs?] ) + !yassl? ( + !libressl? ( >=dev-libs/openssl-1.0.0:0=[${MULTILIB_USEDEP},static-libs?] ) + libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP},static-libs?] ) + ) ) !client-libs? ( >=sys-libs/zlib-1.2.3:0= kerberos? ( virtual/krb5 ) + yassl? ( net-libs/gnutls:0= ) + !yassl? ( + !libressl? ( >=dev-libs/openssl-1.0.0:0= ) + libressl? ( dev-libs/libressl:0= ) + ) ) sys-libs/ncurses:0= !bindist? ( @@ -114,7 +114,7 @@ COMMON_DEPEND=" innodb-lz4? ( app-arch/lz4 ) innodb-lzo? ( dev-libs/lzo ) innodb-snappy? ( app-arch/snappy ) - mroonga? ( app-text/groonga-normalizer-mysql ) + mroonga? ( app-text/groonga-normalizer-mysql >=app-text/groonga-7.0.4 ) numa? ( sys-process/numactl ) oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( virtual/pam:0= )
