[gentoo-commits] repo/gentoo:master commit in: app-office/ledger/files/, app-office/ledger/

[gentoo-commits] repo/gentoo:master commit in: app-office/ledger/files/, app-office/ledger/

[Andreas Sturmlechner]

commit:     90863b09bea41eb793557549ec84c8d9ca144df4
Author:     Francesco Turco <fturco <AT> fastmail <DOT> fm>
AuthorDate: Thu Sep  7 20:26:04 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Oct 28 16:51:36 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90863b09

app-office/ledger: Fix build with >=dev-libs/boost-1.61

Gentoo-bug: 609108
Closes: https://github.com/gentoo/gentoo/pull/5655

 app-office/ledger/files/ledger-3.1.1-boost.patch | 22 ++++++++++++++++++++++
 app-office/ledger/ledger-3.1.1.ebuild            |  2 ++
 2 files changed, 24 insertions(+)

diff --git a/app-office/ledger/files/ledger-3.1.1-boost.patch b/app-office/ledger/files/ledger-3.1.1-boost.patch
new file mode 100644
index 00000000000..b69a42a5011
--- /dev/null
+++ b/app-office/ledger/files/ledger-3.1.1-boost.patch
@@ -0,0 +1,22 @@
+From 1856b8c4902498843f4da37a7aaeb2ce85acc1d3 Mon Sep 17 00:00:00 2001
+From: Denis <dkasak@users.noreply.github.com>
+Date: Mon, 12 Sep 2016 12:49:40 +0200
+Subject: [PATCH] Fix compilation error with boost 1.61
+
+---
+ src/item.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/item.h b/src/item.h
+index ca16d87b3..4dc6df7e6 100644
+--- a/src/item.h
++++ b/src/item.h
+@@ -92,7 +92,7 @@ class item_t : public supports_flags<uint_least16_t>, public scope_t
+ 
+   typedef std::pair<optional<value_t>, bool> tag_data_t;
+   typedef std::map<string, tag_data_t,
+-                   function<bool(string, string)> > string_map;
++                   std::function<bool(string, string)> > string_map;
+ 
+   state_t              _state;
+   optional<date_t>     _date;

diff --git a/app-office/ledger/ledger-3.1.1.ebuild b/app-office/ledger/ledger-3.1.1.ebuild
index f32cda9c830..31ed49d068b 100644
--- a/app-office/ledger/ledger-3.1.1.ebuild
+++ b/app-office/ledger/ledger-3.1.1.ebuild
@@ -42,6 +42,8 @@ DEPEND="
 	)
 "
 
+PATCHES=( "${FILESDIR}/${P}-boost.patch" ) # bug 609108
+
 # 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.

[gentoo-commits] repo/gentoo:master commit in: app-office/ledger/files/, app-office/ledger/

[Andreas Sturmlechner]

commit:     e41b34d2672c0165c74fd982fa338264a63dd668
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 12 12:18:09 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Aug 12 12:25:33 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e41b34d2

app-office/ledger: Drop 3.1.1-r2

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

 app-office/ledger/Manifest                         |   2 -
 app-office/ledger/files/50ledger-gentoo.el         |   5 -
 app-office/ledger/files/ledger-3.1.1-boost.patch   |  22 ----
 .../files/ledger-3.1.1-r1-boost-python.patch       |  13 ---
 app-office/ledger/ledger-3.1.1-r2.ebuild           | 127 ---------------------
 5 files changed, 169 deletions(-)

diff --git a/app-office/ledger/Manifest b/app-office/ledger/Manifest
index 6538340a9b0..dbc383ee8b8 100644
--- a/app-office/ledger/Manifest
+++ b/app-office/ledger/Manifest
@@ -1,3 +1 @@
-DIST de1b48a013b6f4bdf68f7edf333db63a0994ef20.patch 4533 BLAKE2B 39a2ef3b9e6a8e495837376c8a36c9276fbf58bd4ff45a07926e71ca40d65ddb5761e107752247fa2986e63d454e6461bdf0a3bc7bc773db97dcd3027091a841 SHA512 019c862fecb3f3a0682c2f1237ecebec40eafae0b38d6b5d8e56f9829155353569f889dac468ff5b1b2e23f15ae9fe538a0b027f628776f27ea818c12fd1d0b2
-DIST ledger-3.1.1.tar.gz 842364 BLAKE2B 83f9008f6daf4da39ece192388e0231719bc7297d2a911f1209662f57d2963b9ea09a5b6de9450ed29c5973efa47d9d6a250e052c155d9ba742cdb3ee075f341 SHA512 3f81b98a414cdfc0e272de4e958770149fb1acc8bda880d270e1459ce35294a220c52820bb9af49a751ac3a80b878f81fc7799ba41e0a1be43eba72081351bf5
 DIST ledger-3.1.2.tar.gz 801112 BLAKE2B 71b907a83fe10857d17de746c0d124572859c9eca237130ebbfa5b730406470a5d31025736e80516feaac7daf14a4edb8b644ed72a0827f9714ac9cb2b79c0fb SHA512 445d9a9c70aa3e59718f8fb75e4110c73f2f476436149fdd456b5fe7b9cee9333c09647080049989599dfac491e5bdd0d143717e58e15989db0fcaad4e5a958d

