app-office/libreoffice: do not call is-flagq in global scope, bug 593424

Package-Manager: portage-2.3.2

diff --git a/app-office/libreoffice/libreoffice-5.2.9999.ebuild b/app-office/libreoffice/libreoffice-5.2.9999.ebuild
index 663d010b2a0dcc68ed34d6ee8bb0ab19f41c03d2..f71cc06c3362e74ae60865a410e945dc78321407 100644 (file)
--- a/app-office/libreoffice/libreoffice-5.2.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.2.9999.ebuild
@@ -247,19 +247,18 @@ PATCHES=(
        "${FILESDIR}/${PN}-5.2-system-pyuno.patch"
 )
 
-CHECKREQS_MEMORY="512M"
-
-if [[ ${MERGE_TYPE} != binary ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-       CHECKREQS_DISK_BUILD="22G"
-elif [[ ${MERGE_TYPE} != binary ]] ; then
-       CHECKREQS_DISK_BUILD="6G"
-fi
-
 pkg_pretend() {
        use java || \
                ewarn "If you plan to use lbase application you should enable java or you will get various crashes."
 
        if [[ ${MERGE_TYPE} != binary ]]; then
+
+               CHECKREQS_MEMORY="512M"
+               if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+                       CHECKREQS_DISK_BUILD="22G"
+               else
+                       CHECKREQS_DISK_BUILD="6G"
+               fi
                check-reqs_pkg_pretend
 
                if ! $(tc-is-clang) && [[ $(gcc-major-version) -lt 4 ]] || {
@@ -287,7 +286,15 @@ pkg_setup() {
        python-single-r1_pkg_setup
        xdg_environment_reset
 
-       [[ ${MERGE_TYPE} != binary ]] && check-reqs_pkg_setup
+       if [[ ${MERGE_TYPE} != binary ]]; then
+               CHECKREQS_MEMORY="512M"
+               if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+                       CHECKREQS_DISK_BUILD="22G"
+               else
+                       CHECKREQS_DISK_BUILD="6G"
+               fi
+               check-reqs_pkg_setup
+       fi
 }
 
 src_unpack() {

diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index ebc28aaf3833f5256ed26274d15cf4fabe4302da..d43f7ea7d2c6fafcebe724ae15734cae46f29564 100644 (file)
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -246,19 +246,18 @@ PATCHES=(
        "${FILESDIR}/${PN}-5.3-system-pyuno.patch"
 )
 
-CHECKREQS_MEMORY="512M"
-
-if [[ ${MERGE_TYPE} != binary ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-       CHECKREQS_DISK_BUILD="22G"
-elif [[ ${MERGE_TYPE} != binary ]] ; then
-       CHECKREQS_DISK_BUILD="6G"
-fi
-
 pkg_pretend() {
        use java || \
                ewarn "If you plan to use lbase application you should enable java or you will get various crashes."
 
        if [[ ${MERGE_TYPE} != binary ]]; then
+
+               CHECKREQS_MEMORY="512M"
+               if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+                       CHECKREQS_DISK_BUILD="22G"
+               else
+                       CHECKREQS_DISK_BUILD="6G"
+               fi
                check-reqs_pkg_pretend
 
                if ! $(tc-is-clang) && [[ $(gcc-major-version) -lt 4 ]] || {
@@ -286,7 +285,15 @@ pkg_setup() {
        python-single-r1_pkg_setup
        xdg_environment_reset
 
-       [[ ${MERGE_TYPE} != binary ]] && check-reqs_pkg_setup
+       if [[ ${MERGE_TYPE} != binary ]]; then
+               CHECKREQS_MEMORY="512M"
+               if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+                       CHECKREQS_DISK_BUILD="22G"
+               else
+                       CHECKREQS_DISK_BUILD="6G"
+               fi
+               check-reqs_pkg_setup
+       fi
 }
 
 src_unpack() {