commit: 2c71f48c974e657ba4550e06d0be944fc7ac63c5
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Thu Feb 11 20:36:03 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Feb 12 03:45:16 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c71f48c
kde-apps/kdepim-meta: Alt. RDEPEND on kde-frameworks/oxygen-icons
Package-Manager: portage-2.2.27
kde-apps/kdepim-meta/kdepim-meta-4.14.10-r1.ebuild | 5 ++++-
kde-apps/kdepim-meta/kdepim-meta-4.14.8.ebuild | 7 +++++--
kde-apps/kdepim-meta/kdepim-meta-4.4.2015.06.ebuild | 7 +++++--
kde-apps/kdepim-meta/kdepim-meta-4.4.2016.01.ebuild | 5 ++++-
4 files changed, 18 insertions(+), 6 deletions(-)
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 dd2cc71..dfb1b5d 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 5b7355e..ebfffdc 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 5ab989d..2a0d1c8 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 d3fb958..938c15b 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)
