diff options
| author |   Markos Chandras <hwoarang@gentoo.org> | 2010-04-02 10:01:25 +0000 |
|---|---|---|
| committer | Markos Chandras <hwoarang@gentoo.org> | 2010-04-02 10:01:25 +0000 |
| commit | 4f7e7c6ded37eab88d18f7ae7f6385d10d33323f (patch) | |
| tree | 13947281f7d1dc0ee67f7e43ddf62228c4de35e6 /x11-libs | |
| parent | Fix my previous commit (diff) | |
| download | gentoo-2-4f7e7c6ded37eab88d18f7ae7f6385d10d33323f.tar.gz gentoo-2-4f7e7c6ded37eab88d18f7ae7f6385d10d33323f.tar.bz2 gentoo-2-4f7e7c6ded37eab88d18f7ae7f6385d10d33323f.zip | |
Adjust phonon dependencies
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'x11-libs')
| -rw-r--r-- | x11-libs/qt-webkit/ChangeLog | 5 | ||||
| -rw-r--r-- | x11-libs/qt-webkit/qt-webkit-4.6.2.ebuild | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/x11-libs/qt-webkit/ChangeLog b/x11-libs/qt-webkit/ChangeLog index 8348938d23f4..b07c80ab22af 100644 --- a/x11-libs/qt-webkit/ChangeLog +++ b/x11-libs/qt-webkit/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for x11-libs/qt-webkit # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/ChangeLog,v 1.83 2010/03/03 11:58:05 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/ChangeLog,v 1.84 2010/04/02 10:01:25 hwoarang Exp $ + + 02 Apr 2010; Markos Chandras <hwoarang@gentoo.org> qt-webkit-4.6.2.ebuild: + Adjust phonon dependencies 03 Mar 2010; Christian Faulhammer <fauli@gentoo.org> qt-webkit-4.6.2.ebuild: diff --git a/x11-libs/qt-webkit/qt-webkit-4.6.2.ebuild b/x11-libs/qt-webkit/qt-webkit-4.6.2.ebuild index 2006c1136570..064f44ae16e5 100644 --- a/x11-libs/qt-webkit/qt-webkit-4.6.2.ebuild +++ b/x11-libs/qt-webkit/qt-webkit-4.6.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $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 $ +# $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 $ EAPI="2" inherit qt4-build @@ -16,7 +16,7 @@ DEPEND="~x11-libs/qt-core-${PV}[aqua=,debug=,ssl] ~x11-libs/qt-xmlpatterns-${PV}[aqua=,debug=] !kde? ( || ( ~x11-libs/qt-phonon-${PV}:${SLOT}[aqua=,dbus,debug=] media-sound/phonon[aqua=] ) ) - kde? ( media-sound/phonon[aqua=] )" + kde? ( || ( media-sound/phonon[aqua=] ~x11-libs/qt-phonon-${PV}:${SLOT}[aqua=,dbus=,debug] ) )" RDEPEND="${DEPEND}" QT4_TARGET_DIRECTORIES="src/3rdparty/webkit/WebCore tools/designer/src/plugins/qwebview" |