Gentoo Archives: gentoo-commits

From: Davide Pesavento <pesa@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/
Date: Tue, 02 Sep 2014 00:08:55
Message-Id: 1409615748.395fa2b0f99c28da6ebf4c93ae6837927049925d.pesa@gentoo
1 commit: 395fa2b0f99c28da6ebf4c93ae6837927049925d
2 Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
3 AuthorDate: Mon Sep 1 23:55:48 2014 +0000
4 Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
5 CommitDate: Mon Sep 1 23:55:48 2014 +0000
6 URL: http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=395fa2b0
7
8 [dev-qt/qtwebkit:4] Raise minimum deps to ensure correct multilib USE deps.
9
10 Package-Manager: portage-2.2.12-r1
11
12 ---
13 dev-qt/qtwebkit/qtwebkit-4.8.6.ebuild | 10 +++++-----
14 dev-qt/qtwebkit/qtwebkit-4.8.9999.ebuild | 10 +++++-----
15 2 files changed, 10 insertions(+), 10 deletions(-)
16
17 diff --git a/dev-qt/qtwebkit/qtwebkit-4.8.6.ebuild b/dev-qt/qtwebkit/qtwebkit-4.8.6.ebuild
18 index bc6ee6b..5592bbd 100644
19 --- a/dev-qt/qtwebkit/qtwebkit-4.8.6.ebuild
20 +++ b/dev-qt/qtwebkit/qtwebkit-4.8.6.ebuild
21 @@ -18,17 +18,17 @@ IUSE="+gstreamer icu +jit"
22
23 # libxml2[!icu?] is needed for bugs 407315 and 411091
24 DEPEND="
25 - dev-db/sqlite:3[${MULTILIB_USEDEP}]
26 + >=dev-db/sqlite-3.8.3:3[${MULTILIB_USEDEP}]
27 ~dev-qt/qtcore-${PV}[aqua=,debug=,ssl,${MULTILIB_USEDEP}]
28 ~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
29 ~dev-qt/qtxmlpatterns-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
30 - x11-libs/libX11[${MULTILIB_USEDEP}]
31 - x11-libs/libXrender[${MULTILIB_USEDEP}]
32 + >=x11-libs/libX11-1.5.0-r1[${MULTILIB_USEDEP}]
33 + >=x11-libs/libXrender-0.9.7-r1[${MULTILIB_USEDEP}]
34 gstreamer? (
35 dev-libs/glib:2[${MULTILIB_USEDEP}]
36 dev-libs/libxml2:2[!icu?,${MULTILIB_USEDEP}]
37 - >=media-libs/gstreamer-0.10.36:0.10[${MULTILIB_USEDEP}]
38 - >=media-libs/gst-plugins-base-0.10.36:0.10[${MULTILIB_USEDEP}]
39 + >=media-libs/gstreamer-0.10.36-r1:0.10[${MULTILIB_USEDEP}]
40 + >=media-libs/gst-plugins-base-0.10.36-r1:0.10[${MULTILIB_USEDEP}]
41 )
42 icu? ( dev-libs/icu:=[${MULTILIB_USEDEP}] )
43 "
44
45 diff --git a/dev-qt/qtwebkit/qtwebkit-4.8.9999.ebuild b/dev-qt/qtwebkit/qtwebkit-4.8.9999.ebuild
46 index bc6ee6b..5592bbd 100644
47 --- a/dev-qt/qtwebkit/qtwebkit-4.8.9999.ebuild
48 +++ b/dev-qt/qtwebkit/qtwebkit-4.8.9999.ebuild
49 @@ -18,17 +18,17 @@ IUSE="+gstreamer icu +jit"
50
51 # libxml2[!icu?] is needed for bugs 407315 and 411091
52 DEPEND="
53 - dev-db/sqlite:3[${MULTILIB_USEDEP}]
54 + >=dev-db/sqlite-3.8.3:3[${MULTILIB_USEDEP}]
55 ~dev-qt/qtcore-${PV}[aqua=,debug=,ssl,${MULTILIB_USEDEP}]
56 ~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
57 ~dev-qt/qtxmlpatterns-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
58 - x11-libs/libX11[${MULTILIB_USEDEP}]
59 - x11-libs/libXrender[${MULTILIB_USEDEP}]
60 + >=x11-libs/libX11-1.5.0-r1[${MULTILIB_USEDEP}]
61 + >=x11-libs/libXrender-0.9.7-r1[${MULTILIB_USEDEP}]
62 gstreamer? (
63 dev-libs/glib:2[${MULTILIB_USEDEP}]
64 dev-libs/libxml2:2[!icu?,${MULTILIB_USEDEP}]
65 - >=media-libs/gstreamer-0.10.36:0.10[${MULTILIB_USEDEP}]
66 - >=media-libs/gst-plugins-base-0.10.36:0.10[${MULTILIB_USEDEP}]
67 + >=media-libs/gstreamer-0.10.36-r1:0.10[${MULTILIB_USEDEP}]
68 + >=media-libs/gst-plugins-base-0.10.36-r1:0.10[${MULTILIB_USEDEP}]
69 )
70 icu? ( dev-libs/icu:=[${MULTILIB_USEDEP}] )
71 "