public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/ledger/
Date: Thu, 18 Jul 2019 20:58:20 +0000 (UTC)	[thread overview]
Message-ID: <1563483483.ed2d9347b7da75bada1ffd581ad7903646427e0b.asturm@gentoo> (raw)

commit:     ed2d9347b7da75bada1ffd581ad7903646427e0b
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 18 20:57:31 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jul 18 20:58:03 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed2d9347

app-office/ledger: Fix build with >=boost-1.70

Closes: https://bugs.gentoo.org/654326
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 app-office/ledger/ledger-3.1.2.ebuild | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/app-office/ledger/ledger-3.1.2.ebuild b/app-office/ledger/ledger-3.1.2.ebuild
index 1fe3082e204..d027cb0f735 100644
--- a/app-office/ledger/ledger-3.1.2.ebuild
+++ b/app-office/ledger/ledger-3.1.2.ebuild
@@ -62,10 +62,13 @@ pkg_setup() {
 
 src_prepare() {
 	cmake-utils_src_prepare
-	sed -r -i \
-		-e '/set.BOOST_PYTHON/s/python27/python-2.7/g' \
-		"${S}/CMakeLists.txt" \
-		|| die "Failed to update CMakeLists.txt for python2.7 boost"
+
+	if ! has_version ">=dev-libs/boost-1.70"; then
+		sed -r -i \
+			-e '/set.BOOST_PYTHON/s/python27/python-2.7/g' \
+			"${S}/CMakeLists.txt" \
+			|| die "Failed to update CMakeLists.txt for python2.7 boost"
+	fi
 
 	# Want to type "info ledger" not "info ledger3"
 	sed -i -e 's/ledger3/ledger/g' \


             reply	other threads:[~2019-07-18 20:58 UTC|newest]

Thread overview: 48+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-07-18 20:58 Andreas Sturmlechner [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-02-09  4:38 [gentoo-commits] repo/gentoo:master commit in: app-office/ledger/ Erik Mackdanz
2025-02-09  4:38 Erik Mackdanz
2024-11-03 20:12 Erik Mackdanz
2024-11-03 20:12 Erik Mackdanz
2024-05-28 18:19 Arthur Zamarin
2024-05-28 12:35 Sam James
2024-05-28 12:11 Michał Górny
2024-05-19 20:11 Erik Mackdanz
2023-07-02 19:55 Erik Mackdanz
2023-07-02 19:55 Erik Mackdanz
2023-04-08 16:26 Erik Mackdanz
2023-04-08 16:26 Erik Mackdanz
2023-04-08 16:26 Erik Mackdanz
2023-03-19 13:49 Erik Mackdanz
2023-03-03 15:19 Robin H. Johnson
2023-03-02  6:04 Erik Mackdanz
2023-03-02  6:04 Erik Mackdanz
2022-09-04 12:12 David Seifert
2022-07-01  5:22 Erik Mackdanz
2022-04-12 22:36 Jakov Smolić
2022-04-12 19:10 Arthur Zamarin
2022-04-12 19:04 Arthur Zamarin
2021-01-23 20:17 Erik Mackdanz
2021-01-23 20:16 Erik Mackdanz
2020-11-18 14:45 Erik Mackdanz
2020-09-19  8:04 Michał Górny
2020-08-18 11:22 Agostino Sarubbo
2020-08-18 11:16 Agostino Sarubbo
2020-05-24 20:28 Andreas Sturmlechner
2020-05-24 20:28 Andreas Sturmlechner
2020-02-09 16:11 Michał Górny
2019-08-12  8:02 Agostino Sarubbo
2019-08-11  8:19 Andreas Sturmlechner
2019-07-27  8:17 Andreas Sturmlechner
2019-02-13 21:16 Robin H. Johnson
2018-10-30 15:13 Andreas Sturmlechner
2018-08-29  1:58 Erik Mackdanz
2018-08-15  6:23 Robin H. Johnson
2018-02-12 11:11 Patrice Clement
2017-06-11 11:27 Alexis Ballier
2017-04-20  7:59 David Seifert
2016-12-24  2:21 Erik Mackdanz
2016-12-11  0:15 David Seifert
2016-10-21  2:27 Erik Mackdanz
2016-09-14  2:15 Erik Mackdanz
2016-08-07  8:02 Pacho Ramos
2016-02-21 19:17 Erik Mackdanz

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=1563483483.ed2d9347b7da75bada1ffd581ad7903646427e0b.asturm@gentoo \
    --to=asturm@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