diff options
| author |   Caleb Tennis <caleb@gentoo.org> | 2006-11-06 13:54:50 +0000 |
|---|---|---|
| committer | Caleb Tennis <caleb@gentoo.org> | 2006-11-06 13:54:50 +0000 |
| commit | af31adf45a0aa67399a3fc58ddb9a1340f43dc05 (patch) | |
| tree | 302e85f151a410328d3d48356f75126fb5c53a96 /x11-libs | |
| parent | Add ~amd64 keyword --- Bug #153132 --- xetex and xelatex are working very well (diff) | |
| download | gentoo-2-af31adf45a0aa67399a3fc58ddb9a1340f43dc05.tar.gz gentoo-2-af31adf45a0aa67399a3fc58ddb9a1340f43dc05.tar.bz2 gentoo-2-af31adf45a0aa67399a3fc58ddb9a1340f43dc05.zip | |
update the check for the qt4 bindings based on comments from bug #150888
(Portage version: 2.1.2_rc1-r1)
Diffstat (limited to 'x11-libs')
| -rw-r--r-- | x11-libs/qt/ChangeLog | 5 | ||||
| -rw-r--r-- | x11-libs/qt/qt-4.2.1.ebuild | 18 |
2 files changed, 15 insertions, 8 deletions
diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog index 7339797c90e9..cd01beeb51e8 100644 --- a/x11-libs/qt/ChangeLog +++ b/x11-libs/qt/ChangeLog @@ -1,6 +1,9 @@ # 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.384 2006/11/06 10:59:32 eroyf Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.385 2006/11/06 13:54:50 caleb Exp $ + + 06 Nov 2006; Caleb Tennis <caleb@gentoo.org> qt-4.2.1.ebuild: + update the check for the qt4 bindings based on comments from bug #150888 06 Nov 2006; Alexander H. Færøy <eroyf@gentoo.org> qt-3.3.6-r4.ebuild: Stable on Alpha. Bug #151838 diff --git a/x11-libs/qt/qt-4.2.1.ebuild b/x11-libs/qt/qt-4.2.1.ebuild index dae817b8478e..f5c5f191bb28 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.7 2006/11/03 14:33:21 caleb Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.2.1.ebuild,v 1.8 2006/11/06 13:54:50 caleb Exp $ inherit eutils flag-o-matic toolchain-funcs multilib @@ -62,12 +62,16 @@ pkg_setup() { 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 + # If the user current has qt4 bindings for dbus, we can't let them upgrade since they aren't + # yet supported for Qt4.2 + if [ ! -z $(best version =sys-apps/dbus-0.62*) ]; then + 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 fi } |