commit: d4c95be246e07f93a3d7fac4dfcf91806e127843 Author: Brian Evans <grknight <AT> gentoo <DOT> org> AuthorDate: Tue Mar 27 18:17:17 2018 +0000 Commit: Brian Evans <grknight <AT> gentoo <DOT> org> CommitDate: Tue Mar 27 18:19:55 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4c95be2
dev-db/mariadb: Consistently use mysqld section in pkg_config Closes: https://bugs.gentoo.org/651356 Package-Manager: Portage-2.3.24, Repoman-2.3.6 dev-db/mariadb/mariadb-10.2.13.ebuild | 6 +++--- dev-db/mariadb/mariadb-10.3.5_rc.ebuild | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dev-db/mariadb/mariadb-10.2.13.ebuild b/dev-db/mariadb/mariadb-10.2.13.ebuild index d515e8570a6..cc2988c75ed 100644 --- a/dev-db/mariadb/mariadb-10.2.13.ebuild +++ b/dev-db/mariadb/mariadb-10.2.13.ebuild @@ -849,11 +849,11 @@ pkg_config() { unset tmp_mysqld_password_source fi - MYSQL_TMPDIR="$(_getoptval '--mysqld' tmpdir)" + MYSQL_TMPDIR="$(_getoptval mysqld tmpdir)" # These are dir+prefix - MYSQL_RELAY_LOG="$(_getoptval '--mysqld' relay-log)" + MYSQL_RELAY_LOG="$(_getoptval mysqld relay-log)" MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*} - MYSQL_LOG_BIN="$(_getoptval '--mysqld' log-bin)" + MYSQL_LOG_BIN="$(_getoptval mysqld log-bin)" MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*} if [[ ! -d "${ROOT}/$MYSQL_TMPDIR" ]]; then diff --git a/dev-db/mariadb/mariadb-10.3.5_rc.ebuild b/dev-db/mariadb/mariadb-10.3.5_rc.ebuild index 0baa860a6a3..e155c7cf981 100644 --- a/dev-db/mariadb/mariadb-10.3.5_rc.ebuild +++ b/dev-db/mariadb/mariadb-10.3.5_rc.ebuild @@ -853,11 +853,11 @@ pkg_config() { unset tmp_mysqld_password_source fi - MYSQL_TMPDIR="$(_getoptval '--mysqld' tmpdir)" + MYSQL_TMPDIR="$(_getoptval mysqld tmpdir)" # These are dir+prefix - MYSQL_RELAY_LOG="$(_getoptval '--mysqld' relay-log)" + MYSQL_RELAY_LOG="$(_getoptval mysqld relay-log)" MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*} - MYSQL_LOG_BIN="$(_getoptval '--mysqld' log-bin)" + MYSQL_LOG_BIN="$(_getoptval mysqld log-bin)" MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*} if [[ ! -d "${ROOT}/$MYSQL_TMPDIR" ]]; then
