gentoo resync : 12.05.2022

8 files changed, 31 insertions, 190 deletions

diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index 6b3dc4eb8438..224b14513659 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -1,13 +1,9 @@
-AUX meson-0.60.2-check-module-linking.patch 1015 BLAKE2B 63fdee7a00743c9b28a88283f9b626c7705099c5a90b3f573bee3cc2125449a537e4d6ecac9c57160fb05753f94fef5fe134dcbdc0e9de4f1dfeaa65173031fd SHA512 08c472b1a182f380e4bf13e69bb45a287f3df0d92993bc841a1d90a74f479e033a95d9c06cf441ce33651b5e3ba32f8a8a86b2cb94238a6f9cb5936345056522
 AUX meson-0.61.4-fix-gtk-update-icon-cache-check.patch 1390 BLAKE2B 0f7f6c1c9b2c2ec9c7f10f553d7451f64fafaf397df243aed8b81c7604099bfef5ee2f582569dec80af62da4248c2a4d3c8ff634ea3042d44032b922f46106e5 SHA512 f25ed9e4b1d5e57c1ee913fec05a9b537d6f5830a69f55179bbf4604dd05624535434592ac853399895a31cac7d2a60e4b2d7d339f0c3fa48aa530777ed77dcb
-AUX meson-mcompile-treat-load-average-as-a-float.patch 852 BLAKE2B 669dfe4e4cff53b8b3bba66f1098fcf06e4d2f387c83f007d4d92e4b1a7f46b9eeea3d4f2273ddd402e7131b84885f81be8f815be59d8e34539bb13f7ef87f8e SHA512 7d455b1a8d21730bfbeedb5be5ca70978a3ed2af3e7d55a7f0cbf5405b6f7935c7c1f3961dbc09e7e42b3bfc7f2752316458e8627d7846b230638d5b2d6450e7
-DIST meson-0.59.4.tar.gz 1953211 BLAKE2B e8699c274e60708e798ab7a57e096e606ba1552d4062a909610f5a8db8d27b864a9b9f01f32d68f65e0dcc2a75add7916617861edcc6058fc44c312e7a56048c SHA512 e02d13a4af592078c4dc34a1d9531e49d3b99f0996bcc2b04d9b9b446f0f7748fc2ccfeb9e6090a9fd2d95ad06594c770f90a87fafd9b1974117f24c5fb491e3
-DIST meson-0.60.2.tar.gz 1998788 BLAKE2B 7fa59723e49f34a016eb3692ac63ebf38b5a7db1bfada522cc317c8500e29107783ef386a1312aa1ed73018fd93b22c6ee81fa9511e80e85461469d0129581ff SHA512 96064b49a479f81d6def321b4c3c24073b307c3ecd917ab2be2020fedf102da119b205e3d88b6fd1cd13af38949600abc72d4172967d651c78d2e9011276cb80
 DIST meson-0.60.3.tar.gz 2001124 BLAKE2B f66fb29d309f5dea9c0b1934e8b5dfc2b33586e06c6a2d616798d5724216035fe03a3f9b1c6976546d5d5c069734357d61a92aa43de01161cf1fe4297a1d1f2e SHA512 0aa6ef71c20cd899ebb0b202c6319e093e1df1c39fa58c94a1bb479efe630213272127346eab589948898d115d02d64f4bdffd892fbb9700884c1edf2dc6c6dc
 DIST meson-0.61.4.tar.gz 2014265 BLAKE2B 09e6630f8a1786143832007c929e652e743bbf11d1b55ffcf366dd127779f61e8fd4a8be5cb23fa6bc949938a3bd0222f19ad1fec883f0ca6ed8cd6d4bbd6aef SHA512 005f52c678016f3183d36b69254cceab16c682d2389ec9cae41889955a13cb643aea03f2247f3473cfeca9c4dd6c1cc8b9b8b9906dc324c08016c72380a5f195
