| 1 |
scarabeus 11/07/26 13:11:14 |
| 2 |
|
| 3 |
Modified: libreoffice-3.4.2.2.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
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. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha47/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.14 app-office/libreoffice/libreoffice-3.4.2.2.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild?rev=1.14&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild?rev=1.14&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild?r1=1.13&r2=1.14 |
| 15 |
|
| 16 |
Index: libreoffice-3.4.2.2.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild,v |
| 19 |
retrieving revision 1.13 |
| 20 |
retrieving revision 1.14 |
| 21 |
diff -u -r1.13 -r1.14 |
| 22 |
--- libreoffice-3.4.2.2.ebuild 26 Jul 2011 13:05:05 -0000 1.13 |
| 23 |
+++ libreoffice-3.4.2.2.ebuild 26 Jul 2011 13:11:14 -0000 1.14 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2011 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $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 $ |
| 28 |
+# $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 $ |
| 29 |
|
| 30 |
EAPI=3 |
| 31 |
|
| 32 |
@@ -338,8 +338,11 @@ |
| 33 |
local java_opts |
| 34 |
local internal_libs |
| 35 |
local extensions |
| 36 |
- local themes="default" |
| 37 |
- local jobs=$(sed -ne 's/.*\(-j[[:space:]]*\|--jobs=\)\([[:digit:]]\+\).*/\2/;T;p' <<< "${MAKEOPTS}") |
| 38 |
+ local themes="crystal" |
| 39 |
+ local jbs=$(sed -ne 's/.*\(-j[[:space:]]*\|--jobs=\)\([[:digit:]]\+\).*/\2/;T;p' <<< "${MAKEOPTS}") |
| 40 |
+ |
| 41 |
+ # recheck that there is some value in jobs |
| 42 |
+ [[ -z ${jbs} ]] && jbs="1" |
| 43 |
|
| 44 |
# expand themes we are going to build based on DE useflags |
| 45 |
use gnome && themes+=" tango" |
| 46 |
@@ -446,8 +449,8 @@ |
| 47 |
--with-external-thes-dir="${EPREFIX}/usr/share/myspell" \ |
| 48 |
--with-external-tar="${DISTDIR}" \ |
| 49 |
--with-lang="${LINGUAS_OOO}" \ |
| 50 |
- --with-max-jobs=${jobs} \ |
| 51 |
- --with-num-cpus=${jobs} \ |
| 52 |
+ --with-max-jobs=${jbs} \ |
| 53 |
+ --with-num-cpus=${jbs} \ |
| 54 |
--with-theme="${themes}" \ |
| 55 |
--with-unix-wrapper=libreoffice \ |
| 56 |
--with-vendor="Gentoo Foundation" \ |
| 57 |
|
| 58 |
|
| 59 |
|
| 60 |
1.54 app-office/libreoffice/ChangeLog |
| 61 |
|
| 62 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.54&view=markup |
| 63 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.54&content-type=text/plain |
| 64 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?r1=1.53&r2=1.54 |
| 65 |
|
| 66 |
Index: ChangeLog |
| 67 |
=================================================================== |
| 68 |
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v |
| 69 |
retrieving revision 1.53 |
| 70 |
retrieving revision 1.54 |
| 71 |
diff -u -r1.53 -r1.54 |
| 72 |
--- ChangeLog 26 Jul 2011 13:05:05 -0000 1.53 |
| 73 |
+++ ChangeLog 26 Jul 2011 13:11:14 -0000 1.54 |
| 74 |
@@ -1,6 +1,11 @@ |
| 75 |
# ChangeLog for app-office/libreoffice |
| 76 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 77 |
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.53 2011/07/26 13:05:05 scarabeus Exp $ |
| 78 |
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.54 2011/07/26 13:11:14 scarabeus Exp $ |
| 79 |
+ |
| 80 |
+ 26 Jul 2011; Tomáš Chvátal <scarabeus@g.o> |
| 81 |
+ libreoffice-3.4.2.2.ebuild: |
| 82 |
+ Set default theme to crystal, set jobs to 1 if the sed does not find any |
| 83 |
+ value, and rename the variable to not collide with bash jobs command. |
| 84 |
|
| 85 |
26 Jul 2011; Tomáš Chvátal <scarabeus@g.o> |
| 86 |
+files/libreoffice-as-needed-gtk-2.patch, libreoffice-3.4.2.2.ebuild, |
Archives