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 CEF3D138334 for ; Fri, 20 Jul 2018 04:03:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9F785E09A7; Fri, 20 Jul 2018 04:03:16 +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 6B835E09A7 for ; Fri, 20 Jul 2018 04:03:16 +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 77137335CA9 for ; Fri, 20 Jul 2018 04:03:14 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 32A5C370 for ; Fri, 20 Jul 2018 04:03:11 +0000 (UTC) From: "Erik Mackdanz" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Erik Mackdanz" Message-ID: <1532059351.2642ca2a2e080d478b417a37edd1500cf1c283fd.stasibear@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/ledger/, app-office/ledger/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-office/ledger/files/ledger-3.1.1-r1-boost-python.patch app-office/ledger/ledger-3.1.1-r1.ebuild X-VCS-Directories: app-office/ledger/ app-office/ledger/files/ X-VCS-Committer: stasibear X-VCS-Committer-Name: Erik Mackdanz X-VCS-Revision: 2642ca2a2e080d478b417a37edd1500cf1c283fd X-VCS-Branch: master Date: Fri, 20 Jul 2018 04:03:11 +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-Archives-Salt: 0e5ba5bf-85ab-4819-886f-e302b8bf3095 X-Archives-Hash: add3f5a451945693a984127bd983d46a commit: 2642ca2a2e080d478b417a37edd1500cf1c283fd Author: Erik Mackdanz gentoo org> AuthorDate: Fri Jul 20 04:01:29 2018 +0000 Commit: Erik Mackdanz gentoo org> CommitDate: Fri Jul 20 04:02:31 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2642ca2a app-office/ledger: Bug fixes, EAPI=6 Closes: https://bugs.gentoo.org/635730 Closes: https://bugs.gentoo.org/635924 Closes: https://bugs.gentoo.org/642804 Closes: https://bugs.gentoo.org/654326 Package-Manager: Portage-2.3.40, Repoman-2.3.9 .../files/ledger-3.1.1-r1-boost-python.patch | 13 +++ app-office/ledger/ledger-3.1.1-r1.ebuild | 125 +++++++++++++++++++++ 2 files changed, 138 insertions(+) diff --git a/app-office/ledger/files/ledger-3.1.1-r1-boost-python.patch b/app-office/ledger/files/ledger-3.1.1-r1-boost-python.patch new file mode 100644 index 00000000000..6839b3f6067 --- /dev/null +++ b/app-office/ledger/files/ledger-3.1.1-r1-boost-python.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f8dbd892..6aacd5b3 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -67,7 +67,7 @@ if (USE_PYTHON) + + find_package(PythonLibs) + if (PYTHONLIBS_FOUND) +- set(BOOST_PYTHON python) ++ set(BOOST_PYTHON python-2.7) + set(HAVE_BOOST_PYTHON 1) + include_directories(SYSTEM ${PYTHON_INCLUDE_DIRS}) + else() diff --git a/app-office/ledger/ledger-3.1.1-r1.ebuild b/app-office/ledger/ledger-3.1.1-r1.ebuild new file mode 100644 index 00000000000..3618c77570f --- /dev/null +++ b/app-office/ledger/ledger-3.1.1-r1.ebuild @@ -0,0 +1,125 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python2_7 ) + +inherit check-reqs cmake-utils elisp-common python-single-r1 + +DESCRIPTION="A double-entry accounting system with a command-line reporting interface" +HOMEPAGE="https://www.ledger-cli.org/" +SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +KEYWORDS="~amd64 ~x86" +SLOT="0" +IUSE="doc emacs python" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" +RESTRICT="test" + +SITEFILE=50${PN}-gentoo-${PV}.el + +CHECKREQS_MEMORY=8G + +RDEPEND=" + dev-libs/boost:=[python?] + dev-libs/gmp:0= + dev-libs/mpfr:0= + emacs? ( virtual/emacs ) + python? ( + dev-libs/boost:=[${PYTHON_USEDEP}] + dev-python/cheetah + ${PYTHON_DEPS} + ) +" +DEPEND=" + ${RDEPEND} + dev-libs/utfcpp + doc? ( + sys-apps/texinfo + virtual/texi2dvi + dev-texlive/texlive-fontsrecommended + ) +" + +PATCHES=( + "${FILESDIR}/${PN}-${PV}-boost.patch" # bug 609108 + "${FILESDIR}/${PF}-boost-python.patch" # bug 654326 + ) + +# 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. +# Therefore check-reqs_pkg_pretend is deliberately omitted so that we +# ewarn but not eerror. +pkg_pretend() { + : +} + +pkg_setup() { + if use python; then + 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" + + mv doc/ledger{3,}.texi || die "Failed to rename info file name" + + eapply_user +} + +src_configure() { + local mycmakeargs=( + -DBUILD_EMACSLISP="$(usex emacs)" + -DBUILD_DOCS="$(usex doc)" + -DBUILD_WEB_DOCS="$(usex doc)" + -DUSE_PYTHON="$(usex python)" + -DCMAKE_INSTALL_DOCDIR="/usr/share/doc/${PF}" + -DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=ON + ) + + cmake-utils_src_configure +} + +src_compile() { + cmake-utils_src_compile + + use doc && cmake-utils_src_make doc +} + +src_install() { + cmake-utils_src_install + + use emacs && elisp-site-file-install "${FILESDIR}/${SITEFILE}" +} + +pkg_postinst() { + use emacs && elisp-site-regen + + einfo + einfo "Since version 3, vim support is released separately." + einfo "See https://github.com/ledger/vim-ledger" + einfo +} + +pkg_postrm() { + use emacs && elisp-site-regen +} + +# rainy day TODO: +# - IUSE test