Gentoo Archives: gentoo-commits

From: Michael Palimaka <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qt3d/
Date: Tue, 25 Jul 2017 15:09:37
Message-Id: 1500995365.94b5f2eb1a25b873b26cecd8bef84ead8669cb2d.kensington@gentoo
1 commit: 94b5f2eb1a25b873b26cecd8bef84ead8669cb2d
2 Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jul 25 15:07:11 2017 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Tue Jul 25 15:09:25 2017 +0000
6 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=94b5f2eb
7
8 dev-qt/qt3d: 5.9 updates
9
10 Package-Manager: Portage-2.3.6, Repoman-2.3.3
11
12 dev-qt/qt3d/qt3d-5.9.1.ebuild | 6 ++----
13 dev-qt/qt3d/qt3d-5.9.9999.ebuild | 6 ++----
14 dev-qt/qt3d/qt3d-5.9999.ebuild | 6 ++----
15 3 files changed, 6 insertions(+), 12 deletions(-)
16
17 diff --git a/dev-qt/qt3d/qt3d-5.9.1.ebuild b/dev-qt/qt3d/qt3d-5.9.1.ebuild
18 index f3fae18f..be0ee17e 100644
19 --- a/dev-qt/qt3d/qt3d-5.9.1.ebuild
20 +++ b/dev-qt/qt3d/qt3d-5.9.1.ebuild
21 @@ -27,9 +27,7 @@ RDEPEND="${DEPEND}"
22 src_prepare() {
23 rm -r src/3rdparty/assimp/{code,contrib,include} || die
24
25 - qt5-build_src_prepare
26 + qt_use_disable_mod qml quick src/src.pro
27
28 - if ! use qml; then
29 - sed -i -e "/quick3d/s/^/#/" src/src.pro || die
30 - fi
31 + qt5-build_src_prepare
32 }
33
34 diff --git a/dev-qt/qt3d/qt3d-5.9.9999.ebuild b/dev-qt/qt3d/qt3d-5.9.9999.ebuild
35 index f3fae18f..be0ee17e 100644
36 --- a/dev-qt/qt3d/qt3d-5.9.9999.ebuild
37 +++ b/dev-qt/qt3d/qt3d-5.9.9999.ebuild
38 @@ -27,9 +27,7 @@ RDEPEND="${DEPEND}"
39 src_prepare() {
40 rm -r src/3rdparty/assimp/{code,contrib,include} || die
41
42 - qt5-build_src_prepare
43 + qt_use_disable_mod qml quick src/src.pro
44
45 - if ! use qml; then
46 - sed -i -e "/quick3d/s/^/#/" src/src.pro || die
47 - fi
48 + qt5-build_src_prepare
49 }
50
51 diff --git a/dev-qt/qt3d/qt3d-5.9999.ebuild b/dev-qt/qt3d/qt3d-5.9999.ebuild
52 index f3fae18f..be0ee17e 100644
53 --- a/dev-qt/qt3d/qt3d-5.9999.ebuild
54 +++ b/dev-qt/qt3d/qt3d-5.9999.ebuild
55 @@ -27,9 +27,7 @@ RDEPEND="${DEPEND}"
56 src_prepare() {
57 rm -r src/3rdparty/assimp/{code,contrib,include} || die
58
59 - qt5-build_src_prepare
60 + qt_use_disable_mod qml quick src/src.pro
61
62 - if ! use qml; then
63 - sed -i -e "/quick3d/s/^/#/" src/src.pro || die
64 - fi
65 + qt5-build_src_prepare
66 }