diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2011-07-25 11:19:44 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2011-07-25 11:19:44 +0000 |
| commit | 786437082b493a967cca876ca163159e19c8b373 (patch) | |
| tree | bd7daff092ecda9e5dacc86e7aa93031283bc7b1 /app-office | |
| parent | Version bump. (diff) | |
| download | gentoo-2-786437082b493a967cca876ca163159e19c8b373.tar.gz gentoo-2-786437082b493a967cca876ca163159e19c8b373.tar.bz2 gentoo-2-786437082b493a967cca876ca163159e19c8b373.zip | |
Upgrade jobs parsing per bug 375761. Thx to Drake Wyrm for the sed.
(Portage version: 2.2.0_alpha47/cvs/Linux x86_64)
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/libreoffice/ChangeLog | 6 | ||||
| -rw-r--r-- | app-office/libreoffice/libreoffice-3.4.2.2.ebuild | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog index 78657932a338..986476b5b002 100644 --- 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/libreoffice-3.4.2.2.ebuild b/app-office/libreoffice/libreoffice-3.4.2.2.ebuild index 46b2e7e270ff..a16e090f4d65 100644 --- 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" |