summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Deutschmann <whissi@gentoo.org>2020-02-24 23:25:39 +0100
committerThomas Deutschmann <whissi@gentoo.org>2020-02-24 23:35:16 +0100
commit9e564516359eb212b9304357cbdb16d485413924 (patch)
treeb642f2e1702cd64bade8519143383fd7e775cec6
parentwww-client/firefox: call default src_unpack() (diff)
downloadgentoo-9e564516.tar.gz
gentoo-9e564516.tar.bz2
gentoo-9e564516.zip
www-client/firefox: move pkg_pretend()
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
-rw-r--r--www-client/firefox/firefox-68.5.0.ebuild28
-rw-r--r--www-client/firefox/firefox-73.0.1.ebuild28
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 bceb3a0c22ac..811f352adb13 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 ec9af7413fa0..6a7e5f80c0b4 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