diff options
| author | Michael Palimaka <kensington@gentoo.org> | 2014-03-18 00:48:10 +1100 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2014-03-18 00:48:10 +1100 |
| commit | 7ad2f7025a011756301858c791f118a4673681a2 (patch) | |
| tree | 9512abc603d509b0d5b7575c812afd5f7f25a12a /eclass/kde4-base.eclass | |
| parent | f14bcdb22030f0a048073ca92181985f16bb880d (diff) | |
| download | kde-7ad2f7025a011756301858c791f118a4673681a2.tar.gz kde-7ad2f7025a011756301858c791f118a4673681a2.tar.bz2 kde-7ad2f7025a011756301858c791f118a4673681a2.zip | |
[eclass] Raise QT_MINIMAL to latest stable and simplify Qt deps.
Diffstat (limited to 'eclass/kde4-base.eclass')
| -rw-r--r-- | eclass/kde4-base.eclass | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass index 00bcb608945..46b267c30bc 100644 --- a/eclass/kde4-base.eclass +++ b/eclass/kde4-base.eclass @@ -200,7 +200,7 @@ esac # @ECLASS-VARIABLE: QT_MINIMAL # @DESCRIPTION: # Determine version of qt we enforce as minimal for the package. -QT_MINIMAL="${QT_MINIMAL:-4.8.0}" +QT_MINIMAL="${QT_MINIMAL:-4.8.5}" # Declarative dependencies qtdeclarativedepend=" @@ -288,10 +288,8 @@ 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-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) - <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] - ) + >=dev-qt/designer-${QT_MINIMAL}:4[-phonon] + >=dev-qt/qtgui-${QT_MINIMAL}:4[accessibility,dbus(+)] >=dev-qt/qtscript-${QT_MINIMAL}:4 >=dev-qt/qtsql-${QT_MINIMAL}:4[qt3support] >=dev-qt/qtsvg-${QT_MINIMAL}:4 |