Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/ledger/
Date: Thu, 18 Jul 2019 20:58:26
Message-Id: 1563483483.ed2d9347b7da75bada1ffd581ad7903646427e0b.asturm@gentoo
1 commit: ed2d9347b7da75bada1ffd581ad7903646427e0b
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jul 18 20:57:31 2019 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Thu Jul 18 20:58:03 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed2d9347
7
8 app-office/ledger: Fix build with >=boost-1.70
9
10 Closes: https://bugs.gentoo.org/654326
11 Package-Manager: Portage-2.3.69, Repoman-2.3.16
12 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
13
14 app-office/ledger/ledger-3.1.2.ebuild | 11 +++++++----
15 1 file changed, 7 insertions(+), 4 deletions(-)
16
17 diff --git a/app-office/ledger/ledger-3.1.2.ebuild b/app-office/ledger/ledger-3.1.2.ebuild
18 index 1fe3082e204..d027cb0f735 100644
19 --- a/app-office/ledger/ledger-3.1.2.ebuild
20 +++ b/app-office/ledger/ledger-3.1.2.ebuild
21 @@ -62,10 +62,13 @@ pkg_setup() {
22
23 src_prepare() {
24 cmake-utils_src_prepare
25 - sed -r -i \
26 - -e '/set.BOOST_PYTHON/s/python27/python-2.7/g' \
27 - "${S}/CMakeLists.txt" \
28 - || die "Failed to update CMakeLists.txt for python2.7 boost"
29 +
30 + if ! has_version ">=dev-libs/boost-1.70"; then
31 + sed -r -i \
32 + -e '/set.BOOST_PYTHON/s/python27/python-2.7/g' \
33 + "${S}/CMakeLists.txt" \
34 + || die "Failed to update CMakeLists.txt for python2.7 boost"
35 + fi
36
37 # Want to type "info ledger" not "info ledger3"
38 sed -i -e 's/ledger3/ledger/g' \