| 1 |
commit: 9e564516359eb212b9304357cbdb16d485413924 |
| 2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Feb 24 22:25:39 2020 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Feb 24 22:35:16 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e564516 |
| 7 |
|
| 8 |
www-client/firefox: move pkg_pretend() |
| 9 |
|
| 10 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
| 11 |
|
| 12 |
www-client/firefox/firefox-68.5.0.ebuild | 28 ++++++++++++++-------------- |
| 13 |
www-client/firefox/firefox-73.0.1.ebuild | 28 ++++++++++++++-------------- |
| 14 |
2 files changed, 28 insertions(+), 28 deletions(-) |
| 15 |
|
| 16 |
diff --git a/www-client/firefox/firefox-68.5.0.ebuild b/www-client/firefox/firefox-68.5.0.ebuild |
| 17 |
index bceb3a0c22a..811f352adb1 100644 |
| 18 |
--- a/www-client/firefox/firefox-68.5.0.ebuild |
| 19 |
+++ b/www-client/firefox/firefox-68.5.0.ebuild |
| 20 |
@@ -212,15 +212,26 @@ llvm_check_deps() { |
| 21 |
einfo "Will use LLVM slot ${LLVM_SLOT}!" >&2 |
| 22 |
} |
| 23 |
|
| 24 |
-pkg_setup() { |
| 25 |
- moz_pkgsetup |
| 26 |
- |
| 27 |
+pkg_pretend() { |
| 28 |
if use pgo ; then |
| 29 |
if ! has usersandbox $FEATURES ; then |
| 30 |
die "You must enable usersandbox as X server can not run as root!" |
| 31 |
fi |
| 32 |
fi |
| 33 |
|
| 34 |
+ # Ensure we have enough disk space to compile |
| 35 |
+ if use pgo || use lto || use debug || use test ; then |
| 36 |
+ CHECKREQS_DISK_BUILD="8G" |
| 37 |
+ else |
| 38 |
+ CHECKREQS_DISK_BUILD="4G" |
| 39 |
+ fi |
| 40 |
+ |
| 41 |
+ check-reqs_pkg_pretend |
| 42 |
+} |
| 43 |
+ |
| 44 |
+pkg_setup() { |
| 45 |
+ moz_pkgsetup |
| 46 |
+ |
| 47 |
# Avoid PGO profiling problems due to enviroment leakage |
| 48 |
# These should *always* be cleaned up anyway |
| 49 |
unset DBUS_SESSION_BUS_ADDRESS \ |
| 50 |
@@ -244,17 +255,6 @@ pkg_setup() { |
| 51 |
llvm_pkg_setup |
| 52 |
} |
| 53 |
|
| 54 |
-pkg_pretend() { |
| 55 |
- # Ensure we have enough disk space to compile |
| 56 |
- if use pgo || use lto || use debug || use test ; then |
| 57 |
- CHECKREQS_DISK_BUILD="8G" |
| 58 |
- else |
| 59 |
- CHECKREQS_DISK_BUILD="4G" |
| 60 |
- fi |
| 61 |
- |
| 62 |
- check-reqs_pkg_setup |
| 63 |
-} |
| 64 |
- |
| 65 |
src_unpack() { |
| 66 |
default |
| 67 |
|
| 68 |
|
| 69 |
diff --git a/www-client/firefox/firefox-73.0.1.ebuild b/www-client/firefox/firefox-73.0.1.ebuild |
| 70 |
index ec9af7413fa..6a7e5f80c0b 100644 |
| 71 |
--- a/www-client/firefox/firefox-73.0.1.ebuild |
| 72 |
+++ b/www-client/firefox/firefox-73.0.1.ebuild |
| 73 |
@@ -204,15 +204,26 @@ llvm_check_deps() { |
| 74 |
einfo "Will use LLVM slot ${LLVM_SLOT}!" >&2 |
| 75 |
} |
| 76 |
|
| 77 |
-pkg_setup() { |
| 78 |
- moz_pkgsetup |
| 79 |
- |
| 80 |
+pkg_pretend() { |
| 81 |
if use pgo ; then |
| 82 |
if ! has usersandbox $FEATURES ; then |
| 83 |
die "You must enable usersandbox as X server can not run as root!" |
| 84 |
fi |
| 85 |
fi |
| 86 |
|
| 87 |
+ # Ensure we have enough disk space to compile |
| 88 |
+ if use pgo || use lto || use debug || use test ; then |
| 89 |
+ CHECKREQS_DISK_BUILD="8G" |
| 90 |
+ else |
| 91 |
+ CHECKREQS_DISK_BUILD="4G" |
| 92 |
+ fi |
| 93 |
+ |
| 94 |
+ check-reqs_pkg_pretend |
| 95 |
+} |
| 96 |
+ |
| 97 |
+pkg_setup() { |
| 98 |
+ moz_pkgsetup |
| 99 |
+ |
| 100 |
# Avoid PGO profiling problems due to enviroment leakage |
| 101 |
# These should *always* be cleaned up anyway |
| 102 |
unset DBUS_SESSION_BUS_ADDRESS \ |
| 103 |
@@ -236,17 +247,6 @@ pkg_setup() { |
| 104 |
llvm_pkg_setup |
| 105 |
} |
| 106 |
|
| 107 |
-pkg_pretend() { |
| 108 |
- # Ensure we have enough disk space to compile |
| 109 |
- if use pgo || use lto || use debug || use test ; then |
| 110 |
- CHECKREQS_DISK_BUILD="8G" |
| 111 |
- else |
| 112 |
- CHECKREQS_DISK_BUILD="4G" |
| 113 |
- fi |
| 114 |
- |
| 115 |
- check-reqs_pkg_setup |
| 116 |
-} |
| 117 |
- |
| 118 |
src_unpack() { |
| 119 |
default |
Archives