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 89BC0158086 for ; Fri, 29 Oct 2021 05:57:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DDDD9E090E; Fri, 29 Oct 2021 05:57:55 +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 C04C3E090E for ; Fri, 29 Oct 2021 05:57:55 +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 C51773430CE for ; Fri, 29 Oct 2021 05:57:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5BBB5144 for ; Fri, 29 Oct 2021 05:57:53 +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: <1635487067.5df9f0d616ca5a7cc98e8813b3bcb8276ae25fd5.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.30.0.ebuild X-VCS-Directories: app-text/calibre/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 5df9f0d616ca5a7cc98e8813b3bcb8276ae25fd5 X-VCS-Branch: master Date: Fri, 29 Oct 2021 05:57:53 +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: f7a6e0a3-db3f-4fa0-ad09-3e7dd3328db2 X-Archives-Hash: 2e4a669904a5de1cbcb892143936679a commit: 5df9f0d616ca5a7cc98e8813b3bcb8276ae25fd5 Author: Zac Medico gentoo org> AuthorDate: Fri Oct 29 05:55:25 2021 +0000 Commit: Zac Medico gentoo org> CommitDate: Fri Oct 29 05:57:47 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5df9f0d6 app-text/calibre: Respect CFLAGS and LDFLAGS Closes: https://bugs.gentoo.org/814308 Closes: https://bugs.gentoo.org/814311 Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Zac Medico gentoo.org> app-text/calibre/calibre-5.30.0.ebuild | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app-text/calibre/calibre-5.30.0.ebuild b/app-text/calibre/calibre-5.30.0.ebuild index 40fa50fcc40..b01b4920f27 100644 --- a/app-text/calibre/calibre-5.30.0.ebuild +++ b/app-text/calibre/calibre-5.30.0.ebuild @@ -149,13 +149,12 @@ src_prepare() { # Disable unnecessary privilege dropping for bug #287067. sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \ -i setup/install.py || die "sed failed to patch install.py" - - sed -e "/^ self.check_call(\\[QMAKE\\] + qmc + \\[proname\\])$/a\ -\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \ + sed -e "/^ os.chdir(os.path.join(src_dir, 'build'))$/a\ +\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \ '-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \ '-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \ '-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \ -'-i', 'Makefile'])" \ +'-i', os.path.join(os.path.basename(src_dir), 'Makefile')])" \ -e "s|open(self.j(bdir, '.qmake.conf'), 'wb').close()|open(self.j(bdir, '.qmake.conf'), 'wb').write(b'QMAKE_LFLAGS += ${LDFLAGS}')|" \ -i setup/build.py || die "sed failed to patch build.py" }