From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-875981-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	by finch.gentoo.org (Postfix) with ESMTP id DC62D59CB1
	for <garchives@archives.gentoo.org>; Tue, 12 Apr 2016 16:45:45 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id E10CB21C002;
	Tue, 12 Apr 2016 16:45:43 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 8CFA921C002
	for <gentoo-commits@lists.gentoo.org>; Tue, 12 Apr 2016 16:45:43 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id E82F8340C37
	for <gentoo-commits@lists.gentoo.org>; Tue, 12 Apr 2016 16:45:41 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id A1CFB22B
	for <gentoo-commits@lists.gentoo.org>; Tue, 12 Apr 2016 16:45:39 +0000 (UTC)
From: "Johannes Huber" <johu@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Johannes Huber" <johu@gentoo.org>
Message-ID: <1460479508.6a632e157a63318ea785877cfcd28a5d64be1978.johu@gentoo>
Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/kdeedu-meta/
X-VCS-Repository: proj/kde
X-VCS-Files: kde-apps/kdeedu-meta/kdeedu-meta-16.03.90.ebuild kde-apps/kdeedu-meta/kdeedu-meta-16.04.49.9999.ebuild kde-apps/kdeedu-meta/kdeedu-meta-9999.ebuild
X-VCS-Directories: kde-apps/kdeedu-meta/
X-VCS-Committer: johu
X-VCS-Committer-Name: Johannes Huber
X-VCS-Revision: 6a632e157a63318ea785877cfcd28a5d64be1978
X-VCS-Branch: master
Date: Tue, 12 Apr 2016 16:45:39 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 6773c1bc-b5f4-412f-a166-b83ec286367e
X-Archives-Hash: 421afac84cafde372df110ba1c2faa7f

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)