commit: ed6084d902979c53477f2084f9c292e0553b97a5
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 11 15:30:48 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Mar 15 22:26:51 2020 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=ed6084d9
ecm.eclass: Drop kde5.eclass support
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
eclass/ecm.eclass | 53 ++++++++++++++---------------------------------------
1 file changed, 14 insertions(+), 39 deletions(-)
diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass
index 35cb767344..a125162fb2 100644
--- a/eclass/ecm.eclass
+++ b/eclass/ecm.eclass
@@ -173,17 +173,10 @@ case ${ECM_NONGUI} in
true) ;;
false)
# gui applications need breeze or oxygen for basic iconset, bug
#564838
- if [[ -n ${_KDE5_ECLASS} ]] ; then
- RDEPEND+=" || (
- >=kde-frameworks/breeze-icons-${KFMIN}:${KFSLOT}
- kde-frameworks/oxygen-icons:*
- )"
- else
- RDEPEND+=" || (
- kde-frameworks/breeze-icons:*
- kde-frameworks/oxygen-icons:*
- )"
- fi
+ RDEPEND+=" || (
+ kde-frameworks/breeze-icons:*
+ kde-frameworks/oxygen-icons:*
+ )"
;;
*)
eerror "Unknown value for \${ECM_NONGUI}"
@@ -205,11 +198,7 @@ esac
case ${ECM_DESIGNERPLUGIN} in
true)
IUSE+=" designer"
- if [[ -n ${_KDE5_ECLASS} ]] ; then
- BDEPEND+=" designer? (
>=dev-qt/designer-5.12.3:${KFSLOT} )"
- else
- BDEPEND+=" designer? ( dev-qt/designer:${KFSLOT} )"
- fi
+ BDEPEND+=" designer? ( dev-qt/designer:${KFSLOT} )"
;;
false) ;;
*)
@@ -265,14 +254,11 @@ esac
case ${ECM_QTHELP} in
true)
IUSE+=" doc"
- if [[ -n ${_KDE5_ECLASS} ]] ; then
- COMMONDEPEND+=" doc? (
>=dev-qt/qt-docs-5.12.3:${KFSLOT} )"
- BDEPEND+=" doc? ( >=dev-qt/qthelp-5.12.3:${KFSLOT} )"
- else
- COMMONDEPEND+=" doc? ( dev-qt/qt-docs:${KFSLOT} )"
- BDEPEND+=" doc? ( dev-qt/qthelp:${KFSLOT} )"
- fi
- BDEPEND+=" doc? ( >=app-doc/doxygen-1.8.13-r1 )"
+ COMMONDEPEND+=" doc? ( dev-qt/qt-docs:${KFSLOT} )"
+ BDEPEND+=" doc? (
+ >=app-doc/doxygen-1.8.13-r1
+ dev-qt/qthelp:${KFSLOT}
+ )"
;;
false) ;;
*)
@@ -284,11 +270,7 @@ esac
case ${ECM_TEST} in
true|optional|forceoptional|forceoptional-recursive)
IUSE+=" test"
- if [[ -n ${_KDE5_ECLASS} ]] ; then
- DEPEND+=" test? ( >=dev-qt/qttest-5.12.3:${KFSLOT} )"
- else
- DEPEND+=" test? ( dev-qt/qttest:${KFSLOT} )"
- fi
+ DEPEND+=" test? ( dev-qt/qttest:${KFSLOT} )"
RESTRICT+=" !test? ( test )"
;;
false) ;;
@@ -300,11 +282,7 @@ esac
BDEPEND+=" >=kde-frameworks/extra-cmake-modules-${KFMIN}:${KFSLOT}"
RDEPEND+=" >=kde-frameworks/kf-env-4"
-if [[ -n ${_KDE5_ECLASS} ]] ; then
- COMMONDEPEND+=" >=dev-qt/qtcore-5.12.3:${KFSLOT}"
-else
- COMMONDEPEND+=" dev-qt/qtcore:${KFSLOT}"
-fi
+COMMONDEPEND+=" dev-qt/qtcore:${KFSLOT}"
DEPEND+=" ${COMMONDEPEND}"
RDEPEND+=" ${COMMONDEPEND}"
@@ -466,11 +444,8 @@ ecm_src_prepare() {
done
fi
- # don't change behaviour for kde5.eclass consumers
- # for ported ebuilds, limit playing field of this to kde-*/ categories
- if [[ -n ${_KDE5_ECLASS} ]] ; then
- _ecm_strip_handbook_translations # TODO: kde5.eclass cleanup
- elif [[ ${CATEGORY} = kde-* ]] ; then
+ # limit playing field of locale stripping to kde-*/ categories
+ if [[ ${CATEGORY} = kde-* ]] ; then
# always install unconditionally for kconfigwidgets - if you use
# language X as system language, and there is a combobox with
language
# names, the translated language name for language Y is taken
from
