public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Johannes Huber" <johu@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/kdeedu-meta/
Date: Tue, 12 Apr 2016 16:45:39 +0000 (UTC)	[thread overview]
Message-ID: <1460479508.6a632e157a63318ea785877cfcd28a5d64be1978.johu@gentoo> (raw)

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)


             reply	other threads:[~2016-04-12 16:45 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-04-12 16:45 Johannes Huber [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-12-11 16:15 [gentoo-commits] proj/kde:master commit in: kde-apps/kdeedu-meta/ Andreas Sturmlechner
2024-10-21 21:46 Andreas Sturmlechner
2024-09-09 19:05 Andreas Sturmlechner
2024-02-27 22:11 Andreas Sturmlechner
2024-02-27 21:25 Sam James
2023-12-19 22:01 Andreas Sturmlechner
2020-07-18  8:57 Andreas Sturmlechner
2019-11-24 17:54 Andreas Sturmlechner
2019-11-18  8:20 Andreas Sturmlechner
2018-11-08 13:52 Andreas Sturmlechner
2018-06-10 16:29 Johannes Huber
2018-05-03 11:40 Andreas Sturmlechner
2017-11-12 21:19 Andreas Sturmlechner
2016-12-04 16:40 Michael Palimaka
2016-12-03 12:50 Johannes Huber
2016-11-12 10:55 Michael Palimaka
2016-08-18 14:50 Michael Palimaka
2016-08-14 16:47 Michael Palimaka
2016-03-25 14:00 Michael Palimaka
2015-08-19 17:16 Johannes Huber
2015-07-30 17:09 Johannes Huber
2014-11-29 16:44 Michael Palimaka
2014-11-25 16:16 Michael Palimaka
2014-11-25 16:16 Michael Palimaka

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1460479508.6a632e157a63318ea785877cfcd28a5d64be1978.johu@gentoo \
    --to=johu@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox