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 BA67E139084 for ; Thu, 14 Dec 2017 07:36:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0E001E0F10; Thu, 14 Dec 2017 07:36:11 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 E3FCAE0F10 for ; Thu, 14 Dec 2017 07:36:09 +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 9CF4F33C4EE for ; Thu, 14 Dec 2017 07:36:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0CD37AE77 for ; Thu, 14 Dec 2017 07:36:05 +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: <1513236918.f584e341d9ab77da5b0363cf70ed3dd749093dab.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: eclass/ X-VCS-Repository: proj/kde X-VCS-Files: eclass/kde5-functions.eclass eclass/kde5.eclass X-VCS-Directories: eclass/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: f584e341d9ab77da5b0363cf70ed3dd749093dab X-VCS-Branch: master Date: Thu, 14 Dec 2017 07:36:05 +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-Archives-Salt: 1f95c478-b67f-43e3-b5d3-3536dfb77a12 X-Archives-Hash: 8be96aa6ea995909e4eaaec8ba155e4d commit: f584e341d9ab77da5b0363cf70ed3dd749093dab Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Dec 9 22:43:35 2017 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Dec 14 07:35:18 2017 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=f584e341 kde5*.eclass: Drop kde-apps-17.11* quirks eclass/kde5-functions.eclass | 2 +- eclass/kde5.eclass | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass index f2e835725e..19f0a856d8 100644 --- a/eclass/kde5-functions.eclass +++ b/eclass/kde5-functions.eclass @@ -46,7 +46,7 @@ case ${CATEGORY} in fi ;; kde-apps) - if [[ ${KDE_BUILD_TYPE} = live || ${PV} = 17.12* || ${PV} = 17.11* ]]; then + if [[ ${KDE_BUILD_TYPE} = live || ${PV} = 17.12* ]]; then : ${QT_MINIMAL:=5.9.1} fi ;; diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass index 2d7a5a332b..7ef21b7ad6 100644 --- a/eclass/kde5.eclass +++ b/eclass/kde5.eclass @@ -224,7 +224,7 @@ case ${KDE_DESIGNERPLUGIN} in *) IUSE+=" designer" DEPEND+=" designer? ( $(add_frameworks_dep kdesignerplugin) )" - [[ ${PV} = 9999 || ${PV} = 17.12* || ${PV} = 17.11* ]] || \ + [[ ${PV} = 17.08* ]] && \ DEPEND+=" designer? ( $(add_qt_dep designer) )" ;; esac @@ -630,10 +630,10 @@ kde5_src_configure() { fi if ! use_if_iuse designer && [[ ${KDE_DESIGNERPLUGIN} != false ]] ; then - if [[ ${PV} = 9999 || ${PV} = 17.12* || ${PV} = 17.11* ]]; then - cmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KF5DesignerPlugin=ON ) - else + if [[ ${PV} = 17.08* ]]; then cmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Designer=ON ) + else + cmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KF5DesignerPlugin=ON ) fi fi