Gentoo Archives: gentoo-commits

From: Mike Gilbert <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/meson/
Date: Sat, 02 Mar 2019 23:39:18
Message-Id: 1551569931.a89525ece37bbabb5e73f122352c973ccf5456db.floppym@gentoo
1 commit: a89525ece37bbabb5e73f122352c973ccf5456db
2 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
3 AuthorDate: Sat Mar 2 23:38:51 2019 +0000
4 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
5 CommitDate: Sat Mar 2 23:38:51 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a89525ec
7
8 dev-util/meson: revert non-working qt tests fix
9
10 Bug: https://bugs.gentoo.org/678664
11 Package-Manager: Portage-2.3.59_p2, Repoman-2.3.12_p67
12 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
13
14 dev-util/meson/meson-0.49.2.ebuild | 5 -----
15 dev-util/meson/meson-9999.ebuild | 5 -----
16 2 files changed, 10 deletions(-)
17
18 diff --git a/dev-util/meson/meson-0.49.2.ebuild b/dev-util/meson/meson-0.49.2.ebuild
19 index 033c61abb64..c7cd92e8d1f 100644
20 --- a/dev-util/meson/meson-0.49.2.ebuild
21 +++ b/dev-util/meson/meson-0.49.2.ebuild
22 @@ -42,11 +42,6 @@ python_prepare_all() {
23 }
24
25 src_test() {
26 - # This is needed because upstream doesn't support installing qtcore
27 - # without qtgui in the test suite.
28 - # https://bugs.gentoo.org/show_bug.cgi?id=678664
29 - has_version 'dev-qt/qtcore' && ! has_version 'dev-qt/qtgui' &&
30 - rm -r "test cases/frameworks/4 qt" || die
31 distutils-r1_src_test
32 }
33
34
35 diff --git a/dev-util/meson/meson-9999.ebuild b/dev-util/meson/meson-9999.ebuild
36 index 033c61abb64..c7cd92e8d1f 100644
37 --- a/dev-util/meson/meson-9999.ebuild
38 +++ b/dev-util/meson/meson-9999.ebuild
39 @@ -42,11 +42,6 @@ python_prepare_all() {
40 }
41
42 src_test() {
43 - # This is needed because upstream doesn't support installing qtcore
44 - # without qtgui in the test suite.
45 - # https://bugs.gentoo.org/show_bug.cgi?id=678664
46 - has_version 'dev-qt/qtcore' && ! has_version 'dev-qt/qtgui' &&
47 - rm -r "test cases/frameworks/4 qt" || die
48 distutils-r1_src_test
49 }