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 98E29158089 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 DB5852BC040; 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 C00962BC03C 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 D6EF9335CA6 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 30F911290 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.998c272e6cc677acc50d5c3a89a7b97aafcf5039.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: 998c272e6cc677acc50d5c3a89a7b97aafcf5039 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: 201cfeca-a320-41db-95bd-8ccfb8697e90 X-Archives-Hash: 95ba2e73938580900378d53a5499f72e commit: 998c272e6cc677acc50d5c3a89a7b97aafcf5039 Author: Eli Schwartz gmail com> AuthorDate: Mon Oct 2 07:46:36 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=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 gmail.com> Signed-off-by: Zac Medico 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