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

[Andreas Hüttel]

commit:     0dbe763f5adea8454048c0c6c08f7bb750a4715a
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Thu Aug 27 22:31:29 2015 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Sep  1 20:58:06 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0dbe763f

kde-base/kdepim-meta: Fix RDEPENDs

Package-Manager: portage-2.2.20.1

 kde-base/kdepim-meta/kdepim-meta-4.14.10.ebuild     | 13 ++++---------
 kde-base/kdepim-meta/kdepim-meta-4.14.3.ebuild      | 13 ++++---------
 kde-base/kdepim-meta/kdepim-meta-4.14.8.ebuild      | 13 ++++---------
 kde-base/kdepim-meta/kdepim-meta-4.4.2015.06.ebuild | 13 ++++---------
 4 files changed, 16 insertions(+), 36 deletions(-)

diff --git a/kde-base/kdepim-meta/kdepim-meta-4.14.10.ebuild 
b/kde-base/kdepim-meta/kdepim-meta-4.14.10.ebuild
index 8bfa769..afdb69d 100644
--- a/kde-base/kdepim-meta/kdepim-meta-4.14.10.ebuild
+++ b/kde-base/kdepim-meta/kdepim-meta-4.14.10.ebuild
@@ -31,13 +31,8 @@ RDEPEND="
        $(add_kdebase_dep korganizer)
        $(add_kdebase_dep ktimetracker)
        $(add_kdebase_dep ktnef)
-       nls? ( || (
-               (
-                       $(add_kdeapps_dep kde4-l10n '' 15.04.0)
-               )
-               (
-                       $(add_kdeapps_dep kde4-l10n '' 4.14.3)
-                       $(add_kdebase_dep kdepim-l10n '' 4.14.3)
-               )
-       ) )
+       nls? (
+               $(add_kdeapps_dep kde4-l10n '' 4.14.3)
+               $(add_kdebase_dep kdepim-l10n '' 4.14.3)
+       )
 "

diff --git a/kde-base/kdepim-meta/kdepim-meta-4.14.3.ebuild 
b/kde-base/kdepim-meta/kdepim-meta-4.14.3.ebuild
index 8fdf964..e2f4ca1 100644
--- a/kde-base/kdepim-meta/kdepim-meta-4.14.3.ebuild
+++ b/kde-base/kdepim-meta/kdepim-meta-4.14.3.ebuild
@@ -31,13 +31,8 @@ RDEPEND="
        $(add_kdebase_dep korganizer)
        $(add_kdebase_dep ktimetracker)
        $(add_kdebase_dep ktnef)
-       nls? ( || (
-               (
-                       $(add_kdeapps_dep kde4-l10n '' 15.04.0)
-               )
-               (
-                       $(add_kdeapps_dep kde4-l10n '' 4.14.3)
-                       $(add_kdebase_dep kdepim-l10n '' 4.14.3)
-               )
-       ) )
+       nls? (
+               $(add_kdeapps_dep kde4-l10n '' 4.14.3)
+               $(add_kdebase_dep kdepim-l10n '' 4.14.3)
+       )
 "

diff --git a/kde-base/kdepim-meta/kdepim-meta-4.14.8.ebuild 
b/kde-base/kdepim-meta/kdepim-meta-4.14.8.ebuild
index f6135c7..4943a96 100644
--- a/kde-base/kdepim-meta/kdepim-meta-4.14.8.ebuild
+++ b/kde-base/kdepim-meta/kdepim-meta-4.14.8.ebuild
@@ -31,13 +31,8 @@ RDEPEND="
        $(add_kdebase_dep korganizer)
        $(add_kdebase_dep ktimetracker)
        $(add_kdebase_dep ktnef)
-       nls? ( || (
-               (
-                       $(add_kdeapps_dep kde4-l10n '' 15.04.0)
-               )
-               (
-                       $(add_kdeapps_dep kde4-l10n '' 4.14.3)
-                       $(add_kdebase_dep kdepim-l10n '' 4.14.3)
-               )
-       ) )
+       nls? (
+               $(add_kdeapps_dep kde4-l10n '' 4.14.3)
+               $(add_kdebase_dep kdepim-l10n '' 4.14.3)
+       )
 "

diff --git a/kde-base/kdepim-meta/kdepim-meta-4.4.2015.06.ebuild 
b/kde-base/kdepim-meta/kdepim-meta-4.4.2015.06.ebuild
index 2c31d24..bf84ae4 100644
--- a/kde-base/kdepim-meta/kdepim-meta-4.4.2015.06.ebuild
+++ b/kde-base/kdepim-meta/kdepim-meta-4.4.2015.06.ebuild
@@ -30,14 +30,9 @@ RDEPEND="
        $(add_kdebase_dep libkdepim)
        $(add_kdebase_dep libkleo)
        $(add_kdebase_dep libkpgp)
-       nls? ( || (
-               (
-                       $(add_kdeapps_dep kde4-l10n '' 15.04.0)
-               )
-               (
-                       $(add_kdeapps_dep kde4-l10n '' 4.14.3)
-                       $(add_kdebase_dep kdepim-l10n '' 4.4.11.1-r1)
-               )
-       ) )
+       nls? (
+               $(add_kdeapps_dep kde4-l10n '' 4.14.3)
+               $(add_kdebase_dep kdepim-l10n '' 4.4.11.1-r1)
+       )
        !kde-base/kdepim-runtime
 "