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 8069E15814C for ; Wed, 8 Nov 2023 16:26:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 014012BC021; Wed, 8 Nov 2023 16:26:49 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 D04D92BC01F for ; Wed, 8 Nov 2023 16:26:48 +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 08C7C335D91 for ; Wed, 8 Nov 2023 16:26:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5CC681338 for ; Wed, 8 Nov 2023 16:26:46 +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: <1699460797.80e58a44068d3c23c4918c550bf4bc68ad81742b.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-6.29.0.ebuild app-text/calibre/metadata.xml X-VCS-Directories: app-text/calibre/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 80e58a44068d3c23c4918c550bf4bc68ad81742b X-VCS-Branch: master Date: Wed, 8 Nov 2023 16:26:46 +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: 70c5322e-e398-4895-949e-b5f2756a9d9f X-Archives-Hash: 3829ba5c1f89bde13b98d652ab173527 commit: 80e58a44068d3c23c4918c550bf4bc68ad81742b Author: Eli Schwartz gmail com> AuthorDate: Thu Oct 19 21:19:08 2023 +0000 Commit: Zac Medico gentoo org> CommitDate: Wed Nov 8 16:26:37 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80e58a44 app-text/calibre: add support for the system mathjax This devendors a bundled copy of dev-libs/mathjax-3, creates symlinks to the system copy, and regenerates the deployed assets. Requires new package that has fewer keywords, so drop ours to match. Signed-off-by: Eli Schwartz gmail.com> Signed-off-by: Zac Medico gentoo.org> app-text/calibre/calibre-6.29.0.ebuild | 10 ++++++++-- app-text/calibre/metadata.xml | 1 + 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/app-text/calibre/calibre-6.29.0.ebuild b/app-text/calibre/calibre-6.29.0.ebuild index 22431a8f977d..81452b86bbb4 100644 --- a/app-text/calibre/calibre-6.29.0.ebuild +++ b/app-text/calibre/calibre-6.29.0.ebuild @@ -35,9 +35,9 @@ LICENSE=" OFL-1.1 PSF-2 " -KEYWORDS="~amd64 ~arm ~x86" +KEYWORDS="~amd64" SLOT="0" -IUSE="+font-subsetting ios speech test +udisks" +IUSE="+font-subsetting ios speech +system-mathjax test +udisks" RESTRICT="!test? ( test )" @@ -96,6 +96,7 @@ COMMON_DEPEND="${PYTHON_DEPS} >=app-pda/libimobiledevice-1.2.0 ) speech? ( $(python_gen_cond_dep 'app-accessibility/speech-dispatcher[python,${PYTHON_USEDEP}]') ) + system-mathjax? ( >=dev-libs/mathjax-3 ) udisks? ( virtual/libudev )" RDEPEND="${COMMON_DEPEND} udisks? ( sys-fs/udisks:2 )" @@ -107,6 +108,7 @@ BDEPEND="$(python_gen_cond_dep ' >=dev-python/sip-5[${PYTHON_USEDEP}] ') virtual/pkgconfig + system-mathjax? ( dev-lang/rapydscript-ng ) verify-sig? ( sec-keys/openpgp-keys-kovidgoyal ) " @@ -169,6 +171,10 @@ src_compile() { edo ${EPYTHON} setup.py liberation_fonts \ --path-to-liberation_fonts "${EPREFIX}"/usr/share/fonts/liberation-fonts \ --system-liberation_fonts + if use system-mathjax; then + edo ${EPYTHON} setup.py mathjax --path-to-mathjax "${EPREFIX}"/usr/share/mathjax --system-mathjax + edo ${EPYTHON} setup.py rapydscript + fi } src_test() { diff --git a/app-text/calibre/metadata.xml b/app-text/calibre/metadata.xml index 1b2e2f427bd3..469a9e3455c2 100644 --- a/app-text/calibre/metadata.xml +++ b/app-text/calibre/metadata.xml @@ -15,5 +15,6 @@ Enable font subsetting support Enable text-to-speech support + Use a system copy of mathjax