diff options
| author |   Ingmar Vanhassel <ingmar@gentoo.org> | 2008-06-13 23:26:43 +0000 |
|---|---|---|
| committer | Ingmar Vanhassel <ingmar@gentoo.org> | 2008-06-13 23:26:43 +0000 |
| commit | 4c1c229d12d8021478286af5e521733d30ef67a7 (patch) | |
| tree | dbef78b64b24fda3f6ae5c9e8eea8109ceb74118 /x11-libs/qt-webkit | |
| parent | Patch not used, remove. (diff) | |
| download | historical-4c1c229d12d8021478286af5e521733d30ef67a7.tar.gz historical-4c1c229d12d8021478286af5e521733d30ef67a7.tar.bz2 historical-4c1c229d12d8021478286af5e521733d30ef67a7.zip | |
Make all split Qt4 ebuilds block the old monolithic ebuild.
Package-Manager: portage-2.1.5.4
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.4.0.ebuild | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/x11-libs/qt-webkit/ChangeLog b/x11-libs/qt-webkit/ChangeLog index c221a2c49ecb..cd48b756a51a 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-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/ChangeLog,v 1.8 2008/05/30 05:37:02 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/ChangeLog,v 1.9 2008/06/13 23:26:11 ingmar Exp $ + + 13 Jun 2008; Ingmar Vanhassel <ingmar@gentoo.org> qt-webkit-4.4.0.ebuild: + Make all split Qt4 ebuilds block the old monolithic ebuild. 30 May 2008; Jeroen Roovers <jer@gentoo.org> qt-webkit-4.4.0.ebuild: Marked ~hppa (bug #223557). diff --git a/x11-libs/qt-webkit/qt-webkit-4.4.0.ebuild b/x11-libs/qt-webkit/qt-webkit-4.4.0.ebuild index 2f4e1e4da839..e20e90becaad 100644 --- a/x11-libs/qt-webkit/qt-webkit-4.4.0.ebuild +++ b/x11-libs/qt-webkit/qt-webkit-4.4.0.ebuild @@ -1,7 +1,8 @@ # Copyright 1999-2008 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.4.0.ebuild,v 1.3 2008/05/30 05:37:02 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.4.0.ebuild,v 1.4 2008/06/13 23:26:10 ingmar Exp $ +EAPI="1" inherit qt4-build DESCRIPTION="The Webkit module for the Qt toolkit." @@ -12,7 +13,8 @@ SLOT="4" KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86" IUSE="" -DEPEND="~x11-libs/qt-gui-${PV}" +DEPEND="~x11-libs/qt-gui-${PV} + !<=x11-libs/qt-4.4.0_alpha:${SLOT}" RDEPEND="${DEPEND}" QT4_TARGET_DIRECTORIES="src/3rdparty/webkit/WebCore tools/designer/src/plugins/qwebview" |