Set num_cpus to 1, and max_jobs to the jobs from MAKEOPTS, otherwise you end up with...

Package-Manager: portage-2.1.10.3/cvs/Linux ppc64

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index bb2da40032dec4e3ba9b9c4f530a1c6aa8477c69..6f6b5bbca17d9c74e5d2566550ec0be776e3b060 100644 (file)
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/libreoffice
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.73 2011/07/28 15:30:29 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.74 2011/07/28 17:58:39 halcy0n Exp $
+
+  28 Jul 2011; Mark Loeser <halcy0n@gentoo.org> libreoffice-3.4.2.3.ebuild:
+  Set num_cpus to 1, and max_jobs to the jobs from MAKEOPTS, otherwise you end
+  up with way more jobs running than intended
 
   28 Jul 2011; Tomáš Chvátal <scarabeus@gentoo.org>
   files/libreoffice-as-needed-gtk.patch:

diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 02db3b3d3617b505180c6dfcccb2b9ae8d59185c..674098d7f194663d9366ca921e7e14c53d54342d 100644 (file)
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -165,13 +165,13 @@ DIST libreoffice-writer-3.4.2.3.tar.bz2 7294695 RMD160 2a7210c518376d9fe5c6e8a50
 DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 EBUILD libreoffice-3.3.1.ebuild 18572 RMD160 d92d1933c8bbde7d28425b11717614cf6cf7b1e0 SHA1 60ef1f62c341ce7997de7ff5bcef04b304f4dfd9 SHA256 a3fae0a7f7da4a92e67d9c86ba4e7f92a92bbfac8f40a2703c64f317b670da6b
 EBUILD libreoffice-3.3.3.ebuild 18134 RMD160 95cf52bf10765cd9bb7862c673dc57a96bcca376 SHA1 4a001ff974125839ad5219915bb2f8399e6f90f8 SHA256 a60d52f57767ac5e9f46ad5204dd27b4f4a45ac1468357c41462b502d37b8626
-EBUILD libreoffice-3.4.2.3.ebuild 18384 RMD160 ede96109f1902b4a0e11f82e93462566572767ac SHA1 30eea1b1425b255e1bc4e273befdd021b1f9cecb SHA256 6e8dc652afe37f6a4a897b0abfb699fb196b8b20591f53b7fbcf088678fcd302
-MISC ChangeLog 14791 RMD160 160c2dc14042b71be67d75aa6281bcf5c62c7ab0 SHA1 468b8cd2598d06c372ed2a6ce1cfad4fd4a0387c SHA256 d1d3b75491aa4204fedffeae9a39fd0e1e3dd34b8eca7a7b47935a88a7608bc4
+EBUILD libreoffice-3.4.2.3.ebuild 18378 RMD160 e4099bf5ba0c9abaf545c595c71263105452f93f SHA1 ec2ace8a97f3d39d64f926d941a096a8bbfd3729 SHA256 052bf51ac0dd04822267709932b725648bf3a4877986401c8cba0c8700621a9e
+MISC ChangeLog 14991 RMD160 ebf0e0c72615d747506bcba9d0b46cfedf90990b SHA1 2271c7d3d29c27644f2f9a98df5f297712d4d489 SHA256 91644391fdf3e86da4b60dbf0598d8afb397da626a02a48e5bf1e583db038181
 MISC metadata.xml 1070 RMD160 5a010568eabba00eaa6193765fa5d181462dc5a5 SHA1 9973d230e4e10704136eddd33c8e20ddf485ba9f SHA256 c15b697bd70ccf20aef38b02b55a316cc02df24e027daf6d9b0d185d920469b3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk4xgF4ACgkQHB6c3gNBRYdM1wCgpj4AgZdeKj7LvQMZPgKLaT+P
-qZcAn3DAtbbJZYrog7cT+SMa3pYd1qs1
-=KXR3
+iEYEARECAAYFAk4xo1cACgkQCRZPokWLroSPrgCfQFfNoWlA1ihA0rqpLWWcVVaX
+ChEAoI5qy5IW6QczIWt/JebpEYoooDy/
+=lfQg
 -----END PGP SIGNATURE-----

diff --git a/app-office/libreoffice/libreoffice-3.4.2.3.ebuild b/app-office/libreoffice/libreoffice-3.4.2.3.ebuild
index f19f3afcb5c7eae8e73e1d5010df635807da9545..319437f6340ae2d05cfc3fac8d7b5f9f12820179 100644 (file)
--- a/app-office/libreoffice/libreoffice-3.4.2.3.ebuild
+++ b/app-office/libreoffice/libreoffice-3.4.2.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.3.ebuild,v 1.9 2011/07/28 14:22:21 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.3.ebuild,v 1.10 2011/07/28 17:58:39 halcy0n Exp $
 
 EAPI=3
 
@@ -470,7 +470,7 @@ src_configure() {
                --with-external-tar="${DISTDIR}" \
                --with-lang="${LINGUAS_OOO}" \
                --with-max-jobs=${jbs} \
-               --with-num-cpus=${jbs} \
+               --with-num-cpus=1 \
                --with-theme="${themes}" \
                --with-unix-wrapper=libreoffice \
                --with-vendor="Gentoo Foundation" \