commit: cbd9da00c3c4c8e68c18cfbcb930cb46a880a0f6 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Thu Mar 19 15:41:11 2020 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> 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 <asturm <AT> 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=(