diff options
| author |   Johannes Huber <johu@gentoo.org> | 2013-07-23 19:55:30 +0000 |
|---|---|---|
| committer | Johannes Huber <johu@gentoo.org> | 2013-07-23 19:55:30 +0000 |
| commit | 7a97f395ff2887a55cd43eb634bfca546b862b95 (patch) | |
| tree | 7d161b12f5b746b7c64d8dce632bd06f9b37e839 /eclass | |
| parent | Stable on amd64 and x86, wrt bug #474188 (diff) | |
| download | gentoo-2-7a97f395ff2887a55cd43eb634bfca546b862b95.tar.gz gentoo-2-7a97f395ff2887a55cd43eb634bfca546b862b95.tar.bz2 gentoo-2-7a97f395ff2887a55cd43eb634bfca546b862b95.zip | |
Handle dev-qt/desinger split from dev-qt/gui, see bug #477934.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/kde4-base.eclass | 7 |
2 files changed, 9 insertions, 3 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 22d4e8a94f73..efe76d67f465 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.889 2013/07/23 13:48:00 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.890 2013/07/23 19:55:30 johu Exp $ + + 23 Jul 2013; Johannes Huber <johu@gentoo.org> kde4-base.eclass: + Handle dev-qt/desinger split from dev-qt/gui, see bug #477934. 23 Jul 2013; Michał Górny <mgorny@gentoo.org> bash-completion-r1.eclass: Fix typo. diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass index dcb09c151b4e..222c0cff1bb6 100644 --- a/eclass/kde4-base.eclass +++ b/eclass/kde4-base.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.126 2013/07/10 03:46:48 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.127 2013/07/23 19:55:30 johu Exp $ # @ECLASS: kde4-base.eclass # @MAINTAINER: @@ -281,7 +281,10 @@ kdecommondepend=" >=dev-qt/qt3support-${QT_MINIMAL}:4[accessibility] >=dev-qt/qtcore-${QT_MINIMAL}:4[qt3support,ssl] >=dev-qt/qtdbus-${QT_MINIMAL}:4 - >=dev-qt/qtgui-${QT_MINIMAL}:4[accessibility,dbus(+)] + || ( + ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) + <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] + ) >=dev-qt/qtscript-${QT_MINIMAL}:4 >=dev-qt/qtsql-${QT_MINIMAL}:4[qt3support] >=dev-qt/qtsvg-${QT_MINIMAL}:4 |