From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 297DE13835B for ; Wed, 9 Jun 2021 02:05:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 35DF9E0843; Wed, 9 Jun 2021 02:05:39 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7F0F9E0830 for ; Wed, 9 Jun 2021 02:05:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4AED8340C50 for ; Wed, 9 Jun 2021 02:05:34 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BC7007AA for ; Wed, 9 Jun 2021 02:05:30 +0000 (UTC) From: "Adam Feldman" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Adam Feldman" Message-ID: <1623204293.6be829cfbd7d85b80ddf85bdd6b08ebbeced4d8b.np-hardass@gentoo> Subject: [gentoo-commits] proj/gentoo-mate:master commit in: mate-extra/mate-system-monitor/ X-VCS-Repository: proj/gentoo-mate X-VCS-Files: mate-extra/mate-system-monitor/mate-system-monitor-1.24.0.ebuild mate-extra/mate-system-monitor/mate-system-monitor-1.24.1.ebuild X-VCS-Directories: mate-extra/mate-system-monitor/ X-VCS-Committer: np-hardass X-VCS-Committer-Name: Adam Feldman X-VCS-Revision: 6be829cfbd7d85b80ddf85bdd6b08ebbeced4d8b X-VCS-Branch: master Date: Wed, 9 Jun 2021 02:05:30 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e5775ddc-6b60-4ecc-9d1f-141e2ce474cb X-Archives-Hash: 086e38ae820a7a0b462149724df0b16a commit: 6be829cfbd7d85b80ddf85bdd6b08ebbeced4d8b Author: Adam Feldman gentoo org> AuthorDate: Wed Jun 9 01:39:59 2021 +0000 Commit: Adam Feldman gentoo 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 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