commit:     355e91320a3614993d1b0f349e90e0ce9bded8a6
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Apr  7 05:15:15 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Apr 13 00:26:32 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=355e9132

x11-terms/xterm: call pkg-config via toolchain-funcs.eclass helper

This ensures we call the correct pkg-config in e.g. cross.

Package-Manager: Portage-3.0.14-prefix, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>

 x11-terms/xterm/xterm-351.ebuild | 4 ++--
 x11-terms/xterm/xterm-363.ebuild | 4 ++--
 x11-terms/xterm/xterm-365.ebuild | 4 ++--
 x11-terms/xterm/xterm-366.ebuild | 4 ++--
 x11-terms/xterm/xterm-367.ebuild | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/x11-terms/xterm/xterm-351.ebuild b/x11-terms/xterm/xterm-351.ebuild
index 33587fde888..f20d7b47463 100644
--- a/x11-terms/xterm/xterm-351.ebuild
+++ b/x11-terms/xterm/xterm-351.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit desktop flag-o-matic multilib
+inherit desktop flag-o-matic multilib toolchain-funcs
 
 DESCRIPTION="Terminal Emulator for X Windows"
 HOMEPAGE="https://invisible-island.net/xterm/";
@@ -47,7 +47,7 @@ src_configure() {
        # Workaround for ncurses[tinfo] until upstream fixes their buildsystem 
using
        # something sane like pkg-config or ncurses5-config and stops guessing 
libs
        # Everything gets linked against ncurses anyways, so don't shout
-       append-libs $(pkg-config --libs ncurses)
+       append-libs $($(tc-getPKG_CONFIG) --libs ncurses)
 
        local myeconfargs=(
                --disable-full-tgetent

diff --git a/x11-terms/xterm/xterm-363.ebuild b/x11-terms/xterm/xterm-363.ebuild
index 0102172747d..adcd2ef1972 100644
--- a/x11-terms/xterm/xterm-363.ebuild
+++ b/x11-terms/xterm/xterm-363.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit desktop flag-o-matic
+inherit desktop flag-o-matic toolchain-funcs
 
 DESCRIPTION="Terminal Emulator for X Windows"
 HOMEPAGE="https://invisible-island.net/xterm/";
@@ -47,7 +47,7 @@ src_configure() {
        # Workaround for ncurses[tinfo] until upstream fixes their buildsystem 
using
        # something sane like pkg-config or ncurses5-config and stops guessing 
libs
        # Everything gets linked against ncurses anyways, so don't shout
-       append-libs $(pkg-config --libs ncurses)
+       append-libs $($(tc-getPKG_CONFIG) --libs ncurses)
 
        local myeconfargs=(
                --disable-full-tgetent

diff --git a/x11-terms/xterm/xterm-365.ebuild b/x11-terms/xterm/xterm-365.ebuild
index 0102172747d..adcd2ef1972 100644
--- a/x11-terms/xterm/xterm-365.ebuild
+++ b/x11-terms/xterm/xterm-365.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit desktop flag-o-matic
+inherit desktop flag-o-matic toolchain-funcs
 
 DESCRIPTION="Terminal Emulator for X Windows"
 HOMEPAGE="https://invisible-island.net/xterm/";
@@ -47,7 +47,7 @@ src_configure() {
        # Workaround for ncurses[tinfo] until upstream fixes their buildsystem 
using
        # something sane like pkg-config or ncurses5-config and stops guessing 
libs
        # Everything gets linked against ncurses anyways, so don't shout
-       append-libs $(pkg-config --libs ncurses)
+       append-libs $($(tc-getPKG_CONFIG) --libs ncurses)
 
        local myeconfargs=(
                --disable-full-tgetent

diff --git a/x11-terms/xterm/xterm-366.ebuild b/x11-terms/xterm/xterm-366.ebuild
index 75ae0d33810..ea017d32b72 100644
--- a/x11-terms/xterm/xterm-366.ebuild
+++ b/x11-terms/xterm/xterm-366.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit desktop flag-o-matic
+inherit desktop flag-o-matic toolchain-funcs
 
 DESCRIPTION="Terminal Emulator for X Windows"
 HOMEPAGE="https://invisible-island.net/xterm/";
@@ -47,7 +47,7 @@ src_configure() {
        # Workaround for ncurses[tinfo] until upstream fixes their buildsystem 
using
        # something sane like pkg-config or ncurses5-config and stops guessing 
libs
        # Everything gets linked against ncurses anyways, so don't shout
-       append-libs $(pkg-config --libs ncurses)
+       append-libs $($(tc-getPKG_CONFIG) --libs ncurses)
 
        local myeconfargs=(
                --disable-full-tgetent

diff --git a/x11-terms/xterm/xterm-367.ebuild b/x11-terms/xterm/xterm-367.ebuild
index 0102172747d..adcd2ef1972 100644
--- a/x11-terms/xterm/xterm-367.ebuild
+++ b/x11-terms/xterm/xterm-367.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit desktop flag-o-matic
+inherit desktop flag-o-matic toolchain-funcs
 
 DESCRIPTION="Terminal Emulator for X Windows"
 HOMEPAGE="https://invisible-island.net/xterm/";
@@ -47,7 +47,7 @@ src_configure() {
        # Workaround for ncurses[tinfo] until upstream fixes their buildsystem 
using
        # something sane like pkg-config or ncurses5-config and stops guessing 
libs
        # Everything gets linked against ncurses anyways, so don't shout
-       append-libs $(pkg-config --libs ncurses)
+       append-libs $($(tc-getPKG_CONFIG) --libs ncurses)
 
        local myeconfargs=(
                --disable-full-tgetent

Reply via email to