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 7273A158089 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 07BF82BC022; 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 D247F2BC021 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 E70D7335D92 for ; Wed, 8 Nov 2023 16:26:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 497FA1337 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: <1699460796.08d4f78209dedcc8d8cd319edeab2aff807daea6.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 X-VCS-Directories: app-text/calibre/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 08d4f78209dedcc8d8cd319edeab2aff807daea6 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: d1f307bd-6da9-4f65-8ddb-e81a501f33b2 X-Archives-Hash: 892400c605b7a6cd2c88e07b1d2257f4 commit: 08d4f78209dedcc8d8cd319edeab2aff807daea6 Author: Eli Schwartz gmail com> AuthorDate: Tue Oct 24 19:36:06 2023 +0000 Commit: Zac Medico gentoo org> CommitDate: Wed Nov 8 16:26:36 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08d4f782 app-text/calibre: use "edo" for proper build logs Signed-off-by: Eli Schwartz gmail.com> Signed-off-by: Zac Medico gentoo.org> app-text/calibre/calibre-6.29.0.ebuild | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/app-text/calibre/calibre-6.29.0.ebuild b/app-text/calibre/calibre-6.29.0.ebuild index e2f2210a4c0e..22431a8f977d 100644 --- a/app-text/calibre/calibre-6.29.0.ebuild +++ b/app-text/calibre/calibre-6.29.0.ebuild @@ -6,7 +6,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{10..11} ) PYTHON_REQ_USE="ipv6(+),sqlite,ssl" -inherit toolchain-funcs python-single-r1 qmake-utils verify-sig xdg-utils +inherit edo toolchain-funcs python-single-r1 qmake-utils verify-sig xdg-utils DESCRIPTION="Ebook management application" HOMEPAGE="https://calibre-ebook.com/" @@ -158,17 +158,17 @@ src_compile() { export FT_LIB_DIR="${MY_LIBDIR}" HUNSPELL_LIB_DIR="${MY_LIBDIR}" PODOFO_LIB_DIR="${MY_LIBDIR}" export QMAKE="$(qt6_get_bindir)/qmake" - ${EPYTHON} setup.py build || die - ${EPYTHON} setup.py gui || die + edo ${EPYTHON} setup.py build + edo ${EPYTHON} setup.py gui # 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 \ + edo ${EPYTHON} setup.py liberation_fonts \ --path-to-liberation_fonts "${EPREFIX}"/usr/share/fonts/liberation-fonts \ - --system-liberation_fonts || die + --system-liberation_fonts } src_test() { @@ -190,7 +190,7 @@ src_test() { test_searching ) - ${PYTHON} setup.py test "${_test_excludes[@]/#/--exclude-test-name=}" || die + edo ${PYTHON} setup.py test "${_test_excludes[@]/#/--exclude-test-name=}" } src_install() { @@ -214,12 +214,12 @@ src_install() { # If this directory doesn't exist, zsh completion won't install dodir /usr/share/zsh/site-functions - "${PYTHON}" setup.py install \ + edo "${PYTHON}" setup.py install \ --staging-root="${ED}/usr" \ --prefix="${EPREFIX}/usr" \ --libdir="${EPREFIX}/usr/$(get_libdir)" \ --staging-libdir="${ED}/usr/$(get_libdir)" \ - --system-plugins-location="${EPREFIX}/usr/share/calibre/system-plugins" || die + --system-plugins-location="${EPREFIX}/usr/share/calibre/system-plugins" cp -r man-pages/ "${ED}"/usr/share/man || die