Upgrade jobs parsing per bug 375761. Thx to Drake Wyrm for the sed.

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

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index 78657932a3389b77f4f979069d7dae054f7d7b68..986476b5b002eb4037f35f0d5ce83b566ad6ebb9 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.47 2011/07/25 10:42:13 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.48 2011/07/25 11:19:44 scarabeus Exp $
+
+  25 Jul 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  libreoffice-3.4.2.2.ebuild:
+  Upgrade jobs parsing per bug 375761. Thx to Drake Wyrm for the sed.
 
   25 Jul 2011; Tomáš Chvátal <scarabeus@gentoo.org>
   libreoffice-3.4.2.2.ebuild, +files/libreoffice-solenv-build-crash.patch,

diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 16aa10a81636eb11852dd21090aa4138cb12b72b..c1bcac67c43e39b065bb04974508ffc1d90b799f 100644 (file)
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -208,13 +208,13 @@ EBUILD libreoffice-3.3.1.ebuild 18572 RMD160 d92d1933c8bbde7d28425b11717614cf6cf
 EBUILD libreoffice-3.3.2.ebuild 18122 RMD160 c8f363b391004652a2a3c7b1c2660df9d604a475 SHA1 7578952923caf5ed05a54c5cc2c951b86d7acbee SHA256 ebadb43837677bbcec00992718f67c6610c4d049d441f06d15814276c9c11207
 EBUILD libreoffice-3.3.3.ebuild 18134 RMD160 95cf52bf10765cd9bb7862c673dc57a96bcca376 SHA1 4a001ff974125839ad5219915bb2f8399e6f90f8 SHA256 a60d52f57767ac5e9f46ad5204dd27b4f4a45ac1468357c41462b502d37b8626
 EBUILD libreoffice-3.4.1.ebuild 19176 RMD160 9f22a8c93f185f56dfaa37a291f194bc8f1972c8 SHA1 91eb7e4e285643d5c8da3acf1bf952fb68916efe SHA256 0b895bc9569a3b3ca84fe8d54fb861a4570ba8ec57317c0fcd8cf3b03e010274
-EBUILD libreoffice-3.4.2.2.ebuild 18744 RMD160 b879c97dcf9e40808709ed92f6c795a186f33660 SHA1 22e66de3f9fea1accdf47141585a5c57767d99f2 SHA256 2c910eef98d0b8defb6c34d03c0addf1d34276d18582a3b4d87ad61cf9bfea95
-MISC ChangeLog 9769 RMD160 21a6f0fa2a8a5d05c0cdc0f8035e89f570281bb8 SHA1 44f06a77bc4c96cba6a8b50fba75f39458b7431f SHA256 5bfe07f07685cfe96e887b40081a8ac17af3f431358aa63c085c376f4d756e4f
+EBUILD libreoffice-3.4.2.2.ebuild 18777 RMD160 b86b290230b499ebb29e47d6f87d2277e696ac70 SHA1 e24a72b06fce79284f0563fcf657741ed5a5b18c SHA256 8e210006ebcb7d621f4b662c8064661457164d060208eb5a1a51d5aea3895f05
+MISC ChangeLog 9925 RMD160 be95e2e8bb736ba349684f573e83ac6538d76072 SHA1 4c10add2745412ecef58fc4f38e9aa79e8bf0120 SHA256 897538d9a3e08eaebb58e278caecc44fe80ac863f2286c9c54ac690ba06cbba7
 MISC metadata.xml 882 RMD160 fec57be29e81f82a00fe1a3792d06bf55094312f SHA1 2256f830fe8568d99a9104a8446dde40259546d0 SHA256 4b55d790375e3eb2cd00a94f2327efccc0a505cb8e3358eb9a15e44f917f5333
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk4tSPMACgkQHB6c3gNBRYe02gCgiOXwr5sZYD/sCxZJcBqwQo1G
-LFIAoJgf6lUwN+bNs6lJbjZorBDIUfWQ
-=tcne
+iEYEARECAAYFAk4tUVYACgkQHB6c3gNBRYeh4wCfc1XBd4rjnH23hJ8rxN6HsXES
+/NAAoJlUMi3PtP4B+rn+Ij37YzgmMiEU
+=4tdT
 -----END PGP SIGNATURE-----

diff --git a/app-office/libreoffice/libreoffice-3.4.2.2.ebuild b/app-office/libreoffice/libreoffice-3.4.2.2.ebuild
index 46b2e7e270ff5edf3fe0f286ec66bd86f432dc9f..a16e090f4d658f36bba288b657ba859c0c83fd26 100644 (file)
--- a/app-office/libreoffice/libreoffice-3.4.2.2.ebuild
+++ b/app-office/libreoffice/libreoffice-3.4.2.2.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.2.ebuild,v 1.7 2011/07/25 10:42:13 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild,v 1.8 2011/07/25 11:19:44 scarabeus Exp $
 
 EAPI=3
 
@@ -337,7 +337,7 @@ src_configure() {
        local internal_libs
        local extensions
        local themes="default"
-       local jobs=$(echo "${MAKEOPTS}" | sed -e "s/.*-j\([0-9]\+\).*/\1/")
+       local jobs=$(sed -ne 's/.*\(-j[[:space:]]*\|--jobs=\)\([[:digit:]]\+\).*/\2/;T;p' <<< "${MAKEOPTS}")
 
        # expand themes we are going to build based on DE useflags
        use gnome && themes+=" tango"