[gentoo-commits] repo/gentoo:master commit in: app-text/calibre/

["Zac Medico" <zmedico@gentoo.org>]

commit:     998c272e6cc677acc50d5c3a89a7b97aafcf5039
Author:     Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Mon Oct  2 07:46:36 2023 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Wed Oct 18 04:26:00 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=998c272e

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 <eschwartz93 <AT> gmail.com>
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 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