summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIngmar Vanhassel <ingmar@gentoo.org>2008-06-13 23:26:43 +0000
committerIngmar Vanhassel <ingmar@gentoo.org>2008-06-13 23:26:43 +0000
commit4c1c229d12d8021478286af5e521733d30ef67a7 (patch)
treedbef78b64b24fda3f6ae5c9e8eea8109ceb74118 /x11-libs/qt-gui
parentPatch not used, remove. (diff)
downloadhistorical-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-gui')
-rw-r--r--x11-libs/qt-gui/ChangeLog5
-rw-r--r--x11-libs/qt-gui/qt-gui-4.4.0.ebuild3
2 files changed, 6 insertions, 2 deletions
diff --git a/x11-libs/qt-gui/ChangeLog b/x11-libs/qt-gui/ChangeLog
index ac760ef23d6d..af703dad65d9 100644
--- a/x11-libs/qt-gui/ChangeLog
+++ b/x11-libs/qt-gui/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for x11-libs/qt-gui
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.9 2008/05/30 03:51:43 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.10 2008/06/13 23:21:49 ingmar Exp $
+
+ 13 Jun 2008; Ingmar Vanhassel <ingmar@gentoo.org> qt-gui-4.4.0.ebuild:
+ Make all split Qt4 ebuilds block the old monolithic ebuild.
30 May 2008; Jeroen Roovers <jer@gentoo.org> qt-gui-4.4.0.ebuild:
Marked ~hppa (bug #223557).
diff --git a/x11-libs/qt-gui/qt-gui-4.4.0.ebuild b/x11-libs/qt-gui/qt-gui-4.4.0.ebuild
index ff3056b455b6..5286ddb75c03 100644
--- a/x11-libs/qt-gui/qt-gui-4.4.0.ebuild
+++ b/x11-libs/qt-gui/qt-gui-4.4.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.4.0.ebuild,v 1.4 2008/05/30 03:51:43 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.4.0.ebuild,v 1.5 2008/06/13 23:21:49 ingmar Exp $
EAPI="1"
inherit eutils qt4-build
@@ -16,6 +16,7 @@ IUSE_INPUT_DEVICES="input_devices_wacom"
IUSE="+accessibility cups dbus debug glib mng nas nis tiff +qt3support xinerama ${IUSE_INPUT_DEVICES}"
RDEPEND="
+ !<=x11-libs/qt-4.4.0_alpha:${SLOT}
media-libs/fontconfig
>=media-libs/freetype-2
media-libs/jpeg