commit: dde63a0857af89546bbd63a6603c9e7ce206d76a
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 14 16:38:28 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Sep 14 16:38:28 2019 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=dde63a08
kde5.eclass: KDE_DESIGNERPLUGIN min KF5 is set by kde5-functions.eclass
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
eclass/kde5.eclass | 29 ++++++++++++++---------------
1 file changed, 14 insertions(+), 15 deletions(-)
diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 3ab9220914..21ed9d2134 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -177,6 +177,20 @@ case ${KDE_SUBSLOT} in
;;
esac
+case ${KDE_AUTODEPS} in
+ false) ;;
+ *)
+ BDEPEND+=" $(add_frameworks_dep extra-cmake-modules)"
+ RDEPEND+=" >=kde-frameworks/kf-env-4"
+ COMMONDEPEND+=" $(add_qt_dep qtcore)"
+
+ # all packages need breeze/oxygen icons for basic iconset, bug
#564838
+ if [[ ${PN} != breeze-icons && ${PN} != oxygen-icons ]]; then
+ RDEPEND+=" || ( $(add_frameworks_dep breeze-icons)
kde-frameworks/oxygen-icons:* )"
+ fi
+ ;;
+esac
+
case ${KDE_DESIGNERPLUGIN} in
false) ;;
*)
@@ -185,7 +199,6 @@ case ${KDE_DESIGNERPLUGIN} in
BDEPEND+=" designer? ( $(add_qt_dep designer) )"
else
if [[ ${KDE_BUILD_TYPE} = live && ${PV} != 19.08* ]];
then
- FRAMEWORKS_MINIMAL="5.62.0"
BDEPEND+=" designer? ( $(add_qt_dep designer) )"
else
BDEPEND+=" designer? ( $(add_frameworks_dep
kdesignerplugin) )"
@@ -193,20 +206,6 @@ case ${KDE_DESIGNERPLUGIN} in
fi
esac
-case ${KDE_AUTODEPS} in
- false) ;;
- *)
- BDEPEND+=" $(add_frameworks_dep extra-cmake-modules)"
- RDEPEND+=" >=kde-frameworks/kf-env-4"
- COMMONDEPEND+=" $(add_qt_dep qtcore)"
-
- # all packages need breeze/oxygen icons for basic iconset, bug
#564838
- if [[ ${PN} != breeze-icons && ${PN} != oxygen-icons ]]; then
- RDEPEND+=" || ( $(add_frameworks_dep breeze-icons)
kde-frameworks/oxygen-icons:* )"
- fi
- ;;
-esac
-
case ${KDE_DEBUG} in
false) ;;
*)
