diff options
| author |   Ingmar Vanhassel <ingmar@gentoo.org> | 2008-06-13 23:20:12 +0000 |
|---|---|---|
| committer | Ingmar Vanhassel <ingmar@gentoo.org> | 2008-06-13 23:20:12 +0000 |
| commit | ba0082f22165b4ac3db2c3d564605a4822f8ec16 (patch) | |
| tree | eedd3a2aa33d735665119def279742f3a6e30206 /x11-libs | |
| parent | whitespace (diff) | |
| download | gentoo-2-ba0082f22165b4ac3db2c3d564605a4822f8ec16.tar.gz gentoo-2-ba0082f22165b4ac3db2c3d564605a4822f8ec16.tar.bz2 gentoo-2-ba0082f22165b4ac3db2c3d564605a4822f8ec16.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-assistant/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-libs/qt-assistant/qt-assistant-4.4.0-r1.ebuild | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/x11-libs/qt-assistant/ChangeLog b/x11-libs/qt-assistant/ChangeLog index 0f7b73480d75..60dc9116153f 100644 --- a/x11-libs/qt-assistant/ChangeLog +++ b/x11-libs/qt-assistant/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/qt-assistant # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/ChangeLog,v 1.11 2008/06/13 23:00:03 ingmar Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/ChangeLog,v 1.12 2008/06/13 23:20:12 ingmar Exp $ + + 13 Jun 2008; Ingmar Vanhassel <ingmar@gentoo.org> + qt-assistant-4.4.0-r1.ebuild: + Make all split Qt4 ebuilds block the old monolithic ebuild. 13 Jun 2008; Ingmar Vanhassel <ingmar@gentoo.org> -qt-assistant-4.4.0.ebuild: diff --git a/x11-libs/qt-assistant/qt-assistant-4.4.0-r1.ebuild b/x11-libs/qt-assistant/qt-assistant-4.4.0-r1.ebuild index 7fc77a1d43a7..6e4f110a59ae 100644 --- a/x11-libs/qt-assistant/qt-assistant-4.4.0-r1.ebuild +++ b/x11-libs/qt-assistant/qt-assistant-4.4.0-r1.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-assistant/qt-assistant-4.4.0-r1.ebuild,v 1.3 2008/05/30 04:30:57 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/qt-assistant-4.4.0-r1.ebuild,v 1.4 2008/06/13 23:20:12 ingmar Exp $ +EAPI="1" inherit qt4-build DESCRIPTION="The assistant help module for the Qt toolkit." @@ -13,7 +14,8 @@ KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" IUSE="" DEPEND="~x11-libs/qt-gui-${PV} - ~x11-libs/qt-sql-${PV}" + ~x11-libs/qt-sql-${PV} + !<=x11-libs/qt-4.4.0_alpha:${SLOT}" RDEPEND="${DEPEND}" # Pixeltool isn't really assistant related, but it relies on |