diff options
| author |   Caleb Tennis <caleb@gentoo.org> | 2006-11-03 14:33:21 +0000 |
|---|---|---|
| committer | Caleb Tennis <caleb@gentoo.org> | 2006-11-03 14:33:21 +0000 |
| commit | aa719f69b7d2ac37e6fcc094048fbe6c63f9cfd7 (patch) | |
| tree | d40390f1205a5534dede68a6b4479e398780e39a /x11-libs | |
| parent | New SPARC tool wrt #150211, thanks to Friedrich Oslage (diff) | |
| download | gentoo-2-aa719f69b7d2ac37e6fcc094048fbe6c63f9cfd7.tar.gz gentoo-2-aa719f69b7d2ac37e6fcc094048fbe6c63f9cfd7.tar.bz2 gentoo-2-aa719f69b7d2ac37e6fcc094048fbe6c63f9cfd7.zip | |
Add a dbus build error for people who have the qt4 bindings already on their system
(Portage version: 2.1.2_rc1-r1)
Diffstat (limited to 'x11-libs')
| -rw-r--r-- | x11-libs/qt/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-libs/qt/qt-4.2.1.ebuild | 10 |
2 files changed, 14 insertions, 2 deletions
diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog index 64e944e515d3..87b5f8d63d1f 100644 --- a/x11-libs/qt/ChangeLog +++ b/x11-libs/qt/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/qt # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.382 2006/11/02 13:54:50 caleb Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.383 2006/11/03 14:33:21 caleb Exp $ + + 03 Nov 2006; Caleb Tennis <caleb@gentoo.org> qt-4.2.1.ebuild: + Add a dbus build error for people who have the qt4 bindings already on their + system 02 Nov 2006; Caleb Tennis <caleb@gentoo.org> qt-4.2.1.ebuild: removing dbus flag from Qt until the dbus herd unmasks it diff --git a/x11-libs/qt/qt-4.2.1.ebuild b/x11-libs/qt/qt-4.2.1.ebuild index 0de1fde71751..dae817b8478e 100644 --- a/x11-libs/qt/qt-4.2.1.ebuild +++ b/x11-libs/qt/qt-4.2.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.2.1.ebuild,v 1.6 2006/11/02 13:54:50 caleb Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.2.1.ebuild,v 1.7 2006/11/03 14:33:21 caleb Exp $ inherit eutils flag-o-matic toolchain-funcs multilib @@ -61,6 +61,14 @@ pkg_setup() { QTDEMOSDIR=${QTDATADIR}/demos PLATFORM=$(qt_mkspecs_dir) + + if built_with_use =sys-apps/dbus-0.62* qt4; then + eerror "You have built the dbus-0.62 bindings installed with Qt4 support." + eerror "Unfortunately, Qt-4.2 is not supported for these bindings. For now," + eerror "you will need to package.mask =x11-libs/qt-4.2*. Soon, we hope to provide" + eerror "built in dbus support for Qt-4.2. See Gentoo bug #150888 for details" + die + fi } qt_use() { |