dev-util/meson: sync live

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: William Hubbs <williamh@gentoo.org>

diff --git a/dev-util/meson/meson-9999.ebuild b/dev-util/meson/meson-9999.ebuild
index 6149ebc1ee51c5d235f01f8974731ed084965f4b..31d9ff7f79ec82e172ccfc6542f9f12bd284c5d0 100644 (file)
--- a/dev-util/meson/meson-9999.ebuild
+++ b/dev-util/meson/meson-9999.ebuild
@@ -42,12 +42,11 @@ python_prepare_all() {
 }
 
 src_test() {
-       if tc-is-gcc; then
-               # LTO fails for static libs because the bfd plugin in missing.
-               # Remove this workaround after sys-devel/gcc-config-2.0 is stable.
-               # https://bugs.gentoo.org/672706
-               tc-getPROG AR gcc-ar >/dev/null
-       fi
+       # This is needed because upstream doesn't support installing qtcore
+       # without qtgui in the test suite.
+       # https://bugs.gentoo.org/show_bug.cgi?id=678664
+       has_version 'dev-qt/qtcore' && ! has_version 'dev-qt/qtgui' &&
+               rm -rf "test cases/frameworks/4 qt"
        distutils-r1_src_test
 }