commit: 6be829cfbd7d85b80ddf85bdd6b08ebbeced4d8b
Author: Adam Feldman <NP-Hardass <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 9 01:39:59 2021 +0000
Commit: Adam Feldman <np-hardass <AT> gentoo <DOT> org>
CommitDate: Wed Jun 9 02:04:53 2021 +0000
URL: https://gitweb.gentoo.org/proj/gentoo-mate.git/commit/?id=6be829cf
mate-extra/mate-system-monitor: Sync with ::gentoo
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Adam Feldman <NP-Hardass <AT> gentoo.org>
mate-extra/mate-system-monitor/mate-system-monitor-1.24.0.ebuild | 9 +++++----
mate-extra/mate-system-monitor/mate-system-monitor-1.24.1.ebuild | 9 +++++----
2 files changed, 10 insertions(+), 8 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 d6a7c08..d95368b 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
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
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 a489ee3..69e584e 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
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
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