From 6d2542b78229140b21c3c3342600afd92679719c Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Sat, 1 Aug 2015 00:23:14 +0200 Subject: Workaround for kde4-base vs kde5 conflict MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Package-Manager: portage-2.2.20 Signed-off-by: Manuel Rüger --- 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 9d2261bb74..44f4c8a465 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 9d2261bb74..44f4c8a465 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 " -- cgit v1.2.3-65-gdbad