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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id AC1FB15814C for ; Wed, 18 Oct 2023 04:26:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D511C2BC03F; Wed, 18 Oct 2023 04:26:17 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BDB9D2BC03B for ; Wed, 18 Oct 2023 04:26:17 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0BC63335D1C for ; Wed, 18 Oct 2023 04:26:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6B8C01293 for ; Wed, 18 Oct 2023 04:26:14 +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: <1697603162.080103195a8b542af4d54890797857b7008a1123.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.44.0-r2.ebuild X-VCS-Directories: app-text/calibre/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 080103195a8b542af4d54890797857b7008a1123 X-VCS-Branch: master Date: Wed, 18 Oct 2023 04:26:14 +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: fb5438e4-d94a-4970-aad3-9f1f17c0e4fb X-Archives-Hash: 7edfcc55d7fa2562c8fc6db686fbe6c1 commit: 080103195a8b542af4d54890797857b7008a1123 Author: Eli Schwartz gmail com> AuthorDate: Mon Oct 16 02:29:27 2023 +0000 Commit: Zac Medico gentoo org> CommitDate: Wed Oct 18 04:26:02 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08010319 app-text/calibre: misc cleanup guard a command that cannot die with `|| die` for style reasons. Drop a commented-out bit of code that is no longer relevant. Signed-off-by: Eli Schwartz gmail.com> Signed-off-by: Zac Medico gentoo.org> app-text/calibre/calibre-5.44.0-r2.ebuild | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/app-text/calibre/calibre-5.44.0-r2.ebuild b/app-text/calibre/calibre-5.44.0-r2.ebuild index b90a58692d78..8a63bfb638e5 100644 --- a/app-text/calibre/calibre-5.44.0-r2.ebuild +++ b/app-text/calibre/calibre-5.44.0-r2.ebuild @@ -156,11 +156,6 @@ src_prepare() { # # If in doubt about a problem, checking Fedora's packaging is recommended. - # Fix outdated version constant. - #sed -e "s#\\(^numeric_version =\\).*#\\1 (${PV//./, })#" \ - # -i src/calibre/constants.py || \ - # die "sed failed to patch constants.py" - # Disable unnecessary privilege dropping for bug #287067. sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \ -i setup/install.py || die "sed failed to patch install.py" @@ -238,7 +233,7 @@ src_install() { --libdir="${EPREFIX}/usr/$(get_libdir)" \ --staging-libdir="${ED}/usr/$(get_libdir)" || die - find "${ED}"/usr/share -type d -empty -delete + find "${ED}"/usr/share -type d -empty -delete || die einfo "Converting python shebangs" python_fix_shebang "${ED}/usr/bin"