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/files/, app-office/ledger/
Date: Mon, 12 Aug 2019 12:26:00
Message-Id: 1565612733.e41b34d2672c0165c74fd982fa338264a63dd668.asturm@gentoo
1 commit: e41b34d2672c0165c74fd982fa338264a63dd668
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Mon Aug 12 12:18:09 2019 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Mon Aug 12 12:25:33 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e41b34d2
7
8 app-office/ledger: Drop 3.1.1-r2
9
10 Package-Manager: Portage-2.3.69, Repoman-2.3.16
11 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
12
13 app-office/ledger/Manifest | 2 -
14 app-office/ledger/files/50ledger-gentoo.el | 5 -
15 app-office/ledger/files/ledger-3.1.1-boost.patch | 22 ----
16 .../files/ledger-3.1.1-r1-boost-python.patch | 13 ---
17 app-office/ledger/ledger-3.1.1-r2.ebuild | 127 ---------------------
18 5 files changed, 169 deletions(-)
19
20 diff --git a/app-office/ledger/Manifest b/app-office/ledger/Manifest
21 index 6538340a9b0..dbc383ee8b8 100644
22 --- a/app-office/ledger/Manifest
23 +++ b/app-office/ledger/Manifest
24 @@ -1,3 +1 @@
25 -DIST de1b48a013b6f4bdf68f7edf333db63a0994ef20.patch 4533 BLAKE2B 39a2ef3b9e6a8e495837376c8a36c9276fbf58bd4ff45a07926e71ca40d65ddb5761e107752247fa2986e63d454e6461bdf0a3bc7bc773db97dcd3027091a841 SHA512 019c862fecb3f3a0682c2f1237ecebec40eafae0b38d6b5d8e56f9829155353569f889dac468ff5b1b2e23f15ae9fe538a0b027f628776f27ea818c12fd1d0b2
26 -DIST ledger-3.1.1.tar.gz 842364 BLAKE2B 83f9008f6daf4da39ece192388e0231719bc7297d2a911f1209662f57d2963b9ea09a5b6de9450ed29c5973efa47d9d6a250e052c155d9ba742cdb3ee075f341 SHA512 3f81b98a414cdfc0e272de4e958770149fb1acc8bda880d270e1459ce35294a220c52820bb9af49a751ac3a80b878f81fc7799ba41e0a1be43eba72081351bf5
27 DIST ledger-3.1.2.tar.gz 801112 BLAKE2B 71b907a83fe10857d17de746c0d124572859c9eca237130ebbfa5b730406470a5d31025736e80516feaac7daf14a4edb8b644ed72a0827f9714ac9cb2b79c0fb SHA512 445d9a9c70aa3e59718f8fb75e4110c73f2f476436149fdd456b5fe7b9cee9333c09647080049989599dfac491e5bdd0d143717e58e15989db0fcaad4e5a958d
28
29 diff --git a/app-office/ledger/files/50ledger-gentoo.el b/app-office/ledger/files/50ledger-gentoo.el
30 deleted file mode 100644
31 index 1c2c5bde2f8..00000000000
32 --- a/app-office/ledger/files/50ledger-gentoo.el
33 +++ /dev/null
34 @@ -1,5 +0,0 @@
35 -
36 -;;; app-office/ledger site-lisp configuration
37 -
38 -(add-to-list 'load-path "@SITELISP@")
39 -(autoload 'ledger-mode "ledger-mode" "A mode for editing ledger data files." t)
40
41 diff --git a/app-office/ledger/files/ledger-3.1.1-boost.patch b/app-office/ledger/files/ledger-3.1.1-boost.patch
42 deleted file mode 100644
43 index b69a42a5011..00000000000
44 --- a/app-office/ledger/files/ledger-3.1.1-boost.patch
45 +++ /dev/null
46 @@ -1,22 +0,0 @@
47 -From 1856b8c4902498843f4da37a7aaeb2ce85acc1d3 Mon Sep 17 00:00:00 2001
48 -From: Denis <dkasak@××××××××××××××××××××.com>
49 -Date: Mon, 12 Sep 2016 12:49:40 +0200
50 -Subject: [PATCH] Fix compilation error with boost 1.61
51 -
52 ----
53 - src/item.h | 2 +-
54 - 1 file changed, 1 insertion(+), 1 deletion(-)
55 -
56 -diff --git a/src/item.h b/src/item.h
57 -index ca16d87b3..4dc6df7e6 100644
58 ---- a/src/item.h
59 -+++ b/src/item.h
60 -@@ -92,7 +92,7 @@ class item_t : public supports_flags<uint_least16_t>, public scope_t
61 -
62 - typedef std::pair<optional<value_t>, bool> tag_data_t;
63 - typedef std::map<string, tag_data_t,
64 -- function<bool(string, string)> > string_map;
65 -+ std::function<bool(string, string)> > string_map;
66 -
67 - state_t _state;
68 - optional<date_t> _date;
69
70 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
71 deleted file mode 100644
72 index 6839b3f6067..00000000000
73 --- a/app-office/ledger/files/ledger-3.1.1-r1-boost-python.patch
74 +++ /dev/null
75 @@ -1,13 +0,0 @@
76 -diff --git a/CMakeLists.txt b/CMakeLists.txt
77 -index f8dbd892..6aacd5b3 100644
78 ---- a/CMakeLists.txt
79 -+++ b/CMakeLists.txt
80 -@@ -67,7 +67,7 @@ if (USE_PYTHON)
81 -
82 - find_package(PythonLibs)
83 - if (PYTHONLIBS_FOUND)
84 -- set(BOOST_PYTHON python)
85 -+ set(BOOST_PYTHON python-2.7)
86 - set(HAVE_BOOST_PYTHON 1)
87 - include_directories(SYSTEM ${PYTHON_INCLUDE_DIRS})
88 - else()
89
90 diff --git a/app-office/ledger/ledger-3.1.1-r2.ebuild b/app-office/ledger/ledger-3.1.1-r2.ebuild
91 deleted file mode 100644
92 index 9bacf38fd69..00000000000
93 --- a/app-office/ledger/ledger-3.1.1-r2.ebuild
94 +++ /dev/null
95 @@ -1,127 +0,0 @@
96 -# Copyright 1999-2019 Gentoo Authors
97 -# Distributed under the terms of the GNU General Public License v2
98 -
99 -EAPI=6
100 -
101 -PYTHON_COMPAT=( python2_7 )
102 -
103 -inherit check-reqs cmake-utils elisp-common python-single-r1
104 -
105 -DESCRIPTION="A double-entry accounting system with a command-line reporting interface"
106 -HOMEPAGE="https://www.ledger-cli.org/"
107 -SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
108 - https://github.com/ledger/ledger/commit/de1b48a013b6f4bdf68f7edf333db63a0994ef20.patch"
109 -LICENSE="BSD"
110 -KEYWORDS="amd64 x86"
111 -SLOT="0"
112 -IUSE="debug doc emacs python"
113 -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
114 -RESTRICT="test"
115 -
116 -SITEFILE=50${PN}-gentoo.el
117 -
118 -CHECKREQS_MEMORY=8G
119 -
120 -RDEPEND="
121 - dev-libs/boost:=[python?]
122 - dev-libs/gmp:0=
123 - dev-libs/mpfr:0=
124 - emacs? ( virtual/emacs )
125 - python? (
126 - dev-libs/boost:=[${PYTHON_USEDEP}]
127 - dev-python/cheetah
128 - ${PYTHON_DEPS}
129 - )
130 -"
131 -DEPEND="
132 - ${RDEPEND}
133 - dev-libs/utfcpp
134 - doc? (
135 - sys-apps/texinfo
136 - virtual/texi2dvi
137 - dev-texlive/texlive-fontsrecommended
138 - )
139 -"
140 -
141 -PATCHES=(
142 - "${FILESDIR}/${PN}-${PV}-boost.patch" # bug 609108
143 - "${FILESDIR}/${PN}-3.1.1-r1-boost-python.patch" # bug 654326
144 - "${DISTDIR}"/de1b48a013b6f4bdf68f7edf333db63a0994ef20.patch
145 - )
146 -
147 -# Building with python integration seems to fail without 8G available
148 -# RAM(!) Since the memory check in check-reqs doesn't count swap, it
149 -# may be unfair to fail the build entirely on the memory test alone.
150 -# Therefore check-reqs_pkg_pretend is deliberately omitted so that we
151 -# ewarn but not eerror.
152 -pkg_pretend() {
153 - :
154 -}
155 -
156 -pkg_setup() {
157 - if use python; then
158 - check-reqs_pkg_setup
159 - python-single-r1_pkg_setup
160 - fi
161 -}
162 -
163 -src_prepare() {
164 - cmake-utils_src_prepare
165 -
166 - # Want to type "info ledger" not "info ledger3"
167 - sed -i -e 's/ledger3/ledger/g' \
168 - doc/ledger3.texi \
169 - doc/CMakeLists.txt \
170 - test/CheckTexinfo.py \
171 - tools/cleanup.sh \
172 - tools/gendocs.sh \
173 - tools/prepare-commit-msg \
174 - tools/spellcheck.sh \
175 - || die "Failed to update info file name in file contents"
176 -
177 - mv doc/ledger{3,}.texi || die "Failed to rename info file name"
178 -
179 - eapply_user
180 -}
181 -
182 -src_configure() {
183 - local mycmakeargs=(
184 - -DBUILD_EMACSLISP="$(usex emacs)"
185 - -DBUILD_DOCS="$(usex doc)"
186 - -DBUILD_WEB_DOCS="$(usex doc)"
187 - -DUSE_PYTHON="$(usex python)"
188 - -DCMAKE_INSTALL_DOCDIR="/usr/share/doc/${PF}"
189 - -DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=ON
190 - -DBUILD_DEBUG="$(usex debug)"
191 - )
192 -
193 - cmake-utils_src_configure
194 -}
195 -
196 -src_compile() {
197 - cmake-utils_src_compile
198 -
199 - use doc && cmake-utils_src_make doc
200 -}
201 -
202 -src_install() {
203 - cmake-utils_src_install
204 -
205 - use emacs && elisp-site-file-install "${FILESDIR}/${SITEFILE}"
206 -}
207 -
208 -pkg_postinst() {
209 - use emacs && elisp-site-regen
210 -
211 - einfo
212 - einfo "Since version 3, vim support is released separately."
213 - einfo "See https://github.com/ledger/vim-ledger"
214 - einfo
215 -}
216 -
217 -pkg_postrm() {
218 - use emacs && elisp-site-regen
219 -}
220 -
221 -# rainy day TODO:
222 -# - IUSE test