-EBUILD meson-0.59.4.ebuild 2757 BLAKE2B b64fd553319824c0c05059a41b639b4b8260196f17c4bca32cb587ff9775d11d97cf75e5634b1880105920169a950abc777946182a6c54da04d7f108cb406d1e SHA512 d43bb51ac9853a6820b40c2e683882982aea1ed8334d000459c7fa46607d56c8737651e48f313062345c68f1ceba66197e46f6d7d5bddfc08693ad242403ba54
-EBUILD meson-0.60.2-r1.ebuild 2756 BLAKE2B e3c00db9be838a448e1b63ab7987db64590375fd3ff6c714ffc883af5982a8ca109d56a3f5539808e90022091e83735baf804f0b75f9929b5b323080abad69ed SHA512 ab5ced255a8ab04475ee1f68c4b3b10769d17332c5f8cf3a9b4ba42d4ac5d2ea9664ba99e9638bc05fcb9f4d8201ca91a5032a1567e630347bf15d2ecd63d77a
-EBUILD meson-0.60.3.ebuild 2680 BLAKE2B 7391a09710a966e2dc274797c3c6a2c8bef5dc489c3c5d8f597db8fa10f8f76ed8021409991274f68f4de0556ab8d435480508a6dcec287a5e999bcf39c76098 SHA512 4275793478b7cb7e58eb216b3230de2592aff2ed42da138dcddeb313e9e9b1008c3e0e28dc4a63aaa88bbad8eb9d933ae95f93d6d8c243ff037c253001a557f3
-EBUILD meson-0.61.4-r2.ebuild 2857 BLAKE2B d31eb59cd36dcc3cc39e2bf789d6027b49ee92a8d631240e7d3ffccc866be153bd89e9e53839000c404476c99dca594eb8591a95083d61d384b13ac2c3708829 SHA512 d0792868e3a523e3b62b59389fce05548f65e1ace4967c29c98aac8c339a3de854dc15e414e06f1983e75240abf101ff6113e143459c8636f707dd4f3f946341
-EBUILD meson-9999.ebuild 2786 BLAKE2B c04410806610bde0b884b152a4ea7b3650eb3e1fa03863982f697f06d7807c22506cd7ae92cd3529fa796b8227f81b04129b4e5b6f32ff224a7d56bee671c25e SHA512 f07d0a9985d4bf092f5f6881b965226632c68053623e1893366a7ed6a6402cdf00836e76176462274759da2bf62d14ad66680647b743d2507351fe18b16dfeda
+DIST meson-0.62.1.tar.gz 2034805 BLAKE2B 6370b6bf07e6e875f6a0cabbf6284f97c89a4653b62c4765f365fbf083e607853094aa37d5dc97042f086ca1db569b2f8dabd14b37f674615d3b9d267d3d0d0f SHA512 52d2d06c27275b824046164403908be8555faed33aef862940623cef3e4f84b4c9b8d461c291642e6ea2c0db30b2ec4a99f46bde5d54945a26c1dbeca219cc32
+EBUILD meson-0.60.3.ebuild 2678 BLAKE2B 1b602648e5c7eb7be683acf70c759499f95e3a777b42dd1e0b7d26edfa9c3b468b7b2d9a1962240f14efbb569654e1d937da3a505c8e0f68f2700c1d5ad5f2f6 SHA512 2aaf4796facbe63668cf4ae702d0a1a13cd56de0760ea803acbd48d491a2eaa76839b8a43dd1b077a9aaac8a7da416fa7de840107479b261fdaa2895a44d99c5
+EBUILD meson-0.61.4-r2.ebuild 2922 BLAKE2B 3115d61f8d90cb67c60acdd5812fee622b2b21c1e287123ae228e7e29ba3712c0e318c4706b8dc4bef2d0f02dd68e4bb2ab093c6a3587a32685b253d1fef3892 SHA512 7591aedaae7442e2bc94ebb321eb1e35a261eb7dabe61c7d3169b8acfcc140c3f031624b2ed181aa1c4ee037739acf0f06f437a74e590a5c326b499306264983
+EBUILD meson-0.62.1.ebuild 2857 BLAKE2B e1fe1482234d090c12b995d6bcf56336c299d2759d6f0e1e487598021a5c551a175d04ddd29f29fd516ce87137cf32aa614dedbedd304a207622e1a79ec700f9 SHA512 29cf1f26c8c2449f9aba2ee2d554514df0f1244be206255702edd20a5a91f89ae01c88006c55890dee7812ed08828f4a2600358e3248eb8752972b536fca556a
+EBUILD meson-9999.ebuild 2857 BLAKE2B e1fe1482234d090c12b995d6bcf56336c299d2759d6f0e1e487598021a5c551a175d04ddd29f29fd516ce87137cf32aa614dedbedd304a207622e1a79ec700f9 SHA512 29cf1f26c8c2449f9aba2ee2d554514df0f1244be206255702edd20a5a91f89ae01c88006c55890dee7812ed08828f4a2600358e3248eb8752972b536fca556a
 MISC metadata.xml 424 BLAKE2B 9e8cee51a5a6699950f1f4fc203732032afa7b36229bd4117a2b2164761ba0375bbc2c6001a81b48b67171f4b9850e948f6da229cffb9649acc0f514a675c922 SHA512 266b94131a352512bfac11c3db7ff840a6d050eb71c814a5223c9d3bb6f1be30506c9188ef1725a2b435c0b44923aa3efcea5f3d041f0acce0141dfe37ba66c4
