Gentoo Archives: gentoo-commits

From: "Markos Chandras (hwoarang)" <hwoarang@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-libs/qt-webkit: ChangeLog qt-webkit-4.6.2.ebuild
Date: Fri, 02 Apr 2010 10:17:47
Message-Id: E1Nxdgr-0002AM-A8@stork.gentoo.org
1 hwoarang 10/04/02 10:01:25
2
3 Modified: ChangeLog qt-webkit-4.6.2.ebuild
4 Log:
5 Adjust phonon dependencies
6 (Portage version: 2.2_rc67/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.84 x11-libs/qt-webkit/ChangeLog
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-webkit/ChangeLog?rev=1.84&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-webkit/ChangeLog?rev=1.84&content-type=text/plain
13 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-webkit/ChangeLog?r1=1.83&r2=1.84
14
15 Index: ChangeLog
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/ChangeLog,v
18 retrieving revision 1.83
19 retrieving revision 1.84
20 diff -u -r1.83 -r1.84
21 --- ChangeLog 3 Mar 2010 11:58:05 -0000 1.83
22 +++ ChangeLog 2 Apr 2010 10:01:25 -0000 1.84
23 @@ -1,6 +1,9 @@
24 # ChangeLog for x11-libs/qt-webkit
25 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
26 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/ChangeLog,v 1.83 2010/03/03 11:58:05 fauli Exp $
27 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/ChangeLog,v 1.84 2010/04/02 10:01:25 hwoarang Exp $
28 +
29 + 02 Apr 2010; Markos Chandras <hwoarang@g.o> qt-webkit-4.6.2.ebuild:
30 + Adjust phonon dependencies
31
32 03 Mar 2010; Christian Faulhammer <fauli@g.o>
33 qt-webkit-4.6.2.ebuild:
34
35
36
37 1.4 x11-libs/qt-webkit/qt-webkit-4.6.2.ebuild
38
39 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.6.2.ebuild?rev=1.4&view=markup
40 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.6.2.ebuild?rev=1.4&content-type=text/plain
41 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.6.2.ebuild?r1=1.3&r2=1.4
42
43 Index: qt-webkit-4.6.2.ebuild
44 ===================================================================
45 RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.6.2.ebuild,v
46 retrieving revision 1.3
47 retrieving revision 1.4
48 diff -u -r1.3 -r1.4
49 --- qt-webkit-4.6.2.ebuild 3 Mar 2010 11:58:05 -0000 1.3
50 +++ qt-webkit-4.6.2.ebuild 2 Apr 2010 10:01:25 -0000 1.4
51 @@ -1,6 +1,6 @@
52 # Copyright 1999-2010 Gentoo Foundation
53 # Distributed under the terms of the GNU General Public License v2
54 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.6.2.ebuild,v 1.3 2010/03/03 11:58:05 fauli Exp $
55 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.6.2.ebuild,v 1.4 2010/04/02 10:01:25 hwoarang Exp $
56
57 EAPI="2"
58 inherit qt4-build
59 @@ -16,7 +16,7 @@
60 ~x11-libs/qt-xmlpatterns-${PV}[aqua=,debug=]
61 !kde? ( || ( ~x11-libs/qt-phonon-${PV}:${SLOT}[aqua=,dbus,debug=]
62 media-sound/phonon[aqua=] ) )
63 - kde? ( media-sound/phonon[aqua=] )"
64 + kde? ( || ( media-sound/phonon[aqua=] ~x11-libs/qt-phonon-${PV}:${SLOT}[aqua=,dbus=,debug] ) )"
65 RDEPEND="${DEPEND}"
66
67 QT4_TARGET_DIRECTORIES="src/3rdparty/webkit/WebCore tools/designer/src/plugins/qwebview"