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 B5D26138334 for ; Sat, 14 Sep 2019 16:40:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B0BBAE082F; Sat, 14 Sep 2019 16:40:26 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 96BDFE0837 for ; Sat, 14 Sep 2019 16:40:26 +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 7953634B18D for ; Sat, 14 Sep 2019 16:40:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C10A97F0 for ; Sat, 14 Sep 2019 16:40:23 +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: <1568479108.dde63a0857af89546bbd63a6603c9e7ce206d76a.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: eclass/ X-VCS-Repository: proj/kde X-VCS-Files: eclass/kde5.eclass X-VCS-Directories: eclass/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: dde63a0857af89546bbd63a6603c9e7ce206d76a X-VCS-Branch: master Date: Sat, 14 Sep 2019 16:40:23 +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: 93f96ffa-f7bf-455f-9827-1887638a9e5f X-Archives-Hash: 32bf1057c83b8d559d0ff4008c50a0bf commit: dde63a0857af89546bbd63a6603c9e7ce206d76a Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Sep 14 16:38:28 2019 +0000 Commit: Andreas Sturmlechner gentoo 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 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) ;; *)