diff options
| author |   Andreas Hüttel <dilfridge@gentoo.org> | 2014-12-28 18:19:44 +0000 |
|---|---|---|
| committer | Andreas Hüttel <dilfridge@gentoo.org> | 2014-12-28 18:19:44 +0000 |
| commit | b0213becae77443c96190238ec2b5ccee2e32398 (patch) | |
| tree | 189c95f98c1c88548ed87c794393032282aca297 /app-office | |
| parent | Drop PYTHON_MODNAME, bug 533838. (diff) | |
| download | historical-b0213becae77443c96190238ec2b5ccee2e32398.tar.gz historical-b0213becae77443c96190238ec2b5ccee2e32398.tar.bz2 historical-b0213becae77443c96190238ec2b5ccee2e32398.zip | |
Simplify MAKEOPTS handling, bug 530030
Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0x84AD142F
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/libreoffice/ChangeLog | 6 | ||||
| -rw-r--r-- | app-office/libreoffice/Manifest | 30 | ||||
| -rw-r--r-- | app-office/libreoffice/libreoffice-9999-r2.ebuild | 10 |
3 files changed, 23 insertions, 23 deletions
diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog index 5effce8c0645..9e7577f676b5 100644 --- a/app-office/libreoffice/ChangeLog +++ b/app-office/libreoffice/ChangeLog @@ -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 <dilfridge@gentoo.org> + libreoffice-9999-r2.ebuild: + Simplify MAKEOPTS handling, bug 530030 *libreoffice-4.3.5.2 (28 Dec 2014) diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest index 9bf246e6e433..314d045c6af7 100644 --- a/app-office/libreoffice/Manifest +++ b/app-office/libreoffice/Manifest @@ -39,23 +39,23 @@ EBUILD libreoffice-4.2.9999.ebuild 17883 SHA256 f95a82baef7635df697688e80184869c EBUILD libreoffice-4.3.4.1.ebuild 18317 SHA256 9531e640da61f61fbf375361bbbbcdec8d1c0e4d15c2198ae1b5d6bb66abd5d9 SHA512 5d62a730205ac258396f590e6808b75c562e5e6a734086ef32ea74c06f6ee6801c6540c927e71b5024a76808227c35e39d818bda242e7dcf66be3fd5c7d34a95 WHIRLPOOL 969dd87dceeabd12512d542c000acb28d577f77a95d7c4cd2bc8e133ab169fa7fdf3a1aec148c2a54d646e3550bf5eb441188cc5609a492d49213aa2239dd50f EBUILD libreoffice-4.3.5.2.ebuild 18924 SHA256 47866c540522bfc4c6268cd1c7a961001241f259a09112a5fe0bfbdd5effa03f SHA512 a1efc99f4143ea468e7354920181cda66bec7ea19f6016caeaddffe83382085cb48eb82c1faed01a96cc4f8f267f47644a1d4d25206721675b4ecbebc7bac07c WHIRLPOOL 4041ccfcb9cd3017cbbbdaa505faae58fcc084e982befd85c8bfbbec8061251dabe0872e0c3f8523332b3c916b097cdad9027cd0cfbbacdd07e1435354a5ab43 EBUILD libreoffice-4.3.9999.ebuild 18828 SHA256 6f06153754460c8600dd977a75a8ce8e9cbcac42d2d59c27236569290b0e30a0 SHA512 27011e103313dec19704e5ef2458db75c1fa96ea496ab072f8a163efff8dac40c1bc434c6199fa6e532c19d24ada5fee8ade932a549a96f8f11d785d9509e6e1 WHIRLPOOL 44731dfc071f663d6ed911cc1be07a97ca2128d74f07ddd3fec60c4d089b5da65db1d45d3de7cf48a5b4d6e88a730f1dd3fbd6ce2b447a4b7574262cf3d23ee6 -EBUILD libreoffice-9999-r2.ebuild 18422 SHA256 7e374cbda7aab3a6fe75a0288d2ff2c1c47b62f6ffb3fdb4d0c1b046f71a6541 SHA512 1fa4269b9f01eeef516df0e13567b59f57ba0687176e14cf1584dab66c3a73227d782995256b387f366230452706e1f93540e5d02543a77cd30ab915a12a1d48 WHIRLPOOL b5163e894b5b44c4710d13e85bc7ac864e3180fa16d23c507ed28e6ed3846f3b347e4fb0f909c2102c6670019285af7dbff7c49fd5ede6a6740e68df08ad203e -MISC ChangeLog 108848 SHA256 87730bb7527438b000937ed3f549ebe5bb6d5cf6cc917ad6cd325a042f333711 SHA512 c94984ff0393940c176429151210df7e354eda2a1fb8cad0c274d5f56b14f0bad24092046a872d6518c9286180dcc84f5ee547f0652bbc817b39a82393a024da WHIRLPOOL bd3406aa36179171e6ae551c51eaa0f0cf72fae671fad3093f4aa7d81d16955ee7549a9dc9012337ca8e39c4018f099f952034a4a9f2a9afb12f5f661507313b +EBUILD libreoffice-9999-r2.ebuild 18274 SHA256 876d1d7736b956b7afd6a70dad4cc524bddfa9f1496cf2ed92b0140fd2abe0c4 SHA512 8bf27d6a397f3c8211f759b9b0c7a10d4a07050d0b3b33061c88e5ed3757d0ce380b4b2b23efa00701c5102872f5806a3a99a962e5c550c16a18463ca57016b1 WHIRLPOOL 22007f26781dcfbb1109ddaf6ad4ca715a34700094693d456f5fc47489448fc7e6861cdc4fe616d9683264e4586673bd99e1eb965bd62a51064554b843e2ef5b +MISC ChangeLog 108977 SHA256 9abfddb19f4c3d018ed180611dffbf698107df9c1d0db0c2a1b0e6b066decef9 SHA512 215cc38bd0190a9066db083feef25f9fbb6b2969d4948ad0d37c879cf97c3b6b3f6fd425b39219148a06c649726e6aee694b97ed73a18a687df663168ecb4833 WHIRLPOOL b0b796f35bda126ab9cb1043265f3768107d770724512fffbfbc1e668487ec9892800969736f167e45f3b93610a99ef90f4988ff8a75add1939beee201c622a1 MISC metadata.xml 1354 SHA256 bf91c27f941b42e977112a3ea9465babd4c4d94dde3f8308d6db1ccd56bc65b9 SHA512 636da2f295d3055de61b52b2a1d371a25101efdc55014ba2e5a7446bb55b30dca1bb58cc2a84873fb862e40f60de10122c55dba19ba9e5d058eab36f7c33aad6 WHIRLPOOL 4aa957484052955572b2bdca42a7d32f5a89f3916a646e92cca940ce2f4e5c8dec824c75150bf80455dcbc2e13f550d1158c418ca38cecac5ac3090419a52f5e -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJUoDpgAAoJEJS/30SErRQvjVoP/i5rleJHQc5nCChe0cYW7xUy -IlcJWkREzjrUL2CmwJugDQjdTazSjTAsTp23Dmt9JmXQ6XnX2REK50IlniIMm/P/ -9342LJDMoktKNngsnN7VxBVhXP+ALoAH1V7T272odX30GyzrEwLU8F6us2ABaeTN -evkYP9VgRi+C9JfsF4qIpmPOKASpjg72PZCSdqJg9F+CSMb9GRD739/T15sx6NTo -S8ln9OcbXWLNhE04SBm76Cmkuf9ggoWKuarg6/kOgCRoxNyptm4WABYIt6VbIyYk -dV6Vq3kcgNsLWD/lPRcQ/+u52uJ0dEXBbPvljYo9B+/HxfThC6qhgoLvAN8zy9Ha -vx51x9rqhPR+hEchrr+NBuvF+Vj8abkqy4OSY0stzBpA94BQ9l418etA2Tq4rXhA -bJTxtWJotDRCcOGY3f6KXsaIRsZOlfUT2Xp2l1LPpuqPGDUigdrRHYGUA4l0Obws -KG1OlfMWxPD6qiCmbGQAe5NeTy8i7uSoq3UWa7YsKrXvAMUDFpz3w7obEzzEt7Iv -l11j2el3SQxwb28F8h9+9Mupoqhhc8m+lYlSDTPvv3Ct+zoJKhJvkYBH3iksInUP -jwL71Eh/HV1yAoCKXR7wHGHnWIXbPjZwEwpSWewYBtGNxlxIzFg8wvvEkf+ESWQY -7WWlYZJJ8FSQ0Bp7ov/P -=Xec2 +iQIcBAEBCAAGBQJUoEoQAAoJEJS/30SErRQvG/cP+gLJn7NDQVwsK3e1G5zipH30 +1aBECgaB09idCnf0rZ4VA9eT37cwJZYJXULaB2rTKCWIkyUh0ltdB8LN87SjdCCd +kzK55KgQ6H6d+iywfNnQbHrE56gce77YHmrmI8o3aLLMIRNTmCfj+5PaVQG4GGTE +TbHZ07LbEGConw8yyh/4r0zc63TsL28Suz09aZt+Tsqfowz4+CwXfVVeCiBCWEk6 +IqO7R4N78vTg3L2I+P6z1V6jgQAwvxtGr5IntQNKnZlf6lLpdLgvQNa0HyuGXhpB +XDjsUFkHCdfALLzaG5A6jlBAoY2vG6qAn4IZyV84YtOhLBCso+Jxmf4EkQJ0Jdq8 +u5Edk2GLHDcsgTEdguEQrmtZFlU2dv8opNkWmCCmwJrvD9JilWHhWc3c1QfKhE83 +5P1VgaiHH9nt/cdwwwkLOp3PffPh/U2IYCvVmJbp6TcFArGO5uh+ar5fKh4ZKhQc +UyJzU04wyM3Adi/5JcTB1FawIa0/izCpFjj4Z/v+Y3WmTNlte79j9RvZR4S+5DmY +Cox4x0sEgjY0h3JEsepisIELCkJYIWTUGT8ahYN+tBIbCb3JzGfdeC4QLzBD11FS +/YkC9CJflT6Seenxtj7P4nMahrHAfVu+TU7S+/ru6HPHubvMsPQZOhKGseMClNPZ +na3MBSgxvCFPmAMc+vZT +=XZCs -----END PGP SIGNATURE----- diff --git a/app-office/libreoffice/libreoffice-9999-r2.ebuild b/app-office/libreoffice/libreoffice-9999-r2.ebuild index c7a0db47e154..aa70cc04537d 100644 --- a/app-office/libreoffice/libreoffice-9999-r2.ebuild +++ b/app-office/libreoffice/libreoffice-9999-r2.ebuild @@ -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 @@ BRANDING="${PN}-branding-gentoo-0.8.tar.xz" # 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 @@ src_configure() { 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 @@ src_configure() { --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 \ |