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 2CC9A15814C for ; Wed, 18 Oct 2023 04:26:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 560E72BC036; Wed, 18 Oct 2023 04:26:16 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 41A532BC036 for ; Wed, 18 Oct 2023 04:26:16 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7BF64335D12 for ; Wed, 18 Oct 2023 04:26:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E92E3128D for ; Wed, 18 Oct 2023 04:26:13 +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: <1697603159.25c6c42bad25b01571cbcfad087e4ad8080173f6.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: 25c6c42bad25b01571cbcfad087e4ad8080173f6 X-VCS-Branch: master Date: Wed, 18 Oct 2023 04:26:13 +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: 97c58359-e3c3-4f46-ad68-7705f090f640 X-Archives-Hash: ec6e074d7fd3bec89f16c83c2708fde5 commit: 25c6c42bad25b01571cbcfad087e4ad8080173f6 Author: Eli Schwartz gmail com> AuthorDate: Mon Oct 2 05:46:38 2023 +0000 Commit: Zac Medico gentoo org> CommitDate: Wed Oct 18 04:25:59 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25c6c42b app-text/calibre: Use upstream buildsystem to integrate system fonts The liberation fonts are removed and replaced with symlinks to the system fonts. I've put quite a bit of work in upstream to make this work in a supported manner; let's use that instead of fragile, unchecked shell code. In particular, upstream's buildsystem dies if the expected fonts do not exist. Signed-off-by: Eli Schwartz gmail.com> Signed-off-by: Zac Medico gentoo.org> app-text/calibre/calibre-5.44.0-r2.ebuild | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/app-text/calibre/calibre-5.44.0-r2.ebuild b/app-text/calibre/calibre-5.44.0-r2.ebuild index 598bb98f4356..67eb556626cd 100644 --- a/app-text/calibre/calibre-5.44.0-r2.ebuild +++ b/app-text/calibre/calibre-5.44.0-r2.ebuild @@ -186,6 +186,16 @@ src_compile() { export QMAKE="$(qt5_get_bindir)/qmake" ${EPYTHON} setup.py build || die + ${EPYTHON} setup.py gui || die + + # A few different resources are bundled in the distfile by default, because + # not all systems necessarily have them. We un-vendor them, using the + # upstream integrated approach if possible. See setup/revendor.py and + # consider migrating other resources to this if they do not use it, in + # *preference* over manual rm'ing. + ${EPYTHON} setup.py liberation_fonts \ + --path-to-liberation_fonts "${EPREFIX}"/usr/share/fonts/liberation-fonts \ + --system-liberation_fonts || die } src_test() { @@ -233,13 +243,6 @@ src_install() { find "${ED}"/usr/share -type d -empty -delete - cd "${ED}"/usr/share/calibre/fonts/liberation || die - local x - for x in * ; do - [[ -f ${EPREFIX}/usr/share/fonts/liberation-fonts/${x} ]] || continue - ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die - done - einfo "Converting python shebangs" python_fix_shebang --force "${ED}"