From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id AAC6A1395E1 for ; Fri, 31 Jul 2015 22:43:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5302214012; Fri, 31 Jul 2015 22:43:38 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 01A6F14012 for ; Fri, 31 Jul 2015 22:43:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 092F0340B55 for ; Fri, 31 Jul 2015 22:43:37 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A7FA1BF for ; Fri, 31 Jul 2015 22:43:35 +0000 (UTC) From: "Manuel Rüger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Manuel Rüger" Message-ID: <1438382601.6d2542b78229140b21c3c3342600afd92679719c.mrueg@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/kdebase-data/ X-VCS-Repository: proj/kde X-VCS-Files: kde-apps/kdebase-data/kdebase-data-15.08.49.9999.ebuild kde-apps/kdebase-data/kdebase-data-9999.ebuild X-VCS-Directories: kde-apps/kdebase-data/ X-VCS-Committer: mrueg X-VCS-Committer-Name: Manuel Rüger X-VCS-Revision: 6d2542b78229140b21c3c3342600afd92679719c X-VCS-Branch: master Date: Fri, 31 Jul 2015 22:43:35 +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: a346f0f9-4c89-43c3-9c9d-e95f26794315 X-Archives-Hash: 0a063f57135788c058c3e204497e06bd commit: 6d2542b78229140b21c3c3342600afd92679719c Author: Andreas Sturmlechner gmail com> AuthorDate: Fri Jul 31 22:23:14 2015 +0000 Commit: Manuel Rüger gentoo org> CommitDate: Fri Jul 31 22:43:21 2015 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=6d2542b7 Workaround for kde4-base vs kde5 conflict Package-Manager: portage-2.2.20 Signed-off-by: Manuel Rüger gentoo.org> kde-apps/kdebase-data/kdebase-data-15.08.49.9999.ebuild | 2 +- kde-apps/kdebase-data/kdebase-data-9999.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kde-apps/kdebase-data/kdebase-data-15.08.49.9999.ebuild b/kde-apps/kdebase-data/kdebase-data-15.08.49.9999.ebuild index 9d2261b..44f4c8a 100644 --- a/kde-apps/kdebase-data/kdebase-data-15.08.49.9999.ebuild +++ b/kde-apps/kdebase-data/kdebase-data-15.08.49.9999.ebuild @@ -13,7 +13,7 @@ IUSE="+wallpapers" KEYWORDS="" RDEPEND=" - wallpapers? ( $(add_kdeapps_dep kde-wallpapers) ) + wallpapers? ( || ( $(add_kdeapps_dep kde-wallpapers) >=kde-apps/kde-wallpapers-${PV}:5 ) ) x11-themes/hicolor-icon-theme " diff --git a/kde-apps/kdebase-data/kdebase-data-9999.ebuild b/kde-apps/kdebase-data/kdebase-data-9999.ebuild index 9d2261b..44f4c8a 100644 --- a/kde-apps/kdebase-data/kdebase-data-9999.ebuild +++ b/kde-apps/kdebase-data/kdebase-data-9999.ebuild @@ -13,7 +13,7 @@ IUSE="+wallpapers" KEYWORDS="" RDEPEND=" - wallpapers? ( $(add_kdeapps_dep kde-wallpapers) ) + wallpapers? ( || ( $(add_kdeapps_dep kde-wallpapers) >=kde-apps/kde-wallpapers-${PV}:5 ) ) x11-themes/hicolor-icon-theme "