summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Evans <grknight@gentoo.org>2018-03-27 14:17:17 -0400
committerBrian Evans <grknight@gentoo.org>2018-03-27 14:19:55 -0400
commitd4c95be246e07f93a3d7fac4dfcf91806e127843 (patch)
tree697978faf057c0d38b187aae2cf6b7a5cdd53a94 /dev-db/mariadb
parentdev-php/pecl-gnupg: Revbump to include php7-1 and php7-2 (diff)
downloadgentoo-d4c95be246e07f93a3d7fac4dfcf91806e127843.tar.gz
gentoo-d4c95be246e07f93a3d7fac4dfcf91806e127843.tar.bz2
gentoo-d4c95be246e07f93a3d7fac4dfcf91806e127843.zip
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
Diffstat (limited to 'dev-db/mariadb')
-rw-r--r--dev-db/mariadb/mariadb-10.2.13.ebuild6
-rw-r--r--dev-db/mariadb/mariadb-10.3.5_rc.ebuild6
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 d515e8570a64..cc2988c75ed4 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 0baa860a6a36..e155c7cf981b 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