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

diff --git a/dev-db/mariadb/mariadb-10.2.13.ebuild b/dev-db/mariadb/mariadb-10.2.13.ebuild
index d515e8570a645381cbd397b742531852195c610a..cc2988c75ed4198a2678ed89de16ddaf20ff4437 100644 (file)
--- 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 0baa860a6a36b6d65958c9ab7d23049b0f976cf8..e155c7cf981be004b21d505359e958fde0fb9331 100644 (file)
--- 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