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 A1FF9158086 for ; Fri, 22 Oct 2021 05:46:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E1F3AE0866; Fri, 22 Oct 2021 05:46:00 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C8665E0866 for ; Fri, 22 Oct 2021 05:46:00 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 96D963431A6 for ; Fri, 22 Oct 2021 05:45:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F2C67162 for ; Fri, 22 Oct 2021 05:45:57 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1634881474.797e48fc572e31870215cba1559198909ad363f3.zmedico@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/calibre/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-text/calibre/calibre-5.16.1-r1.ebuild X-VCS-Directories: app-text/calibre/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 797e48fc572e31870215cba1559198909ad363f3 X-VCS-Branch: master Date: Fri, 22 Oct 2021 05:45:57 +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: a7585aa8-cc1f-4269-9a9f-dd60199d1f4e X-Archives-Hash: 8830f352be509db0cb83e14a154e50e4 commit: 797e48fc572e31870215cba1559198909ad363f3 Author: Zac Medico gentoo org> AuthorDate: Fri Oct 22 05:41:09 2021 +0000 Commit: Zac Medico gentoo org> CommitDate: Fri Oct 22 05:44:34 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=797e48fc app-text/calibre: remove 5.16.1-r1 sipv4 conditional The ebuild explicitly requires sipv4 via DEPEND, and therefore the conditional is inappropriate. Bug: https://bugs.gentoo.org/793986#c29 Reported-by: Eli Schwartz archlinux.org> Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Zac Medico gentoo.org> app-text/calibre/calibre-5.16.1-r1.ebuild | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/app-text/calibre/calibre-5.16.1-r1.ebuild b/app-text/calibre/calibre-5.16.1-r1.ebuild index 023d6a32a35..32b84b85f21 100644 --- a/app-text/calibre/calibre-5.16.1-r1.ebuild +++ b/app-text/calibre/calibre-5.16.1-r1.ebuild @@ -124,12 +124,8 @@ src_prepare() { eapply \ "${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \ "${FILESDIR}/${PN}-disable_plugins.patch" \ - "${FILESDIR}/${P}-zeroconf.patch" - - if ! has_version ">=dev-python/sip-5"; then - einfo "Applying SIP v4 patch because SIP v5 was not detected" - eapply "${WORKDIR}/${PN}-5.16.0-SIP-v4.patch" - fi + "${FILESDIR}/${P}-zeroconf.patch" \ + "${WORKDIR}/${PN}-5.16.0-SIP-v4.patch" eapply_user