From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: kde-apps/pimcommon/
Date: Fri, 10 Feb 2017 11:32:07 +0000 (UTC) [thread overview]
Message-ID: <1486726220.5855c234a8f75a790a4b4f6620f3c0f6e3b04240.asturm@gentoo> (raw)
commit: 5855c234a8f75a790a4b4f6620f3c0f6e3b04240
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 10 11:26:14 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Feb 10 11:30:20 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5855c234
kde-apps/pimcommon: Add blocker against kde-apps/kdepim-common-libs:4
Gentoo-bug: 608794
Thanks-to: Jonathan Lovelace <kingjon3377 <AT> gmail.com>
Files collide:
/usr/share/icons/hicolor/16x16/apps/kdepim-dropbox.png
/usr/share/icons/hicolor/48x48/apps/kdepim-dropbox.png
/usr/share/icons/hicolor/22x22/apps/kdepim-dropbox.png
/usr/share/icons/hicolor/32x32/apps/kdepim-dropbox.png
Package-Manager: portage-2.3.3
kde-apps/pimcommon/pimcommon-16.12.2.ebuild | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/kde-apps/pimcommon/pimcommon-16.12.2.ebuild b/kde-apps/pimcommon/pimcommon-16.12.2.ebuild
index 601da9a7ec..63286e4ea4 100644
--- a/kde-apps/pimcommon/pimcommon-16.12.2.ebuild
+++ b/kde-apps/pimcommon/pimcommon-16.12.2.ebuild
@@ -14,7 +14,7 @@ LICENSE="GPL-2+ LGPL-2.1+"
KEYWORDS="~amd64 ~x86"
IUSE=""
-RDEPEND="
+COMMON_DEPEND="
$(add_frameworks_dep karchive)
$(add_frameworks_dep kcodecs)
$(add_frameworks_dep kcompletion)
@@ -51,6 +51,9 @@ RDEPEND="
$(add_qt_dep qtxml)
dev-libs/grantlee:5
"
-DEPEND="${RDEPEND}
+DEPEND="${COMMON_DEPEND}
dev-libs/libxslt
"
+RDEPEND="${COMMON_DEPEND}
+ !kde-apps/kdepim-common-libs:4
+"
next reply other threads:[~2017-02-10 11:32 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-10 11:32 Andreas Sturmlechner [this message]
-- strict thread matches above, loose matches on Subject: below --
2017-07-30 18:13 [gentoo-commits] repo/gentoo:master commit in: kde-apps/pimcommon/ Andreas Sturmlechner
2018-02-01 1:34 Andreas Sturmlechner
2018-07-22 14:11 Andreas Sturmlechner
2018-07-29 0:38 Mikle Kolyada
2018-07-29 12:56 Thomas Deutschmann
2019-03-21 11:14 Mikle Kolyada
2019-03-21 11:34 Mikle Kolyada
2019-04-06 15:37 Mikle Kolyada
2019-07-28 2:33 Mikle Kolyada
2019-07-28 2:45 Mikle Kolyada
2019-12-02 23:29 Aaron Bauman
2020-03-18 23:48 Agostino Sarubbo
2020-03-19 0:06 Agostino Sarubbo
2020-03-19 6:25 Mikle Kolyada
2020-07-30 6:58 Agostino Sarubbo
2020-07-30 7:21 Agostino Sarubbo
2021-02-24 19:35 Mikle Kolyada
2021-02-24 22:40 Andreas Sturmlechner
2021-08-04 8:40 Agostino Sarubbo
2021-08-04 9:01 Agostino Sarubbo
2021-11-16 7:40 Andreas Sturmlechner
2023-03-23 14:47 Andreas Sturmlechner
2023-04-02 19:40 Arthur Zamarin
2023-04-29 14:21 Andreas Sturmlechner
2023-07-15 17:09 Arthur Zamarin
2023-11-23 15:27 Sam James
2024-03-06 19:19 Arthur Zamarin
2024-10-01 18:23 Andreas Sturmlechner
2024-12-21 21:27 Andreas Sturmlechner
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=1486726220.5855c234a8f75a790a4b4f6620f3c0f6e3b04240.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