commit: 34259f5bc04e3dda0f2d42e8fa3f0f19c6472678 Author: Filip Kobierski <fkobi <AT> pm <DOT> me> AuthorDate: Sun Jul 28 11:17:28 2024 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Mon Jul 29 07:00:55 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34259f5b
www-client/firefox: fix ExcessiveLineLength where possible Signed-off-by: Filip Kobierski <fkobi <AT> pm.me> Closes: https://github.com/gentoo/gentoo/pull/37757 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> www-client/firefox/firefox-115.13.0.ebuild | 3 ++- www-client/firefox/firefox-128.0.2.ebuild | 16 ++++++++++------ www-client/firefox/firefox-128.0.3.ebuild | 16 ++++++++++------ www-client/firefox/firefox-128.0.ebuild | 16 ++++++++++------ 4 files changed, 32 insertions(+), 19 deletions(-) diff --git a/www-client/firefox/firefox-115.13.0.ebuild b/www-client/firefox/firefox-115.13.0.ebuild index 37e84873147b..445bf48eba12 100644 --- a/www-client/firefox/firefox-115.13.0.ebuild +++ b/www-client/firefox/firefox-115.13.0.ebuild @@ -256,7 +256,8 @@ llvm_check_deps() { if use pgo ; then if ! has_version -b "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*[profile]" ; then - einfo "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*[profile] is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2 + einfo "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*[profile] is missing!" + einfo "Cannot use LLVM slot ${LLVM_SLOT} ..." >&2 return 1 fi fi diff --git a/www-client/firefox/firefox-128.0.2.ebuild b/www-client/firefox/firefox-128.0.2.ebuild index 2cc2102ebd70..bb58710aa6dc 100644 --- a/www-client/firefox/firefox-128.0.2.ebuild +++ b/www-client/firefox/firefox-128.0.2.ebuild @@ -217,7 +217,8 @@ llvm_check_deps() { if use pgo ; then if ! has_version -b "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*[profile]" ; then - einfo "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*[profile] is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2 + einfo "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*[profile] is missing!" >&2 + einfo "Cannot use LLVM slot ${LLVM_SLOT} ..." >&2 return 1 fi fi @@ -650,7 +651,8 @@ src_prepare() { "${S}"/third_party/libwebrtc/build/toolchain/get_cpu_count.py || die "Failed sedding multiprocessing.cpu_count" sed -i -e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \ - "${S}"/third_party/libwebrtc/build/toolchain/get_concurrent_links.py || die "Failed sedding multiprocessing.cpu_count" + "${S}"/third_party/libwebrtc/build/toolchain/get_concurrent_links.py \ + || die "Failed sedding multiprocessing.cpu_count" sed -i -e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \ "${S}"/third_party/python/gyp/pylib/gyp/input.py || die "Failed sedding multiprocessing.cpu_count" @@ -687,10 +689,12 @@ src_prepare() { elog "if that fails try -jumbo-build before opening a bug report." elog "" - sed -i -e "s/\"FILES_PER_UNIFIED_FILE\", 16/\"FILES_PER_UNIFIED_FILE\", "${my_files_per_unified_file}"/" python/mozbuild/mozbuild/frontend/data.py || - die "Failed to adjust FILES_PER_UNIFIED_FILE in python/mozbuild/mozbuild/frontend/data.py" - sed -i -e "s/FILES_PER_UNIFIED_FILE = 6/FILES_PER_UNIFIED_FILE = "${my_files_per_unified_file}"/" js/src/moz.build || - die "Failed to adjust FILES_PER_UNIFIED_FILE in js/src/moz.build" + sed -i -e "s/\"FILES_PER_UNIFIED_FILE\", 16/\"FILES_PER_UNIFIED_FILE\", "${my_files_per_unified_file}"/" \ + python/mozbuild/mozbuild/frontend/data.py \ + || die "Failed to adjust FILES_PER_UNIFIED_FILE in python/mozbuild/mozbuild/frontend/data.py" + sed -i -e "s/FILES_PER_UNIFIED_FILE = 6/FILES_PER_UNIFIED_FILE = "${my_files_per_unified_file}"/" \ + js/src/moz.build \ + || die "Failed to adjust FILES_PER_UNIFIED_FILE in js/src/moz.build" fi # Create build dir diff --git a/www-client/firefox/firefox-128.0.3.ebuild b/www-client/firefox/firefox-128.0.3.ebuild index 2cc2102ebd70..6a86004e39be 100644 --- a/www-client/firefox/firefox-128.0.3.ebuild +++ b/www-client/firefox/firefox-128.0.3.ebuild @@ -217,7 +217,8 @@ llvm_check_deps() { if use pgo ; then if ! has_version -b "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*[profile]" ; then - einfo "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*[profile] is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2 + einfo "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*[profile] is missing!" >&2 + einfo "Cannot use LLVM slot ${LLVM_SLOT} ..." >&2 return 1 fi fi @@ -650,7 +651,8 @@ src_prepare() { "${S}"/third_party/libwebrtc/build/toolchain/get_cpu_count.py || die "Failed sedding multiprocessing.cpu_count" sed -i -e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \ - "${S}"/third_party/libwebrtc/build/toolchain/get_concurrent_links.py || die "Failed sedding multiprocessing.cpu_count" + "${S}"/third_party/libwebrtc/build/toolchain/get_concurrent_links.py \ + || die "Failed sedding multiprocessing.cpu_count" sed -i -e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \ "${S}"/third_party/python/gyp/pylib/gyp/input.py || die "Failed sedding multiprocessing.cpu_count" @@ -687,10 +689,12 @@ src_prepare() { elog "if that fails try -jumbo-build before opening a bug report." elog "" - sed -i -e "s/\"FILES_PER_UNIFIED_FILE\", 16/\"FILES_PER_UNIFIED_FILE\", "${my_files_per_unified_file}"/" python/mozbuild/mozbuild/frontend/data.py || - die "Failed to adjust FILES_PER_UNIFIED_FILE in python/mozbuild/mozbuild/frontend/data.py" - sed -i -e "s/FILES_PER_UNIFIED_FILE = 6/FILES_PER_UNIFIED_FILE = "${my_files_per_unified_file}"/" js/src/moz.build || - die "Failed to adjust FILES_PER_UNIFIED_FILE in js/src/moz.build" + sed -i -e "s/\"FILES_PER_UNIFIED_FILE\", 16/\"FILES_PER_UNIFIED_FILE\", "${my_files_per_unified_file}"/" \ + python/mozbuild/mozbuild/frontend/data.py + || die "Failed to adjust FILES_PER_UNIFIED_FILE in python/mozbuild/mozbuild/frontend/data.py" + sed -i -e "s/FILES_PER_UNIFIED_FILE = 6/FILES_PER_UNIFIED_FILE = "${my_files_per_unified_file}"/" \ + js/src/moz.build + || die "Failed to adjust FILES_PER_UNIFIED_FILE in js/src/moz.build" fi # Create build dir diff --git a/www-client/firefox/firefox-128.0.ebuild b/www-client/firefox/firefox-128.0.ebuild index bc776a4fbb80..f4a6fa3babc7 100644 --- a/www-client/firefox/firefox-128.0.ebuild +++ b/www-client/firefox/firefox-128.0.ebuild @@ -216,7 +216,8 @@ llvm_check_deps() { if use pgo ; then if ! has_version -b "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*[profile]" ; then - einfo "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*[profile] is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2 + einfo "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*[profile] is missing!" >&2 + einfo "Cannot use LLVM slot ${LLVM_SLOT} ..." >&2 return 1 fi fi @@ -649,7 +650,8 @@ src_prepare() { "${S}"/third_party/libwebrtc/build/toolchain/get_cpu_count.py || die "Failed sedding multiprocessing.cpu_count" sed -i -e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \ - "${S}"/third_party/libwebrtc/build/toolchain/get_concurrent_links.py || die "Failed sedding multiprocessing.cpu_count" + "${S}"/third_party/libwebrtc/build/toolchain/get_concurrent_links.py \ + || die "Failed sedding multiprocessing.cpu_count" sed -i -e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \ "${S}"/third_party/python/gyp/pylib/gyp/input.py || die "Failed sedding multiprocessing.cpu_count" @@ -686,10 +688,12 @@ src_prepare() { elog "if that fails try -jumbo-build before opening a bug report." elog "" - sed -i -e "s/\"FILES_PER_UNIFIED_FILE\", 16/\"FILES_PER_UNIFIED_FILE\", "${my_files_per_unified_file}"/" python/mozbuild/mozbuild/frontend/data.py || - die "Failed to adjust FILES_PER_UNIFIED_FILE in python/mozbuild/mozbuild/frontend/data.py" - sed -i -e "s/FILES_PER_UNIFIED_FILE = 6/FILES_PER_UNIFIED_FILE = "${my_files_per_unified_file}"/" js/src/moz.build || - die "Failed to adjust FILES_PER_UNIFIED_FILE in js/src/moz.build" + sed -i -e "s/\"FILES_PER_UNIFIED_FILE\", 16/\"FILES_PER_UNIFIED_FILE\", "${my_files_per_unified_file}"/" \ + python/mozbuild/mozbuild/frontend/data.py \ + || die "Failed to adjust FILES_PER_UNIFIED_FILE in python/mozbuild/mozbuild/frontend/data.py" + sed -i -e "s/FILES_PER_UNIFIED_FILE = 6/FILES_PER_UNIFIED_FILE = "${my_files_per_unified_file}"/" \ + js/src/moz.build \ + || die "Failed to adjust FILES_PER_UNIFIED_FILE in js/src/moz.build" fi # Create build dir
