Revert r559792 to unbreak INDEX and bulk -a

It seems a lot of reverse dependencies were missed

With hat:	portmgr

1 files changed, 144 insertions, 0 deletions

diff --git a/devel/electron7/files/patch-chrome_app_chrome__main__delegate.cc b/devel/electron7/files/patch-chrome_app_chrome__main__delegate.cc
new file mode 100644
index 000000000000..0c05a2b85d05
--- /dev/null
+++ b/devel/electron7/files/patch-chrome_app_chrome__main__delegate.cc
@@ -0,0 +1,144 @@
+--- chrome/app/chrome_main_delegate.cc.orig	2019-12-12 12:39:04 UTC
++++ chrome/app/chrome_main_delegate.cc
+@@ -99,7 +99,7 @@
+ #include "chrome/app/shutdown_signal_handlers_posix.h"
+ #endif
+ 
+-#if BUILDFLAG(ENABLE_NACL) && defined(OS_LINUX)
++#if BUILDFLAG(ENABLE_NACL) && defined(OS_LINUX) && !defined(OS_BSD)
+ #include "components/nacl/common/nacl_paths.h"
+ #include "components/nacl/zygote/nacl_fork_delegate_linux.h"
+ #endif
+@@ -137,7 +137,7 @@
+ #include "v8/include/v8.h"
+ #endif
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ #include "base/environment.h"
+ #endif
+ 
+@@ -240,7 +240,7 @@ bool UseHooks() {
+ 
+ #endif  // defined(OS_WIN)
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) && !defined(OS_BSD)
+ void AdjustLinuxOOMScore(const std::string& process_type) {
+   // Browsers and zygotes should still be killable, but killed last.
+   const int kZygoteScore = 0;
+@@ -299,13 +299,13 @@ void AdjustLinuxOOMScore(const std::string& process_ty
+   if (score > -1)
+     base::AdjustOOMScore(base::GetCurrentProcId(), score);
+ }
+-#endif  // defined(OS_LINUX)
++#endif  // defined(OS_LINUX) && !defined(OS_BSD)
+ 
+ // Returns true if this subprocess type needs the ResourceBundle initialized
+ // and resources loaded.
+ bool SubprocessNeedsResourceBundle(const std::string& process_type) {
+   return
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+       // The zygote process opens the resources for the renderers.
+       process_type == service_manager::switches::kZygoteProcess ||
+ #endif
+@@ -344,7 +344,7 @@ bool HandleVersionSwitches(const base::CommandLine& co
+   return false;
+ }
+ 
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ // Show the man page if --help or -h is on the command line.
+ void HandleHelpSwitches(const base::CommandLine& command_line) {
+   if (command_line.HasSwitch(switches::kHelp) ||
+@@ -354,7 +354,7 @@ void HandleHelpSwitches(const base::CommandLine& comma
+     PLOG(FATAL) << "execlp failed";
+   }
+ }
+-#endif  // defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#endif  // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ 
+ #if !defined(OS_MACOSX) && !defined(OS_ANDROID)
+ void SIGTERMProfilingShutdown(int signal) {
+@@ -408,7 +408,7 @@ void InitializeUserDataDir(base::CommandLine* command_
+   std::string process_type =
+       command_line->GetSwitchValueASCII(switches::kProcessType);
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+   // On Linux, Chrome does not support running multiple copies under different
+   // DISPLAYs, so the profile directory can be specified in the environment to
+   // support the virtual desktop use-case.
+@@ -420,7 +420,7 @@ void InitializeUserDataDir(base::CommandLine* command_
+       user_data_dir = base::FilePath::FromUTF8Unsafe(user_data_dir_string);
+     }
+   }
+-#endif  // OS_LINUX
++#endif  // OS_LINUX || OS_BSD
+ #if defined(OS_MACOSX)
+   policy::path_parser::CheckUserDataDirPolicy(&user_data_dir);
+ #endif  // OS_MAC
+@@ -477,7 +477,7 @@ void InitLogging(const std::string& process_type) {
+ void RecordMainStartupMetrics(base::TimeTicks exe_entry_point_ticks) {
+   if (!exe_entry_point_ticks.is_null())
+     startup_metric_utils::RecordExeMainEntryPointTicks(exe_entry_point_ticks);
+-#if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX)
++#if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
+   // Record the startup process creation time on supported platforms.
+   startup_metric_utils::RecordStartupProcessCreationTime(
+       base::Process::Current().CreationTime());
+@@ -654,7 +654,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi
+     *exit_code = 0;
+     return true;  // Got a --version switch; exit with a success error code.
+   }
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+   // This will directly exit if the user asked for help.
+   HandleHelpSwitches(command_line);
+ #endif
+@@ -678,7 +678,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi
+ #if defined(OS_CHROMEOS)
+   chromeos::RegisterPathProvider();
+ #endif
+-#if BUILDFLAG(ENABLE_NACL) && defined(OS_LINUX)
++#if BUILDFLAG(ENABLE_NACL) && defined(OS_LINUX) && !defined(OS_BSD)
+   nacl::RegisterPathProvider();
+ #endif
+ 
+@@ -872,7 +872,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
+ #if defined(OS_WIN)
+   child_process_logging::Init();
+ #endif
+-#if defined(ARCH_CPU_ARM_FAMILY) && (defined(OS_ANDROID) || defined(OS_LINUX))
++#if defined(ARCH_CPU_ARM_FAMILY) && (defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD))
+   // Create an instance of the CPU class to parse /proc/cpuinfo and cache
+   // cpu_brand info.
+   base::CPU cpu_info;
+@@ -996,7 +996,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
+   InitializePDF();
+ #endif
+ 
+-#if defined(OS_POSIX) && !defined(OS_MACOSX)
++#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
+   // Zygote needs to call InitCrashReporter() in RunZygote().
+   if (process_type != service_manager::switches::kZygoteProcess) {
+ #if defined(OS_ANDROID)
+@@ -1011,7 +1011,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
+     breakpad::InitCrashReporter(process_type);
+ #endif  // defined(OS_ANDROID)
+   }
+-#endif  // defined(OS_POSIX) && !defined(OS_MACOSX)
++#endif  // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
+ 
+   // After all the platform Breakpads have been initialized, store the command
+   // line for crash reporting.
+@@ -1021,7 +1021,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
+ void ChromeMainDelegate::SandboxInitialized(const std::string& process_type) {
+   // Note: If you are adding a new process type below, be sure to adjust the
+   // AdjustLinuxOOMScore function too.
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) && !defined(OS_BSD)
+   AdjustLinuxOOMScore(process_type);
+ #endif
+ #if defined(OS_WIN)