[gentoo-commits] repo/gentoo:master commit in: www-client/firefox/

[Thomas Deutschmann]

commit:     9e564516359eb212b9304357cbdb16d485413924
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 24 22:25:39 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Feb 24 22:35:16 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e564516

www-client/firefox: move pkg_pretend()

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 www-client/firefox/firefox-68.5.0.ebuild | 28 ++++++++++++++--------------
 www-client/firefox/firefox-73.0.1.ebuild | 28 ++++++++++++++--------------
 2 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/www-client/firefox/firefox-68.5.0.ebuild 
b/www-client/firefox/firefox-68.5.0.ebuild
index bceb3a0c22a..811f352adb1 100644
--- a/www-client/firefox/firefox-68.5.0.ebuild
+++ b/www-client/firefox/firefox-68.5.0.ebuild
@@ -212,15 +212,26 @@ llvm_check_deps() {
        einfo "Will use LLVM slot ${LLVM_SLOT}!" >&2
 }
 
-pkg_setup() {
-       moz_pkgsetup
-
+pkg_pretend() {
        if use pgo ; then
                if ! has usersandbox $FEATURES ; then
                        die "You must enable usersandbox as X server can not 
run as root!"
                fi
        fi
 
+       # Ensure we have enough disk space to compile
+       if use pgo || use lto || use debug || use test ; then
+               CHECKREQS_DISK_BUILD="8G"
+       else
+               CHECKREQS_DISK_BUILD="4G"
+       fi
+
+       check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+       moz_pkgsetup
+
        # Avoid PGO profiling problems due to enviroment leakage
        # These should *always* be cleaned up anyway
        unset DBUS_SESSION_BUS_ADDRESS \
@@ -244,17 +255,6 @@ pkg_setup() {
        llvm_pkg_setup
 }
 
-pkg_pretend() {
-       # Ensure we have enough disk space to compile
-       if use pgo || use lto || use debug || use test ; then
-               CHECKREQS_DISK_BUILD="8G"
-       else
-               CHECKREQS_DISK_BUILD="4G"
-       fi
-
-       check-reqs_pkg_setup
-}
-
 src_unpack() {
        default
 

diff --git a/www-client/firefox/firefox-73.0.1.ebuild 
b/www-client/firefox/firefox-73.0.1.ebuild
index ec9af7413fa..6a7e5f80c0b 100644
--- a/www-client/firefox/firefox-73.0.1.ebuild
+++ b/www-client/firefox/firefox-73.0.1.ebuild
@@ -204,15 +204,26 @@ llvm_check_deps() {
        einfo "Will use LLVM slot ${LLVM_SLOT}!" >&2
 }
 
-pkg_setup() {
-       moz_pkgsetup
-
+pkg_pretend() {
        if use pgo ; then
                if ! has usersandbox $FEATURES ; then
                        die "You must enable usersandbox as X server can not 
run as root!"
                fi
        fi
 
+       # Ensure we have enough disk space to compile
+       if use pgo || use lto || use debug || use test ; then
+               CHECKREQS_DISK_BUILD="8G"
+       else
+               CHECKREQS_DISK_BUILD="4G"
+       fi
+
+       check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+       moz_pkgsetup
+
        # Avoid PGO profiling problems due to enviroment leakage
        # These should *always* be cleaned up anyway
        unset DBUS_SESSION_BUS_ADDRESS \
@@ -236,17 +247,6 @@ pkg_setup() {
        llvm_pkg_setup
 }
 
-pkg_pretend() {
-       # Ensure we have enough disk space to compile
-       if use pgo || use lto || use debug || use test ; then
-               CHECKREQS_DISK_BUILD="8G"
-       else
-               CHECKREQS_DISK_BUILD="4G"
-       fi
-
-       check-reqs_pkg_setup
-}
-
 src_unpack() {
        default