summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIngmar Vanhassel <ingmar@gentoo.org>2008-06-13 23:22:22 +0000
committerIngmar Vanhassel <ingmar@gentoo.org>2008-06-13 23:22:22 +0000
commitd50a8a32c17a7aee8989ac9ec21191f7ba792d47 (patch)
treeeaa7a6937085da2bb80e8ad237cfd2e38a210524 /x11-libs
parentMake all split Qt4 ebuilds block the old monolithic ebuild. (diff)
downloadgentoo-2-d50a8a32c17a7aee8989ac9ec21191f7ba792d47.tar.gz
gentoo-2-d50a8a32c17a7aee8989ac9ec21191f7ba792d47.tar.bz2
gentoo-2-d50a8a32c17a7aee8989ac9ec21191f7ba792d47.zip
Make all split Qt4 ebuilds block the old monolithic ebuild.
(Portage version: 2.1.5.4)
Diffstat (limited to 'x11-libs')
-rw-r--r--x11-libs/qt-opengl/ChangeLog5
-rw-r--r--x11-libs/qt-opengl/qt-opengl-4.4.0.ebuild3
2 files changed, 6 insertions, 2 deletions
diff --git a/x11-libs/qt-opengl/ChangeLog b/x11-libs/qt-opengl/ChangeLog
index afb7d594af75..adfae99c1380 100644
--- a/x11-libs/qt-opengl/ChangeLog
+++ b/x11-libs/qt-opengl/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for x11-libs/qt-opengl
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-opengl/ChangeLog,v 1.9 2008/05/30 04:11:29 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-opengl/ChangeLog,v 1.10 2008/06/13 23:22:22 ingmar Exp $
+
+ 13 Jun 2008; Ingmar Vanhassel <ingmar@gentoo.org> qt-opengl-4.4.0.ebuild:
+ Make all split Qt4 ebuilds block the old monolithic ebuild.
30 May 2008; Jeroen Roovers <jer@gentoo.org> qt-opengl-4.4.0.ebuild:
Marked ~hppa (bug #223557).
diff --git a/x11-libs/qt-opengl/qt-opengl-4.4.0.ebuild b/x11-libs/qt-opengl/qt-opengl-4.4.0.ebuild
index 03811c7c654a..224e759986bb 100644
--- a/x11-libs/qt-opengl/qt-opengl-4.4.0.ebuild
+++ b/x11-libs/qt-opengl/qt-opengl-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-opengl/qt-opengl-4.4.0.ebuild,v 1.4 2008/05/30 04:11:29 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-opengl/qt-opengl-4.4.0.ebuild,v 1.5 2008/06/13 23:22:22 ingmar Exp $
EAPI="1"
inherit qt4-build
@@ -14,6 +14,7 @@ KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="+qt3support"
DEPEND="~x11-libs/qt-gui-${PV}
+ !<=x11-libs/qt-4.4.0_alpha:${SLOT}
virtual/opengl
virtual/glu"
RDEPEND="${DEPEND}"