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 B13F915814D 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 E09292BC03D; Wed, 18 Oct 2023 04:26:17 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 C34FC2BC03D 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 D850B335CDF for ; Wed, 18 Oct 2023 04:26:16 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1D2E3128F 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: <1697603160.b831451172bd7855c915363be94339699eaec4ea.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: b831451172bd7855c915363be94339699eaec4ea 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: ea29fa46-2bf1-4e74-b328-fbb5287bc6d5 X-Archives-Hash: 68aebf57bcfb9e56f217187ea77205f4 commit: b831451172bd7855c915363be94339699eaec4ea Author: Eli Schwartz gmail com> AuthorDate: Mon Oct 2 06:55:48 2023 +0000 Commit: Zac Medico gentoo org> CommitDate: Wed Oct 18 04:26:00 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8314511 app-text/calibre: Remove erroneous "binary install" workaround This has never been caused by the upstream binary install, which installs to /opt and does not affect from-source installs under any circumstances ever. What did happen is back during the major version update from 2.85 to 3.0, upstream stopped including a vendored regex/ module, and started expecting it to be installed as a system dependency. Under most circumstances, this was fine, and simply installing the dependency would get things working. One possible edge case occurred, however, when the old version of the package did NOT byte-compile the vendored regex module, but calibre was run as root. (There are reasons it might end up being run as root, the most obvious being that a user wanted to run the headless server or another command-line tool.) If this happened, then the python interpreter would automatically byte-compile every module on import, but the PM wouldn't track it for removal. After an upgrade, the cached file could still be imported and would effectively mask the system version of the regex module, but would be missing the binary portion. Signed-off-by: Eli Schwartz gmail.com> Signed-off-by: Zac Medico gentoo.org> app-text/calibre/calibre-5.44.0-r2.ebuild | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/app-text/calibre/calibre-5.44.0-r2.ebuild b/app-text/calibre/calibre-5.44.0-r2.ebuild index e2db565d6f63..8ff7f95c90aa 100644 --- a/app-text/calibre/calibre-5.44.0-r2.ebuild +++ b/app-text/calibre/calibre-5.44.0-r2.ebuild @@ -253,23 +253,7 @@ src_install() { newconfd "${FILESDIR}"/calibre-server-3.conf calibre-server } -pkg_preinst() { - # Indentify stray directories from upstream's "Binary install" - # method (see bug 622728). - CALIBRE_LIB_DIR=/usr/$(get_libdir)/calibre - CALIBRE_LIB_CONTENT=$(for x in "${ED}${CALIBRE_LIB_DIR}"/*; do - printf -- "${x##*/} "; done) || die "Failed to list ${ED}${CALIBRE_LIB_DIR}" -} - pkg_postinst() { - [[ -n ${CALIBRE_LIB_DIR} ]] || die "CALIBRE_LIB_DIR is unset" - local x - for x in "${EROOT}${CALIBRE_LIB_DIR}"/*; do - if [[ " ${CALIBRE_LIB_CONTENT} " != *" ${x##*/} "* ]]; then - elog "Purging '${x}'" - rm -rf "${x}" - fi - done xdg_desktop_database_update xdg_mimeinfo_database_update xdg_icon_cache_update