[gentoo-commits] repo/gentoo:master commit in: dev-util/meson/

[Mike Gilbert]

commit:     36ed230dfd5c5e1e955bdc5f34c5e5c662c34e46
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 24 22:01:12 2019 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sat Aug 24 22:01:12 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36ed230d

dev-util/meson: unset PKG_CONFIG before running tests

Closes: https://bugs.gentoo.org/687792
Package-Manager: Portage-2.3.71_p6, Repoman-2.3.17_p5
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 dev-util/meson/meson-0.51.1.ebuild | 2 ++
 dev-util/meson/meson-9999.ebuild   | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/dev-util/meson/meson-0.51.1.ebuild b/dev-util/meson/meson-0.51.1.ebuild
index 2cb12abd411..3a13c4ece0a 100644
--- a/dev-util/meson/meson-0.51.1.ebuild
+++ b/dev-util/meson/meson-0.51.1.ebuild
@@ -51,6 +51,8 @@ src_test() {
 	if ${PKG_CONFIG} --exists Qt5Core && ! ${PKG_CONFIG} --exists Qt5Gui; then
 		ewarn "Found Qt5Core but not Qt5Gui; skipping tests"
 	else
+		# https://bugs.gentoo.org/687792
+		unset PKG_CONFIG
 		distutils-r1_src_test
 	fi
 }

diff --git a/dev-util/meson/meson-9999.ebuild b/dev-util/meson/meson-9999.ebuild
index 2e19cffb3b0..782127bd368 100644
--- a/dev-util/meson/meson-9999.ebuild
+++ b/dev-util/meson/meson-9999.ebuild
@@ -51,6 +51,8 @@ src_test() {
 	if ${PKG_CONFIG} --exists Qt5Core && ! ${PKG_CONFIG} --exists Qt5Gui; then
 		ewarn "Found Qt5Core but not Qt5Gui; skipping tests"
 	else
+		# https://bugs.gentoo.org/687792
+		unset PKG_CONFIG
 		distutils-r1_src_test
 	fi
 }