Gentoo Archives: gentoo-commits

From: Pacho Ramos <pacho@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/gnucash/
Date: Sat, 04 Feb 2017 18:39:15
Message-Id: 1486233541.e8a9fae823802beb44c7b0261f9bf18147169bcd.pacho@gentoo
1 commit: e8a9fae823802beb44c7b0261f9bf18147169bcd
2 Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
3 AuthorDate: Sat Feb 4 18:38:26 2017 +0000
4 Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
5 CommitDate: Sat Feb 4 18:39:01 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8a9fae8
7
8 app-office/gnucash: Really pass variables to gnome2_src_install
9
10 Package-Manager: Portage-2.3.3, Repoman-2.3.1
11
12 app-office/gnucash/gnucash-2.6.15-r1.ebuild | 4 +++-
13 app-office/gnucash/gnucash-2.6.15.ebuild | 4 +++-
14 2 files changed, 6 insertions(+), 2 deletions(-)
15
16 diff --git a/app-office/gnucash/gnucash-2.6.15-r1.ebuild b/app-office/gnucash/gnucash-2.6.15-r1.ebuild
17 index 9707d62..fd5767c 100644
18 --- a/app-office/gnucash/gnucash-2.6.15-r1.ebuild
19 +++ b/app-office/gnucash/gnucash-2.6.15-r1.ebuild
20 @@ -101,7 +101,9 @@ src_configure() {
21
22 src_install() {
23 # Parallel installation fails from time to time, bug #359123
24 - gnome2_src_install -j1 GNC_DOC_INSTALL_DIR=/usr/share/doc/${PF}
25 + # Usually reproducible after removing any gnucash installed copy
26 + MAKEOPTS="${MAKEOPTS} -j1" GNC_DOC_INSTALL_DIR=/usr/share/doc/${PF} \
27 + gnome2_src_install
28
29 rm -rf "${ED}"/usr/share/doc/${PF}/{examples/,COPYING,INSTALL,*win32-bin.txt,projects.html}
30 mv "${ED}"/usr/share/doc/${PF} "${T}"/cantuseprepalldocs || die
31
32 diff --git a/app-office/gnucash/gnucash-2.6.15.ebuild b/app-office/gnucash/gnucash-2.6.15.ebuild
33 index 613dc57..e4b71b0 100644
34 --- a/app-office/gnucash/gnucash-2.6.15.ebuild
35 +++ b/app-office/gnucash/gnucash-2.6.15.ebuild
36 @@ -102,7 +102,9 @@ src_configure() {
37
38 src_install() {
39 # Parallel installation fails from time to time, bug #359123
40 - gnome2_src_install -j1 GNC_DOC_INSTALL_DIR=/usr/share/doc/${PF}
41 + # Usually reproducible after removing any gnucash installed copy
42 + MAKEOPTS="${MAKEOPTS} -j1" GNC_DOC_INSTALL_DIR=/usr/share/doc/${PF} \
43 + gnome2_src_install
44
45 rm -rf "${ED}"/usr/share/doc/${PF}/{examples/,COPYING,INSTALL,*win32-bin.txt,projects.html}
46 mv "${ED}"/usr/share/doc/${PF} "${T}"/cantuseprepalldocs || die