commit:     59f1666ed50efdc20fb89ed20f6b3bc12f592c76
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 13 03:04:35 2020 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Dec 14 16:45:18 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59f1666e

mate-extra/mate-system-monitor: fix quoting for pkg-config

Bug: https://bugs.gentoo.org/756238
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 mate-extra/mate-system-monitor/mate-system-monitor-1.24.0.ebuild | 7 ++++---
 mate-extra/mate-system-monitor/mate-system-monitor-1.24.1.ebuild | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/mate-extra/mate-system-monitor/mate-system-monitor-1.24.0.ebuild 
b/mate-extra/mate-system-monitor/mate-system-monitor-1.24.0.ebuild
index d6a7c0848c4..5634e8c0117 100644
--- a/mate-extra/mate-system-monitor/mate-system-monitor-1.24.0.ebuild
+++ b/mate-extra/mate-system-monitor/mate-system-monitor-1.24.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit mate
+inherit mate toolchain-funcs
 
 if [[ ${PV} != 9999 ]]; then
        KEYWORDS="amd64 ~arm ~arm64 x86"
@@ -51,9 +51,10 @@ src_configure() {
        if use elogind || use systemd; then
                myconf+=( --enable-systemd )
                if use elogind; then
+                       local pkgconfig="$(tc-getPKG_CONFIG)"
                        myconf+=(
-                               SYSTEMD_CFLAGS=`pkg-config --cflags 
"libelogind" 2>/dev/null`
-                               SYSTEMD_LIBS=`pkg-config --libs "libelogind" 
2>/dev/null`
+                               SYSTEMD_CFLAGS="$(${pkgconfig} --cflags 
"libelogind")"
+                               SYSTEMD_LIBS="$(${pkgconfig} --libs 
"libelogind")"
                        )
                fi
        else

diff --git a/mate-extra/mate-system-monitor/mate-system-monitor-1.24.1.ebuild 
b/mate-extra/mate-system-monitor/mate-system-monitor-1.24.1.ebuild
index a489ee3adc3..a031a4ddd4c 100644
--- a/mate-extra/mate-system-monitor/mate-system-monitor-1.24.1.ebuild
+++ b/mate-extra/mate-system-monitor/mate-system-monitor-1.24.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit mate
+inherit mate toolchain-funcs
 
 if [[ ${PV} != 9999 ]]; then
        KEYWORDS="~amd64 ~arm ~arm64 ~x86"
@@ -51,9 +51,10 @@ src_configure() {
        if use elogind || use systemd; then
                myconf+=( --enable-systemd )
                if use elogind; then
+                       local pkgconfig="$(tc-getPKG_CONFIG)"
                        myconf+=(
-                               SYSTEMD_CFLAGS=`pkg-config --cflags 
"libelogind" 2>/dev/null`
-                               SYSTEMD_LIBS=`pkg-config --libs "libelogind" 
2>/dev/null`
+                               SYSTEMD_CFLAGS="$(${pkgconfig} --cflags 
"libelogind")"
+                               SYSTEMD_LIBS="$(${pkgconfig} --libs 
"libelogind")"
                        )
                fi
        else

Reply via email to