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-text/gnome-doc-utils/
Date: Sun, 29 May 2016 13:03:50
Message-Id: 1464526970.16e38a842f1728d38f9dec7e26a32c172d3503fc.pacho@gentoo
1 commit: 16e38a842f1728d38f9dec7e26a32c172d3503fc
2 Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
3 AuthorDate: Sun May 29 13:02:50 2016 +0000
4 Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
5 CommitDate: Sun May 29 13:02:50 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16e38a84
7
8 app-text/gnome-doc-utils: Parallel build fails (#574282)
9
10 Package-Manager: portage-2.3.0_rc1
11
12 .../gnome-doc-utils/gnome-doc-utils-0.20.10-r1.ebuild | 15 ++++++---------
13 1 file changed, 6 insertions(+), 9 deletions(-)
14
15 diff --git a/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r1.ebuild b/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r1.ebuild
16 index 66c1556..efd1d43 100644
17 --- a/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r1.ebuild
18 +++ b/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r1.ebuild
19 @@ -1,9 +1,8 @@
20 -# Copyright 1999-2015 Gentoo Foundation
21 +# Copyright 1999-2016 Gentoo Foundation
22 # Distributed under the terms of the GNU General Public License v2
23 # $Id$
24
25 -EAPI="5"
26 -GCONF_DEBUG="no"
27 +EAPI=6
28 PYTHON_COMPAT=( python2_7 )
29
30 inherit gnome2 multibuild python-r1
31 @@ -18,9 +17,8 @@ KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~
32 IUSE=""
33 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
34
35 -RDEPEND="
36 - ${PYTHON_DEPS}
37 - >=dev-libs/libxml2-2.6.12[python,${PYTHON_USEDEP}]
38 +RDEPEND="${PYTHON_DEPS}
39 + >=dev-libs/libxml2-2.6.12:2[python,${PYTHON_USEDEP}]
40 >=dev-libs/libxslt-1.1.8
41 "
42 DEPEND="${RDEPEND}
43 @@ -38,7 +36,7 @@ DEPEND="${RDEPEND}
44
45 src_prepare() {
46 # Stop build from relying on installed package
47 - epatch "${FILESDIR}"/${P}-fix-out-of-tree-build.patch
48 + eapply "${FILESDIR}"/${P}-fix-out-of-tree-build.patch
49
50 gnome2_src_prepare
51
52 @@ -57,7 +55,7 @@ src_configure() {
53 }
54
55 src_compile() {
56 - python_foreach_impl run_in_build_dir gnome2_src_compile
57 + MAKEOPTS="${MAKEOPTS} -j1" python_foreach_impl run_in_build_dir gnome2_src_compile #574282
58 }
59
60 src_test() {
61 @@ -65,7 +63,6 @@ src_test() {
62 }
63
64 src_install() {
65 - dodoc AUTHORS ChangeLog NEWS README
66 python_foreach_impl run_in_build_dir gnome2_src_install
67 python_replicate_script "${ED}"/usr/bin/xml2po
68 }