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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C3B4F138334 for ; Thu, 18 Jul 2019 20:58:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C1A99E0843; Thu, 18 Jul 2019 20:58:25 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8B830E0843 for ; Thu, 18 Jul 2019 20:58:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8D81534801D for ; Thu, 18 Jul 2019 20:58:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BDC59715 for ; Thu, 18 Jul 2019 20:58:20 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1563483483.ed2d9347b7da75bada1ffd581ad7903646427e0b.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/ledger/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-office/ledger/ledger-3.1.2.ebuild X-VCS-Directories: app-office/ledger/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: ed2d9347b7da75bada1ffd581ad7903646427e0b X-VCS-Branch: master Date: Thu, 18 Jul 2019 20:58:20 +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: 6ef58514-2caf-4f9e-b775-38bc3bdf512f X-Archives-Hash: 8a45d5fa46156638a0b8558750d11d24 commit: ed2d9347b7da75bada1ffd581ad7903646427e0b Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Jul 18 20:57:31 2019 +0000 Commit: Andreas Sturmlechner gentoo 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 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' \