| 1 |
dilfridge 14/12/28 18:19:32 |
| 2 |
|
| 3 |
Modified: ChangeLog libreoffice-9999-r2.ebuild |
| 4 |
Log: |
| 5 |
Simplify MAKEOPTS handling, bug 530030 |
| 6 |
|
| 7 |
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 84AD142F) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.598 app-office/libreoffice/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.598&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.598&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?r1=1.597&r2=1.598 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v |
| 19 |
retrieving revision 1.597 |
| 20 |
retrieving revision 1.598 |
| 21 |
diff -u -r1.597 -r1.598 |
| 22 |
--- ChangeLog 28 Dec 2014 17:12:34 -0000 1.597 |
| 23 |
+++ ChangeLog 28 Dec 2014 18:19:32 -0000 1.598 |
| 24 |
@@ -1,6 +1,10 @@ |
| 25 |
# ChangeLog for app-office/libreoffice |
| 26 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.597 2014/12/28 17:12:34 dilfridge Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.598 2014/12/28 18:19:32 dilfridge Exp $ |
| 29 |
+ |
| 30 |
+ 28 Dec 2014; Andreas K. Huettel <dilfridge@g.o> |
| 31 |
+ libreoffice-9999-r2.ebuild: |
| 32 |
+ Simplify MAKEOPTS handling, bug 530030 |
| 33 |
|
| 34 |
*libreoffice-4.3.5.2 (28 Dec 2014) |
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
|
| 39 |
1.235 app-office/libreoffice/libreoffice-9999-r2.ebuild |
| 40 |
|
| 41 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?rev=1.235&view=markup |
| 42 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?rev=1.235&content-type=text/plain |
| 43 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?r1=1.234&r2=1.235 |
| 44 |
|
| 45 |
Index: libreoffice-9999-r2.ebuild |
| 46 |
=================================================================== |
| 47 |
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v |
| 48 |
retrieving revision 1.234 |
| 49 |
retrieving revision 1.235 |
| 50 |
diff -u -r1.234 -r1.235 |
| 51 |
--- libreoffice-9999-r2.ebuild 28 Dec 2014 17:12:34 -0000 1.234 |
| 52 |
+++ libreoffice-9999-r2.ebuild 28 Dec 2014 18:19:32 -0000 1.235 |
| 53 |
@@ -1,6 +1,6 @@ |
| 54 |
# Copyright 1999-2014 Gentoo Foundation |
| 55 |
# Distributed under the terms of the GNU General Public License v2 |
| 56 |
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.234 2014/12/28 17:12:34 dilfridge Exp $ |
| 57 |
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.235 2014/12/28 18:19:32 dilfridge Exp $ |
| 58 |
|
| 59 |
EAPI=5 |
| 60 |
|
| 61 |
@@ -27,7 +27,7 @@ |
| 62 |
# PATCHSET="${P}-patchset-01.tar.xz" |
| 63 |
|
| 64 |
[[ ${PV} == *9999* ]] && SCM_ECLASS="git-2" |
| 65 |
-inherit base autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic nsplugins ${SCM_ECLASS} |
| 66 |
+inherit base multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic nsplugins ${SCM_ECLASS} |
| 67 |
unset SCM_ECLASS |
| 68 |
|
| 69 |
DESCRIPTION="LibreOffice, a full office productivity suite" |
| 70 |
@@ -380,10 +380,6 @@ |
| 71 |
local internal_libs |
| 72 |
local lo_ext |
| 73 |
local ext_opts |
| 74 |
- local jbs=$(sed -ne 's/.*\(-j[[:space:]]*\|--jobs=\)\([[:digit:]]\+\).*/\2/;T;p' <<< "${MAKEOPTS}") |
| 75 |
- |
| 76 |
- # recheck that there is some value in jobs |
| 77 |
- [[ -z ${jbs} ]] && jbs="1" |
| 78 |
|
| 79 |
# sane: just sane.h header that is used for scan in writer, not |
| 80 |
# linked or anything else, worthless to depend on |
| 81 |
@@ -482,7 +478,7 @@ |
| 82 |
--with-external-thes-dir="${EPREFIX}/usr/share/myspell" \ |
| 83 |
--with-external-tar="${DISTDIR}" \ |
| 84 |
--with-lang="" \ |
| 85 |
- --with-parallelism=${jbs} \ |
| 86 |
+ --with-parallelism=$(makeopts_jobs) \ |
| 87 |
--with-system-ucpp \ |
| 88 |
--with-vendor="Gentoo Foundation" \ |
| 89 |
--with-x \ |
Archives