From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D0C17138351 for ; Mon, 16 Mar 2020 21:43:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id ADD47E0B48; Mon, 16 Mar 2020 21:43:16 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 72591E0B48 for ; Mon, 16 Mar 2020 21:43:16 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D67C134F18B for ; Mon, 16 Mar 2020 21:43:14 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E07CC176 for ; Mon, 16 Mar 2020 21:43:12 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1584311211.ed6084d902979c53477f2084f9c292e0553b97a5.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: eclass/ X-VCS-Repository: proj/kde X-VCS-Files: eclass/ecm.eclass X-VCS-Directories: eclass/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: ed6084d902979c53477f2084f9c292e0553b97a5 X-VCS-Branch: master Date: Mon, 16 Mar 2020 21:43:12 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ef8eb60c-d13d-4072-9cdb-6c33ff2ba8d7 X-Archives-Hash: b4aa908979734b45512751992948dfc7 commit: ed6084d902979c53477f2084f9c292e0553b97a5 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Mar 11 15:30:48 2020 +0000 Commit: Andreas Sturmlechner gentoo 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 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