[gentoo-commits] repo/gentoo:master commit in: kde-apps/kdepim-meta/

[Johannes Huber]

commit:     20b728dacb0e7e1027651caa7ef8da1c4c8670e2
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 17 10:09:39 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun Jul 17 10:14:03 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20b728da

kde-apps/kdepim-meta: Drop kde-apps/kdepim-icons for removal

Package-Manager: portage-2.3.0

 kde-apps/kdepim-meta/kdepim-meta-4.14.11_pre20160211.ebuild | 5 +----
 kde-apps/kdepim-meta/kdepim-meta-4.4.2016.01.ebuild         | 5 +----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/kde-apps/kdepim-meta/kdepim-meta-4.14.11_pre20160211.ebuild 
b/kde-apps/kdepim-meta/kdepim-meta-4.14.11_pre20160211.ebuild
index 8c7e0e3..c8769eb 100644
--- a/kde-apps/kdepim-meta/kdepim-meta-4.14.11_pre20160211.ebuild
+++ b/kde-apps/kdepim-meta/kdepim-meta-4.14.11_pre20160211.ebuild
@@ -12,6 +12,7 @@ KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
 IUSE="nls"
 
 RDEPEND="
+       kde-frameworks/oxygen-icons:5
        $(add_kdeapps_dep akonadiconsole '' ${PV})
        $(add_kdeapps_dep akregator '' ${PV})
        $(add_kdeapps_dep blogilo '' ${PV})
@@ -19,10 +20,6 @@ RDEPEND="
        $(add_kdeapps_dep kabcclient '' ${PV})
        $(add_kdeapps_dep kaddressbook '' ${PV})
        $(add_kdeapps_dep kalarm '' ${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.4.2016.01.ebuild 
b/kde-apps/kdepim-meta/kdepim-meta-4.4.2016.01.ebuild
index c8e5385..af37995 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
@@ -13,15 +13,12 @@ KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="nls"
 
 RDEPEND="
+       kde-frameworks/oxygen-icons:5
        $(add_kdeapps_dep akregator)
        $(add_kdeapps_dep blogilo)
        $(add_kdeapps_dep kabcclient)
        $(add_kdeapps_dep kaddressbook)
        $(add_kdeapps_dep kalarm)
-       || (
-               $(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)