commit:     ac656fb80987a2a35def9ef131371ccddb5d1fb0
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 31 21:46:03 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Aug 31 21:47:02 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac656fb8

app-office/libreoffice: use emake, not make

If the rationale (and that's a big if) for using make
and not emake was parallelism, we should be using -j1,
not 'make' which won't respect ${MAKE} or other ${MAKEOPTS}.

While at it, clean up a stale/misplaced comment in
src_install too (makes no sense where it is,
presumably 'make' was previously used in src_install
or -j1 was forced in the past).

Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-office/libreoffice/libreoffice-7.3.5.2.ebuild  | 5 ++---
 app-office/libreoffice/libreoffice-7.3.9999.ebuild | 5 ++---
 app-office/libreoffice/libreoffice-9999.ebuild     | 5 ++---
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/app-office/libreoffice/libreoffice-7.3.5.2.ebuild 
b/app-office/libreoffice/libreoffice-7.3.5.2.ebuild
index d45c3048f25c..07c41dd1473e 100644
--- a/app-office/libreoffice/libreoffice-7.3.5.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.5.2.ebuild
@@ -585,12 +585,11 @@ src_compile() {
 }
 
 src_test() {
-       make unitcheck || die
-       make slowcheck || die
+       emake unitcheck
+       emake slowcheck
 }
 
 src_install() {
-       # This is not Makefile so no buildserver
        emake DESTDIR="${D}" distro-pack-install -o build -o check
 
        # bug 593514

diff --git a/app-office/libreoffice/libreoffice-7.3.9999.ebuild 
b/app-office/libreoffice/libreoffice-7.3.9999.ebuild
index 4969bd6b6a3e..69651435d7d7 100644
--- a/app-office/libreoffice/libreoffice-7.3.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.9999.ebuild
@@ -585,12 +585,11 @@ src_compile() {
 }
 
 src_test() {
-       make unitcheck || die
-       make slowcheck || die
+       emake unitcheck
+       emake slowcheck
 }
 
 src_install() {
-       # This is not Makefile so no buildserver
        emake DESTDIR="${D}" distro-pack-install -o build -o check
 
        # bug 593514

diff --git a/app-office/libreoffice/libreoffice-9999.ebuild 
b/app-office/libreoffice/libreoffice-9999.ebuild
index f791cbf01383..f7ff3494a447 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -582,12 +582,11 @@ src_compile() {
 }
 
 src_test() {
-       make unitcheck || die
-       make slowcheck || die
+       emake unitcheck
+       emake slowcheck
 }
 
 src_install() {
-       # This is not Makefile so no buildserver
        emake DESTDIR="${D}" distro-pack-install -o build -o check
 
        # bug 593514

Reply via email to