1 |
commit: 4fd570e04759fdba7f23ffdf96a4716a39d05150 |
2 |
Author: Erik Mackdanz <stasibear <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Feb 21 19:17:03 2016 +0000 |
4 |
Commit: Erik Mackdanz <stasibear <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Feb 21 19:17:59 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fd570e0 |
7 |
|
8 |
app-office/ledger: constrain boost version |
9 |
|
10 |
Fixes #572810 and #548630. |
11 |
|
12 |
Also, remove an old ebuild and add a missing die |
13 |
|
14 |
Package-Manager: portage-2.2.27 |
15 |
|
16 |
app-office/ledger/ledger-3.1-r1.ebuild | 4 ++-- |
17 |
app-office/ledger/ledger-3.1.1.ebuild | 3 ++- |
18 |
app-office/ledger/ledger-3.1.ebuild | 27 --------------------------- |
19 |
3 files changed, 4 insertions(+), 30 deletions(-) |
20 |
|
21 |
diff --git a/app-office/ledger/ledger-3.1-r1.ebuild b/app-office/ledger/ledger-3.1-r1.ebuild |
22 |
index c1714fd..67bff52 100644 |
23 |
--- a/app-office/ledger/ledger-3.1-r1.ebuild |
24 |
+++ b/app-office/ledger/ledger-3.1-r1.ebuild |
25 |
@@ -1,4 +1,4 @@ |
26 |
-# Copyright 1999-2015 Gentoo Foundation |
27 |
+# Copyright 1999-2016 Gentoo Foundation |
28 |
# Distributed under the terms of the GNU General Public License v2 |
29 |
# $Id$ |
30 |
|
31 |
@@ -18,7 +18,7 @@ IUSE="doc emacs" |
32 |
SITEFILE=50${PN}-gentoo-${PV}.el |
33 |
|
34 |
RDEPEND=" |
35 |
- dev-libs/boost:= |
36 |
+ <dev-libs/boost-1.58:= |
37 |
dev-libs/gmp:0 |
38 |
dev-libs/mpfr:0 |
39 |
emacs? ( virtual/emacs ) |
40 |
|
41 |
diff --git a/app-office/ledger/ledger-3.1.1.ebuild b/app-office/ledger/ledger-3.1.1.ebuild |
42 |
index 13b8cfb..b4338f9 100644 |
43 |
--- a/app-office/ledger/ledger-3.1.1.ebuild |
44 |
+++ b/app-office/ledger/ledger-3.1.1.ebuild |
45 |
@@ -91,7 +91,8 @@ src_compile() { |
46 |
src_install() { |
47 |
# Prevent installing ledger.so into python site-packages. It's an |
48 |
# unnecessary copy of libledger.so and generates security warnings. |
49 |
- sed -i -e '/python/d' ../${P}_build/src/cmake_install.cmake |
50 |
+ sed -i -e '/python/d' ../${P}_build/src/cmake_install.cmake \ |
51 |
+ || die "Failed to disable installation of ledger.so" |
52 |
|
53 |
enable_cmake-utils_src_install |
54 |
|
55 |
|
56 |
diff --git a/app-office/ledger/ledger-3.1.ebuild b/app-office/ledger/ledger-3.1.ebuild |
57 |
deleted file mode 100644 |
58 |
index 6cdf9d9..0000000 |
59 |
--- a/app-office/ledger/ledger-3.1.ebuild |
60 |
+++ /dev/null |
61 |
@@ -1,27 +0,0 @@ |
62 |
-# Copyright 1999-2015 Gentoo Foundation |
63 |
-# Distributed under the terms of the GNU General Public License v2 |
64 |
-# $Id$ |
65 |
- |
66 |
-EAPI=5 |
67 |
- |
68 |
-inherit cmake-utils |
69 |
- |
70 |
-DESCRIPTION="A double-entry accounting system with a command-line reporting interface" |
71 |
-HOMEPAGE="http://ledger-cli.org/" |
72 |
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
73 |
- |
74 |
-LICENSE="BSD" |
75 |
-KEYWORDS="~amd64 ~x86" |
76 |
-SLOT="0" |
77 |
-IUSE="" |
78 |
- |
79 |
-RDEPEND=" |
80 |
- dev-libs/boost:= |
81 |
- dev-libs/gmp:0 |
82 |
- dev-libs/mpfr:0 |
83 |
-" |
84 |
-DEPEND="${RDEPEND} |
85 |
- dev-libs/utfcpp |
86 |
-" |
87 |
- |
88 |
-DOCS=(README.md) |