From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 889D6138350 for ; Thu, 23 Apr 2020 22:07:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C254BE0A91; Thu, 23 Apr 2020 22:07:29 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AA965E0A91 for ; Thu, 23 Apr 2020 22:07:29 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 68F0B34F278 for ; Thu, 23 Apr 2020 22:07:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 960DE1F2 for ; Thu, 23 Apr 2020 22:07:26 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1587679616.e7b48347e9cabbbb8233562f3b182cff662dd8c3.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/kjots/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-text/kjots/kjots-5.0.2-r1.ebuild X-VCS-Directories: app-text/kjots/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: e7b48347e9cabbbb8233562f3b182cff662dd8c3 X-VCS-Branch: master Date: Thu, 23 Apr 2020 22:07:26 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: f8c847df-1016-4fd4-8017-6ac48f951a2a X-Archives-Hash: 3e7feba936a7361d31afe900f2aa89b0 commit: e7b48347e9cabbbb8233562f3b182cff662dd8c3 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Apr 23 10:49:34 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Apr 23 22:06:56 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7b48347 app-text/kjots: Conditionally apply kf5bookmarks-5.69 patch for now It breaks backwards compatiblity. Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner gentoo.org> app-text/kjots/kjots-5.0.2-r1.ebuild | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app-text/kjots/kjots-5.0.2-r1.ebuild b/app-text/kjots/kjots-5.0.2-r1.ebuild index 841544075ce..d5159f4edb3 100644 --- a/app-text/kjots/kjots-5.0.2-r1.ebuild +++ b/app-text/kjots/kjots-5.0.2-r1.ebuild @@ -46,4 +46,10 @@ RDEPEND="${DEPEND} !app-text/kjots:4 " -PATCHES=( "${FILESDIR}/${P}-kf5bookmarks-5.69.patch" ) # KDE-Bug 384000 +src_prepare() { + if has_version ">=kde-frameworks/kbookmarks-5.69"; then + PATCHES+=( "${FILESDIR}/${P}-kf5bookmarks-5.69.patch" ) # KDE-Bug 384000 + fi + + ecm_src_prepare +}