dev-db/mariadb: Fix pkg_config issues when multiple values exist

Closes: https://bugs.gentoo.org/685822
Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Brian Evans <grknight@gentoo.org>

diff --git a/dev-db/mariadb/mariadb-10.2.22-r1.ebuild b/dev-db/mariadb/mariadb-10.2.22-r1.ebuild
index 38e851d55654bb2a6c1f9b9236b42d378788674d..c9ef480b83b62efe1a8e5623afafddd29eecac94 100644 (file)
--- a/dev-db/mariadb/mariadb-10.2.22-r1.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.22-r1.ebuild
@@ -813,11 +813,11 @@ pkg_config() {
 
                unset tmp_mysqld_password_source
        fi
-       MYSQL_TMPDIR="$(_getoptval mysqld tmpdir)"
+       MYSQL_TMPDIR="$(_getoptval mysqld tmpdir | tail -n1)"
        # These are dir+prefix
-       MYSQL_RELAY_LOG="$(_getoptval mysqld relay-log)"
+       MYSQL_RELAY_LOG="$(_getoptval mysqld relay-log | tail -n1)"
        MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*}
-       MYSQL_LOG_BIN="$(_getoptval mysqld log-bin)"
+       MYSQL_LOG_BIN="$(_getoptval mysqld log-bin | tail -n1)"
        MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*}
 
        if [[ ! -d "${ROOT}/$MYSQL_TMPDIR" ]]; then

diff --git a/dev-db/mariadb/mariadb-10.2.24.ebuild b/dev-db/mariadb/mariadb-10.2.24.ebuild
index 36f9e22038036771c22a1f427e5fb1592af7fc1b..184959a17cc8a71a7df58bac439cc6a0663bb3e4 100644 (file)
--- a/dev-db/mariadb/mariadb-10.2.24.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.24.ebuild
@@ -739,7 +739,7 @@ mysql_init_vars() {
 
 pkg_config() {
        _getoptval() {
-               local mypd="${EROOT}"/usr/bin/my_print_defaults
+               local mypd="${EROOT}"usr/libexec/mariadb/my_print_defaults
                local section="$1"
                local flag="--${2}="
                local extra_options="${3}"

diff --git a/dev-db/mariadb/mariadb-10.3.13.ebuild b/dev-db/mariadb/mariadb-10.3.13.ebuild
index 8d049d3508eef0745b5ad6d58ee2ce786d4e42ee..75082171657c1d1e1d81f93beced4beb79b61f98 100644 (file)
--- a/dev-db/mariadb/mariadb-10.3.13.ebuild
+++ b/dev-db/mariadb/mariadb-10.3.13.ebuild
@@ -814,11 +814,11 @@ pkg_config() {
 
                unset tmp_mysqld_password_source
        fi
-       MYSQL_TMPDIR="$(_getoptval mysqld tmpdir)"
+       MYSQL_TMPDIR="$(_getoptval mysqld tmpdir | tail -n1)"
        # These are dir+prefix
-       MYSQL_RELAY_LOG="$(_getoptval mysqld relay-log)"
+       MYSQL_RELAY_LOG="$(_getoptval mysqld relay-log | tail -n1)"
        MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*}
-       MYSQL_LOG_BIN="$(_getoptval mysqld log-bin)"
+       MYSQL_LOG_BIN="$(_getoptval mysqld log-bin | tail -n1)"
        MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*}
 
        if [[ ! -d "${ROOT}/$MYSQL_TMPDIR" ]]; then