commit:     080103195a8b542af4d54890797857b7008a1123
Author:     Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Mon Oct 16 02:29:27 2023 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> 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 <eschwartz93 <AT> gmail.com>
Signed-off-by: Zac Medico <zmedico <AT> 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"

Reply via email to