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/qtdeclarative/
Date: Thu, 06 Oct 2016 15:23:23
Message-Id: 1475767388.87d35ed276b25d060ec4612b8baccccf1186fc5d.kensington@gentoo
1 commit: 87d35ed276b25d060ec4612b8baccccf1186fc5d
2 Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
3 AuthorDate: Thu Oct 6 15:22:42 2016 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Thu Oct 6 15:23:08 2016 +0000
6 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=87d35ed2
7
8 dev-qt/qtdeclarative: remove blocker introduced by accident
9
10 Package-Manager: portage-2.3.1
11
12 dev-qt/qtdeclarative/qtdeclarative-5.6.9999.ebuild | 7 ++-----
13 1 file changed, 2 insertions(+), 5 deletions(-)
14
15 diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.6.9999.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.6.9999.ebuild
16 index 3df6e0d..c51da86 100644
17 --- a/dev-qt/qtdeclarative/qtdeclarative-5.6.9999.ebuild
18 +++ b/dev-qt/qtdeclarative/qtdeclarative-5.6.9999.ebuild
19 @@ -16,7 +16,7 @@ fi
20 IUSE="gles2 +jit localstorage +widgets xml"
21
22 # qtgui[gles2=] is needed because of bug 504322
23 -COMMON_DEPEND="
24 +RDEPEND="
25 ~dev-qt/qtcore-${PV}
26 ~dev-qt/qtgui-${PV}[gles2=]
27 ~dev-qt/qtnetwork-${PV}
28 @@ -28,12 +28,9 @@ COMMON_DEPEND="
29 ~dev-qt/qtxmlpatterns-${PV}
30 )
31 "
32 -DEPEND="${COMMON_DEPEND}
33 +DEPEND="${RDEPEND}
34 ${PYTHON_DEPS}
35 "
36 -RDEPEND="${COMMON_DEPEND}
37 - !<dev-qt/qtquickcontrols-5.7:5
38 -"
39
40 src_prepare() {
41 use jit || PATCHES+=("${FILESDIR}/${PN}-5.4.2-disable-jit.patch")