summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Manifest30
-rw-r--r--Manifest.files.gzbin29649 -> 29630 bytes
-rw-r--r--dev-haskell/Manifest.gzbin135233 -> 135241 bytes
-rw-r--r--dev-haskell/dbus/Manifest3
-rw-r--r--dev-haskell/dbus/dbus-1.2.22.ebuild4
-rw-r--r--dev-haskell/dbus/files/dbus-1.2.22-disable-integration-tests.patch28
-rw-r--r--dev-haskell/doctest-parallel/Manifest5
-rw-r--r--dev-haskell/doctest-parallel/doctest-parallel-0.2.4.ebuild (renamed from dev-haskell/doctest-parallel/doctest-parallel-0.2.3.ebuild)29
-rw-r--r--dev-haskell/doctest-parallel/files/doctest-parallel-0.2.4-disable-internal-test-lib.patch24
-rw-r--r--dev-haskell/haskell-src-exts/Manifest6
-rw-r--r--dev-haskell/haskell-src-exts/haskell-src-exts-1.23.1.ebuild (renamed from dev-haskell/haskell-src-exts/haskell-src-exts-1.21.1.ebuild)17
-rw-r--r--dev-haskell/haskell-src-exts/metadata.xml22
-rw-r--r--dev-haskell/parser-combinators/Manifest2
-rw-r--r--dev-haskell/parser-combinators/parser-combinators-1.3.0.ebuild27
-rw-r--r--dev-haskell/regex-tdfa/Manifest3
-rw-r--r--dev-haskell/regex-tdfa/files/regex-tdfa-1.3.2-disable-doctests.patch18
-rw-r--r--dev-haskell/regex-tdfa/regex-tdfa-1.3.2.ebuild9
-rw-r--r--dev-lang/Manifest.gzbin19035 -> 19028 bytes
-rw-r--r--dev-lang/ghc/Manifest4
-rw-r--r--dev-lang/ghc/files/ghc-9.0.2-disable-unboxed-arrays.patch39
-rw-r--r--dev-lang/ghc/ghc-9.0.2.ebuild28
-rw-r--r--dev-python/Manifest.gzbin259041 -> 259046 bytes
-rw-r--r--dev-python/pyopencl/Manifest2
-rw-r--r--dev-python/pyopencl/pyopencl-2022.1.6.ebuild25
-rw-r--r--dev-python/pytest-markdown/Manifest2
-rw-r--r--dev-python/pytest-markdown/pytest-markdown-1.0.2-r1.ebuild (renamed from dev-python/pytest-markdown/pytest-markdown-1.0.2.ebuild)6
-rw-r--r--dev-ruby/Manifest.gzbin111297 -> 111296 bytes
-rw-r--r--dev-ruby/hoe/Manifest2
-rw-r--r--dev-ruby/hoe/hoe-3.25.0.ebuild52
-rw-r--r--dev-ruby/minitest/Manifest2
-rw-r--r--dev-ruby/minitest/minitest-5.16.3.ebuild23
-rw-r--r--dev-util/Manifest.gzbin67842 -> 67843 bytes
-rw-r--r--dev-util/gitlab-runner/Manifest3
-rw-r--r--dev-util/gitlab-runner/gitlab-runner-15.3.0.ebuild67
-rw-r--r--media-fonts/Manifest.gzbin36768 -> 36762 bytes
-rw-r--r--media-fonts/terminus-font/Manifest2
-rw-r--r--media-fonts/terminus-font/terminus-font-4.49.1.ebuild2
-rw-r--r--media-libs/Manifest.gzbin65964 -> 65961 bytes
-rw-r--r--media-libs/netpbm/Manifest2
-rw-r--r--media-libs/netpbm/netpbm-10.86.33.ebuild2
-rw-r--r--media-libs/openal/Manifest3
-rw-r--r--media-libs/openal/metadata.xml1
-rw-r--r--media-libs/openal/openal-1.22.2-r1.ebuild87
-rw-r--r--media-video/Manifest.gzbin25849 -> 25850 bytes
-rw-r--r--media-video/ffmpeg/Manifest6
-rw-r--r--media-video/ffmpeg/ffmpeg-4.4.2.ebuild3
-rw-r--r--media-video/ffmpeg/ffmpeg-5.0.1.ebuild5
-rw-r--r--media-video/ffmpeg/files/ffmpeg-4.4.2-libsdl2-new-version-scheme.patch25
-rw-r--r--media-video/ffmpeg/files/ffmpeg-5.0.1-libsdl2-new-version-scheme.patch25
-rw-r--r--metadata/Manifest.gzbin3682 -> 3858 bytes
-rw-r--r--metadata/dtd/timestamp.chk2
-rw-r--r--metadata/glsa/Manifest30
-rw-r--r--metadata/glsa/Manifest.files.gzbin523682 -> 524322 bytes
-rw-r--r--metadata/glsa/glsa-202208-32.xml168
-rw-r--r--metadata/glsa/glsa-202208-33.xml72
-rw-r--r--metadata/glsa/glsa-202208-34.xml69
-rw-r--r--metadata/glsa/glsa-202208-35.xml126
-rw-r--r--metadata/glsa/timestamp.chk2
-rw-r--r--metadata/glsa/timestamp.commit2
-rw-r--r--metadata/install-qa-check.d/60noop-testsuites28
-rw-r--r--metadata/md5-cache/Manifest.gzbin28256 -> 28249 bytes
-rw-r--r--metadata/md5-cache/dev-haskell/Manifest.gzbin138701 -> 138706 bytes
-rw-r--r--metadata/md5-cache/dev-haskell/dbus-1.2.222
-rw-r--r--metadata/md5-cache/dev-haskell/doctest-parallel-0.2.4 (renamed from metadata/md5-cache/dev-haskell/doctest-parallel-0.2.3)14
-rw-r--r--metadata/md5-cache/dev-haskell/haskell-src-exts-1.21.116
-rw-r--r--metadata/md5-cache/dev-haskell/haskell-src-exts-1.23.116
-rw-r--r--metadata/md5-cache/dev-haskell/parser-combinators-1.3.04
-rw-r--r--metadata/md5-cache/dev-haskell/regex-tdfa-1.3.24
-rw-r--r--metadata/md5-cache/dev-lang/Manifest.gzbin42940 -> 42937 bytes
-rw-r--r--metadata/md5-cache/dev-lang/ghc-9.0.24
-rw-r--r--metadata/md5-cache/dev-python/Manifest.gzbin350203 -> 350201 bytes
-rw-r--r--metadata/md5-cache/dev-python/pyopencl-2022.1.610
-rw-r--r--metadata/md5-cache/dev-python/pytest-markdown-1.0.215
-rw-r--r--metadata/md5-cache/dev-python/pytest-markdown-1.0.2-r115
-rw-r--r--metadata/md5-cache/dev-ruby/Manifest.gzbin188594 -> 188928 bytes
-rw-r--r--metadata/md5-cache/dev-ruby/hoe-3.25.017
-rw-r--r--metadata/md5-cache/dev-ruby/minitest-5.16.317
-rw-r--r--metadata/md5-cache/dev-util/Manifest.gzbin126964 -> 127128 bytes
-rw-r--r--metadata/md5-cache/dev-util/gitlab-runner-15.3.015
-rw-r--r--metadata/md5-cache/media-fonts/Manifest.gzbin39345 -> 39347 bytes
-rw-r--r--metadata/md5-cache/media-fonts/terminus-font-4.49.14
-rw-r--r--metadata/md5-cache/media-libs/Manifest.gzbin99295 -> 99448 bytes
-rw-r--r--metadata/md5-cache/media-libs/netpbm-10.86.334
-rw-r--r--metadata/md5-cache/media-libs/openal-1.22.2-r115
-rw-r--r--metadata/md5-cache/media-video/Manifest.gzbin39744 -> 39742 bytes
-rw-r--r--metadata/md5-cache/media-video/ffmpeg-4.4.22
-rw-r--r--metadata/md5-cache/media-video/ffmpeg-5.0.14
-rw-r--r--metadata/md5-cache/sys-apps/Manifest.gzbin83952 -> 83953 bytes
-rw-r--r--metadata/md5-cache/sys-apps/fwupd-1.8.32
-rw-r--r--metadata/md5-cache/sys-cluster/Manifest.gzbin25401 -> 25402 bytes
-rw-r--r--metadata/md5-cache/sys-cluster/ploop-1.15-r14
-rw-r--r--metadata/md5-cache/sys-power/Manifest.gzbin7596 -> 7597 bytes
-rw-r--r--metadata/md5-cache/sys-power/upower-0.99.204
-rw-r--r--metadata/md5-cache/www-client/Manifest.gzbin12094 -> 11757 bytes
-rw-r--r--metadata/md5-cache/www-client/chromium-103.0.5060.13416
-rw-r--r--metadata/md5-cache/www-client/chromium-104.0.5112.1014
-rw-r--r--metadata/md5-cache/www-client/chromium-104.0.5112.7916
-rw-r--r--metadata/md5-cache/www-servers/Manifest.gzbin8206 -> 7726 bytes
-rw-r--r--metadata/md5-cache/www-servers/tomcat-10.0.2215
-rw-r--r--metadata/md5-cache/www-servers/tomcat-8.5.8115
-rw-r--r--metadata/md5-cache/www-servers/tomcat-9.0.6415
-rw-r--r--metadata/news/Manifest28
-rw-r--r--metadata/news/timestamp.chk2
-rw-r--r--metadata/timestamp2
-rw-r--r--metadata/timestamp.chk2
-rw-r--r--metadata/timestamp.commit2
-rw-r--r--metadata/timestamp.x2
-rw-r--r--metadata/xml-schema/timestamp.chk2
-rw-r--r--profiles/Manifest.gzbin148609 -> 148607 bytes
-rw-r--r--profiles/default/linux/musl/package.mask6
-rw-r--r--profiles/features/musl/package.mask6
-rw-r--r--profiles/features/musl/package.use.mask6
-rw-r--r--profiles/package.mask184
-rw-r--r--profiles/use.local.desc1
-rw-r--r--sys-apps/Manifest.gzbin48350 -> 48346 bytes
-rw-r--r--sys-apps/fwupd/Manifest3
-rw-r--r--sys-apps/fwupd/files/fwupd-1.8.3-installed_tests.patch215
-rw-r--r--sys-apps/fwupd/fwupd-1.8.3.ebuild1
-rw-r--r--sys-cluster/Manifest.gzbin11561 -> 11561 bytes
-rw-r--r--sys-cluster/ploop/Manifest2
-rw-r--r--sys-cluster/ploop/ploop-1.15-r1.ebuild2
-rw-r--r--sys-power/Manifest.gzbin4891 -> 4896 bytes
-rw-r--r--sys-power/upower/Manifest2
-rw-r--r--sys-power/upower/upower-0.99.20.ebuild2
-rw-r--r--www-client/Manifest.gzbin6216 -> 6216 bytes
-rw-r--r--www-client/chromium/Manifest7
-rw-r--r--www-client/chromium/chromium-103.0.5060.134.ebuild1114
-rw-r--r--www-client/chromium/chromium-104.0.5112.101.ebuild2
-rw-r--r--www-client/chromium/chromium-104.0.5112.79.ebuild1193
-rw-r--r--www-servers/Manifest.gzbin5026 -> 5026 bytes
-rw-r--r--www-servers/tomcat/Manifest6
-rw-r--r--www-servers/tomcat/tomcat-10.0.22.ebuild198
-rw-r--r--www-servers/tomcat/tomcat-8.5.81.ebuild159
-rw-r--r--www-servers/tomcat/tomcat-9.0.64.ebuild190
134 files changed, 1561 insertions, 3191 deletions
diff --git a/Manifest b/Manifest
index 8bd62dcefbcb..ab9e41829165 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
-MANIFEST Manifest.files.gz 29649 BLAKE2B 26c591fafec32b5ddda0df09308ea13e3491d6723cab723a86778815b015b9ab4ed964908a6c0eb50d2ba9f6cf0eb7bcea89b75fe1f19b5b95db7e0010f008b2 SHA512 f21e76b53ba532152294368a9a1675c90f5716a48125f443a3758f7dfc153f6b24ab8639441411fd0dcf3f49f6e5fc54f57e066959f0e7ebbbb93fcfed75412b
-TIMESTAMP 2022-08-21T00:39:50Z
+MANIFEST Manifest.files.gz 29630 BLAKE2B ae86c049661fd4edccb344cd06a97260955857818102e6432957d88583b200be1ba64753c7eb57023b26ca4d3aa51a77bbf6471bc078157fbdb400d2f38324e1 SHA512 71f45b28be359ae0328ea479b021501b7f334948721c4801ba442cadf58e61e07f5c85d5b5778fc762108d0f4810bf6f0efce8a922aa1e173a258506d679cbce
+TIMESTAMP 2022-08-21T06:39:53Z
-----BEGIN PGP SIGNATURE-----
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmMBftZfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmMB0zlfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCOeRAAmm3aSX/rLQGH55KxNVbNxg9ecDh6Zk0XN6lzqfbfOdoe3CQfa8Gqvbur
-tgb7BVeL1GbdeNFA9ySAn3LjO5f/e9PHlRD85DUNAZ2M/mkO9n+Tg/XipNQnvC6u
-ncZWH6/ItS4+FpEBJVoLAtLDOzBpzFvuQKPPVL6P77peZFdYLH8eap4ZUdSFqyFR
-DcYUSrq/KfSHtZfyfys9E/v05On/N4K1UcShVRIm8X8cxkxS5MRKvyODyk3fmcLj
-N0Stzhmwut3JlzBvjI76glZ+StD37Ul7jRc6iuOspEWjHJoCRY79TP6G6mcMyEH2
-ODjIx8vfPO7fc38pzRK8RDTwdn6LNeHzo2YHofDMw8QwuvyJAZ/nrFopKX5l8zXd
-WvaIq3msW7hyO9065A0nvDmOKaWEFbuahQlbkSIgZ9AEqYTro+7/TluiZ0ETPCH3
-LU5ZKoLYXJynMCH5mVldQ6CW0BsfloAP6/CQIogZBvg2AQI7BOYBhKVfncMXv17w
-Bzu2ckMd0atCcassx5svuriQx0nCgg062xqQVjg+lnvUEb0T7aGB5Utl0I7mIxiZ
-2J0hP2UU3TICz6REHg+coxfOM1V1m3HCUQeEcgHV+U53oWD5aD6AlAaAO+ANSoX1
-mS5C4G+J4tQhMm21ll/iHlpooTayDqUzEg+4hTT/n//JMvImViw=
-=wk/e
+klDu5A/9Gb01ZTo4uOV8fpLSXJgtpVPmJoQtSJV4xss9QcBXUBdzW90WiILVncJM
+TZU4TpmqvLicMSLQvBdaG9rDmAiNMEGnBvzXdmlq6kxuI/gGKPmMQ4YJdZcLWFXr
+FAHkCpCiTjAsN+AI9j+AYOoYcNZ1JHRRBh2S/bXxAmqyl5tDFZCK15pDv32vgRp3
+2yLRN10j5iN55ujFQ6JpkU8UQvBMZI/gVDn1/xG8Op1wfk4+dnu6Dn7x1pioGw/3
+3TEbAdH0sM4pqczG9EHqdtgwzTpfkxufe82/egCY2jrXgHepyoHr65sw/5N4U7y4
+nyY87WC1ihyfck3adLP6TxSGH2sm11CcUBc7XkKuFXC/nHuCy6A5Y9uJA4L8APyS
+mYu5DrMMx8NWbrffDsecOVGwl7sWLfGtLlPge4uAM7P1YqwMUnR8K65uHCt0/sTP
+TMLQlqf1uy2AY1x6lUcLDt/Fq6EuqKe5+xGMHAdTa8DgX1wL2PSKIPRkL13CF87r
+8vmhqfsm7IiAywBpXsQPEeLTDBBzSWxWr8E48AIllG8X+sh61JJY0M2iFEg9GkRP
+tbfjzGuULIpY8VIqxlykzOdiNHEObgAOopVjopmNFpWtJ2pRy6XC4/9hj1KXf3Yk
+rWZl2riXnLIY6iYzCqKV21CXplvsB/LdErLNtS4x2uIS+Y0aOYs=
+=bG1Z
-----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index ff6c8699e562..5430b4309180 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
Binary files differ
diff --git a/dev-haskell/Manifest.gz b/dev-haskell/Manifest.gz
index 43943a2975b7..cbc088fb6975 100644
--- a/dev-haskell/Manifest.gz
+++ b/dev-haskell/Manifest.gz
Binary files differ
diff --git a/dev-haskell/dbus/Manifest b/dev-haskell/dbus/Manifest
index 9d1110b69ea1..7c9dbefac7e6 100644
--- a/dev-haskell/dbus/Manifest
+++ b/dev-haskell/dbus/Manifest
@@ -1,3 +1,4 @@
+AUX dbus-1.2.22-disable-integration-tests.patch 868 BLAKE2B ab711ea3076f8bd968e43791c4cd04f8cefdb8751ddb128746a391aa02a9c3a84fecdf98a61b667ec20696dc972beacfc30d8b02f37c8cb155456e9a77999b78 SHA512 14149fabb25d411b7f1d9d015f3ac2c779e5c2a2fc707b20bb7e2ec2c63e9e26d3987c0437f5b12e2df6b1c794bfdab703eb58202ddb5254f78ae8c0a9a9305d
DIST dbus-1.2.22.tar.gz 78010 BLAKE2B c7189e15e0a9622e707bb50064584bd43141857257baec8e6d59d0cf39428b3b5efa82668ef70fbff218738ba5822b1aaad0c85b5e14bfa3ae4ef237e2458a9d SHA512 81f9fe1420939ebb5b03602ba59dd86656e4443690d8be460684dcb461ff7df1ff4cdf846a5a15ea6193b6f64b08526b27d3e12825a375eecbded3d0a99a59b9
-EBUILD dbus-1.2.22.ebuild 1274 BLAKE2B 0670669586cf7d0df0024b2d3e08efe0884ce6add0c0d1e19985c0b2b394d5f205266f754dcce9fe8121ba74dd7c5bb684e12bdf7ef10d1c04690d29d7013afc SHA512 17636cfab10d083f5ee1b48ca27dee37cc26b7b7d9cc352c8b4c2c7a5733cdeaa03344fed074c32a074416636716e991b15c0fe10430fdbbd9efe3a9666c8cf6
+EBUILD dbus-1.2.22.ebuild 1347 BLAKE2B c8556ce568eca34bd23586799335030b42a75e8c05de82d65d527b7ec870faa2b38fcc68baed646d4dcf55fe72a22494297af0583e880ae9b4b784ab666728a8 SHA512 9a77829130e1fd656411cc9fb8187c7e45e6aa10a116543de6bb1ec513adf12a2c32241a19060304ffea2e3be978d44a0206cb1ea623b51fa637829f1a629243
MISC metadata.xml 2060 BLAKE2B e0fa39e05ec8f6cb8def9e78735e7f4e062b3d294b506e08df5d0592d1a480490ae4cda8a00fc2af7211a3981ac983326908cca24877d2908af0c0a1b2457c53 SHA512 eff83d2ba57a618d6dd22761f64152c53d1be6ce7a22505c8e9553628df38171d6688503703cee1c55c1e4c949728a5882c9293faed77cf3885c42ca98a7e755
diff --git a/dev-haskell/dbus/dbus-1.2.22.ebuild b/dev-haskell/dbus/dbus-1.2.22.ebuild
index 58157ba088dc..39a045969ae2 100644
--- a/dev-haskell/dbus/dbus-1.2.22.ebuild
+++ b/dev-haskell/dbus/dbus-1.2.22.ebuild
@@ -16,6 +16,10 @@ LICENSE="Apache-2.0"
SLOT="0/${PV}"
KEYWORDS="~amd64 ~ppc64 ~x86"
+PATCHES=(
+ "${FILESDIR}/${PN}-1.2.22-disable-integration-tests.patch"
+)
+
RDEPEND="<dev-haskell/cereal-0.6:=[profile?]
>=dev-haskell/conduit-1.3.0:=[profile?] <dev-haskell/conduit-1.4:=[profile?]
<dev-haskell/lens-5.2:=[profile?]
diff --git a/dev-haskell/dbus/files/dbus-1.2.22-disable-integration-tests.patch b/dev-haskell/dbus/files/dbus-1.2.22-disable-integration-tests.patch
new file mode 100644
index 000000000000..d5c509ca58e3
--- /dev/null
+++ b/dev-haskell/dbus/files/dbus-1.2.22-disable-integration-tests.patch
@@ -0,0 +1,28 @@
+From: hololeap <hololeap@protonmail.com>
+Signed-off-by: hololeap <hololeap@protonmail.com>
+
+dev-haskell/dbus: Disable integration tests
+
+These tests try to spin up an instance of dbus-daemon
+
+diff -urN dbus-1.2.22/tests/DBusTests.hs dbus-1.2.22-r1/tests/DBusTests.hs
+--- dbus-1.2.22/tests/DBusTests.hs 2021-12-16 12:34:16.000000000 -0700
++++ dbus-1.2.22-r1/tests/DBusTests.hs 2022-08-05 12:51:12.447871229 -0600
+@@ -23,7 +23,7 @@
+ import DBusTests.BusName
+ import DBusTests.Client
+ import DBusTests.ErrorName
+-import DBusTests.Integration
++--import DBusTests.Integration
+ import DBusTests.InterfaceName
+ import DBusTests.Introspection
+ import DBusTests.MemberName
+@@ -55,7 +55,7 @@
+ , test_BusName
+ , test_Client
+ , test_ErrorName
+- , test_Integration
++-- , test_Integration
+ , test_InterfaceName
+ , test_Introspection
+ , test_MemberName
diff --git a/dev-haskell/doctest-parallel/Manifest b/dev-haskell/doctest-parallel/Manifest
index 2f321527a83f..1f6c5977eca7 100644
--- a/dev-haskell/doctest-parallel/Manifest
+++ b/dev-haskell/doctest-parallel/Manifest
@@ -1,3 +1,4 @@
-DIST doctest-parallel-0.2.3.tar.gz 45698 BLAKE2B 1650965be43357d86d497c4545c4673b21add0de3bccb52146519dd109bf34532973ca58285486f8311b4bd0e8b0acc443610a9f4d16d4326fa5a74926c3d6c6 SHA512 7a39b379a4be0bab4e6d360c572d81d4bfd7197d4e2a068ec2b00924ab8866406165eb9aef62a0612619c524f16302fe398edccfbcd117a97891d48fd00b5786
-EBUILD doctest-parallel-0.2.3.ebuild 1300 BLAKE2B 68ab672c2346074830f41bdd384946d53cc64404d4ebcfa38f5e6dd1a5fda287505487393e0bf5866ad7c1df1726dc1fbc41c4ecbfa7f8547ccdac5327081aa7 SHA512 ec3cc3c76aa60ef6f3e07ab6bc821bfc03f2ee29ad41a2b4168a4e5976ab36f0ac0a1aa356ab782178c5feafda52d072dbe1e3d952c8ee4c46a68e48390e7d46
+AUX doctest-parallel-0.2.4-disable-internal-test-lib.patch 917 BLAKE2B 6817c91e82e9d44180fe2f0d263545af08cc2056c886de34c7798cfeae411c6323625d718d8aa7ff8a3ae7fa520aed748557ec9cba64a45b2740545a8fe00d3e SHA512 ca4b5b1f810514a3343315fd11357514a1a6a692452c436f698f644b3ce1eaf296080b5461b6659b043200637dda79fa431ea479350c6744a9c22af58bca9e1c
+DIST doctest-parallel-0.2.4.tar.gz 46038 BLAKE2B c5ce7b48c8cf268dc31ef2060bcd3f1322e41b5ca8ca43ea889ccc2fae3eedbdbcdae57477f4e74f4eb815c5f4997295d30ac9ba62f95ebf6a86643e9c88b096 SHA512 9ccc407e317f09cb7bd104b7d1727f33449bae26f6782bc4a9b3c636b9adc53d4fa37d252bf8d1cc608a1a2bd9c27c105f5f5ad2ed36742d4ac50ef783c3ea7f
+EBUILD doctest-parallel-0.2.4.ebuild 1264 BLAKE2B 92f0ffe50b5f4f3a84fbcac36149aebcc7e23e9f885e3854e6537f56120e38d69022e964aeae72419b694ef061a5c50ef1522063d4c4d139ba6cd9c18a42a249 SHA512 8c6dc40d5988849b74449a86069e9e73561fc5e03b4eb1ed967027168371d6df3bf4e1c0f30196bdfbc16c7afddbc06451a80e4e841752bb88c62af91859ef9d
MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/doctest-parallel/doctest-parallel-0.2.3.ebuild b/dev-haskell/doctest-parallel/doctest-parallel-0.2.4.ebuild
index 6aa28f4165c8..677e98996e3f 100644
--- a/dev-haskell/doctest-parallel/doctest-parallel-0.2.3.ebuild
+++ b/dev-haskell/doctest-parallel/doctest-parallel-0.2.4.ebuild
@@ -3,20 +3,24 @@
EAPI=8
-# ebuild generated by hackport 0.7.1.1
+# ebuild generated by hackport 0.7.2.1.9999
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite
inherit haskell-cabal
DESCRIPTION="Test interactive Haskell examples"
HOMEPAGE="https://github.com/martijnbastiaan/doctest-parallel#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
KEYWORDS="~amd64 ~ppc64 ~x86"
+
RESTRICT="test" # Known failure, issue #22 on upstream github
+PATCHES=(
+ "${FILESDIR}/${PN}-0.2.4-disable-internal-test-lib.patch"
+)
+
RDEPEND=">=dev-haskell/base-compat-0.7.0:=[profile?]
>=dev-haskell/cabal-3.4:=[profile?]
>=dev-haskell/code-page-0.1:=[profile?]
@@ -26,18 +30,17 @@ RDEPEND=">=dev-haskell/base-compat-0.7.0:=[profile?]
>=dev-haskell/random-1.2:=[profile?]
>=dev-haskell/syb-0.3:=[profile?]
dev-haskell/unordered-containers:=[profile?]
- >=dev-lang/ghc-8.2:=[profile?] <dev-lang/ghc-9.3:=[profile?]
>=dev-lang/ghc-8.10.1:=
"
DEPEND="${RDEPEND}
>=dev-haskell/cabal-3.2.0.0
- test? ( >=dev-haskell/hspec-2.3.0
- >=dev-haskell/hspec-core-2.3.0
- dev-haskell/hspec-discover
- dev-haskell/hunit
- dev-haskell/mockery
- >=dev-haskell/quickcheck-2.13.1
- dev-haskell/setenv
- >=dev-haskell/silently-1.2.4
- >=dev-haskell/stringbuilder-0.4 )
"
+# test? ( >=dev-haskell/hspec-2.3.0
+# >=dev-haskell/hspec-core-2.3.0
+# dev-haskell/hspec-discover
+# dev-haskell/hunit
+# dev-haskell/mockery
+# >=dev-haskell/quickcheck-2.13.1
+# dev-haskell/setenv
+# >=dev-haskell/silently-1.2.4
+# >=dev-haskell/stringbuilder-0.4 )
diff --git a/dev-haskell/doctest-parallel/files/doctest-parallel-0.2.4-disable-internal-test-lib.patch b/dev-haskell/doctest-parallel/files/doctest-parallel-0.2.4-disable-internal-test-lib.patch
new file mode 100644
index 000000000000..642f9762c737
--- /dev/null
+++ b/dev-haskell/doctest-parallel/files/doctest-parallel-0.2.4-disable-internal-test-lib.patch
@@ -0,0 +1,24 @@
+From: hololeap <hololeap@protonmail.com>
+Signed-off-by: hololeap <hololeap@protonmail.com>
+
+This internal library is only needed for tests (currently disabled) and it
+causes an error when building docs:
+
+Running Haddock on library 'spectests-modules' for doctest-parallel-0.2.4
+setup: internal error when calculating transitive package dependencies
+Debug info: []
+
+Very similar to:
+https://github.com/commercialhaskell/stack/issues/5284
+
+diff -urN doctest-parallel-0.2.4/doctest-parallel.cabal doctest-parallel-0.2.4-r1/doctest-parallel.cabal
+--- doctest-parallel-0.2.4/doctest-parallel.cabal 2022-08-11 23:35:31.648141338 -0600
++++ doctest-parallel-0.2.4-r1/doctest-parallel.cabal 2022-08-11 23:44:18.178141594 -0600
+@@ -119,6 +119,7 @@
+
+
+ library spectests-modules
++ buildable: False
+ default-language: Haskell2010
+ build-depends: base, doctest-parallel, template-haskell
+ -- Too many warnings. TODO: fix.
diff --git a/dev-haskell/haskell-src-exts/Manifest b/dev-haskell/haskell-src-exts/Manifest
index 7cac35ffd3e4..6d5b5269e14b 100644
--- a/dev-haskell/haskell-src-exts/Manifest
+++ b/dev-haskell/haskell-src-exts/Manifest
@@ -1,3 +1,3 @@
-DIST haskell-src-exts-1.21.1.tar.gz 1248986 BLAKE2B f76d5e5ca978aec46a0f2e5f2442cb3960ffb3008ad11955e5f04cfce38613b6073af59b6e8eb32975664d3f22ee31334166daafc5d935f18e7a008b3d28332b SHA512 1349d419a13343fdf5579bf1f4027a3906de67ac257d0663fb6d10cf96e8312e08beec81d91044421f1202675a8c9381d280104d95c1ffea2e746f378d683e61
-EBUILD haskell-src-exts-1.21.1.ebuild 1021 BLAKE2B 27d77b94e881299280118beba5e64cee0ccbd3d605afa380261456fd3ffea7d97c0e502f49aeab0ce5d966e521a939403348cc35854d974ba79f61085f3f9e46 SHA512 f41f15ca25cb0c4f9f3d20720940dabda2f0b4589f5db632c9906279b262270f27e71e447d89795a03a0ee1407128e2dd7e3fdafad2e14d7f32e2b016a63ac7d
-MISC metadata.xml 779 BLAKE2B 2b013888d9598a0d62f1d56a6ddce956ae645c7f8fe518a04a63a3aef1816415666d565b2cca5b1f48aca5a3a2ae04990956e68083597c6f48319e1473c5bddb SHA512 da393ad717c05f7a54e767035c0520a55d8f709eefd153b045151ed4cc10ab0f808d2fd566e44ac93a7d3ca4b15bce3e0791f70358605aea878f66f972742f2f
+DIST haskell-src-exts-1.23.1.tar.gz 1264319 BLAKE2B 4ad6fe7e2cd70523b5169569f57493e595e2700866f5c44e8044c84bcafc17f98efc57302beb0e3a7ed385c23e204dd79bb63a30bcf0ae414e66696a832038c0 SHA512 c9e6e4d93c2b4ee84d57707aed526291b5c4e297f06a3921257feb0c1df3bb095addd4b1d9bb187650490364647385ab6322e4fc54f9a7648da439a34329d734
+EBUILD haskell-src-exts-1.23.1.ebuild 823 BLAKE2B 849d66d53879c5456bf8cfdf83b9de441643806c5ab4d1ff6ce24ce1d9010991914cdb14423d552ba32e1c75d3b969248035b7c4a39c969552dd39bf7e2daace SHA512 0bf5ac8ed8c7a88b09b7f17efe16f44f4f0a413d670c78ac2b5a53a241faa5375b8972a46e9a2d629ff341cbbdea6e01ac4504e919dc3e1ae9e656670cf7d052
+MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/haskell-src-exts/haskell-src-exts-1.21.1.ebuild b/dev-haskell/haskell-src-exts/haskell-src-exts-1.23.1.ebuild
index e51345e310a5..b25383d74849 100644
--- a/dev-haskell/haskell-src-exts/haskell-src-exts-1.21.1.ebuild
+++ b/dev-haskell/haskell-src-exts/haskell-src-exts-1.23.1.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-# ebuild generated by hackport 0.6.4
+# ebuild generated by hackport 0.7.2.1.9999
#hackport: flags: +base4
CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
@@ -11,22 +11,17 @@ inherit haskell-cabal
DESCRIPTION="Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer"
HOMEPAGE="https://github.com/haskell-suite/haskell-src-exts"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
-SLOT="1.21/${PV}"
+SLOT="0/${PV}"
KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
-RDEPEND=">=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
- >=dev-haskell/semigroups-0.18.3:=[profile?]
- >=dev-lang/ghc-7.4.1:=
+RDEPEND=">=dev-lang/ghc-8.4.3:=
"
DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.10
+ >=dev-haskell/cabal-2.2.0.1
dev-haskell/happy
- test? ( dev-haskell/mtl
- >=dev-haskell/pretty-show-1.6.16
+ test? ( >=dev-haskell/pretty-show-1.6.16
>=dev-haskell/smallcheck-1.0
>=dev-haskell/tasty-0.3
>=dev-haskell/tasty-golden-2.2.2
diff --git a/dev-haskell/haskell-src-exts/metadata.xml b/dev-haskell/haskell-src-exts/metadata.xml
index 1314698031a7..937381521944 100644
--- a/dev-haskell/haskell-src-exts/metadata.xml
+++ b/dev-haskell/haskell-src-exts/metadata.xml
@@ -1,22 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription lang="en">
-Haskell-Source with eXtensions (HSX, haskell-src-exts) is an extension of the
-standard haskell-src package, and handles most common syntactic extensions to
-Haskell, including:
-
- * Multi-parameter type classes with functional dependencies
- * Empty data declarations
- * GADTs
- * Implicit parameters (ghc and hugs style)
- * Template Haskell (broken for 6.4, needs redoing)
-</longdescription>
- <upstream>
- <remote-id type="github">haskell-suite/haskell-src-exts</remote-id>
- </upstream>
+ <maintainer type="project">
+ <email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+ </maintainer>
</pkgmetadata>
diff --git a/dev-haskell/parser-combinators/Manifest b/dev-haskell/parser-combinators/Manifest
index 68426a8ea7c1..f54e4a84632d 100644
--- a/dev-haskell/parser-combinators/Manifest
+++ b/dev-haskell/parser-combinators/Manifest
@@ -1,4 +1,4 @@
DIST parser-combinators-1.3.0.tar.gz 11699 BLAKE2B 0a24e95c52627a3219cc8e89ed49ebc12e759a487e7daf333f3ab788837576aef88d295f585aecd0831866319ee0445369cc3cd26255d6ef85d602f44d7767fa SHA512 f7a4581d229b788e841d844003e058a6c63827c5cadeb6fe8f1b94e2a920b11d3b08a8a7a412fa95e1b75bca24f6957f88162f8d1af5bb174ca7f91ef47c0b71
DIST parser-combinators-tests-1.3.0.tar.gz 6860 BLAKE2B ececd5d8a47501a90e68ba77da679aed2c00da225c234f8afeebd43bf4cb821c988cd5612e8411e70179b39f0fcf8c15fcd93accd81e42ce1b8999d0cd8c7bdf SHA512 ac863afcbe81ea83c20cbab3229c5321860d1d45b4b04031db1a8cc493239096aef80d24148fe3cd5a18dfc811d806855386736be94e32cecabab3ae656d5389
-EBUILD parser-combinators-1.3.0.ebuild 1681 BLAKE2B 17242e0cffb303f26ba44daec6666eaae676c2023e2b129b2500744a3fb17ba29177f2b8966da50f189a9e33e209e8b3a83f30bdd709e0c2dbf75e8dacfb4a84 SHA512 3cde3247d462d4f95765d097ca90eb4168105403b6c2c223c69b56c268c01aee78387177c405fbde43f213fc2a6b32167257620419cd5a4e5a253501633ef783
+EBUILD parser-combinators-1.3.0.ebuild 1798 BLAKE2B 0bb06c68249a0c45a1c18baa18f1ee337408aa3830217db2a061eb1c4e21c2166e89a0035a1831774a35237846503b205611c3eeb7b50e760c1a0885d1e5e4fe SHA512 c06dfeaca924550ddd4b5b238f88749d2cf202a4a0ec037b2369abad8ab7a56c80b2c1d23b233cbba0f8c2163cc5a88203408fd47a7fecb7733dc028489170a4
MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/parser-combinators/parser-combinators-1.3.0.ebuild b/dev-haskell/parser-combinators/parser-combinators-1.3.0.ebuild
index fc3e4a9d5cb2..7c57fcc85c7d 100644
--- a/dev-haskell/parser-combinators/parser-combinators-1.3.0.ebuild
+++ b/dev-haskell/parser-combinators/parser-combinators-1.3.0.ebuild
@@ -9,18 +9,16 @@ EAPI=8
CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
inherit haskell-cabal
-TESTS_PN="${PN}-tests"
-TESTS_P="${TESTS_PN}-${PV}"
+TESTS_PN="${CABAL_PN}-tests"
+TESTS_P="${TESTS_PN}-${CABAL_PV}"
DESCRIPTION="Lightweight package providing commonly useful parser combinators"
HOMEPAGE="https://github.com/mrkkrp/parser-combinators"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
- https://hackage.haskell.org/package/${TESTS_P}/${TESTS_P}.tar.gz"
+SRC_URI+=" https://hackage.haskell.org/package/${TESTS_P}/${TESTS_P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
KEYWORDS="~amd64 ~ppc64 ~x86"
-RESTRICT="test" # tests only work if not already installed
RDEPEND=">=dev-lang/ghc-8.6.3:=
"
@@ -41,18 +39,21 @@ src_configure() {
src_test() {
if use test; then
- ./setup register --inplace --gen-pkg-config || die
- ghc-pkg init pkgdb || die
- ghc-pkg -f pkgdb register "${P}.conf"
+ local -a configure_flags=( "--flag=-dev" )
- old_S="${S}"
+ # Runs the block if the main package is not installed currently
+ if ! ghc-pkg describe "${CABAL_PN}" &>/dev/null; then
+ ./setup register --inplace --gen-pkg-config || die
+ ghc-pkg init pkgdb || die
+ ghc-pkg -f pkgdb register "${CABAL_P}.conf" || die
+ configure_flags+=( "--package-db=${S}/pkgdb" )
+ fi
+
+ local old_S="${S}"
export S="${WORKDIR}/${TESTS_P}"
pushd "${S}" > /dev/null || die
- haskell-cabal_src_configure \
- --package-db="${old_S}/pkgdb" \
- --flag=-dev
-
+ haskell-cabal_src_configure "${configure_flags[@]}"
haskell-cabal_src_compile
haskell-cabal_src_test
diff --git a/dev-haskell/regex-tdfa/Manifest b/dev-haskell/regex-tdfa/Manifest
index 1d28a8b04960..bde8db7f9eb0 100644
--- a/dev-haskell/regex-tdfa/Manifest
+++ b/dev-haskell/regex-tdfa/Manifest
@@ -1,3 +1,4 @@
+AUX regex-tdfa-1.3.2-disable-doctests.patch 617 BLAKE2B 5e2e7dc8ccc6bbf92a46315a736209ce170912971f6df80581f9f6ca2587388fef864d2200d14de21092b784582fd08cb77d2aa118ca3872cd72d67ce31f74ee SHA512 210ee3c910e9f80d904e13c4cefc01d4bef9558bb2c2f8b8273f174022db8bb89b24068f56b84c8d1e3cf0c44476b441f381bd811264123c9fedb22fafedc0d5
DIST regex-tdfa-1.3.2.tar.gz 82839 BLAKE2B e381bc951dfad53b0cd2c83f6c77e3a71fe6b1fd64988f75544e631f49a9d108f39e27bc5bb42fbccc4887321c7655d609c0c13cc58f7be3b93e8131059f4320 SHA512 88bbf8f4d7ac15fb85c899bdeb8f8556c7a284075bf2b600051f529f0e2109dcda6ba74fc95969b824cfb03f00a9eb47e9c375c70b1b9e17096c95acbe517168
-EBUILD regex-tdfa-1.3.2.ebuild 866 BLAKE2B c8f53dd3aa3cbf01fe067bd2eb842f740f5bbecbd5983892363bcb1024a32518a824ffe03624bff3af43a644f388ed59d229a55c1b9324b2d247be178188a9a1 SHA512 69ff4bff75e97916b570b72ecfeee18ebd08673278c45be7a8ee9d6569288328bea4d288dd0578dd53d73e27d52c371c05975a9a8dce19090fcb086c0d7a187a
+EBUILD regex-tdfa-1.3.2.ebuild 893 BLAKE2B ec0b55cae438e784c15fc490970d4e3b3576fcc65d1471846988a3197ae9f811189e809a881547640688b51c151db011eccf932ab7ac75cb77ee5b70ba96da2e SHA512 06a2860335b929535d09957610bd5daf5ddc55f0f97d8b49239d8be58aadfff7f12a65293e6fd2e74757e3d96230cd3535cd9558ed57ccb485500e03b847cf42
MISC metadata.xml 340 BLAKE2B 319aacb72c42132e7ada85d202654dc33109e26c5d5d8c7d429daa3f7f428b779fbd4ba37a328086f51ca6abd7f5371a381ad142a8d16f1101ddbe9b31d1a181 SHA512 d9a7851eef96bea2959de80eecbda08d625c8fa9989beb2cfb4f2e845d2756f309be4a23f2eca4c205e78fa5a78de2087dc816390c27fb6081b8ce0bfbd3ea8c
diff --git a/dev-haskell/regex-tdfa/files/regex-tdfa-1.3.2-disable-doctests.patch b/dev-haskell/regex-tdfa/files/regex-tdfa-1.3.2-disable-doctests.patch
new file mode 100644
index 000000000000..c491fb877d05
--- /dev/null
+++ b/dev-haskell/regex-tdfa/files/regex-tdfa-1.3.2-disable-doctests.patch
@@ -0,0 +1,18 @@
+From: hololeap <hololeap@protonmail.com>
+Signed-off-by: hololeap <hololeap@protonmail.com>
+
+doctest-parallel does not currently work with Setup.hs
+
+See: <martijnbastiaan/doctest-parallel#45>
+
+diff -urN regex-tdfa-1.3.2/regex-tdfa.cabal regex-tdfa-1.3.2-r1/regex-tdfa.cabal
+--- regex-tdfa-1.3.2/regex-tdfa.cabal 2022-08-14 00:42:54.578227087 -0600
++++ regex-tdfa-1.3.2-r1/regex-tdfa.cabal 2022-08-14 00:43:17.428227098 -0600
+@@ -175,6 +175,7 @@
+ ghc-options: -O2
+
+ test-suite doc-test
++ buildable: False
+ type: exitcode-stdio-1.0
+ hs-source-dirs: test
+ main-is: DocTestMain.hs
diff --git a/dev-haskell/regex-tdfa/regex-tdfa-1.3.2.ebuild b/dev-haskell/regex-tdfa/regex-tdfa-1.3.2.ebuild
index c3aa4194136e..459e5d1880e4 100644
--- a/dev-haskell/regex-tdfa/regex-tdfa-1.3.2.ebuild
+++ b/dev-haskell/regex-tdfa/regex-tdfa-1.3.2.ebuild
@@ -16,13 +16,18 @@ LICENSE="BSD"
SLOT="0/${PV}"
KEYWORDS="~amd64 ~ppc64 ~x86"
+PATCHES=(
+ "${FILESDIR}/${PN}-1.3.2-disable-doctests.patch"
+)
+
RDEPEND=">=dev-haskell/regex-base-0.94:=[profile?] <dev-haskell/regex-base-0.95:=[profile?]
>=dev-lang/ghc-8.4.3:=
"
DEPEND="${RDEPEND}
>=dev-haskell/cabal-2.2.0.1
- test? ( >=dev-haskell/doctest-parallel-0.2.2
- >=dev-haskell/utf8-string-1.0.1 <dev-haskell/utf8-string-1.1 )
+ test? (
+ >=dev-haskell/utf8-string-1.0.1 <dev-haskell/utf8-string-1.1
+ )
"
src_configure() {
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 16e55ab56ad1..52a8c871b56d 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
Binary files differ
diff --git a/dev-lang/ghc/Manifest b/dev-lang/ghc/Manifest
index 98a40da89950..40df033a5a97 100644
--- a/dev-lang/ghc/Manifest
+++ b/dev-lang/ghc/Manifest
@@ -9,6 +9,7 @@ AUX ghc-8.2.1_rc1-win32-cross-2-hack.patch 6231 BLAKE2B 8ad4428ebe9a373e08e94e53
AUX ghc-8.8.1-revert-CPP.patch 2236 BLAKE2B f793a9e9516f9f484234311372715116dfdd588a6682113914c17feedc635371779f0c0591e1f0caf3ff3e5ca5d4c7cc8b052045306f3df4085873d0df25f2af SHA512 b324c6873a802e20ee690f0574f9f2f312f3ba4331345504b7170f52ab2b1adeb9d047a0e5526053d006d67fc261e771a284bdb8f7b76653c21d9bf9337d7cf5
AUX ghc-9.0.2-CHOST-prefix.patch 282 BLAKE2B e0a2505c2ae91d5aad41fa3faf4fa7ece8ebcf0677377b76ff16ceea648eb4fde4f198a94574649d5cd7aeaa7d70ad4ea93a2636ba5868c470d2f47209a1065d SHA512 ce17006d5635ba24576bf80b3aabce9eb132ff65d820e22fd430178d3abf8536d3696b72d226384d1c42d9a6969fdcee5a05b260d55015c250fb72c45a1708e5
AUX ghc-9.0.2-darwin.patch 916 BLAKE2B ece65347ee4d40ce729642766273792c5f619c5f2788366f5f1e1784d630efadf59fa1c1e2e03dbd81633ad4202c81fc39a6c94472db52af2f99362ee1e67093 SHA512 300167a4c5c4b4bf6b18cdce242c8e27def88f4f3d810da0e5b60bdb77a186975716c2ac2ced8365e2f6a17b799e77eba8b3b77ae4b9efe69339dec48e78963a
+AUX ghc-9.0.2-disable-unboxed-arrays.patch 1298 BLAKE2B d3d8cf5b8f7f012cb93f6481822348c68e7ff79896664f51de5e4b248f8de68ea04144791bf8959b83ea265f384c055100fc27caf0da17f9a5a173c333928c4b SHA512 cc979c2fdb877716dee3fb75d9ee0734737f2f9a5611a0a1d20e2d603b48ebeaa339d09a130a79fce45eebe659a3741cf862b17eafecf814f408399139250806
AUX ghc-9.0.2-fix-tests-python310.patch 1116 BLAKE2B fc7a7390cbbc737c66ea8401c9211318d078499bfd103f07ec2df0db9824041dfee279e364601a21d4d37a694a9442f3570c0333b2baab6173d6daa366c931da SHA512 0620ebffc49a06a65bd45bf324de4674b98e874291e6bebae1a95d585bbdf38cc201a734f7f20133880b46e9abf0839b59278688b00c892b94091d1c0257352b
AUX ghc-9.0.2-modorigin-semigroup.patch 1210 BLAKE2B e29917dd740bded98257366ca37d3ac8fdc8ffd0e988e6286b8cf21fb9f0232ce1584a1a22665f4afad36e5585c29091040cac16b1204022f5a5f3328420c4ff SHA512 dc54fb02dfed55f5a9309c61ec23859ad4f80fd271fe0ccb41b786fc7d44bc0d9722069e2f56731c6af5ad1703c5081ba9e4b4e683911af4ad9b498f53b67a5e
AUX ghc-9.0.2-modorigin.patch 1169 BLAKE2B 33a02689b5404bf28cd2a04dc601412db54ae1bb64611c3d7831a8478aadf38848f76042206b441983f07d505ad81fc3593625ee91c96e9bdacfb1621c4408a6 SHA512 f319ce4e4af1bdacefc0cc34e508bc9cb37307e5dd4e3b573af8c40232ec5669e094e9231b8fe9a6d21a2bce32fda2e443953ac5f14a7104232c03231cd337df
@@ -21,8 +22,9 @@ DIST ghc-9.0.2-testsuite.tar.xz 2403564 BLAKE2B 0e7f6fefb9c972f94073aca8b1514791
DIST ghc-bin-8.10.6-i686-pc-linux-gnu.tbz2 124324289 BLAKE2B afb34984872b35fdedbdedeb8756cc7c33e5b943dba57dd86910b076d483bb643265d0ab0027784dec5dc489eabd65b5ab17474f25fb2ce657925aa0efaa9033 SHA512 4be13e6dba298d12a4d49ae4633eec83cfaaaf22b5f8cfca5f5952aa294ae52fb3601490beed3bda5a7f7b6a5bd81e0ecc9fc39e8df836cc8fd377a0d0b783a0
DIST ghc-bin-8.10.6-x86_64-pc-linux-gnu.tbz2 122871118 BLAKE2B 527b36abf60390c91f91bc650ee25484d39d377739da87b5b6fd1a752705c1f3bc0ce0c68644657c9a7c1fc9a3b858b9dd7d84b25eab1a89125fccb6eb1f6250 SHA512 42b7fae339e82a6078fae8920efea8d0992e4774ea66b100e22dd9df168be57d8bce52558b8501c3c567c40776389d94bde3f17d26d63535140ce26ac16c27e1
DIST ghc-bin-9.0.2-i686-pc-linux-gnu.tbz2 123509908 BLAKE2B 45614984803a7bfa266f99d4adb4b5f2ab7b9e5e89c6ecd501296fc99a1d96e798ccb9c832f8dcb15fff9725beb918a7b63e62ff13f59b6506a2ef17930c45d2 SHA512 e0b7f4474c16f0763a2f787027fbdfeb3125b48c987fa1196bc189fefad9f0bfa2806da62af46d61ca911f5275b578076e2b326acf39e0894a8daa9deda0843a
+DIST ghc-bin-9.0.2-powerpc64-unknown-linux-gnu.tar.gz 235636284 BLAKE2B 878ac300cca5d2cbc5cb21dbb347da755b4027cbf63ec77464740854fa8010569de5e03acef67cd877da13665c906b2fd04e24e226e9eb39b57ba979093c732b SHA512 28f096e965abdac9cc370c882639f10285b9073ba5332f7af215eccff948e41c01c3d6bb3bc8e3b4e809e12867a95b49f82dd76e0090b974088f75ab9d1bc199
DIST ghc-bin-9.0.2-powerpc64le-unknown-linux-gnu.tar.gz 275226316 BLAKE2B 10ade2359432b0ede7431ee543f0ff47f4b203465d81719da579ad63ca467359eb9fcf7336a12feb6ff75a480f349576ff8ea1b4ebe1094fff228ae4fd00d6e0 SHA512 64b4c84d149358b8d3a6cb29a6d3a75af11e7b14e6d910c9789c9949262e4ed2a17f8a0d1e5dd297121957061fe2395d6f43acae6b4ab28851e3cd414cd9c89c
DIST ghc-bin-9.0.2-x86_64-pc-linux-gnu.tbz2 121536759 BLAKE2B 4433e2d266f065d2b2944b711d622ec26288a2187ac03562257a671744b44da35110ce16ac6d76f7062a563488885326be073e0ff03c7e48250051c3b4763d96 SHA512 2de29a9ddbfd0fac797cdd628f3657ff38e6a153151849508bba75d36f84394ed77750435ff5cc1bdfcd30ef2b6e009bde965bd0a83e0496b5027239642f4b6c
EBUILD ghc-8.10.6.ebuild 26291 BLAKE2B 65b357344617731495555bad893674de98d6425059ea5ea357dae5754a589c61d9fb30fbd241bc42f9efe91b567216ec6c4be130665eec34887a47e39a40d970 SHA512 910f2cd0421f4c5731ed3b35325f59d89883c8041b26aafbd384c51a680f2fcba67aecf1fa86b1db3a6fb543ee51c17d35734e037b5455d02ce1d909b7808f8c
-EBUILD ghc-9.0.2.ebuild 27137 BLAKE2B ecaa563e19df7ad0db75e673a653e7f1e82357d8126ff77feb7046fd9e89c2f1f7ac58399bbfcdb45dd47988201a36fda5aa14392e7f85417a8899a5fa31cd1a SHA512 78ed00458648e2cf09a82189998f9b0fa21c72a2ecb1530ae45e273c3db232fcd4c6ea986e9fbefc6a6c16f221bf978b33e294b3743f8f64787c0587227baf06
+EBUILD ghc-9.0.2.ebuild 26658 BLAKE2B 2ef9b6d6ac5692425fb2b315280ee2173408f00add75b7dfd09a40b41ec13ce9d9b4d58b3ef69b11a6101ab6131712d48cd72b4da1c1cac51706e2760237b4a6 SHA512 cfc871bc4a8d548c26cc9dbd06e86804fbd0eb790841a3b281f1631b6a0fb578f8e97fd19520eb3c9c4489d9346a0dcf6221f4cbf312c5cdbe56d2cffccdf72a
MISC metadata.xml 950 BLAKE2B c719d48919a318bbb52aedebc27c7d2edcc445f885c5b0ecc0b32666ea7a4ac227f42ca08a1c7443eab0d92d8961b196c9a507a5796194be5d5b3f2f6943d3ab SHA512 4fc6c71895c07d8b73d58b71e4e4cdd3a12e366dbc971621e026fadba8ee1b3711e7ae0f5905f28e338e4b850119cef5bff05650be1b83696f2c6fd85fb925d9
diff --git a/dev-lang/ghc/files/ghc-9.0.2-disable-unboxed-arrays.patch b/dev-lang/ghc/files/ghc-9.0.2-disable-unboxed-arrays.patch
new file mode 100644
index 000000000000..599762b95454
--- /dev/null
+++ b/dev-lang/ghc/files/ghc-9.0.2-disable-unboxed-arrays.patch
@@ -0,0 +1,39 @@
+https://gitlab.haskell.org/ghc/packages/containers/-/commit/f5a511f1ff2cf16e710342948792cb8d7576e27c
+https://bugs.gentoo.org/865311
+
+From f5a511f1ff2cf16e710342948792cb8d7576e27c Mon Sep 17 00:00:00 2001
+From: Peter Trommler <ptrommler@acm.org>
+Date: Fri, 31 Dec 2021 18:20:45 +0100
+Subject: [PATCH] Disable unboxed arrays on big-endian
+
+Unboxed arrays are broken on big-endian architectures, see
+https://gitlab.haskell.org/ghc/ghc/-/issues/16998 for details.
+This patch makes the use of unboxed arrays conditional on
+little-endian architecture.
+
+Fixes #673
+---
+ libraries/containers/containers/include/containers.h | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/libraries/containers/containers/include/containers.h b/libraries/containers/containers/include/containers.h
+index cd201ca3..fc2a0e84 100644
+--- a/libraries/containers/containers/include/containers.h 2022-08-16 07:50:42.844217960 +0200
++++ b/libraries/containers/containers/include/containers.h 2022-08-16 07:50:49.327446486 +0200
+@@ -35,7 +35,13 @@
+
+ #ifdef __GLASGOW_HASKELL__
+ # define USE_ST_MONAD 1
++#ifndef WORDS_BIGENDIAN
++/*
++ * Unboxed arrays are broken on big-endian architectures.
++ * See https://gitlab.haskell.org/ghc/ghc/-/issues/16998
++ */
+ # define USE_UNBOXED_ARRAYS 1
+ #endif
++#endif
+
+ #endif
+--
+GitLab
+
diff --git a/dev-lang/ghc/ghc-9.0.2.ebuild b/dev-lang/ghc/ghc-9.0.2.ebuild
index 5f55fd44965a..e0cd53611f2c 100644
--- a/dev-lang/ghc/ghc-9.0.2.ebuild
+++ b/dev-lang/ghc/ghc-9.0.2.ebuild
@@ -32,8 +32,10 @@ BIN_PV=${PV}
arch_binaries="$arch_binaries amd64? ( https://eidetic.codes/ghc-bin-${PV}-x86_64-pc-linux-gnu.tbz2 )"
#arch_binaries="$arch_binaries ia64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ia64-fixed-fiw.tbz2 )"
#arch_binaries="$arch_binaries ppc? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ppc.tbz2 )"
-#arch_binaries="$arch_binaries ppc64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ppc64.tbz2 )"
-arch_binaries="$arch_binaries ppc64? ( !big-endian? ( https://github.com/matoro/ghc/releases/download/${PV}/ghc-bin-${PV}-powerpc64le-unknown-linux-gnu.tar.gz ) )"
+arch_binaries="$arch_binaries ppc64? (
+ big-endian? ( https://github.com/matoro/ghc/releases/download/${PV}/ghc-bin-${PV}-powerpc64-unknown-linux-gnu.tar.gz )
+ !big-endian? ( https://github.com/matoro/ghc/releases/download/${PV}/ghc-bin-${PV}-powerpc64le-unknown-linux-gnu.tar.gz )
+)"
#arch_binaries="$arch_binaries sparc? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-sparc.tbz2 )"
arch_binaries="$arch_binaries x86? ( https://eidetic.codes/ghc-bin-${PV}-i686-pc-linux-gnu.tbz2 )"
@@ -49,9 +51,7 @@ yet_binary() {
amd64) return 0 ;;
#ia64) return 0 ;;
#ppc) return 0 ;;
- ppc64)
- use big-endian || return 0
- ;;
+ ppc64) return 0 ;;
#sparc) return 0 ;;
x86) return 0 ;;
*) return 1 ;;
@@ -506,30 +506,14 @@ src_prepare() {
eapply "${FILESDIR}"/${PN}-9.0.2-CHOST-prefix.patch
eapply "${FILESDIR}"/${PN}-9.0.2-darwin.patch
-
- # Incompatible with ghc-9.0.2-modorigin-semigroup.patch
- # Below patch should not be needed by ghc-9.2
- #eapply "${FILESDIR}"/${PN}-9.0.2-modorigin.patch
-
- # ModUnusable pretty-printing should include the reason
- #eapply "${FILESDIR}/${PN}-9.0.2-verbose-modunusable.patch"
-
# Fixes panic when compiling some packages
# https://github.com/gentoo-haskell/gentoo-haskell/issues/1250#issuecomment-1044257595
# https://gitlab.haskell.org/ghc/ghc/-/issues/21097
eapply "${FILESDIR}/${PN}-9.0.2-modorigin-semigroup.patch"
-
# Needed for testing with python-3.10
use test && eapply "${FILESDIR}/${PN}-9.0.2-fix-tests-python310.patch"
-
- #needs a port?
- #eapply "${FILESDIR}"/${PN}-8.8.1-revert-CPP.patch
eapply "${FILESDIR}"/${PN}-8.10.1-allow-cross-bootstrap.patch
- #eapply "${FILESDIR}"/${PN}-8.10.3-C99-typo-ac270.patch
-
- # a bunch of crosscompiler patches
- # needs newer version:
- #eapply "${FILESDIR}"/${PN}-8.2.1_rc1-hp2ps-cross.patch
+ eapply "${FILESDIR}"/${PN}-9.0.2-disable-unboxed-arrays.patch
# mingw32 target
pushd "${S}/libraries/Win32"
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 835c0ca53158..6ed9cc0edb76 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
Binary files differ
diff --git a/dev-python/pyopencl/Manifest b/dev-python/pyopencl/Manifest
index 680bb81f324c..9ffadcbfc244 100644
--- a/dev-python/pyopencl/Manifest
+++ b/dev-python/pyopencl/Manifest
@@ -1,5 +1,5 @@
DIST pyopencl-2022.1.5.tar.gz 454129 BLAKE2B 266bc327c9af5654287fc47cdf4e6002c7cddcd6f5e55bb70bb62aaee666dc5c102f78d4e946f010c1e109390c1d2e981e7ca6ca002d10f66248cb008b308734 SHA512 e6eb3e6d886d8ca1d94867a398b286556fd2d93535bb8481c7603cd521cd47606ce3d9cd6422830c6404305a4a1293234d8774fdda6923bdd2b4fc21fb39d377
DIST pyopencl-2022.1.6.tar.gz 455424 BLAKE2B 03c46bebc4d6093489b0a1501267d5d67b73e9e7fe50f73cec3dd752fbb699adab63e08d60f3a54c8fd215cbb82c81353d28e875b953686b05e188df78cfe237 SHA512 a1e404c4c5f95d111690c969ae5c5d34f0deca2c8b93a5ce4d90e003031af7eb94a7708f878170a9b6e001b899d321f7dfdaa6f7545af3237d30d237d44bb45f
EBUILD pyopencl-2022.1.5.ebuild 1572 BLAKE2B aaed0c92df6a752644454b17cdddb25f9c77179404a02b76ad3860d862faa9ff8b108b7f3330e385ab22360a41a25fbb6a4378fa4eee683d20955d71ac15d481 SHA512 60867d0d0708fdf047d72d8fd80a49c2b0b88abecb45a859f5690d9ceb07bb171e8789c9e7239d3f2c428ac2d4fb96fdbbab13d94a034e5c600e7caa196251c8
-EBUILD pyopencl-2022.1.6.ebuild 1599 BLAKE2B addd81de214a3c33e515e7716eb07ce1be83f487470a811e6df4de207bb315501f928290ce831c79f792ea7d67761725f656e8a71916393bcd48e9010a8e358f SHA512 36dccf1dd5cd846a64d6eeeb5fbc8fde0aaeacf7fd178531aa039341d69255a09a6745440980ada2983a0d4a59efef87edf21e358aa0ed34a7d7c9976a5fda84
+EBUILD pyopencl-2022.1.6.ebuild 1820 BLAKE2B 4771789e3bcf994856411c9c0f41f1d7c79c3fa1cf8d0dd5ef149cac0a3ad2277031ed97d8f6c17362cfc269cd31d5c1a9e05546b38194e89646e648e12a677a SHA512 2a6b2abd6ffcc6646599064ce4b34d26eea8b3407ea21ba46818efe19c7c203bc95eca0429adcb4d464c4be8e658693dc9577eb1f5acf94697792661da3fc96f
MISC metadata.xml 317 BLAKE2B ba532c522d5fd599dfd41180c9813f8124dc64cd3bc7a3a7b1ecdc121b216db4b43f6cae9c32c52a430fbf6e9a22c0cf27ffaf0041ca372d81666991bcf0e979 SHA512 845a8b83a5d7729ea0fca8b704de297b8b8c0d8f315fad0bea7c0c645bc79dd993209e9ca5e89ec9c8ddbe6db2b1f142c3e1f7e5b8e4b6259fe927527ce6a919
diff --git a/dev-python/pyopencl/pyopencl-2022.1.6.ebuild b/dev-python/pyopencl/pyopencl-2022.1.6.ebuild
index 19e2c5a987c8..a1d774b5553c 100644
--- a/dev-python/pyopencl/pyopencl-2022.1.6.ebuild
+++ b/dev-python/pyopencl/pyopencl-2022.1.6.ebuild
@@ -6,7 +6,7 @@ EAPI=8
PYTHON_COMPAT=( python3_{8..10} )
DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
+inherit distutils-r1 multiprocessing
DESCRIPTION="Python wrapper for OpenCL"
HOMEPAGE="https://mathema.tician.de/software/pyopencl/
@@ -29,15 +29,10 @@ RDEPEND="${COMMON}
>=dev-python/pytools-2021.2.7[${PYTHON_USEDEP}]"
BDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
>=dev-python/pybind11-2.5.0[${PYTHON_USEDEP}]
- <dev-python/pybind11-2.10.0[${PYTHON_USEDEP}]"
+ <dev-python/pybind11-2.10.0[${PYTHON_USEDEP}]
+ test? ( dev-libs/pocl )"
-# The test suite fails if there are no OpenCL platforms available, and
-# even if there is one (which requires the presence of both an OpenCL
-# runtime *and* hardware supported by it - simply emerging any runtime
-# is not enough) the vast majority of tests end up skipped because by
-# default the portage user hasn't got sufficient privileges to talk
-# to the GPU.
-RESTRICT="test"
+distutils_enable_tests pytest
python_configure_all() {
local myconf=()
@@ -49,6 +44,18 @@ python_configure_all() {
"${myconf[@]}"
}
+python_test() {
+ # Use dev-libs/pocl for testing; ignore any other OpenCL devices that might be present
+ local -x PYOPENCL_TEST="portable:pthread"
+ # Set the number of threads to match MAKEOPTS
+ local -x POCL_MAX_PTHREAD_COUNT=$(makeopts_jobs)
+ # Change to the 'test' directory so that python does not try to import pyopencl from the source directory
+ # (Importing from the source directory fails, because the compiled '_cl' module is only in the build directory)
+ pushd test >/dev/null || die
+ epytest
+ popd >/dev/null || die
+}
+
python_install_all() {
if use examples; then
dodoc -r examples
diff --git a/dev-python/pytest-markdown/Manifest b/dev-python/pytest-markdown/Manifest
index 8d571380a692..18110cba4b7b 100644
--- a/dev-python/pytest-markdown/Manifest
+++ b/dev-python/pytest-markdown/Manifest
@@ -1,3 +1,3 @@
DIST pytest-markdown-1.0.2.tar.gz 2991 BLAKE2B 489bd1ccd6060b9588515772ff1f269dc57c328b3695405d0dd755340968899a2b912644e325ce5792528da90e5eac828314dbb9d1396eb34dffe0da04261848 SHA512 a2d5b38982f004a362ec2bda7aec45a6fb9e0b33dfd212647d8eab38fdadf6501b7fec8ad8838b286d81a156429aeb0ad3aa63361a580c2c7528fe19e474a7f6
-EBUILD pytest-markdown-1.0.2.ebuild 642 BLAKE2B 9efb5b62998f05e99ae581db0894849bf96a1bdc034d07d36336f294438a27ee6d80fc78102054922fed4393736c7a45f88b2b14a143af594971ee9fe09b2ea0 SHA512 e1891dd14a72843038f7d420f69e4cf6ac387a0e845e371eccf4b1bef391c1381cc3c4fa5b7f9f64f9d96c8f0a1a1cf8d117c3d809f57adef158528f67c8be85
+EBUILD pytest-markdown-1.0.2-r1.ebuild 593 BLAKE2B ec52d010b7e43cae77ac3544c12a2960efa02f58bf972a27f6c3f8a3c845686b3b3badc02af43756a8f69a3b7083d795f26579e2e74100fc31d6249da6f84bd0 SHA512 bf1a4dd0d1e7ffabebdedb732e58fa792dd9dc7edd0f3302344dd2097a8cdce45109670d7bb5086f6e6d181f169fd641ce31d6ff5f29d63de05a3cda377694ad
MISC metadata.xml 408 BLAKE2B 5bf707e04d11ff64f66112fb2a097ff7791ba883fd96492ccf59856d7840e2de34e6945f04943effa82b4f60b6b48c29b75de310c395da989bd82dbc7088154b SHA512 4c381e16ede235dff63ab6b5525900b66ad160c3e5fd3dfd013358c55266a799c2e10a310ca673ea4a931d671908f28e3e284a44b2fe3f9fbfaabb162ff39ea1
diff --git a/dev-python/pytest-markdown/pytest-markdown-1.0.2.ebuild b/dev-python/pytest-markdown/pytest-markdown-1.0.2-r1.ebuild
index 47c5476a6d1a..6fe08a1956af 100644
--- a/dev-python/pytest-markdown/pytest-markdown-1.0.2.ebuild
+++ b/dev-python/pytest-markdown/pytest-markdown-1.0.2-r1.ebuild
@@ -3,15 +3,15 @@
EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_SETUPTOOLS="pyproject.toml"
+PYTHON_COMPAT=( python3_{8..11} )
+DISTUTILS_USE_PEP517="poetry"
inherit distutils-r1
MY_PN="${PN/-/_}"
MY_P="${MY_PN}-${PV}"
-DESCRIPTION="Write unit tests in Python to test actual state of your servers"
+DESCRIPTION="Run tests in your markdown"
HOMEPAGE="https://github.com/Jc2k/pytest-markdown"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 241ce1a72207..d70f3d089022 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
Binary files differ
diff --git a/dev-ruby/hoe/Manifest b/dev-ruby/hoe/Manifest
index a612651e1c93..b76b121f1d6b 100644
--- a/dev-ruby/hoe/Manifest
+++ b/dev-ruby/hoe/Manifest
@@ -1,7 +1,9 @@
DIST hoe-3.21.0.gem 193024 BLAKE2B 2ff65edc6e0aebc93ebc8f3e628261ac3fabec4034b8e7b1bb3c38ab45c8b4641267a8c46c851ad69425c08782553c628574ae0a1417257cf64ba05a86de08f3 SHA512 39da93520bdb4efcbc58af58562ff8abbdecf45f92071ddb31f68ac799eb6f704431cea3d699aa039ba3a5217dc9b0f2d87f8b553d62860c34cb63803b625754
DIST hoe-3.23.1.gem 194048 BLAKE2B 907c2f2b62dd362f8c472f21d3fd998bd178de2a15fb9875ef36c61dcbf6b170253037d64f70b04b45a5f7e7dcf9e084122a85f694c6396767d541dccd5693f5 SHA512 c2199f93fe806a9639b319d01ae7bb6999ac203aa8bbabaf22b4c0c5b97f69dbd4e876bdfaaa0b0e8cda68dbd25dfa0e5aa91a599613237fc22de0e857c68c37
DIST hoe-3.24.0.gem 194560 BLAKE2B 6f4259fcad82078ea4d56ee7f42027cb9561fc603e1a36634de3f11a48ebedd252ee4ddf5884e571ee0231f5dec20c6a7249d0fb6784bf531a017b033955e680 SHA512 f2048d1f5d9b3010267f2ffb67cbce2aee7ecf58871dd762e51a08035272cdc6b37aacb63aa0af6f62e6dfeb01a60afd53a25b394ff10322a8348320268adb76
+DIST hoe-3.25.0.gem 194560 BLAKE2B d03ba870c720a59fda80b8716635256b01dd41f28a0f1d8ad7e06b810f3bccd2bfdd9a355584c5afdff375e7f56d7987a7ba174af0fe37da91fc05c42c32ffcb SHA512 d49b36a9757379b4c33644c886479ff910791cb830a2392512f52ddde883378dcf17fb9701eb17e18c870074cf5f12258bc8210aba0660dd5220b6ebfa6c9c4b
EBUILD hoe-3.21.0.ebuild 1473 BLAKE2B 4f5e446eea384bc7e4a7f97998dc62ff6f5fbd56f3b9cb938855d4015601a4202927e46b16c3961c55e85c4d2753fae6cbf452198b200eb2b0e994e7e58ba264 SHA512 c1c69b183dad00e7230a49a216dd537ca607104d5cda9994b72423545749ddcf6748e6b0e6a36f0e87313387fd0a4d238d8d1beb89a083180ce57bc619b0aad1
EBUILD hoe-3.23.1.ebuild 1534 BLAKE2B 4a4eb378cde8593f6cbd36d911425c3afe7f6c33c1bbd52875085c9b20d8169f0b74b1fd3127cdadcb32fd98f80a145eb0566fce8ce91f9e6df459e46088a40d SHA512 a20b626a0d151ef8353441844913555c1a390604acffc5f43d0069f522a22f928086542d0295ee7eb9e0fba8ee7e60df9a593c97d5ca8fb7eabd074284539207
EBUILD hoe-3.24.0.ebuild 1534 BLAKE2B 4a4eb378cde8593f6cbd36d911425c3afe7f6c33c1bbd52875085c9b20d8169f0b74b1fd3127cdadcb32fd98f80a145eb0566fce8ce91f9e6df459e46088a40d SHA512 a20b626a0d151ef8353441844913555c1a390604acffc5f43d0069f522a22f928086542d0295ee7eb9e0fba8ee7e60df9a593c97d5ca8fb7eabd074284539207
+EBUILD hoe-3.25.0.ebuild 1527 BLAKE2B 81c6cac40443be6038d9e2002a789b591a10fd9c80678aada970c58ad6f3ce46b614c69cad5a4c91ea0c8eb77312e3fbff61a8abafe80e1d49ad4008044c0c34 SHA512 bf5a3781a1cca51eed6139c12001b6954a1c58300ac961bbebfbc5f44b5a1903cd91fd397c96f05966c0cb62b417f1e6a8346bfd41cb133d18d73650e2645826
MISC metadata.xml 252 BLAKE2B 77e9556ac1d210367a95f4c47816618b685c707cf01d1543d988338e14794fb9ccfb9976ebd11f389db618616d91ee024d8e46dc3a1a356ba7a017a7796b44d1 SHA512 0a970a16d73747993198dd301a3127cef7e65a9f46816b40ca149669ba617826c1d81bac1e5ecf93d16079922964923d37301cd8160f22c823c1ec3b79ee56f1
diff --git a/dev-ruby/hoe/hoe-3.25.0.ebuild b/dev-ruby/hoe/hoe-3.25.0.ebuild
new file mode 100644
index 000000000000..8412695175a7
--- /dev/null
+++ b/dev-ruby/hoe/hoe-3.25.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby27 ruby30 ruby31"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="History.rdoc Manifest.txt README.rdoc"
+
+RUBY_FAKEGEM_EXTRAINSTALL="template"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Hoe extends rake to provide full project automation"
+HOMEPAGE="https://www.zenspider.com/projects/hoe.html"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc"
+
+ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.9:5 )"
+
+ruby_add_rdepend ">=dev-ruby/rake-0.8.7 <dev-ruby/rake-15.0"
+
+all_ruby_prepare() {
+ # Skip isolation
+ sed -i -e '/isolate/ s:^:#:' Rakefile || die
+
+ # Skip test depending on specifics of gem command name
+ sed -i -e '/test_nosudo/,/^ end/ s:^:#:' test/test_hoe.rb || die
+
+ # Avoid test with random sort order
+ sed -i -e '/test_possibly_better/askip "ordering issues"' test/test_hoe.rb || die
+
+ # Avoid test that depends on specifics of merged packages
+ sed -i -e '/test_make_rdoc_cmd/askip "dependent on merged packages"' test/test_hoe_publish.rb || die
+}
+
+all_ruby_compile() {
+ all_fakegem_compile
+
+ if use doc; then
+ rdoc --title "seattlerb's hoe-${PV} Documentation" -o doc --main README.txt lib History.txt Manifest.txt README.txt || die
+ rm -f doc/js/*.gz || die
+ fi
+}
+
+each_ruby_test() {
+ export -n A
+ each_fakegem_test
+}
diff --git a/dev-ruby/minitest/Manifest b/dev-ruby/minitest/Manifest
index 4d1480486162..ccf23a6e7831 100644
--- a/dev-ruby/minitest/Manifest
+++ b/dev-ruby/minitest/Manifest
@@ -2,8 +2,10 @@ DIST minitest-5.13.0.gem 83968 BLAKE2B 90f2bc20328a5522a51bcfee94d69e6fd03189190
DIST minitest-5.14.4.gem 86016 BLAKE2B 1f7b8c72b41e1f4e47852021dd99df411a427ac8bbe564a2b86edbb727a4976030176331442a3a44f734347cc42f80444f8d3937e561f0063ec6bb3132d4c402 SHA512 f967a11cfce82e167879905082859273b270e8d8e663a0c1c553964a345fb8564547627b8cf97418ac5bda544bb76c1385438ad74ec8e846666dc2952d55c9e9
DIST minitest-5.15.0.gem 87040 BLAKE2B 71e7a7952c25fd37067a449867d74a2f18a8a42d1fbd72f24d6db226c54a18e9a21958654d4176176804bedd09ef9d1d3be68f79e29312c3f85d0930d3d68d7b SHA512 5e97a7aa616966ffc60e10cdc0ba123a7e793f10283ec3b6bf36066177036788cb950ad566fbac49e613b93f08b9846534f463017cde966b4890c3a34a2286be
DIST minitest-5.16.2.gem 93184 BLAKE2B 005af875bf38e3744bf9de90ec6e964487908a817c19094dcee658963ab2c8882bb1cc4e0b19124b83af9f5da019a8d9e611ba21856f50deca8d9eb1757640cb SHA512 714dc201e9a8a45eefa080ee1a45fa66acb2de0cf624e7c6233e7e1745c35ef9e1a8d24236ecf33f440c05c03f09e017c6ff1e077473b22e3abe5d1ff3126989
+DIST minitest-5.16.3.gem 93184 BLAKE2B ce3b9f2177a56ab8ff0b61ec4266b67ecfe6e387c57c96eec20db0d7627ac9b73ebebfe148249a1c1c1c9631a63aad8a712b4892a6741a186300afdcd8135a01 SHA512 1463b12842a914df663d0d796bafd418ead038d32c935f3970062492f248f3f4fcf3a5c2f45e2fb71ac13e3b94fca1e6497e7cd7fe9e7050587b7efe2b275453
EBUILD minitest-5.13.0.ebuild 720 BLAKE2B c0dfaa029354a66dde23b3cb3fb1655e88cbd2d1fd8bf97bda8573e003aef8980e95ca1b38da252687c465dcc8309d62f5ac5ca7a5656971a559c9208dfa8ef8 SHA512 09c38e025fe40616270f14f05a7716b3a1c703d2d504dc3ff612f38403874f54e927835fb769b8c80c01c27c03f2f4ca7e6bf72f72feffbd585cdd6009ea257f
EBUILD minitest-5.14.4.ebuild 727 BLAKE2B ff25599b81e0eb8eaa5a619b6cbd8625e40e8f4494c3efc430777d0141dc0fa01ef782c869f9a60eb1dc084ad45963c5977ea984020e5becf0337474ff714de6 SHA512 d977f76e101e9c8c0a8faeb759b11b9edb9621108ad9cc6a6fd0717199082516b9649809f23b4c90a66f7df832c6a3f557bf73a96e423119e1c7979a293cc8fb
EBUILD minitest-5.15.0.ebuild 761 BLAKE2B 3b8b86a9826aaa1a2439ff70a0762175321236d94201699fda644878bd4186b149d929762010938233aec8f35d75ccba0948a0ae563bbdfb8d88f6be8cf0d971 SHA512 3e7c7244504052f7235801ff5b8be1843385bc536656d9d4756c3888d0d5a6883f944295942d9c61a7ca6bc562583c8419b689f05bb62278f4928c0939963039
EBUILD minitest-5.16.2.ebuild 774 BLAKE2B f89999b511cf70efe1d9629d0dae15a71d2444a6d102821aad142ff148d50ace0eb1fa9418ef26ee123f39aaf869ab1f781182f3438a4306939f78279a51c973 SHA512 dc971935e750e17880ac8b0edbded90db194904be0fcf0f65592ad20a04c6623488c6c2cbfd6c22c27f8821b8f57bf08896f87b672f0b12c7ad54078ae9fdde3
+EBUILD minitest-5.16.3.ebuild 767 BLAKE2B 02458d86b369d8cbeba283d96bfd67d7bc5be3d60c8d028b1f2a9a8dd85a171c3e1dd3ebeac18d5743878f054064b8198fa634d1779104ea45f286d2204a294c SHA512 0525afcfbaffde72231895306ffbcd81dd7dbc4565a2b35eb28256a5bb652675acf8e6e44bb6cc87b6818ee5878ffbfac3fcf511fcdbccae5c12b6bbbd622a34
MISC metadata.xml 345 BLAKE2B aa5fc9309fc2803a64737c45818f713867ae504409b879c1481125131fb661a1c71f99d3facb5c7253561b62c32ea4d27c9344bfa0c6ad66a15eb1daea81ff42 SHA512 df9736bf7588243c9d1ff886c8b428237cf96f239fccbfe6561d60b910a07f70750db6576d3aa4597746d18fcce8a708f1aa9be4f9f2796823d1a4e154c6fb4a
diff --git a/dev-ruby/minitest/minitest-5.16.3.ebuild b/dev-ruby/minitest/minitest-5.16.3.ebuild
new file mode 100644
index 000000000000..49e898624368
--- /dev/null
+++ b/dev-ruby/minitest/minitest-5.16.3.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby27 ruby30 ruby31"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="minitest/unit is a small and fast replacement for ruby's huge and slow test/unit"
+HOMEPAGE="https://github.com/seattlerb/minitest"
+
+LICENSE="MIT"
+SLOT="5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc test"
+
+each_ruby_test() {
+ export -n A
+ MT_NO_PLUGINS=true ${RUBY} -Ilib:test:. -e "Dir['**/test_*.rb'].each{|f| require f}" || die "Tests failed"
+}
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index ccab86e9ef7a..ae2253e9e690 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
Binary files differ
diff --git a/dev-util/gitlab-runner/Manifest b/dev-util/gitlab-runner/Manifest
index 59efd914549c..a2583e57d146 100644
--- a/dev-util/gitlab-runner/Manifest
+++ b/dev-util/gitlab-runner/Manifest
@@ -15,10 +15,13 @@ DIST gitlab-runner-15.2.0-deps.tar.xz 141451528 BLAKE2B a77b8ca5c1570fc80f2d9f2b
DIST gitlab-runner-15.2.0.tar.gz 1291980 BLAKE2B 06194f6dfba94a1d071b3f29f3065475b8a9c08669ee0ec43917340a54dcdf79843f43b3f7fbe2e57560184c58166d7c107ed465742cfff05163faaca7ef491f SHA512 74f6a8941909c189bbde534d1cf5e1b8a60f595fa6046ca98dd4fb3a9f7406f988dfb9b2c2a6c777813fb24e4f5c23975f74163f7d5584b553acc4ca28ec8331
DIST gitlab-runner-15.2.1-deps.tar.xz 141242072 BLAKE2B 598850f3614772cad485a994ed156074c5f3aeb9b2bbf085fc9f77ded820d1facc6fafdc8b8fa9d763156cc15a454821113bfd47f2d943f2fb28723bc10a8cb7 SHA512 ac3f2b0272f9a6135c953b55e36623117c5e09c70ce88c2989fca4689eba699d12bffe6d5331876f942cfc69ae704b13f73f01ca9a681d02c113e2638420aad5
DIST gitlab-runner-15.2.1.tar.gz 1291638 BLAKE2B 7f2c7100ab5a7e670f8d50ea9dccd5f96b23b4e7ba60f928d732edc3a5f50b10afcfe9ffb052c4242ee401a21a0ddfad14e398a6a133ac093f3bbab84b620b0e SHA512 ed165fd95094dd00450bd2ffbbe876235849fdd98ff0ffc6ce635a103f426d4380573ef8c71f5a40d115fa6fe7ec9416b1c7b780f1563e8b3d4c4a09c02519f7
+DIST gitlab-runner-15.3.0-deps.tar.xz 141251000 BLAKE2B e72c597a10e78f234f7879ff77ecbd787f8a056116f70ed683b82af47bbc701157e23b1e72e9707598796b30e2a747813049984091058c97098436806b18ed66 SHA512 1956885e185854db3f4d6a40aaebd6c6010879d2baf6f910e5fae3f1ed2ba71c4896761a30a8b29c625af2770cb57e5a0a84dc85441096e9d66ed644cab76765
+DIST gitlab-runner-15.3.0.tar.gz 1306073 BLAKE2B cc7f1902e7cfc7577e936b411ae7f582c25757ed5d59cc5d61bb8f9c027ce292c7aac46788a44be78686f1705d5722373a9f5f2b295fd1eab2666e749fc50e06 SHA512 8eabe9a4fd04e46d4bf306dc202664e29f5cb12cba5d73820888957d694711702e026f79a84e1d5f5237cb3d1e7efed8e035129814dcc6354e708ee98e98cbe9
EBUILD gitlab-runner-14.10.1-r1.ebuild 1784 BLAKE2B b636c54c786ebfa4055dcc159c4350ca9cc9de020be99a6b795b56f9f696a611558284b14aa920be4e3fa48d3c7250b815608c4e4d5836b7df4b6e37f94f5a34 SHA512 71a244482be2d8f8d21d874db99a4b38ef9135876eae259a1debd58245fbf0c49afbd087587d686855ec98b7317e4cbbc4ba7ced1375b5949f35ebcfddd2a51b
EBUILD gitlab-runner-15.0.0-r1.ebuild 1784 BLAKE2B dfd874f9aa65ad955c8091f002e71a4357dc5a262018e53e38726d07e4149400abdf6f4ccdd24bfe04a67a1641e77249f678e7ab28ecca5b365cf9f461ea8a2d SHA512 d9c482c77a7b29028400a30259baafd309cf08586e6044061afbc150eb01747dece3a36eab08f714c96751a5d76bed5ec90416b982afe90247ff123278e07b4f
EBUILD gitlab-runner-15.1.0.ebuild 1784 BLAKE2B 6133e7a415764be2d232faf807521c8b12cbc5689e3f1983d3c56f9c0c942c096e28862227d2b775bf96d9e4dfa9e079d5877917124aa1be586cfb3ad29cc08b SHA512 d2d2234d103770ba859d9daf1b63f483584c6fdd6340ad76a997a7b23bcfdbcce2c8cdc2895ca6781bc44c50aed2fc0828dc794d87b391397e804341c3e88aae
EBUILD gitlab-runner-15.1.1.ebuild 1784 BLAKE2B c17c2a1c0f0e1be690b8a431fb7390b924c5867f8f4943a308975bef90f0b9a393062ab4229c39af026e34271d4792c015ec4ae201a4298b0de3e3c844e688e5 SHA512 f9150a22106f18eccff02ccb5681cb08364c93f6dd3988c7ac9a546711a29728db7cdc2cf611a0763cceaa72078adc12bfd42ddeaf383aa9869562f9874afafd
EBUILD gitlab-runner-15.2.0.ebuild 1784 BLAKE2B d91ad1c66bceda48667acdf56f3e43074d330cc0b1477d88408c6b1313205d220991bbff1c53162ca17d36cee58d51af701d4e53dd88bcd16ce8e909d7210f99 SHA512 eb26a787d3cd9cb72eae7279f109dd1c0ee683369a4c9eea2f273bc05d203f2a91e509bbfb1a60bdc9348a9dd5ff33d72266701b33ce880b1986a036d78e847e
EBUILD gitlab-runner-15.2.1.ebuild 1785 BLAKE2B 7a81c3581d9493c95b5de44cd2de104774453a979388279fff756071d05470baad90211295c612a7b2713d64979a156e09d38e639be206af7f6e841a2dde5b09 SHA512 2838a97c26110d148c7b9303b310d4b803a5602cb14024c7284292f5b5c8760a8796598434c67ee8f51dee8add672e396441319a6ddfc587061def8061bf2414
+EBUILD gitlab-runner-15.3.0.ebuild 1785 BLAKE2B ace2f1fe776d2ba486c30df14899d5e6c903e987cc0088f2328d8f76df9899ad7acec84cde1a5ab4e0650d13b39f4261ce8324c471bad8c79d4895c1bba0307f SHA512 d8577ace52384fb219a54ffd82ea62de35b0b24b0de30706b7535004ce6abb124748ee053c74ff4cf92e70f4577679baca966b46a0350469f412c68d147fce66
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/dev-util/gitlab-runner/gitlab-runner-15.3.0.ebuild b/dev-util/gitlab-runner/gitlab-runner-15.3.0.ebuild
new file mode 100644
index 000000000000..c58f8910bca6
--- /dev/null
+++ b/dev-util/gitlab-runner/gitlab-runner-15.3.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module systemd tmpfiles
+
+# make sure this gets updated for every bump
+GIT_COMMIT=bbcb5aba7
+
+DESCRIPTION="The official GitLab Runner, written in Go"
+HOMEPAGE="https://gitlab.com/gitlab-org/gitlab-runner"
+SRC_URI="https://gitlab.com/gitlab-org/gitlab-runner/-/archive/v${PV}/${PN}-v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+COMMON_DEPEND="acct-group/gitlab-runner
+ acct-user/gitlab-runner"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+BDEPEND="dev-go/gox"
+
+DOCS=( docs CHANGELOG.md README.md config.toml.example )
+
+PATCHES=(
+ # https://gitlab.com/gitlab-org/gitlab-runner/-/merge_requests/3498
+ "${FILESDIR}"/build-for-arm64.patch
+ )
+
+S="${WORKDIR}/${PN}-v${PV}"
+
+src_compile() {
+ emake \
+ BUILT="$(date -u '+%Y-%m-%dT%H:%M:%S%:z')" \
+ GOX="${EPREFIX}/usr/bin/gox" \
+ REVISION=${GIT_COMMIT} \
+ VERSION=${PV} \
+ runner-bin-host
+}
+
+src_test() {
+ CI=0 ego test
+}
+
+src_install() {
+ dobin out/binaries/gitlab-runner
+ einstalldocs
+
+ newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+ newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+ systemd_dounit "${FILESDIR}/${PN}.service"
+ newtmpfiles "${FILESDIR}"/${PN}.tmpfile ${PN}.conf
+ keepdir /{etc,var/log}/${PN}
+ fowners gitlab-runner:gitlab-runner /{etc,var/log}/${PN}
+ fperms 0700 /{etc,var/log}/gitlab-runner
+}
+
+pkg_postinst() {
+ tmpfiles_process gitlab-runner.conf
+ [[ -f ${EROOT}/etc/gitlab-runner/config.toml ]] && return
+ elog
+ elog "To use the runner, you need to register it with this command:"
+ elog "# gitlab-runner register"
+ elog "This will also create the configuration file in /etc/gitlab-runner/config.toml"
+}
diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz
index 284ad8dc9f7d..1be1358ceea2 100644
--- a/media-fonts/Manifest.gz
+++ b/media-fonts/Manifest.gz
Binary files differ
diff --git a/media-fonts/terminus-font/Manifest b/media-fonts/terminus-font/Manifest
index 277da831baec..4ca57977531d 100644
--- a/media-fonts/terminus-font/Manifest
+++ b/media-fonts/terminus-font/Manifest
@@ -1,3 +1,3 @@
DIST terminus-font-4.49.1.tar.gz 648345 BLAKE2B 8c2edff7e57572361cf9a4907a165f8af69cbd5a3ae15817d02d43ab5134278ab64b269e6bd8c79d2107e5c8c51b58f07ab45c308891464cbc8e3e15767efadb SHA512 2e3a99960c459a453b5879bebbebeb653f0a22060177bf75c67bbeb7d32cfe1acce9e74a88fdc42e299b6dc402e0708552487abd26e80e985c7d6059b0d445a8
-EBUILD terminus-font-4.49.1.ebuild 2791 BLAKE2B d2631c1ee21b8bb4349745b834f2c24ef9dd3a95e223ced461d202ec34d5fdb3b4eb72b9a3766ebffaea74a9593dc7a8ac69d1184e513edfa3360d0648ac0dd3 SHA512 ab615cf1e7819d9ee6218ab1d5847357059fb01ac153c82c8f91fe3a6be66869e8c76fb69c6de48ee135814f16596a0b7c967933f6300e4e0dc9faa1c12790fd
+EBUILD terminus-font-4.49.1.ebuild 2791 BLAKE2B 4a5687cfd8b2d9ce691ef70f8d55e5f98413458a5dba3d98dca10d1dceaad9958ded09c381df3413fc658f94f4c2f67e462c91b5e7a90a126cecbdd3bf216da7 SHA512 482a3b387089818ef5fdc080b7540859437abf16b1ceac4a5139e4a51b53cde24ed3acca4820d35587e83759e122d52499b915fd6bf4a28d36c1cc1ebecb4076
MISC metadata.xml 1945 BLAKE2B 8008e4a45a776a1e2aa9e13c8dd7374e300b323f547ece9908604a48d0f80d7942db54e4c34f144b5637865dbeffde7aa20df4451fbfee895ba7a6786f603c48 SHA512 a856c5d4e19a102c3172b96f6df89f2d2ea5eb8c042433fe65fda9654956781a7c7fb6c6b1d8ba4c139b0639301da746a2fc97cd3eaf44677f23f1ed51ae8700
diff --git a/media-fonts/terminus-font/terminus-font-4.49.1.ebuild b/media-fonts/terminus-font/terminus-font-4.49.1.ebuild
index c658888d88e9..48483a49ca14 100644
--- a/media-fonts/terminus-font/terminus-font-4.49.1.ebuild
+++ b/media-fonts/terminus-font/terminus-font-4.49.1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
inherit font python-any-r1
DESCRIPTION="A clean fixed font for the console and X11"
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 53c2f1280b8d..3a8e96e0eae8 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
Binary files differ
diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index c71e6d6c736c..d8bdae4c557a 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -11,5 +11,5 @@ DIST netpbm-10.86.33.tar.xz 3696704 BLAKE2B 57657d69e235ee9babefce6e44e7ac35ac9b
EBUILD netpbm-10.86.24-r1.ebuild 5853 BLAKE2B 8ab739e81bee65f04f0f3468468c8193136781326bfff3efaadcb335d529fef3761d61e43ac8e7815700080568e097e0f61529d80363f2c404d77d6bd31c0920 SHA512 365e21e054dac809d2590d60700d8425e611fcaae2e73d07b084a7254b2f05911514fbbbbaadeb0ee05ac7a3fc2e7a7f2b845b62fb1fd569b0d7b435e4ba34ea
EBUILD netpbm-10.86.27.ebuild 5980 BLAKE2B 4d7ce3a06f36b2b2f9ae01609c9cb260047911f59eb0ddcdb01696c9f5d689850df3206472724c916001e5b26e50666d336e417a52be069c852c4781e98b4e87 SHA512 1638dd2207a544f7ccc1ad54473f0ca19ca057a1f88f14183c875fd52414e16244f49d7ecd4d8a89f4e88c0148576992181ae4a9ee7c4b36b56538f1de4798c8
EBUILD netpbm-10.86.30.ebuild 6026 BLAKE2B 7233840edd237c92f5466d6c8f2b23e03f171cf922a64d944e434ed165327da0c0bc4b2263ffcc32541212ef0260275ef755a8ada8d2d5b4695e5f243880e982 SHA512 821581a46527b938fcc59a45c534baed81ad0ad673980ea7cce5ee2e79ae760621f17e398271763da8ca0c1fefc0f71df8805cd5d2ce258e9f7ab808725bb85d
-EBUILD netpbm-10.86.33.ebuild 6056 BLAKE2B d9f4109dd96128f1de18010ebb080e5dca5e3a85066b94d5af645ce2ccd7b81dc9133d7d5498ecaba84c08025ce9f5110473feff8747daf681aa82097a040e05 SHA512 9a286556e902e75dd88534f6c4740fc6807cc36b8307172daa501bd088701cd06b977a4a85f0bfa7d17e067e4c29e3a0dc71252041edc4100aefa52bdcd55596
+EBUILD netpbm-10.86.33.ebuild 6054 BLAKE2B 10ded746c20490eda12fc44d6b463cb1501a3e484f077351a9a345f15395f26b72ada204d20a8662fabbcdb9e00cef11387d8a1443aa5d55ba8282ba8c7021d8 SHA512 1f8f2e7d8a1795b3aa5178c941288cd189673987614110dcc46328f4e660a2951d53e0ca3b5980f301bf4b3717b4930760f26986e51d4e867ae63b18d38a4605
MISC metadata.xml 578 BLAKE2B 44f5899feee3b35c43e1b21f631fc53acc615003a5ed21c3461b5946882f1b67b9de9ac0b3d5d24f9faf291bbc9d3410841ccbba15f4981fb5ec050195bf93d7 SHA512 a9ef7432d1404a5dfc2458761867fbdcb9be368f20ea3290bb0a2aac10a82c968d3d97c4dbbf65f4840f0a60e9266d63c577e33c27d3b8b45b70349cb211478d
diff --git a/media-libs/netpbm/netpbm-10.86.33.ebuild b/media-libs/netpbm/netpbm-10.86.33.ebuild
index 6bcdb4345f40..054eb2d55f3f 100644
--- a/media-libs/netpbm/netpbm-10.86.33.ebuild
+++ b/media-libs/netpbm/netpbm-10.86.33.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ceamac/netpbm-make-dist/releases/download/v${PV}/${P
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="jbig jpeg png postscript rle cpu_flags_x86_sse2 static-libs svga tiff X xml"
BDEPEND="
diff --git a/media-libs/openal/Manifest b/media-libs/openal/Manifest
index aaafd67e07d2..e0d3b2197274 100644
--- a/media-libs/openal/Manifest
+++ b/media-libs/openal/Manifest
@@ -1,3 +1,4 @@
DIST openal-soft-1.22.2.tar.bz2 606151 BLAKE2B 78cb5ad38635908a59850aeb511223fd6a28f7699294836cbbfdd09cbfd9016250d68b26115131a7cb4af5d5d0a4d2cbd52813d813f78a045b797c5fb601bc7a SHA512 2271968955d55746caf514b6d4304d09d5e552d5640552e2503186ef36bc872a836804ebf79ffbda663931bd13d4e2ce53e0c46cc4faf4134bdb3c08983a5e47
+EBUILD openal-1.22.2-r1.ebuild 2886 BLAKE2B 99c3676c9813778a3585e487ae38977c9e6893f84d596a3f1941ac7a5d54696fb0b0a0f60ebae91cab7de05ed5bcc0069c8d2fc6b55dd88ac960c0bb1a20df0b SHA512 72d6a484c189180ab76e8702f620048e68ae6ca90daa386be3f92021ba2d6d91903f2387210b5f2b8da029bbdbcebf48bc1b73d71a298fcf6ac0e4954c001cb0
EBUILD openal-1.22.2.ebuild 2473 BLAKE2B 317e5e42519896c839d2430a9a233627b6d7f124b197314c797c9df3df7b54ee8f85abcfaba97a15a4407f4c3ec69a9fead8874ebd9add0b0915e68eed9de358 SHA512 868514e77c80fe8917ee56298915443bc5a6869d02409f8d17a080b94078e704791016d4d9e564b1191a30d17c031695fe6e712a64a7b6526ad3419f6c04220f
-MISC metadata.xml 438 BLAKE2B 27d299451c7845881fb3167a7147ddd0efa55af8bcc1e7b69cebbb8b27d9f66282962e0ebc7392fe48c1dec5ec287203a0407fd3ae4aa272cd4c112d446af1c7 SHA512 4733496e5f7aeb692f6218cc7a9ed3b44636746c44a7b8e9e86ac0395c0586c761fa877e49976abd6ae5cceae94265e1d0a7c3b25cb892c73268bfd1a76b82ba
+MISC metadata.xml 538 BLAKE2B 4b9dc398e2edd4930ade6cffbe1e39776bc3a0a1aa5ea2fa4753d8756517f7d2efc3e22ce31eef1f79dee9dc1d1f5c4ca945f1d5b54a7ffac081173f8bb6ffc1 SHA512 9e817af11955ef748ea11979a1da99c046ca4f45f812f1555f9dcd0606ca16e8d027de9588d792170faf81a42a091cc8d5edffff1d12d99128f08f688f685462
diff --git a/media-libs/openal/metadata.xml b/media-libs/openal/metadata.xml
index 58a531d35b6a..82ef9b96fe93 100644
--- a/media-libs/openal/metadata.xml
+++ b/media-libs/openal/metadata.xml
@@ -6,6 +6,7 @@
<name>Gentoo Sound project</name>
</maintainer>
<use>
+ <flag name="pipewire">Enable support for the <pkg>media-video/pipewire</pkg> audio backend</flag>
<flag name="sndio">Enable support for the <pkg>media-sound/sndio</pkg> backend</flag>
</use>
<upstream>
diff --git a/media-libs/openal/openal-1.22.2-r1.ebuild b/media-libs/openal/openal-1.22.2-r1.ebuild
new file mode 100644
index 000000000000..68c7bc35d077
--- /dev/null
+++ b/media-libs/openal/openal-1.22.2-r1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# False positives because of REQUIRE vs BACKEND options() (conditionally set)
+# See bug #809314
+CMAKE_WARN_UNUSED_CLI=no
+inherit cmake-multilib
+
+MY_P="${PN}-soft-${PV}"
+
+DESCRIPTION="A software implementation of the OpenAL 3D audio API"
+HOMEPAGE="https://www.openal-soft.org/"
+SRC_URI="https://www.openal-soft.org/openal-releases/${MY_P}.tar.bz2"
+S="${WORKDIR}"/${MY_P}
+
+# See https://github.com/kcat/openal-soft/blob/e0097c18b82d5da37248c4823fde48b6e0002cdd/BSD-3Clause
+# Some components are under BSD
+LICENSE="LGPL-2+ BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="
+ alsa coreaudio debug jack oss pipewire portaudio pulseaudio sdl sndio qt5
+ cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1
+ cpu_flags_arm_neon
+"
+
+# PipeWire:
+# - See bug #863200 for PipeWire minimum version
+# - PW is in DEPEND although not linked against because we need configure to
+# find it anyway, but no :=.
+RDEPEND="
+ alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+ jack? ( virtual/jack[${MULTILIB_USEDEP}] )
+ pipewire? ( >=media-video/pipewire-0.3.50[${MULTILIB_USEDEP}] )
+ portaudio? ( media-libs/portaudio[${MULTILIB_USEDEP}] )
+ pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ )
+ sdl? ( media-libs/libsdl2[${MULTILIB_USEDEP}] )
+ sndio? ( media-sound/sndio:=[${MULTILIB_USEDEP}] )
+"
+DEPEND="
+ ${RDEPEND}
+ oss? ( virtual/os-headers )
+"
+
+DOCS=( alsoftrc.sample docs/env-vars.txt docs/hrtf.txt ChangeLog README.md )
+
+multilib_src_configure() {
+ local mycmakeargs=(
+ # See bug #809314 for getting both options for backends
+ -DALSOFT_{BACKEND,REQUIRE}_ALSA=$(usex alsa)
+ -DALSOFT_{BACKEND,REQUIRE}_COREAUDIO=$(usex coreaudio)
+ -DALSOFT_{BACKEND,REQUIRE}_JACK=$(usex jack)
+ -DALSOFT_{BACKEND,REQUIRE}_OSS=$(usex oss)
+ -DALSOFT_{BACKEND,REQUIRE}_PIPEWIRE=$(usex pipewire)
+ -DALSOFT_{BACKEND,REQUIRE}_PORTAUDIO=$(usex portaudio)
+ -DALSOFT_{BACKEND,REQUIRE}_PULSEAUDIO=$(usex pulseaudio)
+ -DALSOFT_{BACKEND,REQUIRE}_SDL2=$(usex sdl)
+ -DALSOFT_{BACKEND,REQUIRE}_SNDIO=$(usex sndio)
+
+ -DALSOFT_UTILS=$(multilib_is_native_abi && echo "ON" || echo "OFF")
+ -DALSOFT_NO_CONFIG_UTIL=$(usex qt5 "$(multilib_is_native_abi && echo "OFF" || echo "ON")" ON)
+ # EXAMPLES=OFF to avoid FFmpeg dependency, bug #481670
+ -DALSOFT_EXAMPLES=OFF
+ )
+
+ # Avoid unused variable warnings, bug #738240
+ if use amd64 || use x86 ; then
+ mycmakeargs+=(
+ -DALSOFT_CPUEXT_SSE=$(usex cpu_flags_x86_sse)
+ -DALSOFT_CPUEXT_SSE2=$(usex cpu_flags_x86_sse2)
+ -DALSOFT_CPUEXT_SSE4_1=$(usex cpu_flags_x86_sse4_1)
+ )
+ elif use arm || use arm64 ; then
+ mycmakeargs+=(
+ -DALSOFT_CPUEXT_NEON=$(usex cpu_flags_arm_neon)
+ )
+ fi
+
+ cmake_src_configure
+}
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 7b26a6c01a78..f9d2713ee1bc 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
Binary files differ
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 7d7b170d4bcc..a2cee44daadf 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -1,6 +1,8 @@
AUX amf-env-vulkan-override 60 BLAKE2B 409985e6b5ef0e148076c16d8132db2b79ea53e0a922719a37d66fca9920c5fb94d23c22baef39f91e5d5157a7f58bba3e036355b1dbfb5a70153e0cb9764680 SHA512 7711a02b674638f71383a00b867f22fbd2e4d71ed397376fdfe2cb15655ec0a97eb0d613a339a04268726aae3c34efd29d51a3e8f7f90bf3d8634825c0ef3cc7
AUX chromium-r1.patch 1582 BLAKE2B 48547a7d53fd1f0f44b682c7e2306e79f007f8e96b36253f76775c4a3ced54ffaaf403dfaae94e81aa26c60887677b2dabdd2c5cef9fc4553e203f8259453910 SHA512 808daad5afed13a6d3926c9f9ab5cb58f80e16969533022c7ee959147908bb2c12d066d2125a6b6975ef9304d9b8d49c39aeb0a047009adabb4529e3cf54498f
+AUX ffmpeg-4.4.2-libsdl2-new-version-scheme.patch 1061 BLAKE2B bd2efcc869ad19acbf312568bda705c83999e31ac365a7fbdedc281186d2ec567afb1f0af021e750e5cd76e6715de7006b642a24a936115760da10371a3db982 SHA512 9a005a86b817fdccd0f05704348a8446c3a9b269bdd8ad0243f07a8d0bf9dc0f388a134065e0695073b1df2867a3c8e5e725917ce331bf1ee03c20d8187d1dbe
AUX ffmpeg-5.0-backport-ranlib-build-fix.patch 2224 BLAKE2B 1af6c5eee3f2c69c0630a73ec3885b9302cb045a03623ff138939348d6ba7e7deef1bb07c33c5bef5834040c4f6abcd7d22af8b0b849b28efde3d5753b776108 SHA512 e82cd400488ba86e5d039f088e3798b5a66245a8753d275d608284081f4b260fb7a4d8d1310f43acdf81258cc507943c8f07e431c497411744a62ba98c88c5bb
+AUX ffmpeg-5.0.1-libsdl2-new-version-scheme.patch 1061 BLAKE2B 262d6baf3592044d5cc520cc25e213f41d1d6c02c8848178ec1001ef4d8893ca6f3630fe74b8a5171e46b8607687a899e9970a97915e5e903cb78d34afc6ece0 SHA512 00dae0ebf2fcc0e99fde2d0126cb32262831402e1119e93d0b091fd32431fb36c6ac8b122ba4bf5d8a917e9aa965c9c5624b88aef598c11f9e20ad27731b9d50
AUX vmaf-models-default-path.patch 1126 BLAKE2B 71f83765dc89b85e929af393f9d1415d119e71a91aaf45e8a32fd4fff270a129ca797c3b383a6074bea32fb582816660022a59d33bb6f557514df038baaf0271 SHA512 4d21f4b1622d8e47d2821ecac6b893847ada74d75db7d8aaac70efc7e6e7a6607c011b6fb2d015cb0c5e05f6a56e4feed43eca7d35b0f686a68261e6d9981b6a
DIST ffmpeg-4.2.2-ppc64-altivec.patch.gz 7171 BLAKE2B 6676dadb22d2ab4b0f5c19b418448c5b9b54fd8c803c3f0ab517c6fa7990be08098dd6f6a2b1b3e77a1bed31a069c702366aba79ef9141ff9e23cd8c1b6e2885 SHA512 6653975017de3f7bde420860419fbdddb50ae41dbb811b819f4b5b13807bf885a4c01736f05a684515f97b0d63bd8896d5951a3276af90cc74abfe32dc2e2407
DIST ffmpeg-4.2.2-ppc64-gcc.patch.gz 750 BLAKE2B 3a9cc7f0135e077c77179a7ca3da917bca3995d99d53b58221b23181a075f330132f83ea90a6110e89f90c7c3b5b2a7837559c5df414d9bd52dbb3ec166b1545 SHA512 701b0635e0819484a31de2062ba52d95ee03883ab56547cd75c3646a9b32bf3ecc7f719690b93f29202cfed0fdeecd26b51b9f3c66e72a999a3e8d9e97389275
@@ -10,7 +12,7 @@ DIST ffmpeg-4.4.2.tar.xz.asc 520 BLAKE2B 1ff4a886c7703a05a19499ae5b2b6207df24e05
DIST ffmpeg-5.0.1.tar.xz 9812524 BLAKE2B 0a37d425780f7e15836848048214411829bceb0de12bb7089803feb3dda07a077be9c8e8174b72792558ed86d92224bee9d4db20cc74690ea54312fbf2f10e83 SHA512 e5810c7379748a6bbe1a903bf36b4372b67cb3973179727b6af6f0118eef46f4c990155961cc37255e08a5bafdc4b4683503ad410ebb7afe7a35b891c01fa602
DIST ffmpeg-5.0.1.tar.xz.asc 520 BLAKE2B 686a8c372d26bd0158a0e79f6cbe8d9c46127bd200df7f4f6e2a4285bfd412cfa9aff865eca125a27a7204f32ba0cca86bcbf769ee4874e5202cc700b0eb4449 SHA512 9c4bd404196c3a3808bae92873aefc77f8c26a9419cc6130a3f2359a75c8e83189d206e9aee8ff85c5a7fe4a98da24e11cf607ec351386c18979ec2d5ad3b3ad
EBUILD ffmpeg-4.2.4-r2.ebuild 17868 BLAKE2B e78ee4ec8c2b6ed7132f4a7b61d71df2c8a8af22f6b1206dea5d6a8f988922293827b5f3fd56dfc039933af849db58f7eeedb9531ba5c7a16a03806ec7e78e68 SHA512 f8eb67f028d2d062a11550e8e55446e6956bb88e9c5c50f0ee4fb2941b797777e4f6ba304fcabc99854456d439619e4f1d3cf0c74214214ae2d388279fb2d557
-EBUILD ffmpeg-4.4.2.ebuild 19655 BLAKE2B e2a0735622b1b66f245b462cf11aa3226a53bb434bb107a1bb830004a62eac06149d15c9a36671713868f41df8da3c736fc556932e4e829d36c0df25cb703c36 SHA512 321c5f6f46c3b4c17918ed843c6572fd1073a0562f745d3f95a27d44aa6a8c362293428ce3146b62fee1bec05548062946cf43f83d9e3076b2a025eb6be5f6f5
-EBUILD ffmpeg-5.0.1.ebuild 19751 BLAKE2B 5930fdf191779e4fdf4cf7b4f6f2ab2ecc110528b8aa3d193a68ce5ff9fd533ecaaecd858d17c8b038ecd9cbe449332361ca9191c84ec94df385dc9dab55d502 SHA512 d426c0578c3b81f71d3081d2ead9adc316a5365b8c0316b33d5e6daf991c4ca056dc0ee948a8ed102a43c13c093f1a40625133fd2c87d288e2945d139f741eb1
+EBUILD ffmpeg-4.4.2.ebuild 19707 BLAKE2B 7839be0b631ec26d346c7e6e63ff00a1d6dc799d20b832c5dd15b470c3b0318f9ac946389cefc8ef979df77b4ca769626fca0b1f6f4975b6a0c671196e825646 SHA512 a64861e453d9c5f3abb25720379ace501690fdbd26f7afb67ca89c76932c33c8d262578bede661def6ad01ab9b972057e2eaaa2e3e59d485177e141b09a577aa
+EBUILD ffmpeg-5.0.1.ebuild 19810 BLAKE2B 0ef2a72bc9c6fb5f9dafe7500751081912134aa06e2e7a6dfd712d1565733afc16849d31ae2157fdde9c7ea3422c0c348edaa8c95594e8d6064f0fc77de97f03 SHA512 df943b8b532d2441c9a6101430b883d0d2b5318cec967bc962d70ac08f26ea2a027ced6b969e32f8be007a2729e46e29ba1dd0fa5bf6721250eaa71523f72751
EBUILD ffmpeg-9999.ebuild 19628 BLAKE2B a9b3807ee2245067cd697121caea4adc76ba0f7a18e0563c126d51a2ee373788f38f52a64942ea4321ca97c052d964780320ca37a78e7f70e13f51e17a6419e4 SHA512 4c5ccacacef26ff55e23312b4929f35c58a63418b272d267775e7ebc5c4852428ddb3f191c321555f927ca22a7de127d6e400e7219d52fac25ba985b0ccfb348
MISC metadata.xml 6416 BLAKE2B 050774bf3950f0931b51028e47470178287ea9ea858cbbd8f71b48bba0e138abb1282e5250ba887d3deeefbbc3c9663ce324f5a2e2ea310502ca3a818f313d87 SHA512 2c7a782d48c01bba23f42a500b5c66f8eb56fef910d316740606b6db32d91660b38497438278f27c66de392ca513200b1b90b91a6b848d239ee4723d0f2a31e8
diff --git a/media-video/ffmpeg/ffmpeg-4.4.2.ebuild b/media-video/ffmpeg/ffmpeg-4.4.2.ebuild
index 161cb301720b..49985fd883f3 100644
--- a/media-video/ffmpeg/ffmpeg-4.4.2.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.4.2.ebuild
@@ -332,7 +332,8 @@ S=${WORKDIR}/${P/_/-}
PATCHES=(
"${FILESDIR}"/chromium-r1.patch
- "${FILESDIR}"/ffmpeg-5.0-backport-ranlib-build-fix.patch
+ "${FILESDIR}"/${PN}-5.0-backport-ranlib-build-fix.patch
+ "${FILESDIR}"/${P}-libsdl2-new-version-scheme.patch
)
MULTILIB_WRAPPED_HEADERS=(
diff --git a/media-video/ffmpeg/ffmpeg-5.0.1.ebuild b/media-video/ffmpeg/ffmpeg-5.0.1.ebuild
index 17f3f4c919f0..565f105878be 100644
--- a/media-video/ffmpeg/ffmpeg-5.0.1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-5.0.1.ebuild
@@ -64,7 +64,7 @@ LICENSE="
samba? ( GPL-3 )
"
if [ "${PV#9999}" = "${PV}" ] ; then
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
fi
# Options to use as use_enable in the foo[:bar] form.
@@ -332,7 +332,8 @@ S=${WORKDIR}/${P/_/-}
PATCHES=(
"${FILESDIR}"/chromium-r1.patch
- "${FILESDIR}"/ffmpeg-5.0-backport-ranlib-build-fix.patch
+ "${FILESDIR}"/${PN}-5.0-backport-ranlib-build-fix.patch
+ "${FILESDIR}"/${P}-libsdl2-new-version-scheme.patch
)
MULTILIB_WRAPPED_HEADERS=(
diff --git a/media-video/ffmpeg/files/ffmpeg-4.4.2-libsdl2-new-version-scheme.patch b/media-video/ffmpeg/files/ffmpeg-4.4.2-libsdl2-new-version-scheme.patch
new file mode 100644
index 000000000000..b592c2f9b72d
--- /dev/null
+++ b/media-video/ffmpeg/files/ffmpeg-4.4.2-libsdl2-new-version-scheme.patch
@@ -0,0 +1,25 @@
+https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/839f98ff6719cf2db0cbd88cd787a1b19b9cbf47
+
+From: Christopher Degawa <ccom@randomderp.com>
+Date: Wed, 11 May 2022 15:11:04 -0500
+Subject: [PATCH] configure: extend SDL check to accept all 2.x versions
+
+sdl2 recently changed their versioning, moving the patch level to minor level
+https://github.com/libsdl-org/SDL/commit/cd7c2f1de7d9e418bb554047d714dd7cacc020ff
+and have said that they will instead ship sdl3.pc for 3.0.0
+
+Fixes ticket 9768
+
+Signed-off-by: Christopher Degawa <ccom@randomderp.com>
+Signed-off-by: Gyan Doshi <ffmpeg@gyani.pro>
+--- a/configure
++++ b/configure
+@@ -6383,7 +6383,7 @@ fi
+
+ if enabled sdl2; then
+ SDL2_CONFIG="${cross_prefix}sdl2-config"
+- test_pkg_config sdl2 "sdl2 >= 2.0.1 sdl2 < 2.1.0" SDL_events.h SDL_PollEvent
++ test_pkg_config sdl2 "sdl2 >= 2.0.1 sdl2 < 3.0.0" SDL_events.h SDL_PollEvent
+ if disabled sdl2 && "${SDL2_CONFIG}" --version > /dev/null 2>&1; then
+ sdl2_cflags=$("${SDL2_CONFIG}" --cflags)
+ sdl2_extralibs=$("${SDL2_CONFIG}" --libs)
diff --git a/media-video/ffmpeg/files/ffmpeg-5.0.1-libsdl2-new-version-scheme.patch b/media-video/ffmpeg/files/ffmpeg-5.0.1-libsdl2-new-version-scheme.patch
new file mode 100644
index 000000000000..f95ff1cb7065
--- /dev/null
+++ b/media-video/ffmpeg/files/ffmpeg-5.0.1-libsdl2-new-version-scheme.patch
@@ -0,0 +1,25 @@
+https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/240d82f26eef10461c8b78b09a0db76c464deea8
+
+From: Christopher Degawa <ccom@randomderp.com>
+Date: Wed, 11 May 2022 15:11:04 -0500
+Subject: [PATCH] configure: extend SDL check to accept all 2.x versions
+
+sdl2 recently changed their versioning, moving the patch level to minor level
+https://github.com/libsdl-org/SDL/commit/cd7c2f1de7d9e418bb554047d714dd7cacc020ff
+and have said that they will instead ship sdl3.pc for 3.0.0
+
+Fixes ticket 9768
+
+Signed-off-by: Christopher Degawa <ccom@randomderp.com>
+Signed-off-by: Gyan Doshi <ffmpeg@gyani.pro>
+--- a/configure
++++ b/configure
+@@ -6739,7 +6739,7 @@ fi
+
+ if enabled sdl2; then
+ SDL2_CONFIG="${cross_prefix}sdl2-config"
+- test_pkg_config sdl2 "sdl2 >= 2.0.1 sdl2 < 2.1.0" SDL_events.h SDL_PollEvent
++ test_pkg_config sdl2 "sdl2 >= 2.0.1 sdl2 < 3.0.0" SDL_events.h SDL_PollEvent
+ if disabled sdl2 && "${SDL2_CONFIG}" --version > /dev/null 2>&1; then
+ sdl2_cflags=$("${SDL2_CONFIG}" --cflags)
+ sdl2_extralibs=$("${SDL2_CONFIG}" --libs)
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 65ce47a9704d..40792d65a79e 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
Binary files differ
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 4a43529b82e0..5026473316b2 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sun, 21 Aug 2022 00:39:46 +0000
+Sun, 21 Aug 2022 06:39:49 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index f501520da5aa..e2b3e29edbaf 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -1,23 +1,23 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
-MANIFEST Manifest.files.gz 523682 BLAKE2B a866720fe3384cb354d689c52dc2eed547ab55e37608dcb637780fcc52106c8f5b1ad8a84b41fe53778860d6ace908fc8c4af0faa17e457054d95d23aee6e6b7 SHA512 8cd7653583d003af73b72c5887e3bbb7c5321dc87e14d08d6283a4c633685378b7922f0cd4552eeb523a7d2aca7c675e2fd4704a62d96cc574355d98d5158f89
-TIMESTAMP 2022-08-21T00:39:49Z
+MANIFEST Manifest.files.gz 524322 BLAKE2B 3983f62074c223717c76ae7cd44857f5de5972e245bd5f084c8632e144cf7a950ad3ddd53324db99f9b82eb9e76e49cd3a84bf1f531314d7660db91335a05cb9 SHA512 9b6be0313a2999bb5ad817a373c95ecf8d02d687a3d707b14136357c7bc684ea302f0ccdb228be1e52484b458ecca78cec7150915afe09c096106aa055c4eae2
+TIMESTAMP 2022-08-21T06:39:52Z
-----BEGIN PGP SIGNATURE-----
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmMBftVfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmMB0zhfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBC0hAAmGjM7cG9Xm0SwfGoWGW47Z3Q7zwDGatoqP6piorGq3qjYzxtNgN0iXt2
-FcKm8VB58kxujUKwQ4UBFL5Y1Rk4WJCGBnY/zvuLKp6GTgGJI8oX4zREJLz854uP
-pPjRpRCgRW6uqk7AjuKoVwOttyqKMS8IN8HZ/9Nd22kCisMU6zuKr62mtxGVtb1M
-vovYW00j4JGI49UIu0LScM8EZuL1eCW1PH5zWN9V+njkTjTIQ3FM7/SH7d4nOz4R
-5BIBo8AZh3J8FCY4pekV3csGJ8FulzlFvJfS7GZabrxFXAcXEARxgSu5dfzdo9no
-6QzYkKnYOBs7o0ownEJtbxZTM73esHyFzz51m/E2pdQ9wPRpbktQ7foJdK5drM1V
-qEw6F4I2bhTJjCRABEidUWm74mE1bjGqQmX/6fD0Qz/c5J9lC5viAtknfh4x7Eti
-KKwb8zMWgZFFKxDeCOclwAwrTXm1E1RL2HNbKts9BfhK1LnpP5nYGcwORbH0QWxc
-jVEbr9o7LYO42jd0HX4fB8n86Q3WcHBckUsLFa45QnQhvFkgrnKf4TlI7jRJXhT7
-/tKhn4C/CWS8abYFoBmlgZRS4QjtJzW9WIh0lvzvirt8FVmxbpsyZGL9ERu4AN4d
-4YQNEGQwmwRMyDJMCoNsJ/iT3QXmCyD8KAqnexKo+WSJYKtfhzY=
-=YLbY
+klDRaBAAnRlxiIHRi1a+BS3+1USaV5PC3qDCV65SzzBIWS9zWb657CiuG+UP+a99
+PBys0GawkwItVa1xNZmLlsdf/Snznn/a/5dLjLHEOWL2FN7BtUxigVKsxqVtvdiR
+Fix6ezPlEeh8I2vWka9rWIVMFI/CNBXFAUzxdEQQP4z/9F9UraNT7lkdU0mOz7LX
+/Nlnxg7m/1AYMRFrAunGM4K6QjKcJIwe7LGcL2M6W2I42oofnC1w2w+0zNM7KZJc
+Q/hdDY2yrf/nRQFWczs2AHXjyUvKN+/Ytt4M1tHPktD5morysmIKRKF6vXnFNNe4
+Z/irl05SLHSDTIWA9EqhyW49EuTupizMAu46Lqf6A/fCb2ySCgGlvVCTxWdazjYb
+5QiJT+Ew6REyVfpEu3uiNMDrK/9n25GNR4/QNKDP+itq0gx6rWYLkfidYgojp6+1
+lmU6BJvRrtJznTxWLTGrlTGjRhcQoFYK0q9NPklcwiJL0RNBqBmBRFSgkxG+xc3z
+0B4VIVVOs88BceC6Py8VJ1CQG3X50AqbnTJSnwZojqERmS+SHmq7kLVyd/mP0MxU
+dq+xhaqVceHEowYDsFMjoXSH7qmWV8oA8dSt0DxqEPyUCw8P1Sqb76edc6+Vfacr
+PUKVMzhj5jJ1euJz4yD8bL5JQXqmYvNwTEsn9W0zj5Ganhj/x7M=
+=b8lo
-----END PGP SIGNATURE-----
diff --git a/metadata/glsa/Manifest.files.gz b/metadata/glsa/Manifest.files.gz
index 7e8bb5813ec4..170adcfbebd2 100644
--- a/metadata/glsa/Manifest.files.gz
+++ b/metadata/glsa/Manifest.files.gz
Binary files differ
diff --git a/metadata/glsa/glsa-202208-32.xml b/metadata/glsa/glsa-202208-32.xml
new file mode 100644
index 000000000000..1ff4b3b3d6ab
--- /dev/null
+++ b/metadata/glsa/glsa-202208-32.xml
@@ -0,0 +1,168 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="202208-32">
+ <title>Vim, gVim: Multiple Vulnerabilities</title>
+ <synopsis>Multiple vulnerabilities have been discovered in Vim, the worst of which could result in denial of service.</synopsis>
+ <product type="ebuild">gvim,vim,vim-core</product>
+ <announced>2022-08-21</announced>
+ <revised count="1">2022-08-21</revised>
+ <bug>811870</bug>
+ <bug>818562</bug>
+ <bug>819528</bug>
+ <bug>823473</bug>
+ <bug>824930</bug>
+ <bug>828583</bug>
+ <bug>829658</bug>
+ <bug>830106</bug>
+ <bug>830994</bug>
+ <bug>833572</bug>
+ <bug>836432</bug>
+ <bug>851231</bug>
+ <access>remote</access>
+ <affected>
+ <package name="app-editors/gvim" auto="yes" arch="*">
+ <unaffected range="ge">9.0.0060</unaffected>
+ <vulnerable range="lt">9.0.0060</vulnerable>
+ </package>
+ <package name="app-editors/vim" auto="yes" arch="*">
+ <unaffected range="ge">9.0.0060</unaffected>
+ <vulnerable range="lt">9.0.0060</vulnerable>
+ </package>
+ <package name="app-editors/vim-core" auto="yes" arch="*">
+ <unaffected range="ge">9.0.0060</unaffected>
+ <vulnerable range="lt">9.0.0060</vulnerable>
+ </package>
+ </affected>
+ <background>
+ <p>Vim is an efficient, highly configurable improved version of the classic ‘vi’ text editor. gVim is the GUI version of Vim.</p>
+ </background>
+ <description>
+ <p>Multiple vulnerabilities have been discovered in Vim and gVim. Please review the CVE identifiers referenced below for details.</p>
+ </description>
+ <impact type="low">
+ <p>Please review the referenced CVE identifiers for details.</p>
+ </impact>
+ <workaround>
+ <p>There is no known workaround at this time.</p>
+ </workaround>
+ <resolution>
+ <p>All Vim users should upgrade to the latest version:</p>
+
+ <code>
+ # emerge --sync
+ # emerge --ask --oneshot --verbose ">=app-editors/vim-9.0.0060"
+ </code>
+
+ <p>All gVim users should upgrade to the latest version:</p>
+
+ <code>
+ # emerge --sync
+ # emerge --ask --oneshot --verbose ">=app-editors/gvim-9.0.0060"
+ </code>
+
+ <p>All vim-core users should upgrade to the latest version:</p>
+
+ <code>
+ # emerge --sync
+ # emerge --ask --oneshot --verbose ">=app-editors/vim-core-9.0.0060"
+ </code>
+ </resolution>
+ <references>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-3770">CVE-2021-3770</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-3778">CVE-2021-3778</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-3796">CVE-2021-3796</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-3872">CVE-2021-3872</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-3875">CVE-2021-3875</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-3927">CVE-2021-3927</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-3928">CVE-2021-3928</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-3968">CVE-2021-3968</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-3973">CVE-2021-3973</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-3974">CVE-2021-3974</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-3984">CVE-2021-3984</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-4019">CVE-2021-4019</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-4069">CVE-2021-4069</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-4136">CVE-2021-4136</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-4166">CVE-2021-4166</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-4173">CVE-2021-4173</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-4187">CVE-2021-4187</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-4192">CVE-2021-4192</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-4193">CVE-2021-4193</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-46059">CVE-2021-46059</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-0128">CVE-2022-0128</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-0156">CVE-2022-0156</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-0158">CVE-2022-0158</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-0213">CVE-2022-0213</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-0261">CVE-2022-0261</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-0318">CVE-2022-0318</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-0319">CVE-2022-0319</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-0351">CVE-2022-0351</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-0359">CVE-2022-0359</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-0361">CVE-2022-0361</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-0368">CVE-2022-0368</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-0392">CVE-2022-0392</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-0393">CVE-2022-0393</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-0407">CVE-2022-0407</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-0408">CVE-2022-0408</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-0413">CVE-2022-0413</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-0417">CVE-2022-0417</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-0443">CVE-2022-0443</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-0554">CVE-2022-0554</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-0629">CVE-2022-0629</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-0685">CVE-2022-0685</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-0714">CVE-2022-0714</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-0729">CVE-2022-0729</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-0943">CVE-2022-0943</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-1154">CVE-2022-1154</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-1160">CVE-2022-1160</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-1381">CVE-2022-1381</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-1420">CVE-2022-1420</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-1616">CVE-2022-1616</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-1619">CVE-2022-1619</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-1620">CVE-2022-1620</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-1621">CVE-2022-1621</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-1629">CVE-2022-1629</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-1674">CVE-2022-1674</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-1720">CVE-2022-1720</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-1733">CVE-2022-1733</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-1735">CVE-2022-1735</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-1769">CVE-2022-1769</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-1771">CVE-2022-1771</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-1785">CVE-2022-1785</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-1796">CVE-2022-1796</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-1851">CVE-2022-1851</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-1886">CVE-2022-1886</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-1897">CVE-2022-1897</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-1898">CVE-2022-1898</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-1927">CVE-2022-1927</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-1942">CVE-2022-1942</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-1968">CVE-2022-1968</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-2000">CVE-2022-2000</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-2042">CVE-2022-2042</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-2124">CVE-2022-2124</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-2125">CVE-2022-2125</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-2126">CVE-2022-2126</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-2129">CVE-2022-2129</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-2175">CVE-2022-2175</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-2182">CVE-2022-2182</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-2183">CVE-2022-2183</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-2206">CVE-2022-2206</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-2207">CVE-2022-2207</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-2208">CVE-2022-2208</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-2210">CVE-2022-2210</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-2231">CVE-2022-2231</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-2257">CVE-2022-2257</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-2264">CVE-2022-2264</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-2284">CVE-2022-2284</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-2285">CVE-2022-2285</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-2286">CVE-2022-2286</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-2287">CVE-2022-2287</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-2288">CVE-2022-2288</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-2289">CVE-2022-2289</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-2304">CVE-2022-2304</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-2343">CVE-2022-2343</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-2344">CVE-2022-2344</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-2345">CVE-2022-2345</uri>
+ </references>
+ <metadata tag="requester" timestamp="2022-08-21T01:33:31.581561Z">ajak</metadata>
+ <metadata tag="submitter" timestamp="2022-08-21T01:33:31.591372Z">ajak</metadata>
+</glsa> \ No newline at end of file
diff --git a/metadata/glsa/glsa-202208-33.xml b/metadata/glsa/glsa-202208-33.xml
new file mode 100644
index 000000000000..9a40b07937b0
--- /dev/null
+++ b/metadata/glsa/glsa-202208-33.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="202208-33">
+ <title>Gnome Shell, gettext, libcroco: Multiple Vulnerabilities</title>
+ <synopsis>A vulnerability has been found in libcroco which could result in denial of service.</synopsis>
+ <product type="ebuild">gettext,gnome-shell,libcroco</product>
+ <announced>2022-08-21</announced>
+ <revised count="1">2022-08-21</revised>
+ <bug>722752</bug>
+ <bug>755848</bug>
+ <bug>769998</bug>
+ <access>remote</access>
+ <affected>
+ <package name="dev-libs/libcroco" auto="yes" arch="*">
+ <unaffected range="ge">0.6.13</unaffected>
+ <vulnerable range="lt">0.6.13</vulnerable>
+ </package>
+ <package name="gnome-base/gnome-shell" auto="yes" arch="*">
+ <unaffected range="ge">3.36.7</unaffected>
+ <vulnerable range="lt">3.36.7</vulnerable>
+ </package>
+ <package name="sys-devel/gettext" auto="yes" arch="*">
+ <unaffected range="ge">0.21</unaffected>
+ <vulnerable range="lt">0.21</vulnerable>
+ </package>
+ </affected>
+ <background>
+ <p>GNOME Shell provides core user interface functions for the GNOME desktop, like switching to windows and launching applications.
+
+gettext contains the GNU locale utilities.
+
+libcroco is a standalone CSS2 parsing and manipulation library.</p>
+ </background>
+ <description>
+ <p>The cr_parser_parse_any_core function in libcroco&#39;s cr-parser.c does not limit recursion, leading to a denial of service via a stack overflow when trying to parse crafted CSS.
+
+Gnome Shell and gettext bundle libcroco in their own sources and thus are potentially vulnerable as well.</p>
+ </description>
+ <impact type="normal">
+ <p>An attacker with control over the input to the library can cause a denial of service.</p>
+ </impact>
+ <workaround>
+ <p>There is no known workaround at this time.</p>
+ </workaround>
+ <resolution>
+ <p>All gettext users should upgrade to the latest version:</p>
+
+ <code>
+ # emerge --sync
+ # emerge --ask --oneshot --verbose ">=sys-devel/gettext-0.21"
+ </code>
+
+ <p>All Gnome Shell users should upgrade to the latest version:</p>
+
+ <code>
+ # emerge --sync
+ # emerge --ask --oneshot --verbose ">=gnome-base/gnome-shell-3.36.7"
+ </code>
+
+ <p>All libcroco users should upgrade to the latest version:</p>
+
+ <code>
+ # emerge --sync
+ # emerge --ask --oneshot --verbose ">=dev-libs/libcroco-0.6.13"
+ </code>
+ </resolution>
+ <references>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-12825">CVE-2020-12825</uri>
+ </references>
+ <metadata tag="requester" timestamp="2022-08-21T01:34:48.802416Z">ajak</metadata>
+ <metadata tag="submitter" timestamp="2022-08-21T01:34:48.808281Z">ajak</metadata>
+</glsa> \ No newline at end of file
diff --git a/metadata/glsa/glsa-202208-34.xml b/metadata/glsa/glsa-202208-34.xml
new file mode 100644
index 000000000000..d9d0d45186a7
--- /dev/null
+++ b/metadata/glsa/glsa-202208-34.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="202208-34">
+ <title>Apache Tomcat: Multiple Vulnerabilities</title>
+ <synopsis>Multiple vulnerabilities have been discovered in Apache Tomcat, the worst of which could result in denial of service.</synopsis>
+ <product type="ebuild">tomcat</product>
+ <announced>2022-08-21</announced>
+ <revised count="1">2022-08-21</revised>
+ <bug>773571</bug>
+ <bug>801916</bug>
+ <bug>818160</bug>
+ <bug>855971</bug>
+ <access>remote</access>
+ <affected>
+ <package name="www-servers/tomcat" auto="yes" arch="*">
+ <unaffected range="ge" slot="10">10.0.23</unaffected>
+ <unaffected range="ge" slot="9">9.0.65</unaffected>
+ <unaffected range="ge" slot="8.5">8.5.82</unaffected>
+ <vulnerable range="lt" slot="10">10.0.23</vulnerable>
+ <vulnerable range="lt" slot="9">9.0.65</vulnerable>
+ <vulnerable range="lt" slot="8.5">8.5.82</vulnerable>
+ </package>
+ </affected>
+ <background>
+ <p>Apache Tomcat is a Servlet-3.0/JSP-2.2 Container.</p>
+ </background>
+ <description>
+ <p>Multiple vulnerabilities have been discovered in Apache Tomcat. Please review the CVE identifiers referenced below for details.</p>
+ </description>
+ <impact type="low">
+ <p>Please review the referenced CVE identifiers for details.</p>
+ </impact>
+ <workaround>
+ <p>There is no known workaround at this time.</p>
+ </workaround>
+ <resolution>
+ <p>All Apache Tomcat 10.x users should upgrade to the latest version:</p>
+
+ <code>
+ # emerge --sync
+ # emerge --ask --oneshot --verbose ">=www-servers/tomcat-10.0.23:10"
+ </code>
+
+ <p>All Apache Tomcat 9.x users should upgrade to the latest version:</p>
+
+ <code>
+ # emerge --sync
+ # emerge --ask --oneshot --verbose ">=www-servers/tomcat-9.0.65:9"
+ </code>
+
+ <p>All Apache Tomcat 8.5.x users should upgrade to the latest version:</p>
+
+ <code>
+ # emerge --sync
+ # emerge --ask --oneshot --verbose ">=www-servers/tomcat-8.5.82:8.5"
+ </code>
+ </resolution>
+ <references>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-25122">CVE-2021-25122</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-25329">CVE-2021-25329</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-30639">CVE-2021-30639</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-30640">CVE-2021-30640</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-33037">CVE-2021-33037</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-42340">CVE-2021-42340</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-34305">CVE-2022-34305</uri>
+ </references>
+ <metadata tag="requester" timestamp="2022-08-21T01:35:21.756179Z">ajak</metadata>
+ <metadata tag="submitter" timestamp="2022-08-21T01:35:21.761073Z">ajak</metadata>
+</glsa>
diff --git a/metadata/glsa/glsa-202208-35.xml b/metadata/glsa/glsa-202208-35.xml
new file mode 100644
index 000000000000..b35642c517b8
--- /dev/null
+++ b/metadata/glsa/glsa-202208-35.xml
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="202208-35">
+ <title>Chromium, Google Chrome, Microsoft Edge: Multiple Vulnerabilities</title>
+ <synopsis>Multiple vulnerabilities have been found in Chromium and its derivatives, the worst of which could result in remote code execution.</synopsis>
+ <product type="ebuild">chromium,chromium-bin,google-chrome,microsoft-edge</product>
+ <announced>2022-08-21</announced>
+ <revised count="1">2022-08-21</revised>
+ <bug>858104</bug>
+ <bug>859442</bug>
+ <bug>863512</bug>
+ <bug>865501</bug>
+ <bug>864723</bug>
+ <access>remote</access>
+ <affected>
+ <package name="www-client/chromium" auto="yes" arch="*">
+ <unaffected range="ge">104.0.5112.101</unaffected>
+ <vulnerable range="lt">104.0.5112.101</vulnerable>
+ </package>
+ <package name="www-client/chromium-bin" auto="yes" arch="*">
+ <unaffected range="ge">104.0.5112.101</unaffected>
+ <vulnerable range="lt">104.0.5112.101</vulnerable>
+ </package>
+ <package name="www-client/google-chrome" auto="yes" arch="*">
+ <unaffected range="ge">104.0.5112.101</unaffected>
+ <vulnerable range="lt">104.0.5112.101</vulnerable>
+ </package>
+ <package name="www-client/microsoft-edge" auto="yes" arch="*">
+ <unaffected range="ge">104.0.1293.63</unaffected>
+ <vulnerable range="lt">104.0.1293.63</vulnerable>
+ </package>
+ </affected>
+ <background>
+ <p>Chromium is an open-source browser project that aims to build a safer, faster, and more stable way for all users to experience the web.
+
+Google Chrome is one fast, simple, and secure browser for all your devices.
+
+Microsoft Edge is a browser that combines a minimal design with sophisticated technology to make the web faster, safer, and easier.</p>
+ </background>
+ <description>
+ <p>Multiple vulnerabilities have been discovered in Chromium and its derivatives. Please review the CVE identifiers referenced below for details.</p>
+ </description>
+ <impact type="high">
+ <p>Please review the referenced CVE identifiers for details.</p>
+ </impact>
+ <workaround>
+ <p>There is no known workaround at this time.</p>
+ </workaround>
+ <resolution>
+ <p>All Chromium users should upgrade to the latest version:</p>
+
+ <code>
+ # emerge --sync
+ # emerge --ask --oneshot --verbose ">=www-client/chromium-104.0.5112.101"
+ </code>
+
+ <p>All Chromium binary users should upgrade to the latest version:</p>
+
+ <code>
+ # emerge --sync
+ # emerge --ask --oneshot --verbose ">=www-client/chromium-bin-104.0.5112.101"
+ </code>
+
+ <p>All Google Chrome users should upgrade to tha latest version:</p>
+
+ <code>
+ # emerge --sync
+ # emerge --ask --oneshot --verbose ">=www-client/google-chrome-104.0.5112.101"
+ </code>
+
+ <p>All Microsoft Edge users should upgrade to tha latest version:</p>
+
+ <code>
+ # emerge --sync
+ # emerge --ask --oneshot --verbose ">=www-client/microsoft-edge-104.0.1293.63"
+ </code>
+ </resolution>
+ <references>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-2163">CVE-2022-2163</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-2294">CVE-2022-2294</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-2295">CVE-2022-2295</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-2296">CVE-2022-2296</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-2477">CVE-2022-2477</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-2478">CVE-2022-2478</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-2479">CVE-2022-2479</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-2480">CVE-2022-2480</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-2481">CVE-2022-2481</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-2603">CVE-2022-2603</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-2604">CVE-2022-2604</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-2605">CVE-2022-2605</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-2606">CVE-2022-2606</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-2607">CVE-2022-2607</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-2608">CVE-2022-2608</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-2609">CVE-2022-2609</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-2610">CVE-2022-2610</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-2611">CVE-2022-2611</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-2612">CVE-2022-2612</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-2613">CVE-2022-2613</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-2614">CVE-2022-2614</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-2615">CVE-2022-2615</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-2616">CVE-2022-2616</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-2617">CVE-2022-2617</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-2618">CVE-2022-2618</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-2619">CVE-2022-2619</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-2620">CVE-2022-2620</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-2621">CVE-2022-2621</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-2622">CVE-2022-2622</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-2623">CVE-2022-2623</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-2624">CVE-2022-2624</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-2852">CVE-2022-2852</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-2853">CVE-2022-2853</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-2854">CVE-2022-2854</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-2855">CVE-2022-2855</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-2856">CVE-2022-2856</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-2857">CVE-2022-2857</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-2858">CVE-2022-2858</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-2859">CVE-2022-2859</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-2860">CVE-2022-2860</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-2861">CVE-2022-2861</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-33636">CVE-2022-33636</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-33649">CVE-2022-33649</uri>
+ <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-35796">CVE-2022-35796</uri>
+ </references>
+ <metadata tag="requester" timestamp="2022-08-21T06:11:41.017671Z">ajak</metadata>
+ <metadata tag="submitter" timestamp="2022-08-21T06:11:41.021023Z">sam</metadata>
+</glsa> \ No newline at end of file
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 4a43529b82e0..5026473316b2 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sun, 21 Aug 2022 00:39:46 +0000
+Sun, 21 Aug 2022 06:39:49 +0000
diff --git a/metadata/glsa/timestamp.commit b/metadata/glsa/timestamp.commit
index fe751d1c8859..844345985e03 100644
--- a/metadata/glsa/timestamp.commit
+++ b/metadata/glsa/timestamp.commit
@@ -1 +1 @@
-f69203b9608d0db5bda6ce4050bf90de5119c0f8 1660513701 2022-08-14T21:48:21+00:00
+cc821fda3ee186d2bcc82c6163599beb50f2302d 1661062375 2022-08-21T06:12:55+00:00
diff --git a/metadata/install-qa-check.d/60noop-testsuites b/metadata/install-qa-check.d/60noop-testsuites
new file mode 100644
index 000000000000..82e3de6b7ed3
--- /dev/null
+++ b/metadata/install-qa-check.d/60noop-testsuites
@@ -0,0 +1,28 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# QA check: look for autotools-based tests are actually no-ops
+# Maintainer: Quality Assurance team <qa@gentoo.org>
+
+noop_testsuite_check() {
+ use test || return
+
+ IFS= readarray -t noop_testsuites < <(find "${S}" -type f -name 'test-suite.log' -print0 | xargs -0 grep -l "TOTAL: 0" 2>/dev/null)
+
+ if [[ -n ${noop_testsuites[@]} ]]; then
+ eqawarn "QA Notice: Test suite passed but did not actually execute any tests:"
+ eqawarn
+ for suite in ${noop_testsuites[@]}
+ do
+ # can't use eqatag here because filenames must be relative to ${D},
+ # but our test suite log files only exist in ${S}
+ eqawarn "\t${suite#${S}/}"
+ done
+ eqawarn
+ fi
+}
+
+noop_testsuite_check
+: # guarantee successful exit
+
+# vim:ft=sh
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 6e75874043f6..08d4b974d2b5 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
Binary files differ
diff --git a/metadata/md5-cache/dev-haskell/Manifest.gz b/metadata/md5-cache/dev-haskell/Manifest.gz
index 31c678fbd8c9..5cfe1143a821 100644
--- a/metadata/md5-cache/dev-haskell/Manifest.gz
+++ b/metadata/md5-cache/dev-haskell/Manifest.gz
Binary files differ
diff --git a/metadata/md5-cache/dev-haskell/dbus-1.2.22 b/metadata/md5-cache/dev-haskell/dbus-1.2.22
index 8a9c95f8000f..8943a4c62acb 100644
--- a/metadata/md5-cache/dev-haskell/dbus-1.2.22
+++ b/metadata/md5-cache/dev-haskell/dbus-1.2.22
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
SLOT=0/1.2.22
SRC_URI=https://hackage.haskell.org/package/dbus-1.2.22/dbus-1.2.22.tar.gz
_eclasses_=ghc-package dbe1a8d17cacb390a3df7bbba6617679 haskell-cabal bd6d32a0289c486284bc0cdc06a639a6 multilib 5ca4e49abed8e3a2f7b56920eadee157 multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 toolchain-funcs 1542e649be915f43f6908a9e93909961
-_md5_=8f280368882576de3165b364e8495f11
+_md5_=4fe87a40ca88859e1892b96e1e2c80bd
diff --git a/metadata/md5-cache/dev-haskell/doctest-parallel-0.2.3 b/metadata/md5-cache/dev-haskell/doctest-parallel-0.2.4
index 4d738ec64890..ff0551f4e464 100644
--- a/metadata/md5-cache/dev-haskell/doctest-parallel-0.2.3
+++ b/metadata/md5-cache/dev-haskell/doctest-parallel-0.2.4
@@ -1,16 +1,16 @@
BDEPEND=app-text/dos2unix
DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/base-compat-0.7.0:=[profile?] >=dev-haskell/cabal-3.4:=[profile?] >=dev-haskell/code-page-0.1:=[profile?] dev-haskell/extra:=[profile?] >=dev-haskell/ghc-paths-0.1.0.9:=[profile?] dev-haskell/glob:=[profile?] >=dev-haskell/random-1.2:=[profile?] >=dev-haskell/syb-0.3:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-lang/ghc-8.2:=[profile?] <dev-lang/ghc-9.3:=[profile?] >=dev-lang/ghc-8.10.1:= >=dev-haskell/cabal-3.2.0.0 test? ( >=dev-haskell/hspec-2.3.0 >=dev-haskell/hspec-core-2.3.0 dev-haskell/hspec-discover dev-haskell/hunit dev-haskell/mockery >=dev-haskell/quickcheck-2.13.1 dev-haskell/setenv >=dev-haskell/silently-1.2.4 >=dev-haskell/stringbuilder-0.4 ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/base-compat-0.7.0:=[profile?] >=dev-haskell/cabal-3.4:=[profile?] >=dev-haskell/code-page-0.1:=[profile?] dev-haskell/extra:=[profile?] >=dev-haskell/ghc-paths-0.1.0.9:=[profile?] dev-haskell/glob:=[profile?] >=dev-haskell/random-1.2:=[profile?] >=dev-haskell/syb-0.3:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-lang/ghc-8.10.1:= >=dev-haskell/cabal-3.2.0.0 hscolour? ( dev-haskell/hscolour )
DESCRIPTION=Test interactive Haskell examples
EAPI=8
HOMEPAGE=https://github.com/martijnbastiaan/doctest-parallel#readme
INHERIT=haskell-cabal
-IUSE=doc hscolour profile test
+IUSE=doc hscolour profile
KEYWORDS=~amd64 ~ppc64 ~x86
LICENSE=MIT
-RDEPEND=>=dev-haskell/base-compat-0.7.0:=[profile?] >=dev-haskell/cabal-3.4:=[profile?] >=dev-haskell/code-page-0.1:=[profile?] dev-haskell/extra:=[profile?] >=dev-haskell/ghc-paths-0.1.0.9:=[profile?] dev-haskell/glob:=[profile?] >=dev-haskell/random-1.2:=[profile?] >=dev-haskell/syb-0.3:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-lang/ghc-8.2:=[profile?] <dev-lang/ghc-9.3:=[profile?] >=dev-lang/ghc-8.10.1:=
-RESTRICT=test !test? ( test )
-SLOT=0/0.2.3
-SRC_URI=https://hackage.haskell.org/package/doctest-parallel-0.2.3/doctest-parallel-0.2.3.tar.gz
+RDEPEND=>=dev-haskell/base-compat-0.7.0:=[profile?] >=dev-haskell/cabal-3.4:=[profile?] >=dev-haskell/code-page-0.1:=[profile?] dev-haskell/extra:=[profile?] >=dev-haskell/ghc-paths-0.1.0.9:=[profile?] dev-haskell/glob:=[profile?] >=dev-haskell/random-1.2:=[profile?] >=dev-haskell/syb-0.3:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-lang/ghc-8.10.1:=
+RESTRICT=test
+SLOT=0/0.2.4
+SRC_URI=https://hackage.haskell.org/package/doctest-parallel-0.2.4/doctest-parallel-0.2.4.tar.gz
_eclasses_=ghc-package dbe1a8d17cacb390a3df7bbba6617679 haskell-cabal bd6d32a0289c486284bc0cdc06a639a6 multilib 5ca4e49abed8e3a2f7b56920eadee157 multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 toolchain-funcs 1542e649be915f43f6908a9e93909961
-_md5_=0936bad814795f343fe5e50e923974e7
+_md5_=03032dcac0990a9361a6294e4658efff
diff --git a/metadata/md5-cache/dev-haskell/haskell-src-exts-1.21.1 b/metadata/md5-cache/dev-haskell/haskell-src-exts-1.21.1
deleted file mode 100644
index 28c7e721f9cb..000000000000
--- a/metadata/md5-cache/dev-haskell/haskell-src-exts-1.21.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/semigroups-0.18.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 dev-haskell/happy test? ( dev-haskell/mtl >=dev-haskell/pretty-show-1.6.16 >=dev-haskell/smallcheck-1.0 >=dev-haskell/tasty-0.3 >=dev-haskell/tasty-golden-2.2.2 dev-haskell/tasty-smallcheck ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer
-EAPI=7
-HOMEPAGE=https://github.com/haskell-suite/haskell-src-exts
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/semigroups-0.18.3:=[profile?] >=dev-lang/ghc-7.4.1:=
-RESTRICT=!test? ( test )
-SLOT=1.21/1.21.1
-SRC_URI=https://hackage.haskell.org/package/haskell-src-exts-1.21.1/haskell-src-exts-1.21.1.tar.gz
-_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 8f942ebdcf04334697649d4a0bf65a32 ghc-package dbe1a8d17cacb390a3df7bbba6617679 haskell-cabal bd6d32a0289c486284bc0cdc06a639a6 multilib 5ca4e49abed8e3a2f7b56920eadee157 multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs 1542e649be915f43f6908a9e93909961 wrapper 4a1902f969e5718126434fc35f3a0d9c
-_md5_=65013b46ee39c06f055e2b62abed328b
diff --git a/metadata/md5-cache/dev-haskell/haskell-src-exts-1.23.1 b/metadata/md5-cache/dev-haskell/haskell-src-exts-1.23.1
new file mode 100644
index 000000000000..10dc184d0254
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/haskell-src-exts-1.23.1
@@ -0,0 +1,16 @@
+BDEPEND=app-text/dos2unix
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-lang/ghc-8.4.3:= >=dev-haskell/cabal-2.2.0.1 dev-haskell/happy test? ( >=dev-haskell/pretty-show-1.6.16 >=dev-haskell/smallcheck-1.0 >=dev-haskell/tasty-0.3 >=dev-haskell/tasty-golden-2.2.2 dev-haskell/tasty-smallcheck ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer
+EAPI=8
+HOMEPAGE=https://github.com/haskell-suite/haskell-src-exts
+INHERIT=haskell-cabal
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-8.4.3:=
+RESTRICT=!test? ( test )
+SLOT=0/1.23.1
+SRC_URI=https://hackage.haskell.org/package/haskell-src-exts-1.23.1/haskell-src-exts-1.23.1.tar.gz
+_eclasses_=ghc-package dbe1a8d17cacb390a3df7bbba6617679 haskell-cabal bd6d32a0289c486284bc0cdc06a639a6 multilib 5ca4e49abed8e3a2f7b56920eadee157 multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 toolchain-funcs 1542e649be915f43f6908a9e93909961
+_md5_=b82bdc8b7f9f396f28b270bb941cbad9
diff --git a/metadata/md5-cache/dev-haskell/parser-combinators-1.3.0 b/metadata/md5-cache/dev-haskell/parser-combinators-1.3.0
index d1a2a61eabd9..04b4ab0bd093 100644
--- a/metadata/md5-cache/dev-haskell/parser-combinators-1.3.0
+++ b/metadata/md5-cache/dev-haskell/parser-combinators-1.3.0
@@ -9,8 +9,8 @@ IUSE=doc hscolour profile test
KEYWORDS=~amd64 ~ppc64 ~x86
LICENSE=BSD
RDEPEND=>=dev-lang/ghc-8.6.3:=
-RESTRICT=test !test? ( test )
+RESTRICT=!test? ( test )
SLOT=0/1.3.0
SRC_URI=https://hackage.haskell.org/package/parser-combinators-1.3.0/parser-combinators-1.3.0.tar.gz https://hackage.haskell.org/package/parser-combinators-tests-1.3.0/parser-combinators-tests-1.3.0.tar.gz
_eclasses_=ghc-package dbe1a8d17cacb390a3df7bbba6617679 haskell-cabal bd6d32a0289c486284bc0cdc06a639a6 multilib 5ca4e49abed8e3a2f7b56920eadee157 multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 toolchain-funcs 1542e649be915f43f6908a9e93909961
-_md5_=f6b2b0e01d935d7f2474c21580d3765a
+_md5_=9ef465a82fc16f95ec9bf606ce79d109
diff --git a/metadata/md5-cache/dev-haskell/regex-tdfa-1.3.2 b/metadata/md5-cache/dev-haskell/regex-tdfa-1.3.2
index f6cdc984967b..e8d81de121c5 100644
--- a/metadata/md5-cache/dev-haskell/regex-tdfa-1.3.2
+++ b/metadata/md5-cache/dev-haskell/regex-tdfa-1.3.2
@@ -1,6 +1,6 @@
BDEPEND=app-text/dos2unix
DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/regex-base-0.94:=[profile?] <dev-haskell/regex-base-0.95:=[profile?] >=dev-lang/ghc-8.4.3:= >=dev-haskell/cabal-2.2.0.1 test? ( >=dev-haskell/doctest-parallel-0.2.2 >=dev-haskell/utf8-string-1.0.1 <dev-haskell/utf8-string-1.1 ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/regex-base-0.94:=[profile?] <dev-haskell/regex-base-0.95:=[profile?] >=dev-lang/ghc-8.4.3:= >=dev-haskell/cabal-2.2.0.1 test? ( >=dev-haskell/utf8-string-1.0.1 <dev-haskell/utf8-string-1.1 ) hscolour? ( dev-haskell/hscolour )
DESCRIPTION=Pure Haskell Tagged DFA Backend for "Text.Regex" (regex-base)
EAPI=8
HOMEPAGE=https://wiki.haskell.org/Regular_expressions
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
SLOT=0/1.3.2
SRC_URI=https://hackage.haskell.org/package/regex-tdfa-1.3.2/regex-tdfa-1.3.2.tar.gz
_eclasses_=ghc-package dbe1a8d17cacb390a3df7bbba6617679 haskell-cabal bd6d32a0289c486284bc0cdc06a639a6 multilib 5ca4e49abed8e3a2f7b56920eadee157 multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 toolchain-funcs 1542e649be915f43f6908a9e93909961
-_md5_=8f38ce4573da0d1ccbf868eb0573f2d3
+_md5_=e78c5a09cbac33d177756ae80025ba78
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index c73033297554..5cb1527ff914 100644
--- a/metadata/md5-cache/dev-lang/Manifest.gz
+++ b/metadata/md5-cache/dev-lang/Manifest.gz
Binary files differ
diff --git a/metadata/md5-cache/dev-lang/ghc-9.0.2 b/metadata/md5-cache/dev-lang/ghc-9.0.2
index 619ee82dd545..48269e74cb6b 100644
--- a/metadata/md5-cache/dev-lang/ghc-9.0.2
+++ b/metadata/md5-cache/dev-lang/ghc-9.0.2
@@ -13,6 +13,6 @@ RDEPEND=>=dev-lang/perl-5.6.1 dev-libs/gmp:0= sys-libs/ncurses:=[unicode(+)] elf
REQUIRED_USE=?? ( ghcbootstrap binary ) ?? ( profile binary )
RESTRICT=!test? ( test )
SLOT=0/9.0.2
-SRC_URI=!binary? ( https://downloads.haskell.org/ghc/9.0.2/ghc-9.0.2-src.tar.xz test? ( https://downloads.haskell.org/ghc/9.0.2/ghc-9.0.2-testsuite.tar.xz ) ) !ghcbootstrap? ( amd64? ( https://eidetic.codes/ghc-bin-9.0.2-x86_64-pc-linux-gnu.tbz2 ) ppc64? ( !big-endian? ( https://github.com/matoro/ghc/releases/download/9.0.2/ghc-bin-9.0.2-powerpc64le-unknown-linux-gnu.tar.gz ) ) x86? ( https://eidetic.codes/ghc-bin-9.0.2-i686-pc-linux-gnu.tbz2 ) )
+SRC_URI=!binary? ( https://downloads.haskell.org/ghc/9.0.2/ghc-9.0.2-src.tar.xz test? ( https://downloads.haskell.org/ghc/9.0.2/ghc-9.0.2-testsuite.tar.xz ) ) !ghcbootstrap? ( amd64? ( https://eidetic.codes/ghc-bin-9.0.2-x86_64-pc-linux-gnu.tbz2 ) ppc64? ( big-endian? ( https://github.com/matoro/ghc/releases/download/9.0.2/ghc-bin-9.0.2-powerpc64-unknown-linux-gnu.tar.gz ) !big-endian? ( https://github.com/matoro/ghc/releases/download/9.0.2/ghc-bin-9.0.2-powerpc64le-unknown-linux-gnu.tar.gz ) ) x86? ( https://eidetic.codes/ghc-bin-9.0.2-i686-pc-linux-gnu.tbz2 ) )
_eclasses_=autotools 9e6965bfaa00f52cc61e0d4bc44c87b3 bash-completion-r1 f5e7a020fd9c741740756aac61bf75ff check-reqs 5e6dfbd7a8d3238a79f009fae7ac469c eapi8-dosym cd7d420bb5be5ee079f27239ce76b8f5 edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 8f942ebdcf04334697649d4a0bf65a32 flag-o-matic 38d6ec96711cea42a5cb1cc723a6e906 ghc-package dbe1a8d17cacb390a3df7bbba6617679 gnuconfig b6b3e92f8b8c996400074b5f61a59256 libtool 241a8f577b9781a42a7421e53448a44e multilib 5ca4e49abed8e3a2f7b56920eadee157 multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 pax-utils 91d47e5d20627c717aa878b9167c62a8 prefix eab3c99d77fe00506c109c8a736186f7 python-any-r1 a3e9c0524a795d7f2767a2cf12a2e8c0 python-utils-r1 dd5e1098e305ad508d21f496e9e37046 strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs 1542e649be915f43f6908a9e93909961 wrapper 4a1902f969e5718126434fc35f3a0d9c
-_md5_=7615c7f1736e0cfb386bf06dd17dc9e2
+_md5_=7055d8a060b0c1f8087e9a800384343c
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 5d93f157a23f..bb45bfa78ea2 100644
--- a/metadata/md5-cache/dev-python/Manifest.gz
+++ b/metadata/md5-cache/dev-python/Manifest.gz
Binary files differ
diff --git a/metadata/md5-cache/dev-python/pyopencl-2022.1.6 b/metadata/md5-cache/dev-python/pyopencl-2022.1.6
index 2c074d81c3a5..b69a04e99aa7 100644
--- a/metadata/md5-cache/dev-python/pyopencl-2022.1.6
+++ b/metadata/md5-cache/dev-python/pyopencl-2022.1.6
@@ -1,17 +1,17 @@
-BDEPEND=dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pybind11-2.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/pybind11-2.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pybind11-2.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/pybind11-2.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-libs/pocl ) test? ( >=virtual/opencl-2 >=dev-python/mako-0.3.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/platformdirs-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytools-2021.2.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
DEFINED_PHASES=compile configure install prepare test
DEPEND=>=virtual/opencl-2 opengl? ( media-libs/libglvnd )
DESCRIPTION=Python wrapper for OpenCL
EAPI=8
HOMEPAGE=https://mathema.tician.de/software/pyopencl/ https://pypi.org/project/pyopencl/
-INHERIT=distutils-r1
-IUSE=examples opengl python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+INHERIT=distutils-r1 multiprocessing
+IUSE=examples opengl test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
KEYWORDS=~amd64 ~ppc64
LICENSE=GPL-2
RDEPEND=>=virtual/opencl-2 >=dev-python/mako-0.3.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/platformdirs-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytools-2021.2.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=test
+RESTRICT=!test? ( test )
SLOT=0
SRC_URI=mirror://pypi/p/pyopencl/pyopencl-2022.1.6.tar.gz
_eclasses_=distutils-r1 e3b0f72d558eb613ff83262d22cbf887 multibuild d26d81f242cb193d899a72bca423d0bd multilib 5ca4e49abed8e3a2f7b56920eadee157 multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 python-r1 7b65c41111cd80a4d4a0921e8d4a310c python-utils-r1 dd5e1098e305ad508d21f496e9e37046 toolchain-funcs 1542e649be915f43f6908a9e93909961
-_md5_=7c2aefab37c26d6bdb192186d09c3860
+_md5_=c52e2b5fc0d197dfd2cf1e3f5de10a15
diff --git a/metadata/md5-cache/dev-python/pytest-markdown-1.0.2 b/metadata/md5-cache/dev-python/pytest-markdown-1.0.2
deleted file mode 100644
index f2783188fcc3..000000000000
--- a/metadata/md5-cache/dev-python/pytest-markdown-1.0.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/pyproject2setuppy-22[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Write unit tests in Python to test actual state of your servers
-EAPI=8
-HOMEPAGE=https://github.com/Jc2k/pytest-markdown
-INHERIT=distutils-r1
-IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~riscv
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/commonmark-0.9.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-6.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=mirror://pypi/p/pytest_markdown/pytest_markdown-1.0.2.tar.gz -> pytest-markdown-1.0.2.tar.gz
-_eclasses_=distutils-r1 e3b0f72d558eb613ff83262d22cbf887 multibuild d26d81f242cb193d899a72bca423d0bd multilib 5ca4e49abed8e3a2f7b56920eadee157 multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 python-r1 7b65c41111cd80a4d4a0921e8d4a310c python-utils-r1 dd5e1098e305ad508d21f496e9e37046 toolchain-funcs 1542e649be915f43f6908a9e93909961
-_md5_=ae412dcabdc54c69bf18db0aead0ee37
diff --git a/metadata/md5-cache/dev-python/pytest-markdown-1.0.2-r1 b/metadata/md5-cache/dev-python/pytest-markdown-1.0.2-r1
new file mode 100644
index 000000000000..f3a7059fcf39
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pytest-markdown-1.0.2-r1
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/poetry-core-1.0.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Run tests in your markdown
+EAPI=8
+HOMEPAGE=https://github.com/Jc2k/pytest-markdown
+INHERIT=distutils-r1
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~riscv
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/commonmark-0.9.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-6.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+SLOT=0
+SRC_URI=mirror://pypi/p/pytest_markdown/pytest_markdown-1.0.2.tar.gz -> pytest-markdown-1.0.2.tar.gz
+_eclasses_=distutils-r1 e3b0f72d558eb613ff83262d22cbf887 multibuild d26d81f242cb193d899a72bca423d0bd multilib 5ca4e49abed8e3a2f7b56920eadee157 multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 python-r1 7b65c41111cd80a4d4a0921e8d4a310c python-utils-r1 dd5e1098e305ad508d21f496e9e37046 toolchain-funcs 1542e649be915f43f6908a9e93909961
+_md5_=8290ae8de40506054c5bd79555068b36
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index da73c550e64c..7eea2d930fb0 100644
--- a/metadata/md5-cache/dev-ruby/Manifest.gz
+++ b/metadata/md5-cache/dev-ruby/Manifest.gz
Binary files differ
diff --git a/metadata/md5-cache/dev-ruby/hoe-3.25.0 b/metadata/md5-cache/dev-ruby/hoe-3.25.0
new file mode 100644
index 000000000000..21eab1b61b23
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/hoe-3.25.0
@@ -0,0 +1,17 @@
+BDEPEND=ruby_targets_ruby27? ( test? ( >=dev-ruby/minitest-5.9:5[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( >=dev-ruby/minitest-5.9:5[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( >=dev-ruby/minitest-5.9:5[ruby_targets_ruby31(-)] ) ) test? ( ruby_targets_ruby27? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby27(-)] <dev-ruby/rake-15.0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby30(-)] <dev-ruby/rake-15.0[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby31(-)] <dev-ruby/rake-15.0[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+DESCRIPTION=Hoe extends rake to provide full project automation
+EAPI=8
+HOMEPAGE=https://www.zenspider.com/projects/hoe.html
+INHERIT=ruby-fakegem
+IUSE=doc test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby27? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby27(-)] <dev-ruby/rake-15.0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby30(-)] <dev-ruby/rake-15.0[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby31(-)] <dev-ruby/rake-15.0[ruby_targets_ruby31(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://rubygems.org/gems/hoe-3.25.0.gem
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib 5ca4e49abed8e3a2f7b56920eadee157 ruby-fakegem 5219a86777b162618ed386ae08bf8ce4 ruby-ng 55326c3bb01904e05d55c73c84c85d07 ruby-utils 97c8e15d89dc6537e36cddedf413ed22 toolchain-funcs 1542e649be915f43f6908a9e93909961
+_md5_=914a0cc161272470bc163cd89b5c9580
diff --git a/metadata/md5-cache/dev-ruby/minitest-5.16.3 b/metadata/md5-cache/dev-ruby/minitest-5.16.3
new file mode 100644
index 000000000000..3539927ecce2
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/minitest-5.16.3
@@ -0,0 +1,17 @@
+BDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+DESCRIPTION=minitest/unit is a small and fast replacement for ruby's huge and slow test/unit
+EAPI=8
+HOMEPAGE=https://github.com/seattlerb/minitest
+INHERIT=ruby-fakegem
+IUSE=doc test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5
+SRC_URI=https://rubygems.org/gems/minitest-5.16.3.gem
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib 5ca4e49abed8e3a2f7b56920eadee157 ruby-fakegem 5219a86777b162618ed386ae08bf8ce4 ruby-ng 55326c3bb01904e05d55c73c84c85d07 ruby-utils 97c8e15d89dc6537e36cddedf413ed22 toolchain-funcs 1542e649be915f43f6908a9e93909961
+_md5_=9a24a7592bbbe60e72811730809a0591
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 6540632b1ba7..219f2292af16 100644
--- a/metadata/md5-cache/dev-util/Manifest.gz
+++ b/metadata/md5-cache/dev-util/Manifest.gz
Binary files differ
diff --git a/metadata/md5-cache/dev-util/gitlab-runner-15.3.0 b/metadata/md5-cache/dev-util/gitlab-runner-15.3.0
new file mode 100644
index 000000000000..5f18b405c222
--- /dev/null
+++ b/metadata/md5-cache/dev-util/gitlab-runner-15.3.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-go/gox >=dev-lang/go-1.16 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install postinst test unpack
+DEPEND=acct-group/gitlab-runner acct-user/gitlab-runner
+DESCRIPTION=The official GitLab Runner, written in Go
+EAPI=8
+HOMEPAGE=https://gitlab.com/gitlab-org/gitlab-runner
+INHERIT=go-module systemd tmpfiles
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=acct-group/gitlab-runner acct-user/gitlab-runner virtual/tmpfiles
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://gitlab.com/gitlab-org/gitlab-runner/-/archive/v15.3.0/gitlab-runner-v15.3.0.tar.gz -> gitlab-runner-15.3.0.tar.gz https://dev.gentoo.org/~williamh/dist/gitlab-runner-15.3.0-deps.tar.xz
+_eclasses_=go-module a13d34fe4e2996720e1ca6c53b9ea95a multilib 5ca4e49abed8e3a2f7b56920eadee157 systemd 2736b403a83f194b59b767f3b344c2c1 tmpfiles 216aa76c3a6fcb5d893c23a0de86048f toolchain-funcs 1542e649be915f43f6908a9e93909961
+_md5_=744834f2b841c73a51fb1c8869f46f32
diff --git a/metadata/md5-cache/media-fonts/Manifest.gz b/metadata/md5-cache/media-fonts/Manifest.gz
index 7acea2b94490..9d2261ae7e9a 100644
--- a/metadata/md5-cache/media-fonts/Manifest.gz
+++ b/metadata/md5-cache/media-fonts/Manifest.gz
Binary files differ
diff --git a/metadata/md5-cache/media-fonts/terminus-font-4.49.1 b/metadata/md5-cache/media-fonts/terminus-font-4.49.1
index d4c1d29c0686..1fb5d3841c6a 100644
--- a/metadata/md5-cache/media-fonts/terminus-font-4.49.1
+++ b/metadata/md5-cache/media-fonts/terminus-font-4.49.1
@@ -1,4 +1,4 @@
-BDEPEND=app-arch/gzip || ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) virtual/awk pcf-8bit? ( x11-apps/bdftopcf ) pcf-unicode? ( x11-apps/bdftopcf ) X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+BDEPEND=app-arch/gzip || ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) virtual/awk pcf-8bit? ( x11-apps/bdftopcf ) pcf-unicode? ( x11-apps/bdftopcf ) X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
DEFINED_PHASES=compile configure install postinst postrm prepare setup
DESCRIPTION=A clean fixed font for the console and X11
EAPI=7
@@ -11,4 +11,4 @@ REQUIRED_USE=X? ( || ( otf pcf-8bit pcf-unicode ) )
SLOT=0
SRC_URI=mirror://sourceforge/project/terminus-font/terminus-font-4.49/terminus-font-4.49.1.tar.gz
_eclasses_=eapi8-dosym cd7d420bb5be5ee079f27239ce76b8f5 font d31f12a0f6e13d56dc3062e76ae58a61 multilib 5ca4e49abed8e3a2f7b56920eadee157 multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 python-any-r1 a3e9c0524a795d7f2767a2cf12a2e8c0 python-utils-r1 dd5e1098e305ad508d21f496e9e37046 toolchain-funcs 1542e649be915f43f6908a9e93909961
-_md5_=b5e5f47f039464385175f4e8339824d1
+_md5_=b8794c9dcb48bad6952660a9b5e875c2
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 950011225b9b..90ed1a4b7af7 100644
--- a/metadata/md5-cache/media-libs/Manifest.gz
+++ b/metadata/md5-cache/media-libs/Manifest.gz
Binary files differ
diff --git a/metadata/md5-cache/media-libs/netpbm-10.86.33 b/metadata/md5-cache/media-libs/netpbm-10.86.33
index 224430a5bee8..6b35b881fa36 100644
--- a/metadata/md5-cache/media-libs/netpbm-10.86.33
+++ b/metadata/md5-cache/media-libs/netpbm-10.86.33
@@ -6,10 +6,10 @@ EAPI=8
HOMEPAGE=http://netpbm.sourceforge.net/
INHERIT=flag-o-matic multilib toolchain-funcs
IUSE=jbig jpeg png postscript rle cpu_flags_x86_sse2 static-libs svga tiff X xml
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
LICENSE=GPL-2
RDEPEND=jbig? ( media-libs/jbigkit:= ) jpeg? ( media-libs/libjpeg-turbo:=[static-libs?] ) png? ( >=media-libs/libpng-1.4:0= sys-libs/zlib ) postscript? ( app-text/ghostscript-gpl sys-libs/zlib ) rle? ( media-libs/urt:= ) svga? ( media-libs/svgalib ) tiff? ( >=media-libs/tiff-3.5.5:0 ) xml? ( dev-libs/libxml2 ) X? ( x11-libs/libX11 )
SLOT=0
SRC_URI=https://github.com/ceamac/netpbm-make-dist/releases/download/v10.86.33/netpbm-10.86.33.tar.xz
_eclasses_=flag-o-matic 38d6ec96711cea42a5cb1cc723a6e906 multilib 5ca4e49abed8e3a2f7b56920eadee157 toolchain-funcs 1542e649be915f43f6908a9e93909961
-_md5_=c6ede40779ae77b446559258b03ae758
+_md5_=112bd17442080cb4df13ae4b02d16351
diff --git a/metadata/md5-cache/media-libs/openal-1.22.2-r1 b/metadata/md5-cache/media-libs/openal-1.22.2-r1
new file mode 100644
index 000000000000..c256491f966b
--- /dev/null
+++ b/metadata/md5-cache/media-libs/openal-1.22.2-r1
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pipewire? ( >=media-video/pipewire-0.3.50[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) portaudio? ( media-libs/portaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) sdl? ( media-libs/libsdl2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sndio? ( media-sound/sndio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) oss? ( virtual/os-headers )
+DESCRIPTION=A software implementation of the OpenAL 3D audio API
+EAPI=8
+HOMEPAGE=https://www.openal-soft.org/
+INHERIT=cmake-multilib
+IUSE=alsa coreaudio debug jack oss pipewire portaudio pulseaudio sdl sndio qt5 cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_arm_neon abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=LGPL-2+ BSD
+RDEPEND=alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pipewire? ( >=media-video/pipewire-0.3.50[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) portaudio? ( media-libs/portaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) sdl? ( media-libs/libsdl2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sndio? ( media-sound/sndio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+SLOT=0
+SRC_URI=https://www.openal-soft.org/openal-releases/openal-soft-1.22.2.tar.bz2
+_eclasses_=cmake 44afbf15c35884f7c840470f1cf05d0d cmake-multilib 877c17770372bcf902ac9f0525cfb7f3 flag-o-matic 38d6ec96711cea42a5cb1cc723a6e906 multibuild d26d81f242cb193d899a72bca423d0bd multilib 5ca4e49abed8e3a2f7b56920eadee157 multilib-build 05f207909a804c9174bc39a00547d598 multilib-minimal 4b0f1857965db8869a729948d5277e0b multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 ninja-utils 58ec4e54962bf45d065fb95030701514 toolchain-funcs 1542e649be915f43f6908a9e93909961 xdg-utils fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=7bc264c19385c0c2f12b71117aa2c58e
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index b4427eb6a0f3..ea6e6b838b12 100644
--- a/metadata/md5-cache/media-video/Manifest.gz
+++ b/metadata/md5-cache/media-video/Manifest.gz
Binary files differ
diff --git a/metadata/md5-cache/media-video/ffmpeg-4.4.2 b/metadata/md5-cache/media-video/ffmpeg-4.4.2
index e2c5af095e9a..fd529ca03be1 100644
--- a/metadata/md5-cache/media-video/ffmpeg-4.4.2
+++ b/metadata/md5-cache/media-video/ffmpeg-4.4.2
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) gpl? ( openssl? ( bindist ) fdk? ( bindist ) )
SLOT=0/56.58.58
SRC_URI=https://ffmpeg.org/releases/ffmpeg-4.4.2.tar.xz verify-sig? ( https://ffmpeg.org/releases/ffmpeg-4.4.2.tar.xz.asc )
_eclasses_=flag-o-matic 38d6ec96711cea42a5cb1cc723a6e906 multibuild d26d81f242cb193d899a72bca423d0bd multilib 5ca4e49abed8e3a2f7b56920eadee157 multilib-build 05f207909a804c9174bc39a00547d598 multilib-minimal 4b0f1857965db8869a729948d5277e0b toolchain-funcs 1542e649be915f43f6908a9e93909961 verify-sig 0748d665fa664a87add00152ed046e16
-_md5_=fe2c46903edfd24e44bcb1bc08fd33ea
+_md5_=9d37f7b46ed6376c7fb80fcf1b6d3ecb
diff --git a/metadata/md5-cache/media-video/ffmpeg-5.0.1 b/metadata/md5-cache/media-video/ffmpeg-5.0.1
index 6b79fe116ed1..c1511e7373a2 100644
--- a/metadata/md5-cache/media-video/ffmpeg-5.0.1
+++ b/metadata/md5-cache/media-video/ffmpeg-5.0.1
@@ -6,7 +6,7 @@ EAPI=7
HOMEPAGE=https://ffmpeg.org/
INHERIT=flag-o-matic multilib multilib-minimal toolchain-funcs verify-sig
IUSE=alsa chromium doc +encode oss pic sndio static-libs test v4l +bzip2 cpudetection debug gcrypt +gnutls gmp +gpl hardcoded-tables +iconv libxml2 lzma +network opencl openssl +postproc samba sdl sdl vaapi vdpau vulkan X X X X +zlib cdio iec61883 ieee1394 libcaca openal opengl libv4l pulseaudio libdrm jack amr amr codec2 +dav1d fdk jpeg2k bluray gme gsm libaribb24 mmal modplug opus libilbc librtmp ssh speex srt svg nvenc vorbis vpx zvbi appkit bs2b chromaprint cuda flite frei0r vmaf fribidi fontconfig ladspa libass libtesseract lv2 truetype vidstab rubberband zeromq zimg libsoxr +threads amf amrenc kvazaar libaom mp3 openh264 rav1e snappy svt-av1 theora twolame webp x264 x265 xvid cpu_flags_arm_thumb cpu_flags_arm_v6 cpu_flags_arm_thumb2 cpu_flags_arm_neon cpu_flags_arm_vfp cpu_flags_arm_vfpv3 cpu_flags_arm_v8 mipsdspr1 mipsdspr2 mipsfpu cpu_flags_ppc_altivec cpu_flags_ppc_vsx cpu_flags_ppc_vsx2 cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_x86_aes cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_mmx cpu_flags_x86_mmxext cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_xop +fftools_aviocat +fftools_cws2fws +fftools_ffescape +fftools_ffeval +fftools_ffhash +fftools_fourcc2pixfmt +fftools_graph2dot +fftools_ismindex +fftools_pktdumper +fftools_qt-faststart +fftools_sidxindex +fftools_trasher abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
LICENSE=!gpl? ( LGPL-2.1 ) gpl? ( GPL-2 ) amr? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) gmp? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) libaribb24? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) encode? ( amrenc? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) ) samba? ( GPL-3 )
RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amf? ( media-video/amdgpu-pro-amf ) amr? ( >=media-libs/opencore-amr-0.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bluray? ( >=media-libs/libbluray-0.3.0-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bs2b? ( >=media-libs/libbs2b-3.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) chromaprint? ( >=media-libs/chromaprint-1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) codec2? ( media-libs/codec2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dav1d? ( >=media-libs/dav1d-0.4.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) encode? ( amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kvazaar? ( >=media-libs/kvazaar-1.2.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/lame-3.99.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openh264? ( >=media-libs/openh264-1.4.0-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rav1e? ( >=media-video/rav1e-0.4:=[capi] ) snappy? ( >=app-arch/snappy-1.1.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) twolame? ( >=media-sound/twolame-0.3.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( >=media-libs/libwebp-0.3.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x264? ( >=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x265? ( >=media-libs/x265-1.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvid? ( >=media-libs/xvid-1.3.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) fdk? ( >=media-libs/fdk-aac-0.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) flite? ( >=app-accessibility/flite-1.4-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) frei0r? ( media-plugins/frei0r-plugins[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fribidi? ( >=dev-libs/fribidi-0.19.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gme? ( >=media-libs/game-music-emu-0.6.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gmp? ( >=dev-libs/gmp-6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iconv? ( >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iec61883? ( >=media-libs/libiec61883-1.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( >=media-libs/libdc1394-2.2.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( >=media-libs/openjpeg-2:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libaom? ( >=media-libs/libaom-1.0.0-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libaribb24? ( >=media-libs/aribb24-1.0.3-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libass? ( >=media-libs/libass-0.11.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libdrm? ( x11-libs/libdrm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libilbc? ( >=media-libs/libilbc-2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) librtmp? ( >=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libsoxr? ( >=media-libs/soxr-0.1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libtesseract? ( >=app-text/tesseract-4.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libv4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libxml2? ( dev-libs/libxml2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lv2? ( media-libs/lv2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/lilv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mmal? ( media-libs/raspberrypi-userland ) modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opus? ( >=media-libs/opus-1.0.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rubberband? ( >=media-libs/rubberband-1.8.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) samba? ( >=net-fs/samba-3.6.23-r1[client,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2[sound,video,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sndio? ( media-sound/sndio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) speex? ( >=media-libs/speex-1.2_rc1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) srt? ( >=net-libs/srt-1.3.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( >=net-libs/libssh-0.5.5:=[sftp,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) svg? ( gnome-base/librsvg:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nvenc? ( >=media-libs/nv-codec-headers-9.1.23.1 ) svt-av1? ( >=media-libs/svt-av1-0.8.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.2.1-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vidstab? ( >=media-libs/vidstab-1.1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vmaf? ( media-libs/libvmaf[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vpx? ( >=media-libs/libvpx-1.4.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( >=media-libs/vulkan-loader-1.2.189:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXv-1.0.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) postproc? ( !media-libs/libpostproc ) zeromq? ( >=net-libs/zeromq-4.1.6 ) zimg? ( >=media-libs/zimg-2.7.4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zvbi? ( >=media-libs/zvbi-0.2.35[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !openssl? ( gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
REQUIRED_USE=cuda? ( nvenc ) libv4l? ( v4l ) fftools_cws2fws? ( zlib ) test? ( encode ) postproc? ( gpl ) frei0r? ( gpl ) cdio? ( gpl ) rubberband? ( gpl ) vidstab? ( gpl ) samba? ( gpl ) encode? ( x264? ( gpl ) x265? ( gpl ) xvid? ( gpl ) ) arm64? ( cpu_flags_arm_v8 ) cpu_flags_arm_v8? ( cpu_flags_arm_vfpv3 cpu_flags_arm_neon ) cpu_flags_arm_neon? ( cpu_flags_arm_thumb2 cpu_flags_arm_vfp ) cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp ) cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 ) cpu_flags_arm_v6? ( cpu_flags_arm_thumb ) cpu_flags_ppc_vsx? ( cpu_flags_ppc_altivec ) cpu_flags_ppc_vsx2? ( cpu_flags_ppc_vsx ) cpu_flags_x86_avx2? ( cpu_flags_x86_avx ) cpu_flags_x86_fma4? ( cpu_flags_x86_avx ) cpu_flags_x86_fma3? ( cpu_flags_x86_avx ) cpu_flags_x86_xop? ( cpu_flags_x86_avx ) cpu_flags_x86_avx? ( cpu_flags_x86_sse4_2 ) cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 ) cpu_flags_x86_sse4_2? ( cpu_flags_x86_sse4_1 ) cpu_flags_x86_sse4_1? ( cpu_flags_x86_ssse3 ) cpu_flags_x86_ssse3? ( cpu_flags_x86_sse3 ) cpu_flags_x86_sse3? ( cpu_flags_x86_sse2 ) cpu_flags_x86_sse2? ( cpu_flags_x86_sse ) cpu_flags_x86_sse? ( cpu_flags_x86_mmxext ) cpu_flags_x86_mmxext? ( cpu_flags_x86_mmx ) cpu_flags_x86_3dnowext? ( cpu_flags_x86_3dnow ) cpu_flags_x86_3dnow? ( cpu_flags_x86_mmx )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) gpl? ( openssl? ( bindist ) fdk? ( bindist ) )
SLOT=0/57.59.59
SRC_URI=https://ffmpeg.org/releases/ffmpeg-5.0.1.tar.xz verify-sig? ( https://ffmpeg.org/releases/ffmpeg-5.0.1.tar.xz.asc )
_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 8f942ebdcf04334697649d4a0bf65a32 flag-o-matic 38d6ec96711cea42a5cb1cc723a6e906 multibuild d26d81f242cb193d899a72bca423d0bd multilib 5ca4e49abed8e3a2f7b56920eadee157 multilib-build 05f207909a804c9174bc39a00547d598 multilib-minimal 4b0f1857965db8869a729948d5277e0b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs 1542e649be915f43f6908a9e93909961 verify-sig 0748d665fa664a87add00152ed046e16 wrapper 4a1902f969e5718126434fc35f3a0d9c
-_md5_=8d30c4e5851220140445fcf0f943c0d7
+_md5_=54760c62205d0d6d976f2eee38e04635
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 1b4d5c5f1aac..ef5b89dc71fd 100644
--- a/metadata/md5-cache/sys-apps/Manifest.gz
+++ b/metadata/md5-cache/sys-apps/Manifest.gz
Binary files differ
diff --git a/metadata/md5-cache/sys-apps/fwupd-1.8.3 b/metadata/md5-cache/sys-apps/fwupd-1.8.3
index 5c3ac6e9af84..a11fd5990b3a 100644
--- a/metadata/md5-cache/sys-apps/fwupd-1.8.3
+++ b/metadata/md5-cache/sys-apps/fwupd-1.8.3
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/fwupd/fwupd/archive/1.8.3.tar.gz -> fwupd-1.8.3.tar.gz
_eclasses_=linux-info 56708ddc53d8b607ed88fd97a56e59dc meson 1994a5aef5d4f5798b92f64d6f9a6003 multilib 5ca4e49abed8e3a2f7b56920eadee157 multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 ninja-utils 58ec4e54962bf45d065fb95030701514 python-single-r1 a5747fe6dc0651d95cb78eddd5e160a8 python-utils-r1 dd5e1098e305ad508d21f496e9e37046 toolchain-funcs 1542e649be915f43f6908a9e93909961 udev f3a0a3964e2028a140c181f00eea9712 vala 1c07e7167d9ef851ad187f5f3f02d34d xdg 6024fbc93167fad782e2032933654857 xdg-utils fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=8d2b0fa4a77905f7a415ab50faa77f91
+_md5_=3ad5f53fc2f3b51598532b3e97636e3e
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index 72246f163e4a..cb29ce1955ff 100644
--- a/metadata/md5-cache/sys-cluster/Manifest.gz
+++ b/metadata/md5-cache/sys-cluster/Manifest.gz
Binary files differ
diff --git a/metadata/md5-cache/sys-cluster/ploop-1.15-r1 b/metadata/md5-cache/sys-cluster/ploop-1.15-r1
index 7fb798c52b05..08ec6f58aa80 100644
--- a/metadata/md5-cache/sys-cluster/ploop-1.15-r1
+++ b/metadata/md5-cache/sys-cluster/ploop-1.15-r1
@@ -6,10 +6,10 @@ EAPI=7
HOMEPAGE=https://wiki.openvz.org/Download/ploop
INHERIT=tmpfiles toolchain-funcs
IUSE=debug
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
LICENSE=GPL-2
RDEPEND=dev-libs/libxml2 sys-block/parted sys-fs/e2fsprogs sys-process/lsof sys-apps/findutils virtual/tmpfiles
SLOT=0
SRC_URI=https://download.openvz.org/utils/ploop/1.15/src/ploop-1.15.tar.bz2
_eclasses_=multilib 5ca4e49abed8e3a2f7b56920eadee157 tmpfiles 216aa76c3a6fcb5d893c23a0de86048f toolchain-funcs 1542e649be915f43f6908a9e93909961
-_md5_=c77a39e326f7aeb5be851771de76eae0
+_md5_=c0bcc29d4201e3c55f9d7344cef9f66b
diff --git a/metadata/md5-cache/sys-power/Manifest.gz b/metadata/md5-cache/sys-power/Manifest.gz
index 36e82f21dca0..86ba63996a21 100644
--- a/metadata/md5-cache/sys-power/Manifest.gz
+++ b/metadata/md5-cache/sys-power/Manifest.gz
Binary files differ
diff --git a/metadata/md5-cache/sys-power/upower-0.99.20 b/metadata/md5-cache/sys-power/upower-0.99.20
index 92bf6241ed57..da8c761f36be 100644
--- a/metadata/md5-cache/sys-power/upower-0.99.20
+++ b/metadata/md5-cache/sys-power/upower-0.99.20
@@ -6,11 +6,11 @@ EAPI=8
HOMEPAGE=https://upower.freedesktop.org/
INHERIT=meson python-any-r1 systemd udev xdg-utils
IUSE=doc +introspection ios selinux test
-KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86
LICENSE=GPL-2
RDEPEND=>=dev-libs/glib-2.58:2 sys-apps/dbus:= introspection? ( dev-libs/gobject-introspection:= ) kernel_linux? ( >=dev-libs/libgudev-236:= virtual/udev ios? ( >=app-pda/libimobiledevice-1:= >=app-pda/libplist-2:= ) ) selinux? ( sec-policy/selinux-devicekit )
RESTRICT=!test? ( test )
SLOT=0/3
SRC_URI=https://gitlab.freedesktop.org/upower/upower/-/archive/v0.99.20/upower-v0.99.20.tar.bz2
_eclasses_=meson 1994a5aef5d4f5798b92f64d6f9a6003 multilib 5ca4e49abed8e3a2f7b56920eadee157 multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 ninja-utils 58ec4e54962bf45d065fb95030701514 python-any-r1 a3e9c0524a795d7f2767a2cf12a2e8c0 python-utils-r1 dd5e1098e305ad508d21f496e9e37046 systemd 2736b403a83f194b59b767f3b344c2c1 toolchain-funcs 1542e649be915f43f6908a9e93909961 udev f3a0a3964e2028a140c181f00eea9712 xdg-utils fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=222ee1ff10bc9066f18b9965518f60fc
+_md5_=a163bc88a20e1562dc89f8eb342087bd
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index 6261213924b3..6cbd1f91e489 100644
--- a/metadata/md5-cache/www-client/Manifest.gz
+++ b/metadata/md5-cache/www-client/Manifest.gz
Binary files differ
diff --git a/metadata/md5-cache/www-client/chromium-103.0.5060.134 b/metadata/md5-cache/www-client/chromium-103.0.5060.134
deleted file mode 100644
index 9bf3492754e8..000000000000
--- a/metadata/md5-cache/www-client/chromium-103.0.5060.134
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=system-icu? ( >=dev-libs/icu-71.1:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= !libcxx? ( >=dev-libs/re2-0.2019.08.01:= ) dev-libs/libxslt:= media-libs/fontconfig:= >=media-libs/freetype-2.11.0-r1:= system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] ) media-libs/libjpeg-turbo:= system-png? ( media-libs/libpng:=[-apng] ) >=media-libs/libwebp-0.4.0:= media-libs/mesa:=[gbm(+)] >=media-libs/openh264-1.6.0:= sys-libs/zlib:= x11-libs/libdrm:= !headless? ( dev-libs/glib:2 >=media-libs/alsa-lib-1.0.19:= pulseaudio? ( media-sound/pulseaudio:= ) sys-apps/pciutils:= kerberos? ( virtual/krb5 ) vaapi? ( >=x11-libs/libva-2.7:=[X?,wayland?] ) X? ( x11-libs/libX11:= x11-libs/libXext:= x11-libs/libxcb:= ) x11-libs/libxkbcommon:= wayland? ( dev-libs/wayland:= screencast? ( media-video/pipewire:= ) ) ) || ( >=dev-lang/python-3.10.4:3.10[xml] >=dev-lang/python-3.9.12:3.9[xml] >=dev-lang/python-3.8.13:3.8[xml] ) || ( ( >=dev-lang/python-3.10.4:3.10[xml] dev-python/setuptools[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9[xml] dev-python/setuptools[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8[xml] dev-python/setuptools[python_targets_python3_8(-)] ) ) >=app-arch/gzip-1.7 libcxx? ( >=sys-devel/clang-13 ) lto? ( || ( ( sys-devel/clang:13 sys-devel/llvm:13 =sys-devel/lld-13* ) ( sys-devel/clang:14 sys-devel/llvm:14 =sys-devel/lld-14* ) ) ) dev-lang/perl >=dev-util/gn-0.1807 >=dev-util/gperf-3.0.3 >=dev-util/ninja-1.7.2 dev-vcs/git >=net-libs/nodejs-7.6.0[inspector] >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig js-type-check? ( virtual/jre )
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup
-DEPEND=system-icu? ( >=dev-libs/icu-71.1:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= !libcxx? ( >=dev-libs/re2-0.2019.08.01:= ) dev-libs/libxslt:= media-libs/fontconfig:= >=media-libs/freetype-2.11.0-r1:= system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] ) media-libs/libjpeg-turbo:= system-png? ( media-libs/libpng:=[-apng] ) >=media-libs/libwebp-0.4.0:= media-libs/mesa:=[gbm(+)] >=media-libs/openh264-1.6.0:= sys-libs/zlib:= x11-libs/libdrm:= !headless? ( dev-libs/glib:2 >=media-libs/alsa-lib-1.0.19:= pulseaudio? ( media-sound/pulseaudio:= ) sys-apps/pciutils:= kerberos? ( virtual/krb5 ) vaapi? ( >=x11-libs/libva-2.7:=[X?,wayland?] ) X? ( x11-libs/libX11:= x11-libs/libXext:= x11-libs/libxcb:= ) x11-libs/libxkbcommon:= wayland? ( dev-libs/wayland:= screencast? ( media-video/pipewire:= ) ) ) app-arch/bzip2:= dev-libs/expat:= system-ffmpeg? ( >=media-video/ffmpeg-4.3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) >=media-libs/opus-1.3.1:= ) net-misc/curl[ssl] sys-apps/dbus:= media-libs/flac:= sys-libs/zlib:=[minizip] !headless? ( X? ( x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libxshmfence:= ) >=app-accessibility/at-spi2-atk-2.26:2 >=app-accessibility/at-spi2-core-2.26:2 >=dev-libs/atk-2.26 media-libs/mesa:=[X?,wayland?] cups? ( >=net-print/cups-1.3.11:= ) virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/pango:= ) !headless? ( gtk4? ( gui-libs/gtk:4[X?,wayland?] ) !gtk4? ( x11-libs/gtk+:3[X?,wayland?] ) ) !!sys-devel/llvm:0
-DESCRIPTION=Open-source version of Google Chrome web browser
-EAPI=8
-HOMEPAGE=https://chromium.org/
-INHERIT=check-reqs chromium-2 desktop flag-o-matic llvm ninja-utils pax-utils python-any-r1 readme.gentoo-r1 toolchain-funcs xdg-utils
-IUSE=+X component-build cups cpu_flags_arm_neon debug gtk4 +hangouts headless +js-type-check kerberos libcxx lto +official pic +proprietary-codecs pulseaudio screencast selinux +suid +system-ffmpeg +system-harfbuzz +system-icu +system-png vaapi wayland widevine custom-cflags +l10n_af +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_ur +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=amd64 arm64
-LICENSE=BSD
-RDEPEND=system-icu? ( >=dev-libs/icu-71.1:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= !libcxx? ( >=dev-libs/re2-0.2019.08.01:= ) dev-libs/libxslt:= media-libs/fontconfig:= >=media-libs/freetype-2.11.0-r1:= system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] ) media-libs/libjpeg-turbo:= system-png? ( media-libs/libpng:=[-apng] ) >=media-libs/libwebp-0.4.0:= media-libs/mesa:=[gbm(+)] >=media-libs/openh264-1.6.0:= sys-libs/zlib:= x11-libs/libdrm:= !headless? ( dev-libs/glib:2 >=media-libs/alsa-lib-1.0.19:= pulseaudio? ( media-sound/pulseaudio:= ) sys-apps/pciutils:= kerberos? ( virtual/krb5 ) vaapi? ( >=x11-libs/libva-2.7:=[X?,wayland?] ) X? ( x11-libs/libX11:= x11-libs/libXext:= x11-libs/libxcb:= ) x11-libs/libxkbcommon:= wayland? ( dev-libs/wayland:= screencast? ( media-video/pipewire:= ) ) ) app-arch/bzip2:= dev-libs/expat:= system-ffmpeg? ( >=media-video/ffmpeg-4.3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) >=media-libs/opus-1.3.1:= ) net-misc/curl[ssl] sys-apps/dbus:= media-libs/flac:= sys-libs/zlib:=[minizip] !headless? ( X? ( x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libxshmfence:= ) >=app-accessibility/at-spi2-atk-2.26:2 >=app-accessibility/at-spi2-core-2.26:2 >=dev-libs/atk-2.26 media-libs/mesa:=[X?,wayland?] cups? ( >=net-print/cups-1.3.11:= ) virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/pango:= ) !headless? ( || ( x11-libs/gtk+:3[X?,wayland?] gui-libs/gtk:4[X?,wayland?] ) x11-misc/xdg-utils ) virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium )
-REQUIRED_USE=component-build? ( !suid !libcxx ) screencast? ( wayland ) !headless ( || ( X wayland ) )
-SLOT=0/stable
-SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-103.0.5060.134.tar.xz https://github.com/stha09/chromium-patches/releases/download/chromium-103-patchset-4/chromium-103-patchset-4.tar.xz
-_eclasses_=check-reqs 5e6dfbd7a8d3238a79f009fae7ac469c chromium-2 1004ce9fd1ae9622a0b7eabcd8fc0d69 desktop 22952d8f27cac191d75529d4c38e6bfa flag-o-matic 38d6ec96711cea42a5cb1cc723a6e906 linux-info 56708ddc53d8b607ed88fd97a56e59dc llvm 1c0b36f6ee2ff37bb9ab25cf23563030 multilib 5ca4e49abed8e3a2f7b56920eadee157 multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 ninja-utils 58ec4e54962bf45d065fb95030701514 pax-utils 91d47e5d20627c717aa878b9167c62a8 python-any-r1 a3e9c0524a795d7f2767a2cf12a2e8c0 python-utils-r1 dd5e1098e305ad508d21f496e9e37046 readme.gentoo-r1 b776ad4b42f564c406a95c41ccb42c55 toolchain-funcs 1542e649be915f43f6908a9e93909961 xdg-utils fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=f0423cd12ec7d27f7f56d856a7908c0a
diff --git a/metadata/md5-cache/www-client/chromium-104.0.5112.101 b/metadata/md5-cache/www-client/chromium-104.0.5112.101
index 1e047ba62408..08f2c41c5019 100644
--- a/metadata/md5-cache/www-client/chromium-104.0.5112.101
+++ b/metadata/md5-cache/www-client/chromium-104.0.5112.101
@@ -6,11 +6,11 @@ EAPI=8
HOMEPAGE=https://chromium.org/
INHERIT=check-reqs chromium-2 desktop flag-o-matic llvm ninja-utils pax-utils python-any-r1 readme.gentoo-r1 toolchain-funcs virtualx xdg-utils
IUSE=+X component-build cups cpu_flags_arm_neon debug gtk4 +hangouts headless +js-type-check kerberos libcxx lto +official pgo pic +proprietary-codecs pulseaudio screencast selinux +suid +system-ffmpeg +system-harfbuzz +system-icu +system-png vaapi wayland widevine custom-cflags +l10n_af +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_ur +l10n_vi +l10n_zh-CN +l10n_zh-TW pgo
-KEYWORDS=~amd64 arm64
+KEYWORDS=amd64 arm64
LICENSE=BSD
RDEPEND=system-icu? ( >=dev-libs/icu-71.1:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= !libcxx? ( >=dev-libs/re2-0.2019.08.01:= ) dev-libs/libxslt:= media-libs/fontconfig:= >=media-libs/freetype-2.11.0-r1:= system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] ) media-libs/libjpeg-turbo:= system-png? ( media-libs/libpng:=[-apng] ) >=media-libs/libwebp-0.4.0:= media-libs/mesa:=[gbm(+)] >=media-libs/openh264-1.6.0:= sys-libs/zlib:= x11-libs/libdrm:= !headless? ( dev-libs/glib:2 >=media-libs/alsa-lib-1.0.19:= pulseaudio? ( media-sound/pulseaudio:= ) sys-apps/pciutils:= kerberos? ( virtual/krb5 ) vaapi? ( >=x11-libs/libva-2.7:=[X?,wayland?] ) X? ( x11-libs/libX11:= x11-libs/libXext:= x11-libs/libxcb:= ) x11-libs/libxkbcommon:= wayland? ( dev-libs/wayland:= screencast? ( media-video/pipewire:= ) ) ) app-arch/bzip2:= dev-libs/expat:= system-ffmpeg? ( >=media-video/ffmpeg-4.3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) >=media-libs/opus-1.3.1:= ) net-misc/curl[ssl] sys-apps/dbus:= media-libs/flac:= sys-libs/zlib:=[minizip] !headless? ( X? ( x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libxshmfence:= ) >=app-accessibility/at-spi2-atk-2.26:2 >=app-accessibility/at-spi2-core-2.26:2 >=dev-libs/atk-2.26 media-libs/mesa:=[X?,wayland?] cups? ( >=net-print/cups-1.3.11:= ) virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/pango:= ) !headless? ( || ( x11-libs/gtk+:3[X?,wayland?] gui-libs/gtk:4[X?,wayland?] ) x11-misc/xdg-utils ) virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium )
REQUIRED_USE=component-build? ( !suid !libcxx ) screencast? ( wayland ) !headless? ( || ( X wayland ) ) pgo? ( X !wayland )
SLOT=0/stable
SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-104.0.5112.101.tar.xz https://github.com/stha09/chromium-patches/releases/download/chromium-104-patchset-2/chromium-104-patchset-2.tar.xz pgo? ( https://blackhole.sk/~kabel/src/chromium-profiler-0.1.tar )
_eclasses_=check-reqs 5e6dfbd7a8d3238a79f009fae7ac469c chromium-2 1004ce9fd1ae9622a0b7eabcd8fc0d69 desktop 22952d8f27cac191d75529d4c38e6bfa flag-o-matic 38d6ec96711cea42a5cb1cc723a6e906 linux-info 56708ddc53d8b607ed88fd97a56e59dc llvm 1c0b36f6ee2ff37bb9ab25cf23563030 multilib 5ca4e49abed8e3a2f7b56920eadee157 multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 ninja-utils 58ec4e54962bf45d065fb95030701514 pax-utils 91d47e5d20627c717aa878b9167c62a8 python-any-r1 a3e9c0524a795d7f2767a2cf12a2e8c0 python-utils-r1 dd5e1098e305ad508d21f496e9e37046 readme.gentoo-r1 b776ad4b42f564c406a95c41ccb42c55 toolchain-funcs 1542e649be915f43f6908a9e93909961 virtualx 644887c82aefdf12001489391fca4f02 xdg-utils fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=cb6cff9be393f06fecea27b8482ee1d5
+_md5_=e795b4f715da0d330ecccb0dd1b75bea
diff --git a/metadata/md5-cache/www-client/chromium-104.0.5112.79 b/metadata/md5-cache/www-client/chromium-104.0.5112.79
deleted file mode 100644
index 55dcd5afbd94..000000000000
--- a/metadata/md5-cache/www-client/chromium-104.0.5112.79
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=system-icu? ( >=dev-libs/icu-71.1:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= !libcxx? ( >=dev-libs/re2-0.2019.08.01:= ) dev-libs/libxslt:= media-libs/fontconfig:= >=media-libs/freetype-2.11.0-r1:= system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] ) media-libs/libjpeg-turbo:= system-png? ( media-libs/libpng:=[-apng] ) >=media-libs/libwebp-0.4.0:= media-libs/mesa:=[gbm(+)] >=media-libs/openh264-1.6.0:= sys-libs/zlib:= x11-libs/libdrm:= !headless? ( dev-libs/glib:2 >=media-libs/alsa-lib-1.0.19:= pulseaudio? ( media-sound/pulseaudio:= ) sys-apps/pciutils:= kerberos? ( virtual/krb5 ) vaapi? ( >=x11-libs/libva-2.7:=[X?,wayland?] ) X? ( x11-libs/libX11:= x11-libs/libXext:= x11-libs/libxcb:= ) x11-libs/libxkbcommon:= wayland? ( dev-libs/wayland:= screencast? ( media-video/pipewire:= ) ) ) || ( >=dev-lang/python-3.10.4:3.10[xml] >=dev-lang/python-3.9.12:3.9[xml] >=dev-lang/python-3.8.13:3.8[xml] ) || ( ( >=dev-lang/python-3.10.4:3.10[xml] dev-python/setuptools[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9[xml] dev-python/setuptools[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8[xml] dev-python/setuptools[python_targets_python3_8(-)] ) ) >=app-arch/gzip-1.7 libcxx? ( >=sys-devel/clang-12 ) lto? ( || ( ( sys-devel/clang:13 sys-devel/llvm:13 =sys-devel/lld-13* ) ( sys-devel/clang:14 sys-devel/llvm:14 =sys-devel/lld-14* ) ) ) pgo? ( >=dev-python/selenium-3.141.0 >=dev-util/web_page_replay_go-20220314 || ( ( sys-devel/clang:13 sys-devel/llvm:13 =sys-devel/lld-13* ) ( sys-devel/clang:14 sys-devel/llvm:14 =sys-devel/lld-14* ) ) ) dev-lang/perl >=dev-util/gn-0.1807 >=dev-util/gperf-3.0.3 >=dev-util/ninja-1.7.2 dev-vcs/git >=net-libs/nodejs-7.6.0[inspector] >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig js-type-check? ( virtual/jre ) pgo? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup
-DEPEND=system-icu? ( >=dev-libs/icu-71.1:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= !libcxx? ( >=dev-libs/re2-0.2019.08.01:= ) dev-libs/libxslt:= media-libs/fontconfig:= >=media-libs/freetype-2.11.0-r1:= system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] ) media-libs/libjpeg-turbo:= system-png? ( media-libs/libpng:=[-apng] ) >=media-libs/libwebp-0.4.0:= media-libs/mesa:=[gbm(+)] >=media-libs/openh264-1.6.0:= sys-libs/zlib:= x11-libs/libdrm:= !headless? ( dev-libs/glib:2 >=media-libs/alsa-lib-1.0.19:= pulseaudio? ( media-sound/pulseaudio:= ) sys-apps/pciutils:= kerberos? ( virtual/krb5 ) vaapi? ( >=x11-libs/libva-2.7:=[X?,wayland?] ) X? ( x11-libs/libX11:= x11-libs/libXext:= x11-libs/libxcb:= ) x11-libs/libxkbcommon:= wayland? ( dev-libs/wayland:= screencast? ( media-video/pipewire:= ) ) ) app-arch/bzip2:= dev-libs/expat:= system-ffmpeg? ( >=media-video/ffmpeg-4.3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) >=media-libs/opus-1.3.1:= ) net-misc/curl[ssl] sys-apps/dbus:= media-libs/flac:= sys-libs/zlib:=[minizip] !headless? ( X? ( x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libxshmfence:= ) >=app-accessibility/at-spi2-atk-2.26:2 >=app-accessibility/at-spi2-core-2.26:2 >=dev-libs/atk-2.26 media-libs/mesa:=[X?,wayland?] cups? ( >=net-print/cups-1.3.11:= ) virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/pango:= ) !headless? ( gtk4? ( gui-libs/gtk:4[X?,wayland?] ) !gtk4? ( x11-libs/gtk+:3[X?,wayland?] ) ) !!sys-devel/llvm:0
-DESCRIPTION=Open-source version of Google Chrome web browser
-EAPI=8
-HOMEPAGE=https://chromium.org/
-INHERIT=check-reqs chromium-2 desktop flag-o-matic llvm ninja-utils pax-utils python-any-r1 readme.gentoo-r1 toolchain-funcs virtualx xdg-utils
-IUSE=+X component-build cups cpu_flags_arm_neon debug gtk4 +hangouts headless +js-type-check kerberos libcxx lto +official pgo pic +proprietary-codecs pulseaudio screencast selinux +suid +system-ffmpeg +system-harfbuzz +system-icu +system-png vaapi wayland widevine custom-cflags +l10n_af +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_ur +l10n_vi +l10n_zh-CN +l10n_zh-TW pgo
-KEYWORDS=~amd64 ~arm64
-LICENSE=BSD
-RDEPEND=system-icu? ( >=dev-libs/icu-71.1:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= !libcxx? ( >=dev-libs/re2-0.2019.08.01:= ) dev-libs/libxslt:= media-libs/fontconfig:= >=media-libs/freetype-2.11.0-r1:= system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] ) media-libs/libjpeg-turbo:= system-png? ( media-libs/libpng:=[-apng] ) >=media-libs/libwebp-0.4.0:= media-libs/mesa:=[gbm(+)] >=media-libs/openh264-1.6.0:= sys-libs/zlib:= x11-libs/libdrm:= !headless? ( dev-libs/glib:2 >=media-libs/alsa-lib-1.0.19:= pulseaudio? ( media-sound/pulseaudio:= ) sys-apps/pciutils:= kerberos? ( virtual/krb5 ) vaapi? ( >=x11-libs/libva-2.7:=[X?,wayland?] ) X? ( x11-libs/libX11:= x11-libs/libXext:= x11-libs/libxcb:= ) x11-libs/libxkbcommon:= wayland? ( dev-libs/wayland:= screencast? ( media-video/pipewire:= ) ) ) app-arch/bzip2:= dev-libs/expat:= system-ffmpeg? ( >=media-video/ffmpeg-4.3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) >=media-libs/opus-1.3.1:= ) net-misc/curl[ssl] sys-apps/dbus:= media-libs/flac:= sys-libs/zlib:=[minizip] !headless? ( X? ( x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libxshmfence:= ) >=app-accessibility/at-spi2-atk-2.26:2 >=app-accessibility/at-spi2-core-2.26:2 >=dev-libs/atk-2.26 media-libs/mesa:=[X?,wayland?] cups? ( >=net-print/cups-1.3.11:= ) virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/pango:= ) !headless? ( || ( x11-libs/gtk+:3[X?,wayland?] gui-libs/gtk:4[X?,wayland?] ) x11-misc/xdg-utils ) virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium )
-REQUIRED_USE=component-build? ( !suid !libcxx ) screencast? ( wayland ) !headless? ( || ( X wayland ) ) pgo? ( X !wayland )
-SLOT=0/stable
-SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-104.0.5112.79.tar.xz https://github.com/stha09/chromium-patches/releases/download/chromium-104-patchset-2/chromium-104-patchset-2.tar.xz pgo? ( https://blackhole.sk/~kabel/src/chromium-profiler-0.1.tar )
-_eclasses_=check-reqs 5e6dfbd7a8d3238a79f009fae7ac469c chromium-2 1004ce9fd1ae9622a0b7eabcd8fc0d69 desktop 22952d8f27cac191d75529d4c38e6bfa flag-o-matic 38d6ec96711cea42a5cb1cc723a6e906 linux-info 56708ddc53d8b607ed88fd97a56e59dc llvm 1c0b36f6ee2ff37bb9ab25cf23563030 multilib 5ca4e49abed8e3a2f7b56920eadee157 multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 ninja-utils 58ec4e54962bf45d065fb95030701514 pax-utils 91d47e5d20627c717aa878b9167c62a8 python-any-r1 a3e9c0524a795d7f2767a2cf12a2e8c0 python-utils-r1 dd5e1098e305ad508d21f496e9e37046 readme.gentoo-r1 b776ad4b42f564c406a95c41ccb42c55 toolchain-funcs 1542e649be915f43f6908a9e93909961 virtualx 644887c82aefdf12001489391fca4f02 xdg-utils fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=32b0eef2d337ccad1dcd2935d45cee05
diff --git a/metadata/md5-cache/www-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz
index 1cfb4e751c28..badc27365f9a 100644
--- a/metadata/md5-cache/www-servers/Manifest.gz
+++ b/metadata/md5-cache/www-servers/Manifest.gz
Binary files differ
diff --git a/metadata/md5-cache/www-servers/tomcat-10.0.22 b/metadata/md5-cache/www-servers/tomcat-10.0.22
deleted file mode 100644
index a427eaea4d32..000000000000
--- a/metadata/md5-cache/www-servers/tomcat-10.0.22
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
-DEPEND=dev-java/eclipse-ecj:4.15 dev-java/glassfish-xmlrpc-api:0 dev-java/jakartaee-migration:0 ~dev-java/tomcat-servlet-api-10.0.22:5.0 dev-java/wsdl4j:0 app-admin/pwgen dev-java/ant-core >=virtual/jdk-1.8:* test? ( dev-java/ant-junit:0 dev-java/easymock:3.2 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=Tomcat Servlet-5.0/JSP-3.0/EL-4.0/WebSocket-2.0/JASIC-2.0 Container
-EAPI=8
-HOMEPAGE=https://tomcat.apache.org/
-INHERIT=java-pkg-2 java-ant-2 prefix
-IUSE=extra-webapps doc source test
-KEYWORDS=amd64 ~amd64-linux
-LICENSE=Apache-2.0
-RDEPEND=dev-java/eclipse-ecj:4.15 dev-java/glassfish-xmlrpc-api:0 dev-java/jakartaee-migration:0 ~dev-java/tomcat-servlet-api-10.0.22:5.0 dev-java/wsdl4j:0 acct-group/tomcat acct-user/tomcat virtual/jre >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test !test? ( test )
-SLOT=10
-SRC_URI=mirror://apache/tomcat/tomcat-10/v10.0.22/src/apache-tomcat-10.0.22-src.tar.gz https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/6.2.0/biz.aQute.bnd-6.2.0.jar https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/6.2.0/biz.aQute.bndlib-6.2.0.jar
-_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 c79d65661a9f4f72b60376c9e4b3dfa1 multilib 5ca4e49abed8e3a2f7b56920eadee157 prefix eab3c99d77fe00506c109c8a736186f7 toolchain-funcs 1542e649be915f43f6908a9e93909961
-_md5_=b24ff14ee46257c4632ef9a322fd7e9d
diff --git a/metadata/md5-cache/www-servers/tomcat-8.5.81 b/metadata/md5-cache/www-servers/tomcat-8.5.81
deleted file mode 100644
index 97a7a316465d..000000000000
--- a/metadata/md5-cache/www-servers/tomcat-8.5.81
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DEPEND=dev-java/eclipse-ecj:4.15 ~dev-java/tomcat-servlet-api-8.5.81:3.1 app-admin/pwgen dev-java/ant-core >=virtual/jdk-1.8:* doc? ( dev-java/glassfish-xmlrpc-api:0 dev-java/wsdl4j:0 ) test? ( >=dev-java/ant-junit-1.9:0 dev-java/easymock:3.2 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container
-EAPI=8
-HOMEPAGE=https://tomcat.apache.org/
-INHERIT=java-pkg-2 java-ant-2 prefix
-IUSE=extra-webapps doc source test
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=dev-java/eclipse-ecj:4.15 ~dev-java/tomcat-servlet-api-8.5.81:3.1 acct-group/tomcat acct-user/tomcat >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test !test? ( test )
-SLOT=8.5
-SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.81/src/apache-tomcat-8.5.81-src.tar.gz
-_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 c79d65661a9f4f72b60376c9e4b3dfa1 multilib 5ca4e49abed8e3a2f7b56920eadee157 prefix eab3c99d77fe00506c109c8a736186f7 toolchain-funcs 1542e649be915f43f6908a9e93909961
-_md5_=a349f6c83e999bc4dc1e10e73c82d933
diff --git a/metadata/md5-cache/www-servers/tomcat-9.0.64 b/metadata/md5-cache/www-servers/tomcat-9.0.64
deleted file mode 100644
index fb7db3363ebe..000000000000
--- a/metadata/md5-cache/www-servers/tomcat-9.0.64
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
-DEPEND=dev-java/eclipse-ecj:4.15 dev-java/glassfish-xmlrpc-api:0 ~dev-java/tomcat-servlet-api-9.0.64:4.0 dev-java/wsdl4j:0 app-admin/pwgen >=dev-java/ant-core-1.9.13 >=virtual/jdk-1.8:* test? ( >=dev-java/ant-junit-1.9:0 dev-java/easymock:3.2 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=Tomcat Servlet-4.0/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container
-EAPI=8
-HOMEPAGE=https://tomcat.apache.org/
-INHERIT=java-pkg-2 java-ant-2 prefix
-IUSE=extra-webapps doc source test
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=dev-java/eclipse-ecj:4.15 dev-java/glassfish-xmlrpc-api:0 ~dev-java/tomcat-servlet-api-9.0.64:4.0 dev-java/wsdl4j:0 acct-group/tomcat acct-user/tomcat >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test !test? ( test )
-SLOT=9
-SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.64/src/apache-tomcat-9.0.64-src.tar.gz https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/6.2.0/biz.aQute.bnd-6.2.0.jar https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/6.2.0/biz.aQute.bndlib-6.2.0.jar
-_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 c79d65661a9f4f72b60376c9e4b3dfa1 multilib 5ca4e49abed8e3a2f7b56920eadee157 prefix eab3c99d77fe00506c109c8a736186f7 toolchain-funcs 1542e649be915f43f6908a9e93909961
-_md5_=9011e000813038b08b10f89c4ceccac9
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index a65e53196b4e..7ef371aeb3dd 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
Hash: SHA512
MANIFEST Manifest.files.gz 14053 BLAKE2B c0a5bea7cd069c2e9b07dab158b876c74e027945a8fdd50fee280ec7abb59b03a223e89d53d1563fc784c8a353890e9928577f3cf4c4daaf3eebee6f871aa5c0 SHA512 43691780e35724149b779ecf32c3d83556a2e30fb3c35c56b8841fc4c866de83cb09e4b9be3071940181a4933de197417647dd3921df2f61e100510b23a9e327
-TIMESTAMP 2022-08-21T00:39:49Z
+TIMESTAMP 2022-08-21T06:39:52Z
-----BEGIN PGP SIGNATURE-----
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmMBftVfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmMB0zhfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBe6hAAsYmb8NgToPEOGWktxcclwvz8+uJg+baVcar/jK+DnO8UG9uxn/6alWLg
-kKj215Oi+6D31ZeHQmSTWVZK/Fhz3aA1jpO0U3SSy7P4ZETQt7hYPvwKhxOxml7A
-vXLzuhqQoTy71r1OUeP49s6zS1MERIyYxmYGObKc902uy/vPINw4g5EwFSaD32HS
-TSuB0CctAUl+d0ZaHJk2kmY57Mkh4WQbKxwCr/fH1j9Ex9LChWbfoV1qj0Jq22xn
-STw0KcQmEJYCfDhsJhyxBLPm07bJMfEY0HgSUY3LHZSdZVVeR8SioLXLRJ/eX+nm
-BHmLHBR9srSm7HwSyjEsMAMWM7dopTq8Be/1WXw3Guf8M9vMkZ4awEsr98OrleEx
-zATfTLRGpVDky9GOcyZC0mbsO6HJA6C852hb0YvJF+I6kjcCPH1wdj/cLMx4RQdT
-CaGQgUbd1Q8MBRFR6oaM8cUkIcGIIoEvqtCxTlKSeQMefDYTXvmunyCqxZahDWQD
-N4kPX6m7ctz+u92XRrw8cpNpTeQ47B1bbb4vPf/hcuWUiPXDz2E3dIqkIwhCHXuB
-1T+0TFUiVHtMNZECQVC2JnJxnSPP/g4sbuBhRIvv4VVhWoRToHg8orFFG1iLFuct
-mH07e7+LI1gD3ahfo9onOv0sLyjZOGjbahFfQCx7jjRPhcR7j9E=
-=u/2c
+klCgqxAAky81SDy5gP0IbEp9uZNdGQYu51Ha5RttrGVd3EWsPXbboYkobBeSQ0Gd
+zSVSYfDDoIOVU0uGoDpTOeGGlLUIXpvMUqSDHObIFkFMdYYeVnB45kgy7LazVysb
+n8OUjIwZa97R7CiTqIHGP1lbqfEFArveEgZSfpyxdM0ykRH4qiEyvcOCSD8rn4aa
+wzuNtE/vV1FG95LuYozYLB+fBgKot0y6vSPLlHPnfWdFBvhnR2q7Ul9nk9PZimen
+iahjWyZi8aMVEVE4wH2Fm+m9l75h+D3yQwyRefQrwmFWfCdPiXKBUzp04CLfLjgv
+Qoz5r9fZp9JgJlI+y+QV1wO4Undd9/RX9obML9h67BW/7mrkwR8qun+QzHkQFt3D
+fSzK9FEgLO0FpndKZn6HR2Dj1UgelDyy/fc+qS7lxe7hoLGQYivIwqHAv+astJAc
+pLnW7R5nQjiSYJ8J8Ao5GW4GKPXYIplbTrgz7cIKPGHAXR9/0Ik9gQUY0RVPtzQi
+h6TrB0tDpJFzdL92vQMmIErg8uJHdwvhg3WP2MF7MV6XIVDZG1PdXwTObmIil705
+JckXeu2f1hOuNp6ck5yFvMwKjM/U/Q3WwsbF2ZJJpRD27D0q8RZH1UMF+u5L/WGv
+DzXziA4zgPhEpvXTqgPvhaZ/KrS80X7pPqarIB/oQ0i2HXRtGhw=
+=OLrA
-----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 4a43529b82e0..db92fb500a6f 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sun, 21 Aug 2022 00:39:46 +0000
+Sun, 21 Aug 2022 06:39:50 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index c3a803abb705..9520d52a1f7c 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sun Aug 21 12:39:46 AM UTC 2022
+Sun Aug 21 06:39:49 AM UTC 2022
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index cd055a6cfbe1..c0f81943b137 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sun, 21 Aug 2022 00:45:01 +0000
+Sun, 21 Aug 2022 06:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index c12c25bec846..b1dd0cfffc08 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-efdee14e338440b65508eb1d3da75334d15b14fe 1661041845 2022-08-21T00:30:45+00:00
+3919cf9eb8bd6cdf061342b8c7f1cd7f7f50a08c 1661062989 2022-08-21T06:23:09+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 43621538f65c..57c766bd9973 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1661042401 Sun 21 Aug 2022 12:40:01 AM UTC
+1661064001 Sun 21 Aug 2022 06:40:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 4a43529b82e0..5026473316b2 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Sun, 21 Aug 2022 00:39:46 +0000
+Sun, 21 Aug 2022 06:39:49 +0000
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 12429650211e..0b9a6548e1d1 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
Binary files differ
diff --git a/profiles/default/linux/musl/package.mask b/profiles/default/linux/musl/package.mask
index c90ad0cedaf6..369b436b9733 100644
--- a/profiles/default/linux/musl/package.mask
+++ b/profiles/default/linux/musl/package.mask
@@ -82,9 +82,3 @@ media-video/binkplayer
# Binary package for glibc. Could be built from source but would take ages and
# isn't worth the maintenance cost.
dev-libs/nwjs
-
-# Ian Stakenvicius, 2017-06-14
-# on behalf of mozilla@gentoo.org
-# Mask firefox-54 and above as it requires rust
-# now, and rust reportedly will not build yet.
->=www-client/firefox-54.0
diff --git a/profiles/features/musl/package.mask b/profiles/features/musl/package.mask
index 63dd6903ed0a..6b934461e79c 100644
--- a/profiles/features/musl/package.mask
+++ b/profiles/features/musl/package.mask
@@ -291,12 +291,6 @@ sys-apps/systemd
# systemd sources fail to build without glibc
sys-boot/systemd-boot
-# Ian Stakenvicius <axs@gentoo.org> (2017-06-14)
-# (on behalf of <mozilla@gentoo.org>)
-# Mask firefox-54 and above as it requires rust
-# now, and rust reportedly will not build yet.
->=www-client/firefox-54.0
-
# rust-bin requires a glibc system
dev-lang/rust-bin
mail-client/thunderbird-bin
diff --git a/profiles/features/musl/package.use.mask b/profiles/features/musl/package.use.mask
index 24959cbeda7e..53a1c21b3025 100644
--- a/profiles/features/musl/package.use.mask
+++ b/profiles/features/musl/package.use.mask
@@ -1,6 +1,11 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
+# Alfred Persson Forsberg <cat@catcream.org> (2022-07-27)
+# Firefox does not build with these flags enabled on musl libc.
+# See bug #829033
+www-client/firefox clang pgo
+
# Ionen Wolkens <ionen@gentoo.org (2022-06-08)
# Depends on www-plugins/chrome-binary-plugins which is masked here.
www-client/qutebrowser widevine
@@ -38,7 +43,6 @@ sys-apps/sysvinit nls
# Disable some sanitizers for LLVM, see bug #753935
# Needs libexecinfo on musl, not yet packaged
sys-libs/compiler-rt-sanitizers gwp-asan
-<sys-libs/compiler-rt-sanitizers-13 libfuzzer
# Sam James <sam@gentoo.org> (2021-11-07)
# Broken as "error: unknown type name '_Unwind_Word'"
diff --git a/profiles/package.mask b/profiles/package.mask
index d0b1326f4f14..f86a28e15e18 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,140 @@
#--- END OF EXAMPLES ---
+# hololeap <hololeap@protonmail.com> (2022-08-21)
+# Monolithic mask for dev-haskell/* packages which have no reverse dependencies,
+# are broken, or severely out of date. The aim is to have the Haskell overlay
+# (::haskell) be the place for development packages and only have packages
+# needed for end-user applications in ::gentoo, as the status quo has
+# proven to be unsustainable. More up-to-date versions of these packages
+# are available in ::haskell.
+# Removal on 2022-09-19.
+app-portage/fquery
+dev-games/goatee
+dev-haskell/megaparsec
+dev-haskell/parser-combinators
+dev-haskell/megaparsec-tests
+dev-haskell/hspec-megaparsec
+dev-haskell/neat-interpolation
+dev-haskell/stack
+dev-haskell/abstract-deque-tests
+dev-haskell/aeson-diff
+dev-haskell/annotated-wl-pprint
+dev-haskell/authenticate-oauth
+dev-haskell/base-prelude
+dev-haskell/base-unicode-symbols
+dev-haskell/casa-client
+dev-haskell/casa-types
+dev-haskell/cipher-aes128
+dev-haskell/concurrent-extra
+dev-haskell/configurator
+dev-haskell/contravariant-extras
+dev-haskell/convertible
+dev-haskell/cpphs
+dev-haskell/crypto-pubkey-types
+dev-haskell/cryptohash
+dev-haskell/cryptohash-cryptoapi
+dev-haskell/data-default-instances-base
+dev-haskell/dns
+dev-haskell/drbg
+dev-haskell/edit-distance-vector
+dev-haskell/either
+dev-haskell/errorcall-eq-instance
+dev-haskell/filelock
+dev-haskell/filemanip
+dev-haskell/filepattern
+dev-haskell/fsnotify
+dev-haskell/ghc-lib-parser
+dev-haskell/ghc-lib-parser-ex
+dev-haskell/githash
+dev-haskell/groupoids
+dev-haskell/groups
+dev-haskell/haddock
+dev-haskell/haddock-api
+dev-haskell/hashable-time
+dev-haskell/hashtables
+dev-haskell/haskell-src-meta
+dev-haskell/hdbc
+dev-haskell/hdbc-odbc
+dev-haskell/hdbc-postgresql
+dev-haskell/hdbc-sqlite3
+dev-haskell/hi-file-parser
+dev-haskell/hlint
+dev-haskell/hpack
+dev-haskell/hslogger
+dev-haskell/hsopenssl
+dev-haskell/hsyaml-aeson
+dev-haskell/http-common
+dev-haskell/http-download
+dev-haskell/http-streams
+dev-haskell/hxt
+dev-haskell/hxt-charproperties
+dev-haskell/hxt-regex-xmlschema
+dev-haskell/hxt-unicode
+dev-haskell/infer-license
+dev-haskell/interpolate
+dev-haskell/io-streams
+dev-haskell/io-streams-haproxy
+dev-haskell/iwlib
+dev-haskell/js-flot
+dev-haskell/js-jquery
+dev-haskell/keys
+dev-haskell/lens-aeson
+dev-haskell/memotrie
+dev-haskell/mintty
+dev-haskell/missingh
+dev-haskell/mustache
+dev-haskell/newtype-generics
+dev-haskell/open-browser
+dev-haskell/openssl-streams
+dev-haskell/optparse-simple
+dev-haskell/pantry
+dev-haskell/parallel-io
+dev-haskell/path-io
+dev-haskell/pointed
+dev-haskell/polyparse
+dev-haskell/prettyclass
+dev-haskell/project-template
+dev-haskell/readable
+dev-haskell/rebase
+dev-haskell/refact
+dev-haskell/regex-applicative-text
+dev-haskell/regex-compat-tdfa
+dev-haskell/regex-pcre
+dev-haskell/rerebase
+dev-haskell/rfc5051
+dev-haskell/rio-orphans
+dev-haskell/rio-prettyprint
+dev-haskell/rsa
+dev-haskell/selective
+dev-haskell/snap-core
+dev-haskell/snap-server
+dev-haskell/tar-conduit
+dev-haskell/template-haskell-compat-v0208
+dev-haskell/text-metrics
+dev-haskell/th-expand-syns
+dev-haskell/th-orphans
+dev-haskell/th-reify-many
+dev-haskell/threads
+dev-haskell/vector-builder
+dev-haskell/vector-instances
+dev-haskell/weigh
+dev-haskell/wreq
+dev-haskell/xhtml
+dev-haskell/zlib-bindings
+dev-util/shelltestrunner
+net-mail/list-remote-forwards
+net-mail/mailbox-count
+net-misc/haeredes
+net-misc/hath
+dev-util/bnfc
+
+# hololeap <hololeap@protonmail.com> (2022-08-21)
+# doctest-parallel does not currently work with Setup.hs (used internally by
+# haskell-cabal.eclass)
+# See: <https://github.com/martijnbastiaan/doctest-parallel/issues/45>
+dev-haskell/doctest-parallel
+
# John Helmert III <ajak@gentoo.org> (2022-08-16)
# Multiple vulnerabilities, unmaintained upstream, EAPI 6. Removal in 30
# days, bug #830138
@@ -70,6 +204,12 @@ sys-cluster/slurm
net-misc/calico-cni-plugin
net-misc/calicoctl
+# Sam James <sam@gentoo.org> (2022-08-14)
+# Removes MSVC functionality which some packages are relying on - they
+# need time to adapt to upstream setuptools changes.
+# bug #865183.
+=dev-python/setuptools-65.0.0
+
# John Helmert III <ajak@gentoo.org> (2022-08-14)
# Vulnerable and unmaintained for years, many open bugs, no revdeps
# Removal in 30 days, bug #631140
@@ -495,11 +635,35 @@ sci-libs/io_lib
# Removal on 2022-08-18.
kde-misc/plasma-applet-weather-widget
+# Sam James <sam@gentoo.org> (2022-07-17)
+# Code quality issues, out of date by several versions in Gentoo,
+# unmaintained, and several open bugs: bugs #521272, #729684, #855230.
+# Removal on 2022-08-17.
+dev-db/gigabase
+
# Hans de Graaff <graaff@gentoo.org> (2022-07-16)
# No longer supported upstream. Use a newer ruby version instead.
# Masked for removal in 30 days.
dev-lang/ruby:2.6
+# Sam James <sam@gentoo.org> (2022-07-15)
+# No activity upstream since early 2021, uses deprecated Go eclass,
+# open bugs: bug #680358, bug #844694. Removal on 2022-08-15.
+dev-util/docker-ls
+
+# Bernard Cafarelli <voyageur@gentoo.org> (2022-07-14)
+# Dead upstream (last release in 2013, no tarballs or git download)
+# No reverse dependencies for a long time, several test and build failures
+# Bug #857948, removal on 2022-08-13.
+net-misc/csync
+
+# David Seifert <soap@gentoo.org> (2022-07-14)
+# Unmaintained, no other major distro carries this, code quality is
+# abysmal, build system has major issues, tons of patches, EAPI 6,
+# no other revdeps in tree. Bug #822762, #831874, removal on 2022-08-13.
+sci-visualization/opendx
+sci-visualization/opendx-samples
+
# Marek Szuba <marecki@gentoo.org> (2022-07-13)
# Upstream has switched from CMake to hand-crafted Makefiles (yes, TO them),
# which have seriously messed up dependency handling and trigger several
@@ -507,6 +671,26 @@ dev-lang/ruby:2.6
# and the jumbo patch fixing the former has been thoroughly tested.
>media-gfx/gmic-3.1.0
+# Volkmar W. Pogatzki <gentoo@pogatzki.net> (2022-07-12)
+# Unused java libraries, all asm-* included in dev-java/asm,
+# log4j-api-java9 never to be used as a package. Removal on 2022-08-12.
+dev-java/asm-analysis
+dev-java/asm-commons
+dev-java/asm-tree
+dev-java/asm-util
+dev-java/log4j-api-java9
+
+# Sam James <sam@gentoo.org> (2022-07-12)
+# Huge number of open bugs, deprecated upstream (they recommend
+# using other video editors like Shotcut, Kdenlive, ...). Removal on 2022-08-12.
+# Bugs #372053, #438248, #740528, #778338, #832380, #834406.
+media-video/kino
+
+# Matt Turner <mattst88@gentoo.org> (2022-07-11)
+# Dead package upstream. No reverse dependencies.
+# Removal on 2022-08-11.
+x11-libs/gtk+extra
+
# Fabian Groffen <grobian@gentoo.org> (2022-07-02)
# Segfaults handling SPF validations (warn on permerror), like the
# previous release, better not to trust your important mail to
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 4e4658d644c1..d8dae55e3ec0 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -4367,6 +4367,7 @@ media-libs/mlt:rtaudio - Builds rtaudio consumer for native audio support on mul
media-libs/mlt:rubberband - Enable audio pitch-shifting using media-libs/rubberband
media-libs/mlt:vidstab - Enabled video stabilization with media-libs/vidstab
media-libs/netpbm:rle - Build converters for the RLE format (utah raster toolkit)
+media-libs/openal:pipewire - Enable support for the media-video/pipewire audio backend
media-libs/openal:sndio - Enable support for the media-sound/sndio backend
media-libs/opencv:contrib - Install user contributed scripts from opencv_contrib (Experimental!)
media-libs/opencv:contribcvv - CVV module requires Qt5
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index e54e16751876..46cdf3abb96c 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
Binary files differ
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index 40b4ff0a43d8..44f8c85f1022 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -1,5 +1,6 @@
AUX fwupd-1.8.3-docgen_deps_test.patch 671 BLAKE2B 3a39ca3d9c70fc0f18ce4d3b9efaaf2c9cba8ef11b3e9cf9501ba32a1a2e0ef6b6e59dadd0a13bffea77f227d917893609033764c0cad268fbe65826f5f6a11c SHA512 7a81b69349fecf0b9730e3c11e33044a4ee1728f8b61ee0d1e737c74f33fde737111eb7f55fc8e0975e2b72b4df08b4f9c466c4c2ab2c586f2bc1c18e046c648
AUX fwupd-1.8.3-gresource_quirks_paths.patch 421 BLAKE2B c21f9756c92fdb104bf0ac2d1edd424b9ddc68a4ca192d5569745f2ec332068c3d6d69c16c3c53652c0491a28b23c533752367341e73a7ec7dec9bac8d82709a SHA512 eb272783f1ff849190e7dbb3762b118d661aacf975516948558fedb2aceefb8fab8d1c96e165408b50bccacfce4b1046603479e7234fbf8c81a08c7d9e531128
+AUX fwupd-1.8.3-installed_tests.patch 6003 BLAKE2B 0d70f6c2d8acb905b07d4526c6298912a9665ed2303526037722e7a78eb24ba82d7bf0d3f3e893ff568286e5179419d120afcee7bfad6795987f128cdb2ee58a SHA512 d32cf37fdd689a66ae1738967ee60110771f773a7e713bfcddcd9d0e4b7dbf4f2006509b269782f14f2f5e2b01d15d14ec56d6d97f54c8ac3f56118400543e24
AUX fwupd-r2 308 BLAKE2B 4494e69515347569965f0966ce2fe0779a6273df18412b4f6045c6186730dc8088f85eb029347b01c22897662d9205f98871752dee99690871a39cbb26db3899 SHA512 0f5070dc73cb6e0cfad7a66781afb85c695faffd05685e9df8c9798b94d55b31c0977134015d0d5418f5815d10529d79c898ae0efb2bdf0dc9ee44b696d5fdd7
DIST fwupd-1.7.5.tar.gz 4014523 BLAKE2B b7297bbf3358209464691b928b928fa029c68ae6a3bc413d514409e4382bf8a3b0d57f4febc29a24d6351481474dd8111406ffdcb11125139fbc04a33ea00321 SHA512 1c2d99d905f76ebfce65db310ba0f6c1305ecf662b58bd9f6f6597ccc79cbabed126c97f2142207c99d8373ed42575363a58d9f053f390780b7c9a19c614fb31
DIST fwupd-1.7.7.tar.gz 4057638 BLAKE2B 197d7b8a8de64094d267bb4e2de30101373bcc52fd54d12dc2590a50f2bcebbcfe00847d19c0088d2c778743d219ee73c0237db711ad27e36f7126f7c615ccf7 SHA512 a787ffdff93f483ad97547d335c50a4db7b61bce1bc27d737b077bbedfa4676c8d6d37db94ac24083c50e3bfde8aefd4d1adb3d0e473303f454a46dde136df0a
@@ -10,5 +11,5 @@ EBUILD fwupd-1.7.5.ebuild 4666 BLAKE2B 947d030a4e6e65f90ce120d7c8f1b74c2096eeea9
EBUILD fwupd-1.7.7-r2.ebuild 4684 BLAKE2B 2febf3c31449381b94a4c46589017fd7ba00f262a9fb22c9dfd660018ce2acdff582116984e5e21f8f7181345c013b8eb88f14df1052633a3c29a9cb6546af50 SHA512 677ee8f9c19fc7bcc016b301d0abc9277c3ec20f8fe21cf407f68acab52f2067bb6a3366afc8dfe175ebfdd71c5c701c27d8fc8f75e47a4544f5e7ce5cee2b1a
EBUILD fwupd-1.8.0-r1.ebuild 4784 BLAKE2B eec6be280d70d15750bf9c15f875bcd5e09f4d77cb4c3b7f7f21707d45d935554cfd531dcb416fb9480849c6ce3534a31b1b78463b4bfed7f2fd79b197ea8ca1 SHA512 c1e21ddb6d20e994a7720bbcc546f1a84dfda34a813cd408ac96ba379a9d3cc2a77c5c447bc1733771dcf5553172b532fda48a9cfc2d002436c3fdf735c48588
EBUILD fwupd-1.8.1.ebuild 4922 BLAKE2B 99f3888b9c3c2ce2f793f14ccfdf7a4ce725a6c9a026cf6cb9090aaad0e800d2524932fbfccd92b6f9c1753d06aa0de010beed72dec663fb384edc376accd831 SHA512 f333e07a813fd0e25d9b48731454f450f8467e60db6732a40855c4934e9e1354da4e6f6bbab6fb0991d3502445c694b329d40eabd4ce7104a27d5c54ab84a213
-EBUILD fwupd-1.8.3.ebuild 5266 BLAKE2B d08e99c72593eea714b5f3670f44ac314cb9d40232a1c86e3a74b3035691c7bafecf7fc9d99cb07531c1c0d757df8132b2f2671303b96207765b79d22be708b8 SHA512 d12fec962668911e9d32081773301b979d342eb70760a69004a79f07ad4db5eda66092ae0a25c39c37cfde1d3339b3d19d20fb366eae22fed38095c0749a57ed
+EBUILD fwupd-1.8.3.ebuild 5315 BLAKE2B 79fb31e025d9875bf1ef93ff11bf92f4af42a73f120b89d58abd7e6989474786c86d12305dd04a6770669b35418c3ccb5ba9551c291ab8124736508236d66f61 SHA512 e23bb57626c5361f169b3d604f5586eb362c735668345f64ea3cdd5c25c7d6df647836c63e8c2766047f8b6182c8fda6cb3529e10648ad6ee921fd14a9f97491
MISC metadata.xml 1527 BLAKE2B 0cbeb805ede86d77bbd736349c84de642534059b2c90d938bd68c3caf0ff90257f3579d20eb38313f10a99f72780accd242601d778fd73386a727cad362a9f48 SHA512 9a541ecead0fc13a5cd78bcbcda425b9b2f4029dd921f01dc0ab1d2055ffcb0690d1fefdfbb98c68ef168c150178f75d085eeedf0699d35fd440d0b4d730a8d2
diff --git a/sys-apps/fwupd/files/fwupd-1.8.3-installed_tests.patch b/sys-apps/fwupd/files/fwupd-1.8.3-installed_tests.patch
new file mode 100644
index 000000000000..be97e6a61d20
--- /dev/null
+++ b/sys-apps/fwupd/files/fwupd-1.8.3-installed_tests.patch
@@ -0,0 +1,215 @@
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -10,20 +10,10 @@
+ subdir('fish-completion')
+ endif
+
+-if get_option('tests')
+-subdir('device-tests')
+-endif
+-
+ if build_daemon
+ subdir('motd')
+ endif
+
+-if get_option('tests')
+- if build_daemon
+- subdir('installed-tests')
+- endif
+-endif
+-
+ if build_standalone
+ install_data(['daemon.conf'],
+ install_dir: join_paths(sysconfdir, 'fwupd')
+--- a/plugins/acpi-dmar/meson.build
++++ b/plugins/acpi-dmar/meson.build
+@@ -49,7 +49,6 @@
+ fwupd,
+ fwupdplugin,
+ ],
+- install: true,
+ install_dir: installed_test_bindir,
+ )
+ test('acpi-dmar-self-test', e, env: env) # added to installed-tests
+--- a/plugins/acpi-facp/meson.build
++++ b/plugins/acpi-facp/meson.build
+@@ -47,7 +47,6 @@
+ fwupd,
+ fwupdplugin,
+ ],
+- install: true,
+ install_dir: installed_test_bindir,
+ )
+ test('acpi-facp-self-test', e, env: env) # added to installed-tests
+--- a/plugins/acpi-ivrs/meson.build
++++ b/plugins/acpi-ivrs/meson.build
+@@ -49,7 +49,6 @@
+ fwupd,
+ fwupdplugin,
+ ],
+- install: true,
+ install_dir: installed_test_bindir,
+ )
+ test('acpi-ivrs-self-test', e, env: env) # added to installed-tests
+--- a/plugins/acpi-phat/meson.build
++++ b/plugins/acpi-phat/meson.build
+@@ -53,7 +53,6 @@
+ fwupd,
+ fwupdplugin,
+ ],
+- install: true,
+ install_dir: installed_test_bindir,
+ )
+ test('acpi-phat-self-test', e, env: env) # added to installed-tests
+--- a/plugins/ata/meson.build
++++ b/plugins/ata/meson.build
+@@ -53,7 +53,6 @@
+ fwupd,
+ fwupdplugin,
+ ],
+- install: true,
+ install_dir: installed_test_bindir,
+ )
+ test('ata-self-test', e, env: env) # added to installed-tests
+--- a/plugins/bcm57xx/meson.build
++++ b/plugins/bcm57xx/meson.build
+@@ -35,8 +35,6 @@
+ )
+
+ if get_option('tests')
+- install_data(['tests/bcm57xx.builder.xml'],
+- install_dir: join_paths(installed_test_datadir, 'tests'))
+ env = environment()
+ env.set('G_TEST_SRCDIR', meson.current_source_dir())
+ env.set('G_TEST_BUILDDIR', meson.current_build_dir())
+@@ -63,7 +61,6 @@
+ fwupd,
+ fwupdplugin,
+ ],
+- install: true,
+ install_dir: installed_test_bindir,
+ )
+ test('bcm57xx-self-test', e, env: env)
+--- a/plugins/ccgx/meson.build
++++ b/plugins/ccgx/meson.build
+@@ -37,8 +37,6 @@
+ endif
+
+ if get_option('tests')
+- install_data(['tests/ccgx.builder.xml', 'tests/ccgx-dmc.builder.xml'],
+- install_dir: join_paths(installed_test_datadir, 'tests'))
+ env = environment()
+ env.set('G_TEST_SRCDIR', meson.current_source_dir())
+ env.set('G_TEST_BUILDDIR', meson.current_build_dir())
+@@ -64,7 +62,6 @@
+ fwupd,
+ fwupdplugin,
+ ],
+- install: true,
+ install_dir: installed_test_bindir,
+ )
+ test('ccgx-self-test', e, env: env)
+--- a/plugins/elantp/meson.build
++++ b/plugins/elantp/meson.build
+@@ -33,8 +33,6 @@
+ endif
+
+ if get_option('tests')
+- install_data(['tests/elantp.builder.xml'],
+- install_dir: join_paths(installed_test_datadir, 'tests'))
+ env = environment()
+ env.set('G_TEST_SRCDIR', meson.current_source_dir())
+ env.set('G_TEST_BUILDDIR', meson.current_build_dir())
+@@ -57,7 +55,6 @@
+ fwupd,
+ fwupdplugin,
+ ],
+- install: true,
+ install_dir: installed_test_bindir,
+ )
+ test('elantp-self-test', e, env: env)
+--- a/plugins/linux-swap/meson.build
++++ b/plugins/linux-swap/meson.build
+@@ -44,7 +44,6 @@
+ fwupd,
+ fwupdplugin,
+ ],
+- install: true,
+ install_dir: installed_test_bindir,
+ )
+ test('linux-swap-self-test', e) # added to installed-tests
+--- a/plugins/mtd/meson.build
++++ b/plugins/mtd/meson.build
+@@ -46,7 +46,6 @@
+ fwupd,
+ fwupdplugin,
+ ],
+- install: true,
+ install_dir: installed_test_bindir,
+ )
+ test('mtd-self-test', e) # added to installed-tests
+--- a/plugins/nitrokey/meson.build
++++ b/plugins/nitrokey/meson.build
+@@ -47,7 +47,6 @@
+ link_with: [
+ fwupdplugin,
+ ],
+- install: true,
+ install_dir: installed_test_bindir,
+ )
+ test('nitrokey-self-test', e) # added to installed-tests
+--- a/plugins/pixart-rf/meson.build
++++ b/plugins/pixart-rf/meson.build
+@@ -31,8 +31,6 @@
+ )
+
+ if get_option('tests')
+- install_data(['tests/pixart.builder.xml'],
+- install_dir: join_paths(installed_test_datadir, 'tests'))
+ env = environment()
+ env.set('G_TEST_SRCDIR', meson.current_source_dir())
+ env.set('G_TEST_BUILDDIR', meson.current_build_dir())
+@@ -55,7 +53,6 @@
+ fwupd,
+ fwupdplugin,
+ ],
+- install: true,
+ install_dir: installed_test_bindir,
+ )
+ test('pxi-self-test', e, env: env)
+--- a/plugins/redfish/meson.build
++++ b/plugins/redfish/meson.build
+@@ -47,14 +47,6 @@
+ )
+
+ if get_option('tests')
+- install_data(['tests/redfish-smbios.bin'],
+- install_dir: join_paths(installed_test_datadir, 'tests'))
+- install_data(['tests/redfish.conf'],
+- install_dir: join_paths(installed_test_datadir, 'tests'))
+- install_data(['tests/efi/efivars/RedfishIndications-16faa37e-4b6a-4891-9028-242de65a3b70'],
+- install_dir: join_paths(installed_test_datadir, 'tests', 'efi', 'efivars'))
+- install_data(['tests/efi/efivars/RedfishOSCredentials-16faa37e-4b6a-4891-9028-242de65a3b70'],
+- install_dir: join_paths(installed_test_datadir, 'tests', 'efi', 'efivars'))
+ env = environment()
+ env.set('G_TEST_SRCDIR', meson.current_source_dir())
+ env.set('G_TEST_BUILDDIR', meson.current_build_dir())
+@@ -89,7 +81,6 @@
+ fwupd,
+ fwupdplugin,
+ ],
+- install: true,
+ install_dir: installed_test_bindir,
+ )
+ test('redfish-self-test', e, env: env) # added to installed-tests
+--- a/src/tests/host-emulate/meson.build
++++ b/src/tests/host-emulate/meson.build
+@@ -8,7 +8,7 @@
+ output: '@0@.gz'.format(input_file),
+ capture: true,
+ command: [gzip, '--keep', '--stdout', '@INPUT@'],
+- install: true,
++ install: false,
+ install_dir: join_paths(datadir, 'fwupd', 'host-emulate.d'),
+ )
+ endforeach
diff --git a/sys-apps/fwupd/fwupd-1.8.3.ebuild b/sys-apps/fwupd/fwupd-1.8.3.ebuild
index 4265a6081d1e..bde563c6d54e 100644
--- a/sys-apps/fwupd/fwupd-1.8.3.ebuild
+++ b/sys-apps/fwupd/fwupd-1.8.3.ebuild
@@ -95,6 +95,7 @@ DEPEND="
PATCHES=(
"${FILESDIR}"/${PN}-1.8.3-docgen_deps_test.patch
"${FILESDIR}"/${PN}-1.8.3-gresource_quirks_paths.patch
+ "${FILESDIR}"/${PN}-1.8.3-installed_tests.patch
)
pkg_setup() {
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 9b615d6ffd4c..d12d3d138607 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
Binary files differ
diff --git a/sys-cluster/ploop/Manifest b/sys-cluster/ploop/Manifest
index 09eea0bfd3e0..c6bd8a176953 100644
--- a/sys-cluster/ploop/Manifest
+++ b/sys-cluster/ploop/Manifest
@@ -4,5 +4,5 @@ AUX ploop-1.15-makedev-include.patch 272 BLAKE2B 474c2a5c09b4ed508c57a5401ec1ff0
DIST ploop-1.14.1.tar.bz2 123962 BLAKE2B d4f4f102d2ec0714d79901bd3193f85514e232dc18ffcab254becb954cf794f3598fe7b0f65d0bbb85766bff5ded9d816900b40b81cb6046c31d8b6459c67618 SHA512 7a235865f071de6e2762923d6591c8c6ee00d0d05ec80c6a2a1332f5b6881ccf827f7ddc40dfe1d663b8abf492a188a23f7d28a43dd553d6e37c8091cb3bc484
DIST ploop-1.15.tar.bz2 125618 BLAKE2B ad7d06865606c20bdd9601ce343817a332653f3f7544dd27f08d3fb5ff2ee8112ef1ae0217546c28fde3dba076b0703b5881e8a019eec663964dd39885c5524c SHA512 07a691aeed949971534dcf9bb5138defacf25d7c437336df84a5ec3759cba0c20f6724660b7c8a204b3f455d15a892e20b060b0e0ea27280eeba738c36f280cb
EBUILD ploop-1.14.1-r1.ebuild 1493 BLAKE2B 9689336ae21fe11ca41c1d43c4399ce2eae4cc1d5f77624ae2e1beacde16fb0b3ef8028fc52a578a5a7a07e38de8b0f43da27b647bd56caef6acc6458b5a3562 SHA512 341058a862c6c4158d1ef744a42bed76d912415c0bfcba2385d0265685539119b3264b18041eedb539aad66efca38bb168530b34a6d964323deb58b2a2b7e65c
-EBUILD ploop-1.15-r1.ebuild 1548 BLAKE2B 9f963e1560c4f577ae9ee74308d184c910b35f664f0d1265996e677a3ba6128d94bc5964e84c648abc77523615d9ff50c6071de4597be44bca4a9b5c06eb841d SHA512 83b97846dce5c3b56656c7e2b3ae6dc7e960bec1b7f7079375be95ec62c1bdfa56223ffd42f18fae4a77a5745b88bc3f43ee64c5774e6ad2408d9aa24de74f2f
+EBUILD ploop-1.15-r1.ebuild 1547 BLAKE2B a275c5318d60acd3e39fcfdba66d9a20b7e29a49f28e19ad9b522b10c678ddeb8fa2d3d2026749851aaa72b6fd48f9138f1f94807081d54ecc0640b0b4e1bd58 SHA512 3b4defa81cf833be8f4318ac9bafbbddc23d633e52efea58ccd06706a8c555a5782dcbd106f7cf54fb49d1c022e067916ee064418af0483ae09b82aaf53baec5
MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/sys-cluster/ploop/ploop-1.15-r1.ebuild b/sys-cluster/ploop/ploop-1.15-r1.ebuild
index 2898f9031156..b097c176c3ac 100644
--- a/sys-cluster/ploop/ploop-1.15-r1.ebuild
+++ b/sys-cluster/ploop/ploop-1.15-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.openvz.org/utils/ploop/${PV}/src/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
IUSE="debug"
BDEPEND="virtual/pkgconfig"
diff --git a/sys-power/Manifest.gz b/sys-power/Manifest.gz
index 352fe6dd4b94..0e0c61a926e2 100644
--- a/sys-power/Manifest.gz
+++ b/sys-power/Manifest.gz
Binary files differ
diff --git a/sys-power/upower/Manifest b/sys-power/upower/Manifest
index 5a1896fb2cf1..0acb89deb3ee 100644
--- a/sys-power/upower/Manifest
+++ b/sys-power/upower/Manifest
@@ -10,5 +10,5 @@ EBUILD upower-0.99.12-r1.ebuild 2705 BLAKE2B 4da66afcf8ad299b2cbe201d9f54b514bd9
EBUILD upower-0.99.17.ebuild 2890 BLAKE2B 7cbb2e63443639c494b2e98d1ff64ac7c08d0c2775ca86382f53794196e8f02ac8598aa989c0e6f734f2889d8637f8586932fb5c5d12b757861bce8dec20f562 SHA512 738c340c727c4d57603c25bca273b1a06de64357d04f55089f0eb97369cedbe06804c67639f31a50ab76145774a5257fec4bff95c81d0c291019cc15206f1cff
EBUILD upower-0.99.18.ebuild 2894 BLAKE2B 4e1d7b4aa402aee936ad2bf9b8ea57b6e2e1984418d1fdd2deecb34665ae0fbcf553915bc30ee9a0560ff54ab5dbd23793544c6aa155bf15c1e87927fe379e25 SHA512 9c6c534afa3878febf6d4c29442e71f587e40653fb48a1336358402a22c4129b621a01282a7faf96a7b5a69e1b42b2d6d5da35eab6885116f972f350388fadee
EBUILD upower-0.99.19.ebuild 2853 BLAKE2B 63464a80f4cb8303e7928c66719a96e830e85076b3d5ec62b4014b362f338655dc428327e9cc830e84a62a1886754e50a09f13874d96ab862af8baece37ef699 SHA512 15c86382c895ca74cb82bc396a92494e2658e873d995fdc267dfb7b7b9183c874801b41f1814b73070c63e18e3cce7dd5f636206fe2c593bb947f092110e4ba0
-EBUILD upower-0.99.20.ebuild 2849 BLAKE2B ac5e76a1004733358480da0f3795f7037cc51d7f6dc7dbc4ad967965f9c120460ba3605ca042d55be04bada7eb89944675e78a9d11398665fc9438d05e3c2498 SHA512 94394c7b22129c28f993463766ccbd58485d43829977ce9db0b5049fe51a28eab5775e7835629f733850d371d890680e7a5456f8a957a775750e0213911f9220
+EBUILD upower-0.99.20.ebuild 2846 BLAKE2B 9a1e1cc83a358580d243469e97645ca5686f4962d3b657108f4406305e7a99671b286d764015ff687ec65b52ab73ab0a63ec198a7dbec7056e9959375fd99984 SHA512 7bd343ccf810bd4b607afeb633845235a2cfdff6be7efbfde4fa815e5300f3b1e87d3758d6a147b284b946079efb82d18683f82fa9d4441957028586f0f44cb2
MISC metadata.xml 229 BLAKE2B 35bd897953d3051382021de0742162ed1a166c98224fec04fc54dc467dfe5492289b1da910ae9213259b20a0bd5bbffc041624ccb3aacc23b56de2c397861d7d SHA512 7340f6b8c0a938920b7940a288c212e868ae0d8cb18b97c028e6e959f72f94e35f37a2d864bb662fc1d01b43bd7b72efdcbcc5d48e700aaf8c845eb6b9d67fed
diff --git a/sys-power/upower/upower-0.99.20.ebuild b/sys-power/upower/upower-0.99.20.ebuild
index 629bf43c350e..5294daef3cf8 100644
--- a/sys-power/upower/upower-0.99.20.ebuild
+++ b/sys-power/upower/upower-0.99.20.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/v${PV}/${PN}-v${PV
LICENSE="GPL-2"
SLOT="0/3" # based on SONAME of libupower-glib.so
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
# gtk-doc files are not available as prebuilt in the tarball
IUSE="doc +introspection ios selinux test"
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 6b78c8559a22..134ee13a88ee 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
Binary files differ
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index d124be8d5b59..b7dc65abf08d 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -11,16 +11,11 @@ AUX chromium-launcher-r7.sh 1631 BLAKE2B ae28d758264446511fd2b64ba69fe920144b351
AUX chromium-shim_headers.patch 1510 BLAKE2B 9716cd250b249c6255aca01a385ef8a2a6f1df9ea3cf7499715543c14f8be62fd323b6048b890aa2be45891e7a765d92de3f41c3b3a88c08dae4b806c048e20f SHA512 c74bcf690a41b4f9b364477d23408d493aa674e3bd014940098a594471297c2a425241f908510061b5f11c9cfe009c4a803370edd757d3c0ab8d9c0cc128135c
AUX chromium-use-oauth2-client-switches-as-default.patch 1085 BLAKE2B baf3c463305934c126af4f7c5be305863edc7eec3add5b5ada30565b49b5944021eb40f1a9643e7eec3f973c502d9b02426f00b760570fcea5f1509219e41c6f SHA512 fe2878ee45778bac894ea17a668511d27ad2ca40988d5f11439790b700bfefd6560f3931415b4e6c543fcbbfc7cfef55cc757ed4ace1d111039ae78c46b81945
AUX chromium.default 148 BLAKE2B 5ee5b582c59a6e4bef87bbb0e232e2470ad412b1fbbb3b9af6ef7153edb55c5b9080cc16a5a115b0c5b3c381aa87ce57a7b12bdd2070e67dac10a6c2995ddbaf SHA512 0d4849e03592fb58b05e62a43021eca7e61615616c8907c3b2e445402e03adaf9e8fa25b0a745d6c31eb037456215cc02b59e345a3a06d932e76cf990c92d739
-DIST chromium-103-patchset-4.tar.xz 7220 BLAKE2B 3dc9670be01d4bbfd24e8d305ea72e6bd911062a9a012c7548fca76ec34998b54ff31ef0118be5db9fdde3839365103cb06b29ff2ab167ad4313b4b64cba3a63 SHA512 54fb3600bb42ffcd6168f9741432879877bb5d206c11b3874249faaaff13288bffd4e7336f055c0c619efba02aa694de6abde394a6964c0ff6b33d9e3aed1691
-DIST chromium-103.0.5060.134.tar.xz 1488286096 BLAKE2B 5750317f9998fa42d01a245ce2e9e2425484a9f7debb040ebd55624fac1d162ad73a437dd4ab1a90f42d290d310a378532531827d981f1bab1cf896f7caf8585 SHA512 448d7adb91a243041fdce466e750c96e69442711c7809f7aa4a04cc098351c3ca61a37fa52347c7bba2fefcde4951e747c092006bec7288010f36c872f6b7b4c
DIST chromium-104-patchset-2.tar.xz 6168 BLAKE2B 57e9f2090315d2fa9baa0d285e40fd7809b35a897fba7684672d04850c2b59ea1bc11383654a8178ece2d4baa9bb2e248898d2435618b9e8a995461d6e92ac53 SHA512 f23effc604051c18acfad3bfb974efd4aa675b84135f4eb95e0dd97261dcc9099f283a8015854c375499370f4155bb9fad51fca59555ec2f41f2d7ab90be7208
DIST chromium-104.0.5112.101.tar.xz 1510110428 BLAKE2B 33b5ac2339d88e03096f3ca8cba9b388eeea2f120ab137a38d3e6d0c03315136cfb9f01a4c7b52b5eb7e78921d00a502dfcab3c0cf167074fbc197490fd3866b SHA512 a955cee81e983212c27a972db8e4857000e626b5e85ce07db71b7f19a4f1a10b675fb4d3df055265681670b4166dc96a3b597a00cf60b837016be9c81e6972b1
-DIST chromium-104.0.5112.79.tar.xz 1509100404 BLAKE2B 06cb36a07c25d3957648b572fea8e9eb43e6f7d418864ac47e52332d22b050f886270080c3277f8c7014f2f3c1f6728cad7576fbc3496aecc8079115c017a843 SHA512 3c6814c6670ccb938a4d2502f36e89ba5ddec9ffdc7c201111054edad5f54a31a93d9fb34c2c04265788ea6f7a8f4391aa0878a0820eac45674a69eba443480d
DIST chromium-105-patchset-1.tar.xz 9116 BLAKE2B 7728b83899e19b3c0ba4a69c660b68af7ea549a0144c15ab9fa972001441d9d145de20b7a1bafabf2b0667335b7436f6374c9934d4433160805c31bc743e867e SHA512 8f97aecf7b24c3f676bc74b88382dc4a5d967a090a4b4890971cb342973b0a20fd563c658b1c3fdaf036e830317d97470143ab78b28f336b315d491217368a81
DIST chromium-105.0.5195.37.tar.xz 1597759960 BLAKE2B cda98fac8b4d7b0e4d9004c5cf896dee954048fecb331f92e8f69c2690ff0e21462622608b334e6fb7e6c47463efdd7ff3c2414b9b7d75be8fbc0badcb34ebc9 SHA512 f71012934146682c1f557117f46cf2996070aa2943048b12a419bbee537d8955aaaa283fcd8a4b803b7a4089bce12f167353a3f60cc7ab72b74225b5e706dce8
DIST chromium-profiler-0.1.tar 269066240 BLAKE2B 6897387b63ff9a724b67f2e8799fe803dc75da376da809e752d19d6f5cf98bd84ac24161d07ac4a967577279e9ad5a8a46f0825332a7ee933a27693d6dc95611 SHA512 3fb6132599d28455d1b5c04d856ea7623e49b0b0b96f021c31d0952c4ba57d69d0a1cae6f0b91470a235221c89cc0d3bb38303ff02594ed0739712e6e2f8dbcc
-EBUILD chromium-103.0.5060.134.ebuild 35046 BLAKE2B d0b332721f570063f561892ffe5cc4739178cb87908140814dd1d19e1c332b83353627feca41cd9f9ceed8ffd346a8f78709aac862836807cabb84081cd6ac11 SHA512 bccb1d6e1e9b6a724f4f44a597c4e245fbcc916aa34d83410f03a394baa5f9ec8944db143bc4b1776c80966190c1cd6acb51873af2cf321bdc182f1fe445b959
-EBUILD chromium-104.0.5112.101.ebuild 37234 BLAKE2B bfe42f6a55aa9f02be4d3f41c13d0245007fea8a807e4281f7a9270f522e65e9f528ccd3e7a4263813bc45a7e3ff7570d8298d2c56e5cfd7ce4edec8b582be49 SHA512 c3c38384128e806b9deb921136a285f0a2a8f97c18e485d3fe0c0fb6458d68c591456d81b6c6d438d0d5366a3526f386cab313889629d65fe7057187a87e1c17
-EBUILD chromium-104.0.5112.79.ebuild 37181 BLAKE2B 69fc2a35b3c8bf14231fca654b2c6bc527e524fb9ce9ab3466e540bd93069e1e8910ae335587128c8b0e9f1b1841a40c82f7318e16f1c4a6159df46eda484e82 SHA512 84c3b62f78d5084bc2c3a411f19a106b02e5d9b5621dd5e1a952ba1412cfbbae1873b6cc98264e7407eaba1d83f99f7b537d21893f7efd0f16d19a5863869fbd
+EBUILD chromium-104.0.5112.101.ebuild 37233 BLAKE2B 78798f71360c617d0962861f298cc274286c00e1ec1f55e8f2dbf53ae7c053c96c4f344147c862331edac7f76bbc869729e5681f91102cf3b488632364a5336f SHA512 226770c92db724d0690aff4ea16582a132ed5c0a51557811dc7284a4823b657f520b486227061f7b73d742598b09cea232a7128b53f7068fe1d6ba64363d15b6
EBUILD chromium-105.0.5195.37.ebuild 37348 BLAKE2B dfcfd165ccdfa447c51679ded53dbbb9458adab98ebd42525bbcd413172b6382853b4fcc93014da24116dfe1374ac29de505f334406904a9217dd52635dff24f SHA512 c316c99e63464d6229949d5e9d630a36a89de71418bf1c4f32e25d074b9f6b2a33cef910d5a2b82882df2ef7935c3bcd0cbeb7b5e52d32bc4e35c13b005975de
MISC metadata.xml 2039 BLAKE2B 165c45988d524ab5fa9562cce25997d1a54685ce1c15cfb4058ca572ba4d5ea906ba4392c59e3f492cd2b7b3ff656a33a5494e1418cb64942c69b70f271138cd SHA512 b85e969b529177a8cec0f10c4f1226fa4facb7c579c102731ae518edf25146044120a713e78f13589979c8f5b6df41e9519ac0243526b23879e3b17f966f6284
diff --git a/www-client/chromium/chromium-103.0.5060.134.ebuild b/www-client/chromium/chromium-103.0.5060.134.ebuild
deleted file mode 100644
index 6dfc23064049..000000000000
--- a/www-client/chromium/chromium-103.0.5060.134.ebuild
+++ /dev/null
@@ -1,1114 +0,0 @@
-# Copyright 2009-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="xml"
-LLVM_MAX_SLOT=14
-
-CHROMIUM_LANGS="af am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
- hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
- sv sw ta te th tr uk ur vi zh-CN zh-TW"
-
-inherit check-reqs chromium-2 desktop flag-o-matic llvm ninja-utils pax-utils python-any-r1 readme.gentoo-r1 toolchain-funcs xdg-utils
-
-DESCRIPTION="Open-source version of Google Chrome web browser"
-HOMEPAGE="https://chromium.org/"
-PATCHSET="4"
-PATCHSET_NAME="chromium-$(ver_cut 1)-patchset-${PATCHSET}"
-SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz
- https://github.com/stha09/chromium-patches/releases/download/${PATCHSET_NAME}/${PATCHSET_NAME}.tar.xz"
-
-LICENSE="BSD"
-SLOT="0/stable"
-KEYWORDS="amd64 arm64"
-IUSE="+X component-build cups cpu_flags_arm_neon debug gtk4 +hangouts headless +js-type-check kerberos libcxx lto +official pic +proprietary-codecs pulseaudio screencast selinux +suid +system-ffmpeg +system-harfbuzz +system-icu +system-png vaapi wayland widevine"
-REQUIRED_USE="
- component-build? ( !suid !libcxx )
- screencast? ( wayland )
- !headless ( || ( X wayland ) )
-"
-
-COMMON_X_DEPEND="
- x11-libs/libXcomposite:=
- x11-libs/libXcursor:=
- x11-libs/libXdamage:=
- x11-libs/libXfixes:=
- >=x11-libs/libXi-1.6.0:=
- x11-libs/libXrandr:=
- x11-libs/libXrender:=
- x11-libs/libXtst:=
- x11-libs/libxshmfence:=
-"
-
-COMMON_SNAPSHOT_DEPEND="
- system-icu? ( >=dev-libs/icu-71.1:= )
- >=dev-libs/libxml2-2.9.4-r3:=[icu]
- dev-libs/nspr:=
- >=dev-libs/nss-3.26:=
- !libcxx? ( >=dev-libs/re2-0.2019.08.01:= )
- dev-libs/libxslt:=
- media-libs/fontconfig:=
- >=media-libs/freetype-2.11.0-r1:=
- system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] )
- media-libs/libjpeg-turbo:=
- system-png? ( media-libs/libpng:=[-apng] )
- >=media-libs/libwebp-0.4.0:=
- media-libs/mesa:=[gbm(+)]
- >=media-libs/openh264-1.6.0:=
- sys-libs/zlib:=
- x11-libs/libdrm:=
- !headless? (
- dev-libs/glib:2
- >=media-libs/alsa-lib-1.0.19:=
- pulseaudio? ( media-sound/pulseaudio:= )
- sys-apps/pciutils:=
- kerberos? ( virtual/krb5 )
- vaapi? ( >=x11-libs/libva-2.7:=[X?,wayland?] )
- X? (
- x11-libs/libX11:=
- x11-libs/libXext:=
- x11-libs/libxcb:=
- )
- x11-libs/libxkbcommon:=
- wayland? (
- dev-libs/wayland:=
- screencast? ( media-video/pipewire:= )
- )
- )
-"
-
-COMMON_DEPEND="
- ${COMMON_SNAPSHOT_DEPEND}
- app-arch/bzip2:=
- dev-libs/expat:=
- system-ffmpeg? (
- >=media-video/ffmpeg-4.3:=
- || (
- media-video/ffmpeg[-samba]
- >=net-fs/samba-4.5.10-r1[-debug(-)]
- )
- >=media-libs/opus-1.3.1:=
- )
- net-misc/curl[ssl]
- sys-apps/dbus:=
- media-libs/flac:=
- sys-libs/zlib:=[minizip]
- !headless? (
- X? ( ${COMMON_X_DEPEND} )
- >=app-accessibility/at-spi2-atk-2.26:2
- >=app-accessibility/at-spi2-core-2.26:2
- >=dev-libs/atk-2.26
- media-libs/mesa:=[X?,wayland?]
- cups? ( >=net-print/cups-1.3.11:= )
- virtual/udev
- x11-libs/cairo:=
- x11-libs/gdk-pixbuf:2
- x11-libs/pango:=
- )
-"
-RDEPEND="${COMMON_DEPEND}
- !headless? (
- || (
- x11-libs/gtk+:3[X?,wayland?]
- gui-libs/gtk:4[X?,wayland?]
- )
- x11-misc/xdg-utils
- )
- virtual/ttf-fonts
- selinux? ( sec-policy/selinux-chromium )
-"
-DEPEND="${COMMON_DEPEND}
- !headless? (
- gtk4? ( gui-libs/gtk:4[X?,wayland?] )
- !gtk4? ( x11-libs/gtk+:3[X?,wayland?] )
- )
-"
-
-depend_clang_llvm_version() {
- echo "sys-devel/clang:$1"
- echo "sys-devel/llvm:$1"
- echo "=sys-devel/lld-$1*"
-}
-
-depend_clang_llvm_versions() {
- local _v
- if [[ $# -gt 1 ]]; then
- echo "|| ("
- for _v in "$@"; do
- echo "("
- depend_clang_llvm_version "${_v}"
- echo ")"
- done
- echo ")"
- elif [[ $# -eq 1 ]]; then
- depend_clang_llvm_version "$1"
- fi
-}
-
-BDEPEND="
- ${COMMON_SNAPSHOT_DEPEND}
- ${PYTHON_DEPS}
- $(python_gen_any_dep '
- dev-python/setuptools[${PYTHON_USEDEP}]
- ')
- >=app-arch/gzip-1.7
- libcxx? ( >=sys-devel/clang-13 )
- lto? ( $(depend_clang_llvm_versions 13 14) )
- dev-lang/perl
- >=dev-util/gn-0.1807
- >=dev-util/gperf-3.0.3
- >=dev-util/ninja-1.7.2
- dev-vcs/git
- >=net-libs/nodejs-7.6.0[inspector]
- >=sys-devel/bison-2.4.3
- sys-devel/flex
- virtual/pkgconfig
- js-type-check? ( virtual/jre )
-"
-
-# These are intended for ebuild maintainer use to force clang if GCC is broken.
-: ${CHROMIUM_FORCE_CLANG=no}
-
-if [[ ${CHROMIUM_FORCE_CLANG} == yes ]]; then
- BDEPEND+=" >=sys-devel/clang-13"
-fi
-
-if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
- EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
-fi
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-Some web pages may require additional fonts to display properly.
-Try installing some of the following packages if some characters
-are not displayed properly:
-- media-fonts/arphicfonts
-- media-fonts/droid
-- media-fonts/ipamonafont
-- media-fonts/noto
-- media-fonts/ja-ipafonts
-- media-fonts/takao-fonts
-- media-fonts/wqy-microhei
-- media-fonts/wqy-zenhei
-
-To fix broken icons on the Downloads page, you should install an icon
-theme that covers the appropriate MIME types, and configure this as your
-GTK+ icon theme.
-
-For native file dialogs in KDE, install kde-apps/kdialog.
-
-To make password storage work with your desktop environment you may
-have install one of the supported credentials management applications:
-- app-crypt/libsecret (GNOME)
-- kde-frameworks/kwallet (KDE)
-If you have one of above packages installed, but don't want to use
-them in Chromium, then add --password-store=basic to CHROMIUM_FLAGS
-in /etc/chromium/default.
-"
-
-python_check_deps() {
- python_has_version "dev-python/setuptools[${PYTHON_USEDEP}]"
-}
-
-needs_clang() {
- [[ ${CHROMIUM_FORCE_CLANG} == yes ]] || use libcxx || use lto
-}
-
-llvm_check_deps() {
- if needs_clang; then
- if ! has_version -b "sys-devel/clang:${LLVM_SLOT}" ; then
- einfo "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
- return 1
- fi
-
- if use lto && ! has_version -b "=sys-devel/lld-${LLVM_SLOT}*" ; then
- einfo "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
- return 1
- fi
- fi
-
- einfo "Using LLVM slot ${LLVM_SLOT} to build" >&2
-}
-
-pre_build_checks() {
- if [[ ${MERGE_TYPE} != binary ]]; then
- [[ ${EBUILD_PHASE_FUNC} == pkg_setup ]] && use lto && llvm_pkg_setup
-
- local -x CPP="$(tc-getCXX) -E"
- if tc-is-gcc && ! ver_test "$(gcc-version)" -ge 9.2; then
- die "At least gcc 9.2 is required"
- fi
- if needs_clang || tc-is-clang; then
- tc-is-cross-compiler && CPP=${CBUILD}-clang++ || CPP=${CHOST}-clang++
- CPP+=" -E"
- if ! ver_test "$(clang-major-version)" -ge 12; then
- die "At least clang 12 is required"
- fi
- fi
- if [[ ${EBUILD_PHASE_FUNC} == pkg_setup ]] && use js-type-check; then
- "${BROOT}"/usr/bin/java -version 2>1 > /dev/null || die "Java VM not setup correctly"
- fi
- fi
-
- # Check build requirements, bug #541816 and bug #471810 .
- CHECKREQS_MEMORY="4G"
- CHECKREQS_DISK_BUILD="10G"
- tc-is-cross-compiler && CHECKREQS_DISK_BUILD="13G"
- if use lto; then
- CHECKREQS_MEMORY="9G"
- CHECKREQS_DISK_BUILD="12G"
- tc-is-cross-compiler && CHECKREQS_DISK_BUILD="15G"
- fi
- if is-flagq '-g?(gdb)?([1-9])'; then
- if use custom-cflags || use component-build; then
- CHECKREQS_DISK_BUILD="25G"
- fi
- if ! use component-build; then
- CHECKREQS_MEMORY="16G"
- fi
- fi
- check-reqs_${EBUILD_PHASE_FUNC}
-}
-
-pkg_pretend() {
- pre_build_checks
-
- if use headless; then
- local headless_unused_flags=("cups" "kerberos" "pulseaudio" "vaapi" "wayland")
- for myiuse in ${headless_unused_flags[@]}; do
- use ${myiuse} && ewarn "Ignoring USE=${myiuse} since USE=headless is set."
- done
- fi
-}
-
-pkg_setup() {
- pre_build_checks
-
- chromium_suid_sandbox_check_kernel_config
-
- # nvidia-drivers does not work correctly with Wayland due to unsupported EGLStreams
- if use wayland && ! use headless && has_version "x11-drivers/nvidia-drivers"; then
- ewarn "Proprietary nVidia driver does not work with Wayland. You can disable"
- ewarn "Wayland by setting DISABLE_OZONE_PLATFORM=true in /etc/chromium/default."
- fi
-}
-
-src_prepare() {
- # Calling this here supports resumption via FEATURES=keepwork
- python_setup
-
- local PATCHES=(
- "${WORKDIR}/patches"
- "${FILESDIR}/chromium-93-InkDropHost-crash.patch"
- "${FILESDIR}/chromium-98-EnumTable-crash.patch"
- "${FILESDIR}/chromium-98-gtk4-build.patch"
- "${FILESDIR}/chromium-use-oauth2-client-switches-as-default.patch"
- "${FILESDIR}/chromium-shim_headers.patch"
- "${FILESDIR}/chromium-cross-compile.patch"
- )
-
- default
-
- mkdir -p third_party/node/linux/node-linux-x64/bin || die
- ln -s "${EPREFIX}"/usr/bin/node third_party/node/linux/node-linux-x64/bin/node || die
-
- # adjust python interpreter version
- sed -i -e "s|\(^script_executable = \).*|\1\"${EPYTHON}\"|g" .gn || die
-
- local keeplibs=(
- base/third_party/cityhash
- base/third_party/double_conversion
- base/third_party/dynamic_annotations
- base/third_party/icu
- base/third_party/nspr
- base/third_party/superfasthash
- base/third_party/symbolize
- base/third_party/valgrind
- base/third_party/xdg_mime
- base/third_party/xdg_user_dirs
- buildtools/third_party/libc++
- buildtools/third_party/libc++abi
- chrome/third_party/mozilla_security_manager
- courgette/third_party
- net/third_party/mozilla_security_manager
- net/third_party/nss
- net/third_party/quic
- net/third_party/uri_template
- third_party/abseil-cpp
- third_party/angle
- third_party/angle/src/common/third_party/base
- third_party/angle/src/common/third_party/smhasher
- third_party/angle/src/common/third_party/xxhash
- third_party/angle/src/third_party/libXNVCtrl
- third_party/angle/src/third_party/trace_event
- third_party/angle/src/third_party/volk
- third_party/apple_apsl
- third_party/axe-core
- third_party/blink
- third_party/boringssl
- third_party/boringssl/src/third_party/fiat
- third_party/breakpad
- third_party/breakpad/breakpad/src/third_party/curl
- third_party/brotli
- third_party/catapult
- third_party/catapult/common/py_vulcanize/third_party/rcssmin
- third_party/catapult/common/py_vulcanize/third_party/rjsmin
- third_party/catapult/third_party/beautifulsoup4-4.9.3
- third_party/catapult/third_party/html5lib-1.1
- third_party/catapult/third_party/polymer
- third_party/catapult/third_party/six
- third_party/catapult/tracing/third_party/d3
- third_party/catapult/tracing/third_party/gl-matrix
- third_party/catapult/tracing/third_party/jpeg-js
- third_party/catapult/tracing/third_party/jszip
- third_party/catapult/tracing/third_party/mannwhitneyu
- third_party/catapult/tracing/third_party/oboe
- third_party/catapult/tracing/third_party/pako
- third_party/ced
- third_party/cld_3
- third_party/closure_compiler
- third_party/cpuinfo
- third_party/crashpad
- third_party/crashpad/crashpad/third_party/lss
- third_party/crashpad/crashpad/third_party/zlib
- third_party/crc32c
- third_party/cros_system_api
- third_party/dav1d
- third_party/dawn
- third_party/dawn/third_party/gn/webgpu-cts
- third_party/dawn/third_party/khronos
- third_party/depot_tools
- third_party/devscripts
- third_party/devtools-frontend
- third_party/devtools-frontend/src/front_end/third_party/acorn
- third_party/devtools-frontend/src/front_end/third_party/additional_readme_paths.json
- third_party/devtools-frontend/src/front_end/third_party/axe-core
- third_party/devtools-frontend/src/front_end/third_party/chromium
- third_party/devtools-frontend/src/front_end/third_party/codemirror
- third_party/devtools-frontend/src/front_end/third_party/diff
- third_party/devtools-frontend/src/front_end/third_party/i18n
- third_party/devtools-frontend/src/front_end/third_party/intl-messageformat
- third_party/devtools-frontend/src/front_end/third_party/lighthouse
- third_party/devtools-frontend/src/front_end/third_party/lit-html
- third_party/devtools-frontend/src/front_end/third_party/lodash-isequal
- third_party/devtools-frontend/src/front_end/third_party/marked
- third_party/devtools-frontend/src/front_end/third_party/puppeteer
- third_party/devtools-frontend/src/front_end/third_party/wasmparser
- third_party/devtools-frontend/src/test/unittests/front_end/third_party/i18n
- third_party/devtools-frontend/src/third_party
- third_party/distributed_point_functions
- third_party/dom_distiller_js
- third_party/eigen3
- third_party/emoji-segmenter
- third_party/farmhash
- third_party/fdlibm
- third_party/fft2d
- third_party/flatbuffers
- third_party/fp16
- third_party/freetype
- third_party/fusejs
- third_party/fxdiv
- third_party/highway
- third_party/libgifcodec
- third_party/liburlpattern
- third_party/libzip
- third_party/gemmlowp
- third_party/google_input_tools
- third_party/google_input_tools/third_party/closure_library
- third_party/google_input_tools/third_party/closure_library/third_party/closure
- third_party/googletest
- third_party/hunspell
- third_party/iccjpeg
- third_party/inspector_protocol
- third_party/jinja2
- third_party/jsoncpp
- third_party/jstemplate
- third_party/khronos
- third_party/leveldatabase
- third_party/libaddressinput
- third_party/libaom
- third_party/libaom/source/libaom/third_party/fastfeat
- third_party/libaom/source/libaom/third_party/vector
- third_party/libaom/source/libaom/third_party/x86inc
- third_party/libavif
- third_party/libgav1
- third_party/libjingle
- third_party/libjxl
- third_party/libphonenumber
- third_party/libsecret
- third_party/libsrtp
- third_party/libsync
- third_party/libudev
- third_party/libva_protected_content
- third_party/libvpx
- third_party/libvpx/source/libvpx/third_party/x86inc
- third_party/libwebm
- third_party/libx11
- third_party/libxcb-keysyms
- third_party/libxml/chromium
- third_party/libyuv
- third_party/llvm
- third_party/lottie
- third_party/lss
- third_party/lzma_sdk
- third_party/mako
- third_party/maldoca
- third_party/maldoca/src/third_party/tensorflow_protos
- third_party/maldoca/src/third_party/zlibwrapper
- third_party/markupsafe
- third_party/mesa
- third_party/metrics_proto
- third_party/minigbm
- third_party/modp_b64
- third_party/nasm
- third_party/nearby
- third_party/neon_2_sse
- third_party/node
- third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2
- third_party/one_euro_filter
- third_party/openscreen
- third_party/openscreen/src/third_party/mozilla
- third_party/openscreen/src/third_party/tinycbor/src/src
- third_party/ots
- third_party/pdfium
- third_party/pdfium/third_party/agg23
- third_party/pdfium/third_party/base
- third_party/pdfium/third_party/bigint
- third_party/pdfium/third_party/freetype
- third_party/pdfium/third_party/lcms
- third_party/pdfium/third_party/libopenjpeg20
- third_party/pdfium/third_party/libpng16
- third_party/pdfium/third_party/libtiff
- third_party/pdfium/third_party/skia_shared
- third_party/perfetto
- third_party/perfetto/protos/third_party/chromium
- third_party/pffft
- third_party/ply
- third_party/polymer
- third_party/private-join-and-compute
- third_party/private_membership
- third_party/protobuf
- third_party/protobuf/third_party/six
- third_party/pthreadpool
- third_party/pyjson5
- third_party/qcms
- third_party/rnnoise
- third_party/s2cellid
- third_party/securemessage
- third_party/shell-encryption
- third_party/simplejson
- third_party/skia
- third_party/skia/include/third_party/skcms
- third_party/skia/include/third_party/vulkan
- third_party/skia/third_party/skcms
- third_party/skia/third_party/vulkan
- third_party/smhasher
- third_party/snappy
- third_party/sqlite
- third_party/swiftshader
- third_party/swiftshader/third_party/astc-encoder
- third_party/swiftshader/third_party/llvm-subzero
- third_party/swiftshader/third_party/marl
- third_party/swiftshader/third_party/subzero
- third_party/swiftshader/third_party/SPIRV-Headers/include/spirv
- third_party/swiftshader/third_party/SPIRV-Tools
- third_party/tensorflow-text
- third_party/tflite
- third_party/tflite/src/third_party/eigen3
- third_party/tflite/src/third_party/fft2d
- third_party/ruy
- third_party/six
- third_party/ukey2
- third_party/unrar
- third_party/utf
- third_party/vulkan
- third_party/web-animations-js
- third_party/webdriver
- third_party/webgpu-cts
- third_party/webrtc
- third_party/webrtc/common_audio/third_party/ooura
- third_party/webrtc/common_audio/third_party/spl_sqrt_floor
- third_party/webrtc/modules/third_party/fft
- third_party/webrtc/modules/third_party/g711
- third_party/webrtc/modules/third_party/g722
- third_party/webrtc/rtc_base/third_party/base64
- third_party/webrtc/rtc_base/third_party/sigslot
- third_party/widevine
- third_party/woff2
- third_party/wuffs
- third_party/x11proto
- third_party/xcbproto
- third_party/xnnpack
- third_party/zxcvbn-cpp
- third_party/zlib/google
- url/third_party/mozilla
- v8/src/third_party/siphash
- v8/src/third_party/valgrind
- v8/src/third_party/utf8-decoder
- v8/third_party/inspector_protocol
- v8/third_party/v8
-
- # gyp -> gn leftovers
- base/third_party/libevent
- third_party/speech-dispatcher
- third_party/usb_ids
- third_party/xdg-utils
- )
- if ! use system-ffmpeg; then
- keeplibs+=( third_party/ffmpeg third_party/opus )
- fi
- if ! use system-icu; then
- keeplibs+=( third_party/icu )
- fi
- if ! use system-png; then
- keeplibs+=( third_party/libpng )
- fi
- if use libcxx; then
- keeplibs+=( third_party/re2 )
- fi
- if use system-harfbuzz; then
- keeplibs+=( third_party/harfbuzz-ng/utils )
- else
- keeplibs+=( third_party/harfbuzz-ng )
- fi
- if use wayland && ! use headless ; then
- keeplibs+=( third_party/wayland )
- fi
- if use arm64 || use ppc64 ; then
- keeplibs+=( third_party/swiftshader/third_party/llvm-10.0 )
- fi
- # we need to generate ppc64 stuff because upstream does not ship it yet
- # it has to be done before unbundling.
- if use ppc64; then
- pushd third_party/libvpx >/dev/null || die
- mkdir -p source/config/linux/ppc64 || die
- # requires git and clang, bug #832803
- sed -i -e "s|^update_readme||g; s|clang-format|${EPREFIX}/bin/true|g" \
- generate_gni.sh || die
- ./generate_gni.sh || die
- popd >/dev/null || die
-
- pushd third_party/ffmpeg >/dev/null || die
- cp libavcodec/ppc/h264dsp.c libavcodec/ppc/h264dsp_ppc.c || die
- cp libavcodec/ppc/h264qpel.c libavcodec/ppc/h264qpel_ppc.c || die
- popd >/dev/null || die
- fi
-
- # Remove most bundled libraries. Some are still needed.
- build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove || die
-
- if use js-type-check; then
- ln -s "${EPREFIX}"/usr/bin/java third_party/jdk/current/bin/java || die
- fi
-
- # bundled eu-strip is for amd64 only and we don't want to pre-stripped binaries
- mkdir -p buildtools/third_party/eu-strip/bin || die
- ln -s "${EPREFIX}"/bin/true buildtools/third_party/eu-strip/bin/eu-strip || die
-}
-
-src_configure() {
- # Calling this here supports resumption via FEATURES=keepwork
- python_setup
-
- local myconf_gn=""
-
- # Make sure the build system will use the right tools, bug #340795.
- tc-export AR CC CXX NM
-
- if needs_clang && ! tc-is-clang; then
- # Force clang since gcc is either broken or build is using libcxx.
- if tc-is-cross-compiler; then
- CC="${CBUILD}-clang -target ${CHOST} --sysroot ${ESYSROOT}"
- CXX="${CBUILD}-clang++ -target ${CHOST} --sysroot ${ESYSROOT}"
- BUILD_CC=${CBUILD}-clang
- BUILD_CXX=${CBUILD}-clang++
- else
- CC=${CHOST}-clang
- CXX=${CHOST}-clang++
- fi
- strip-unsupported-flags
- fi
-
- if tc-is-clang; then
- myconf_gn+=" is_clang=true clang_use_chrome_plugins=false"
- else
- myconf_gn+=" is_clang=false"
- fi
-
- if use lto; then
- myconf_gn+=" use_lld=true"
- else
- myconf_gn+=" use_lld=false"
- fi
-
- if use lto; then
- AR=llvm-ar
- NM=llvm-nm
- if tc-is-cross-compiler; then
- BUILD_AR=llvm-ar
- BUILD_NM=llvm-nm
- fi
- fi
-
- # Define a custom toolchain for GN
- myconf_gn+=" custom_toolchain=\"//build/toolchain/linux/unbundle:default\""
-
- if tc-is-cross-compiler; then
- tc-export BUILD_{AR,CC,CXX,NM}
- myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:host\""
- myconf_gn+=" v8_snapshot_toolchain=\"//build/toolchain/linux/unbundle:host\""
- myconf_gn+=" pkg_config=\"$(tc-getPKG_CONFIG)\""
- myconf_gn+=" host_pkg_config=\"$(tc-getBUILD_PKG_CONFIG)\""
-
- # setup cups-config, build system only uses --libs option
- if use cups; then
- mkdir "${T}/cups-config" || die
- cp "${ESYSROOT}/usr/bin/${CHOST}-cups-config" "${T}/cups-config/cups-config" || die
- export PATH="${PATH}:${T}/cups-config"
- fi
-
- # Don't inherit PKG_CONFIG_PATH from environment
- local -x PKG_CONFIG_PATH=
- else
- myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:default\""
- fi
-
- # GN needs explicit config for Debug/Release as opposed to inferring it from build directory.
- myconf_gn+=" is_debug=false"
-
- # enable DCHECK with USE=debug only, increases chrome binary size by 30%, bug #811138.
- # DCHECK is fatal by default, make it configurable at runtime, #bug 807881.
- myconf_gn+=" dcheck_always_on=$(usex debug true false)"
- myconf_gn+=" dcheck_is_configurable=$(usex debug true false)"
-
- # Component build isn't generally intended for use by end users. It's mostly useful
- # for development and debugging.
- myconf_gn+=" is_component_build=$(usex component-build true false)"
-
- # Disable nacl, we can't build without pnacl (http://crbug.com/269560).
- myconf_gn+=" enable_nacl=false"
-
- # Use system-provided libraries.
- # TODO: freetype -- remove sources (https://bugs.chromium.org/p/pdfium/issues/detail?id=733).
- # TODO: use_system_hunspell (upstream changes needed).
- # TODO: use_system_protobuf (bug #525560).
- # TODO: use_system_sqlite (http://crbug.com/22208).
-
- # libevent: https://bugs.gentoo.org/593458
- local gn_system_libraries=(
- flac
- fontconfig
- freetype
- # Need harfbuzz_from_pkgconfig target
- #harfbuzz-ng
- libdrm
- libjpeg
- libwebp
- libxml
- libxslt
- openh264
- zlib
- )
- if use system-ffmpeg; then
- gn_system_libraries+=( ffmpeg opus )
- fi
- if use system-icu; then
- gn_system_libraries+=( icu )
- fi
- if use system-png; then
- gn_system_libraries+=( libpng )
- fi
- # re2 library interface relies on std::string and std::vector
- if ! use libcxx; then
- gn_system_libraries+=( re2 )
- fi
- build/linux/unbundle/replace_gn_files.py --system-libraries "${gn_system_libraries[@]}" || die
-
- # See dependency logic in third_party/BUILD.gn
- myconf_gn+=" use_system_harfbuzz=$(usex system-harfbuzz true false)"
-
- # Disable deprecated libgnome-keyring dependency, bug #713012
- myconf_gn+=" use_gnome_keyring=false"
-
- # Optional dependencies.
- myconf_gn+=" enable_js_type_check=$(usex js-type-check true false)"
- myconf_gn+=" enable_hangout_services_extension=$(usex hangouts true false)"
- myconf_gn+=" enable_widevine=$(usex widevine true false)"
-
- if use headless; then
- myconf_gn+=" use_cups=false"
- myconf_gn+=" use_kerberos=false"
- myconf_gn+=" use_pulseaudio=false"
- myconf_gn+=" use_vaapi=false"
- myconf_gn+=" rtc_use_pipewire=false"
- else
- myconf_gn+=" use_cups=$(usex cups true false)"
- myconf_gn+=" use_kerberos=$(usex kerberos true false)"
- myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)"
- myconf_gn+=" use_vaapi=$(usex vaapi true false)"
- myconf_gn+=" rtc_use_pipewire=$(usex screencast true false)"
- myconf_gn+=" gtk_version=$(usex gtk4 4 3)"
- fi
-
- # TODO: link_pulseaudio=true for GN.
-
- myconf_gn+=" disable_fieldtrial_testing_config=true"
-
- # Never use bundled gold binary. Disable gold linker flags for now.
- # Do not use bundled clang.
- # Trying to use gold results in linker crash.
- myconf_gn+=" use_gold=false use_sysroot=false"
- myconf_gn+=" use_custom_libcxx=$(usex libcxx true false)"
-
- # Disable pseudolocales, only used for testing
- myconf_gn+=" enable_pseudolocales=false"
-
- # Disable code formating of generated files
- myconf_gn+=" blink_enable_generated_code_formatting=false"
-
- ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
- myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)"
- myconf_gn+=" ffmpeg_branding=\"${ffmpeg_branding}\""
-
- # Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
- # Note: these are for Gentoo use ONLY. For your own distribution,
- # please get your own set of keys. Feel free to contact chromium@gentoo.org
- # for more info. The OAuth2 credentials, however, have been left out.
- # Those OAuth2 credentials have been broken for quite some time anyway.
- # Instead we apply a patch to use the --oauth2-client-id= and
- # --oauth2-client-secret= switches for setting GOOGLE_DEFAULT_CLIENT_ID and
- # GOOGLE_DEFAULT_CLIENT_SECRET at runtime. This allows signing into
- # Chromium without baked-in values.
- local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc"
- myconf_gn+=" google_api_key=\"${google_api_key}\""
- local myarch="$(tc-arch)"
-
- # Avoid CFLAGS problems, bug #352457, bug #390147.
- if ! use custom-cflags; then
- replace-flags "-Os" "-O2"
- strip-flags
-
- # Debug info section overflows without component build
- # Prevent linker from running out of address space, bug #471810 .
- if ! use component-build || use x86; then
- filter-flags "-g*"
- fi
-
- # Prevent libvpx/xnnpack build failures. Bug 530248, 544702, 546984, 853646.
- if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
- filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2 -mno-fma -mno-fma4 -mno-xop
- fi
- fi
-
- if [[ $myarch = amd64 ]] ; then
- myconf_gn+=" target_cpu=\"x64\""
- ffmpeg_target_arch=x64
- elif [[ $myarch = x86 ]] ; then
- myconf_gn+=" target_cpu=\"x86\""
- ffmpeg_target_arch=ia32
-
- # This is normally defined by compiler_cpu_abi in
- # build/config/compiler/BUILD.gn, but we patch that part out.
- append-flags -msse2 -mfpmath=sse -mmmx
- elif [[ $myarch = arm64 ]] ; then
- myconf_gn+=" target_cpu=\"arm64\""
- ffmpeg_target_arch=arm64
- elif [[ $myarch = arm ]] ; then
- myconf_gn+=" target_cpu=\"arm\""
- ffmpeg_target_arch=$(usex cpu_flags_arm_neon arm-neon arm)
- elif [[ $myarch = ppc64 ]] ; then
- myconf_gn+=" target_cpu=\"ppc64\""
- ffmpeg_target_arch=ppc64
- else
- die "Failed to determine target arch, got '$myarch'."
- fi
-
- # Make sure that -Werror doesn't get added to CFLAGS by the build system.
- # Depending on GCC version the warnings are different and we don't want
- # the build to fail because of that.
- myconf_gn+=" treat_warnings_as_errors=false"
-
- # Disable fatal linker warnings, bug 506268.
- myconf_gn+=" fatal_linker_warnings=false"
-
- # Disable external code space for V8 for ppc64. It is disabled for ppc64
- # by default, but cross-compiling on amd64 enables it again.
- if tc-is-cross-compiler; then
- if ! use amd64 && ! use arm64; then
- myconf_gn+=" v8_enable_external_code_space=false"
- fi
- fi
-
- # Bug 491582.
- export TMPDIR="${WORKDIR}/temp"
- mkdir -p -m 755 "${TMPDIR}" || die
-
- # https://bugs.gentoo.org/654216
- addpredict /dev/dri/ #nowarn
-
- #if ! use system-ffmpeg; then
- if false; then
- local build_ffmpeg_args=""
- if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
- build_ffmpeg_args+=" --disable-asm"
- fi
-
- # Re-configure bundled ffmpeg. See bug #491378 for example reasons.
- einfo "Configuring bundled ffmpeg..."
- pushd third_party/ffmpeg > /dev/null || die
- chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
- --branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
- chromium/scripts/copy_config.sh || die
- chromium/scripts/generate_gn.py || die
- popd > /dev/null || die
- fi
-
- # Disable unknown warning message from clang.
- if tc-is-clang; then
- append-flags -Wno-unknown-warning-option
- if tc-is-cross-compiler; then
- export BUILD_CXXFLAGS+=" -Wno-unknown-warning-option"
- export BUILD_CFLAGS+=" -Wno-unknown-warning-option"
- fi
- fi
-
- # Disable opaque pointers, https://crbug.com/1316298
- if tc-is-clang; then
- if test-flag-CXX -Xclang -no-opaque-pointers; then
- append-flags -Xclang -no-opaque-pointers
- if tc-is-cross-compiler; then
- export BUILD_CXXFLAGS+=" -Xclang -no-opaque-pointers"
- export BUILD_CFLAGS+=" -Xclang -no-opaque-pointers"
- fi
- fi
- fi
-
- # Explicitly disable ICU data file support for system-icu/headless builds.
- if use system-icu || use headless; then
- myconf_gn+=" icu_use_data_file=false"
- fi
-
- # Enable ozone wayland and/or headless support
- myconf_gn+=" use_ozone=true ozone_auto_platforms=false"
- myconf_gn+=" ozone_platform_headless=true"
- if use headless; then
- myconf_gn+=" ozone_platform=\"headless\""
- myconf_gn+=" use_xkbcommon=false use_gtk=false"
- myconf_gn+=" use_glib=false use_gio=false"
- myconf_gn+=" use_pangocairo=false use_alsa=false"
- myconf_gn+=" use_libpci=false use_udev=false"
- myconf_gn+=" enable_print_preview=false"
- myconf_gn+=" enable_remoting=false"
- else
- myconf_gn+=" use_system_libdrm=true"
- myconf_gn+=" use_system_minigbm=true"
- myconf_gn+=" use_xkbcommon=true"
- myconf_gn+=" ozone_platform_x11=$(usex X true false)"
- myconf_gn+=" ozone_platform_wayland=$(usex wayland true false)"
- myconf_gn+=" ozone_platform=$(usex wayland \"wayland\" \"x11\")"
- fi
-
- # Results in undefined references in chrome linking, may require CFI to work
- if use arm64; then
- myconf_gn+=" arm_control_flow_integrity=\"none\""
- fi
-
- # Enable official builds
- myconf_gn+=" is_official_build=$(usex official true false)"
- myconf_gn+=" use_thin_lto=$(usex lto true false)"
- myconf_gn+=" thin_lto_enable_optimizations=$(usex lto true false)"
- if use official; then
- # Allow building against system libraries in official builds
- sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \
- tools/generate_shim_headers/generate_shim_headers.py || die
- # Disable CFI: unsupported for GCC, requires clang+lto+lld
- myconf_gn+=" is_cfi=false"
- # Disable PGO, because profile data is only compatible with >=clang-11
- myconf_gn+=" chrome_pgo_phase=0"
- # Don't add symbols to build
- myconf_gn+=" symbol_level=0"
- fi
-
- # user CXXFLAGS might overwrite -march=armv8-a+crc+crypto, bug #851639
- if use arm64 && tc-is-gcc; then
- sed -i '/^#if HAVE_ARM64_CRC32C/a #pragma GCC target ("+crc+crypto")' \
- third_party/crc32c/src/src/crc32c_arm64.cc || die
- fi
-
- einfo "Configuring Chromium..."
- set -- gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release
- echo "$@"
- "$@" || die
-}
-
-src_compile() {
- # Final link uses lots of file descriptors.
- ulimit -n 2048
-
- # Calling this here supports resumption via FEATURES=keepwork
- python_setup
-
- # Don't inherit PYTHONPATH from environment, bug #789021, #812689
- local -x PYTHONPATH=
-
- #"${EPYTHON}" tools/clang/scripts/update.py --force-local-build --gcc-toolchain /usr --skip-checkout --use-system-cmake --without-android || die
-
- # Build mksnapshot and pax-mark it.
- local x
- for x in mksnapshot v8_context_snapshot_generator; do
- if tc-is-cross-compiler; then
- eninja -C out/Release "host/${x}"
- pax-mark m "out/Release/host/${x}"
- else
- eninja -C out/Release "${x}"
- pax-mark m "out/Release/${x}"
- fi
- done
-
- # Even though ninja autodetects number of CPUs, we respect
- # user's options, for debugging with -j 1 or any other reason.
- eninja -C out/Release chrome chromedriver
- use suid && eninja -C out/Release chrome_sandbox
-
- pax-mark m out/Release/chrome
-
- mv out/Release/chromedriver{.unstripped,} || die
-
- # Build manpage; bug #684550
- sed -e 's|@@PACKAGE@@|chromium-browser|g;
- s|@@MENUNAME@@|Chromium|g;' \
- chrome/app/resources/manpage.1.in > \
- out/Release/chromium-browser.1 || die
-
- # Build desktop file; bug #706786
- sed -e 's|@@MENUNAME@@|Chromium|g;
- s|@@USR_BIN_SYMLINK_NAME@@|chromium-browser|g;
- s|@@PACKAGE@@|chromium-browser|g;
- s|\(^Exec=\)/usr/bin/|\1|g;' \
- chrome/installer/linux/common/desktop.template > \
- out/Release/chromium-browser-chromium.desktop || die
-
- # Build vk_swiftshader_icd.json; bug #827861
- sed -e 's|${ICD_LIBRARY_PATH}|./libvk_swiftshader.so|g' \
- third_party/swiftshader/src/Vulkan/vk_swiftshader_icd.json.tmpl > \
- out/Release/vk_swiftshader_icd.json || die
-}
-
-src_install() {
- local CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser"
- exeinto "${CHROMIUM_HOME}"
- doexe out/Release/chrome
-
- if use suid; then
- newexe out/Release/chrome_sandbox chrome-sandbox
- fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
- fi
-
- doexe out/Release/chromedriver
- doexe out/Release/chrome_crashpad_handler
-
- ozone_auto_session () {
- use X && use wayland && ! use headless && echo true || echo false
- }
- local sedargs=( -e
- "s:/usr/lib/:/usr/$(get_libdir)/:g;
- s:@@OZONE_AUTO_SESSION@@:$(ozone_auto_session):g"
- )
- sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r7.sh" > chromium-launcher.sh || die
- doexe chromium-launcher.sh
-
- # It is important that we name the target "chromium-browser",
- # xdg-utils expect it; bug #355517.
- dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser
- # keep the old symlink around for consistency
- dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium
-
- dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver
-
- # Allow users to override command-line options, bug #357629.
- insinto /etc/chromium
- newins "${FILESDIR}/chromium.default" "default"
-
- pushd out/Release/locales > /dev/null || die
- chromium_remove_language_paks
- popd
-
- insinto "${CHROMIUM_HOME}"
- doins out/Release/*.bin
- doins out/Release/*.pak
- (
- shopt -s nullglob
- local files=(out/Release/*.so out/Release/*.so.[0-9])
- [[ ${#files[@]} -gt 0 ]] && doins "${files[@]}"
- )
-
- if ! use system-icu && ! use headless; then
- doins out/Release/icudtl.dat
- fi
-
- doins -r out/Release/locales
- doins -r out/Release/MEIPreload
-
- # Install vk_swiftshader_icd.json; bug #827861
- doins out/Release/vk_swiftshader_icd.json
-
- if [[ -d out/Release/swiftshader ]]; then
- insinto "${CHROMIUM_HOME}/swiftshader"
- doins out/Release/swiftshader/*.so
- fi
-
- # Install icons
- local branding size
- for size in 16 24 32 48 64 128 256 ; do
- case ${size} in
- 16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
- *) branding="chrome/app/theme/chromium" ;;
- esac
- newicon -s ${size} "${branding}/product_logo_${size}.png" \
- chromium-browser.png
- done
-
- # Install desktop entry
- domenu out/Release/chromium-browser-chromium.desktop
-
- # Install GNOME default application entry (bug #303100).
- insinto /usr/share/gnome-control-center/default-apps
- newins "${FILESDIR}"/chromium-browser.xml chromium-browser.xml
-
- # Install manpage; bug #684550
- doman out/Release/chromium-browser.1
- dosym chromium-browser.1 /usr/share/man/man1/chromium.1
-
- readme.gentoo_create_doc
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
- xdg_desktop_database_update
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
- xdg_desktop_database_update
- readme.gentoo_print_elog
-
- if ! use headless; then
- if use vaapi; then
- elog "VA-API is disabled by default at runtime. You have to enable it"
- elog "by adding --enable-features=VaapiVideoDecoder to CHROMIUM_FLAGS"
- elog "in /etc/chromium/default."
- fi
- if use screencast; then
- elog "Screencast is disabled by default at runtime. Either enable it"
- elog "by navigating to chrome://flags/#enable-webrtc-pipewire-capturer"
- elog "inside Chromium or add --enable-features=WebRTCPipeWireCapturer"
- elog "to CHROMIUM_FLAGS in /etc/chromium/default."
- fi
- if use gtk4; then
- elog "Chromium prefers GTK3 over GTK4 at runtime. To override this"
- elog "behavior you need to pass --gtk-version=4, e.g. by adding it"
- elog "to CHROMIUM_FLAGS in /etc/chromium/default."
- fi
- fi
-}
diff --git a/www-client/chromium/chromium-104.0.5112.101.ebuild b/www-client/chromium/chromium-104.0.5112.101.ebuild
index a0de1d3d2f8b..d1f1e6dffdd1 100644
--- a/www-client/chromium/chromium-104.0.5112.101.ebuild
+++ b/www-client/chromium/chromium-104.0.5112.101.ebuild
@@ -24,7 +24,7 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}
LICENSE="BSD"
SLOT="0/stable"
-KEYWORDS="~amd64 arm64"
+KEYWORDS="amd64 arm64"
IUSE="+X component-build cups cpu_flags_arm_neon debug gtk4 +hangouts headless +js-type-check kerberos libcxx lto +official pgo pic +proprietary-codecs pulseaudio screencast selinux +suid +system-ffmpeg +system-harfbuzz +system-icu +system-png vaapi wayland widevine"
REQUIRED_USE="
component-build? ( !suid !libcxx )
diff --git a/www-client/chromium/chromium-104.0.5112.79.ebuild b/www-client/chromium/chromium-104.0.5112.79.ebuild
deleted file mode 100644
index 21b76aac3497..000000000000
--- a/www-client/chromium/chromium-104.0.5112.79.ebuild
+++ /dev/null
@@ -1,1193 +0,0 @@
-# Copyright 2009-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="xml"
-LLVM_MAX_SLOT=14
-
-CHROMIUM_LANGS="af am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
- hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
- sv sw ta te th tr uk ur vi zh-CN zh-TW"
-
-VIRTUALX_REQUIRED="pgo"
-
-inherit check-reqs chromium-2 desktop flag-o-matic llvm ninja-utils pax-utils python-any-r1 readme.gentoo-r1 toolchain-funcs virtualx xdg-utils
-
-DESCRIPTION="Open-source version of Google Chrome web browser"
-HOMEPAGE="https://chromium.org/"
-PATCHSET="2"
-PATCHSET_NAME="chromium-$(ver_cut 1)-patchset-${PATCHSET}"
-SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz
- https://github.com/stha09/chromium-patches/releases/download/${PATCHSET_NAME}/${PATCHSET_NAME}.tar.xz
- pgo? ( https://blackhole.sk/~kabel/src/chromium-profiler-0.1.tar )"
-
-LICENSE="BSD"
-SLOT="0/stable"
-KEYWORDS="~amd64 ~arm64"
-IUSE="+X component-build cups cpu_flags_arm_neon debug gtk4 +hangouts headless +js-type-check kerberos libcxx lto +official pgo pic +proprietary-codecs pulseaudio screencast selinux +suid +system-ffmpeg +system-harfbuzz +system-icu +system-png vaapi wayland widevine"
-REQUIRED_USE="
- component-build? ( !suid !libcxx )
- screencast? ( wayland )
- !headless? ( || ( X wayland ) )
- pgo? ( X !wayland )
-"
-
-COMMON_X_DEPEND="
- x11-libs/libXcomposite:=
- x11-libs/libXcursor:=
- x11-libs/libXdamage:=
- x11-libs/libXfixes:=
- >=x11-libs/libXi-1.6.0:=
- x11-libs/libXrandr:=
- x11-libs/libXrender:=
- x11-libs/libXtst:=
- x11-libs/libxshmfence:=
-"
-
-COMMON_SNAPSHOT_DEPEND="
- system-icu? ( >=dev-libs/icu-71.1:= )
- >=dev-libs/libxml2-2.9.4-r3:=[icu]
- dev-libs/nspr:=
- >=dev-libs/nss-3.26:=
- !libcxx? ( >=dev-libs/re2-0.2019.08.01:= )
- dev-libs/libxslt:=
- media-libs/fontconfig:=
- >=media-libs/freetype-2.11.0-r1:=
- system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] )
- media-libs/libjpeg-turbo:=
- system-png? ( media-libs/libpng:=[-apng] )
- >=media-libs/libwebp-0.4.0:=
- media-libs/mesa:=[gbm(+)]
- >=media-libs/openh264-1.6.0:=
- sys-libs/zlib:=
- x11-libs/libdrm:=
- !headless? (
- dev-libs/glib:2
- >=media-libs/alsa-lib-1.0.19:=
- pulseaudio? ( media-sound/pulseaudio:= )
- sys-apps/pciutils:=
- kerberos? ( virtual/krb5 )
- vaapi? ( >=x11-libs/libva-2.7:=[X?,wayland?] )
- X? (
- x11-libs/libX11:=
- x11-libs/libXext:=
- x11-libs/libxcb:=
- )
- x11-libs/libxkbcommon:=
- wayland? (
- dev-libs/wayland:=
- screencast? ( media-video/pipewire:= )
- )
- )
-"
-
-COMMON_DEPEND="
- ${COMMON_SNAPSHOT_DEPEND}
- app-arch/bzip2:=
- dev-libs/expat:=
- system-ffmpeg? (
- >=media-video/ffmpeg-4.3:=
- || (
- media-video/ffmpeg[-samba]
- >=net-fs/samba-4.5.10-r1[-debug(-)]
- )
- >=media-libs/opus-1.3.1:=
- )
- net-misc/curl[ssl]
- sys-apps/dbus:=
- media-libs/flac:=
- sys-libs/zlib:=[minizip]
- !headless? (
- X? ( ${COMMON_X_DEPEND} )
- >=app-accessibility/at-spi2-atk-2.26:2
- >=app-accessibility/at-spi2-core-2.26:2
- >=dev-libs/atk-2.26
- media-libs/mesa:=[X?,wayland?]
- cups? ( >=net-print/cups-1.3.11:= )
- virtual/udev
- x11-libs/cairo:=
- x11-libs/gdk-pixbuf:2
- x11-libs/pango:=
- )
-"
-RDEPEND="${COMMON_DEPEND}
- !headless? (
- || (
- x11-libs/gtk+:3[X?,wayland?]
- gui-libs/gtk:4[X?,wayland?]
- )
- x11-misc/xdg-utils
- )
- virtual/ttf-fonts
- selinux? ( sec-policy/selinux-chromium )
-"
-DEPEND="${COMMON_DEPEND}
- !headless? (
- gtk4? ( gui-libs/gtk:4[X?,wayland?] )
- !gtk4? ( x11-libs/gtk+:3[X?,wayland?] )
- )
-"
-
-depend_clang_llvm_version() {
- echo "sys-devel/clang:$1"
- echo "sys-devel/llvm:$1"
- echo "=sys-devel/lld-$1*"
-}
-
-depend_clang_llvm_versions() {
- local _v
- if [[ $# -gt 1 ]]; then
- echo "|| ("
- for _v in "$@"; do
- echo "("
- depend_clang_llvm_version "${_v}"
- echo ")"
- done
- echo ")"
- elif [[ $# -eq 1 ]]; then
- depend_clang_llvm_version "$1"
- fi
-}
-
-BDEPEND="
- ${COMMON_SNAPSHOT_DEPEND}
- ${PYTHON_DEPS}
- $(python_gen_any_dep '
- dev-python/setuptools[${PYTHON_USEDEP}]
- ')
- >=app-arch/gzip-1.7
- libcxx? ( >=sys-devel/clang-12 )
- lto? ( $(depend_clang_llvm_versions 13 14) )
- pgo? (
- >=dev-python/selenium-3.141.0
- >=dev-util/web_page_replay_go-20220314
- $(depend_clang_llvm_versions 13 14)
- )
- dev-lang/perl
- >=dev-util/gn-0.1807
- >=dev-util/gperf-3.0.3
- >=dev-util/ninja-1.7.2
- dev-vcs/git
- >=net-libs/nodejs-7.6.0[inspector]
- >=sys-devel/bison-2.4.3
- sys-devel/flex
- virtual/pkgconfig
- js-type-check? ( virtual/jre )
-"
-
-# These are intended for ebuild maintainer use to force clang if GCC is broken.
-: ${CHROMIUM_FORCE_CLANG=no}
-
-if [[ ${CHROMIUM_FORCE_CLANG} == yes ]]; then
- BDEPEND+=" >=sys-devel/clang-12"
-fi
-
-if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
- EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
-fi
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-Some web pages may require additional fonts to display properly.
-Try installing some of the following packages if some characters
-are not displayed properly:
-- media-fonts/arphicfonts
-- media-fonts/droid
-- media-fonts/ipamonafont
-- media-fonts/noto
-- media-fonts/ja-ipafonts
-- media-fonts/takao-fonts
-- media-fonts/wqy-microhei
-- media-fonts/wqy-zenhei
-
-To fix broken icons on the Downloads page, you should install an icon
-theme that covers the appropriate MIME types, and configure this as your
-GTK+ icon theme.
-
-For native file dialogs in KDE, install kde-apps/kdialog.
-
-To make password storage work with your desktop environment you may
-have install one of the supported credentials management applications:
-- app-crypt/libsecret (GNOME)
-- kde-frameworks/kwallet (KDE)
-If you have one of above packages installed, but don't want to use
-them in Chromium, then add --password-store=basic to CHROMIUM_FLAGS
-in /etc/chromium/default.
-"
-
-python_check_deps() {
- python_has_version "dev-python/setuptools[${PYTHON_USEDEP}]"
-}
-
-needs_clang() {
- [[ ${CHROMIUM_FORCE_CLANG} == yes ]] || use libcxx || use lto || use pgo
-}
-
-llvm_check_deps() {
- if ! has_version -b "sys-devel/clang:${LLVM_SLOT}" ; then
- einfo "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
- return 1
- fi
-
- if ( use lto || use pgo ) && ! has_version -b "=sys-devel/lld-${LLVM_SLOT}*" ; then
- einfo "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
- return 1
- fi
-
- einfo "Using LLVM slot ${LLVM_SLOT} to build" >&2
-}
-
-pre_build_checks() {
- if [[ ${MERGE_TYPE} != binary ]]; then
- [[ ${EBUILD_PHASE_FUNC} == pkg_setup ]] && ( use lto || use pgo ) && llvm_pkg_setup
-
- local -x CPP="$(tc-getCXX) -E"
- if tc-is-gcc && ! ver_test "$(gcc-version)" -ge 9.2; then
- die "At least gcc 9.2 is required"
- fi
- if use pgo && tc-is-cross-compiler; then
- die "The pgo USE flag cannot be used when cross-compiling"
- fi
- if needs_clang || tc-is-clang; then
- tc-is-cross-compiler && CPP=${CBUILD}-clang++ || CPP=${CHOST}-clang++
- CPP+=" -E"
- if ! ver_test "$(clang-major-version)" -ge 12; then
- die "At least clang 12 is required"
- fi
- fi
- if [[ ${EBUILD_PHASE_FUNC} == pkg_setup ]] && use js-type-check; then
- "${BROOT}"/usr/bin/java -version 2>1 > /dev/null || die "Java VM not setup correctly"
- fi
- fi
-
- # Check build requirements, bug #541816 and bug #471810 .
- CHECKREQS_MEMORY="4G"
- CHECKREQS_DISK_BUILD="10G"
- tc-is-cross-compiler && CHECKREQS_DISK_BUILD="13G"
- if use lto || use pgo; then
- CHECKREQS_MEMORY="9G"
- CHECKREQS_DISK_BUILD="12G"
- tc-is-cross-compiler && CHECKREQS_DISK_BUILD="15G"
- use pgo && CHECKREQS_DISK_BUILD="19G"
- fi
- if is-flagq '-g?(gdb)?([1-9])'; then
- if use custom-cflags || use component-build; then
- CHECKREQS_DISK_BUILD="25G"
- fi
- if ! use component-build; then
- CHECKREQS_MEMORY="16G"
- fi
- fi
- check-reqs_${EBUILD_PHASE_FUNC}
-}
-
-pkg_pretend() {
- pre_build_checks
-
- if use headless; then
- local headless_unused_flags=("cups" "kerberos" "pulseaudio" "vaapi" "wayland")
- for myiuse in ${headless_unused_flags[@]}; do
- use ${myiuse} && ewarn "Ignoring USE=${myiuse} since USE=headless is set."
- done
- fi
-}
-
-pkg_setup() {
- pre_build_checks
-
- chromium_suid_sandbox_check_kernel_config
-
- # nvidia-drivers does not work correctly with Wayland due to unsupported EGLStreams
- if use wayland && ! use headless && has_version "x11-drivers/nvidia-drivers"; then
- ewarn "Proprietary nVidia driver does not work with Wayland. You can disable"
- ewarn "Wayland by setting DISABLE_OZONE_PLATFORM=true in /etc/chromium/default."
- fi
-}
-
-src_prepare() {
- # Calling this here supports resumption via FEATURES=keepwork
- python_setup
-
- local PATCHES=(
- "${WORKDIR}/patches"
- "${FILESDIR}/chromium-93-InkDropHost-crash.patch"
- "${FILESDIR}/chromium-98-EnumTable-crash.patch"
- "${FILESDIR}/chromium-98-gtk4-build.patch"
- "${FILESDIR}/chromium-104-tflite-system-zlib.patch"
- "${FILESDIR}/chromium-104-swiftshader-no-wayland.patch"
- "${FILESDIR}/chromium-use-oauth2-client-switches-as-default.patch"
- "${FILESDIR}/chromium-shim_headers.patch"
- "${FILESDIR}/chromium-cross-compile.patch"
- )
-
- default
-
- mkdir -p third_party/node/linux/node-linux-x64/bin || die
- ln -s "${EPREFIX}"/usr/bin/node third_party/node/linux/node-linux-x64/bin/node || die
-
- # adjust python interpreter version
- sed -i -e "s|\(^script_executable = \).*|\1\"${EPYTHON}\"|g" .gn || die
-
- local keeplibs=(
- base/third_party/cityhash
- base/third_party/double_conversion
- base/third_party/dynamic_annotations
- base/third_party/icu
- base/third_party/nspr
- base/third_party/superfasthash
- base/third_party/symbolize
- base/third_party/valgrind
- base/third_party/xdg_mime
- base/third_party/xdg_user_dirs
- buildtools/third_party/libc++
- buildtools/third_party/libc++abi
- chrome/third_party/mozilla_security_manager
- courgette/third_party
- net/third_party/mozilla_security_manager
- net/third_party/nss
- net/third_party/quic
- net/third_party/uri_template
- third_party/abseil-cpp
- third_party/angle
- third_party/angle/src/common/third_party/base
- third_party/angle/src/common/third_party/smhasher
- third_party/angle/src/common/third_party/xxhash
- third_party/angle/src/third_party/libXNVCtrl
- third_party/angle/src/third_party/trace_event
- third_party/angle/src/third_party/volk
- third_party/apple_apsl
- third_party/axe-core
- third_party/blink
- third_party/boringssl
- third_party/boringssl/src/third_party/fiat
- third_party/breakpad
- third_party/breakpad/breakpad/src/third_party/curl
- third_party/brotli
- third_party/catapult
- third_party/catapult/common/py_vulcanize/third_party/rcssmin
- third_party/catapult/common/py_vulcanize/third_party/rjsmin
- third_party/catapult/third_party/beautifulsoup4-4.9.3
- third_party/catapult/third_party/html5lib-1.1
- third_party/catapult/third_party/polymer
- third_party/catapult/third_party/six
- third_party/catapult/tracing/third_party/d3
- third_party/catapult/tracing/third_party/gl-matrix
- third_party/catapult/tracing/third_party/jpeg-js
- third_party/catapult/tracing/third_party/jszip
- third_party/catapult/tracing/third_party/mannwhitneyu
- third_party/catapult/tracing/third_party/oboe
- third_party/catapult/tracing/third_party/pako
- third_party/ced
- third_party/cld_3
- third_party/closure_compiler
- third_party/cpuinfo
- third_party/crashpad
- third_party/crashpad/crashpad/third_party/lss
- third_party/crashpad/crashpad/third_party/zlib
- third_party/crc32c
- third_party/cros_system_api
- third_party/dav1d
- third_party/dawn
- third_party/dawn/third_party/gn/webgpu-cts
- third_party/dawn/third_party/khronos
- third_party/depot_tools
- third_party/devscripts
- third_party/devtools-frontend
- third_party/devtools-frontend/src/front_end/third_party/acorn
- third_party/devtools-frontend/src/front_end/third_party/additional_readme_paths.json
- third_party/devtools-frontend/src/front_end/third_party/axe-core
- third_party/devtools-frontend/src/front_end/third_party/chromium
- third_party/devtools-frontend/src/front_end/third_party/codemirror
- third_party/devtools-frontend/src/front_end/third_party/diff
- third_party/devtools-frontend/src/front_end/third_party/i18n
- third_party/devtools-frontend/src/front_end/third_party/intl-messageformat
- third_party/devtools-frontend/src/front_end/third_party/lighthouse
- third_party/devtools-frontend/src/front_end/third_party/lit-html
- third_party/devtools-frontend/src/front_end/third_party/lodash-isequal
- third_party/devtools-frontend/src/front_end/third_party/marked
- third_party/devtools-frontend/src/front_end/third_party/puppeteer
- third_party/devtools-frontend/src/front_end/third_party/wasmparser
- third_party/devtools-frontend/src/test/unittests/front_end/third_party/i18n
- third_party/devtools-frontend/src/third_party
- third_party/distributed_point_functions
- third_party/dom_distiller_js
- third_party/eigen3
- third_party/emoji-segmenter
- third_party/farmhash
- third_party/fdlibm
- third_party/fft2d
- third_party/flatbuffers
- third_party/fp16
- third_party/freetype
- third_party/fusejs
- third_party/fxdiv
- third_party/highway
- third_party/libgifcodec
- third_party/liburlpattern
- third_party/libzip
- third_party/gemmlowp
- third_party/google_input_tools
- third_party/google_input_tools/third_party/closure_library
- third_party/google_input_tools/third_party/closure_library/third_party/closure
- third_party/googletest
- third_party/hunspell
- third_party/iccjpeg
- third_party/inspector_protocol
- third_party/jinja2
- third_party/jsoncpp
- third_party/jstemplate
- third_party/khronos
- third_party/leveldatabase
- third_party/libaddressinput
- third_party/libaom
- third_party/libaom/source/libaom/third_party/fastfeat
- third_party/libaom/source/libaom/third_party/vector
- third_party/libaom/source/libaom/third_party/x86inc
- third_party/libavif
- third_party/libgav1
- third_party/libjingle
- third_party/libjxl
- third_party/libphonenumber
- third_party/libsecret
- third_party/libsrtp
- third_party/libsync
- third_party/libudev
- third_party/libva_protected_content
- third_party/libvpx
- third_party/libvpx/source/libvpx/third_party/x86inc
- third_party/libwebm
- third_party/libx11
- third_party/libxcb-keysyms
- third_party/libxml/chromium
- third_party/libyuv
- third_party/llvm
- third_party/lottie
- third_party/lss
- third_party/lzma_sdk
- third_party/mako
- third_party/maldoca
- third_party/maldoca/src/third_party/tensorflow_protos
- third_party/maldoca/src/third_party/zlibwrapper
- third_party/markupsafe
- third_party/mesa
- third_party/metrics_proto
- third_party/minigbm
- third_party/modp_b64
- third_party/nasm
- third_party/nearby
- third_party/neon_2_sse
- third_party/node
- third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2
- third_party/one_euro_filter
- third_party/openscreen
- third_party/openscreen/src/third_party/mozilla
- third_party/openscreen/src/third_party/tinycbor/src/src
- third_party/ots
- third_party/pdfium
- third_party/pdfium/third_party/agg23
- third_party/pdfium/third_party/base
- third_party/pdfium/third_party/bigint
- third_party/pdfium/third_party/freetype
- third_party/pdfium/third_party/lcms
- third_party/pdfium/third_party/libopenjpeg20
- third_party/pdfium/third_party/libpng16
- third_party/pdfium/third_party/libtiff
- third_party/pdfium/third_party/skia_shared
- third_party/perfetto
- third_party/perfetto/protos/third_party/chromium
- third_party/pffft
- third_party/ply
- third_party/polymer
- third_party/private-join-and-compute
- third_party/private_membership
- third_party/protobuf
- third_party/protobuf/third_party/six
- third_party/pthreadpool
- third_party/pyjson5
- third_party/qcms
- third_party/rnnoise
- third_party/s2cellid
- third_party/securemessage
- third_party/shell-encryption
- third_party/simplejson
- third_party/skia
- third_party/skia/include/third_party/skcms
- third_party/skia/include/third_party/vulkan
- third_party/skia/third_party/skcms
- third_party/skia/third_party/vulkan
- third_party/smhasher
- third_party/snappy
- third_party/sqlite
- third_party/swiftshader
- third_party/swiftshader/third_party/astc-encoder
- third_party/swiftshader/third_party/llvm-subzero
- third_party/swiftshader/third_party/marl
- third_party/swiftshader/third_party/subzero
- third_party/swiftshader/third_party/SPIRV-Headers/include/spirv
- third_party/swiftshader/third_party/SPIRV-Tools
- third_party/tensorflow-text
- third_party/tflite
- third_party/tflite/src/third_party/eigen3
- third_party/tflite/src/third_party/fft2d
- third_party/ruy
- third_party/six
- third_party/ukey2
- third_party/unrar
- third_party/utf
- third_party/vulkan
- third_party/web-animations-js
- third_party/webdriver
- third_party/webgpu-cts
- third_party/webrtc
- third_party/webrtc/common_audio/third_party/ooura
- third_party/webrtc/common_audio/third_party/spl_sqrt_floor
- third_party/webrtc/modules/third_party/fft
- third_party/webrtc/modules/third_party/g711
- third_party/webrtc/modules/third_party/g722
- third_party/webrtc/rtc_base/third_party/base64
- third_party/webrtc/rtc_base/third_party/sigslot
- third_party/widevine
- third_party/woff2
- third_party/wuffs
- third_party/x11proto
- third_party/xcbproto
- third_party/xnnpack
- third_party/zxcvbn-cpp
- third_party/zlib/google
- url/third_party/mozilla
- v8/src/third_party/siphash
- v8/src/third_party/valgrind
- v8/src/third_party/utf8-decoder
- v8/third_party/inspector_protocol
- v8/third_party/v8
-
- # gyp -> gn leftovers
- base/third_party/libevent
- third_party/speech-dispatcher
- third_party/usb_ids
- third_party/xdg-utils
- )
- if ! use system-ffmpeg; then
- keeplibs+=( third_party/ffmpeg third_party/opus )
- fi
- if ! use system-icu; then
- keeplibs+=( third_party/icu )
- fi
- if ! use system-png; then
- keeplibs+=( third_party/libpng )
- fi
- if use libcxx; then
- keeplibs+=( third_party/re2 )
- fi
- if use system-harfbuzz; then
- keeplibs+=( third_party/harfbuzz-ng/utils )
- else
- keeplibs+=( third_party/harfbuzz-ng )
- fi
- if use wayland && ! use headless ; then
- keeplibs+=( third_party/wayland )
- fi
- if use arm64 || use ppc64 ; then
- keeplibs+=( third_party/swiftshader/third_party/llvm-10.0 )
- fi
- # we need to generate ppc64 stuff because upstream does not ship it yet
- # it has to be done before unbundling.
- if use ppc64; then
- pushd third_party/libvpx >/dev/null || die
- mkdir -p source/config/linux/ppc64 || die
- # requires git and clang, bug #832803
- sed -i -e "s|^update_readme||g; s|clang-format|${EPREFIX}/bin/true|g" \
- generate_gni.sh || die
- ./generate_gni.sh || die
- popd >/dev/null || die
-
- pushd third_party/ffmpeg >/dev/null || die
- cp libavcodec/ppc/h264dsp.c libavcodec/ppc/h264dsp_ppc.c || die
- cp libavcodec/ppc/h264qpel.c libavcodec/ppc/h264qpel_ppc.c || die
- popd >/dev/null || die
- fi
-
- # Remove most bundled libraries. Some are still needed.
- build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove || die
-
- if use js-type-check; then
- ln -s "${EPREFIX}"/usr/bin/java third_party/jdk/current/bin/java || die
- fi
-
- # bundled eu-strip is for amd64 only and we don't want to pre-stripped binaries
- mkdir -p buildtools/third_party/eu-strip/bin || die
- ln -s "${EPREFIX}"/bin/true buildtools/third_party/eu-strip/bin/eu-strip || die
-}
-
-chromium_configure() {
- # Calling this here supports resumption via FEATURES=keepwork
- python_setup
-
- local myconf_gn=""
-
- # Make sure the build system will use the right tools, bug #340795.
- tc-export AR CC CXX NM
-
- if needs_clang && ! tc-is-clang; then
- # Force clang since gcc is either broken or build is using libcxx.
- if tc-is-cross-compiler; then
- CC="${CBUILD}-clang -target ${CHOST} --sysroot ${ESYSROOT}"
- CXX="${CBUILD}-clang++ -target ${CHOST} --sysroot ${ESYSROOT}"
- BUILD_CC=${CBUILD}-clang
- BUILD_CXX=${CBUILD}-clang++
- else
- CC=${CHOST}-clang
- CXX=${CHOST}-clang++
- fi
- strip-unsupported-flags
- fi
-
- if tc-is-clang; then
- myconf_gn+=" is_clang=true clang_use_chrome_plugins=false"
- else
- myconf_gn+=" is_clang=false"
- fi
-
- # Force lld for lto or pgo builds only, otherwise disable, bug 641556
- if use lto || use pgo; then
- myconf_gn+=" use_lld=true"
- else
- myconf_gn+=" use_lld=false"
- fi
-
- if use lto || use pgo; then
- AR=llvm-ar
- NM=llvm-nm
- if tc-is-cross-compiler; then
- BUILD_AR=llvm-ar
- BUILD_NM=llvm-nm
- fi
- fi
-
- # Define a custom toolchain for GN
- myconf_gn+=" custom_toolchain=\"//build/toolchain/linux/unbundle:default\""
-
- if tc-is-cross-compiler; then
- tc-export BUILD_{AR,CC,CXX,NM}
- myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:host\""
- myconf_gn+=" v8_snapshot_toolchain=\"//build/toolchain/linux/unbundle:host\""
- myconf_gn+=" pkg_config=\"$(tc-getPKG_CONFIG)\""
- myconf_gn+=" host_pkg_config=\"$(tc-getBUILD_PKG_CONFIG)\""
-
- # setup cups-config, build system only uses --libs option
- if use cups; then
- mkdir "${T}/cups-config" || die
- cp "${ESYSROOT}/usr/bin/${CHOST}-cups-config" "${T}/cups-config/cups-config" || die
- export PATH="${PATH}:${T}/cups-config"
- fi
-
- # Don't inherit PKG_CONFIG_PATH from environment
- local -x PKG_CONFIG_PATH=
- else
- myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:default\""
- fi
-
- # GN needs explicit config for Debug/Release as opposed to inferring it from build directory.
- myconf_gn+=" is_debug=false"
-
- # enable DCHECK with USE=debug only, increases chrome binary size by 30%, bug #811138.
- # DCHECK is fatal by default, make it configurable at runtime, #bug 807881.
- myconf_gn+=" dcheck_always_on=$(usex debug true false)"
- myconf_gn+=" dcheck_is_configurable=$(usex debug true false)"
-
- # Component build isn't generally intended for use by end users. It's mostly useful
- # for development and debugging.
- myconf_gn+=" is_component_build=$(usex component-build true false)"
-
- # Disable nacl, we can't build without pnacl (http://crbug.com/269560).
- myconf_gn+=" enable_nacl=false"
-
- # Use system-provided libraries.
- # TODO: freetype -- remove sources (https://bugs.chromium.org/p/pdfium/issues/detail?id=733).
- # TODO: use_system_hunspell (upstream changes needed).
- # TODO: use_system_protobuf (bug #525560).
- # TODO: use_system_sqlite (http://crbug.com/22208).
-
- # libevent: https://bugs.gentoo.org/593458
- local gn_system_libraries=(
- flac
- fontconfig
- freetype
- # Need harfbuzz_from_pkgconfig target
- #harfbuzz-ng
- libdrm
- libjpeg
- libwebp
- libxml
- libxslt
- openh264
- zlib
- )
- if use system-ffmpeg; then
- gn_system_libraries+=( ffmpeg opus )
- fi
- if use system-icu; then
- gn_system_libraries+=( icu )
- fi
- if use system-png; then
- gn_system_libraries+=( libpng )
- fi
- # re2 library interface relies on std::string and std::vector
- if ! use libcxx; then
- gn_system_libraries+=( re2 )
- fi
- build/linux/unbundle/replace_gn_files.py --system-libraries "${gn_system_libraries[@]}" || die
-
- # See dependency logic in third_party/BUILD.gn
- myconf_gn+=" use_system_harfbuzz=$(usex system-harfbuzz true false)"
-
- # Disable deprecated libgnome-keyring dependency, bug #713012
- myconf_gn+=" use_gnome_keyring=false"
-
- # Optional dependencies.
- myconf_gn+=" enable_js_type_check=$(usex js-type-check true false)"
- myconf_gn+=" enable_hangout_services_extension=$(usex hangouts true false)"
- myconf_gn+=" enable_widevine=$(usex widevine true false)"
-
- if use headless; then
- myconf_gn+=" use_cups=false"
- myconf_gn+=" use_kerberos=false"
- myconf_gn+=" use_pulseaudio=false"
- myconf_gn+=" use_vaapi=false"
- myconf_gn+=" rtc_use_pipewire=false"
- else
- myconf_gn+=" use_cups=$(usex cups true false)"
- myconf_gn+=" use_kerberos=$(usex kerberos true false)"
- myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)"
- myconf_gn+=" use_vaapi=$(usex vaapi true false)"
- myconf_gn+=" rtc_use_pipewire=$(usex screencast true false)"
- myconf_gn+=" gtk_version=$(usex gtk4 4 3)"
- fi
-
- # TODO: link_pulseaudio=true for GN.
-
- myconf_gn+=" disable_fieldtrial_testing_config=true"
-
- # Never use bundled gold binary. Disable gold linker flags for now.
- # Do not use bundled clang.
- # Trying to use gold results in linker crash.
- myconf_gn+=" use_gold=false use_sysroot=false"
- myconf_gn+=" use_custom_libcxx=$(usex libcxx true false)"
-
- # Disable pseudolocales, only used for testing
- myconf_gn+=" enable_pseudolocales=false"
-
- # Disable code formating of generated files
- myconf_gn+=" blink_enable_generated_code_formatting=false"
-
- ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
- myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)"
- myconf_gn+=" ffmpeg_branding=\"${ffmpeg_branding}\""
-
- # Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
- # Note: these are for Gentoo use ONLY. For your own distribution,
- # please get your own set of keys. Feel free to contact chromium@gentoo.org
- # for more info. The OAuth2 credentials, however, have been left out.
- # Those OAuth2 credentials have been broken for quite some time anyway.
- # Instead we apply a patch to use the --oauth2-client-id= and
- # --oauth2-client-secret= switches for setting GOOGLE_DEFAULT_CLIENT_ID and
- # GOOGLE_DEFAULT_CLIENT_SECRET at runtime. This allows signing into
- # Chromium without baked-in values.
- local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc"
- myconf_gn+=" google_api_key=\"${google_api_key}\""
- local myarch="$(tc-arch)"
-
- # Avoid CFLAGS problems, bug #352457, bug #390147.
- if ! use custom-cflags; then
- replace-flags "-Os" "-O2"
- strip-flags
-
- # Debug info section overflows without component build
- # Prevent linker from running out of address space, bug #471810 .
- if ! use component-build || use x86; then
- filter-flags "-g*"
- fi
-
- # Prevent libvpx/xnnpack build failures. Bug 530248, 544702, 546984, 853646.
- if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
- filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2 -mno-fma -mno-fma4 -mno-xop
- fi
- fi
-
- if [[ $myarch = amd64 ]] ; then
- myconf_gn+=" target_cpu=\"x64\""
- ffmpeg_target_arch=x64
- elif [[ $myarch = x86 ]] ; then
- myconf_gn+=" target_cpu=\"x86\""
- ffmpeg_target_arch=ia32
-
- # This is normally defined by compiler_cpu_abi in
- # build/config/compiler/BUILD.gn, but we patch that part out.
- append-flags -msse2 -mfpmath=sse -mmmx
- elif [[ $myarch = arm64 ]] ; then
- myconf_gn+=" target_cpu=\"arm64\""
- ffmpeg_target_arch=arm64
- elif [[ $myarch = arm ]] ; then
- myconf_gn+=" target_cpu=\"arm\""
- ffmpeg_target_arch=$(usex cpu_flags_arm_neon arm-neon arm)
- elif [[ $myarch = ppc64 ]] ; then
- myconf_gn+=" target_cpu=\"ppc64\""
- ffmpeg_target_arch=ppc64
- else
- die "Failed to determine target arch, got '$myarch'."
- fi
-
- # Make sure that -Werror doesn't get added to CFLAGS by the build system.
- # Depending on GCC version the warnings are different and we don't want
- # the build to fail because of that.
- myconf_gn+=" treat_warnings_as_errors=false"
-
- # Disable fatal linker warnings, bug 506268.
- myconf_gn+=" fatal_linker_warnings=false"
-
- # Disable external code space for V8 for ppc64. It is disabled for ppc64
- # by default, but cross-compiling on amd64 enables it again.
- if tc-is-cross-compiler; then
- if ! use amd64 && ! use arm64; then
- myconf_gn+=" v8_enable_external_code_space=false"
- fi
- fi
-
- # Bug 491582.
- export TMPDIR="${WORKDIR}/temp"
- mkdir -p -m 755 "${TMPDIR}" || die
-
- # https://bugs.gentoo.org/654216
- addpredict /dev/dri/ #nowarn
-
- #if ! use system-ffmpeg; then
- if false; then
- local build_ffmpeg_args=""
- if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
- build_ffmpeg_args+=" --disable-asm"
- fi
-
- # Re-configure bundled ffmpeg. See bug #491378 for example reasons.
- einfo "Configuring bundled ffmpeg..."
- pushd third_party/ffmpeg > /dev/null || die
- chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
- --branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
- chromium/scripts/copy_config.sh || die
- chromium/scripts/generate_gn.py || die
- popd > /dev/null || die
- fi
-
- # Disable unknown warning message from clang.
- if tc-is-clang; then
- append-flags -Wno-unknown-warning-option
- if tc-is-cross-compiler; then
- export BUILD_CXXFLAGS+=" -Wno-unknown-warning-option"
- export BUILD_CFLAGS+=" -Wno-unknown-warning-option"
- fi
- fi
-
- # Disable opaque pointers, https://crbug.com/1316298
- if tc-is-clang; then
- if test-flag-CXX -Xclang -no-opaque-pointers; then
- append-flags -Xclang -no-opaque-pointers
- if tc-is-cross-compiler; then
- export BUILD_CXXFLAGS+=" -Xclang -no-opaque-pointers"
- export BUILD_CFLAGS+=" -Xclang -no-opaque-pointers"
- fi
- fi
- fi
-
- # Explicitly disable ICU data file support for system-icu/headless builds.
- if use system-icu || use headless; then
- myconf_gn+=" icu_use_data_file=false"
- fi
-
- # Enable ozone wayland and/or headless support
- myconf_gn+=" use_ozone=true ozone_auto_platforms=false"
- myconf_gn+=" ozone_platform_headless=true"
- if use headless; then
- myconf_gn+=" ozone_platform=\"headless\""
- myconf_gn+=" use_xkbcommon=false use_gtk=false"
- myconf_gn+=" use_glib=false use_gio=false"
- myconf_gn+=" use_pangocairo=false use_alsa=false"
- myconf_gn+=" use_libpci=false use_udev=false"
- myconf_gn+=" enable_print_preview=false"
- myconf_gn+=" enable_remoting=false"
- else
- myconf_gn+=" use_system_libdrm=true"
- myconf_gn+=" use_system_minigbm=true"
- myconf_gn+=" use_xkbcommon=true"
- myconf_gn+=" ozone_platform_x11=$(usex X true false)"
- myconf_gn+=" ozone_platform_wayland=$(usex wayland true false)"
- myconf_gn+=" ozone_platform=$(usex wayland \"wayland\" \"x11\")"
- fi
-
- # Results in undefined references in chrome linking, may require CFI to work
- if use arm64; then
- myconf_gn+=" arm_control_flow_integrity=\"none\""
- fi
-
- # Enable official builds
- myconf_gn+=" is_official_build=$(usex official true false)"
- myconf_gn+=" use_thin_lto=$(usex lto true false)"
- myconf_gn+=" thin_lto_enable_optimizations=$(usex lto true false)"
- if use official; then
- # Allow building against system libraries in official builds
- sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \
- tools/generate_shim_headers/generate_shim_headers.py || die
- # Disable CFI: unsupported for GCC, requires clang+lto+lld
- myconf_gn+=" is_cfi=false"
- # Don't add symbols to build
- myconf_gn+=" symbol_level=0"
- fi
-
- if use pgo; then
- myconf_gn+=" chrome_pgo_phase=${1}"
- if [[ "$1" == "2" ]]; then
- myconf_gn+=" pgo_data_path=\"${2}\""
- fi
- else
- # Disable PGO, because profile data is only compatible with >=clang-11
- myconf_gn+=" chrome_pgo_phase=0"
- fi
-
- # user CXXFLAGS might overwrite -march=armv8-a+crc+crypto, bug #851639
- if use arm64 && tc-is-gcc; then
- sed -i '/^#if HAVE_ARM64_CRC32C/a #pragma GCC target ("+crc+crypto")' \
- third_party/crc32c/src/src/crc32c_arm64.cc || die
- fi
-
- einfo "Configuring Chromium..."
- set -- gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release
- echo "$@"
- "$@" || die
-}
-
-src_configure() {
- chromium_configure $(usex pgo 1 0)
-}
-
-chromium_compile() {
- # Final link uses lots of file descriptors.
- ulimit -n 2048
-
- # Calling this here supports resumption via FEATURES=keepwork
- python_setup
-
- # Don't inherit PYTHONPATH from environment, bug #789021, #812689
- local -x PYTHONPATH=
-
- #"${EPYTHON}" tools/clang/scripts/update.py --force-local-build --gcc-toolchain /usr --skip-checkout --use-system-cmake --without-android || die
-
- # Build mksnapshot and pax-mark it.
- local x
- for x in mksnapshot v8_context_snapshot_generator; do
- if tc-is-cross-compiler; then
- eninja -C out/Release "host/${x}"
- pax-mark m "out/Release/host/${x}"
- else
- eninja -C out/Release "${x}"
- pax-mark m "out/Release/${x}"
- fi
- done
-
- # Even though ninja autodetects number of CPUs, we respect
- # user's options, for debugging with -j 1 or any other reason.
- eninja -C out/Release chrome chromedriver
- use suid && eninja -C out/Release chrome_sandbox
-
- pax-mark m out/Release/chrome
-}
-
-# This function is called from virtx, and must always return so that Xvfb
-# session isn't left running. If we return 1, virtx will call die().
-chromium_profile() {
- einfo "Profiling for PGO"
-
- pushd "${WORKDIR}/chromium-profiler-"* >/dev/null || return 1
-
- # Remove old profdata in case profiling was interrupted.
- rm -rf "${1}" || return 1
-
- if ! "${EPYTHON}" ./chromium_profiler.py \
- --chrome-executable "${S}/out/Release/chrome" \
- --chromedriver-executable "${S}/out/Release/chromedriver.unstripped" \
- --add-arg no-sandbox --add-arg disable-dev-shm-usage \
- --profile-output "${1}"; then
- eerror "Profiling failed"
- return 1
- fi
-
- popd >/dev/null || return 1
-}
-
-src_compile() {
- if use pgo; then
- local profdata
-
- profdata="${WORKDIR}/chromium.profdata"
-
- if [[ ! -e "${WORKDIR}/.pgo-profiled" ]]; then
- chromium_compile
- virtx chromium_profile "$profdata"
-
- touch "${WORKDIR}/.pgo-profiled" || die
- fi
-
- if [[ ! -e "${WORKDIR}/.pgo-phase-2-configured" ]]; then
- # Remove phase 1 output
- rm -r out/Release || die
-
- chromium_configure 2 "$profdata"
-
- touch "${WORKDIR}/.pgo-phase-2-configured" || die
- fi
-
- if [[ ! -e "${WORKDIR}/.pgo-phase-2-compiled" ]]; then
- chromium_compile
- touch "${WORKDIR}/.pgo-phase-2-compiled" || die
- fi
- else
- chromium_compile
- fi
-
- mv out/Release/chromedriver{.unstripped,} || die
-
- # Build manpage; bug #684550
- sed -e 's|@@PACKAGE@@|chromium-browser|g;
- s|@@MENUNAME@@|Chromium|g;' \
- chrome/app/resources/manpage.1.in > \
- out/Release/chromium-browser.1 || die
-
- # Build desktop file; bug #706786
- sed -e 's|@@MENUNAME@@|Chromium|g;
- s|@@USR_BIN_SYMLINK_NAME@@|chromium-browser|g;
- s|@@PACKAGE@@|chromium-browser|g;
- s|\(^Exec=\)/usr/bin/|\1|g;' \
- chrome/installer/linux/common/desktop.template > \
- out/Release/chromium-browser-chromium.desktop || die
-
- # Build vk_swiftshader_icd.json; bug #827861
- sed -e 's|${ICD_LIBRARY_PATH}|./libvk_swiftshader.so|g' \
- third_party/swiftshader/src/Vulkan/vk_swiftshader_icd.json.tmpl > \
- out/Release/vk_swiftshader_icd.json || die
-}
-
-src_install() {
- local CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser"
- exeinto "${CHROMIUM_HOME}"
- doexe out/Release/chrome
-
- if use suid; then
- newexe out/Release/chrome_sandbox chrome-sandbox
- fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
- fi
-
- doexe out/Release/chromedriver
- doexe out/Release/chrome_crashpad_handler
-
- ozone_auto_session () {
- use X && use wayland && ! use headless && echo true || echo false
- }
- local sedargs=( -e
- "s:/usr/lib/:/usr/$(get_libdir)/:g;
- s:@@OZONE_AUTO_SESSION@@:$(ozone_auto_session):g"
- )
- sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r7.sh" > chromium-launcher.sh || die
- doexe chromium-launcher.sh
-
- # It is important that we name the target "chromium-browser",
- # xdg-utils expect it; bug #355517.
- dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser
- # keep the old symlink around for consistency
- dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium
-
- dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver
-
- # Allow users to override command-line options, bug #357629.
- insinto /etc/chromium
- newins "${FILESDIR}/chromium.default" "default"
-
- pushd out/Release/locales > /dev/null || die
- chromium_remove_language_paks
- popd
-
- insinto "${CHROMIUM_HOME}"
- doins out/Release/*.bin
- doins out/Release/*.pak
- (
- shopt -s nullglob
- local files=(out/Release/*.so out/Release/*.so.[0-9])
- [[ ${#files[@]} -gt 0 ]] && doins "${files[@]}"
- )
-
- if ! use system-icu && ! use headless; then
- doins out/Release/icudtl.dat
- fi
-
- doins -r out/Release/locales
- doins -r out/Release/MEIPreload
-
- # Install vk_swiftshader_icd.json; bug #827861
- doins out/Release/vk_swiftshader_icd.json
-
- if [[ -d out/Release/swiftshader ]]; then
- insinto "${CHROMIUM_HOME}/swiftshader"
- doins out/Release/swiftshader/*.so
- fi
-
- # Install icons
- local branding size
- for size in 16 24 32 48 64 128 256 ; do
- case ${size} in
- 16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
- *) branding="chrome/app/theme/chromium" ;;
- esac
- newicon -s ${size} "${branding}/product_logo_${size}.png" \
- chromium-browser.png
- done
-
- # Install desktop entry
- domenu out/Release/chromium-browser-chromium.desktop
-
- # Install GNOME default application entry (bug #303100).
- insinto /usr/share/gnome-control-center/default-apps
- newins "${FILESDIR}"/chromium-browser.xml chromium-browser.xml
-
- # Install manpage; bug #684550
- doman out/Release/chromium-browser.1
- dosym chromium-browser.1 /usr/share/man/man1/chromium.1
-
- readme.gentoo_create_doc
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
- xdg_desktop_database_update
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
- xdg_desktop_database_update
- readme.gentoo_print_elog
-
- if ! use headless; then
- if use vaapi; then
- elog "VA-API is disabled by default at runtime. You have to enable it"
- elog "by adding --enable-features=VaapiVideoDecoder to CHROMIUM_FLAGS"
- elog "in /etc/chromium/default."
- fi
- if use screencast; then
- elog "Screencast is disabled by default at runtime. Either enable it"
- elog "by navigating to chrome://flags/#enable-webrtc-pipewire-capturer"
- elog "inside Chromium or add --enable-features=WebRTCPipeWireCapturer"
- elog "to CHROMIUM_FLAGS in /etc/chromium/default."
- fi
- if use gtk4; then
- elog "Chromium prefers GTK3 over GTK4 at runtime. To override this"
- elog "behavior you need to pass --gtk-version=4, e.g. by adding it"
- elog "to CHROMIUM_FLAGS in /etc/chromium/default."
- fi
- fi
-}
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index 388f0cac18a9..4c0e2e273756 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
Binary files differ
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 8afe11b864ce..4970285cff82 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -9,20 +9,14 @@ AUX tomcat-instance-manager-r1.bash 6451 BLAKE2B 3bcd9dd4d3360a91f4a548c050eab6f
AUX tomcat-instance-manager-r2.bash 6999 BLAKE2B f1c771678bd8b894ecf242d5a8fb22f5b2f0f33445a1ff158c242b5154edc4483a5707ce33a5dcee53a3106e631ad8218243d8b72a32a10cd99e9646fa54085d SHA512 c30c156cbf2b53cf8498288bacaedd48872dce52f461ff32071310b438bdb5015c1cd1d512a2905c4db01e2b22342590e1b8aeadbd44f29062606fabbb2f2fed
AUX tomcat-r1.init 3200 BLAKE2B eb913d32bb8c1883e58551a25ff9516337d947c6fd2c7b449601a89a4518286d61dbca76417265289782a7a08540d8e78a3ea1cd1427d43d87e24813261c0fee SHA512 3d32e2ad998adfbaea5fe0ffcbbe6659dcb530a110faed5f2712ae2fd767353b1fc3f1ac83a24d43138c1bfc55949e645833a428ab982be14415887fc46d9fab
AUX tomcat.conf 1811 BLAKE2B a92606e113172c6f0f73e18ab8ad8796f38bd8c741bb2fd1f6c43d7682728729d0198d4150e42282c7e732750231b7cdbfb51de9b24f2ba780a22700965113c5 SHA512 0747dd2fdad6c68123425adce39f625d34924ae3e7c9d5a00361565a593047d7a4d01dee64c1ef831e5ad79b51750babaf642b0588d4b5948bbed441d53d654d
-DIST apache-tomcat-10.0.22-src.tar.gz 6115322 BLAKE2B 6a9d2e6896fa266b4d75627f85ffa4f132c3cf30db24a331ef2d279e4c618aa817981a963c54148cbcd01af0d502ecf2c4c0f4debdb301f202ea748ea2572a66 SHA512 2d26828a1c44876feb4746186090866784f2a136d8120eb3dc106af7cc4cb95e94c6cbb51a3d4a14ea7159cd3351f4bd475153864e43d7e192296b5382c93a83
DIST apache-tomcat-10.0.23-src.tar.gz 6136614 BLAKE2B 4eaf963187b9a754ed459d7f85e6f7d329927b949bb4a390a602cdc6651aa037aeec559c511ddb9880b6ec4d7cd97b96d82da341509370e412e1b21b799d8c2e SHA512 19ec026bae75318e9ffbe2e619ad2e12ec116382ea88a1064696275afb3fd13e6f08efe497dde79689bfc828f76e27d114ad3a9284b79c8d956a6a85bdac6360
DIST apache-tomcat-7.0.109-src.tar.gz 5314401 BLAKE2B 56583caea6879bf8ca5cc02a886de3d7af413032f88d367653e709dc1c8f590e78620c788317bbff4b6e65dd3e242cc26863164ac8e7c87334a22636f3ed0703 SHA512 ecf9c0bee0e3e1aa24f299fe633705c5a2f6aa264d9e4968cfc96aa5d0a425c2b0ff07765a8b6c67221766733bdfaed6e6c6377a8d0870d889e7063ce90a46ce
-DIST apache-tomcat-8.5.81-src.tar.gz 5988747 BLAKE2B 569e1564cf6f5419aaa0d66a2497852021a244af1a858ad943b45e1c36939011a78edd83c717f346e4327278b95b95535e5c57bdd71af5662e052abc02528f49 SHA512 a9261e2a92e122f0f7f547d0b4e083d6c15cdb4d1ad750bdb3c9e3a597a1c4c1bb0f5dd7ad92f41ce18d15ac7fee47acc2cdd59e588b872f173467864120e581
DIST apache-tomcat-8.5.82-src.tar.gz 6011553 BLAKE2B ea34c0485877ace8c84144f0e75f370c0ac461b5b725d97a07e27014b7a14b1ab88fad4230d4fae60190d7bff3836f691615b57b9f085797477acc69560a57ce SHA512 3e0a0a808fb78493930ce8832731eba4ab3cc440387c3b5226ff6e4ac2faf5fd70eff1560d840d34f14a8acfd7e60fc8b7f638f3dbe0c0ed4569dc4271a9c3f2
-DIST apache-tomcat-9.0.64-src.tar.gz 6174208 BLAKE2B 3ec55872dc73279202faae10b4825ca8cd4f5d2763c43778445b2f1aee27ed1cd765e7345276735359e3a40779eaf2ef8f9120eaca8d38af07cbbcd0584078b4 SHA512 7e01a979d41f7d73204b7a7ae5a85b0094626bf64bcfa3a52f1fc46989369d504b6dd49718084ee0a10af775cab488aae1e18ce05eb2b527800e2a693c7b6386
DIST apache-tomcat-9.0.65-src.tar.gz 6195265 BLAKE2B 13ca956b58e9f1831700f67d1fa8883f6471ab6b700b2af169bf284552658a4e9ad4130451b36976af4dd366cc987e228e0b0f98e688cccf577c626dfc78aae7 SHA512 3ff344370cc36f5bed389ed198054783a4f5bc86476a751cda280618457a06bae38c1e764b0c110c2f68efe2d34243a4e24596e8b90e8fbd171bf584a22fd3bc
DIST biz.aQute.bnd-6.2.0.jar 16669843 BLAKE2B 290aec26cb4e2248488038e6cb0919728ca0cc802b16de3f390d549d135bc1177053b75e500b9f74e47c996d20b231404d57965a3f412662730cc4c938d90a4f SHA512 ad51dc9a04fc117cd01b604559989dd7c7db776761ef6000eccdcfdab825dedc615297af60c778044e46867972a74840d90eebea9b0ff826bdbd10f4d2ec5d6f
DIST biz.aQute.bndlib-6.2.0.jar 3156015 BLAKE2B 922b9bc78e47968bad73a26f4df475d84d8a2bca3773473b1f8c147737e652728df4e90a49d09a20943f418a91fd5acfe18e51137e85850796d95b7415bcf684 SHA512 7b7b366467b71c6dd67b3d7a7bc63d476c4aca479153bbc1506435168b0b4c792152fb5b44e2b1f916cd67f482d15956d2c38182fdfaf9679dff65b1b109a16a
-EBUILD tomcat-10.0.22.ebuild 6258 BLAKE2B 438a3004bf5f4206f8aee6b0267f9597e56981ad4a698f181e135df2cc3576f7e695be10815fce7a15207646e991ecfcfc69de13ce8325cb285e0eb75cce38d8 SHA512 d5c7815169e200036d326f8b2901342a00fe88992409eb53c956393640f791bf4e5f8030bf0389d36be9fc04ae5c2a9a3c6a22e7bca4cad2a6b080d127f0f3a7
EBUILD tomcat-10.0.23.ebuild 6258 BLAKE2B 438a3004bf5f4206f8aee6b0267f9597e56981ad4a698f181e135df2cc3576f7e695be10815fce7a15207646e991ecfcfc69de13ce8325cb285e0eb75cce38d8 SHA512 d5c7815169e200036d326f8b2901342a00fe88992409eb53c956393640f791bf4e5f8030bf0389d36be9fc04ae5c2a9a3c6a22e7bca4cad2a6b080d127f0f3a7
EBUILD tomcat-7.0.109-r1.ebuild 4151 BLAKE2B 2dd58aae5be3d975b4cee4852a61e97d670f7b312d0e8f6dad1f6faaaab617c1d1270f7d574b2c740432fd34818aa618c04fb488b38b29493e9ae7336a6c7fba SHA512 8f92e1f5f08be910962366c1b812b5f0386c983137fc41e20d812232ca156a2daa9062c89ad00ce093f583c67953efa3d70d24b002d814db8298e8d03827fbf3
-EBUILD tomcat-8.5.81.ebuild 4749 BLAKE2B 07355b40016620c842b4b582ea11ca987bc04b4b89c65ed6228d0d94a37518d5cfe0da98589cec5985aa6d62fa701f9932c1bde8683734c1985bea6f7f181656 SHA512 2c5edb87d504df16582030f7340df7a27f845b12c95f0b342aaf5a2c88fae025ec1c8582d18312d9cf1d15cb8a0973e7f2763986690a3c3b59223832ea368cfe
EBUILD tomcat-8.5.82.ebuild 4749 BLAKE2B 07355b40016620c842b4b582ea11ca987bc04b4b89c65ed6228d0d94a37518d5cfe0da98589cec5985aa6d62fa701f9932c1bde8683734c1985bea6f7f181656 SHA512 2c5edb87d504df16582030f7340df7a27f845b12c95f0b342aaf5a2c88fae025ec1c8582d18312d9cf1d15cb8a0973e7f2763986690a3c3b59223832ea368cfe
-EBUILD tomcat-9.0.64.ebuild 5822 BLAKE2B 9ec1e8f21e7a6b07adf51e10dec445291e86260d33b2c014848c301e1593becc7a32a73c25c60ee19570c2ec8b6ead7005f9052b3b2e503b80d38e88e03baa73 SHA512 f5de64b7838ebeff771bb1c8f6aa3ddc0ad1a929faee65aa483ef79ae8aaecf6056b633f1ae0e4f169f09422b55b9053aefaa2caab94ab2d359a932e3d49dd16
EBUILD tomcat-9.0.65.ebuild 5822 BLAKE2B 9ec1e8f21e7a6b07adf51e10dec445291e86260d33b2c014848c301e1593becc7a32a73c25c60ee19570c2ec8b6ead7005f9052b3b2e503b80d38e88e03baa73 SHA512 f5de64b7838ebeff771bb1c8f6aa3ddc0ad1a929faee65aa483ef79ae8aaecf6056b633f1ae0e4f169f09422b55b9053aefaa2caab94ab2d359a932e3d49dd16
MISC metadata.xml 713 BLAKE2B 8a4ecfb2190e156b77598a825550953f936ddc1a1303a95bcae173592ac4f482e81af1d7b62bc62248c20ac92cdd1dd3a9c351c74f684193085c0b242043fee7 SHA512 946fed270cb43e9c239f6f831ac2e8021526a9c3b1b8fea91d00d1b48f979273de3f7c227bce03009de04bcc8386803606864ffdb85666005d6b0ef5c49f01c5
diff --git a/www-servers/tomcat/tomcat-10.0.22.ebuild b/www-servers/tomcat/tomcat-10.0.22.ebuild
deleted file mode 100644
index eedd06361adf..000000000000
--- a/www-servers/tomcat/tomcat-10.0.22.ebuild
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2 prefix
-
-MY_P="apache-${PN}-${PV}-src"
-
-# Currently we bundle binary versions of bnd.jar and bndlib.jar
-# See bugs #203080 and #676116
-BND_VERSION="6.2.0"
-BND="biz.aQute.bnd-${BND_VERSION}.jar"
-BNDLIB="biz.aQute.bndlib-${BND_VERSION}.jar"
-
-DESCRIPTION="Tomcat Servlet-5.0/JSP-3.0/EL-4.0/WebSocket-2.0/JASIC-2.0 Container"
-HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="mirror://apache/${PN}/tomcat-10/v${PV}/src/${MY_P}.tar.gz
- https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/${BND_VERSION}/${BND}
- https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/${BND_VERSION}/${BNDLIB}"
-
-LICENSE="Apache-2.0"
-SLOT="10"
-KEYWORDS="amd64 ~amd64-linux"
-IUSE="extra-webapps"
-
-RESTRICT="test" # can we run them on a production system?
-
-# though it could work with 4.22 and upstream uses 4.20,
-# we still use 4.15 because 4.20+ is currently built with java 11
-# and it would force Tomcat to use at least java 11 too
-ECJ_SLOT="4.15"
-SAPI_SLOT="5.0"
-
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
- dev-java/glassfish-xmlrpc-api:0
- dev-java/jakartaee-migration:0
- ~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}
- dev-java/wsdl4j:0"
-RDEPEND="${COMMON_DEP}
- acct-group/tomcat
- acct-user/tomcat
- virtual/jre"
-DEPEND="${COMMON_DEP}
- app-admin/pwgen
- dev-java/ant-core
- >=virtual/jdk-1.8:*
- test? (
- dev-java/ant-junit:0
- dev-java/easymock:3.2
- )"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
- "${FILESDIR}/${PN}-9.0.50-insufficient-ecj.patch"
-)
-
-BND_HOME="${S}/tomcat-build-libs/bnd"
-BNDLIB_HOME="${S}/tomcat-build-libs/bndlib"
-BND_JAR="${BND_HOME}/${BND}"
-BNDLIB_JAR="${BNDLIB_HOME}/${BND_LIB}"
-
-src_unpack() {
- unpack ${MY_P}.tar.gz
-
- mkdir -p "${BND_HOME}" "${BNDLIB_HOME}" || die "Failed to create dir"
- ln -s "${DISTDIR}/${BND}" "${BND_HOME}/" || die "Failed to symlink bnd-*.jar"
- ln -s "${DISTDIR}/${BND}" "${BNDLIB_HOME}/" || die "Failed to symlink bndlib-*.jar"
-}
-
-src_prepare() {
- default
-
- find -name '*.jar' -type f -delete -print || die
-
- # Remove bundled servlet-api
- rm -rv java/jakarta/{el,servlet} || die
-
- eapply "${FILESDIR}/${PN}-10.0.20-build.xml.patch"
-
- local vm_version="$(java-config -g PROVIDES_VERSION)"
- [[ "${vm_version}" == "1.8" ]] && eapply "${FILESDIR}/${PN}-10.0.16-build.xml-strip-html5.patch"
-
- # For use of catalina.sh in netbeans
- sed -i -e "/^# ----- Execute The Requested Command/ a\
- CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \
- bin/catalina.sh || die
-
- java-pkg-2_src_prepare
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_BUILD_TARGET="deploy"
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},jakartaee-migration,tomcat-servlet-api-${SAPI_SLOT},wsdl4j"
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dbnd.jar=${BND_JAR} -Dbndlib.jar=${BNDLIB_JAR}"
-
-# revisions of the scripts
-IM_REV="-r2"
-INIT_REV="-r1"
-
-src_configure() {
- java-ant-2_src_configure
-
- eapply "${FILESDIR}/${PN}-9.0.37-fix-build-rewrite.patch"
-}
-
-src_compile() {
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar):$(java-pkg_getjars --build-only glassfish-xmlrpc-api)"
- LC_ALL=C java-pkg-2_src_compile
-}
-
-src_test() {
- java-pkg-2_src_test
-}
-
-src_install() {
- local dest="/usr/share/${PN}-${SLOT}"
-
- java-pkg_jarinto "${dest}"/bin
- java-pkg_dojar output/build/bin/*.jar
- exeinto "${dest}"/bin
- doexe output/build/bin/*.sh
-
- java-pkg_jarinto "${dest}"/lib
- java-pkg_dojar output/build/lib/*.jar
-
- dodoc RELEASE-NOTES RUNNING.txt
- use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
- use source && java-pkg_dosrc java/*
-
- ### Webapps ###
-
- # add missing docBase
- local apps="host-manager manager"
- for app in ${apps}; do
- sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
- output/build/webapps/${app}/META-INF/context.xml || die
- done
-
- insinto "${dest}"/webapps
- doins -r output/build/webapps/{host-manager,manager,ROOT}
- use extra-webapps && doins -r output/build/webapps/{docs,examples}
-
- ### Config ###
-
- # create "logs" directory in $CATALINA_BASE
- # and set correct perms, see #458890
- dodir "${dest}"/logs
- fperms 0750 "${dest}"/logs
-
- # replace the default pw with a random one, see #92281
- local randpw="$(pwgen -s -B 15 1)"
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
-
- # prepend gentoo.classpath to common.loader, see #453212
- sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
-
- insinto "${dest}"
- doins -r output/build/conf
-
- ### rc ###
-
- cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
- eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
- sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
-
- insinto "${dest}"/gentoo
- doins "${T}"/tomcat.conf
- exeinto "${dest}"/gentoo
- newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
-}
-
-pkg_postinst() {
- elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
- elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
- elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
-
- elog "To manage Tomcat instances, run:"
- elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
-
- ewarn "Please note that since version 10 the primary package for all implemented APIs"
- ewarn "has changed from javax.* to jakarta.*. This will almost certainly require code"
- ewarn "changes to enable applications to migrate from Tomcat 9 and earlier to Tomcat 10 and later."
-
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
-
- einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and"
- einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information."
-}
diff --git a/www-servers/tomcat/tomcat-8.5.81.ebuild b/www-servers/tomcat/tomcat-8.5.81.ebuild
deleted file mode 100644
index 4c41325ba986..000000000000
--- a/www-servers/tomcat/tomcat-8.5.81.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2 prefix
-
-MY_P="apache-${P}-src"
-
-DESCRIPTION="Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container"
-HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="8.5"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="extra-webapps"
-
-RESTRICT="test" # can we run them on a production system?
-
-ECJ_SLOT="4.15"
-SAPI_SLOT="3.1"
-
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
- ~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}"
-RDEPEND="${COMMON_DEP}
- acct-group/tomcat
- acct-user/tomcat
- >=virtual/jre-1.8:*"
-DEPEND="${COMMON_DEP}
- app-admin/pwgen
- dev-java/ant-core
- >=virtual/jdk-1.8:*
- doc? (
- dev-java/glassfish-xmlrpc-api:0
- dev-java/wsdl4j:0
- )
- test? (
- >=dev-java/ant-junit-1.9:0
- dev-java/easymock:3.2
- )"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- default
-
- find -name '*.jar' -type f -delete -print || die
-
- # Remove bundled servlet-api
- rm -rv java/javax/{el,servlet} || die
-
- eapply "${FILESDIR}/${PN}-8.5.66-build.xml.patch"
-
- # For use of catalina.sh in netbeans
- sed -i -e "/^# ----- Execute The Requested Command/ a\
- CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \
- bin/catalina.sh || die
-
- java-pkg-2_src_prepare
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_BUILD_TARGET="deploy"
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}"
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dexecute.validate=false"
-
-# revisions of the scripts
-IM_REV="-r2"
-INIT_REV="-r1"
-
-src_compile() {
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
- use doc && EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only glassfish-xmlrpc-api glassfish-xmlrpc-api.jar):$(java-pkg_getjar --build-only wsdl4j wsdl4j.jar)"
- LC_ALL=C java-pkg-2_src_compile
-}
-
-src_test() {
- java-pkg-2_src_test
-}
-
-src_install() {
- local dest="/usr/share/${PN}-${SLOT}"
-
- java-pkg_jarinto "${dest}"/bin
- java-pkg_dojar output/build/bin/*.jar
- exeinto "${dest}"/bin
- doexe output/build/bin/*.sh
-
- java-pkg_jarinto "${dest}"/lib
- java-pkg_dojar output/build/lib/*.jar
-
- dodoc RELEASE-NOTES RUNNING.txt
- use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
- use source && java-pkg_dosrc java/*
-
- ### Webapps ###
-
- # add missing docBase
- local apps="host-manager manager"
- for app in ${apps}; do
- sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
- output/build/webapps/${app}/META-INF/context.xml || die
- done
-
- insinto "${dest}"/webapps
- doins -r output/build/webapps/{host-manager,manager,ROOT}
- use extra-webapps && doins -r output/build/webapps/{docs,examples}
-
- ### Config ###
-
- # create "logs" directory in $CATALINA_BASE
- # and set correct perms, see #458890
- dodir "${dest}"/logs
- fperms 0750 "${dest}"/logs
-
- # replace the default pw with a random one, see #92281
- local randpw="$(pwgen -s -B 15 1)"
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
-
- # prepend gentoo.classpath to common.loader, see #453212
- sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
-
- insinto "${dest}"
- doins -r output/build/conf
-
- ### rc ###
-
- cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
- eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
- sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
-
- insinto "${dest}"/gentoo
- doins "${T}"/tomcat.conf
- exeinto "${dest}"/gentoo
- newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
-}
-
-pkg_postinst() {
- elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
- elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
- elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
-
- elog "To manage Tomcat instances, run:"
- elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
-
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
-
- einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and"
- einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information."
-}
diff --git a/www-servers/tomcat/tomcat-9.0.64.ebuild b/www-servers/tomcat/tomcat-9.0.64.ebuild
deleted file mode 100644
index 816509c99633..000000000000
--- a/www-servers/tomcat/tomcat-9.0.64.ebuild
+++ /dev/null
@@ -1,190 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2 prefix
-
-MY_P="apache-${PN}-${PV}-src"
-
-# Currently we bundle binary versions of bnd.jar and bndlib.jar
-# See bugs #203080 and #676116
-BND_VERSION="6.2.0"
-BND="biz.aQute.bnd-${BND_VERSION}.jar"
-BNDLIB="biz.aQute.bndlib-${BND_VERSION}.jar"
-
-DESCRIPTION="Tomcat Servlet-4.0/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container"
-HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="mirror://apache/${PN}/tomcat-9/v${PV}/src/${MY_P}.tar.gz
- https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/${BND_VERSION}/${BND}
- https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/${BND_VERSION}/${BNDLIB}"
-
-LICENSE="Apache-2.0"
-SLOT="9"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="extra-webapps"
-
-RESTRICT="test" # can we run them on a production system?
-
-# though it could work with 4.22 and upstream uses 4.20,
-# we still use 4.15 because 4.20+ is currently built with java 11
-# and it would force Tomcat to use at least java 11 too
-ECJ_SLOT="4.15"
-SAPI_SLOT="4.0"
-
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
- dev-java/glassfish-xmlrpc-api:0
- ~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}
- dev-java/wsdl4j:0"
-RDEPEND="${COMMON_DEP}
- acct-group/tomcat
- acct-user/tomcat
- >=virtual/jre-1.8:*"
-DEPEND="${COMMON_DEP}
- app-admin/pwgen
- >=dev-java/ant-core-1.9.13
- >=virtual/jdk-1.8:*
- test? (
- >=dev-java/ant-junit-1.9:0
- dev-java/easymock:3.2
- )"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
- "${FILESDIR}/${PN}-9.0.50-insufficient-ecj.patch"
-)
-
-BND_HOME="${S}/tomcat-build-libs/bnd"
-BNDLIB_HOME="${S}/tomcat-build-libs/bndlib"
-BND_JAR="${BND_HOME}/${BND}"
-BNDLIB_JAR="${BNDLIB_HOME}/${BND_LIB}"
-
-src_unpack() {
- unpack ${MY_P}.tar.gz
-
- mkdir -p "${BND_HOME}" "${BNDLIB_HOME}" || die "Failed to create dir"
- ln -s "${DISTDIR}/${BND}" "${BND_HOME}/" || die "Failed to symlink bnd-*.jar"
- ln -s "${DISTDIR}/${BND}" "${BNDLIB_HOME}/" || die "Failed to symlink bndlib-*.jar"
-}
-
-src_prepare() {
- default
-
- find -name '*.jar' -type f -delete -print || die
-
- # Remove bundled servlet-api
- rm -rv java/javax/{el,servlet} || die
-
- eapply "${FILESDIR}/${PN}-9.0.62-build.xml.patch"
-
- # For use of catalina.sh in netbeans
- sed -i -e "/^# ----- Execute The Requested Command/ a\
- CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \
- bin/catalina.sh || die
-
- java-pkg-2_src_prepare
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_BUILD_TARGET="deploy"
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT},wsdl4j"
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dbnd.jar=${BND_JAR} -Dbndlib.jar=${BNDLIB_JAR}"
-
-# revisions of the scripts
-IM_REV="-r2"
-INIT_REV="-r1"
-
-src_configure() {
- java-ant-2_src_configure
-
- eapply "${FILESDIR}/${PN}-9.0.37-fix-build-rewrite.patch"
-}
-
-src_compile() {
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar):$(java-pkg_getjars --build-only glassfish-xmlrpc-api)"
- LC_ALL=C java-pkg-2_src_compile
-}
-
-src_test() {
- java-pkg-2_src_test
-}
-
-src_install() {
- local dest="/usr/share/${PN}-${SLOT}"
-
- java-pkg_jarinto "${dest}"/bin
- java-pkg_dojar output/build/bin/*.jar
- exeinto "${dest}"/bin
- doexe output/build/bin/*.sh
-
- java-pkg_jarinto "${dest}"/lib
- java-pkg_dojar output/build/lib/*.jar
-
- dodoc RELEASE-NOTES RUNNING.txt
- use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
- use source && java-pkg_dosrc java/*
-
- ### Webapps ###
-
- # add missing docBase
- local apps="host-manager manager"
- for app in ${apps}; do
- sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
- output/build/webapps/${app}/META-INF/context.xml || die
- done
-
- insinto "${dest}"/webapps
- doins -r output/build/webapps/{host-manager,manager,ROOT}
- use extra-webapps && doins -r output/build/webapps/{docs,examples}
-
- ### Config ###
-
- # create "logs" directory in $CATALINA_BASE
- # and set correct perms, see #458890
- dodir "${dest}"/logs
- fperms 0750 "${dest}"/logs
-
- # replace the default pw with a random one, see #92281
- local randpw="$(pwgen -s -B 15 1)"
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
-
- # prepend gentoo.classpath to common.loader, see #453212
- sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
-
- insinto "${dest}"
- doins -r output/build/conf
-
- ### rc ###
-
- cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
- eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
- sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
-
- insinto "${dest}"/gentoo
- doins "${T}"/tomcat.conf
- exeinto "${dest}"/gentoo
- newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
-}
-
-pkg_postinst() {
- elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
- elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
- elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
-
- elog "To manage Tomcat instances, run:"
- elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
-
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
-
- einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and"
- einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information."
-}