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 CB678138334 for ; Wed, 14 Aug 2019 11:44:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0B626E075F; Wed, 14 Aug 2019 11:44:31 +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 E6283E075F for ; Wed, 14 Aug 2019 11:44:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 E6C59349B16 for ; Wed, 14 Aug 2019 11:44:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 45E7474D for ; Wed, 14 Aug 2019 11:44:27 +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: <1565780513.84ffc64fc920cf397f9b74649d4f364692350c86.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: 84ffc64fc920cf397f9b74649d4f364692350c86 X-VCS-Branch: master Date: Wed, 14 Aug 2019 11:44:27 +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: 546642f3-cdd6-4ce4-8676-81f8949614fb X-Archives-Hash: 12f0fc33f24ccd78a921ac9ebb8060f0 commit: 84ffc64fc920cf397f9b74649d4f364692350c86 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Aug 14 11:01:53 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Aug 14 11:01:53 2019 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=84ffc64f kde5.eclass: KDE_DESIGNERPLUGIN: Make use of ECM 5.62.0 for KDE PIM Recent git master KDE PIM repositories are making use of BUILD_DESIGNERPLUGIN and the ECM facilities available since >=5.62.0 instead of kdesignerplugin. Signed-off-by: Andreas Sturmlechner gentoo.org> eclass/kde5.eclass | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass index 38c0d0f125..d6f70a9e9e 100644 --- a/eclass/kde5.eclass +++ b/eclass/kde5.eclass @@ -187,6 +187,22 @@ case ${KDE_SUBSLOT} in ;; esac +case ${KDE_DESIGNERPLUGIN} in + false) ;; + *) + IUSE+=" designer" + if [[ ${CATEGORY} = kde-frameworks ]]; then + 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) )" + fi + fi +esac + case ${KDE_AUTODEPS} in false) ;; *) @@ -208,17 +224,6 @@ case ${KDE_DEBUG} in ;; esac -case ${KDE_DESIGNERPLUGIN} in - false) ;; - *) - IUSE+=" designer" - if [[ ${CATEGORY} = kde-frameworks ]]; then - BDEPEND+=" designer? ( $(add_qt_dep designer) )" - else - BDEPEND+=" designer? ( $(add_frameworks_dep kdesignerplugin) )" - fi -esac - case ${KDE_EXAMPLES} in false) ;; *) @@ -611,7 +616,11 @@ kde5_src_configure() { if [[ ${CATEGORY} = kde-frameworks ]]; then cmakeargs+=( -DBUILD_DESIGNERPLUGIN=$(usex designer) ) else - cmakeargs+=( $(cmake-utils_use_find_package designer KF5DesignerPlugin) ) + if [[ ${KDE_BUILD_TYPE} = live && ${PV} != 19.08* ]] ; then + cmakeargs+=( -DBUILD_DESIGNERPLUGIN=$(usex designer) ) + else + cmakeargs+=( $(cmake-utils_use_find_package designer KF5DesignerPlugin) ) + fi fi fi