diff --git a/dev-util/meson/files/meson-0.60.2-check-module-linking.patch b/dev-util/meson/files/meson-0.60.2-check-module-linking.patch
deleted file mode 100644
index b192a454c28a..000000000000
--- a/dev-util/meson/files/meson-0.60.2-check-module-linking.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From df7ddc7ec19886ccdc433f42379c04c1df793565 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Thu, 25 Nov 2021 21:19:32 -0500
-Subject: [PATCH] Remove premature return in build.check_module_linking()
-
-We want to loop over all link_targets to update
-backwards_compat_want_soname if necessary.
-
-Fixes: ec9bdc6edb17d1d9da5df2d6525025242c119f3a
----
- mesonbuild/build.py | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/mesonbuild/build.py b/mesonbuild/build.py
-index ad18a7f6a..263942556 100644
---- a/mesonbuild/build.py
-+++ b/mesonbuild/build.py
-@@ -1601,7 +1601,6 @@ You probably should put it in link_with instead.''')
-                             '\n             '
-                             'use shared_libary() with `override_options: [\'b_lundef=false\']` instead.')
-                     link_target.backwards_compat_want_soname = True
--                return
- 
- class Generator(HoldableObject):
-     def __init__(self, exe: T.Union['Executable', programs.ExternalProgram],
--- 
-2.34.0
-
diff --git a/dev-util/meson/files/meson-mcompile-treat-load-average-as-a-float.patch b/dev-util/meson/files/meson-mcompile-treat-load-average-as-a-float.patch
deleted file mode 100644
index 9effb382be22..000000000000
--- a/dev-util/meson/files/meson-mcompile-treat-load-average-as-a-float.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From bb07c850c77e2bd07e1261547bc6b1e6b024f31d Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Fri, 27 Aug 2021 10:17:14 -0400
-Subject: [PATCH] mcompile: treat load-average as a float
-
-`ninja -l` accepts a double. We should do the same.
-
-Bug: https://bugs.gentoo.org/810655
----
- mesonbuild/mcompile.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/mesonbuild/mcompile.py b/mesonbuild/mcompile.py
-index bb7ecae9b..e20485c76 100644
---- a/mesonbuild/mcompile.py
-+++ b/mesonbuild/mcompile.py
-@@ -305,7 +305,7 @@ def add_arguments(parser: 'argparse.ArgumentParser') -> None:
-         '-l', '--load-average',
-         action='store',
-         default=0,
--        type=int,
-+        type=float,
-         help='The system load average to try to maintain (if supported).'
-     )
-     parser.add_argument(
--- 
-2.33.0
-
diff --git a/dev-util/meson/meson-0.59.4.ebuild b/dev-util/meson/meson-0.59.4.ebuild
deleted file mode 100644
index 0b7b12ebfbb7..000000000000
--- a/dev-util/meson/meson-0.59.4.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 2016-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/mesonbuild/meson"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-inherit distutils-r1 toolchain-funcs
-
-DESCRIPTION="Open source build system"
-HOMEPAGE="https://mesonbuild.com/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	test? (
-		dev-libs/glib:2
-		dev-libs/gobject-introspection
-		dev-util/ninja
-		dev-vcs/git
-		sys-libs/zlib[static-libs(+)]
-		virtual/pkgconfig
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/meson-mcompile-treat-load-average-as-a-float.patch"
-)
-
-python_prepare_all() {
-	local disable_unittests=(
-		# ASAN and sandbox both want control over LD_PRELOAD
-		# https://bugs.gentoo.org/673016
-		-e 's/test_generate_gir_with_address_sanitizer/_&/'
-
-		# ASAN is unsupported on some targets
-		# https://bugs.gentoo.org/692822
-		-e 's/test_pch_with_address_sanitizer/_&/'
-
-		# https://github.com/mesonbuild/meson/issues/7203
-		-e 's/test_templates/_&/'
-
-		# Broken due to python2 wrapper
-		-e 's/test_python_module/_&/'
-	)
-
-	sed -i "${disable_unittests[@]}" run_unittests.py || die
-
-	# Broken due to python2 script created by python_wrapper_setup
-	rm -r "test cases/frameworks/1 boost" || die
-
-	distutils-r1_python_prepare_all
-}
-
-src_test() {
-	tc-export PKG_CONFIG
-	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
-}
-
-python_test() {
-	(
-		# test_meson_installed
-		unset PYTHONDONTWRITEBYTECODE
-
-		# test_cross_file_system_paths
-		unset XDG_DATA_HOME
-
-		# 'test cases/unit/73 summary' expects 80 columns
-		export COLUMNS=80
-
-		# If JAVA_HOME is not set, meson looks for javac in PATH.
-		# If javac is in /usr/bin, meson assumes /usr/include is a valid
-		# JDK include path. Setting JAVA_HOME works around this broken
-		# autodection. If no JDK is installed, we should end up with an empty
-		# value in JAVA_HOME, and the tests should get skipped.
-		export JAVA_HOME=$(java-config -O 2>/dev/null)
-
-		${EPYTHON} -u run_tests.py
-	) || die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	insinto /usr/share/vim/vimfiles
-	doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax}
-	insinto /usr/share/zsh/site-functions
-	doins data/shell-completions/zsh/_meson
-}
diff --git a/dev-util/meson/meson-0.60.3.ebuild b/dev-util/meson/meson-0.60.3.ebuild
index 55dd71fc8240..72eb2e56f912 100644
--- a/dev-util/meson/meson-0.60.3.ebuild
+++ b/dev-util/meson/meson-0.60.3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-PYTHON_COMPAT=( python3_{7,8,9,10} )
+PYTHON_COMPAT=( python3_{8,9,10} )
 
 if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/mesonbuild/meson"
diff --git a/dev-util/meson/meson-0.61.4-r2.ebuild b/dev-util/meson/meson-0.61.4-r2.ebuild
index 107a474f40dd..1f5c0a0da628 100644
--- a/dev-util/meson/meson-0.61.4-r2.ebuild
+++ b/dev-util/meson/meson-0.61.4-r2.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 inherit bash-completion-r1 distutils-r1 toolchain-funcs
@@ -93,7 +93,8 @@ python_test() {
 		# value in JAVA_HOME, and the tests should get skipped.
 		export JAVA_HOME=$(java-config -O 2>/dev/null)
 
-		${EPYTHON} -u run_tests.py
+		# Call python3 instead of EPYTHON to satisfy test_meson_uninstalled.
+		python3 run_tests.py
 	) || die "Testing failed with ${EPYTHON}"
 }
 
diff --git a/dev-util/meson/meson-0.60.2-r1.ebuild b/dev-util/meson/meson-0.62.1.ebuild
index dae5370ccd0e..9743e5a1839f 100644
--- a/dev-util/meson/meson-0.60.2-r1.ebuild
+++ b/dev-util/meson/meson-0.62.1.ebuild
@@ -1,18 +1,20 @@
-# Copyright 2016-2021 Gentoo Authors
+# Copyright 2016-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+PYTHON_COMPAT=( python3_{8,9,10} )
+DISTUTILS_USE_PEP517=setuptools
 
 if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/mesonbuild/meson"
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
-inherit distutils-r1 toolchain-funcs
+inherit bash-completion-r1 distutils-r1 toolchain-funcs
 
 DESCRIPTION="Open source build system"
 HOMEPAGE="https://mesonbuild.com/"
@@ -33,10 +35,6 @@ DEPEND="
 	)
 "
 
-PATCHES=(
-	"${FILESDIR}/meson-0.60.2-check-module-linking.patch"
-)
-
 python_prepare_all() {
 	local disable_unittests=(
 		# ASAN and sandbox both want control over LD_PRELOAD
@@ -54,7 +52,7 @@ python_prepare_all() {
 		-e 's/test_python_module/_&/'
 	)
 
-	sed -i "${disable_unittests[@]}" run_unittests.py || die
+	sed -i "${disable_unittests[@]}" unittests/*.py || die
 
 	# Broken due to python2 script created by python_wrapper_setup
 	rm -r "test cases/frameworks/1 boost" || die
@@ -67,8 +65,6 @@ 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
 }
@@ -78,6 +74,9 @@ python_test() {
 		# test_meson_installed
 		unset PYTHONDONTWRITEBYTECODE
 
+		# https://bugs.gentoo.org/687792
+		unset PKG_CONFIG
+
 		# test_cross_file_system_paths
 		unset XDG_DATA_HOME
 
@@ -91,7 +90,8 @@ python_test() {
 		# value in JAVA_HOME, and the tests should get skipped.
 		export JAVA_HOME=$(java-config -O 2>/dev/null)
 
-		${EPYTHON} -u run_tests.py
+		# Call python3 instead of EPYTHON to satisfy test_meson_uninstalled.
+		python3 run_tests.py
 	) || die "Testing failed with ${EPYTHON}"
 }
 
@@ -100,6 +100,9 @@ python_install_all() {
 
 	insinto /usr/share/vim/vimfiles
 	doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax}
+
 	insinto /usr/share/zsh/site-functions
 	doins data/shell-completions/zsh/_meson
+
+	dobashcomp data/shell-completions/bash/meson
 }
diff --git a/dev-util/meson/meson-9999.ebuild b/dev-util/meson/meson-9999.ebuild
index 2d8599c3973b..9743e5a1839f 100644
--- a/dev-util/meson/meson-9999.ebuild
+++ b/dev-util/meson/meson-9999.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 inherit bash-completion-r1 distutils-r1 toolchain-funcs
@@ -52,7 +52,7 @@ python_prepare_all() {
 		-e 's/test_python_module/_&/'
 	)
 
-	sed -i "${disable_unittests[@]}" run_unittests.py || die
+	sed -i "${disable_unittests[@]}" unittests/*.py || die
 
 	# Broken due to python2 script created by python_wrapper_setup
 	rm -r "test cases/frameworks/1 boost" || die
@@ -65,8 +65,6 @@ 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
 }
@@ -76,6 +74,9 @@ python_test() {
 		# test_meson_installed
 		unset PYTHONDONTWRITEBYTECODE
 
+		# https://bugs.gentoo.org/687792
+		unset PKG_CONFIG
+
 		# test_cross_file_system_paths
 		unset XDG_DATA_HOME
 
@@ -89,7 +90,8 @@ python_test() {
 		# value in JAVA_HOME, and the tests should get skipped.
 		export JAVA_HOME=$(java-config -O 2>/dev/null)
 
-		${EPYTHON} -u run_tests.py
+		# Call python3 instead of EPYTHON to satisfy test_meson_uninstalled.
+		python3 run_tests.py
 	) || die "Testing failed with ${EPYTHON}"
 }