diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2011-07-26 13:11:14 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2011-07-26 13:11:14 +0000 |
| commit | 9a98b9441907b7b5169299d4fffd1e14aa1e25f7 (patch) | |
| tree | b36b4028b3f8579fa283ca9515085ea6ccf91072 /app-office | |
| parent | Fixed compilation with >=curl-7.21.7 (bug #375899) (diff) | |
| download | gentoo-2-9a98b9441907b7b5169299d4fffd1e14aa1e25f7.tar.gz gentoo-2-9a98b9441907b7b5169299d4fffd1e14aa1e25f7.tar.bz2 gentoo-2-9a98b9441907b7b5169299d4fffd1e14aa1e25f7.zip | |
Set default theme to crystal, set jobs to 1 if the sed does not find any value, and rename the variable to not collide with bash jobs command.
(Portage version: 2.2.0_alpha47/cvs/Linux x86_64)
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/libreoffice/ChangeLog | 7 | ||||
| -rw-r--r-- | app-office/libreoffice/libreoffice-3.4.2.2.ebuild | 13 |
2 files changed, 14 insertions, 6 deletions
diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog index d88cf5ecffbd..ffcf4803a865 100644 --- a/app-office/libreoffice/ChangeLog +++ b/app-office/libreoffice/ChangeLog @@ -1,6 +1,11 @@ # 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.53 2011/07/26 13:05:05 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.54 2011/07/26 13:11:14 scarabeus Exp $ + + 26 Jul 2011; Tomáš Chvátal <scarabeus@gentoo.org> + libreoffice-3.4.2.2.ebuild: + Set default theme to crystal, set jobs to 1 if the sed does not find any + value, and rename the variable to not collide with bash jobs command. 26 Jul 2011; Tomáš Chvátal <scarabeus@gentoo.org> +files/libreoffice-as-needed-gtk-2.patch, libreoffice-3.4.2.2.ebuild, diff --git a/app-office/libreoffice/libreoffice-3.4.2.2.ebuild b/app-office/libreoffice/libreoffice-3.4.2.2.ebuild index f7bac16a1eba..613fe75ad57a 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.13 2011/07/26 13:05:05 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild,v 1.14 2011/07/26 13:11:14 scarabeus Exp $ EAPI=3 @@ -338,8 +338,11 @@ src_configure() { local java_opts local internal_libs local extensions - local themes="default" - local jobs=$(sed -ne 's/.*\(-j[[:space:]]*\|--jobs=\)\([[:digit:]]\+\).*/\2/;T;p' <<< "${MAKEOPTS}") + local themes="crystal" + local jbs=$(sed -ne 's/.*\(-j[[:space:]]*\|--jobs=\)\([[:digit:]]\+\).*/\2/;T;p' <<< "${MAKEOPTS}") + + # recheck that there is some value in jobs + [[ -z ${jbs} ]] && jbs="1" # expand themes we are going to build based on DE useflags use gnome && themes+=" tango" @@ -446,8 +449,8 @@ src_configure() { --with-external-thes-dir="${EPREFIX}/usr/share/myspell" \ --with-external-tar="${DISTDIR}" \ --with-lang="${LINGUAS_OOO}" \ - --with-max-jobs=${jobs} \ - --with-num-cpus=${jobs} \ + --with-max-jobs=${jbs} \ + --with-num-cpus=${jbs} \ --with-theme="${themes}" \ --with-unix-wrapper=libreoffice \ --with-vendor="Gentoo Foundation" \ |