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 CE855138350 for ; Thu, 19 Mar 2020 15:43:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 23766E0BAF; Thu, 19 Mar 2020 15:43:11 +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 092D9E0BAF for ; Thu, 19 Mar 2020 15:43:10 +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 A191134F263 for ; Thu, 19 Mar 2020 15:43:09 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8AA0B192 for ; Thu, 19 Mar 2020 15:43:06 +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: <1584632566.cbd9da00c3c4c8e68c18cfbcb930cb46a880a0f6.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-misc/kio-gdrive/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-misc/kio-gdrive/kio-gdrive-1.2.7.ebuild X-VCS-Directories: kde-misc/kio-gdrive/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: cbd9da00c3c4c8e68c18cfbcb930cb46a880a0f6 X-VCS-Branch: master Date: Thu, 19 Mar 2020 15:43:06 +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: 4616e9ef-110d-4cc7-9c9a-474c934caa0b X-Archives-Hash: 78f7f04864c4add65c33b7c4b7ff98e0 commit: cbd9da00c3c4c8e68c18cfbcb930cb46a880a0f6 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Mar 19 15:41:11 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Mar 19 15:42:46 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbd9da00 kde-misc/kio-gdrive: Conditionalise backwards incompatible patch Closes: https://bugs.gentoo.org/713360 Package-Manager: Portage-2.3.94, Repoman-2.3.21 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-misc/kio-gdrive/kio-gdrive-1.2.7.ebuild | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/kde-misc/kio-gdrive/kio-gdrive-1.2.7.ebuild b/kde-misc/kio-gdrive/kio-gdrive-1.2.7.ebuild index 1a713692b2a..a36f78862b1 100644 --- a/kde-misc/kio-gdrive/kio-gdrive-1.2.7.ebuild +++ b/kde-misc/kio-gdrive/kio-gdrive-1.2.7.ebuild @@ -42,10 +42,13 @@ RDEPEND="${COMMON_DEPEND} DOCS=( README.md ) -PATCHES=( - "${FILESDIR}"/${PN}-1.2.6-refresh-credentials.patch - "${FILESDIR}"/${P}-kaccounts-integration-20.04.patch -) +PATCHES=( "${FILESDIR}"/${PN}-1.2.6-refresh-credentials.patch ) + +src_prepare() { + has_version ">=kde-apps/kaccounts-providers-20.03.80" && + PATCHES+=( "${FILESDIR}"/${P}-kaccounts-integration-20.04.patch ) + ecm_src_prepare +} src_configure() { local mycmakeargs=(