public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Zac Medico" <zmedico@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/calibre/
Date: Fri, 29 Oct 2021 05:57:53 +0000 (UTC)	[thread overview]
Message-ID: <1635487067.5df9f0d616ca5a7cc98e8813b3bcb8276ae25fd5.zmedico@gentoo> (raw)

commit:     5df9f0d616ca5a7cc98e8813b3bcb8276ae25fd5
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 29 05:55:25 2021 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> 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 <zmedico <AT> 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"
 }


             reply	other threads:[~2021-10-29  5:57 UTC|newest]

Thread overview: 286+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-10-29  5:57 Zac Medico [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-10-30 11:07 [gentoo-commits] repo/gentoo:master commit in: app-text/calibre/ Sam James
2024-10-27 16:13 Eli Schwartz
2024-10-21  2:55 Eli Schwartz
2024-10-01  1:46 Sam James
2024-09-27  5:57 Eli Schwartz
2024-08-16  1:16 Eli Schwartz
2024-07-31  9:41 Arthur Zamarin
2024-07-31  9:41 Arthur Zamarin
2024-07-31  5:25 Eli Schwartz
2024-07-31  3:53 Eli Schwartz
2024-07-28 23:38 Sam James
2024-07-22  4:50 Eli Schwartz
2024-07-21 21:18 Eli Schwartz
2024-07-21 21:18 Eli Schwartz
2024-07-16  4:11 Eli Schwartz
2024-07-16  4:11 Eli Schwartz
2024-07-04  0:49 Sam James
2024-06-28 12:59 Sam James
2024-06-25  2:12 Sam James
2024-06-06  7:19 Sam James
2024-05-31 20:10 Sam James
2024-05-31 20:10 Sam James
2024-05-30  4:26 Sam James
2024-05-24 19:15 Arthur Zamarin
2024-05-24 19:15 Arthur Zamarin
2024-05-09 22:33 Sam James
2024-05-09 21:46 Sam James
2024-05-05 15:46 Sam James
2024-04-26 21:01 Sam James
2024-04-26 18:19 Sam James
2024-04-26 12:50 Sam James
2024-04-26 12:50 Sam James
2024-04-26 12:50 Sam James
2024-04-26 12:50 Sam James
2024-04-26 12:50 Sam James
2024-04-07  6:17 Sam James
2024-03-23  5:59 Sam James
2024-03-22 18:25 Sam James
2024-03-22  6:24 Arthur Zamarin
2024-03-22  6:24 Arthur Zamarin
2024-03-06  3:46 Sam James
2024-02-26 22:27 Sam James
2024-02-26 22:27 Sam James
2024-02-19  4:04 Sam James
2024-02-15 13:50 Sam James
2024-02-09  5:45 Zac Medico
2024-01-27  6:51 Sam James
2024-01-19  5:20 Zac Medico
2024-01-19  5:20 Zac Medico
2024-01-07 21:07 Zac Medico
2024-01-06  9:56 Joonas Niilola
2023-12-22 22:40 Mart Raudsepp
2023-12-15  5:15 Sam James
2023-11-29  6:05 Sam James
2023-11-28 14:16 Sam James
2023-11-24 16:55 Sam James
2023-11-19 16:18 Michał Górny
2023-11-19  8:42 Sam James
2023-11-08 16:26 Zac Medico
2023-11-08 16:26 Zac Medico
2023-11-08 16:26 Zac Medico
2023-11-08 16:26 Zac Medico
2023-11-08 16:26 Zac Medico
2023-11-08 16:26 Zac Medico
2023-11-08 16:26 Zac Medico
2023-11-08 16:26 Zac Medico
2023-10-18  4:37 Zac Medico
2023-10-18  4:26 Zac Medico
2023-10-18  4:26 Zac Medico
2023-10-18  4:26 Zac Medico
2023-10-18  4:26 Zac Medico
2023-10-18  4:26 Zac Medico
2023-10-18  4:26 Zac Medico
2023-10-18  4:26 Zac Medico
2023-10-18  4:26 Zac Medico
2023-10-18  4:26 Zac Medico
2023-10-18  4:26 Zac Medico
2023-10-18  4:26 Zac Medico
2023-10-18  4:26 Zac Medico
2023-10-18  4:26 Zac Medico
2023-10-18  4:26 Zac Medico
2023-10-18  4:26 Zac Medico
2023-10-18  4:26 Zac Medico
2023-10-18  4:26 Zac Medico
2023-10-18  4:26 Zac Medico
2023-10-18  4:26 Zac Medico
2023-10-18  4:26 Zac Medico
2023-10-18  4:26 Zac Medico
2023-10-18  4:26 Zac Medico
2023-10-18  4:26 Zac Medico
2023-10-18  4:26 Zac Medico
2023-09-21 14:59 Zac Medico
2023-03-03 18:52 Arthur Zamarin
2023-02-20 18:20 Michał Górny
2023-02-02 20:56 Sam James
2022-06-23  5:19 Sam James
2022-06-17 23:54 Zac Medico
2022-06-17 23:54 Zac Medico
2022-06-01  1:56 Sam James
2022-06-01  1:55 Sam James
2022-05-28 17:01 Zac Medico
2022-05-20 17:47 Zac Medico
2022-05-19  2:36 Zac Medico
2022-05-19  2:36 Zac Medico
2022-05-17  5:34 Sam James
2022-05-15  8:04 Michał Górny
2022-05-04  3:40 Zac Medico
2022-05-04  3:28 Zac Medico
2022-04-23 16:11 Zac Medico
2022-04-01 17:10 Zac Medico
2022-03-25  3:45 Zac Medico
2022-03-25  3:28 Zac Medico
2022-03-20 16:59 Zac Medico
2022-03-18  4:10 Zac Medico
2022-03-18  4:10 Zac Medico
2022-03-04 23:46 Zac Medico
2022-02-18 18:27 Zac Medico
2022-02-04 18:36 Zac Medico
2022-01-21  4:11 Zac Medico
2021-12-05 18:52 Zac Medico
2021-12-03  4:14 Zac Medico
2021-11-13  5:59 Sam James
2021-11-13  4:00 Zac Medico
2021-11-12  3:47 Zac Medico
2021-11-05  2:58 Zac Medico
2021-11-02 22:45 Sam James
2021-11-02 22:45 Sam James
2021-10-29  5:53 Zac Medico
2021-10-22  5:45 Zac Medico
2021-10-05  4:58 Zac Medico
2021-08-31  9:05 Michał Górny
2021-08-27 20:45 Sam James
2021-06-14 20:50 Zac Medico
2021-06-14 19:15 Zac Medico
2021-06-14 18:03 Zac Medico
2021-06-02  7:53 Andrew Ammerlaan
2021-04-19  6:17 Zac Medico
2021-04-19  0:12 Zac Medico
2021-03-10 17:55 Zac Medico
2021-03-10  6:07 Zac Medico
2020-12-06 20:51 Zac Medico
2020-12-06  1:07 Zac Medico
2020-12-05  7:58 Zac Medico
2020-12-05  7:58 Zac Medico
2020-11-29 13:07 Andreas K. Hüttel
2020-11-01 18:17 Zac Medico
2020-10-31 22:41 Zac Medico
2020-10-31 22:00 Zac Medico
2020-08-21 18:22 Agostino Sarubbo
2020-08-21  5:13 Zac Medico
2020-08-21  4:34 Zac Medico
2020-08-21  4:27 Zac Medico
2020-08-15  5:52 Sam James
2020-07-31  7:52 Zac Medico
2020-07-20  5:19 Zac Medico
2020-07-17 19:52 Zac Medico
2020-07-17 19:52 Zac Medico
2020-07-17 19:52 Zac Medico
2020-07-09 17:10 Zac Medico
2020-07-09 16:26 Zac Medico
2020-07-03  3:22 Zac Medico
2020-06-19  4:23 Zac Medico
2020-06-14 18:43 Zac Medico
2020-06-05  3:53 Zac Medico
2020-06-03 23:10 Zac Medico
2020-06-03 22:57 Zac Medico
2020-05-27  3:35 Zac Medico
2020-05-23  6:01 Zac Medico
2020-05-15  8:24 Zac Medico
2020-05-05  4:42 Zac Medico
2020-03-26 22:59 Thomas Deutschmann
2020-03-19 17:49 Michał Górny
2020-03-15 12:20 Mikle Kolyada
2020-03-07 19:01 Zac Medico
2020-03-07 18:54 Zac Medico
2020-02-22 19:59 Zac Medico
2020-02-21 23:51 Zac Medico
2020-02-17 17:58 Zac Medico
2020-02-16 20:25 Zac Medico
2020-02-15 18:44 Zac Medico
2020-02-11 13:59 Agostino Sarubbo
2020-02-09 16:47 Michał Górny
2020-02-08 13:41 Mikle Kolyada
2020-02-07 18:21 Zac Medico
2020-02-07 17:43 Zac Medico
2020-02-07  3:42 Zac Medico
2020-01-26 20:05 Zac Medico
2020-01-26 20:05 Zac Medico
2020-01-25  8:47 Zac Medico
2020-01-23 18:43 Zac Medico
2020-01-23  4:17 Zac Medico
2020-01-13  2:15 Zac Medico
2020-01-13  2:15 Zac Medico
2020-01-13  2:15 Zac Medico
2020-01-12  1:42 Zac Medico
2020-01-12  1:24 Zac Medico
2020-01-03  3:23 Zac Medico
2019-12-27  6:20 Zac Medico
2019-12-14 19:55 Zac Medico
2019-12-13  8:32 Zac Medico
2019-11-29  5:30 Zac Medico
2019-11-29  5:11 Zac Medico
2019-11-22  3:16 Zac Medico
2019-11-22  3:09 Zac Medico
2019-11-11  1:00 Zac Medico
2019-11-08  2:27 Zac Medico
2019-10-18  4:32 Zac Medico
2019-10-09 17:32 Zac Medico
2019-10-08 23:20 Zac Medico
2019-10-04  3:13 Zac Medico
2019-09-30 19:15 Zac Medico
2019-09-13  4:09 Zac Medico
2019-09-13  4:03 Zac Medico
2019-09-02  4:26 Zac Medico
2019-08-30  3:46 Zac Medico
2019-08-15 19:48 Zac Medico
2019-07-30  6:04 Michał Górny
2019-07-30  6:00 Michał Górny
2019-07-21  4:40 Zac Medico
2019-07-21  4:22 Zac Medico
2019-05-31  4:48 Zac Medico
2019-05-28 20:10 Zac Medico
2019-05-28 20:10 Zac Medico
2019-05-19 22:15 Zac Medico
2019-04-28 19:22 Zac Medico
2019-04-28 19:02 Zac Medico
2019-04-22 21:28 Zac Medico
2019-04-02  5:58 Zac Medico
2019-04-02  5:49 Zac Medico
2019-03-11 22:47 Zac Medico
2019-03-11 17:55 Zac Medico
2019-01-25  3:16 Zac Medico
2018-12-24 23:46 Zac Medico
2018-12-21  9:15 Zac Medico
2018-12-17  7:07 Zac Medico
2018-12-13 21:15 Zac Medico
2018-12-12 18:38 Zac Medico
2018-12-12 18:26 Zac Medico
2018-08-30  8:57 Mikle Kolyada
2018-08-29  1:07 Thomas Deutschmann
2018-08-28 16:47 Zac Medico
2018-07-04 18:31 Zac Medico
2018-06-06  8:25 Zac Medico
2018-03-30 21:16 Zac Medico
2018-03-30  3:05 Aaron Bauman
2018-01-08  7:10 Zac Medico
2018-01-08  6:55 Zac Medico
2018-01-08  6:45 Zac Medico
2018-01-08  2:16 Zac Medico
2018-01-07 12:37 Zac Medico
2017-10-01 20:05 Zac Medico
2017-10-01 18:28 Zac Medico
2017-07-10 15:33 Andrey Grozin
2017-06-26 22:17 Zac Medico
2017-06-26 16:27 Zac Medico
2017-06-26 16:20 Zac Medico
2017-06-25 17:40 Zac Medico
2017-06-20 12:37 Pacho Ramos
2017-06-02 14:30 Zac Medico
2017-05-12  3:37 Zac Medico
2017-05-11  0:28 Zac Medico
2017-04-24  1:52 Zac Medico
2017-04-24  0:05 Zac Medico
2017-03-10  5:58 Zac Medico
2017-02-15 16:56 Zac Medico
2017-02-15 15:56 Agostino Sarubbo
2017-02-15 11:53 Agostino Sarubbo
2017-02-08  7:08 Zac Medico
2016-11-26 22:00 Lars Wendler
2016-11-26 22:00 Lars Wendler
2016-10-16 17:36 Manuel Rüger
2016-10-16 17:36 Manuel Rüger
2016-09-19  0:41 Manuel Rüger
2016-09-07 23:49 Manuel Rüger
2016-08-06  5:01 Zac Medico
2016-07-10 17:57 Michael Palimaka
2016-04-24 18:16 Manuel Rüger
2016-01-11 11:32 Justin Lecher
2015-12-21 22:23 Ian Stakenvicius
2015-11-10 14:12 Justin Lecher
2015-11-10 13:50 Justin Lecher
2015-11-04  8:42 Justin Lecher
2015-10-30 12:04 Justin Lecher
2015-08-17  9:19 Ben de Groot
2015-08-12  6:29 Ben de Groot

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1635487067.5df9f0d616ca5a7cc98e8813b3bcb8276ae25fd5.zmedico@gentoo \
    --to=zmedico@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox