dilfridge 14/12/28 18:19:32 Modified: ChangeLog libreoffice-9999-r2.ebuild Log: Simplify MAKEOPTS handling, bug 530030 (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 84AD142F)
Revision Changes Path 1.598 app-office/libreoffice/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.598&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.598&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?r1=1.597&r2=1.598 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v retrieving revision 1.597 retrieving revision 1.598 diff -u -r1.597 -r1.598 --- ChangeLog 28 Dec 2014 17:12:34 -0000 1.597 +++ ChangeLog 28 Dec 2014 18:19:32 -0000 1.598 @@ -1,6 +1,10 @@ # ChangeLog for app-office/libreoffice # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.597 2014/12/28 17:12:34 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.598 2014/12/28 18:19:32 dilfridge Exp $ + + 28 Dec 2014; Andreas K. Huettel <dilfri...@gentoo.org> + libreoffice-9999-r2.ebuild: + Simplify MAKEOPTS handling, bug 530030 *libreoffice-4.3.5.2 (28 Dec 2014) 1.235 app-office/libreoffice/libreoffice-9999-r2.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?rev=1.235&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?rev=1.235&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?r1=1.234&r2=1.235 Index: libreoffice-9999-r2.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v retrieving revision 1.234 retrieving revision 1.235 diff -u -r1.234 -r1.235 --- libreoffice-9999-r2.ebuild 28 Dec 2014 17:12:34 -0000 1.234 +++ libreoffice-9999-r2.ebuild 28 Dec 2014 18:19:32 -0000 1.235 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.234 2014/12/28 17:12:34 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.235 2014/12/28 18:19:32 dilfridge Exp $ EAPI=5 @@ -27,7 +27,7 @@ # PATCHSET="${P}-patchset-01.tar.xz" [[ ${PV} == *9999* ]] && SCM_ECLASS="git-2" -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} +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} unset SCM_ECLASS DESCRIPTION="LibreOffice, a full office productivity suite" @@ -380,10 +380,6 @@ local internal_libs local lo_ext local ext_opts - 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" # sane: just sane.h header that is used for scan in writer, not # linked or anything else, worthless to depend on @@ -482,7 +478,7 @@ --with-external-thes-dir="${EPREFIX}/usr/share/myspell" \ --with-external-tar="${DISTDIR}" \ --with-lang="" \ - --with-parallelism=${jbs} \ + --with-parallelism=$(makeopts_jobs) \ --with-system-ucpp \ --with-vendor="Gentoo Foundation" \ --with-x \
