Switch between jobs and cpus, it should be way smarter this way.

Package-Manager: portage-2.2.0_alpha58/cvs/Linux x86_64

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index ad56a5eb16ac593cb26a3e9fd9706b9e82aedbab..975424ef4df229cfccf185832f3c855e843b9395 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.136 2011/09/17 03:44:58 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.137 2011/09/17 03:46:18 scarabeus Exp $
+
+  17 Sep 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  libreoffice-9999-r1.ebuild:
+  Switch between jobs and cpus, it should be way smarter this way.
 
   17 Sep 2011; Tomáš Chvátal <scarabeus@gentoo.org>
   libreoffice-9999-r1.ebuild:

diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 558902ce11b955b04ec6d6e9254443603737dc89..40bd1b359981272fdfcfdfb192dc50b9b5241038 100644 (file)
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -173,23 +173,23 @@ EBUILD libreoffice-3.3.3.ebuild 18131 RMD160 9ac5d82927f327bff9ef1f37304f13239c0
 EBUILD libreoffice-3.3.4.ebuild 18146 RMD160 1c71a223f37c402ab01d95b71dfa5af2c69f61af SHA1 18c1211e8eaf8c587f52ee303dc264c941e7c045 SHA256 d602a3efffc23cb848b1fdc667a0d7b1c9dde2502dfae0fb537fecb9ee744cc2
 EBUILD libreoffice-3.4.3.2-r1.ebuild 18350 RMD160 54bbfb6be956667016eefe1dad15737cc44e1deb SHA1 59dafcc4461a5c8571f814b41843950420b54fdc SHA256 8f883984653e50045ec2404ce4286950bafd82cf31e97347edc38a61e1fe2b4d
 EBUILD libreoffice-3.4.9999-r1.ebuild 18356 RMD160 51b1cb846c7900663975354fd6f1d7cf0f22a177 SHA1 c7c39420e80a0644d8260db8be7a6df4ac5f6870 SHA256 028fb7cbf31d0e5189d226d7fe6d78a5fed657cddbadb84d3801ba5665f1ea5f
-EBUILD libreoffice-9999-r1.ebuild 17195 RMD160 60febe0b10b682132585355c381ff97416586a4e SHA1 a337709830fa61f2fe61a304183ac78abe4933d2 SHA256 1ea43856a41390535856354b90d2da8ab1bbbc8a4d15b9c38da3993bf6af78a4
-MISC ChangeLog 26617 RMD160 4bbd78977cfa998ac2175f135daf117e0b21347c SHA1 16e01f6dc6bfaabc55ae7267e129580e71cbbee3 SHA256 5a9b00d4c4c5149f18b444c373690f1e3fb6615b927513cec6b0fd243780c452
+EBUILD libreoffice-9999-r1.ebuild 17195 RMD160 2952ac7f1188adb62d45dc632f3a90e63fc0d7b7 SHA1 f5b3e00551882b994f659995faaf70b48faf0c22 SHA256 6bdd9eb952f55e28df19accd88ac942b3f5c9b8e0fc0f363579e27abff7c3e2d
+MISC ChangeLog 26770 RMD160 c7402b15fa4ea9044f5312d62f71c24101b7701c SHA1 a2f79e7ed7a6e20a332a495b6c8a5e1dc4442da7 SHA256 c142d1039751325c35b717b4af113e1a9609cb65656990af55364262e79e85ef
 MISC metadata.xml 980 RMD160 5201a4943c69632cf94cfaf309fba261ea5146ec SHA1 069a007c495275783c7a025f44e4f1ab59edb715 SHA256 191a40132b182e7dc3f504055341014664f42d74caa27ee8dda2b5edbbdac6c2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJOdBfSAAoJEOSiRoyO7jvoGI4QAKVR5ZZxV3w8Lf5VenjeiPrw
