From 998c272e6cc677acc50d5c3a89a7b97aafcf5039 Mon Sep 17 00:00:00 2001 From: Eli Schwartz Date: Mon, 2 Oct 2023 03:46:36 -0400 Subject: app-text/calibre: clean up install invocation a bit There's a bit of indirection here that isn't strictly needed: - get_libdir is guaranteed to never fail - PYTHONPATH is not necessary, setup.py internally handles this - the --staging-root and --root options are aliases, and the last one wins; simply pass it once Signed-off-by: Eli Schwartz Signed-off-by: Zac Medico --- app-text/calibre/calibre-5.44.0-r2.ebuild | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/app-text/calibre/calibre-5.44.0-r2.ebuild b/app-text/calibre/calibre-5.44.0-r2.ebuild index 8ff7f95c90aa..eaf6721e4e46 100644 --- a/app-text/calibre/calibre-5.44.0-r2.ebuild +++ b/app-text/calibre/calibre-5.44.0-r2.ebuild @@ -228,18 +228,13 @@ src_install() { export CALIBRE_CONFIG_DIRECTORY="${HOME}/.config/calibre" mkdir -p "${CALIBRE_CONFIG_DIRECTORY}" || die - local libdir=$(get_libdir) - [[ -n $libdir ]] || die "get_libdir returned an empty string" - addpredict /dev/dri #665310 - PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \ - "${PYTHON}" setup.py install \ - --root="${D}" \ - --prefix="${EPREFIX}/usr" \ - --libdir="${EPREFIX}/usr/${libdir}" \ + "${PYTHON}" setup.py install \ --staging-root="${ED}/usr" \ - --staging-libdir="${ED}/usr/${libdir}" || die + --prefix="${EPREFIX}/usr" \ + --libdir="${EPREFIX}/usr/$(get_libdir)" \ + --staging-libdir="${ED}/usr/$(get_libdir)" || die find "${ED}"/usr/share -type d -empty -delete -- cgit v1.2.3-65-gdbad