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-dbus
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-dbus')
-rw-r--r--x11-libs/qt-dbus/ChangeLog5
-rw-r--r--x11-libs/qt-dbus/qt-dbus-4.4.0.ebuild6
2 files changed, 8 insertions, 3 deletions
diff --git a/x11-libs/qt-dbus/ChangeLog b/x11-libs/qt-dbus/ChangeLog
index 61974fc2b981..c8d3ec6d1d80 100644
--- a/x11-libs/qt-dbus/ChangeLog
+++ b/x11-libs/qt-dbus/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for x11-libs/qt-dbus
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-dbus/ChangeLog,v 1.9 2008/05/27 13:09:35 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-dbus/ChangeLog,v 1.10 2008/06/13 23:20:45 ingmar Exp $
+
+ 13 Jun 2008; Ingmar Vanhassel <ingmar@gentoo.org> qt-dbus-4.4.0.ebuild:
+ Make all split Qt4 ebuilds block the old monolithic ebuild.
27 May 2008; Raúl Porcel <armin76@gentoo.org> qt-dbus-4.4.0.ebuild:
Add ~alpha/~ia64/~sparc wrt #223557
diff --git a/x11-libs/qt-dbus/qt-dbus-4.4.0.ebuild b/x11-libs/qt-dbus/qt-dbus-4.4.0.ebuild
index d6b3a5837c61..309657370c2c 100644
--- a/x11-libs/qt-dbus/qt-dbus-4.4.0.ebuild
+++ b/x11-libs/qt-dbus/qt-dbus-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-dbus/qt-dbus-4.4.0.ebuild,v 1.4 2008/05/27 13:09:35 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-dbus/qt-dbus-4.4.0.ebuild,v 1.5 2008/06/13 23:20:45 ingmar Exp $
+EAPI="1"
inherit qt4-build
DESCRIPTION="The DBus module for the Qt toolkit."
@@ -16,7 +17,8 @@ IUSE=""
# protocol I don't know if there's value trying to derive it out into a core build
# The library itself, however, only depends on core and xml
DEPEND="~x11-libs/qt-core-${PV}
- >=sys-apps/dbus-1.0.2"
+ >=sys-apps/dbus-1.0.2
+ !<=x11-libs/qt-4.4.0_alpha:${SLOT}"
RDEPEND="${DEPEND}"
QT4_TARGET_DIRECTORIES="