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 D507A138334 for ; Tue, 12 Jun 2018 17:00:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 92C55E08FA; Tue, 12 Jun 2018 17:00:15 +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 6309BE08FA for ; Tue, 12 Jun 2018 17:00:15 +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 169FD335C8A for ; Tue, 12 Jun 2018 17:00:01 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 48BF63C for ; Tue, 12 Jun 2018 16:59:59 +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: <1528816907.83647a51bd254fc98d1ee5add3d9b9ec01f11f37.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: eclass/ X-VCS-Repository: proj/kde X-VCS-Files: eclass/kde5-functions.eclass X-VCS-Directories: eclass/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 83647a51bd254fc98d1ee5add3d9b9ec01f11f37 X-VCS-Branch: master Date: Tue, 12 Jun 2018 16:59:59 +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: fdd04be9-b492-48ac-8b20-5d6a770a2b11 X-Archives-Hash: 0022cee56fc521250fd99d0c4bf70b84 commit: 83647a51bd254fc98d1ee5add3d9b9ec01f11f37 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Jun 12 15:21:47 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Jun 12 15:21:47 2018 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=83647a51 kde5-functions: Drop obsolete 5.12.90 conditional eclass/kde5-functions.eclass | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass index 8f8406bdf1..348406ce1a 100644 --- a/eclass/kde5-functions.eclass +++ b/eclass/kde5-functions.eclass @@ -38,10 +38,8 @@ case ${CATEGORY} in [[ ${KDE_BUILD_TYPE} = live ]] && : ${FRAMEWORKS_MINIMAL:=9999} ;; kde-plasma) - if [[ ${PV} = 5.13* || ${PV} = 5.12.90 ]]; then - : ${QT_MINIMAL:=5.10.1} - fi - if [[ ${KDE_BUILD_TYPE} = live && ${PV} != 5.12* ]]; then + [[ ${PV} = 5.13* ]] && : ${QT_MINIMAL:=5.10.1} + if [[ ${KDE_BUILD_TYPE} = live && ${PV} != 5.??.49* ]]; then : ${FRAMEWORKS_MINIMAL:=9999} : ${QT_MINIMAL:=5.10.1} fi