From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
Date: Thu, 11 Feb 2016 20:36:03 +0000 (+0100)
Subject: kde-apps/kdepim-meta: Alt. RDEPEND on kde-frameworks/oxygen-icons
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=2c71f48c974e657ba4550e06d0be944fc7ac63c5;p=gentoo.git

kde-apps/kdepim-meta: Alt. RDEPEND on kde-frameworks/oxygen-icons

Package-Manager: portage-2.2.27
---

diff --git a/kde-apps/kdepim-meta/kdepim-meta-4.14.10-r1.ebuild b/kde-apps/kdepim-meta/kdepim-meta-4.14.10-r1.ebuild
index dd2cc718c7db..dfb1b5d94660 100644
--- a/kde-apps/kdepim-meta/kdepim-meta-4.14.10-r1.ebuild
+++ b/kde-apps/kdepim-meta/kdepim-meta-4.14.10-r1.ebuild
@@ -18,7 +18,10 @@ RDEPEND="
 	$(add_kdeapps_dep kabcclient '' ${PV})
 	$(add_kdeapps_dep kaddressbook '' ${PV})
 	$(add_kdeapps_dep kalarm '' ${PV})
-	$(add_kdeapps_dep kdepim-icons '' ${PV})
+	|| (
+		$(add_kdeapps_dep kdepim-icons)
+		>=kde-frameworks/oxygen-icons-5.19.0:5
+	)
 	$(add_kdeapps_dep kdepim-kresources '' ${PV})
 	$(add_kdeapps_dep kdepim-runtime '' ${PV})
 	$(add_kdeapps_dep kjots '' ${PV})
diff --git a/kde-apps/kdepim-meta/kdepim-meta-4.14.8.ebuild b/kde-apps/kdepim-meta/kdepim-meta-4.14.8.ebuild
index 5b7355e3d0e4..ebfffdcc152c 100644
--- a/kde-apps/kdepim-meta/kdepim-meta-4.14.8.ebuild
+++ b/kde-apps/kdepim-meta/kdepim-meta-4.14.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -18,7 +18,10 @@ RDEPEND="
 	$(add_kdeapps_dep kabcclient)
 	$(add_kdeapps_dep kaddressbook)
 	$(add_kdeapps_dep kalarm)
-	$(add_kdeapps_dep kdepim-icons)
+	|| (
+		$(add_kdeapps_dep kdepim-icons)
+		>=kde-frameworks/oxygen-icons-5.19.0:5
+	)
 	$(add_kdeapps_dep kdepim-kresources)
 	$(add_kdeapps_dep kdepim-runtime)
 	$(add_kdeapps_dep kjots)
diff --git a/kde-apps/kdepim-meta/kdepim-meta-4.4.2015.06.ebuild b/kde-apps/kdepim-meta/kdepim-meta-4.4.2015.06.ebuild
index 5ab989d61d0c..2a0d1c86a8b2 100644
--- a/kde-apps/kdepim-meta/kdepim-meta-4.4.2015.06.ebuild
+++ b/kde-apps/kdepim-meta/kdepim-meta-4.4.2015.06.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -17,7 +17,10 @@ RDEPEND="
 	$(add_kdeapps_dep kabcclient)
 	$(add_kdeapps_dep kaddressbook)
 	$(add_kdeapps_dep kalarm)
-	$(add_kdeapps_dep kdepim-icons)
+	|| (
+		$(add_kdeapps_dep kdepim-icons)
+		>=kde-frameworks/oxygen-icons-5.19.0:5
+	)
 	$(add_kdeapps_dep kdepim-kresources)
 	$(add_kdeapps_dep kdepim-wizards)
 	$(add_kdeapps_dep kjots)
diff --git a/kde-apps/kdepim-meta/kdepim-meta-4.4.2016.01.ebuild b/kde-apps/kdepim-meta/kdepim-meta-4.4.2016.01.ebuild
index d3fb9586121b..938c15b6df1a 100644
--- a/kde-apps/kdepim-meta/kdepim-meta-4.4.2016.01.ebuild
+++ b/kde-apps/kdepim-meta/kdepim-meta-4.4.2016.01.ebuild
@@ -18,7 +18,10 @@ RDEPEND="
 	$(add_kdeapps_dep kabcclient)
 	$(add_kdeapps_dep kaddressbook)
 	$(add_kdeapps_dep kalarm)
-	$(add_kdeapps_dep kdepim-icons)
+	|| (
+		$(add_kdeapps_dep kdepim-icons)
+		>=kde-frameworks/oxygen-icons-5.19.0:5
+	)
 	$(add_kdeapps_dep kdepim-kresources)
 	$(add_kdeapps_dep kdepim-wizards)
 	$(add_kdeapps_dep kjots)