From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-943402-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 DAF1C139694
for <garchives@archives.gentoo.org>; Sat, 8 Apr 2017 22:53:14 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id B374221C084;
Sat, 8 Apr 2017 22:53:11 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(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 9057C21C084
for <gentoo-commits@lists.gentoo.org>; Sat, 8 Apr 2017 22:53:11 +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 2C00834112A
for <gentoo-commits@lists.gentoo.org>; Sat, 8 Apr 2017 22:53:10 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 8F2B173E8
for <gentoo-commits@lists.gentoo.org>; Sat, 8 Apr 2017 22:53:08 +0000 (UTC)
From: "Andreas Sturmlechner" <asturm@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, "Andreas Sturmlechner" <asturm@gentoo.org>
Message-ID: <1491688319.696a07882b68220f598d16f3c1a318b04283cd3f.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: 696a07882b68220f598d16f3c1a318b04283cd3f
X-VCS-Branch: master
Date: Sat, 8 Apr 2017 22:53:08 +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: 7d9bfb9c-005e-4078-ad19-7acff42e5e90
X-Archives-Hash: e39e4a7733f8760ea3a124e6f2b384c0
commit: 696a07882b68220f598d16f3c1a318b04283cd3f
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 8 21:51:59 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Apr 8 21:51:59 2017 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=696a0788
kde5.eclass: Add additional blocker for <kde-apps/kde4-l10n-16.12.0:4
There would be file collisions in the event that someone is upgrading
straight from 16.08 to 17.04, specifically packages that were ported
to KF5 in the meantime.
eclass/kde5.eclass | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 0fc2d72f6b..e071a82b5d 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -180,7 +180,11 @@ case ${KDE_AUTODEPS} in
kde-apps)
[[ ${KDE_BLOCK_SLOT4} = true ]] && RDEPEND+=" !kde-apps/${PN}:4"
[[ $(get_version_component_range 1) -ge 17 ]] && \
- RDEPEND+=" !kde-apps/kde-l10n !kde-apps/kdepim-l10n:5"
+ RDEPEND+="
+ !kde-apps/kde-l10n
+ !<kde-apps/kde4-l10n-16.12.0:4
+ !kde-apps/kdepim-l10n:5
+ "
;;
esac
;;