commit: 7ad2f7025a011756301858c791f118a4673681a2
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 17 13:48:10 2014 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Mar 17 13:48:10 2014 +0000
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=7ad2f702
[eclass] Raise QT_MINIMAL to latest stable and simplify Qt deps.
---
eclass/kde4-base.eclass | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index 00bcb60..46b267c 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
