commit:     aa25bd36a7b854346d694de10e39b0905cdf1f2c
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 13 02:58:26 2020 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Dec 14 16:45:17 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa25bd36

gnome-base/gnome-flashback: fix quoting for pkg-config

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

 gnome-base/gnome-flashback/gnome-flashback-3.36.4.ebuild | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/gnome-base/gnome-flashback/gnome-flashback-3.36.4.ebuild 
b/gnome-base/gnome-flashback/gnome-flashback-3.36.4.ebuild
index 033c47fe341..b0eb921b559 100644
--- a/gnome-base/gnome-flashback/gnome-flashback-3.36.4.ebuild
+++ b/gnome-base/gnome-flashback/gnome-flashback-3.36.4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit gnome2
+inherit gnome2 toolchain-funcs
 
 DESCRIPTION="GNOME Flashback session"
 HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-flashback/";
@@ -71,11 +71,12 @@ src_configure() {
        fi
 
        if use elogind; then
+               local pkgconfig="$(tc-getPKG_CONFIG)"
                myconf+=(
-                       DESKTOP_CFLAGS=`pkg-config --cflags glib-2.0 gio-2.0 
gio-unix-2.0 gnome-desktop-3.0 gtk+-3.0 libelogind x11 2>/dev/null`
-                       DESKTOP_LIBS=`pkg-config --libs glib-2.0 gio-2.0 
gio-unix-2.0 gnome-desktop-3.0 gtk+-3.0 libelogind x11 2>/dev/null`
-                       SCREENSAVER_CFLAGS=`pkg-config --cflags gdm 
gio-unix-2.0 glib-2.0 gnome-desktop-3.0 gtk+-3.0 libelogind xxf86vm 2>/dev/null`
-                       SCREENSAVER_LIBS=`pkg-config --libs gdm gio-unix-2.0 
glib-2.0 gnome-desktop-3.0 gtk+-3.0 libelogind xxf86vm 2>/dev/null`
+                       DESKTOP_CFLAGS="$(${pkgconfig} --cflags glib-2.0 
gio-2.0 gio-unix-2.0 gnome-desktop-3.0 gtk+-3.0 libelogind x11)"
+                       DESKTOP_LIBS="$(${pkgconfig} --libs glib-2.0 gio-2.0 
gio-unix-2.0 gnome-desktop-3.0 gtk+-3.0 libelogind x11)"
+                       SCREENSAVER_CFLAGS="$(${pkgconfig} --cflags gdm 
gio-unix-2.0 glib-2.0 gnome-desktop-3.0 gtk+-3.0 libelogind xxf86vm)"
+                       SCREENSAVER_LIBS="$(${pkgconfig} --libs gdm 
gio-unix-2.0 glib-2.0 gnome-desktop-3.0 gtk+-3.0 libelogind xxf86vm)"
                )
        fi
 

Reply via email to