public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/calligraplan/
Date: Sat, 12 Oct 2019 21:13:50 +0000 (UTC)	[thread overview]
Message-ID: <1570914793.ecbdcd7367b9d3c97d4a6bc9ec736de1f5247a34.asturm@gentoo> (raw)

commit:     ecbdcd7367b9d3c97d4a6bc9ec736de1f5247a34
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Oct  9 22:32:03 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Oct 12 21:13:13 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ecbdcd73

app-office/calligraplan: Accept kde-frameworks/{kcalendarcore,kcontacts}

Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 ...lligraplan-3.1.0-r2.ebuild => calligraplan-3.1.0-r3.ebuild} | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/app-office/calligraplan/calligraplan-3.1.0-r2.ebuild b/app-office/calligraplan/calligraplan-3.1.0-r3.ebuild
similarity index 94%
rename from app-office/calligraplan/calligraplan-3.1.0-r2.ebuild
rename to app-office/calligraplan/calligraplan-3.1.0-r3.ebuild
index 8be9484950d..ec094bc71c2 100644
--- a/app-office/calligraplan/calligraplan-3.1.0-r2.ebuild
+++ b/app-office/calligraplan/calligraplan-3.1.0-r3.ebuild
@@ -60,8 +60,14 @@ DEPEND="
 		app-crypt/qca:2[qt5(+)]
 	)
 	pim? (
-		$(add_kdeapps_dep kcalcore)
-		$(add_kdeapps_dep kcontacts)
+		|| (
+			$(add_frameworks_dep kcalendarcore)
+			$(add_kdeapps_dep kcalcore)
+		)
+		|| (
+			$(add_frameworks_dep kcontacts)
+			$(add_kdeapps_dep kcontacts)
+		)
 	)
 	X? (
 		$(add_qt_dep qtx11extras)


             reply	other threads:[~2019-10-12 21:13 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-10-12 21:13 Andreas Sturmlechner [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-01-21 20:50 [gentoo-commits] repo/gentoo:master commit in: app-office/calligraplan/ Andreas Sturmlechner
2023-05-27  9:46 Sam James
2022-12-25 23:22 Andreas Sturmlechner
2021-12-29 13:46 Yixun Lan
2021-03-08 10:26 Sam James
2021-03-08 10:25 Sam James
2021-01-28 21:53 Andreas Sturmlechner
2020-10-29 19:41 Andreas Sturmlechner
2020-01-18 19:39 Andreas Sturmlechner
2020-01-18 19:39 Andreas Sturmlechner
2019-12-17 17:06 Andreas Sturmlechner
2019-12-02 16:33 Mikle Kolyada
2019-12-02 16:12 Mikle Kolyada
2019-12-01 21:35 Andreas Sturmlechner
2019-12-01 21:35 Andreas Sturmlechner
2019-11-14 10:58 Andreas Sturmlechner
2019-08-16 14:40 Andreas Sturmlechner
2019-08-15 13:09 Andreas Sturmlechner
2019-01-14 14:43 Mikle Kolyada

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=1570914793.ecbdcd7367b9d3c97d4a6bc9ec736de1f5247a34.asturm@gentoo \
    --to=asturm@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