Set default theme to crystal, set jobs to 1 if the sed does not find any value, and...

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

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index d88cf5ecffbd857472b6744948d32a7f560fe7ff..ffcf4803a865d9fda589bc12e22f6b2e0dfee060 100644 (file)
--- 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/Manifest b/app-office/libreoffice/Manifest
index 1accbd2639fac219759613e647fce93aefebb6da..4f8b4d43d4ea1ca04d0b2830795c84c30607d697 100644 (file)
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -209,13 +209,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 17747 RMD160 0721db7e24ccee961e8a778dcfa94713372c243e SHA1 86e7f4103e19fe3232a2afee402c703536f3f079 SHA256 9b1b14fac1dd37dd90414071563905508b7e6f01cfda8d14e868bdf7cf48939f
-MISC ChangeLog 11008 RMD160 3d95ea09696204068f3f96172e5fda98ea5e159b SHA1 2c1cdf995849b679f328717d9f050ccaa1ad0e3b SHA256 0eff51d0b737800f0b59b86a945b2197b1f9f8afa2a9898f183f060bda99b532
+EBUILD libreoffice-3.4.2.2.ebuild 17817 RMD160 6ef997b9f8dbecc11e7654bacc67189d21139807 SHA1 36667d0a3a9e77cca966cd4a05fc1b188c09b301 SHA256 a3db6da4a557bc915c3136ab93e317fbbd03674c871dfc56c0927e48850edc48
+MISC ChangeLog 11241 RMD160 74ad53e46131a2f5d7b9b082869434eddf1ba46a SHA1 8f50a249b46c427dcc744104294b52032764f092 SHA256 49297a264112036cea14c800f8c07a3e56ae873aab58b8907a0dbe8bc9aa1d3d
 MISC metadata.xml 968 RMD160 4c276f754c1e2f9e2ca31d8afc848c7104405071 SHA1 ffd8cf3e1260eceeca576d417138f2d8584bf0fd SHA256 8dc930d20711f541b049eefa6e2b77fe5904c26ca4a08ea40553acb787c94908
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk4uu2YACgkQHB6c3gNBRYfz3QCePBQ3pei2iTeU4dXufxior8Qu
-uZwAoJs7GsleFMT7zOCntk+PDVQGIXf4
-=7zX5
+iEYEARECAAYFAk4uvNUACgkQHB6c3gNBRYcuEwCgqBc9uQtKeQx4HrH32a7JNxzo
+JnkAn25xN9MDdXcgfnivmtKSXDDVR4uo
+=WwNG
 -----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 f7bac16a1eba8b4507e8c264c593f05944c4f4c4..613fe75ad57a32f3e6d1915cf380f39b32f63333 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.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" \