From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-916491-garchives=archives.gentoo.org@lists.gentoo.org> 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 196291395E2 for <garchives@archives.gentoo.org>; Sun, 11 Dec 2016 00:15:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 086C3E0B2C; Sun, 11 Dec 2016 00:15:37 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C71C2E0B2C for <gentoo-commits@lists.gentoo.org>; Sun, 11 Dec 2016 00:15:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9D46D341130 for <gentoo-commits@lists.gentoo.org>; Sun, 11 Dec 2016 00:15:35 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A15B4494 for <gentoo-commits@lists.gentoo.org>; Sun, 11 Dec 2016 00:15:32 +0000 (UTC) From: "David Seifert" <soap@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" <soap@gentoo.org> Message-ID: <1481415326.f09fe4809ba88d7849a5cd691c33f63cbc48daf7.soap@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.1.ebuild X-VCS-Directories: app-office/ledger/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: f09fe4809ba88d7849a5cd691c33f63cbc48daf7 X-VCS-Branch: master Date: Sun, 11 Dec 2016 00:15:32 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: fa3f752f-4aaa-46a7-86f9-46a82b29c2ea X-Archives-Hash: e80899e3fd3cd9ee7dd1b7c36069bd91 commit: f09fe4809ba88d7849a5cd691c33f63cbc48daf7 Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Sun Dec 11 00:15:07 2016 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Sun Dec 11 00:15:26 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f09fe480 app-office/ledger: [QA] Minor fixes * Simplify dev-libs/boost dependency * Add missing call to 'cmake-utils_src_prepare' * Remove DOCS, as einstalldocs already covers this * Fix wrong indentation * Call correct 'cmake-utils_src_install' function Package-Manager: portage-2.3.3 app-office/ledger/ledger-3.1.1.ebuild | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/app-office/ledger/ledger-3.1.1.ebuild b/app-office/ledger/ledger-3.1.1.ebuild index 679e7b6..7bf7605 100644 --- a/app-office/ledger/ledger-3.1.1.ebuild +++ b/app-office/ledger/ledger-3.1.1.ebuild @@ -22,11 +22,10 @@ SITEFILE=50${PN}-gentoo-${PV}.el CHECKREQS_MEMORY=8G COMMON_DEPEND=" - dev-libs/gmp:0 - dev-libs/mpfr:0 + dev-libs/boost:=[python?] + dev-libs/gmp:0= + dev-libs/mpfr:0= emacs? ( virtual/emacs ) - python? ( dev-libs/boost:=[python] ) - !python? ( dev-libs/boost:= ) " RDEPEND=" ${COMMON_DEPEND} @@ -41,8 +40,6 @@ DEPEND=" ) " -DOCS=(README.md) - # Building with python integration seems to fail without 8G available # RAM(!) Since the memory check in check-reqs doesn't count swap, it # may be unfair to fail the build entirely on the memory test alone. @@ -51,24 +48,27 @@ DOCS=(README.md) pkg_pretend() { : } + pkg_setup() { if use python; then - check-reqs_pkg_setup - python-single-r1_pkg_setup + check-reqs_pkg_setup + python-single-r1_pkg_setup fi } src_prepare() { + cmake-utils_src_prepare + # Want to type "info ledger" not "info ledger3" sed -i -e 's/ledger3/ledger/g' \ - doc/ledger3.texi \ - doc/CMakeLists.txt \ - test/CheckTexinfo.py \ - tools/cleanup.sh \ - tools/gendocs.sh \ - tools/prepare-commit-msg \ - tools/spellcheck.sh \ - || die "Failed to update info file name in file contents" + doc/ledger3.texi \ + doc/CMakeLists.txt \ + test/CheckTexinfo.py \ + tools/cleanup.sh \ + tools/gendocs.sh \ + tools/prepare-commit-msg \ + tools/spellcheck.sh \ + || die "Failed to update info file name in file contents" mv doc/ledger{3,}.texi || die "Failed to rename info file name" } @@ -97,7 +97,7 @@ src_install() { sed -i -e '/python/d' ../${P}_build/src/cmake_install.cmake \ || die "Failed to disable installation of ledger.so" - enable_cmake-utils_src_install + cmake-utils_src_install # This source dir appears to include some helper code for serving # reports to a browser ("ledger server"). I can't quite get it to