diff options
author | Ben de Groot <yngwin@gentoo.org> | 2009-05-30 19:32:06 +0000 |
---|---|---|
committer | Ben de Groot <yngwin@gentoo.org> | 2009-05-30 19:32:06 +0000 |
commit | cc97810e9dd9529d575073913c9f8a90a54f9611 (patch) | |
tree | e83006ec89ae5c792031c34235abb443e75efe46 /x11-libs/qt-webkit | |
parent | Revert kde useflag addition, as it breaks stable (diff) | |
download | gentoo-2-cc97810e9dd9529d575073913c9f8a90a54f9611.tar.gz gentoo-2-cc97810e9dd9529d575073913c9f8a90a54f9611.tar.bz2 gentoo-2-cc97810e9dd9529d575073913c9f8a90a54f9611.zip |
Revert kde useflag addition, as it breaks stable
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Diffstat (limited to 'x11-libs/qt-webkit')
-rw-r--r-- | x11-libs/qt-webkit/ChangeLog | 5 | ||||
-rw-r--r-- | x11-libs/qt-webkit/qt-webkit-4.5.1.ebuild | 8 |
2 files changed, 8 insertions, 5 deletions
diff --git a/x11-libs/qt-webkit/ChangeLog b/x11-libs/qt-webkit/ChangeLog index 783931ddf87c..ee72f84ac52a 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-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/ChangeLog,v 1.38 2009/05/29 23:18:42 yngwin Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/ChangeLog,v 1.39 2009/05/30 19:32:06 yngwin Exp $ + + 30 May 2009; Ben de Groot <yngwin@gentoo.org> qt-webkit-4.5.1.ebuild: + Revert kde useflag addition, as it breaks stable 29 May 2009; Ben de Groot <yngwin@gentoo.org> qt-webkit-4.5.1.ebuild: Add kde useflag to make dependency calculation easier, bug 270188 diff --git a/x11-libs/qt-webkit/qt-webkit-4.5.1.ebuild b/x11-libs/qt-webkit/qt-webkit-4.5.1.ebuild index 49f1521db394..777c689eee3f 100644 --- a/x11-libs/qt-webkit/qt-webkit-4.5.1.ebuild +++ b/x11-libs/qt-webkit/qt-webkit-4.5.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 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.5.1.ebuild,v 1.6 2009/05/29 23:18:42 yngwin Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.5.1.ebuild,v 1.7 2009/05/30 19:32:06 yngwin Exp $ EAPI="2" inherit qt4-build flag-o-matic @@ -8,12 +8,12 @@ inherit qt4-build flag-o-matic DESCRIPTION="The Webkit module for the Qt toolkit" SLOT="4" KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~mips ppc ~ppc64 -sparc ~x86 ~x86-fbsd" -IUSE="kde" +IUSE="" DEPEND="~x11-libs/qt-core-${PV}[debug=,ssl] ~x11-libs/qt-gui-${PV}[debug=] - || ( ~x11-libs/qt-phonon-${PV}:${SLOT}[debug=] media-sound/phonon ) - kde? ( media-sound/phonon )" + || ( ~x11-libs/qt-phonon-${PV}:${SLOT}[debug=] media-sound/phonon )" +# kde? ( media-sound/phonon )" RDEPEND="${DEPEND}" QT4_TARGET_DIRECTORIES="src/3rdparty/webkit/WebCore tools/designer/src/plugins/qwebview" |