[gentoo-commits] proj/kde:master commit in: kde-apps/kdeedu-meta/

[Johannes Huber]

commit:     6a632e157a63318ea785877cfcd28a5d64be1978
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 12 16:45:08 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Tue Apr 12 16:45:08 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=6a632e15

kde-apps/kdeedu-meta: Sync with tree

Package-Manager: portage-2.2.28

 kde-apps/kdeedu-meta/kdeedu-meta-16.03.90.ebuild      | 2 +-
 kde-apps/kdeedu-meta/kdeedu-meta-16.04.49.9999.ebuild | 2 +-
 kde-apps/kdeedu-meta/kdeedu-meta-9999.ebuild          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/kde-apps/kdeedu-meta/kdeedu-meta-16.03.90.ebuild 
b/kde-apps/kdeedu-meta/kdeedu-meta-16.03.90.ebuild
index de2cb14..a9f1103 100644
--- a/kde-apps/kdeedu-meta/kdeedu-meta-16.03.90.ebuild
+++ b/kde-apps/kdeedu-meta/kdeedu-meta-16.03.90.ebuild
@@ -33,7 +33,7 @@ RDEPEND="
        $(add_kdeapps_dep kturtle)
        $(add_kdeapps_dep kwordquiz)
        $(add_kdeapps_dep libkeduvocdocument)
-       $(add_kdeapps_dep marble)
+       || ( $(add_kdeapps_dep marble) kde-apps/marble:4 )
        $(add_kdeapps_dep minuet)
        $(add_kdeapps_dep parley)
        $(add_kdeapps_dep rocs)

diff --git a/kde-apps/kdeedu-meta/kdeedu-meta-16.04.49.9999.ebuild 
b/kde-apps/kdeedu-meta/kdeedu-meta-16.04.49.9999.ebuild
index 5cb9ae8..776b112 100644
--- a/kde-apps/kdeedu-meta/kdeedu-meta-16.04.49.9999.ebuild
+++ b/kde-apps/kdeedu-meta/kdeedu-meta-16.04.49.9999.ebuild
@@ -33,7 +33,7 @@ RDEPEND="
        $(add_kdeapps_dep kturtle)
        $(add_kdeapps_dep kwordquiz)
        $(add_kdeapps_dep libkeduvocdocument)
-       $(add_kdeapps_dep marble)
+       || ( $(add_kdeapps_dep marble) kde-apps/marble:4 )
        $(add_kdeapps_dep minuet)
        $(add_kdeapps_dep parley)
        $(add_kdeapps_dep rocs)

diff --git a/kde-apps/kdeedu-meta/kdeedu-meta-9999.ebuild 
b/kde-apps/kdeedu-meta/kdeedu-meta-9999.ebuild
index 5cb9ae8..776b112 100644
--- a/kde-apps/kdeedu-meta/kdeedu-meta-9999.ebuild
+++ b/kde-apps/kdeedu-meta/kdeedu-meta-9999.ebuild
@@ -33,7 +33,7 @@ RDEPEND="
        $(add_kdeapps_dep kturtle)
        $(add_kdeapps_dep kwordquiz)
        $(add_kdeapps_dep libkeduvocdocument)
-       $(add_kdeapps_dep marble)
+       || ( $(add_kdeapps_dep marble) kde-apps/marble:4 )
        $(add_kdeapps_dep minuet)
        $(add_kdeapps_dep parley)
        $(add_kdeapps_dep rocs)