Limit the number of make jobs to 1 when building doc. There is no

reason to limit it unconditionally because parallel make only fails
on doc/Makefile - see bug \#320029 .

- Geezzz. Copy pasting this from ChangeLog is stupid, when are
we moving to git?
Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

diff --git a/gpe-base/libtododb/ChangeLog b/gpe-base/libtododb/ChangeLog
index d516b66fcf0390f3e28c0661a9e1cc742a2b33b1..52a7c09a47743f2ac478b09154580864093a27cf 100644 (file)
--- a/gpe-base/libtododb/ChangeLog
+++ b/gpe-base/libtododb/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gpe-base/libtododb
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gpe-base/libtododb/ChangeLog,v 1.3 2009/08/26 16:36:57 miknix Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gpe-base/libtododb/ChangeLog,v 1.4 2010/05/26 12:23:35 miknix Exp $
+
+  26 May 2010; Angelo Arrifano <miknix@gentoo.org> libtododb-0.11.ebuild:
+  Limit the number of make jobs to 1 when building doc. There is no
+  reason to limit it unconditionally because parallel make only fails
+  on doc/Makefile - see bug #320029 .
 
   26 Aug 2009; Angelo Arrifano <miknix@gentoo.org> libtododb-0.11.ebuild:
   Add DEPEND on dev-util/gtk-doc-am due to use of GTK_DOC_CHECK M4 macro.

diff --git a/gpe-base/libtododb/Manifest b/gpe-base/libtododb/Manifest
index b49061965617d34ff41ffbd27a97a92edaf1e3f7..7a6538d5fbd84fe3c1d5a5da020ad0f8754e2214 100644 (file)
--- a/gpe-base/libtododb/Manifest
+++ b/gpe-base/libtododb/Manifest
@@ -1,4 +1,4 @@
 DIST libtododb-0.11.tar.bz2 214770 RMD160 6993dea508392efec21cc4c26b4ee61984f9b3c6 SHA1 44a89eb3aa981a587418e7acd2974e82c7882048 SHA256 8841680d9de5b30637719f62cf1c45579700e8eadb5d35b3ece5a637ee85d488
-EBUILD libtododb-0.11.ebuild 805 RMD160 49f2017c540bbe2de01b606c4b068b4480b7bbd8 SHA1 a69f70e268e5d23d7615895404adcc94d90e146b SHA256 ac608ecac6176063a803474b89d9c7746d036c85b026a0905a5e046aba83e713
-MISC ChangeLog 628 RMD160 4b9e33d2bcf61a8aad7af162a253b62579a23264 SHA1 e83e71fe32c7ab4e8c2cab64bdd136f69ed92aab SHA256 e5d6b21b980c5ab4e8d50ca24690686f8c3718ef6d8c2eef0e27d6f991ee43dc
+EBUILD libtododb-0.11.ebuild 1107 RMD160 98877188c472f5b84931ff0b9357f9f3d90bd9df SHA1 6fc3675ff6b218eca6c6cec6f79f4a969278186e SHA256 509e5fdf18b2cf10bc0999f988b46a720f43dce4ed30b9ccbd93c86f9ff1baaf
+MISC ChangeLog 879 RMD160 62f5c350d8e19a90ed4a8bd826c5efabc9acc65b SHA1 1648ef8cc3efff16dd73d298e3807acc127e599d SHA256 9c2460e764b89d382f91a71cabdc7013f842ac7cf89935df888db398a74f6af1
 MISC metadata.xml 214 RMD160 bca5b2208a68a7a7a84355f818a615e04dcb3ca8 SHA1 d0f048fbc4c361e89505f6edb1ddda27bbc7d73e SHA256 7b5eab127a5e896980df3a9aa01494e608a8a701ae9c5478255bff89d46410af

diff --git a/gpe-base/libtododb/libtododb-0.11.ebuild b/gpe-base/libtododb/libtododb-0.11.ebuild
index 65ea6aef2ab2948d3754cda13d51c3244636e2f5..b983707f377486067e0bbe77541848c4ab4fa7f3 100644 (file)
--- a/gpe-base/libtododb/libtododb-0.11.ebuild
+++ b/gpe-base/libtododb/libtododb-0.11.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gpe-base/libtododb/libtododb-0.11.ebuild,v 1.3 2009/08/26 16:36:57 miknix Exp $
+# $Header: /var/cvsroot/gentoo-x86/gpe-base/libtododb/libtododb-0.11.ebuild,v 1.4 2010/05/26 12:23:35 miknix Exp $
 
 GPE_TARBALL_SUFFIX="bz2"
 inherit gpe autotools
@@ -27,6 +27,8 @@ DEPEND="${DEPEND}
 src_unpack() {
        gpe_src_unpack "$@"
 
+       # Build ignores --disable-gtk-doc
+       # See http://lists.linuxtogo.org/pipermail/gpe-list/2009-July/001018.html
        if ! use doc; then
                sed -i -e 's;SUBDIRS = doc;SUBDIRS = ;' Makefile.am \
                || die "sed failed"
@@ -34,3 +36,11 @@ src_unpack() {
 
        eautoreconf
 }
+
+src_compile() {
+       # Parallel make only fails when building doc, see #320029 .
+       if use doc; then
+               export MAKEOPTS="$(echo "$MAKEOPTS" | sed -e "s/-j[0-9]*/-j1/g")"
+       fi
+       gpe_src_compile "$@"
+}