app-office/ledger: constrain boost version

Fixes #572810 and #548630.

Also, remove an old ebuild and add a missing die

Package-Manager: portage-2.2.27

diff --git a/app-office/ledger/ledger-3.1-r1.ebuild b/app-office/ledger/ledger-3.1-r1.ebuild
index c1714fd590b2d95b77350298ebe517a559e992c3..67bff52a5a60dcb4c9ba037d1afa2ca765298bdc 100644 (file)
--- a/app-office/ledger/ledger-3.1-r1.ebuild
+++ b/app-office/ledger/ledger-3.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -18,7 +18,7 @@ IUSE="doc emacs"
 SITEFILE=50${PN}-gentoo-${PV}.el
 
 RDEPEND="
-       dev-libs/boost:=
+       <dev-libs/boost-1.58:=
        dev-libs/gmp:0
        dev-libs/mpfr:0
        emacs? ( virtual/emacs )

diff --git a/app-office/ledger/ledger-3.1.1.ebuild b/app-office/ledger/ledger-3.1.1.ebuild
index 13b8cfb035f895b783635871c4dce09089a53857..b4338f9bc3870d890c2a3933c3b438c4d89b0736 100644 (file)
--- a/app-office/ledger/ledger-3.1.1.ebuild
+++ b/app-office/ledger/ledger-3.1.1.ebuild
@@ -91,7 +91,8 @@ src_compile() {
 src_install() {
        # Prevent installing ledger.so into python site-packages.  It's an
        # unnecessary copy of libledger.so and generates security warnings.
-       sed -i -e '/python/d' ../${P}_build/src/cmake_install.cmake
+       sed -i -e '/python/d' ../${P}_build/src/cmake_install.cmake \
+               || die "Failed to disable installation of ledger.so"
 
        enable_cmake-utils_src_install
 

diff --git a/app-office/ledger/ledger-3.1.ebuild b/app-office/ledger/ledger-3.1.ebuild
deleted file mode 100644 (file)
index 6cdf9d9..0000000
--- a/app-office/ledger/ledger-3.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="A double-entry accounting system with a command-line reporting interface"
-HOMEPAGE="http://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=""
-
-RDEPEND="
-       dev-libs/boost:=
-       dev-libs/gmp:0
-       dev-libs/mpfr:0
-"
-DEPEND="${RDEPEND}
-       dev-libs/utfcpp
-"
-
-DOCS=(README.md)