[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/, dev-qt/qtwebengine/files/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     ad78682a89f566aac4a43ee935038e6068212b84
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Apr  9 20:11:23 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Apr  9 20:17:05 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad78682a

dev-qt/qtwebengine: Cleanup vulnerable 5.15.8_p20230112

Bug: https://bugs.gentoo.org/903544
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-qt/qtwebengine/Manifest                        |   3 -
 ...qtwebengine-5.15.2-disable-fatal-warnings.patch |  12 -
 ...ine-5.15.2_p20210224-chromium-87-v8-icu68.patch | 192 ---------
 .../qtwebengine-5.15.2_p20210224-disable-git.patch |  15 -
 ...gine-5.15.2_p20211015-pdfium-system-lcms2.patch |  79 ----
 .../qtwebengine-5.15.3_p20220329-clang14.patch     |  42 --
 .../qtwebengine-5.15.3_p20220406-ffmpeg5.patch     | 169 --------
 ...webengine-5.15.3_p20220406-gcc12-includes.patch |  32 --
 .../qtwebengine-5.15.3_p20220505-extra-gn.patch    |  10 -
 ...gine-5.15.8_p20230106-v8-opcode-constexpr.patch |  43 --
 .../qtwebengine-5.15.8_p20230106-widevine.patch    |  82 ----
 .../files/qtwebengine-5.15.8_p20230112-gcc13.patch | 431 ---------------------
 .../qtwebengine-5.15.8_p20230112.ebuild            | 285 --------------
 13 files changed, 1395 deletions(-)

diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 96741df51b44..e8759573bd2a 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,7 +1,4 @@
 DIST qtwebengine-5.15.2-r1-chromium87-ppc64le.tar.xz 28784 BLAKE2B aa101d14446f3282fda8932cc75a249d88b79319f0886d95777292776d94ac5f4fc114c3893b2801fbba6abb14f381172bb14b15b5ffef12413db3a16e4d1ca6 SHA512 3324e0076eb18e2ae2248428d2730cfb3413761514b2bb57e25b8db79248aaaa8098d9f7cebfa08f1a3b39b1d0a382aafed75c5ae8273918909335957921305e
-DIST qtwebengine-5.15.2_p20211019-jumbo-build.patch.bz2 2930 BLAKE2B fca1d1406874d04eafb64bb4d8730512a6307ba44fb99d76f428ca1bd4a303758e0c3bd8f92a59f7bcf62e5b767c5a8ed239028bdb74ad7a8b62abf88d38c101 SHA512 61cbfbe4ff340b75ea8d356e031e932ac03fe65dd009999ff897ca4b0185d1d989490daf75ffeaaabb3e92c870c11c7ff8ad2cd6372f5363b3d774b8ecca6d89
-DIST qtwebengine-5.15.3_p20220406-patchset.tar.xz 35480 BLAKE2B ce6aeebbb3255196611130d04ee7a3907ba45d6d2a283f2433e2176cf67e473e74137b180de0a9998762cc54439bb06825815e81e9f95f9413ce2956ac9308b7 SHA512 47e29a1429dce2db324929af91c8ef8421c75ae48f5a491db71b434f8017a5b1e7475e9938989e331e8e012220852848565242e09747892e1a8a8d3ab7386840
-DIST qtwebengine-5.15.8_p20230112.tar.xz 320881876 BLAKE2B 681fb4e2c6dfb80f1f2839092bbbd891a0a0d68f6b31dbdfe8693b8ea9a0ecd9611ba692b0565f32fc2ad199de715cf61e333d796df618572f79d9ed88545ffb SHA512 1806e7a3134579a5cfc0c932cc95ffb15edc515c2ff32b01eee9de8245938f95301610cd7b57451a07a9e38451111973b88c1d64a03f1371e58106bf202b143e
 DIST qtwebengine-5.15.8_p20230313-patchset.tar.xz 45904 BLAKE2B 9f58b9808fd445a06e6a2cd6d5f7bc9782bd6de13138fdebc9e81bd9f69e7ae673a71bd3ed6b011a47e84cc64b5b703a7cfc8d5f740eaaa663da1db8ef9ef05b SHA512 21b0b853358260fa1bdc96c97c5b2af7007c744d10abeebf9f0e708a0cd7dece583d86c0554a4e327a0d615bb403b0d328acaa6622b50d7a8059bc0802edbcec
 DIST qtwebengine-5.15.8_p20230313.tar.xz 298163692 BLAKE2B 653e2577ea7e670fdffec2cf2db5392621109571b430b9b66c7bc23739a14eb36ffa5f989ec2b98d77e718b0a69bd2b3948f0340fd9e86aaf10372c8b13286ee SHA512 34062e54f95f441420b41ede88d0f0f98445677d301eedbe0be2e57cc5c280d4e564abb99ccf754eb2c0efaccc21ff4e34bc20163c970b4d5309ca85c5f37577
 DIST qtwebengine-everywhere-src-6.4.3.tar.xz 440562844 BLAKE2B 86155ffbb12bef9dad461c2bb0dc4fce53b269c6f9f61cd1ec49cc25bb0516dcfc903ce8b48751c9c47614d448c2cd290f3f313d5fdfe0a3643534fa7e2e9f3f SHA512 e9e8bdeac942350bf779a9fabfb59ffdfec366ec23cb1c58fa416a777c9399bfa9828107f6a1c079414a8aa52a35d0547e3bd673053d994e19308e11733e0d39

diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.2-disable-fatal-warnings.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.2-disable-fatal-warnings.patch
deleted file mode 100644
index b0f5f3d30e0b..000000000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.15.2-disable-fatal-warnings.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/buildtools/config/common.pri b/src/buildtools/config/common.pri
-index cf990c79..910a88ca 100644
---- a/src/buildtools/config/common.pri
-+++ b/src/buildtools/config/common.pri
-@@ -26,6 +26,7 @@ gn_args += \
-     skia_use_dawn=false \
-     toolkit_views=false \
-     treat_warnings_as_errors=false \
-+    fatal_linker_warnings=false \
-     use_allocator_shim=false \
-     use_allocator=\"none\" \
-     use_custom_libcxx=false \

diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210224-chromium-87-v8-icu68.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210224-chromium-87-v8-icu68.patch
deleted file mode 100644
index a6856975a663..000000000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210224-chromium-87-v8-icu68.patch
+++ /dev/null
@@ -1,192 +0,0 @@
-From b0a7f5691113534c2cf771f2dd3cece5e93bc7d4 Mon Sep 17 00:00:00 2001
-From: Frank Tang <ftang@chromium.org>
-Date: Tue, 03 Nov 2020 23:20:37 -0800
-Subject: [PATCH] Update to ICU68-1
-
-ICU68-1 change the output skeleton format. So we need to change
-resolvedOptions code for 68 migration.
-
-Chromium roll
-https://chromium-review.googlesource.com/c/chromium/src/+/2474093
-
-Bug: v8:10945
-Change-Id: I3b2c7fbe8abb22df8fa51287c498ca3245b8c55b
-Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2477431
-Commit-Queue: Frank Tang <ftang@chromium.org>
-Reviewed-by: Jakob Kummerow <jkummerow@chromium.org>
-Reviewed-by: Shu-yu Guo <syg@chromium.org>
-Cr-Commit-Position: refs/heads/master@{#70972}
-
-(ported to work with <ICU-68.1 and rebased chromium)
----
-
-diff --git a/src/3rdparty/chromium/v8/src/objects/js-number-format.cc b/src/3rdparty/chromium/v8/src/objects/js-number-format.cc
-index 45b0eab..d18b133 100644
---- a/src/3rdparty/chromium/v8/src/objects/js-number-format.cc
-+++ b/src/3rdparty/chromium/v8/src/objects/js-number-format.cc
-@@ -389,17 +389,20 @@ Handle<String> CurrencySignString(Isolate* isolate,
- Handle<String> UnitDisplayString(Isolate* isolate,
-                                  const icu::UnicodeString& skeleton) {
-   // Ex: skeleton as
--  // "measure-unit/length-meter .### rounding-mode-half-up unit-width-full-name"
-+  // <ICU-68.1:  "measure-unit/length-meter .### rounding-mode-half-up unit-width-full-name".
-+  // >=ICU-68.1: "unit/length-meter .### rounding-mode-half-up unit-width-full-name"
-   if (skeleton.indexOf("unit-width-full-name") >= 0) {
-     return ReadOnlyRoots(isolate).long_string_handle();
-   }
-   // Ex: skeleton as
--  // "measure-unit/length-meter .### rounding-mode-half-up unit-width-narrow".
-+  // <ICU-68.1:  "measure-unit/length-meter .### rounding-mode-half-up unit-width-narrow".
-+  // >=ICU-68.1: "unit/length-meter .### rounding-mode-half-up unit-width-narrow".
-   if (skeleton.indexOf("unit-width-narrow") >= 0) {
-     return ReadOnlyRoots(isolate).narrow_string_handle();
-   }
-   // Ex: skeleton as
--  // "measure-unit/length-foot .### rounding-mode-half-up"
-+  // <ICU-68.1:  "measure-unit/length-foot .### rounding-mode-half-up"
-+  // >=ICU-68.1: "unit/length-foot .### rounding-mode-half-up"
-   return ReadOnlyRoots(isolate).short_string_handle();
- }
- 
-@@ -422,7 +425,8 @@ Notation NotationFromSkeleton(const icu::UnicodeString& skeleton) {
-     return Notation::COMPACT;
-   }
-   // Ex: skeleton as
--  // "measure-unit/length-foot .### rounding-mode-half-up"
-+  // <ICU-68.1:  "measure-unit/length-foot .### rounding-mode-half-up"
-+  // >=ICU-68.1: "unit/length-foot .### rounding-mode-half-up"
-   return Notation::STANDARD;
- }
- 
-@@ -562,14 +566,23 @@ namespace {
- 
- // Ex: percent .### rounding-mode-half-up
- // Special case for "percent"
--// Ex: "measure-unit/length-kilometer per-measure-unit/duration-hour .###
--// rounding-mode-half-up" should return "kilometer-per-unit".
--// Ex: "measure-unit/duration-year .### rounding-mode-half-up" should return
--// "year".
-+// <ICU-68.1:
-+//   Ex: "measure-unit/length-kilometer per-measure-unit/duration-hour .###
-+//   rounding-mode-half-up" should return "kilometer-per-unit".
-+//   Ex: "measure-unit/duration-year .### rounding-mode-half-up" should return
-+// >=ICU-68.1:
-+//   Ex: "unit/milliliter-per-acre .### rounding-mode-half-up"
-+//   should return "milliliter-per-acre".
-+//   Ex: "unit/year .### rounding-mode-half-up" should return
-+//   "year".
- std::string UnitFromSkeleton(const icu::UnicodeString& skeleton) {
-   std::string str;
-   str = skeleton.toUTF8String<std::string>(str);
-+#if U_ICU_VERSION_MAJOR_NUM < 68
-   std::string search("measure-unit/");
-+#else
-+  std::string search("unit/");
-+#endif
-   size_t begin = str.find(search);
-   if (begin == str.npos) {
-     // Special case for "percent".
-@@ -578,20 +591,41 @@ std::string UnitFromSkeleton(const icu::UnicodeString& skeleton) {
-     }
-     return "";
-   }
-+#if U_ICU_VERSION_MAJOR_NUM < 68
-   // Skip the type (ex: "length").
-   // "measure-unit/length-kilometer per-measure-unit/duration-hour"
-   //                     b
-   begin = str.find("-", begin + search.size());
-+#else
-+  // Ex:
-+  // "unit/acre .### rounding-mode-half-up"
-+  //       b
-+  // Ex:
-+  // "unit/milliliter-per-acre .### rounding-mode-half-up"
-+  //       b
-+  begin += search.size();
-+#endif
-   if (begin == str.npos) {
-     return "";
-   }
-+#if U_ICU_VERSION_MAJOR_NUM < 68
-   begin++;  // Skip the '-'.
-+#endif
-   // Find the end of the subtype.
-   size_t end = str.find(" ", begin);
--  // "measure-unit/length-kilometer per-measure-unit/duration-hour"
--  //                      b        e
-+  // <ICU-68.1:
-+  //   "measure-unit/length-kilometer per-measure-unit/duration-hour"
-+  //                        b        e
-+  // >=ICU-68.1:
-+  //   Ex:
-+  //   "unit/acre .### rounding-mode-half-up"
-+  //         b   e
-+  //   Ex:
-+  //   "unit/milliliter-per-acre .### rounding-mode-half-up"
-+  //         b                  e
-   if (end == str.npos) {
-     end = str.size();
-+#if U_ICU_VERSION_MAJOR_NUM < 68
-     return str.substr(begin, end - begin);
-   }
-   // "measure-unit/length-kilometer per-measure-unit/duration-hour"
-@@ -625,17 +659,36 @@ std::string UnitFromSkeleton(const icu::UnicodeString& skeleton) {
-   // "measure-unit/length-kilometer per-measure-unit/duration-hour"
-   //                      [result ]                           b   e
-   return result + "-per-" + str.substr(begin, end - begin);
-+#else
-+  }
-+  return str.substr(begin, end - begin);
-+#endif
- }
- 
- Style StyleFromSkeleton(const icu::UnicodeString& skeleton) {
-   if (skeleton.indexOf("currency/") >= 0) {
-     return Style::CURRENCY;
-   }
-+#if U_ICU_VERSION_MAJOR_NUM < 68
-   if (skeleton.indexOf("measure-unit/") >= 0) {
-     if (skeleton.indexOf("scale/100") >= 0 &&
-         skeleton.indexOf("measure-unit/concentr-percent") >= 0) {
-+#else
-+  if (skeleton.indexOf("percent") >= 0) {
-+    // percent precision-integer rounding-mode-half-up scale/100
-+    if (skeleton.indexOf("scale/100") >= 0) {
-+#endif
-       return Style::PERCENT;
-+#if U_ICU_VERSION_MAJOR_NUM >= 68
-+    } else {
-+      return Style::UNIT;
-+#endif
-     }
-+#if U_ICU_VERSION_MAJOR_NUM >= 68
-+  }
-+  // Before ICU68: "measure-unit/", since ICU68 "unit/"
-+  if (skeleton.indexOf("unit/") >= 0) {
-+#endif
-     return Style::UNIT;
-   }
-   return Style::DECIMAL;
-diff --git a/src/3rdparty/chromium/v8/src/objects/js-relative-time-format.cc b/src/3rdparty/chromium/v8/src/objects/js-relative-time-format.cc
-index 267343aaae..64d56a1c12 100644
---- a/src/3rdparty/chromium/v8/src/objects/js-relative-time-format.cc
-+++ b/src/3rdparty/chromium/v8/src/objects/js-relative-time-format.cc
-@@ -195,9 +195,18 @@ MaybeHandle<JSRelativeTimeFormat> JSRelativeTimeFormat::New(
-     }
-   }
- 
-+#if U_ICU_VERSION_MAJOR_NUM < 68
-   icu::DecimalFormat* decimal_format =
-       static_cast<icu::DecimalFormat*>(number_format);
-   decimal_format->setMinimumGroupingDigits(-2);
-+#else
-+  if (number_format->getDynamicClassID() ==
-+      icu::DecimalFormat::getStaticClassID()) {
-+    icu::DecimalFormat* decimal_format =
-+        static_cast<icu::DecimalFormat*>(number_format);
-+    decimal_format->setMinimumGroupingDigits(-2);
-+  }
-+#endif
- 
-   // Change UDISPCTX_CAPITALIZATION_NONE to other values if
-   // ECMA402 later include option to change capitalization.

diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210224-disable-git.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210224-disable-git.patch
deleted file mode 100644
index c31e8970eaef..000000000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210224-disable-git.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-generate_gni.sh: update_readme() runs git at the end of process, prevent it.
-
-Thanks-to: Georgy Yakovlev <gyakovlev@gentoo.org>
-
---- a/src/3rdparty/chromium/third_party/libvpx/generate_gni.sh	2021-02-07 12:51:49.438514897 +0100
-+++ b/src/3rdparty/chromium/third_party/libvpx/generate_gni.sh	2021-02-21 16:23:38.375724515 +0100
-@@ -519,8 +519,3 @@
- 
- gn format --in-place $BASE_DIR/BUILD.gn
- gn format --in-place $BASE_DIR/libvpx_srcs.gni
--
--cd $BASE_DIR/$LIBVPX_SRC_DIR
--update_readme
--
--cd $BASE_DIR

diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20211015-pdfium-system-lcms2.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20211015-pdfium-system-lcms2.patch
deleted file mode 100644
index b3c2ffb315a5..000000000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20211015-pdfium-system-lcms2.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-Description: Use system lcms2
-Author: Sandro Knauß <hefee@debian.org>
-Origin: Debian
-Forwarded: https://bugreports.qt.io/browse/QTBUG-61746
-Reviewed-by: Sandro Knauß <hefee@debian.org>
-Last-Update: 2021-03-08
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/src/3rdparty/chromium/third_party/pdfium/third_party/BUILD.gn
-+++ b/src/3rdparty/chromium/third_party/pdfium/third_party/BUILD.gn
-@@ -239,58 +239,19 @@ if (!pdf_use_skia && !pdf_use_skia_paths
-   }
- }
- 
--config("fx_lcms2_warnings") {
--  visibility = [ ":*" ]
--  if (is_clang) {
--    cflags = [
--      # cmslut.cc is sloppy with aggregate initialization. Version 2.7 of this
--      # library doesn't appear to have this problem.
--      "-Wno-missing-braces",
--    ]
--  }
-+import("//build/shim_headers.gni")
-+
-+shim_headers("lcms2_shim") {
-+  root_path = "lcms/include"
-+  headers = [
-+    "lcms2.h",
-+    "lcms2_plugin.h",
-+  ]
- }
- 
- source_set("fx_lcms2") {
--  configs -= [ "//build/config/compiler:chromium_code" ]
--  configs += [
--    "//build/config/compiler:no_chromium_code",
--    "//build/config/sanitizers:cfi_icall_generalize_pointers",
--    ":pdfium_third_party_config",
--
--    # Must be after no_chromium_code for warning flags to be ordered correctly.
--    ":fx_lcms2_warnings",
--  ]
--  sources = [
--    "lcms/include/lcms2.h",
--    "lcms/include/lcms2_plugin.h",
--    "lcms/src/cmsalpha.c",
--    "lcms/src/cmscam02.c",
--    "lcms/src/cmscgats.c",
--    "lcms/src/cmscnvrt.c",
--    "lcms/src/cmserr.c",
--    "lcms/src/cmsgamma.c",
--    "lcms/src/cmsgmt.c",
--    "lcms/src/cmshalf.c",
--    "lcms/src/cmsintrp.c",
--    "lcms/src/cmsio0.c",
--    "lcms/src/cmsio1.c",
--    "lcms/src/cmslut.c",
--    "lcms/src/cmsmd5.c",
--    "lcms/src/cmsmtrx.c",
--    "lcms/src/cmsnamed.c",
--    "lcms/src/cmsopt.c",
--    "lcms/src/cmspack.c",
--    "lcms/src/cmspcs.c",
--    "lcms/src/cmsplugin.c",
--    "lcms/src/cmsps2.c",
--    "lcms/src/cmssamp.c",
--    "lcms/src/cmssm.c",
--    "lcms/src/cmstypes.c",
--    "lcms/src/cmsvirt.c",
--    "lcms/src/cmswtpnt.c",
--    "lcms/src/cmsxform.c",
--  ]
--  deps = [ "../core/fxcrt" ]
-+  deps = [ ":lcms2_shim" ]
-+  libs = ["lcms2"]
- }
- 
- if (!build_with_chromium) {

diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.3_p20220329-clang14.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.3_p20220329-clang14.patch
deleted file mode 100644
index c1a98d0934fb..000000000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.15.3_p20220329-clang14.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 0825e7bc64e47d87e1f1026cc80c933550f114f5 Mon Sep 17 00:00:00 2001
-From: Dimitry Andric <dim@FreeBSD.org>
-Date: Mon, 14 Feb 2022 13:55:25 +0100
-Subject: www/qt5-webengine: fix build with clang 14
-
-Fixes compile error:
-
-In file included from gen/third_party/blink/renderer/platform/platform_jumbo_63.cc:8:
-src/3rdparty/chromium/third_party/blink/renderer/platform/text/text_break_iterator_icu.cc:122:15: error: anonymous non-C-compatible type given name for linkage purposes by typedef declaration after its linkage was computed; add a tag name here to establish linkage prior to definition
-typedef struct {
-              ^
-               UTextWithBuffer
-src/3rdparty/chromium/third_party/blink/renderer/platform/text/text_break_iterator_icu.cc:123:3: note: type is not C-compatible due to this member declaration
-  DISALLOW_NEW();
-  ^~~~~~~~~~~~~~
-src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/allocator/allocator.h:40:2: note: expanded from macro 'DISALLOW_NEW'
- public:                                                                      \
- ^~~~~~~
-src/3rdparty/chromium/third_party/blink/renderer/platform/text/text_break_iterator_icu.cc:126:3: note: type is given name 'UTextWithBuffer' for linkage purposes by this typedef declaration
-} UTextWithBuffer;
-  ^
-
-PR:		261949
-Approved by:	adridg (maintainer)
-MFH:		2022Q1
-
---- a/src/3rdparty/chromium/third_party/blink/renderer/platform/text/text_break_iterator_icu.cc
-+++ b/src/3rdparty/chromium/third_party/blink/renderer/platform/text/text_break_iterator_icu.cc
-@@ -119,11 +119,11 @@ enum TextContext { kNoContext, kPriorContext, kPrimary
- 
- const int kTextBufferCapacity = 16;
- 
--typedef struct {
-+struct UTextWithBuffer {
-   DISALLOW_NEW();
-   UText text;
-   UChar buffer[kTextBufferCapacity];
--} UTextWithBuffer;
-+};
- 
- static inline int64_t TextPinIndex(int64_t& index, int64_t limit) {
-   if (index < 0)

diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.3_p20220406-ffmpeg5.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.3_p20220406-ffmpeg5.patch
deleted file mode 100644
index 15c192667f22..000000000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.15.3_p20220406-ffmpeg5.patch
+++ /dev/null
@@ -1,169 +0,0 @@
-From 05f6ffbbce0a2aad01dc05d682cbe4a1ec44fad5 Mon Sep 17 00:00:00 2001
-From: Antonio Rojas <arojas@archlinux.org>
-Date: Tue, 25 Jan 2022 10:51:58 +0000
-Subject: [PATCH] Fix build with ffmpeg 5
-
----
- chromium/media/ffmpeg/ffmpeg_common.h                |  1 +
- chromium/media/filters/audio_file_reader.cc          |  2 +-
- chromium/media/filters/ffmpeg_audio_decoder.cc       |  2 +-
- chromium/media/filters/ffmpeg_demuxer.cc             | 12 ++++++------
- chromium/media/filters/ffmpeg_glue.cc                |  4 ----
- chromium/media/filters/ffmpeg_video_decoder.cc       |  2 +-
- chromium/media/filters/media_file_checker.cc         |  2 +-
- .../video_coding/codecs/h264/h264_decoder_impl.cc    |  2 +-
- 8 files changed, 12 insertions(+), 15 deletions(-)
-
-diff --git a/chromium/media/ffmpeg/ffmpeg_common.h b/chromium/media/ffmpeg/ffmpeg_common.h
-index 2734a485cbd..70b1877a43c 100644
---- a/src/3rdparty/chromium/media/ffmpeg/ffmpeg_common.h
-+++ b/src/3rdparty/chromium/media/ffmpeg/ffmpeg_common.h
-@@ -29,6 +29,7 @@ extern "C" {
- #include <libavformat/avformat.h>
- #include <libavformat/avio.h>
- #include <libavutil/avutil.h>
-+#include <libavutil/channel_layout.h>
- #include <libavutil/imgutils.h>
- #include <libavutil/log.h>
- #include <libavutil/mastering_display_metadata.h>
-diff --git a/chromium/media/filters/audio_file_reader.cc b/chromium/media/filters/audio_file_reader.cc
-index cb81d920def..bd73908d0ca 100644
---- a/src/3rdparty/chromium/media/filters/audio_file_reader.cc
-+++ b/src/3rdparty/chromium/media/filters/audio_file_reader.cc
-@@ -85,7 +85,7 @@ bool AudioFileReader::OpenDemuxer() {
- }
- 
- bool AudioFileReader::OpenDecoder() {
--  AVCodec* codec = avcodec_find_decoder(codec_context_->codec_id);
-+  const AVCodec* codec = avcodec_find_decoder(codec_context_->codec_id);
-   if (codec) {
-     // MP3 decodes to S16P which we don't support, tell it to use S16 instead.
-     if (codec_context_->sample_fmt == AV_SAMPLE_FMT_S16P)
-diff --git a/chromium/media/filters/ffmpeg_audio_decoder.cc b/chromium/media/filters/ffmpeg_audio_decoder.cc
-index 0d825ed791b..72fac6167ef 100644
---- a/src/3rdparty/chromium/media/filters/ffmpeg_audio_decoder.cc
-+++ b/src/3rdparty/chromium/media/filters/ffmpeg_audio_decoder.cc
-@@ -329,7 +329,7 @@ bool FFmpegAudioDecoder::ConfigureDecoder(const AudioDecoderConfig& config) {
-     }
-   }
- 
--  AVCodec* codec = avcodec_find_decoder(codec_context_->codec_id);
-+  const AVCodec* codec = avcodec_find_decoder(codec_context_->codec_id);
-   if (!codec ||
-       avcodec_open2(codec_context_.get(), codec, &codec_options) < 0) {
-     DLOG(ERROR) << "Could not initialize audio decoder: "
-diff --git a/chromium/media/filters/ffmpeg_demuxer.cc b/chromium/media/filters/ffmpeg_demuxer.cc
-index d34db63f3ef..427565b00c1 100644
---- a/src/3rdparty/chromium/media/filters/ffmpeg_demuxer.cc
-+++ b/src/3rdparty/chromium/media/filters/ffmpeg_demuxer.cc
-@@ -98,12 +98,12 @@ static base::TimeDelta ExtractStartTime(AVStream* stream) {
- 
-   // Next try to use the first DTS value, for codecs where we know PTS == DTS
-   // (excludes all H26x codecs). The start time must be returned in PTS.
--  if (stream->first_dts != kNoFFmpegTimestamp &&
-+  if (av_stream_get_first_dts(stream) != kNoFFmpegTimestamp &&
-       stream->codecpar->codec_id != AV_CODEC_ID_HEVC &&
-       stream->codecpar->codec_id != AV_CODEC_ID_H264 &&
-       stream->codecpar->codec_id != AV_CODEC_ID_MPEG4) {
-     const base::TimeDelta first_pts =
--        ConvertFromTimeBase(stream->time_base, stream->first_dts);
-+        ConvertFromTimeBase(stream->time_base, av_stream_get_first_dts(stream));
-     if (first_pts < start_time)
-       start_time = first_pts;
-   }
-@@ -408,11 +408,11 @@ void FFmpegDemuxerStream::EnqueuePacket(ScopedAVPacket packet) {
-   scoped_refptr<DecoderBuffer> buffer;
- 
-   if (type() == DemuxerStream::TEXT) {
--    int id_size = 0;
-+    size_t id_size = 0;
-     uint8_t* id_data = av_packet_get_side_data(
-         packet.get(), AV_PKT_DATA_WEBVTT_IDENTIFIER, &id_size);
- 
--    int settings_size = 0;
-+    size_t settings_size = 0;
-     uint8_t* settings_data = av_packet_get_side_data(
-         packet.get(), AV_PKT_DATA_WEBVTT_SETTINGS, &settings_size);
- 
-@@ -424,7 +424,7 @@ void FFmpegDemuxerStream::EnqueuePacket(ScopedAVPacket packet) {
-     buffer = DecoderBuffer::CopyFrom(packet->data, packet->size,
-                                      side_data.data(), side_data.size());
-   } else {
--    int side_data_size = 0;
-+    size_t side_data_size = 0;
-     uint8_t* side_data = av_packet_get_side_data(
-         packet.get(), AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL, &side_data_size);
- 
-@@ -485,7 +485,7 @@ void FFmpegDemuxerStream::EnqueuePacket(ScopedAVPacket packet) {
-                                        packet->size - data_offset);
-     }
- 
--    int skip_samples_size = 0;
-+    size_t skip_samples_size = 0;
-     const uint32_t* skip_samples_ptr =
-         reinterpret_cast<const uint32_t*>(av_packet_get_side_data(
-             packet.get(), AV_PKT_DATA_SKIP_SAMPLES, &skip_samples_size));
-diff --git a/chromium/media/filters/ffmpeg_glue.cc b/chromium/media/filters/ffmpeg_glue.cc
-index 0ef3521473d..8483ecc348f 100644
---- a/src/3rdparty/chromium/media/filters/ffmpeg_glue.cc
-+++ b/src/3rdparty/chromium/media/filters/ffmpeg_glue.cc
-@@ -59,7 +59,6 @@ static int64_t AVIOSeekOperation(void* opaque, int64_t offset, int whence) {
- }
- 
- void FFmpegGlue::InitializeFFmpeg() {
--  av_register_all();
- }
- 
- static void LogContainer(bool is_local_file,
-@@ -95,9 +94,6 @@ FFmpegGlue::FFmpegGlue(FFmpegURLProtocol* protocol) {
-   // Enable fast, but inaccurate seeks for MP3.
-   format_context_->flags |= AVFMT_FLAG_FAST_SEEK;
- 
--  // Ensures we can read out various metadata bits like vp8 alpha.
--  format_context_->flags |= AVFMT_FLAG_KEEP_SIDE_DATA;
--
-   // Ensures format parsing errors will bail out. From an audit on 11/2017, all
-   // instances were real failures. Solves bugs like http://crbug.com/710791.
-   format_context_->error_recognition |= AV_EF_EXPLODE;
-diff --git a/chromium/media/filters/ffmpeg_video_decoder.cc b/chromium/media/filters/ffmpeg_video_decoder.cc
-index ef12477ee89..7996606f5f9 100644
---- a/src/3rdparty/chromium/media/filters/ffmpeg_video_decoder.cc
-+++ b/src/3rdparty/chromium/media/filters/ffmpeg_video_decoder.cc
-@@ -391,7 +391,7 @@ bool FFmpegVideoDecoder::ConfigureDecoder(const VideoDecoderConfig& config,
-   if (decode_nalus_)
-     codec_context_->flags2 |= AV_CODEC_FLAG2_CHUNKS;
- 
--  AVCodec* codec = avcodec_find_decoder(codec_context_->codec_id);
-+  const AVCodec* codec = avcodec_find_decoder(codec_context_->codec_id);
-   if (!codec || avcodec_open2(codec_context_.get(), codec, NULL) < 0) {
-     ReleaseFFmpegResources();
-     return false;
-diff --git a/chromium/media/filters/media_file_checker.cc b/chromium/media/filters/media_file_checker.cc
-index 59c2a2fc618..1a9872c7acb 100644
---- a/src/3rdparty/chromium/media/filters/media_file_checker.cc
-+++ b/src/3rdparty/chromium/media/filters/media_file_checker.cc
-@@ -68,7 +68,7 @@ bool MediaFileChecker::Start(base::TimeDelta check_time) {
-       auto context = AVStreamToAVCodecContext(format_context->streams[i]);
-       if (!context)
-         continue;
--      AVCodec* codec = avcodec_find_decoder(cp->codec_id);
-+      const AVCodec* codec = avcodec_find_decoder(cp->codec_id);
-       if (codec && avcodec_open2(context.get(), codec, nullptr) >= 0) {
-         auto loop = std::make_unique<FFmpegDecodingLoop>(context.get());
-         stream_contexts[i] = {std::move(context), std::move(loop)};
-diff --git a/chromium/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc b/chromium/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc
-index 9002b874611..d12fade8b63 100644
---- a/src/3rdparty/chromium/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc
-+++ b/src/3rdparty/chromium/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc
-@@ -203,7 +203,7 @@ int32_t H264DecoderImpl::InitDecode(const VideoCodec* codec_settings,
-   // a pointer |this|.
-   av_context_->opaque = this;
- 
--  AVCodec* codec = avcodec_find_decoder(av_context_->codec_id);
-+  const AVCodec* codec = avcodec_find_decoder(av_context_->codec_id);
-   if (!codec) {
-     // This is an indication that FFmpeg has not been initialized or it has not
-     // been compiled/initialized with the correct set of codecs.
--- 
-2.35.1
-

diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.3_p20220406-gcc12-includes.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.3_p20220406-gcc12-includes.patch
deleted file mode 100644
index cd476564037a..000000000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.15.3_p20220406-gcc12-includes.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-https://build.opensuse.org/package/view_file/KDE:Qt:5.15/libqt5-qtwebengine/0001-skia-Some-includes-to-fix-build-with-GCC-12.patch?expand=1
-https://bugs.gentoo.org/840326
-
-From 68799a1e0815b20ca59ce354a55280399257a201 Mon Sep 17 00:00:00 2001
-From: Fabian Vogt <fvogt@suse.de>
-Date: Fri, 25 Mar 2022 15:29:28 +0100
-Subject: [PATCH] skia: Some includes to fix build with GCC 12
-
-Those includes got introduced upstream for other reasons and fixed building
-with GCC 12 as a side effect.
---- a/src/3rdparty/chromium/third_party/skia/include/core/SkColor.h
-+++ b/src/3rdparty/chromium/third_party/skia/include/core/SkColor.h
-@@ -12,6 +12,8 @@
- #include "include/core/SkScalar.h"
- #include "include/core/SkTypes.h"
- 
-+#include <array>
-+
- /** \file SkColor.h
- 
-     Types, consts, functions, and macros for colors.
---- a/src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp
-+++ b/src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp
-@@ -8,6 +8,8 @@
- 
- #include "include/utils/SkParse.h"
- 
-+#include <algorithm> // std::lower_bound
-+
- static constexpr const char* gColorNames[] = {
-     "aliceblue",
-     "antiquewhite",

diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.3_p20220505-extra-gn.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.3_p20220505-extra-gn.patch
deleted file mode 100644
index a319f521ca67..000000000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.15.3_p20220505-extra-gn.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/core/gn_run.pro
-+++ b/src/core/gn_run.pro
-@@ -64,6 +64,7 @@
-         }
-     } else {
-         gn_args+= "qtwebengine_target=\"$$system_path($$OUT_PWD/$$getConfigDir()):QtWebEngineCore\""
-+        gn_args += $$(EXTRA_GN)
-         gn_args = $$system_quote($$gn_args)
-         gn_build_root = $$system_quote($$system_path($$OUT_PWD/$$getConfigDir()))
-         gn_run = $$gn_binary gen $$gn_build_root $$gn_python --args=$$gn_args --root=$$gn_src_root

diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.8_p20230106-v8-opcode-constexpr.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.8_p20230106-v8-opcode-constexpr.patch
deleted file mode 100644
index b1fe0f69801c..000000000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.15.8_p20230106-v8-opcode-constexpr.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From a5cea1bfc38ceafc74f4baddd6ab94ea13757ef8 Mon Sep 17 00:00:00 2001
-From: Lei Zhang <thestig@chromium.org>
-Date: Fri, 21 May 2021 10:55:53 -0700
-Subject: [PATCH] Mark Node::opcode() and Operator::opcode() as constexpr.
-
-Without the explicit constexpr keyword, Clang seems to be able to treat
-these methods as constexpr, whereas MSVC will not.
-
-Bug: v8:11760
-Change-Id: I9f6492f38fb50dcaf7a4f09da0bd79c0da6a50eb
-Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2912916
-Reviewed-by: Clemens Backes <clemensb@chromium.org>
-Reviewed-by: Maya Lekova <mslekova@chromium.org>
-Commit-Queue: Lei Zhang <thestig@chromium.org>
-Cr-Commit-Position: refs/heads/master@{#74791}
----
-
-diff --git a/src/3rdparty/chromium/v8/src/compiler/node.h b/src/3rdparty/chromium/v8/src/compiler/node.h
-index 37b45c4..57d49fe 100644
---- a/src/3rdparty/chromium/v8/src/compiler/node.h
-+++ b/src/3rdparty/chromium/v8/src/compiler/node.h
-@@ -50,7 +50,7 @@
- 
-   const Operator* op() const { return op_; }
- 
--  IrOpcode::Value opcode() const {
-+  constexpr IrOpcode::Value opcode() const {
-     DCHECK_GE(IrOpcode::kLast, op_->opcode());
-     return static_cast<IrOpcode::Value>(op_->opcode());
-   }
-diff --git a/src/3rdparty/chromium/v8/src/compiler/operator.h b/src/3rdparty/chromium/v8/src/compiler/operator.h
-index 4206e75..f641394 100644
---- a/src/3rdparty/chromium/v8/src/compiler/operator.h
-+++ b/src/3rdparty/chromium/v8/src/compiler/operator.h
-@@ -73,7 +73,7 @@
-   // A small integer unique to all instances of a particular kind of operator,
-   // useful for quick matching for specific kinds of operators. For fast access
-   // the opcode is stored directly in the operator object.
--  Opcode opcode() const { return opcode_; }
-+  constexpr Opcode opcode() const { return opcode_; }
- 
-   // Returns a constant string representing the mnemonic of the operator,
-   // without the static parameters. Useful for debugging.

diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.8_p20230106-widevine.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.8_p20230106-widevine.patch
deleted file mode 100644
index dcfdeae3c6f3..000000000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.15.8_p20230106-widevine.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From b99042fb839021a0a3d2fe0cac7ac3899c4acbba Mon Sep 17 00:00:00 2001
-From: Allan Sandfeld Jensen <allan.jensen@qt.io>
-Date: Tue, 14 Jun 2022 14:19:24 +0200
-Subject: [PATCH] Find modern Chrome, Chromium and Firefox CDM modules
-
-The default download location has moved again, but we can now
-also use firefox CDMs.
-
-Pick-to: 6.4 6.3
-Task-number: QTBUG-104238
-Change-Id: I7ee581fa63e50df970acb31ea6d3f67d332aef59
-Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
----
- src/core/content_client_qt.cpp | 54 ++++++++++++++++++++++++++++++----
- 1 file changed, 49 insertions(+), 5 deletions(-)
-
-diff --git a/src/core/content_client_qt.cpp b/src/core/content_client_qt.cpp
-index 6c914b7729..7167332d9b 100644
---- a/src/core/content_client_qt.cpp
-+++ b/src/core/content_client_qt.cpp
-@@ -250,15 +251,56 @@ static bool IsWidevineAvailable(base::FilePath *cdm_path,
-         }
-     }
- #elif defined(Q_OS_LINUX)
--        pluginPaths << QStringLiteral("/opt/google/chrome/libwidevinecdm.so") // Old Google Chrome
-+        QList<QDir> potentialWidevineVersionDirs;
-+
-+        // Google Chrome widevine modules
-+        QDir chromeWidevineDir(QDir::homePath() + "/.config/google-chrome/WidevineCdm");
-+        if (chromeWidevineDir.exists())
-+            potentialWidevineVersionDirs << chromeWidevineDir;
-+
-+        // Firefox widevine modules
-+        QDir firefoxPotentialProfilesDir(QDir::homePath() + "/.mozilla/firefox");
-+        if (firefoxPotentialProfilesDir.exists()) {
-+            QFileInfoList firefoxProfileDirs = firefoxPotentialProfilesDir.entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot, QDir::Name | QDir::Reversed);
-+            for (const QFileInfo &info : firefoxProfileDirs) {
-+                QDir widevinePluginsDir(info.absoluteFilePath() + "/gmp-widevinecdm");
-+                if (widevinePluginsDir.exists())
-+                    potentialWidevineVersionDirs << widevinePluginsDir;
-+            }
-+        }
-+
-+        // Chromium widevine modules (might not work with proprietary codecs)
-+        QDir chromiumWidevineDir(QDir::homePath() + "/.config/chromium/WidevineCdm");
-+        if (chromiumWidevineDir.exists())
-+            potentialWidevineVersionDirs << chromiumWidevineDir;
-+
-+        // Search for widewine versions
-+        for (const QDir &dir : potentialWidevineVersionDirs) {
-+            QFileInfoList widevineVersionDirs = dir.entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot, QDir::Name | QDir::Reversed);
-+            // ### alternatively look up in the manifest.json and take the path from there.
- #if Q_PROCESSOR_WORDSIZE == 8
--                    << QStringLiteral("/opt/google/chrome/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so")
-+            const QString library = QLatin1String("/_platform_specific/linux_x64/libwidevinecdm.so");
- #else
--                    << QStringLiteral("/opt/google/chrome/WidevineCdm/_platform_specific/linux_x86/libwidevinecdm.so")
-+            const QString library = QLatin1String("/_platform_specific/linux_x86/libwidevinecdm.so");
- #endif
--                    << QStringLiteral("/usr/lib/chromium/libwidevinecdm.so") // Arch
-+            for (const QFileInfo &info : widevineVersionDirs) {
-+                pluginPaths << info.absoluteFilePath() + "/libwidevinecdm.so";
-+                pluginPaths << info.absoluteFilePath() + library;
-+            }
-+        }
-+
-+        // Fixed paths:
-+        pluginPaths << QStringLiteral("/usr/lib/chromium/libwidevinecdm.so") // Arch
-                     << QStringLiteral("/usr/lib/chromium-browser/libwidevinecdm.so") // Ubuntu/neon
--                    << QStringLiteral("/usr/lib64/chromium/libwidevinecdm.so"); // OpenSUSE style
-+                    << QStringLiteral("/usr/lib64/chromium/libwidevinecdm.so") // OpenSUSE style
-+#if Q_PROCESSOR_WORDSIZE == 8
-+                    << QStringLiteral("/usr/lib64/chromium-browser/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so") // Gentoo
-+                    << QStringLiteral("/opt/google/chrome/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so") // Old Google Chrome
-+#else
-+                    << QStringLiteral("/usr/lib/chromium-browser/WidevineCdm/_platform_specific/linux_x86/libwidevinecdm.so") // Gentoo
-+                    << QStringLiteral("/opt/google/chrome/WidevineCdm/_platform_specific/linux_x86/libwidevinecdm.so") // Old Google Chrome
-+#endif
-+                    << QStringLiteral("/opt/google/chrome/libwidevinecdm.so"); // Older Google Chrome
- #endif
-     }
- 

diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.8_p20230112-gcc13.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.8_p20230112-gcc13.patch
deleted file mode 100644
index b9df5b0fe445..000000000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.15.8_p20230112-gcc13.patch
+++ /dev/null
@@ -1,431 +0,0 @@
-Upstream:
-- https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/468198
-
-Gentoo bugs:
-- https://bugs.gentoo.org/889724
-- https://bugs.gentoo.org/895196
-- https://bugs.gentoo.org/898902
-- https://bugs.gentoo.org/898634 (bundled abseil)
-
-Based on the following from Fedora:
-- https://src.fedoraproject.org/rpms/qt5-qtwebengine/c/14bbdcc0567223a4c96421ab2dfe2a668831ec98?branch=rawhide
-- https://src.fedoraproject.org/rpms/qt5-qtwebengine/c/9a37c86a90d1d3c0684aa1428657fc7ed22390ac?branch=rawhide
-- https://src.fedoraproject.org/rpms/qt5-qtwebengine/c/5dc49e01024ab2adae3705d14a9be76d706b7e52?branch=rawhide
-- Whole thing: https://src.fedoraproject.org/rpms/qt5-qtwebengine/raw/rawhide/f/qtwebengine-fix-build.patch
---- a/src/3rdparty/chromium/base/debug/profiler.h
-+++ b/src/3rdparty/chromium/base/debug/profiler.h
-@@ -5,6 +5,7 @@
- #ifndef BASE_DEBUG_PROFILER_H_
- #define BASE_DEBUG_PROFILER_H_
- 
-+#include <cstdint>
- #include <stddef.h>
- 
- #include <string>
---- a/src/3rdparty/chromium/base/debug/stack_trace.h
-+++ b/src/3rdparty/chromium/base/debug/stack_trace.h
-@@ -7,6 +7,7 @@
- 
- #include <stddef.h>
- 
-+#include <cstdint>
- #include <iosfwd>
- #include <string>
- 
---- a/src/3rdparty/chromium/cc/trees/target_property.cc
-+++ b/src/3rdparty/chromium/cc/trees/target_property.cc
-@@ -4,6 +4,8 @@
- 
- #include "cc/trees/target_property.h"
- 
-+#include <cstdint>
-+
- namespace cc {
- 
- static_assert(TargetProperty::LAST_TARGET_PROPERTY < kMaxTargetPropertyIndex,
---- a/src/3rdparty/chromium/content/public/browser/browsing_data_remover_delegate.h
-+++ b/src/3rdparty/chromium/content/public/browser/browsing_data_remover_delegate.h
-@@ -5,6 +5,7 @@
- #ifndef CONTENT_PUBLIC_BROWSER_BROWSING_DATA_REMOVER_DELEGATE_H_
- #define CONTENT_PUBLIC_BROWSER_BROWSING_DATA_REMOVER_DELEGATE_H_
- 
-+#include <cstdint>
- #include <string>
- #include <vector>
- #include "base/callback_forward.h"
---- a/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.cc
-+++ b/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.cc
-@@ -4,6 +4,8 @@
- 
- #include "device/base/synchronization/one_writer_seqlock.h"
- 
-+#include <cstdint>
-+
- namespace device {
- 
- OneWriterSeqLock::OneWriterSeqLock() : sequence_(0) {}
---- a/src/3rdparty/chromium/device/bluetooth/public/cpp/bluetooth_uuid.h
-+++ b/src/3rdparty/chromium/device/bluetooth/public/cpp/bluetooth_uuid.h
-@@ -5,6 +5,7 @@
- #ifndef DEVICE_BLUETOOTH_PUBLIC_CPP_BLUETOOTH_UUID_H_
- #define DEVICE_BLUETOOTH_PUBLIC_CPP_BLUETOOTH_UUID_H_
- 
-+#include <cstdint>
- #include <string>
- #include <vector>
- 
---- a/src/3rdparty/chromium/extensions/browser/api/audio/audio_device_id_calculator.h
-+++ b/src/3rdparty/chromium/extensions/browser/api/audio/audio_device_id_calculator.h
-@@ -5,6 +5,7 @@
- #ifndef EXTENSIONS_BROWSER_API_AUDIO_AUDIO_DEVICE_ID_CALCULATOR_H_
- #define EXTENSIONS_BROWSER_API_AUDIO_AUDIO_DEVICE_ID_CALCULATOR_H_
- 
-+#include <cstdint>
- #include <map>
- #include <string>
- 
---- a/src/3rdparty/chromium/extensions/common/constants.h
-+++ b/src/3rdparty/chromium/extensions/common/constants.h
-@@ -11,6 +11,8 @@
- #include "components/version_info/channel.h"
- #include "ui/base/layout.h"
- 
-+#include <cstdint>
-+
- namespace extensions {
- 
- // Scheme we serve extension content from.
---- a/src/3rdparty/chromium/gpu/command_buffer/common/webgpu_cmd_enums.h
-+++ b/src/3rdparty/chromium/gpu/command_buffer/common/webgpu_cmd_enums.h
-@@ -5,6 +5,8 @@
- #ifndef GPU_COMMAND_BUFFER_COMMON_WEBGPU_CMD_ENUMS_H_
- #define GPU_COMMAND_BUFFER_COMMON_WEBGPU_CMD_ENUMS_H_
- 
-+#include <cstdint>
-+
- namespace gpu {
- namespace webgpu {
- 
---- a/src/3rdparty/chromium/gpu/command_buffer/common/webgpu_cmd_format.h
-+++ b/src/3rdparty/chromium/gpu/command_buffer/common/webgpu_cmd_format.h
-@@ -5,6 +5,7 @@
- #ifndef GPU_COMMAND_BUFFER_COMMON_WEBGPU_CMD_FORMAT_H_
- #define GPU_COMMAND_BUFFER_COMMON_WEBGPU_CMD_FORMAT_H_
- 
-+#include <cstdint>
- #include <string.h>
- 
- #include "gpu/command_buffer/common/gl2_types.h"
---- a/src/3rdparty/chromium/gpu/command_buffer/service/shared_context_state.h
-+++ b/src/3rdparty/chromium/gpu/command_buffer/service/shared_context_state.h
-@@ -5,6 +5,7 @@
- #ifndef GPU_COMMAND_BUFFER_SERVICE_SHARED_CONTEXT_STATE_H_
- #define GPU_COMMAND_BUFFER_SERVICE_SHARED_CONTEXT_STATE_H_
- 
-+#include <cstdint>
- #include <memory>
- #include <vector>
- 
---- a/src/3rdparty/chromium/gpu/config/device_perf_info.h
-+++ b/src/3rdparty/chromium/gpu/config/device_perf_info.h
-@@ -5,6 +5,7 @@
- #ifndef GPU_CONFIG_DEVICE_PERF_INFO_H_
- #define GPU_CONFIG_DEVICE_PERF_INFO_H_
- 
-+#include <cstdint>
- #include <string>
- #include <vector>
- 
---- a/src/3rdparty/chromium/gpu/config/gpu_feature_info.h
-+++ b/src/3rdparty/chromium/gpu/config/gpu_feature_info.h
-@@ -5,6 +5,7 @@
- #ifndef GPU_CONFIG_GPU_FEATURE_INFO_H_
- #define GPU_CONFIG_GPU_FEATURE_INFO_H_
- 
-+#include <cstdint>
- #include <string>
- #include <vector>
- 
---- a/src/3rdparty/chromium/gpu/config/gpu_preferences.h
-+++ b/src/3rdparty/chromium/gpu/config/gpu_preferences.h
-@@ -5,6 +5,7 @@
- #ifndef GPU_CONFIG_GPU_PREFERENCES_H_
- #define GPU_CONFIG_GPU_PREFERENCES_H_
- 
-+#include <cstdint>
- #include <stddef.h>
- #include <string>
- #include <vector>
---- a/src/3rdparty/chromium/gpu/config/gpu_util.h
-+++ b/src/3rdparty/chromium/gpu/config/gpu_util.h
-@@ -5,6 +5,8 @@
- #ifndef GPU_CONFIG_GPU_UTIL_H_
- #define GPU_CONFIG_GPU_UTIL_H_
- 
-+#include <cstdint>
-+
- #include "build/build_config.h"
- #include "gpu/config/gpu_feature_info.h"
- #include "gpu/gpu_export.h"
---- a/src/3rdparty/chromium/net/base/parse_number.h
-+++ b/src/3rdparty/chromium/net/base/parse_number.h
-@@ -9,6 +9,8 @@
- #include "base/strings/string_piece.h"
- #include "net/base/net_export.h"
- 
-+#include <cstdint>
-+
- // This file contains utility functions for parsing numbers, in the context of
- // network protocols.
- //
---- a/src/3rdparty/chromium/net/cookies/cookie_inclusion_status.h
-+++ b/src/3rdparty/chromium/net/cookies/cookie_inclusion_status.h
-@@ -5,6 +5,7 @@
- #ifndef NET_COOKIES_COOKIE_INCLUSION_STATUS_H_
- #define NET_COOKIES_COOKIE_INCLUSION_STATUS_H_
- 
-+#include <cstdint>
- #include <string>
- #include <vector>
- 
---- a/src/3rdparty/chromium/pdf/document_attachment_info.h
-+++ b/src/3rdparty/chromium/pdf/document_attachment_info.h
-@@ -7,6 +7,8 @@
- 
- #include "base/strings/string16.h"
- 
-+#include <cstdint>
-+
- namespace chrome_pdf {
- 
- struct DocumentAttachmentInfo {
---- a/src/3rdparty/chromium/ppapi/utility/completion_callback_factory_thread_traits.h
-+++ b/src/3rdparty/chromium/ppapi/utility/completion_callback_factory_thread_traits.h
-@@ -38,6 +38,10 @@ namespace pp {
- /// As a further optimization, we can add support for this later.
- class ThreadSafeThreadTraits {
-  public:
-+
-+  typedef pp::Lock Lock;
-+  typedef pp::AutoLock AutoLock;
-+
-   class RefCount {
-    public:
-     /// Default constructor. In debug mode, this checks that the object is being
-@@ -67,8 +71,6 @@ class ThreadSafeThreadTraits {
-     int32_t ref_;
-   };
- 
--  typedef pp::Lock Lock;
--  typedef pp::AutoLock AutoLock;
- };
- 
- /// The non-thread-safe version of thread traits. Using this class as the
---- a/src/3rdparty/chromium/third_party/abseil-cpp/absl/strings/internal/str_format/extension.h
-+++ b/src/3rdparty/chromium/third_party/abseil-cpp/absl/strings/internal/str_format/extension.h
-@@ -19,6 +19,7 @@
- #include <limits.h>
- 
- #include <cstddef>
-+#include <cstdint>
- #include <cstring>
- #include <ostream>
- 
---- a/src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderVars.h
-+++ b/src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderVars.h
-@@ -12,6 +12,7 @@
- 
- #include <algorithm>
- #include <array>
-+#include <cstdint>
- #include <string>
- #include <vector>
- 
---- a/src/3rdparty/chromium/third_party/angle/src/common/angleutils.h
-+++ b/src/3rdparty/chromium/third_party/angle/src/common/angleutils.h
-@@ -15,6 +15,7 @@
- #    include "absl/container/flat_hash_map.h"
- #endif  // defined(ANGLE_USE_ABSEIL)
- 
-+#include <cstdint>
- #include <climits>
- #include <cstdarg>
- #include <cstddef>
---- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/minidump_descriptor.h
-+++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/minidump_descriptor.h
-@@ -33,6 +33,7 @@
- #include <assert.h>
- #include <sys/types.h>
- 
-+#include <cstdint>
- #include <string>
- 
- #include "client/linux/handler/microdump_extra_info.h"
---- a/src/3rdparty/chromium/third_party/libgav1/src/src/utils/threadpool.cc
-+++ b/src/3rdparty/chromium/third_party/libgav1/src/src/utils/threadpool.cc
-@@ -30,6 +30,7 @@
- #include <cstddef>
- #include <cstdint>
- #include <cstring>
-+#include <cstdio>
- #include <new>
- #include <utility>
- 
---- a/src/3rdparty/chromium/third_party/pdfium/constants/annotation_flags.h
-+++ b/src/3rdparty/chromium/third_party/pdfium/constants/annotation_flags.h
-@@ -5,6 +5,8 @@
- #ifndef CONSTANTS_ANNOTATION_FLAGS_H_
- #define CONSTANTS_ANNOTATION_FLAGS_H_
- 
-+#include <cstdint>
-+
- namespace pdfium {
- namespace annotation_flags {
- 
---- a/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/uuid.h
-+++ b/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/uuid.h
-@@ -18,6 +18,7 @@
- #define INCLUDE_PERFETTO_EXT_BASE_UUID_H_
- 
- #include <array>
-+#include <cstdint>
- #include <string>
- 
- #include "perfetto/ext/base/optional.h"
---- a/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/importers/proto/proto_importer_module.h
-+++ b/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/importers/proto/proto_importer_module.h
-@@ -21,6 +21,8 @@
- #include "perfetto/trace_processor/status.h"
- #include "src/trace_processor/trace_blob_view.h"
- 
-+#include <cstdint>
-+
- namespace perfetto {
- 
- namespace protos {
---- a/src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp
-+++ b/src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp
-@@ -9,6 +9,9 @@
- #include "include/utils/SkParse.h"
- 
- #include <algorithm> // std::lower_bound
-+#include <algorithm>
-+#include <cstring>
-+#include <iterator>
- 
- static constexpr const char* gColorNames[] = {
-     "aliceblue",
---- a/src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.h
-+++ b/src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.h
-@@ -11,6 +11,7 @@
- #ifndef CALL_RTP_DEMUXER_H_
- #define CALL_RTP_DEMUXER_H_
- 
-+#include <cstdint>
- #include <map>
- #include <set>
- #include <string>
---- a/src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/base64/base64.h
-+++ b/src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/base64/base64.h
-@@ -12,6 +12,7 @@
- #ifndef RTC_BASE_THIRD_PARTY_BASE64_BASE64_H_
- #define RTC_BASE_THIRD_PARTY_BASE64_BASE64_H_
- 
-+#include <cstdint>
- #include <string>
- #include <vector>
- 
---- a/src/3rdparty/chromium/third_party/xcbproto/src/src/present.xml
-+++ b/src/3rdparty/chromium/third_party/xcbproto/src/src/present.xml
-@@ -89,7 +89,7 @@ OF THIS SOFTWARE.
-     </reply>
-   </request>
- 
--  <request name="Pixmap" opcode="1">
-+  <request name="PresentPixmap" opcode="1">
-     <required_start_align align="8" />
-     <field type="WINDOW" name="window" />
-     <field type="PIXMAP" name="pixmap" />
---- a/src/3rdparty/chromium/ui/events/gesture_event_details.h
-+++ b/src/3rdparty/chromium/ui/events/gesture_event_details.h
-@@ -5,6 +5,7 @@
- #ifndef UI_EVENTS_GESTURE_DETECTION_GESTURE_EVENT_DETAILS_H_
- #define UI_EVENTS_GESTURE_DETECTION_GESTURE_EVENT_DETAILS_H_
- 
-+#include <cstdint>
- #include <string.h>
- 
- #include "base/check_op.h"
---- a/src/3rdparty/chromium/ui/events/types/scroll_types.h
-+++ b/src/3rdparty/chromium/ui/events/types/scroll_types.h
-@@ -5,6 +5,8 @@
- #ifndef UI_EVENTS_TYPES_SCROLL_TYPES_H_
- #define UI_EVENTS_TYPES_SCROLL_TYPES_H_
- 
-+#include <cstdint>
-+
- namespace ui {
- 
- enum class ScrollGranularity : uint8_t {
---- a/src/3rdparty/chromium/ui/gl/gl_surface_glx.cc
-+++ b/src/3rdparty/chromium/ui/gl/gl_surface_glx.cc
-@@ -4,6 +4,7 @@
- 
- #include "ui/gl/gl_surface_glx.h"
- 
-+#include <cstdint>
- #include <utility>
- 
- #include "base/bind.h"
---- a/src/3rdparty/chromium/ui/gl/gl_surface_glx.h
-+++ b/src/3rdparty/chromium/ui/gl/gl_surface_glx.h
-@@ -5,6 +5,7 @@
- #ifndef UI_GL_GL_SURFACE_GLX_H_
- #define UI_GL_GL_SURFACE_GLX_H_
- 
-+#include <cstdint>
- #include <stdint.h>
- 
- #include <memory>
---- a/src/3rdparty/chromium/v8/src/base/logging.h
-+++ b/src/3rdparty/chromium/v8/src/base/logging.h
-@@ -5,6 +5,7 @@
- #ifndef V8_BASE_LOGGING_H_
- #define V8_BASE_LOGGING_H_
- 
-+#include <cstdint>
- #include <cstring>
- #include <sstream>
- #include <string>
---- a/src/3rdparty/chromium/v8/src/base/macros.h
-+++ b/src/3rdparty/chromium/v8/src/base/macros.h
-@@ -5,6 +5,7 @@
- #ifndef V8_BASE_MACROS_H_
- #define V8_BASE_MACROS_H_
- 
-+#include <cstdint>
- #include <limits>
- #include <type_traits>
- 
---- a/src/3rdparty/chromium/v8/src/inspector/v8-string-conversions.h
-+++ b/src/3rdparty/chromium/v8/src/inspector/v8-string-conversions.h
-@@ -5,6 +5,7 @@
- #ifndef V8_INSPECTOR_V8_STRING_CONVERSIONS_H_
- #define V8_INSPECTOR_V8_STRING_CONVERSIONS_H_
- 
-+#include <cstdint>
- #include <string>
- 
- // Conversion routines between UT8 and UTF16, used by string-16.{h,cc}. You may
---- a/src/core/browsing_data_remover_delegate_qt.h
-+++ b/src/core/browsing_data_remover_delegate_qt.h
-@@ -42,6 +42,8 @@
- 
- #include "content/public/browser/browsing_data_remover_delegate.h"
- 
-+#include <cstdint>
-+
- namespace QtWebEngineCore {
- 
- class BrowsingDataRemoverDelegateQt : public content::BrowsingDataRemoverDelegate {
-

diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.8_p20230112.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.8_p20230112.ebuild
deleted file mode 100644
index a9eb384e9067..000000000000
--- a/dev-qt/qtwebengine/qtwebengine-5.15.8_p20230112.ebuild
+++ /dev/null
@@ -1,285 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9,10} )
-PYTHON_REQ_USE="xml(+)"
-inherit check-reqs estack flag-o-matic multiprocessing python-any-r1 qt5-build toolchain-funcs
-
-DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
-HOMEPAGE="https://www.qt.io/"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86"
-	if [[ ${PV} == ${QT5_PV}_p* ]]; then
-		SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
-		S="${WORKDIR}/${P}"
-		QT5_BUILD_DIR="${S}_build"
-	fi
-else
-	EGIT_BRANCH="5.15"
-	EGIT_REPO_URI=(
-		"https://code.qt.io/qt/${QT5_MODULE}.git"
-		"https://github.com/qt/${QT5_MODULE}.git"
-	)
-	inherit git-r3
-fi
-
-# ppc64 patchset based on https://github.com/chromium-ppc64le releases
-SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-5.15.2_p20211019-jumbo-build.patch.bz2
-	https://dev.gentoo.org/~asturm/distfiles/${PN}-5.15.3_p20220406-patchset.tar.xz
-	ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/${PN}-5.15.2-r1-chromium87-ppc64le.tar.xz )"
-
-IUSE="alsa bindist designer geolocation +jumbo-build kerberos pulseaudio screencast +system-ffmpeg +system-icu widgets"
-REQUIRED_USE="designer? ( widgets )"
-
-RDEPEND="
-	app-arch/snappy:=
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	dev-libs/expat
-	dev-libs/libevent:=
-	dev-libs/libxml2[icu]
-	dev-libs/libxslt
-	dev-libs/re2:=
-	=dev-qt/qtcore-${QT5_PV}*
-	=dev-qt/qtdeclarative-${QT5_PV}*
-	=dev-qt/qtgui-${QT5_PV}*
-	=dev-qt/qtnetwork-${QT5_PV}*
-	=dev-qt/qtprintsupport-${QT5_PV}*
-	=dev-qt/qtwebchannel-${QT5_PV}*[qml]
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/harfbuzz:=
-	media-libs/lcms:2
-	media-libs/libjpeg-turbo:=
-	media-libs/libpng:0=
-	>=media-libs/libvpx-1.5:=[svc(+)]
-	media-libs/libwebp:=
-	media-libs/opus
-	sys-apps/dbus
-	sys-apps/pciutils
-	sys-libs/zlib[minizip]
-	virtual/libudev
-	x11-libs/libdrm
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libxkbfile
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXScrnSaver
-	x11-libs/libXtst
-	alsa? ( media-libs/alsa-lib )
-	designer? ( =dev-qt/designer-${QT5_PV}* )
-	geolocation? ( =dev-qt/qtpositioning-${QT5_PV}* )
-	kerberos? ( virtual/krb5 )
-	pulseaudio? ( media-libs/libpulse )
-	screencast? ( media-video/pipewire:= )
-	system-ffmpeg? ( media-video/ffmpeg:0= )
-	system-icu? ( >=dev-libs/icu-69.1:= )
-	widgets? (
-		=dev-qt/qtdeclarative-${QT5_PV}*[widgets]
-		=dev-qt/qtwidgets-${QT5_PV}*
-	)
-"
-DEPEND="${RDEPEND}
-	media-libs/libglvnd
-"
-BDEPEND="${PYTHON_DEPS}
-	dev-util/gperf
-	dev-util/ninja
-	dev-util/re2c
-	net-libs/nodejs[ssl]
-	sys-devel/bison
-	sys-devel/flex
-	ppc64? ( >=dev-util/gn-0.1807 )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.15.2-disable-fatal-warnings.patch" # downstream, bug 695446
-	"${FILESDIR}/${PN}-5.15.3_p20220505-extra-gn.patch" # downstream, bug 774186
-	"${FILESDIR}/${PN}-5.15.2_p20210224-chromium-87-v8-icu68.patch" # downstream, bug 757606
-	"${FILESDIR}/${PN}-5.15.2_p20210224-disable-git.patch" # downstream snapshot fix
-	"${FILESDIR}/${PN}-5.15.2_p20211015-pdfium-system-lcms2.patch" # by Debian, QTBUG-61746
-	"${FILESDIR}/${PN}-5.15.3_p20220329-clang14.patch" # by FreeBSD, bug 836604
-	"${FILESDIR}/${PN}-5.15.3_p20220406-gcc12-includes.patch" # by openSUSE, bug 840326
-	"${WORKDIR}/${PN}-5.15.2_p20211019-jumbo-build.patch" # bug 813957
-	"${WORKDIR}/${PN}-5.15.3_p20220406-patchset" # bug 698988 (py2--), pipewire-3
-	"${FILESDIR}/${PN}-5.15.8_p20230106-v8-opcode-constexpr.patch" # bug 889042
-	"${FILESDIR}/${PN}-5.15.8_p20230106-widevine.patch" # bug 888783
-	"${FILESDIR}/${PN}-5.15.8_p20230112-gcc13.patch" # bug 889724, bug 895196, bug 898902, bug 898634
-)
-
-qtwebengine_check-reqs() {
-	# bug #307861
-	eshopts_push -s extglob
-	if is-flagq '-g?(gdb)?([1-9])'; then
-		ewarn "You have enabled debug info (probably have -g or -ggdb in your CFLAGS/CXXFLAGS)."
-		ewarn "You may experience really long compilation times and/or increased memory usage."
-		ewarn "If compilation fails, please try removing -g/-ggdb before reporting a bug."
-	fi
-	eshopts_pop
-
-	[[ ${MERGE_TYPE} == binary ]] && return
-
-	# (check-reqs added for bug #570534)
-	#
-	# Estimate the amount of RAM required
-	# Multiplier is *10 because Bash doesn't do floating point maths.
-	# Let's crudely assume ~2GB per compiler job for GCC.
-	local multiplier=20
-
-	# And call it ~1.5GB for Clang.
-	if tc-is-clang ; then
-		multiplier=15
-	fi
-
-	local CHECKREQS_DISK_BUILD="7G"
-	local CHECKREQS_DISK_USR="150M"
-	if ! has "distcc" ${FEATURES} ; then
-		# bug #830661
-		# Not super realistic to come up with good estimates for distcc right now
-		local CHECKREQS_MEMORY=$(($(makeopts_jobs)*multiplier/10))G
-	fi
-
-	check-reqs_${EBUILD_PHASE_FUNC}
-}
-
-pkg_pretend() {
-	qtwebengine_check-reqs
-}
-
-pkg_setup() {
-	qtwebengine_check-reqs
-	python-any-r1_pkg_setup
-}
-
-src_unpack() {
-	case ${QT5_BUILD_TYPE} in
-		live)    git-r3_src_unpack ;&
-		release) default ;;
-	esac
-}
-
-src_prepare() {
-	if [[ ${PV} == ${QT5_PV}_p* ]]; then
-		# This is made from git, and for some reason will fail w/o .git directories.
-		mkdir -p .git src/3rdparty/chromium/.git || die
-	fi
-	# We need to make sure this integrates well into Qt 5.15.3 installation.
-	# Otherwise revdeps fail w/o heavy changes. This is the simplest way to do it.
-	# See also: https://www.qt.io/blog/building-qt-webengine-against-other-qt-versions
-	sed -E "/^MODULE_VERSION/s/5\.15\.[0-9]+/${QT5_PV}/" -i .qmake.conf || die
-
-	# QTBUG-88657 - jumbo-build could still make trouble
-	if ! use jumbo-build; then
-		sed -i -e 's|use_jumbo_build=true|use_jumbo_build=false|' \
-			src/buildtools/config/common.pri || die
-	fi
-
-	# bug 620444 - ensure local headers are used
-	find "${S}" -type f -name "*.pr[fio]" | \
-		xargs sed -i -e 's|INCLUDEPATH += |&$${QTWEBENGINE_ROOT}_build/include $${QTWEBENGINE_ROOT}/include |' || die
-
-	if use system-icu; then
-		# Sanity check to ensure that bundled copy of ICU is not used.
-		# Whole src/3rdparty/chromium/third_party/icu directory cannot be deleted because
-		# src/3rdparty/chromium/third_party/icu/BUILD.gn is used by build system.
-		# If usage of headers of bundled copy of ICU occurs, then lists of shim headers in
-		# shim_headers("icui18n_shim") and shim_headers("icuuc_shim") in
-		# src/3rdparty/chromium/third_party/icu/BUILD.gn should be updated.
-		local file
-		while read file; do
-			echo "#error This file should not be used!" > "${file}" || die
-		done < <(find src/3rdparty/chromium/third_party/icu -type f "(" -name "*.c" -o -name "*.cpp" -o -name "*.h" ")" 2>/dev/null)
-	fi
-
-	# src/3rdparty/gn fails with libc++ due to passing of `-static-libstdc++`
-	if tc-is-clang ; then
-		if has_version 'sys-devel/clang[default-libcxx(-)]' || has_version 'sys-devel/clang-common[default-libcxx(-)]' ; then
-			eapply "${FILESDIR}/${PN}-5.15.2_p20210521-clang-libc++.patch"
-		fi
-	fi
-
-	if use system-ffmpeg && has_version '>=media-video/ffmpeg-5'; then
-		eapply "${FILESDIR}/${PN}-5.15.3_p20220406-ffmpeg5.patch" # by Archlinux, bug 831437
-	fi
-
-	qt_use_disable_config alsa webengine-alsa src/buildtools/config/linux.pri
-	qt_use_disable_config pulseaudio webengine-pulseaudio src/buildtools/config/linux.pri
-
-	qt_use_disable_mod designer webenginewidgets src/plugins/plugins.pro
-
-	qt_use_disable_mod widgets widgets src/src.pro
-
-	qt5-build_src_prepare
-
-	# we need to generate ppc64 stuff because upstream does not ship it yet
-	if use ppc64; then
-		einfo "Patching for ppc64le and generating build files"
-		eapply "${FILESDIR}/qtwebengine-5.15.2-enable-ppc64.patch"
-		pushd src/3rdparty/chromium > /dev/null || die
-		eapply -p0 "${WORKDIR}/${PN}-ppc64le"
-		popd > /dev/null || die
-		pushd src/3rdparty/chromium/third_party/libvpx > /dev/null || die
-		mkdir -vp source/config/linux/ppc64 || die
-		mkdir -p source/libvpx/test || die
-		touch source/libvpx/test/test.mk || die
-		# clang-format is used to re-format sources
-		# but we'd rather make it a no-op than introduce a clang dependency
-		# https://bugs.gentoo.org/849458
-		clang-format() { : ; }
-		export -f clang-format || die
-		./generate_gni.sh || die
-		popd >/dev/null || die
-	fi
-}
-
-src_configure() {
-	export NINJA_PATH=/usr/bin/ninja
-	export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs "${MAKEOPTS}" 999) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}"
-
-	local myqmakeargs=(
-		--
-		-no-build-qtpdf
-		-printing-and-pdf
-		-system-opus
-		-system-webp
-		$(qt_use alsa)
-		$(qt_use !bindist proprietary-codecs)
-		$(qt_use geolocation webengine-geolocation)
-		$(qt_use kerberos webengine-kerberos)
-		$(qt_use pulseaudio)
-		$(usex screencast -webengine-webrtc-pipewire '')
-		$(usex system-ffmpeg -system-ffmpeg -qt-ffmpeg)
-		$(qt_use system-icu webengine-icu)
-	)
-	qt5-build_src_configure
-}
-
-src_install() {
-	qt5-build_src_install
-
-	# bug 601472
-	if [[ ! -f ${D}${QT5_LIBDIR}/libQt5WebEngine.so ]]; then
-		die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/"
-	fi
-}
-
-pkg_preinst() {
-	elog "This version of Qt WebEngine is based on Chromium version 87.0.4280.144,"
-	elog "with additional security fixes from newer versions. Extensive as it is, the"
-	elog "list of backports is impossible to evaluate, but always bound to be behind"
-	elog "Chromium's release schedule."
-	elog "In addition, various online services may deny service based on an outdated"
-	elog "user agent version (and/or other checks). Google is already known to do so."
-	elog
-	elog "tldr: Your web browsing experience will be compromised."
-}