Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/kjots/
Date: Thu, 23 Apr 2020 22:07:30
Message-Id: 1587679616.e7b48347e9cabbbb8233562f3b182cff662dd8c3.asturm@gentoo
1 commit: e7b48347e9cabbbb8233562f3b182cff662dd8c3
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Thu Apr 23 10:49:34 2020 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Thu Apr 23 22:06:56 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7b48347
7
8 app-text/kjots: Conditionally apply kf5bookmarks-5.69 patch for now
9
10 It breaks backwards compatiblity.
11
12 Package-Manager: Portage-2.3.99, Repoman-2.3.22
13 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
14
15 app-text/kjots/kjots-5.0.2-r1.ebuild | 8 +++++++-
16 1 file changed, 7 insertions(+), 1 deletion(-)
17
18 diff --git a/app-text/kjots/kjots-5.0.2-r1.ebuild b/app-text/kjots/kjots-5.0.2-r1.ebuild
19 index 841544075ce..d5159f4edb3 100644
20 --- a/app-text/kjots/kjots-5.0.2-r1.ebuild
21 +++ b/app-text/kjots/kjots-5.0.2-r1.ebuild
22 @@ -46,4 +46,10 @@ RDEPEND="${DEPEND}
23 !app-text/kjots:4
24 "
25
26 -PATCHES=( "${FILESDIR}/${P}-kf5bookmarks-5.69.patch" ) # KDE-Bug 384000
27 +src_prepare() {
28 + if has_version ">=kde-frameworks/kbookmarks-5.69"; then
29 + PATCHES+=( "${FILESDIR}/${P}-kf5bookmarks-5.69.patch" ) # KDE-Bug 384000
30 + fi
31 +
32 + ecm_src_prepare
33 +}