From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-900732-garchives=archives.gentoo.org@lists.gentoo.org> 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 B6EFC138330 for <garchives@archives.gentoo.org>; Sat, 10 Sep 2016 18:03:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EF3C6E0B77; Sat, 10 Sep 2016 18:03:00 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D358EE0AE6 for <gentoo-commits@lists.gentoo.org>; Sat, 10 Sep 2016 18:03:00 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 97116340961 for <gentoo-commits@lists.gentoo.org>; Sat, 10 Sep 2016 18:02:59 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A9EDB247F for <gentoo-commits@lists.gentoo.org>; Sat, 10 Sep 2016 18:02:57 +0000 (UTC) From: "Michael Palimaka" <kensington@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" <kensington@gentoo.org> Message-ID: <1473519563.7cd7df59d588e440bcf3cb12c7351a9bc3e76944.kensington@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: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: 7cd7df59d588e440bcf3cb12c7351a9bc3e76944 X-VCS-Branch: master Date: Sat, 10 Sep 2016 18:02:57 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 5195ea92-93cc-4f12-b300-dc2bdcc770dd X-Archives-Hash: fe5cb6be5af0cae74b86ad0bbbdc7e8d commit: 7cd7df59d588e440bcf3cb12c7351a9bc3e76944 Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> AuthorDate: Sat Sep 10 14:59:23 2016 +0000 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> CommitDate: Sat Sep 10 14:59:23 2016 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=7cd7df59 kde5.eclass: KDE Plasma 5.8 requires >=KF-5.26 eclass/kde5.eclass | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass index 4a20e18..45065af 100644 --- a/eclass/kde5.eclass +++ b/eclass/kde5.eclass @@ -159,14 +159,18 @@ case ${KDE_AUTODEPS} in esac fi + if [[ ${CATEGORY} = kde-plasma ]]; then + if ! [[ $(get_version_component_range 2) -le 7 && $(get_version_component_range 3) -lt 50 ]]; then + FRAMEWORKS_MINIMAL=5.26.0 + fi + fi + DEPEND+=" $(add_frameworks_dep extra-cmake-modules)" RDEPEND+=" >=kde-frameworks/kf-env-3" COMMONDEPEND+=" $(add_qt_dep qtcore)" if [[ ${CATEGORY} = kde-frameworks || ${CATEGORY} = kde-plasma && ${PN} != polkit-kde-agent ]]; then - RDEPEND+=" - !<kde-apps/kde4-l10n-15.12.3-r1 - " + RDEPEND+=" !<kde-apps/kde4-l10n-15.12.3-r1" fi if [[ ${KDE_BLOCK_SLOT4} = true && ${CATEGORY} = kde-apps ]]; then