app-office/libreoffice: Simpler check-reqs

Package-Manager: Portage-2.3.41, Repoman-2.3.9

diff --git a/app-office/libreoffice/libreoffice-6.0.5.2-r1.ebuild b/app-office/libreoffice/libreoffice-6.0.5.2-r1.ebuild
index 8d2c709d0992a41292902e575618863cd9ffdf06..df31a0f84f82504203b7bcddc65c8901dfc2a0da 100644 (file)
--- a/app-office/libreoffice/libreoffice-6.0.5.2-r1.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.5.2-r1.ebuild
@@ -267,6 +267,7 @@ _check_reqs() {
        else
                CHECKREQS_DISK_BUILD="6G"
        fi
+       check-reqs_$1
 }
 
 pkg_pretend() {
@@ -279,10 +280,7 @@ pkg_pretend() {
                ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"
        fi
 
-       if [[ ${MERGE_TYPE} != binary ]]; then
-               _check_reqs
-               check-reqs_pkg_pretend
-       fi
+       [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
 }
 
 pkg_setup() {
@@ -290,10 +288,7 @@ pkg_setup() {
        python-single-r1_pkg_setup
        xdg_environment_reset
 
-       if [[ ${MERGE_TYPE} != binary ]]; then
-               _check_reqs
-               check-reqs_pkg_setup
-       fi
+       [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
 }
 
 src_unpack() {

diff --git a/app-office/libreoffice/libreoffice-6.0.9999.ebuild b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
index b25f7e8074b8e5d792644a9e514bb78a4e5058bb..7fa72b5977b859c5f9a381f0475481a97d9c3906 100644 (file)
--- a/app-office/libreoffice/libreoffice-6.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
@@ -264,6 +264,7 @@ _check_reqs() {
        else
                CHECKREQS_DISK_BUILD="6G"
        fi
+       check-reqs_$1
 }
 
 pkg_pretend() {
@@ -276,10 +277,7 @@ pkg_pretend() {
                ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"
        fi
 
-       if [[ ${MERGE_TYPE} != binary ]]; then
-               _check_reqs
-               check-reqs_pkg_pretend
-       fi
+       [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
 }
 
 pkg_setup() {
@@ -287,10 +285,7 @@ pkg_setup() {
        python-single-r1_pkg_setup
        xdg_environment_reset
 
-       if [[ ${MERGE_TYPE} != binary ]]; then
-               _check_reqs
-               check-reqs_pkg_setup
-       fi
+       [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
 }
 
 src_unpack() {

diff --git a/app-office/libreoffice/libreoffice-6.1.9999.ebuild b/app-office/libreoffice/libreoffice-6.1.9999.ebuild
index 1a45077dea2c60d81557a261321b8a0dbf4fc7a5..46abef27e9817bd7bbdbd038f797f99db8980db1 100644 (file)
--- a/app-office/libreoffice/libreoffice-6.1.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.1.9999.ebuild
@@ -261,6 +261,7 @@ _check_reqs() {
        else
                CHECKREQS_DISK_BUILD="6G"
        fi
+       check-reqs_$1
 }
 
 pkg_pretend() {
@@ -273,10 +274,7 @@ pkg_pretend() {
                ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"
        fi
 
-       if [[ ${MERGE_TYPE} != binary ]]; then
-               _check_reqs
-               check-reqs_pkg_pretend
-       fi
+       [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
 }
 
 pkg_setup() {
@@ -284,10 +282,7 @@ pkg_setup() {
        python-single-r1_pkg_setup
        xdg_environment_reset
 
-       if [[ ${MERGE_TYPE} != binary ]]; then
-               _check_reqs
-               check-reqs_pkg_setup
-       fi
+       [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
 }
 
 src_unpack() {

diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 1a45077dea2c60d81557a261321b8a0dbf4fc7a5..46abef27e9817bd7bbdbd038f797f99db8980db1 100644 (file)
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -261,6 +261,7 @@ _check_reqs() {
        else
                CHECKREQS_DISK_BUILD="6G"
        fi
+       check-reqs_$1
 }
 
 pkg_pretend() {
@@ -273,10 +274,7 @@ pkg_pretend() {
                ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"
        fi
 
-       if [[ ${MERGE_TYPE} != binary ]]; then
-               _check_reqs
-               check-reqs_pkg_pretend
-       fi
+       [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
 }
 
 pkg_setup() {
@@ -284,10 +282,7 @@ pkg_setup() {
        python-single-r1_pkg_setup
        xdg_environment_reset
 
-       if [[ ${MERGE_TYPE} != binary ]]; then
-               _check_reqs
-               check-reqs_pkg_setup
-       fi
+       [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
 }
 
 src_unpack() {