diff --git a/app-office/ledger/files/50ledger-gentoo.el b/app-office/ledger/files/50ledger-gentoo.el
deleted file mode 100644
index 1c2c5bde2f8..00000000000
--- a/app-office/ledger/files/50ledger-gentoo.el
+++ /dev/null
@@ -1,5 +0,0 @@
-
-;;; app-office/ledger site-lisp configuration
-
-(add-to-list 'load-path "@SITELISP@")
-(autoload 'ledger-mode "ledger-mode" "A mode for editing ledger data files." t)

diff --git a/app-office/ledger/files/ledger-3.1.1-boost.patch b/app-office/ledger/files/ledger-3.1.1-boost.patch
deleted file mode 100644
index b69a42a5011..00000000000
--- a/app-office/ledger/files/ledger-3.1.1-boost.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 1856b8c4902498843f4da37a7aaeb2ce85acc1d3 Mon Sep 17 00:00:00 2001
-From: Denis <dkasak@users.noreply.github.com>
-Date: Mon, 12 Sep 2016 12:49:40 +0200
-Subject: [PATCH] Fix compilation error with boost 1.61
-
----
- src/item.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/item.h b/src/item.h
-index ca16d87b3..4dc6df7e6 100644
---- a/src/item.h
-+++ b/src/item.h
-@@ -92,7 +92,7 @@ class item_t : public supports_flags<uint_least16_t>, public scope_t
- 
-   typedef std::pair<optional<value_t>, bool> tag_data_t;
-   typedef std::map<string, tag_data_t,
--                   function<bool(string, string)> > string_map;
-+                   std::function<bool(string, string)> > string_map;
- 
-   state_t              _state;
-   optional<date_t>     _date;

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
deleted file mode 100644
index 6839b3f6067..00000000000
--- a/app-office/ledger/files/ledger-3.1.1-r1-boost-python.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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-r2.ebuild b/app-office/ledger/ledger-3.1.1-r2.ebuild
deleted file mode 100644
index 9bacf38fd69..00000000000
--- a/app-office/ledger/ledger-3.1.1-r2.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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
-		 https://github.com/ledger/ledger/commit/de1b48a013b6f4bdf68f7edf333db63a0994ef20.patch"
-LICENSE="BSD"
-KEYWORDS="amd64 x86"
-SLOT="0"
-IUSE="debug doc emacs python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RESTRICT="test"
-
-SITEFILE=50${PN}-gentoo.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}/${PN}-3.1.1-r1-boost-python.patch" # bug 654326
-	"${DISTDIR}"/de1b48a013b6f4bdf68f7edf333db63a0994ef20.patch
-	)
-
-# 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
-		-DBUILD_DEBUG="$(usex debug)"
-	)
-
-	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

[gentoo-commits] repo/gentoo:master commit in: app-office/ledger/files/, app-office/ledger/

[Sam James]

commit:     068d3cff008f530abe5a6c8d7daeabdc9b805387
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 14 12:46:22 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jun 14 12:46:50 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=068d3cff

app-office/ledger: fix build with Boost 1.76

Closes: https://bugs.gentoo.org/790176
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../files/ledger-3.2.1-fix-build-boost-1-76.patch  | 28 ++++++++++++++++++++++
 app-office/ledger/ledger-3.2.1.ebuild              |  4 ++++
 2 files changed, 32 insertions(+)

diff --git a/app-office/ledger/files/ledger-3.2.1-fix-build-boost-1-76.patch b/app-office/ledger/files/ledger-3.2.1-fix-build-boost-1-76.patch
new file mode 100644
index 00000000000..62d2d609511
--- /dev/null
+++ b/app-office/ledger/files/ledger-3.2.1-fix-build-boost-1-76.patch
@@ -0,0 +1,28 @@
+From fa37f595b3c44dc7ac86b29d105ae6417c3e0080 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Mon, 14 Jun 2021 12:37:58 +0000
+Subject: [PATCH] Fix compilation with Boost 1.76
+
+---
+--- a/src/expr.cc
++++ b/src/expr.cc
+@@ -35,6 +35,8 @@
+ #include "parser.h"
+ #include "scope.h"
+ 
++#include <boost/smart_ptr/scoped_ptr.hpp>
++
+ namespace ledger {
+ 
+ expr_t::expr_t() : base_type()
+--- a/src/format.h
++++ b/src/format.h
+@@ -45,6 +45,8 @@
+ #include "expr.h"
+ #include "unistring.h"
+ 
++#include <boost/smart_ptr/scoped_ptr.hpp>
++
+ namespace ledger {
+ 
+ class unistring;

diff --git a/app-office/ledger/ledger-3.2.1.ebuild b/app-office/ledger/ledger-3.2.1.ebuild
index 467af5e0eb0..a17e0d29f87 100644
--- a/app-office/ledger/ledger-3.2.1.ebuild
+++ b/app-office/ledger/ledger-3.2.1.ebuild
@@ -42,6 +42,10 @@ DEPEND="${RDEPEND}
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.2.1-fix-build-boost-1-76.patch
+)
+
 pkg_pretend() {
 	if use python; then
 		check-reqs_pkg_pretend