summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIngmar Vanhassel <ingmar@gentoo.org>2008-03-05 16:40:05 +0000
committerIngmar Vanhassel <ingmar@gentoo.org>2008-03-05 16:40:05 +0000
commitfb6b4f283a8f26293541348571add42d9f384489 (patch)
treea725fb126816d9c1224ac110d32036fe59c04c38 /x11-libs/qt
parentVersion bump to 2.0.6_pre11 for testing. (diff)
downloadgentoo-2-fb6b4f283a8f26293541348571add42d9f384489.tar.gz
gentoo-2-fb6b4f283a8f26293541348571add42d9f384489.tar.bz2
gentoo-2-fb6b4f283a8f26293541348571add42d9f384489.zip
=x11-libs/qt-4.3*:4 needs to block split Qt ebuilds.
(Portage version: 2.1.4.4)
Diffstat (limited to 'x11-libs/qt')
-rw-r--r--x11-libs/qt/ChangeLog6
-rw-r--r--x11-libs/qt/qt-4.3.2-r1.ebuild5
-rw-r--r--x11-libs/qt/qt-4.3.3.ebuild3
-rw-r--r--x11-libs/qt/qt-4.3.4.ebuild3
4 files changed, 12 insertions, 5 deletions
diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog
index d8f695766192..ad8947000aad 100644
--- a/x11-libs/qt/ChangeLog
+++ b/x11-libs/qt/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-libs/qt
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.518 2008/03/04 06:11:37 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.519 2008/03/05 16:40:05 ingmar Exp $
+
+ 05 Mar 2008; Ingmar Vanhassel <ingmar@gentoo.org> qt-4.3.2-r1.ebuild,
+ qt-4.3.3.ebuild, qt-4.3.4.ebuild:
+ =x11-libs/qt-4.3*:4 needs to block split Qt ebuilds.
04 Mar 2008; Jeroen Roovers <jer@gentoo.org> qt-4.4.0_rc1.ebuild:
Marked ~hppa for no good reason.
diff --git a/x11-libs/qt/qt-4.3.2-r1.ebuild b/x11-libs/qt/qt-4.3.2-r1.ebuild
index 5cd77fcaae20..d2d1cb98d7ea 100644
--- a/x11-libs/qt/qt-4.3.2-r1.ebuild
+++ b/x11-libs/qt/qt-4.3.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.3.2-r1.ebuild,v 1.7 2007/12/10 13:12:35 rbu Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.3.2-r1.ebuild,v 1.8 2008/03/05 16:40:05 ingmar Exp $
inherit eutils flag-o-matic toolchain-funcs multilib
@@ -23,6 +23,7 @@ RDEPEND="x11-libs/libXrandr
x11-libs/libXcursor
x11-libs/libXfont
x11-libs/libSM
+ !x11-libs/qt-core
xinerama? ( x11-libs/libXinerama )
media-libs/fontconfig
>=media-libs/freetype-2
diff --git a/x11-libs/qt/qt-4.3.3.ebuild b/x11-libs/qt/qt-4.3.3.ebuild
index 0cd8a43f570a..844c9f5f9bc8 100644
--- a/x11-libs/qt/qt-4.3.3.ebuild
+++ b/x11-libs/qt/qt-4.3.3.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/qt-4.3.3.ebuild,v 1.3 2008/01/07 13:25:54 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.3.3.ebuild,v 1.4 2008/03/05 16:40:05 ingmar Exp $
inherit eutils flag-o-matic toolchain-funcs multilib
@@ -23,6 +23,7 @@ RDEPEND="x11-libs/libXrandr
x11-libs/libXcursor
x11-libs/libXfont
x11-libs/libSM
+ !x11-libs/qt-core
xinerama? ( x11-libs/libXinerama )
media-libs/fontconfig
>=media-libs/freetype-2
diff --git a/x11-libs/qt/qt-4.3.4.ebuild b/x11-libs/qt/qt-4.3.4.ebuild
index a83c88adbd29..59624660b250 100644
--- a/x11-libs/qt/qt-4.3.4.ebuild
+++ b/x11-libs/qt/qt-4.3.4.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/qt-4.3.4.ebuild,v 1.1 2008/02/25 14:24:44 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.3.4.ebuild,v 1.2 2008/03/05 16:40:05 ingmar Exp $
inherit eutils flag-o-matic toolchain-funcs multilib
@@ -23,6 +23,7 @@ RDEPEND="x11-libs/libXrandr
x11-libs/libXcursor
x11-libs/libXfont
x11-libs/libSM
+ !x11-libs/qt-core
xinerama? ( x11-libs/libXinerama )
media-libs/fontconfig
>=media-libs/freetype-2