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 5C463138334 for ; Mon, 8 Jul 2019 13:21:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7C8CDE082F; Mon, 8 Jul 2019 13:21:30 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 4D85DE082F for ; Mon, 8 Jul 2019 13:21:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 E60DE347375 for ; Mon, 8 Jul 2019 13:21:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5BE125DE for ; Mon, 8 Jul 2019 13:21:27 +0000 (UTC) From: "Brian Evans" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Evans" Message-ID: <1562592064.3a44bac7032fd5b21e884bff7c2a0afc37d9ddd9.grknight@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.4.6.ebuild X-VCS-Directories: dev-db/mariadb/ X-VCS-Committer: grknight X-VCS-Committer-Name: Brian Evans X-VCS-Revision: 3a44bac7032fd5b21e884bff7c2a0afc37d9ddd9 X-VCS-Branch: master Date: Mon, 8 Jul 2019 13:21:27 +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: 825c08d4-7c1d-427c-9f24-580de8169020 X-Archives-Hash: 696b8fb47853a1053fbc3e4146ab5481 commit: 3a44bac7032fd5b21e884bff7c2a0afc37d9ddd9 Author: Brian Evans gentoo org> AuthorDate: Mon Jul 8 13:13:08 2019 +0000 Commit: Brian Evans gentoo org> CommitDate: Mon Jul 8 13:21:04 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a44bac7 dev-db/mariadb: Fix EAPI 7 paths, drop client-libs USE Closes: https://bugs.gentoo.org/689412 Package-Manager: Portage-2.3.68, Repoman-2.3.16 Signed-off-by: Brian Evans gentoo.org> dev-db/mariadb/mariadb-10.4.6.ebuild | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/dev-db/mariadb/mariadb-10.4.6.ebuild b/dev-db/mariadb/mariadb-10.4.6.ebuild index 9235108192c..d23b680cdd9 100644 --- a/dev-db/mariadb/mariadb-10.4.6.ebuild +++ b/dev-db/mariadb/mariadb-10.4.6.ebuild @@ -26,7 +26,7 @@ HOMEPAGE="https://mariadb.org/" DESCRIPTION="An enhanced, drop-in replacement for MySQL" LICENSE="GPL-2 LGPL-2.1+" SLOT="0/${SUBSLOT:-0}" -IUSE="+backup bindist client-libs cracklib debug extraengine galera innodb-lz4 +IUSE="+backup bindist cracklib debug extraengine galera innodb-lz4 innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 libressl mroonga numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx sst-rsync sst-mariabackup static systemd systemtap tcmalloc @@ -117,6 +117,7 @@ RDEPEND="selinux? ( sec-policy/selinux-mysql ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster server? ( !prefix? ( dev-db/mysql-init-scripts ) ) ! "${sqltmp}" 2>/dev/null - local cmd=( "${EROOT}usr/share/mariadb/scripts/mysql_install_db" ) - [[ -f "${cmd}" ]] || cmd=( "${EROOT}usr/bin/mysql_install_db" ) + local cmd=( "${EROOT}/usr/share/mariadb/scripts/mysql_install_db" ) + [[ -f "${cmd}" ]] || cmd=( "${EROOT}/usr/bin/mysql_install_db" ) cmd+=( "--basedir=${EPREFIX}/usr" ${options} "--datadir=${ROOT}/${MY_DATADIR}" "--tmpdir=${ROOT}/${MYSQL_TMPDIR}" ) einfo "Command: ${cmd[*]}" su -s /bin/sh -c "${cmd[*]}" mysql \