Gentoo Archives: gentoo-commits

From: William Hubbs <williamh@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:21:48
Message-Id: 1551568890.098740100ba7034cc9d8849e9c6d642dc9e2372e.williamh@gentoo
1 commit: 098740100ba7034cc9d8849e9c6d642dc9e2372e
2 Author: William Hubbs <williamh <AT> gentoo <DOT> org>
3 AuthorDate: Sat Mar 2 23:20:40 2019 +0000
4 Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
5 CommitDate: Sat Mar 2 23:21:30 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09874010
7
8 dev-util/meson: die if unable to remove qt framework
9
10 Package-Manager: Portage-2.3.62, Repoman-2.3.12
11 Signed-off-by: William Hubbs <williamh <AT> gentoo.org>
12
13 dev-util/meson/meson-0.49.2.ebuild | 2 +-
14 dev-util/meson/meson-9999.ebuild | 2 +-
15 2 files changed, 2 insertions(+), 2 deletions(-)
16
17 diff --git a/dev-util/meson/meson-0.49.2.ebuild b/dev-util/meson/meson-0.49.2.ebuild
18 index 31d9ff7f79e..033c61abb64 100644
19 --- a/dev-util/meson/meson-0.49.2.ebuild
20 +++ b/dev-util/meson/meson-0.49.2.ebuild
21 @@ -46,7 +46,7 @@ src_test() {
22 # without qtgui in the test suite.
23 # https://bugs.gentoo.org/show_bug.cgi?id=678664
24 has_version 'dev-qt/qtcore' && ! has_version 'dev-qt/qtgui' &&
25 - rm -rf "test cases/frameworks/4 qt"
26 + rm -r "test cases/frameworks/4 qt" || die
27 distutils-r1_src_test
28 }
29
30
31 diff --git a/dev-util/meson/meson-9999.ebuild b/dev-util/meson/meson-9999.ebuild
32 index 31d9ff7f79e..033c61abb64 100644
33 --- a/dev-util/meson/meson-9999.ebuild
34 +++ b/dev-util/meson/meson-9999.ebuild
35 @@ -46,7 +46,7 @@ src_test() {
36 # without qtgui in the test suite.
37 # https://bugs.gentoo.org/show_bug.cgi?id=678664
38 has_version 'dev-qt/qtcore' && ! has_version 'dev-qt/qtgui' &&
39 - rm -rf "test cases/frameworks/4 qt"
40 + rm -r "test cases/frameworks/4 qt" || die
41 distutils-r1_src_test
42 }