[gentoo-commits] proj/kde:master commit in: kde-apps/kdebase-data/

[Manuel Rüger]

commit:     6d2542b78229140b21c3c3342600afd92679719c
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Fri Jul 31 22:23:14 2015 +0000
Commit:     Manuel Rüger <mrueg <AT> gentoo <DOT> 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 <mrueg <AT> 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
 "