public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Adam Feldman" <np-hardass@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/gentoo-mate:master commit in: mate-extra/mate-system-monitor/
Date: Wed,  9 Jun 2021 02:05:30 +0000 (UTC)	[thread overview]
Message-ID: <1623204293.6be829cfbd7d85b80ddf85bdd6b08ebbeced4d8b.np-hardass@gentoo> (raw)

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


             reply	other threads:[~2021-06-09  2:05 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-09  2:05 Adam Feldman [this message]
  -- strict thread matches above, loose matches on Subject: below --
2021-06-10 15:36 [gentoo-commits] proj/gentoo-mate:master commit in: mate-extra/mate-system-monitor/ Adam Feldman
2021-06-10 15:36 Adam Feldman
2021-05-23 20:07 Adam Feldman
2020-09-02  5:55 Adam Feldman
2020-04-09 22:52 Adam Feldman
2018-02-11 13:49 Ettore Di Giacinto
2017-09-27  3:18 NP Hardass
2017-03-16 16:08 [gentoo-commits] proj/gentoo-mate:1.18-bump " Ettore Di Giacinto
2017-03-16 16:17 ` [gentoo-commits] proj/gentoo-mate:master " Ettore Di Giacinto
2016-11-29 19:49 Ettore Di Giacinto
2016-08-13 18:49 NP Hardass
2016-06-17 17:39 NP Hardass
2016-03-26  2:37 NP Hardass
2015-07-23  5:19 NP Hardass

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1623204293.6be829cfbd7d85b80ddf85bdd6b08ebbeced4d8b.np-hardass@gentoo \
    --to=np-hardass@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox