From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1075300-garchives=archives.gentoo.org@lists.gentoo.org>
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 3B626138334
for <garchives@archives.gentoo.org>; Sat, 2 Mar 2019 23:12:19 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 3B08EE084E;
Sat, 2 Mar 2019 23:12:18 +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 0FF1BE084E
for <gentoo-commits@lists.gentoo.org>; Sat, 2 Mar 2019 23:12:18 +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 65D3C335D12
for <gentoo-commits@lists.gentoo.org>; Sat, 2 Mar 2019 23:12:15 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 67F4A517
for <gentoo-commits@lists.gentoo.org>; Sat, 2 Mar 2019 23:12:13 +0000 (UTC)
From: "William Hubbs" <williamh@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" <williamh@gentoo.org>
Message-ID: <1551568306.01f3512592d5830c0d1442a4df3043cec905fc02.williamh@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/meson/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-util/meson/meson-9999.ebuild
X-VCS-Directories: dev-util/meson/
X-VCS-Committer: williamh
X-VCS-Committer-Name: William Hubbs
X-VCS-Revision: 01f3512592d5830c0d1442a4df3043cec905fc02
X-VCS-Branch: master
Date: Sat, 2 Mar 2019 23:12:13 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: c17a3563-b88b-4f07-94e8-5e57604f26f2
X-Archives-Hash: 8433b4c074646920c8ece1fd3f4f696a
commit: 01f3512592d5830c0d1442a4df3043cec905fc02
Author: William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 2 23:11:39 2019 +0000
Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sat Mar 2 23:11:46 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01f35125
dev-util/meson: sync live
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: William Hubbs <williamh <AT> gentoo.org>
dev-util/meson/meson-9999.ebuild | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/dev-util/meson/meson-9999.ebuild b/dev-util/meson/meson-9999.ebuild
index 6149ebc1ee5..31d9ff7f79e 100644
--- 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
}