-CF9zUARM+CHnjOm2IzF7XuBbXjttWCK2VkzsE2VKDo4sMHygHcgl8v7pSMrHFRoB
-NXoc50Yno5b8rGIYg/VVwZjxt+sEVWDSD4rk7iATBRQMY/nIpEegf5CcIfbz1ai7
-HWj1LIXjhE+Z7cf2jajKJCZG/t+3i8QLEW6dqaz/FgSn4XcwD/SFgVCIIrI52nP2
-4FOmSsg9cvlkTus6GThltb1BJvUvcwatwOd+eByg8BZlgg8sgy1kqJoE+Zv2fHxP
-VfvDNaA0HDCE4a2H/IFskfNLP7bXA87Nsj+J32cEHXorcW2dXvpdlffYapkMzmL6
-p7UtInJxoF+dWaA7LVte8vzosllcrux2YuLrygNHduHkWrXg++w7aXKj5a9nhzad
-TdAYsEuMW+XLjYabek8VYbE5wXmpQ2VhMB6fGbVkx/bB0SMo5Y+bRuuDuOSKsj+W
-HzsF5enbSoMny74myIkWTGbyZa5v6XDIeXmjvmBqi2Cp5v+Mq/dcH8HwcZkUEXzj
-gSJGKLcMSY7IS4fcP1u/85b+kF7jBm84YfsGqB1iYcsVX2xzFCa7mw85ItwD9ksl
-h+LzeHl8lPw3hS6rz1k2Z6DFOSTCMXlIPECZNg7CoH8KxfEIu+Oc9bxrWLhj5pSE
-Z130P9I6iKRiFpGQEgDn
-=gicP
+iQIcBAEBAgAGBQJOdBgiAAoJEOSiRoyO7jvoXCwP/2mLVAUZkvwpHeISeworu2hp
+o45iaIDpVC28wsCzjt0qkuKJ+1jlu0ZwTHKa5F5jpk50PJ5yjT6t0Hal2lSfS1SJ
+kLqxv9KwJfVs5fTkRM1JePMduFaH8iFw+bpyE9tFFM7h/BH9FDJU2Vn0W89eIuzi
+yvDvUk5gH8HqpzRKy+JmtU3a1weXODVn3bzaKFQ0vW2LpxUdIjqYpvstMecjVWSO
+WafbUgMzvBpWDjZtmYJ01k1sUdr9/1P9wpi20FGHOUNDQ2deqdRljv5shx1ISfg8
+kicTJQdn+mMn8KvhticwhI90zJffM4cgbeBM8VTUwblRkEWZcTuVbK8prcxE7QGJ
+dJ7FgxXEACDiIFxinCcVrGayIqeHlQ6VEVUd4+vV59MLbRWiaamEc99AVbCGMc1c
+tM4ONAKan2esoXgA1QC7MvZ+M/qGOXwCpQwY4PTQeIFDs4mH+J+oemn4YkIxPFM/
+/+8TT3IidV0y7x/Lj3XIah1Bb+UkNBh1mq1ncsdxSR66+F2kPJIjyfPdkV/ppG71
+cIvs2eveX+5ahdp8VWGGUH7/VSbURLrwJLafpkEWtogXzkUKgebLoYsOJC3Ox1Gn
+fvmJPoPjiJG36JavxL+V+lFY/iWmMeUswoAii2ZFQuuqmMhQylHtPZQjLQ+WT3lD
+stly0/bVuYZC7FudETpu
+=Zawh
 -----END PGP SIGNATURE-----

diff --git a/app-office/libreoffice/libreoffice-9999-r1.ebuild b/app-office/libreoffice/libreoffice-9999-r1.ebuild
index 886494beb4a014542ab14cfc5f728c13577cfd1b..1352cf3c24331b09838f28f1cf58fde39f255d77 100644 (file)
--- a/app-office/libreoffice/libreoffice-9999-r1.ebuild
+++ b/app-office/libreoffice/libreoffice-9999-r1.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-9999-r1.ebuild,v 1.12 2011/09/17 03:44:58 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r1.ebuild,v 1.13 2011/09/17 03:46:18 scarabeus Exp $
 
 EAPI=3
 
@@ -450,8 +450,8 @@ src_configure() {
                --with-external-thes-dir="${EPREFIX}/usr/share/myspell" \
                --with-external-tar="${DISTDIR}" \
                --with-lang="" \
-               --with-max-jobs=${jbs} \
-               --with-num-cpus=1 \
+               --with-max-jobs=1 \
+               --with-num-cpus=${jbs} \
                --with-theme="${themes}" \
                --with-unix-wrapper=libreoffice \
                --with-vendor="Gentoo Foundation" \