16 files changed, 108 insertions, 2333 deletions
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index d8c680799d70..2a6e0484604e 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/libcloudproviders/Manifest b/net-libs/libcloudproviders/Manifest
index d5f75bb8a93c..25bf991994c7 100644
--- a/net-libs/libcloudproviders/Manifest
+++ b/net-libs/libcloudproviders/Manifest
@@ -1,3 +1,5 @@
 DIST libcloudproviders-0.3.1.tar.xz 22072 BLAKE2B ecd573507b75c144d94678b693181efc9420fed2d9103cb35653a5f83435e544e77cba232c490ad946ace1eb3cc7382d746ca9fadb55a69c87f55ba3aa09ec83 SHA512 66e951380da8447529d04cc9cbaa0587f40152ab0b66787ce3939104a49eeb16808499a5dcdcd38b7ae9c8cca8bec66ae0bbf04524e7ff8fdf6d420e8a71d609
+DIST libcloudproviders-0.3.2.tar.xz 22764 BLAKE2B f2cbb411c49600ae3c4d34b1ad494b53259752eb17e403ff3dba16c327373b567c978fa4e54ac47e00db057b77deac8369e4c7ef2647f9be081a0f5e563d0969 SHA512 76829adcc7ca830254305c11755caf55f200a0780f82d4fc6480a09cf92848409933a1b044b7c62b837d071d28e2b14252e78d7d2c04801f64096fea9a068dd7
 EBUILD libcloudproviders-0.3.1.ebuild 1072 BLAKE2B e57d4ee2231f2bd54b7f2d897cdd84cbbed06bdb7af4a3fd9cde05af39258ac84d66cb7586eece02977ccf676ab795f92d8d7e6a42ac96836dc9e65614f1a461 SHA512 e64fae9d6a1ebbdfe663ef7fa04ded71d01e53763ae24d749399197d6bb51c61f07cc1a198d3f925d458081f9f335a4392f8a7e5ab642e7e2864f64a4dcd7266
+EBUILD libcloudproviders-0.3.2.ebuild 1079 BLAKE2B 2a1fba5ad9244c7e0e0c9371e9bb230b8426699b73ba3c5a4587712330fedac399ce39b391c6da28e8210845a2881856c745cb3e414059ab1a73b0a851efcc55 SHA512 ccb96dbc378cf21d5ab147b891b93a7ec19d77ed0dc4e1e67750b38fef965a58bf21b686caccf606b505b91d40fdd5b4cfe7c843dd6e8e6cda1c36bd0eb00e35
 MISC metadata.xml 358 BLAKE2B 5411f132651dd738aaaa1aad4bc8b1d28b08082c76c375145c660435e63c8422382c96b290bc3c194becd8251572b21528200e29badbd73274bd335f877677ac SHA512 4ce53f86d353badca979470dff17f1e30e1d7ad820561dcb348148d1e7cb6435319b1ed2ed2522d897763536a7680843aa7c5204807ce7f22b94cdb4bf172fd4
diff --git a/net-libs/libcloudproviders/libcloudproviders-0.3.2.ebuild b/net-libs/libcloudproviders/libcloudproviders-0.3.2.ebuild
new file mode 100644
index 000000000000..4ea2fe60e264
--- /dev/null
+++ b/net-libs/libcloudproviders/libcloudproviders-0.3.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org meson-multilib vala
+
+DESCRIPTION="DBus API that allows cloud storage sync clients to expose their services"
+HOMEPAGE="https://gitlab.gnome.org/World/libcloudproviders"
+
+LICENSE="LGPL-3"
+SLOT="0"
+IUSE="gtk-doc +introspection vala"
+REQUIRED_USE="vala? ( introspection )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+DEPEND="
+	>=dev-libs/glib-2.51.2:2[${MULTILIB_USEDEP}]
+	introspection? ( dev-libs/gobject-introspection )"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	virtual/pkgconfig
+	gtk-doc? ( dev-util/gtk-doc )
+	vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+	default
+	use vala && vala_setup
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		$(meson_native_use_bool gtk-doc enable-gtk-doc)
+		-Dinstalled-tests=false
+		$(meson_native_use_bool introspection)
+		$(meson_native_use_bool vala vapigen)
+	)
+	meson_src_configure
+}
+
+multilib_src_install() {
+	meson_src_install
+}
diff --git a/net-libs/libtorrent-rasterbar/Manifest b/net-libs/libtorrent-rasterbar/Manifest
index f5966b26eaaa..7ff4a87ab4de 100644
--- a/net-libs/libtorrent-rasterbar/Manifest
+++ b/net-libs/libtorrent-rasterbar/Manifest
@@ -6,4 +6,4 @@ EBUILD libtorrent-rasterbar-1.2.18-r1.ebuild 1789 BLAKE2B 863906064e168b1c7a4856
 EBUILD libtorrent-rasterbar-1.2.19.ebuild 1791 BLAKE2B dce4a514f28b0b8d0015b01f0342134aedc4214482cb625de0c593208098fc7d4d41bd751b2380a7d3144c522fe84c508556b1448787cc2d55c43bd8bb470a02 SHA512 82b234329999fba3acd54fbe722d935fa439f99a9ee3378d1b4fbaa7ca62139f4729a87b4b4111df9f14be885b624d6aae1ae6012834596014c2e1fba200e1db
 EBUILD libtorrent-rasterbar-2.0.8.ebuild 1893 BLAKE2B 2a22bc1340ea847a8f5a8aaf0e420a4c108ace8acd4b1275a283f8c93c5fd2855e83652abaa5722c2e984ef763832f90abb2b8d4948f7939178acb5bbcab73d4 SHA512 aea9aca9595497b5f54ffec4def5ed4d6b6f5a7e747b3e8447d83580dcd62c24a91225a3cdb3ed2ee23971c276787f7664fce9756d24aefe2da27d4e140b430e
 EBUILD libtorrent-rasterbar-2.0.9.ebuild 1895 BLAKE2B 2c9627e0610c3164e1c877057a98214ad27f5294e1549448071b2bf048c171c84177c48be9dc4054f47b183083f4824dbde43f5111325fb4ff4aba68bb633a08 SHA512 4c93a1f10a0b315e67a3a9f5753ac263be7cdb0fe878a89d4baa4711563cd344925e4e13727376dcde17e465efd098842aeb9442b2bb815b14e1caddde3b0bbb
-MISC metadata.xml 530 BLAKE2B 602487cff9d278f0ee1ee427ad49005080accb6e2dd8e833db165800789fbefac9f351a463f6b26bb8662af41c1dc9a7e4693076c6109ec881f6a7d12bf40a92 SHA512 fce66854e89057b0fa6d5850d8a91069ca763f89eace002e7d85e54b576f64213dc263589185a0e5d9891ae39d24567faf218c48757ecd377fa2f89bb27f3cc3
+MISC metadata.xml 445 BLAKE2B f15fb3002e1a5f205ad22b4cd3969da7e0cd48471a3b6f2235d47aa754014867f84cb41269e620df154beb4ad4f046dc77e3638244a1b45a33f9097613f49dd3 SHA512 94b12e4317a8633fe7d39fe49a6b69d271b7f77510e42cbd1cb44e3720437d3521fa815a09513cd84a8d0ded88d55f9ca8e4e29e49a94ff605e198b7f04e9462
diff --git a/net-libs/libtorrent-rasterbar/metadata.xml b/net-libs/libtorrent-rasterbar/metadata.xml
index 09b4f2955697..530c90675b75 100644
--- a/net-libs/libtorrent-rasterbar/metadata.xml
+++ b/net-libs/libtorrent-rasterbar/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>slashbeast@gentoo.org</email>
-		<name>Piotr Karbowski</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="google-code">libtorrent</remote-id>
 		<remote-id type="sourceforge">libtorrent</remote-id>
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index 078f93e22a47..656d44e214e9 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -1,25 +1,18 @@
 AUX nodejs-16.4.2-paxmarking.patch 4257 BLAKE2B c088deb4f9207d0cfbc43d71111230ec23a30c6fc86df67ab9bf17b3ca6de276e4d84980b58855bb94f0caa865fa5ab9af19fa4db72b7edb9394798b739fa939 SHA512 a96de4f57589db222eb493fcdcddbd67e051728165cdabde675aeb3bbdce857f13a9708b7495acc64cd88f7fa3994d89ade006a1292895b2299ef6b5162ec6a3
 AUX nodejs-18.16.0-paxmarking.patch 3470 BLAKE2B 4de01a4b3267d24c7c899a9caf8dae3975a8ed4a82cfe4df2ffc6858a3e1153bd6801ec5f5dc17ab5984ffa2d3b5ec9651c80e6993bd20c14865b0d873f58547 SHA512 5f49c1ca953421b3aa07e0b93375e99c9e5f543b48df3cff833f5e55f7e1b511971c56ed250e36c8a7465229db135a8d2bd1319f2d09368788f6152f06ced4f9
 AUX nodejs-20.3.0-gcc14.patch 1119 BLAKE2B 6be4d981ce94f618aa4a07766e8fa1c99e3825cee7374cae5c76264c961083604ce408a7847de54ae6c72d36c6b0cbe34921e69a800ebebc5553cdaead2cbaa5 SHA512 8137b7ac6b5920c7f16b6409923092f3eb3c4f81887035e1840ae61deb61090d88d6184c36db4bcf7249fa6d7a21687788616b2aee51cb6bdc08cb78ed656e5d
-AUX nodejs-20.3.0-simdutf-2.3.14.patch 85173 BLAKE2B c4431a4a02bea7783126dbfc731b35ce2c28edb99b9cf778e3a61aa7b01708953fb03036ae97a8478d505052d284539a2babd0e4bc1fc1f5896cefadac5b5528 SHA512 a22d34a87f7e77895a1563484e739ce3c12b0a50b4034a746a10acba689cea736808c592307679562bcc7aed3aa534f297d00018b0c6709b4e274f11c8b04fd2
 AUX nodejs-fix-incomplete-type.patch 1895 BLAKE2B 30b548caee43f47dd25d35b789257b6355cf9ef4adde15c533fc6ea23650cd44d5dd555474248e39a8e6f782215847ec42595710349875c0817f60eae026873e SHA512 e97479bd7a3f6d3557609e5db2eab1f426a64fcc0ac1c3b204a93a0dd86ec4764040079e2dc14f84c9e69fdc2e18af2f9fe6e0c008d381eae9ce2da6616a25ba
 DIST node-v16.20.0.tar.xz 35546884 BLAKE2B 5bdb1fb7365e07f13d0a58a8d052d11efaadcf1b0792af0517b78b1ecf01e50eabe26e31588ae410ee63b7494a4eb9d23f70d4dd157a452d0bbf8bd548865255 SHA512 b155acdff0244307afcc334844f113b5c321f7764ebb69326d60a6a79d0e0d38d55257a38b815f5933aa4071e6a788e01c466476ef012cec648c84d74adda406
 DIST node-v16.20.1.tar.xz 35556440 BLAKE2B cd10c4bf8fdf47126b84bb746e5b11ae1a5a17492b7fe2920be98d5ff2a9bce984515af4833d9bcccf645d53ebc068a3c658a37ad878432664f15cea368a500e SHA512 3179c4b598f211f21c6d7ba378cd03a7ca4a06d99ae8e5bd5b8c0f1a895dc83222858a349cfb7589deecb7c654e9f25ce89c30aef9981ee18d4e24d6bbd5822e
 DIST node-v18.16.0.tar.xz 40467860 BLAKE2B b16749c0212f3aa196ec9fc0f999a023adeb9031b3332939330ba5a3edb5bc2ed6dc21bf861509696e19ed0cc5d5c54bb882018f0e54eb1ad8e9b0ba3bb64bff SHA512 608ce5db97ce2d851f381c7991f635c5e0927ae79037649b482c7e197479341b7c6560644e25f4d65ece8aa80c5763a0e044349a5be210fa33fbbf97a96462bd
-DIST node-v18.16.1.tar.xz 40462540 BLAKE2B 4103b771cdd629be794bd0433caa0e7a3b652511d5aa0535d48990d4ac7901f42e75f498b3a64b6d3b821046c1c26bb8b5c0e1edb953589a76d5fa87346da002 SHA512 15488a06aa31666a0af4470f08910b8a1df53d78cce597ddfdc0c6aebb77ae66138540d47ab0d4ab6d58d1c55226e3e2c0cfec641b2c55b417427171b1ace48c
 DIST node-v18.17.0.tar.xz 40780504 BLAKE2B 2f93bc7fecc6d3a578b43fd079ce4a0eb9f76f9f61c1306fba1e0cf3e7343189c74bfce8648e7b29d84c7b7eade78f9281e5276f7a29f5f527a113892117565b SHA512 01421e9ac6be8db90c14682a5c283f7d2a5824d9f1496e698dae27de090b3014efbbb98bb300c4bf9967681390d8f2450aa65648ddf7ea473814b81d2665b21c
 DIST node-v20.2.0.tar.xz 41778040 BLAKE2B 362b0ee89fe822722caeeb4b918550637bfb10791de75d872da334cb1123b744c351b5822b05abf4d36a0449badc5232ab1d73896dd5ce7755d10b226f0b9f52 SHA512 bf780e79bf6c7f766beb7734c7af45edc62094aba4c608f5519b130ff263e52ece925f85a4ee5740e962d16020070ef00933f6c74e771d948f23525c223da48e
-DIST node-v20.3.0.tar.xz 41709484 BLAKE2B 93aadc92914fd977a9bea5643c0806c709a4e68bca2840f7af0b24bfde654e9a3bfb83ead159579c67ebd8cfea81648863d2d87d07d2f11dfe73f1312d873d40 SHA512 6aade4c1cc0ef8f47f403286d88099a3c0bf43f6e1e2b6d50e777eb9327fc1f0a8ba73c943306a431fd422fdda9017b1931bcb31c48badcfcadde8a260840d7c
-DIST node-v20.3.1.tar.xz 41712208 BLAKE2B 242f0d932d93e802a157d667aacec325cc40e357675237a96ab941fbf6e42a9a9b7888c87c37a16f24f50ecab9a42ec64ddf49bb3e9259f233c20daed18abcad SHA512 f9f7a3905aa05f9708d3dddcbbe8ad729db3a123ccbdbcade402c6faa6b36905239aca9ac19ca4ebb4682dde2c39058c58197f5015556ab2351f8035d35da5e1
 DIST node-v20.5.0.tar.xz 41738488 BLAKE2B 2e66328cb5df4c8d1eeb2b934a36b720ba7182a77d9158bd8ae47fe53db1e636f1ce9aff902d6cc05c5707fb4419e11cdda9ed24345903e995fa530ba9de317f SHA512 f7afb0aa7175bf1b87d1916c8085e2292bfa32aae3de1dae060d74bcdadb3fe486cca6b92c5fb27a70cd3aaa57622e65a57721519fd180bfdf16401d5d89bec7
 EBUILD nodejs-16.20.0.ebuild 6517 BLAKE2B 252a45b8565c15b6ecb42c96e40fb54bf31d64673e11f1042fdc28f2672aad4fbc626389b0fc39bc0800154db3e6e00dea1d8827e6495ea97dd0bbe3e5755647 SHA512 d1ff9e94d0abf6a2eabbc8a7e0f09b29195cb0dd8941eec42f7ba36f7da25616cebb13786972c5a00a1c19329c17cf488a1c125702dafc1550d426b415a9105f
 EBUILD nodejs-16.20.1.ebuild 6522 BLAKE2B cb4db8a6d820ec95b186b6a4d535232d99aa8b127bfa70d31ef740bf39dcfbe05de7c8f6bbabab7e7e6d6a195d218895a664b3e05c4e0d34691264ec30f593d1 SHA512 627594204e5fe05625e7fe4fa62272977d242ae4dc50d6bb047072fe573bebe2d1b55a6b4125ad514e3af8cda36504cb111defbe556cfba62c2ca75b74bc1e22
 EBUILD nodejs-18.16.0.ebuild 7328 BLAKE2B 991dce66c991b452fd3e207bcf5dcf9116b2a7f421d4a117d366d78e902670dd235329f4f6de4a4edda7545b37e053ee1e6338ae96b1dfe794d85ca13005b466 SHA512 51e67374a5c2ecf2b89e071736badccc04d396ecb5e1d7e52d271eb152139d2dd0c73ecf76e6de75fe8acaae39eb3daf16ff85aa33806d70459ba22089984dea
-EBUILD nodejs-18.16.1.ebuild 7333 BLAKE2B 7ffe272be584d67e8d9c75c45aef83d96de9594c7998ffd6f0a79747f7acb6af7db43dd3ea6d1d3384694c0c9ebbd13c67c8e25a1d3b2faff16828ab9944629d SHA512 b96ebdecf18a04035bc75233b90e230e756c8967d57c59305cf6c781f036f8d8298b2f26651a0e198d1d36c85fb00ebd6b6e5d479bbe09fc48d754de69e0de82
 EBUILD nodejs-18.17.0.ebuild 7466 BLAKE2B 00cd39351f217fe14b544bee00d4639813e49b016e39335e55dab72e79935f4a06ece721fdc7c004fff3aabdb4e767bc918d3ea67524a7faabd1b2387bf406ef SHA512 929e1dace7672aed9fa5b82788c1722dea86f31292d9d69dfd6208b6a47e5483ad214f8f0b9dcd29005861d5e24257d05b3776b7a94ad7aac7f9b385559499f9
 EBUILD nodejs-20.2.0.ebuild 7138 BLAKE2B d7de0fce607c8b2118d52c06a9cb106095268ae6befbb472eceb12348efa84f0b5b5a3ff37756ef8f4e1151cc985ca716efa030746a94d710bf0a55d4b31a054 SHA512 40f9e0e5a8d04f91c7357a8c4497978ccc3c0c4cd77973a8350840e418ca1b4d644a5c19732c0b773e14ae9002ccbd043ac9cf88e5010f439be63edffe2a69dd
-EBUILD nodejs-20.3.0.ebuild 7232 BLAKE2B 5780c7aed6f2818319a544472d490cc87b5cd5f74a7ab8dddf886eb9cdcdcfd41a7e4296e8c3f63b69d5caef00e9dc6ff5e56084bce3fe3bba6da90f001b28b2 SHA512 1b9ee26b4dbff32bdb48c92f8f271d538fec89d26feb9ccaefbf939584d16c2accc3f19d58bcb4de100fd246d43237360c28fdf1cc78d6ac0544892ded9a848b
-EBUILD nodejs-20.3.1.ebuild 7249 BLAKE2B 4debb03373cab722e616884c85aea741758aa261f97d1a16a1b7d3bd5ae0f96c32baf92a0fa415283b3c1bc8ff2a765fbb25a79f0c486993534bad6dfcfd6ee5 SHA512 479bef2b9fd33e9c7a125621a0b60b549a84f98925b77b45a2fe7c2be04260697bc7387388325bec8a9763458db54b65ed1faa35aede8362e72751a042cd001c
-EBUILD nodejs-20.5.0.ebuild 7393 BLAKE2B 144244629cf6046582550339cc61433c8475d8937ff6e98ef5a978c434cd95e2e1e844b00cb1cfd3f93d952972417be2dcfd2abeb6be67d90a826771a84cc854 SHA512 4b4ac097ad7a99180684685e0e5927d12a6901e807f3f4324899ab97e6367fdb6a6fbafbfc4386a47e497ab47a3fcba9a1f872f85999c16cb036792d24abefce
+EBUILD nodejs-20.5.0.ebuild 7392 BLAKE2B 9c66e2bc5657dec1236f7cb54b8ce34ee0d593fc802b574c5894318d841af4eb70683064c9f996cc0f79e740ed60f61a8f298b6256ae6099e91467158657e51a SHA512 6fcffd34700697837168dbb985c057d7d4ee816f91d4773b6c14ffc3b47aa9e263aa85510caef54ae92b63e78c07a9134ec3d4a2d6ee7f80b4b47f2dff60b610
 EBUILD nodejs-99999999.ebuild 7142 BLAKE2B 0a127841349fff417f328e207c6a030e811d482c67a75f1813b2f73a32620953a9bb1d413208c853d75b879ab51904e608ddb819a8680e2446bd4c6dc217e0d7 SHA512 7073de0294f0d36dc4c6b733da26f2bf8e4bfe01d9d9fecf45e16de07e8ce9a8e3694c14c458a61807d0dfe5978fc6d7e0fe2cc93f74db2fe7b439f110bf9163
 MISC metadata.xml 986 BLAKE2B 67133c97db85eced638323a93514e084da381b7cbebcab2f0f2ce2781cf0da02be705ab5781c18205a8d4e8b679b6f77f3c9e97ea6ef72b36b6a8a854a39617d SHA512 3f749720ea0623fefa703f8b4563ebabfd5e4aeff4f2e8998576860177d3b1a075afaabc2aa0dc5100df59b3cb787d70d44284976bad3409966b68c11ec64d7a
diff --git a/net-libs/nodejs/files/nodejs-20.3.0-simdutf-2.3.14.patch b/net-libs/nodejs/files/nodejs-20.3.0-simdutf-2.3.14.patch
deleted file mode 100644
index 69c37e573bca..000000000000
--- a/net-libs/nodejs/files/nodejs-20.3.0-simdutf-2.3.14.patch
+++ /dev/null
@@ -1,1550 +0,0 @@
-From 1d1685e6fde1bcb47dd30c3bb45dba219939c272 Mon Sep 17 00:00:00 2001
-From: "Node.js GitHub Bot" <github-bot@iojs.org>
-Date: Wed, 7 Jun 2023 14:39:02 +0100
-Subject: [PATCH] deps: update simdutf to 3.2.14
-
-PR-URL: https://github.com/nodejs/node/pull/48344
-Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com>
-Reviewed-By: Debadree Chatterjee <debadree333@gmail.com>
-Reviewed-By: LiviaMedeiros <livia@cirno.name>
-Reviewed-By: Mestery <mestery@protonmail.com>
-Reviewed-By: Mohammed Keyvanzadeh <mohammadkeyvanzade94@gmail.com>
-Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
-Reviewed-By: Darshan Sen <raisinten@gmail.com>
-Reviewed-By: Marco Ippolito <marcoippolito54@gmail.com>
----
- deps/simdutf/simdutf.cpp                      | 320 +++++++++---------
- deps/simdutf/simdutf.h                        |  50 +--
- .../maintaining/maintaining-dependencies.md   |   6 +-
- 3 files changed, 189 insertions(+), 187 deletions(-)
-
-diff --git a/deps/simdutf/simdutf.cpp b/deps/simdutf/simdutf.cpp
-index 15107075d51b..712bf0cf8583 100644
---- a/deps/simdutf/simdutf.cpp
-+++ b/deps/simdutf/simdutf.cpp
-@@ -1,8 +1,8 @@
--/* auto-generated on 2023-05-22 21:46:48 -0400. Do not edit! */
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=simdutf.cpp
-+/* auto-generated on 2023-06-05 08:58:28 -0400. Do not edit! */
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=simdutf.cpp
- /* begin file src/simdutf.cpp */
- #include "simdutf.h"
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=implementation.cpp
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=implementation.cpp
- /* begin file src/implementation.cpp */
- #include <initializer_list>
- #include <climits>
-@@ -26,7 +26,7 @@ std::string toBinaryString(T b) {
- 
- // Implementations
- // The best choice should always come first!
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=simdutf/arm64.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=simdutf/arm64.h
- /* begin file src/simdutf/arm64.h */
- #ifndef SIMDUTF_ARM64_H
- #define SIMDUTF_ARM64_H
-@@ -53,7 +53,7 @@ namespace arm64 {
- } // namespace arm64
- } // namespace simdutf
- 
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=simdutf/arm64/implementation.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=simdutf/arm64/implementation.h
- /* begin file src/simdutf/arm64/implementation.h */
- #ifndef SIMDUTF_ARM64_IMPLEMENTATION_H
- #define SIMDUTF_ARM64_IMPLEMENTATION_H
-@@ -130,14 +130,14 @@ class implementation final : public simdutf::implementation {
- #endif // SIMDUTF_ARM64_IMPLEMENTATION_H
- /* end file src/simdutf/arm64/implementation.h */
- 
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=simdutf/arm64/begin.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=simdutf/arm64/begin.h
- /* begin file src/simdutf/arm64/begin.h */
- // redefining SIMDUTF_IMPLEMENTATION to "arm64"
- // #define SIMDUTF_IMPLEMENTATION arm64
- /* end file src/simdutf/arm64/begin.h */
- 
- // Declarations
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=simdutf/arm64/intrinsics.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=simdutf/arm64/intrinsics.h
- /* begin file src/simdutf/arm64/intrinsics.h */
- #ifndef SIMDUTF_ARM64_INTRINSICS_H
- #define SIMDUTF_ARM64_INTRINSICS_H
-@@ -149,7 +149,7 @@ class implementation final : public simdutf::implementation {
- 
- #endif //  SIMDUTF_ARM64_INTRINSICS_H
- /* end file src/simdutf/arm64/intrinsics.h */
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=simdutf/arm64/bitmanipulation.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=simdutf/arm64/bitmanipulation.h
- /* begin file src/simdutf/arm64/bitmanipulation.h */
- #ifndef SIMDUTF_ARM64_BITMANIPULATION_H
- #define SIMDUTF_ARM64_BITMANIPULATION_H
-@@ -169,7 +169,7 @@ simdutf_really_inline int count_ones(uint64_t input_num) {
- 
- #endif // SIMDUTF_ARM64_BITMANIPULATION_H
- /* end file src/simdutf/arm64/bitmanipulation.h */
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=simdutf/arm64/simd.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=simdutf/arm64/simd.h
- /* begin file src/simdutf/arm64/simd.h */
- #ifndef SIMDUTF_ARM64_SIMD_H
- #define SIMDUTF_ARM64_SIMD_H
-@@ -782,7 +782,7 @@ simdutf_really_inline int16x8_t make_int16x8_t(int16_t x1,  int16_t x2,  int16_t
-       ).to_bitmask();
-     }
-   }; // struct simd8x64<T>
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=simdutf/arm64/simd16-inl.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=simdutf/arm64/simd16-inl.h
- /* begin file src/simdutf/arm64/simd16-inl.h */
- template<typename T>
- struct simd16;
-@@ -1095,7 +1095,7 @@ simdutf_really_inline simd16<int16_t>::operator simd16<uint16_t>() const { retur
- #endif // SIMDUTF_ARM64_SIMD_H
- /* end file src/simdutf/arm64/simd.h */
- 
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=simdutf/arm64/end.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=simdutf/arm64/end.h
- /* begin file src/simdutf/arm64/end.h */
- /* end file src/simdutf/arm64/end.h */
- 
-@@ -1103,7 +1103,7 @@ simdutf_really_inline simd16<int16_t>::operator simd16<uint16_t>() const { retur
- 
- #endif // SIMDUTF_ARM64_H
- /* end file src/simdutf/arm64.h */
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=simdutf/icelake.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=simdutf/icelake.h
- /* begin file src/simdutf/icelake.h */
- #ifndef SIMDUTF_ICELAKE_H
- #define SIMDUTF_ICELAKE_H
-@@ -1142,7 +1142,7 @@ simdutf_really_inline simd16<int16_t>::operator simd16<uint16_t>() const { retur
- #if SIMDUTF_CAN_ALWAYS_RUN_ICELAKE
- #define SIMDUTF_TARGET_ICELAKE
- #else
--#define SIMDUTF_TARGET_ICELAKE SIMDUTF_TARGET_REGION("avx512f,avx512dq,avx512cd,avx512bw,avx512vbmi,avx512vbmi2,avx512vl,avx2,bmi,bmi2,pclmul,lzcnt")
-+#define SIMDUTF_TARGET_ICELAKE SIMDUTF_TARGET_REGION("avx512f,avx512dq,avx512cd,avx512bw,avx512vbmi,avx512vbmi2,avx512vl,avx2,bmi,bmi2,pclmul,lzcnt,popcnt")
- #endif
- 
- namespace simdutf {
-@@ -1155,7 +1155,7 @@ namespace icelake {
- //
- // These two need to be included outside SIMDUTF_TARGET_REGION
- //
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=simdutf/icelake/intrinsics.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=simdutf/icelake/intrinsics.h
- /* begin file src/simdutf/icelake/intrinsics.h */
- #ifndef SIMDUTF_ICELAKE_INTRINSICS_H
- #define SIMDUTF_ICELAKE_INTRINSICS_H
-@@ -1265,7 +1265,7 @@ inline __m512i _mm512_set_epi8(uint8_t a0, uint8_t a1, uint8_t a2, uint8_t a3, u
- 
- #endif // SIMDUTF_HASWELL_INTRINSICS_H
- /* end file src/simdutf/icelake/intrinsics.h */
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=simdutf/icelake/implementation.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=simdutf/icelake/implementation.h
- /* begin file src/simdutf/icelake/implementation.h */
- #ifndef SIMDUTF_ICELAKE_IMPLEMENTATION_H
- #define SIMDUTF_ICELAKE_IMPLEMENTATION_H
-@@ -1348,7 +1348,7 @@ class implementation final : public simdutf::implementation {
- //
- // The rest need to be inside the region
- //
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=simdutf/icelake/begin.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=simdutf/icelake/begin.h
- /* begin file src/simdutf/icelake/begin.h */
- // redefining SIMDUTF_IMPLEMENTATION to "icelake"
- // #define SIMDUTF_IMPLEMENTATION icelake
-@@ -1364,7 +1364,7 @@ SIMDUTF_DISABLE_GCC_WARNING(-Wmaybe-uninitialized)
- #endif // end of workaround
- /* end file src/simdutf/icelake/begin.h */
- // Declarations
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=simdutf/icelake/bitmanipulation.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=simdutf/icelake/bitmanipulation.h
- /* begin file src/simdutf/icelake/bitmanipulation.h */
- #ifndef SIMDUTF_ICELAKE_BITMANIPULATION_H
- #define SIMDUTF_ICELAKE_BITMANIPULATION_H
-@@ -1390,7 +1390,7 @@ simdutf_really_inline long long int count_ones(uint64_t input_num) {
- 
- #endif // SIMDUTF_ICELAKE_BITMANIPULATION_H
- /* end file src/simdutf/icelake/bitmanipulation.h */
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=simdutf/icelake/end.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=simdutf/icelake/end.h
- /* begin file src/simdutf/icelake/end.h */
- #if SIMDUTF_CAN_ALWAYS_RUN_ICELAKE
- // nothing needed.
-@@ -1409,7 +1409,7 @@ SIMDUTF_POP_DISABLE_WARNINGS
- #endif // SIMDUTF_IMPLEMENTATION_ICELAKE
- #endif // SIMDUTF_ICELAKE_H
- /* end file src/simdutf/icelake.h */
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=simdutf/haswell.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=simdutf/haswell.h
- /* begin file src/simdutf/haswell.h */
- #ifndef SIMDUTF_HASWELL_H
- #define SIMDUTF_HASWELL_H
-@@ -1442,7 +1442,7 @@ SIMDUTF_POP_DISABLE_WARNINGS
- 
- #if SIMDUTF_IMPLEMENTATION_HASWELL
- 
--#define SIMDUTF_TARGET_HASWELL SIMDUTF_TARGET_REGION("avx2,bmi,lzcnt")
-+#define SIMDUTF_TARGET_HASWELL SIMDUTF_TARGET_REGION("avx2,bmi,lzcnt,popcnt")
- 
- namespace simdutf {
- /**
-@@ -1455,7 +1455,7 @@ namespace haswell {
- //
- // These two need to be included outside SIMDUTF_TARGET_REGION
- //
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=simdutf/haswell/implementation.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=simdutf/haswell/implementation.h
- /* begin file src/simdutf/haswell/implementation.h */
- #ifndef SIMDUTF_HASWELL_IMPLEMENTATION_H
- #define SIMDUTF_HASWELL_IMPLEMENTATION_H
-@@ -1534,7 +1534,7 @@ class implementation final : public simdutf::implementation {
- 
- #endif // SIMDUTF_HASWELL_IMPLEMENTATION_H
- /* end file src/simdutf/haswell/implementation.h */
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=simdutf/haswell/intrinsics.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=simdutf/haswell/intrinsics.h
- /* begin file src/simdutf/haswell/intrinsics.h */
- #ifndef SIMDUTF_HASWELL_INTRINSICS_H
- #define SIMDUTF_HASWELL_INTRINSICS_H
-@@ -1603,7 +1603,7 @@ SIMDUTF_POP_DISABLE_WARNINGS
- //
- // The rest need to be inside the region
- //
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=simdutf/haswell/begin.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=simdutf/haswell/begin.h
- /* begin file src/simdutf/haswell/begin.h */
- // redefining SIMDUTF_IMPLEMENTATION to "haswell"
- // #define SIMDUTF_IMPLEMENTATION haswell
-@@ -1619,7 +1619,7 @@ SIMDUTF_DISABLE_GCC_WARNING(-Wmaybe-uninitialized)
- #endif // end of workaround
- /* end file src/simdutf/haswell/begin.h */
- // Declarations
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=simdutf/haswell/bitmanipulation.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=simdutf/haswell/bitmanipulation.h
- /* begin file src/simdutf/haswell/bitmanipulation.h */
- #ifndef SIMDUTF_HASWELL_BITMANIPULATION_H
- #define SIMDUTF_HASWELL_BITMANIPULATION_H
-@@ -1645,7 +1645,7 @@ simdutf_really_inline long long int count_ones(uint64_t input_num) {
- 
- #endif // SIMDUTF_HASWELL_BITMANIPULATION_H
- /* end file src/simdutf/haswell/bitmanipulation.h */
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=simdutf/haswell/simd.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=simdutf/haswell/simd.h
- /* begin file src/simdutf/haswell/simd.h */
- #ifndef SIMDUTF_HASWELL_SIMD_H
- #define SIMDUTF_HASWELL_SIMD_H
-@@ -2041,7 +2041,7 @@ namespace simd {
-     }
-   }; // struct simd8x64<T>
- 
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=simdutf/haswell/simd16-inl.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=simdutf/haswell/simd16-inl.h
- /* begin file src/simdutf/haswell/simd16-inl.h */
- #ifdef __GNUC__
- #if __GNUC__ < 8
-@@ -2320,7 +2320,7 @@ struct simd16<uint16_t>: base16_numeric<uint16_t>  {
- #endif // SIMDUTF_HASWELL_SIMD_H
- /* end file src/simdutf/haswell/simd.h */
- 
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=simdutf/haswell/end.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=simdutf/haswell/end.h
- /* begin file src/simdutf/haswell/end.h */
- #if SIMDUTF_CAN_ALWAYS_RUN_HASWELL
- // nothing needed.
-@@ -2337,7 +2337,7 @@ SIMDUTF_POP_DISABLE_WARNINGS
- #endif // SIMDUTF_IMPLEMENTATION_HASWELL
- #endif // SIMDUTF_HASWELL_COMMON_H
- /* end file src/simdutf/haswell.h */
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=simdutf/westmere.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=simdutf/westmere.h
- /* begin file src/simdutf/westmere.h */
- #ifndef SIMDUTF_WESTMERE_H
- #define SIMDUTF_WESTMERE_H
-@@ -2365,7 +2365,7 @@ SIMDUTF_POP_DISABLE_WARNINGS
- 
- #if SIMDUTF_IMPLEMENTATION_WESTMERE
- 
--#define SIMDUTF_TARGET_WESTMERE SIMDUTF_TARGET_REGION("sse4.2")
-+#define SIMDUTF_TARGET_WESTMERE SIMDUTF_TARGET_REGION("sse4.2,popcnt")
- 
- namespace simdutf {
- /**
-@@ -2378,7 +2378,7 @@ namespace westmere {
- //
- // These two need to be included outside SIMDUTF_TARGET_REGION
- //
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=simdutf/westmere/implementation.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=simdutf/westmere/implementation.h
- /* begin file src/simdutf/westmere/implementation.h */
- #ifndef SIMDUTF_WESTMERE_IMPLEMENTATION_H
- #define SIMDUTF_WESTMERE_IMPLEMENTATION_H
-@@ -2455,7 +2455,7 @@ class implementation final : public simdutf::implementation {
- 
- #endif // SIMDUTF_WESTMERE_IMPLEMENTATION_H
- /* end file src/simdutf/westmere/implementation.h */
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=simdutf/westmere/intrinsics.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=simdutf/westmere/intrinsics.h
- /* begin file src/simdutf/westmere/intrinsics.h */
- #ifndef SIMDUTF_WESTMERE_INTRINSICS_H
- #define SIMDUTF_WESTMERE_INTRINSICS_H
-@@ -2504,7 +2504,7 @@ SIMDUTF_POP_DISABLE_WARNINGS
- //
- // The rest need to be inside the region
- //
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=simdutf/westmere/begin.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=simdutf/westmere/begin.h
- /* begin file src/simdutf/westmere/begin.h */
- // redefining SIMDUTF_IMPLEMENTATION to "westmere"
- // #define SIMDUTF_IMPLEMENTATION westmere
-@@ -2517,7 +2517,7 @@ SIMDUTF_TARGET_WESTMERE
- /* end file src/simdutf/westmere/begin.h */
- 
- // Declarations
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=simdutf/westmere/bitmanipulation.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=simdutf/westmere/bitmanipulation.h
- /* begin file src/simdutf/westmere/bitmanipulation.h */
- #ifndef SIMDUTF_WESTMERE_BITMANIPULATION_H
- #define SIMDUTF_WESTMERE_BITMANIPULATION_H
-@@ -2543,7 +2543,7 @@ simdutf_really_inline long long int count_ones(uint64_t input_num) {
- 
- #endif // SIMDUTF_WESTMERE_BITMANIPULATION_H
- /* end file src/simdutf/westmere/bitmanipulation.h */
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=simdutf/westmere/simd.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=simdutf/westmere/simd.h
- /* begin file src/simdutf/westmere/simd.h */
- #ifndef SIMDUTF_WESTMERE_SIMD_H
- #define SIMDUTF_WESTMERE_SIMD_H
-@@ -2987,7 +2987,7 @@ namespace simd {
-     }
-   }; // struct simd8x64<T>
- 
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=simdutf/westmere/simd16-inl.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=simdutf/westmere/simd16-inl.h
- /* begin file src/simdutf/westmere/simd16-inl.h */
- template<typename T>
- struct simd16;
-@@ -3264,7 +3264,7 @@ template<typename T>
- #endif // SIMDUTF_WESTMERE_SIMD_INPUT_H
- /* end file src/simdutf/westmere/simd.h */
- 
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=simdutf/westmere/end.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=simdutf/westmere/end.h
- /* begin file src/simdutf/westmere/end.h */
- #if SIMDUTF_CAN_ALWAYS_RUN_WESTMERE
- // nothing needed.
-@@ -3277,7 +3277,7 @@ SIMDUTF_UNTARGET_REGION
- #endif // SIMDUTF_IMPLEMENTATION_WESTMERE
- #endif // SIMDUTF_WESTMERE_COMMON_H
- /* end file src/simdutf/westmere.h */
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=simdutf/ppc64.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=simdutf/ppc64.h
- /* begin file src/simdutf/ppc64.h */
- #ifndef SIMDUTF_PPC64_H
- #define SIMDUTF_PPC64_H
-@@ -3304,7 +3304,7 @@ namespace ppc64 {
- } // namespace ppc64
- } // namespace simdutf
- 
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=simdutf/ppc64/implementation.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=simdutf/ppc64/implementation.h
- /* begin file src/simdutf/ppc64/implementation.h */
- #ifndef SIMDUTF_PPC64_IMPLEMENTATION_H
- #define SIMDUTF_PPC64_IMPLEMENTATION_H
-@@ -3383,14 +3383,14 @@ class implementation final : public simdutf::implementation {
- #endif // SIMDUTF_PPC64_IMPLEMENTATION_H
- /* end file src/simdutf/ppc64/implementation.h */
- 
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=simdutf/ppc64/begin.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=simdutf/ppc64/begin.h
- /* begin file src/simdutf/ppc64/begin.h */
- // redefining SIMDUTF_IMPLEMENTATION to "ppc64"
- // #define SIMDUTF_IMPLEMENTATION ppc64
- /* end file src/simdutf/ppc64/begin.h */
- 
- // Declarations
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=simdutf/ppc64/intrinsics.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=simdutf/ppc64/intrinsics.h
- /* begin file src/simdutf/ppc64/intrinsics.h */
- #ifndef SIMDUTF_PPC64_INTRINSICS_H
- #define SIMDUTF_PPC64_INTRINSICS_H
-@@ -3411,7 +3411,7 @@ class implementation final : public simdutf::implementation {
- 
- #endif //  SIMDUTF_PPC64_INTRINSICS_H
- /* end file src/simdutf/ppc64/intrinsics.h */
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=simdutf/ppc64/bitmanipulation.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=simdutf/ppc64/bitmanipulation.h
- /* begin file src/simdutf/ppc64/bitmanipulation.h */
- #ifndef SIMDUTF_PPC64_BITMANIPULATION_H
- #define SIMDUTF_PPC64_BITMANIPULATION_H
-@@ -3437,7 +3437,7 @@ simdutf_really_inline int count_ones(uint64_t input_num) {
- 
- #endif // SIMDUTF_PPC64_BITMANIPULATION_H
- /* end file src/simdutf/ppc64/bitmanipulation.h */
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=simdutf/ppc64/simd.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=simdutf/ppc64/simd.h
- /* begin file src/simdutf/ppc64/simd.h */
- #ifndef SIMDUTF_PPC64_SIMD_H
- #define SIMDUTF_PPC64_SIMD_H
-@@ -3929,7 +3929,7 @@ template <typename T> struct simd8x64 {
- #endif // SIMDUTF_PPC64_SIMD_INPUT_H
- /* end file src/simdutf/ppc64/simd.h */
- 
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=simdutf/ppc64/end.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=simdutf/ppc64/end.h
- /* begin file src/simdutf/ppc64/end.h */
- /* end file src/simdutf/ppc64/end.h */
- 
-@@ -3937,7 +3937,7 @@ template <typename T> struct simd8x64 {
- 
- #endif // SIMDUTF_PPC64_H
- /* end file src/simdutf/ppc64.h */
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=simdutf/fallback.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=simdutf/fallback.h
- /* begin file src/simdutf/fallback.h */
- #ifndef SIMDUTF_FALLBACK_H
- #define SIMDUTF_FALLBACK_H
-@@ -3966,7 +3966,7 @@ namespace fallback {
- } // namespace fallback
- } // namespace simdutf
- 
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=simdutf/fallback/implementation.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=simdutf/fallback/implementation.h
- /* begin file src/simdutf/fallback/implementation.h */
- #ifndef SIMDUTF_FALLBACK_IMPLEMENTATION_H
- #define SIMDUTF_FALLBACK_IMPLEMENTATION_H
-@@ -4047,14 +4047,14 @@ class implementation final : public simdutf::implementation {
- #endif // SIMDUTF_FALLBACK_IMPLEMENTATION_H
- /* end file src/simdutf/fallback/implementation.h */
- 
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=simdutf/fallback/begin.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=simdutf/fallback/begin.h
- /* begin file src/simdutf/fallback/begin.h */
- // redefining SIMDUTF_IMPLEMENTATION to "fallback"
- // #define SIMDUTF_IMPLEMENTATION fallback
- /* end file src/simdutf/fallback/begin.h */
- 
- // Declarations
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=simdutf/fallback/bitmanipulation.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=simdutf/fallback/bitmanipulation.h
- /* begin file src/simdutf/fallback/bitmanipulation.h */
- #ifndef SIMDUTF_FALLBACK_BITMANIPULATION_H
- #define SIMDUTF_FALLBACK_BITMANIPULATION_H
-@@ -4089,7 +4089,7 @@ static unsigned char _BitScanReverse64(unsigned long* ret, uint64_t x) {
- #endif // SIMDUTF_FALLBACK_BITMANIPULATION_H
- /* end file src/simdutf/fallback/bitmanipulation.h */
- 
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=simdutf/fallback/end.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=simdutf/fallback/end.h
- /* begin file src/simdutf/fallback/end.h */
- /* end file src/simdutf/fallback/end.h */
- 
-@@ -4978,7 +4978,7 @@ const implementation * builtin_implementation() {
- } // namespace simdutf
- 
- /* end file src/implementation.cpp */
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=encoding_types.cpp
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=encoding_types.cpp
- /* begin file src/encoding_types.cpp */
- 
- namespace simdutf {
-@@ -5040,7 +5040,7 @@ encoding_type check_bom(const char* byte, size_t length) {
- }
- }
- /* end file src/encoding_types.cpp */
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=error.cpp
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=error.cpp
- /* begin file src/error.cpp */
- namespace simdutf {
- 
-@@ -5052,7 +5052,7 @@ namespace simdutf {
- /* end file src/error.cpp */
- // The large tables should be included once and they
- // should not depend on a kernel.
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=tables/utf8_to_utf16_tables.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=tables/utf8_to_utf16_tables.h
- /* begin file src/tables/utf8_to_utf16_tables.h */
- #ifndef SIMDUTF_UTF8_TO_UTF16_TABLES_H
- #define SIMDUTF_UTF8_TO_UTF16_TABLES_H
-@@ -9391,7 +9391,7 @@ const uint8_t utf8bigindex[4096][2] =
- 
- #endif // SIMDUTF_UTF8_TO_UTF16_TABLES_H
- /* end file src/tables/utf8_to_utf16_tables.h */
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=tables/utf16_to_utf8_tables.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=tables/utf16_to_utf8_tables.h
- /* begin file src/tables/utf16_to_utf8_tables.h */
- // file generated by scripts/sse_convert_utf16_to_utf8.py
- #ifndef SIMDUTF_UTF16_TO_UTF8_TABLES_H
-@@ -9932,7 +9932,7 @@ namespace utf16_to_utf8 {
- // End of tables.
- 
- // The scalar routines should be included once.
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=scalar/ascii.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=scalar/ascii.h
- /* begin file src/scalar/ascii.h */
- #ifndef SIMDUTF_ASCII_H
- #define SIMDUTF_ASCII_H
-@@ -9993,7 +9993,7 @@ inline simdutf_warn_unused result validate_with_errors(const char *buf, size_t l
- 
- #endif
- /* end file src/scalar/ascii.h */
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=scalar/utf8.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=scalar/utf8.h
- /* begin file src/scalar/utf8.h */
- #ifndef SIMDUTF_UTF8_H
- #define SIMDUTF_UTF8_H
-@@ -10183,7 +10183,7 @@ inline size_t utf16_length_from_utf8(const char* buf, size_t len) {
- 
- #endif
- /* end file src/scalar/utf8.h */
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=scalar/utf16.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=scalar/utf16.h
- /* begin file src/scalar/utf16.h */
- #ifndef SIMDUTF_UTF16_H
- #define SIMDUTF_UTF16_H
-@@ -10297,7 +10297,7 @@ simdutf_really_inline void change_endianness_utf16(const char16_t* in, size_t si
- 
- #endif
- /* end file src/scalar/utf16.h */
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=scalar/utf32.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=scalar/utf32.h
- /* begin file src/scalar/utf32.h */
- #ifndef SIMDUTF_UTF32_H
- #define SIMDUTF_UTF32_H
-@@ -10372,7 +10372,7 @@ inline size_t utf16_length_from_utf32(const char32_t* buf, size_t len) {
- #endif
- /* end file src/scalar/utf32.h */
- 
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=scalar/utf32_to_utf8/valid_utf32_to_utf8.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=scalar/utf32_to_utf8/valid_utf32_to_utf8.h
- /* begin file src/scalar/utf32_to_utf8/valid_utf32_to_utf8.h */
- #ifndef SIMDUTF_VALID_UTF32_TO_UTF8_H
- #define SIMDUTF_VALID_UTF32_TO_UTF8_H
-@@ -10439,7 +10439,7 @@ inline size_t convert_valid(const char32_t* buf, size_t len, char* utf8_output)
- 
- #endif
- /* end file src/scalar/utf32_to_utf8/valid_utf32_to_utf8.h */
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=scalar/utf32_to_utf8/utf32_to_utf8.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=scalar/utf32_to_utf8/utf32_to_utf8.h
- /* begin file src/scalar/utf32_to_utf8/utf32_to_utf8.h */
- #ifndef SIMDUTF_UTF32_TO_UTF8_H
- #define SIMDUTF_UTF32_TO_UTF8_H
-@@ -10555,7 +10555,7 @@ inline result convert_with_errors(const char32_t* buf, size_t len, char* utf8_ou
- #endif
- /* end file src/scalar/utf32_to_utf8/utf32_to_utf8.h */
- 
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=scalar/utf32_to_utf16/valid_utf32_to_utf16.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=scalar/utf32_to_utf16/valid_utf32_to_utf16.h
- /* begin file src/scalar/utf32_to_utf16/valid_utf32_to_utf16.h */
- #ifndef SIMDUTF_VALID_UTF32_TO_UTF16_H
- #define SIMDUTF_VALID_UTF32_TO_UTF16_H
-@@ -10600,7 +10600,7 @@ inline size_t convert_valid(const char32_t* buf, size_t len, char16_t* utf16_out
- 
- #endif
- /* end file src/scalar/utf32_to_utf16/valid_utf32_to_utf16.h */
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=scalar/utf32_to_utf16/utf32_to_utf16.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=scalar/utf32_to_utf16/utf32_to_utf16.h
- /* begin file src/scalar/utf32_to_utf16/utf32_to_utf16.h */
- #ifndef SIMDUTF_UTF32_TO_UTF16_H
- #define SIMDUTF_UTF32_TO_UTF16_H
-@@ -10676,7 +10676,7 @@ inline result convert_with_errors(const char32_t* buf, size_t len, char16_t* utf
- #endif
- /* end file src/scalar/utf32_to_utf16/utf32_to_utf16.h */
- 
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=scalar/utf16_to_utf8/valid_utf16_to_utf8.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=scalar/utf16_to_utf8/valid_utf16_to_utf8.h
- /* begin file src/scalar/utf16_to_utf8/valid_utf16_to_utf8.h */
- #ifndef SIMDUTF_VALID_UTF16_TO_UTF8_H
- #define SIMDUTF_VALID_UTF16_TO_UTF8_H
-@@ -10751,7 +10751,7 @@ inline size_t convert_valid(const char16_t* buf, size_t len, char* utf8_output)
- 
- #endif
- /* end file src/scalar/utf16_to_utf8/valid_utf16_to_utf8.h */
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=scalar/utf16_to_utf8/utf16_to_utf8.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=scalar/utf16_to_utf8/utf16_to_utf8.h
- /* begin file src/scalar/utf16_to_utf8/utf16_to_utf8.h */
- #ifndef SIMDUTF_UTF16_TO_UTF8_H
- #define SIMDUTF_UTF16_TO_UTF8_H
-@@ -10887,7 +10887,7 @@ inline result convert_with_errors(const char16_t* buf, size_t len, char* utf8_ou
- #endif
- /* end file src/scalar/utf16_to_utf8/utf16_to_utf8.h */
- 
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=scalar/utf16_to_utf32/valid_utf16_to_utf32.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=scalar/utf16_to_utf32/valid_utf16_to_utf32.h
- /* begin file src/scalar/utf16_to_utf32/valid_utf16_to_utf32.h */
- #ifndef SIMDUTF_VALID_UTF16_TO_UTF32_H
- #define SIMDUTF_VALID_UTF16_TO_UTF32_H
-@@ -10929,7 +10929,7 @@ inline size_t convert_valid(const char16_t* buf, size_t len, char32_t* utf32_out
- 
- #endif
- /* end file src/scalar/utf16_to_utf32/valid_utf16_to_utf32.h */
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=scalar/utf16_to_utf32/utf16_to_utf32.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=scalar/utf16_to_utf32/utf16_to_utf32.h
- /* begin file src/scalar/utf16_to_utf32/utf16_to_utf32.h */
- #ifndef SIMDUTF_UTF16_TO_UTF32_H
- #define SIMDUTF_UTF16_TO_UTF32_H
-@@ -11001,7 +11001,7 @@ inline result convert_with_errors(const char16_t* buf, size_t len, char32_t* utf
- #endif
- /* end file src/scalar/utf16_to_utf32/utf16_to_utf32.h */
- 
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=scalar/utf8_to_utf16/valid_utf8_to_utf16.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=scalar/utf8_to_utf16/valid_utf8_to_utf16.h
- /* begin file src/scalar/utf8_to_utf16/valid_utf8_to_utf16.h */
- #ifndef SIMDUTF_VALID_UTF8_TO_UTF16_H
- #define SIMDUTF_VALID_UTF8_TO_UTF16_H
-@@ -11086,7 +11086,7 @@ inline size_t convert_valid(const char* buf, size_t len, char16_t* utf16_output)
- 
- #endif
- /* end file src/scalar/utf8_to_utf16/valid_utf8_to_utf16.h */
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=scalar/utf8_to_utf16/utf8_to_utf16.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=scalar/utf8_to_utf16/utf8_to_utf16.h
- /* begin file src/scalar/utf8_to_utf16/utf8_to_utf16.h */
- #ifndef SIMDUTF_UTF8_TO_UTF16_H
- #define SIMDUTF_UTF8_TO_UTF16_H
-@@ -11336,7 +11336,7 @@ inline result rewind_and_convert_with_errors(size_t prior_bytes, const char* buf
- #endif
- /* end file src/scalar/utf8_to_utf16/utf8_to_utf16.h */
- 
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=scalar/utf8_to_utf32/valid_utf8_to_utf32.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=scalar/utf8_to_utf32/valid_utf8_to_utf32.h
- /* begin file src/scalar/utf8_to_utf32/valid_utf8_to_utf32.h */
- #ifndef SIMDUTF_VALID_UTF8_TO_UTF32_H
- #define SIMDUTF_VALID_UTF8_TO_UTF32_H
-@@ -11402,7 +11402,7 @@ inline size_t convert_valid(const char* buf, size_t len, char32_t* utf32_output)
- 
- #endif
- /* end file src/scalar/utf8_to_utf32/valid_utf8_to_utf32.h */
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=scalar/utf8_to_utf32/utf8_to_utf32.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=scalar/utf8_to_utf32/utf8_to_utf32.h
- /* begin file src/scalar/utf8_to_utf32/utf8_to_utf32.h */
- #ifndef SIMDUTF_UTF8_TO_UTF32_H
- #define SIMDUTF_UTF8_TO_UTF32_H
-@@ -11622,9 +11622,9 @@ SIMDUTF_DISABLE_UNDESIRED_WARNINGS
- 
- 
- #if SIMDUTF_IMPLEMENTATION_ARM64
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=arm64/implementation.cpp
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=arm64/implementation.cpp
- /* begin file src/arm64/implementation.cpp */
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=simdutf/arm64/begin.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=simdutf/arm64/begin.h
- /* begin file src/simdutf/arm64/begin.h */
- // redefining SIMDUTF_IMPLEMENTATION to "arm64"
- // #define SIMDUTF_IMPLEMENTATION arm64
-@@ -11660,7 +11660,7 @@ simdutf_really_inline simd8<bool> must_be_2_3_continuation(const simd8<uint8_t>
-     return is_third_byte ^ is_fourth_byte;
- }
- 
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=arm64/arm_detect_encodings.cpp
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=arm64/arm_detect_encodings.cpp
- /* begin file src/arm64/arm_detect_encodings.cpp */
- template<class checker>
- // len is known to be a multiple of 2 when this is called
-@@ -11868,7 +11868,7 @@ int arm_detect_encodings(const char * buf, size_t len) {
- }
- /* end file src/arm64/arm_detect_encodings.cpp */
- 
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=arm64/arm_validate_utf16.cpp
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=arm64/arm_validate_utf16.cpp
- /* begin file src/arm64/arm_validate_utf16.cpp */
- template <endianness big_endian>
- const char16_t* arm_validate_utf16(const char16_t* input, size_t size) {
-@@ -12018,7 +12018,7 @@ const result arm_validate_utf16_with_errors(const char16_t* input, size_t size)
-     return result(error_code::SUCCESS, input - start);
- }
- /* end file src/arm64/arm_validate_utf16.cpp */
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=arm64/arm_validate_utf32le.cpp
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=arm64/arm_validate_utf32le.cpp
- /* begin file src/arm64/arm_validate_utf32le.cpp */
- 
- const char32_t* arm_validate_utf32le(const char32_t* input, size_t size) {
-@@ -12083,7 +12083,7 @@ const result arm_validate_utf32le_with_errors(const char32_t* input, size_t size
- }
- /* end file src/arm64/arm_validate_utf32le.cpp */
- 
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=arm64/arm_convert_utf8_to_utf16.cpp
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=arm64/arm_convert_utf8_to_utf16.cpp
- /* begin file src/arm64/arm_convert_utf8_to_utf16.cpp */
- // Convert up to 12 bytes from utf8 to utf16 using a mask indicating the
- // end of the code points. Only the least significant 12 bits of the mask
-@@ -12270,7 +12270,7 @@ size_t convert_masked_utf8_to_utf16(const char *input,
-   return consumed;
- }
- /* end file src/arm64/arm_convert_utf8_to_utf16.cpp */
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=arm64/arm_convert_utf8_to_utf32.cpp
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=arm64/arm_convert_utf8_to_utf32.cpp
- /* begin file src/arm64/arm_convert_utf8_to_utf32.cpp */
- // Convert up to 12 bytes from utf8 to utf32 using a mask indicating the
- // end of the code points. Only the least significant 12 bits of the mask
-@@ -12407,7 +12407,7 @@ size_t convert_masked_utf8_to_utf32(const char *input,
- }
- /* end file src/arm64/arm_convert_utf8_to_utf32.cpp */
- 
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=arm64/arm_convert_utf16_to_utf8.cpp
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=arm64/arm_convert_utf16_to_utf8.cpp
- /* begin file src/arm64/arm_convert_utf16_to_utf8.cpp */
- /*
-     The vectorized algorithm works on single SSE register i.e., it
-@@ -12987,7 +12987,7 @@ std::pair<result, char*> arm_convert_utf16_to_utf8_with_errors(const char16_t* b
-   return std::make_pair(result(error_code::SUCCESS, buf - start), reinterpret_cast<char*>(utf8_output));
- }
- /* end file src/arm64/arm_convert_utf16_to_utf8.cpp */
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=arm64/arm_convert_utf16_to_utf32.cpp
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=arm64/arm_convert_utf16_to_utf32.cpp
- /* begin file src/arm64/arm_convert_utf16_to_utf32.cpp */
- /*
-     The vectorized algorithm works on single SSE register i.e., it
-@@ -13164,7 +13164,7 @@ std::pair<result, char32_t*> arm_convert_utf16_to_utf32_with_errors(const char16
- }
- /* end file src/arm64/arm_convert_utf16_to_utf32.cpp */
- 
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=arm64/arm_convert_utf32_to_utf8.cpp
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=arm64/arm_convert_utf32_to_utf8.cpp
- /* begin file src/arm64/arm_convert_utf32_to_utf8.cpp */
- std::pair<const char32_t*, char*> arm_convert_utf32_to_utf8(const char32_t* buf, size_t len, char* utf8_out) {
-   uint8_t * utf8_output = reinterpret_cast<uint8_t*>(utf8_out);
-@@ -13636,7 +13636,7 @@ std::pair<result, char*> arm_convert_utf32_to_utf8_with_errors(const char32_t* b
-   return std::make_pair(result(error_code::SUCCESS, buf - start), reinterpret_cast<char*>(utf8_output));
- }
- /* end file src/arm64/arm_convert_utf32_to_utf8.cpp */
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=arm64/arm_convert_utf32_to_utf16.cpp
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=arm64/arm_convert_utf32_to_utf16.cpp
- /* begin file src/arm64/arm_convert_utf32_to_utf16.cpp */
- template <endianness big_endian>
- std::pair<const char32_t*, char16_t*> arm_convert_utf32_to_utf16(const char32_t* buf, size_t len, char16_t* utf16_out) {
-@@ -13769,7 +13769,7 @@ std::pair<result, char16_t*> arm_convert_utf32_to_utf16_with_errors(const char32
- } // unnamed namespace
- } // namespace arm64
- } // namespace simdutf
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=generic/buf_block_reader.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=generic/buf_block_reader.h
- /* begin file src/generic/buf_block_reader.h */
- namespace simdutf {
- namespace arm64 {
-@@ -13864,7 +13864,7 @@ simdutf_really_inline void buf_block_reader<STEP_SIZE>::advance() {
- } // namespace arm64
- } // namespace simdutf
- /* end file src/generic/buf_block_reader.h */
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=generic/utf8_validation/utf8_lookup4_algorithm.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=generic/utf8_validation/utf8_lookup4_algorithm.h
- /* begin file src/generic/utf8_validation/utf8_lookup4_algorithm.h */
- namespace simdutf {
- namespace arm64 {
-@@ -14053,7 +14053,7 @@ using utf8_validation::utf8_checker;
- } // namespace arm64
- } // namespace simdutf
- /* end file src/generic/utf8_validation/utf8_lookup4_algorithm.h */
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=generic/utf8_validation/utf8_validator.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=generic/utf8_validation/utf8_validator.h
- /* begin file src/generic/utf8_validation/utf8_validator.h */
- namespace simdutf {
- namespace arm64 {
-@@ -14180,7 +14180,7 @@ result generic_validate_ascii_with_errors(const char * input, size_t length) {
- } // namespace simdutf
- /* end file src/generic/utf8_validation/utf8_validator.h */
- // transcoding from UTF-8 to UTF-16
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=generic/utf8_to_utf16/valid_utf8_to_utf16.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=generic/utf8_to_utf16/valid_utf8_to_utf16.h
- /* begin file src/generic/utf8_to_utf16/valid_utf8_to_utf16.h */
- 
- 
-@@ -14255,7 +14255,7 @@ simdutf_warn_unused size_t convert_valid(const char* input, size_t size,
- } // namespace arm64
- } // namespace simdutf
- /* end file src/generic/utf8_to_utf16/valid_utf8_to_utf16.h */
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=generic/utf8_to_utf16/utf8_to_utf16.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=generic/utf8_to_utf16/utf8_to_utf16.h
- /* begin file src/generic/utf8_to_utf16/utf8_to_utf16.h */
- 
- 
-@@ -14563,7 +14563,7 @@ using namespace simd;
- } // namespace simdutf
- /* end file src/generic/utf8_to_utf16/utf8_to_utf16.h */
- // transcoding from UTF-8 to UTF-32
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=generic/utf8_to_utf32/valid_utf8_to_utf32.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=generic/utf8_to_utf32/valid_utf8_to_utf32.h
- /* begin file src/generic/utf8_to_utf32/valid_utf8_to_utf32.h */
- 
- namespace simdutf {
-@@ -14609,7 +14609,7 @@ simdutf_warn_unused size_t convert_valid(const char* input, size_t size,
- } // namespace arm64
- } // namespace simdutf
- /* end file src/generic/utf8_to_utf32/valid_utf8_to_utf32.h */
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=generic/utf8_to_utf32/utf8_to_utf32.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=generic/utf8_to_utf32/utf8_to_utf32.h
- /* begin file src/generic/utf8_to_utf32/utf8_to_utf32.h */
- 
- 
-@@ -14910,7 +14910,7 @@ using namespace simd;
- } // namespace simdutf
- /* end file src/generic/utf8_to_utf32/utf8_to_utf32.h */
- // other functions
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=generic/utf8.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=generic/utf8.h
- /* begin file src/generic/utf8.h */
- 
- namespace simdutf {
-@@ -14957,7 +14957,7 @@ simdutf_really_inline size_t utf32_length_from_utf8(const char* in, size_t size)
- } // namespace arm64
- } // namespace simdutf
- /* end file src/generic/utf8.h */
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=generic/utf16.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=generic/utf16.h
- /* begin file src/generic/utf16.h */
- namespace simdutf {
- namespace arm64 {
-@@ -15492,15 +15492,15 @@ simdutf_warn_unused size_t implementation::utf32_length_from_utf8(const char * i
- } // namespace arm64
- } // namespace simdutf
- 
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=simdutf/arm64/end.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=simdutf/arm64/end.h
- /* begin file src/simdutf/arm64/end.h */
- /* end file src/simdutf/arm64/end.h */
- /* end file src/arm64/implementation.cpp */
- #endif
- #if SIMDUTF_IMPLEMENTATION_FALLBACK
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=fallback/implementation.cpp
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=fallback/implementation.cpp
- /* begin file src/fallback/implementation.cpp */
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=simdutf/fallback/begin.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=simdutf/fallback/begin.h
- /* begin file src/simdutf/fallback/begin.h */
- // redefining SIMDUTF_IMPLEMENTATION to "fallback"
- // #define SIMDUTF_IMPLEMENTATION fallback
-@@ -15744,17 +15744,17 @@ simdutf_warn_unused size_t implementation::utf32_length_from_utf8(const char * i
- } // namespace fallback
- } // namespace simdutf
- 
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=simdutf/fallback/end.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=simdutf/fallback/end.h
- /* begin file src/simdutf/fallback/end.h */
- /* end file src/simdutf/fallback/end.h */
- /* end file src/fallback/implementation.cpp */
- #endif
- #if SIMDUTF_IMPLEMENTATION_ICELAKE
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=icelake/implementation.cpp
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=icelake/implementation.cpp
- /* begin file src/icelake/implementation.cpp */
- 
- 
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=simdutf/icelake/begin.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=simdutf/icelake/begin.h
- /* begin file src/simdutf/icelake/begin.h */
- // redefining SIMDUTF_IMPLEMENTATION to "icelake"
- // #define SIMDUTF_IMPLEMENTATION icelake
-@@ -15775,7 +15775,7 @@ namespace {
- #ifndef SIMDUTF_ICELAKE_H
- #error "icelake.h must be included"
- #endif
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=icelake/icelake_utf8_common.inl.cpp
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=icelake/icelake_utf8_common.inl.cpp
- /* begin file src/icelake/icelake_utf8_common.inl.cpp */
- // Common procedures for both validating and non-validating conversions from UTF-8.
- enum block_processing_mode { SIMDUTF_FULL, SIMDUTF_TAIL};
-@@ -16440,7 +16440,7 @@ simdutf_really_inline __m512i expand_utf8_to_utf32(__m512i input) {
-     return expanded_utf8_to_utf32(char_class, input);
- }
- /* end file src/icelake/icelake_utf8_common.inl.cpp */
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=icelake/icelake_macros.inl.cpp
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=icelake/icelake_macros.inl.cpp
- /* begin file src/icelake/icelake_macros.inl.cpp */
- 
- /*
-@@ -16576,7 +16576,7 @@ simdutf_really_inline __m512i expand_utf8_to_utf32(__m512i input) {
-                 }                                                                         \
-         }
- /* end file src/icelake/icelake_macros.inl.cpp */
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=icelake/icelake_from_valid_utf8.inl.cpp
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=icelake/icelake_from_valid_utf8.inl.cpp
- /* begin file src/icelake/icelake_from_valid_utf8.inl.cpp */
- // file included directly
- 
-@@ -16715,7 +16715,7 @@ std::pair<const char*, OUTPUT*> valid_utf8_to_fixed_length(const char* str, size
- 
- using utf8_to_utf16_result = std::pair<const char*, char16_t*>;
- /* end file src/icelake/icelake_from_valid_utf8.inl.cpp */
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=icelake/icelake_utf8_validation.inl.cpp
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=icelake/icelake_utf8_validation.inl.cpp
- /* begin file src/icelake/icelake_utf8_validation.inl.cpp */
- // file included directly
- 
-@@ -16845,7 +16845,7 @@ simdutf_really_inline __m512i check_special_cases(__m512i input, const __m512i p
- 
-   }; // struct avx512_utf8_checker
- /* end file src/icelake/icelake_utf8_validation.inl.cpp */
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=icelake/icelake_from_utf8.inl.cpp
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=icelake/icelake_from_utf8.inl.cpp
- /* begin file src/icelake/icelake_from_utf8.inl.cpp */
- // file included directly
- 
-@@ -17148,7 +17148,7 @@ std::tuple<const char*, OUTPUT*, bool> validating_utf8_to_fixed_length_with_cons
-     return {ptr, output, true};
- }
- /* end file src/icelake/icelake_from_utf8.inl.cpp */
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=icelake/icelake_convert_utf16_to_utf32.inl.cpp
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=icelake/icelake_convert_utf16_to_utf32.inl.cpp
- /* begin file src/icelake/icelake_convert_utf16_to_utf32.inl.cpp */
- // file included directly
- 
-@@ -17260,7 +17260,7 @@ std::tuple<const char16_t*, char32_t*, bool> convert_utf16_to_utf32(const char16
-   return std::make_tuple(buf+carry, utf32_output, true);
- }
- /* end file src/icelake/icelake_convert_utf16_to_utf32.inl.cpp */
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=icelake/icelake_convert_utf32_to_utf8.inl.cpp
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=icelake/icelake_convert_utf32_to_utf8.inl.cpp
- /* begin file src/icelake/icelake_convert_utf32_to_utf8.inl.cpp */
- // file included directly
- 
-@@ -17746,7 +17746,7 @@ std::pair<result, char*> avx512_convert_utf32_to_utf8_with_errors(const char32_t
-   return std::make_pair(result(error_code::SUCCESS, buf - start), utf8_output);
- }
- /* end file src/icelake/icelake_convert_utf32_to_utf8.inl.cpp */
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=icelake/icelake_convert_utf32_to_utf16.inl.cpp
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=icelake/icelake_convert_utf32_to_utf16.inl.cpp
- /* begin file src/icelake/icelake_convert_utf32_to_utf16.inl.cpp */
- // file included directly
- 
-@@ -17881,7 +17881,7 @@ std::pair<result, char16_t*> avx512_convert_utf32_to_utf16_with_errors(const cha
-   return std::make_pair(result(error_code::SUCCESS, buf - start), utf16_output);
- }
- /* end file src/icelake/icelake_convert_utf32_to_utf16.inl.cpp */
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=icelake/icelake_ascii_validation.inl.cpp
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=icelake/icelake_ascii_validation.inl.cpp
- /* begin file src/icelake/icelake_ascii_validation.inl.cpp */
- // file included directly
- 
-@@ -17900,7 +17900,7 @@ bool validate_ascii(const char* buf, size_t len) {
-   return (_mm512_test_epi8_mask(running_or, running_or) == 0);
- }
- /* end file src/icelake/icelake_ascii_validation.inl.cpp */
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=icelake/icelake_utf32_validation.inl.cpp
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=icelake/icelake_utf32_validation.inl.cpp
- /* begin file src/icelake/icelake_utf32_validation.inl.cpp */
- // file included directly
- 
-@@ -17932,7 +17932,7 @@ const char32_t* validate_utf32(const char32_t* buf, size_t len) {
-     return buf;
- }
- /* end file src/icelake/icelake_utf32_validation.inl.cpp */
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=icelake/icelake_convert_utf16_to_utf8.inl.cpp
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=icelake/icelake_convert_utf16_to_utf8.inl.cpp
- /* begin file src/icelake/icelake_convert_utf16_to_utf8.inl.cpp */
- // file included directly
- 
-@@ -19244,7 +19244,7 @@ simdutf_warn_unused size_t implementation::utf32_length_from_utf8(const char * i
- } // namespace icelake
- } // namespace simdutf
- 
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=simdutf/icelake/end.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=simdutf/icelake/end.h
- /* begin file src/simdutf/icelake/end.h */
- #if SIMDUTF_CAN_ALWAYS_RUN_ICELAKE
- // nothing needed.
-@@ -19260,10 +19260,10 @@ SIMDUTF_POP_DISABLE_WARNINGS
- /* end file src/icelake/implementation.cpp */
- #endif
- #if SIMDUTF_IMPLEMENTATION_HASWELL
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=haswell/implementation.cpp
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=haswell/implementation.cpp
- /* begin file src/haswell/implementation.cpp */
- 
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=simdutf/haswell/begin.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=simdutf/haswell/begin.h
- /* begin file src/simdutf/haswell/begin.h */
- // redefining SIMDUTF_IMPLEMENTATION to "haswell"
- // #define SIMDUTF_IMPLEMENTATION haswell
-@@ -19306,7 +19306,7 @@ simdutf_really_inline simd8<bool> must_be_2_3_continuation(const simd8<uint8_t>
-   return simd8<int8_t>(is_third_byte | is_fourth_byte) > int8_t(0);
- }
- 
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=haswell/avx2_detect_encodings.cpp
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=haswell/avx2_detect_encodings.cpp
- /* begin file src/haswell/avx2_detect_encodings.cpp */
- template<class checker>
- // len is known to be a multiple of 2 when this is called
-@@ -19496,7 +19496,7 @@ int avx2_detect_encodings(const char * buf, size_t len) {
- }
- /* end file src/haswell/avx2_detect_encodings.cpp */
- 
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=haswell/avx2_validate_utf16.cpp
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=haswell/avx2_validate_utf16.cpp
- /* begin file src/haswell/avx2_validate_utf16.cpp */
- /*
-     In UTF-16 words in range 0xD800 to 0xDFFF have special meaning.
-@@ -19697,7 +19697,7 @@ const result avx2_validate_utf16_with_errors(const char16_t* input, size_t size)
-     return result(error_code::SUCCESS, input - start);
- }
- /* end file src/haswell/avx2_validate_utf16.cpp */
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=haswell/avx2_validate_utf32le.cpp
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=haswell/avx2_validate_utf32le.cpp
- /* begin file src/haswell/avx2_validate_utf32le.cpp */
- /* Returns:
-    - pointer to the last unprocessed character (a scalar fallback should check the rest);
-@@ -19763,7 +19763,7 @@ const result avx2_validate_utf32le_with_errors(const char32_t* input, size_t siz
- }
- /* end file src/haswell/avx2_validate_utf32le.cpp */
- 
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=haswell/avx2_convert_utf8_to_utf16.cpp
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=haswell/avx2_convert_utf8_to_utf16.cpp
- /* begin file src/haswell/avx2_convert_utf8_to_utf16.cpp */
- // depends on "tables/utf8_to_utf16_tables.h"
- 
-@@ -19946,7 +19946,7 @@ size_t convert_masked_utf8_to_utf16(const char *input,
-   return consumed;
- }
- /* end file src/haswell/avx2_convert_utf8_to_utf16.cpp */
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=haswell/avx2_convert_utf8_to_utf32.cpp
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=haswell/avx2_convert_utf8_to_utf32.cpp
- /* begin file src/haswell/avx2_convert_utf8_to_utf32.cpp */
- // depends on "tables/utf8_to_utf16_tables.h"
- 
-@@ -20075,7 +20075,7 @@ size_t convert_masked_utf8_to_utf32(const char *input,
- }
- /* end file src/haswell/avx2_convert_utf8_to_utf32.cpp */
- 
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=haswell/avx2_convert_utf16_to_utf8.cpp
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=haswell/avx2_convert_utf16_to_utf8.cpp
- /* begin file src/haswell/avx2_convert_utf16_to_utf8.cpp */
- /*
-     The vectorized algorithm works on single SSE register i.e., it
-@@ -20608,7 +20608,7 @@ std::pair<result, char*> avx2_convert_utf16_to_utf8_with_errors(const char16_t*
-   return std::make_pair(result(error_code::SUCCESS, buf - start), utf8_output);
- }
- /* end file src/haswell/avx2_convert_utf16_to_utf8.cpp */
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=haswell/avx2_convert_utf16_to_utf32.cpp
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=haswell/avx2_convert_utf16_to_utf32.cpp
- /* begin file src/haswell/avx2_convert_utf16_to_utf32.cpp */
- /*
-     The vectorized algorithm works on single SSE register i.e., it
-@@ -20793,7 +20793,7 @@ std::pair<result, char32_t*> avx2_convert_utf16_to_utf32_with_errors(const char1
- }
- /* end file src/haswell/avx2_convert_utf16_to_utf32.cpp */
- 
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=haswell/avx2_convert_utf32_to_utf8.cpp
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=haswell/avx2_convert_utf32_to_utf8.cpp
- /* begin file src/haswell/avx2_convert_utf32_to_utf8.cpp */
- std::pair<const char32_t*, char*> avx2_convert_utf32_to_utf8(const char32_t* buf, size_t len, char* utf8_output) {
-   const char32_t* end = buf + len;
-@@ -21276,7 +21276,7 @@ std::pair<result, char*> avx2_convert_utf32_to_utf8_with_errors(const char32_t*
-   return std::make_pair(result(error_code::SUCCESS, buf - start), utf8_output);
- }
- /* end file src/haswell/avx2_convert_utf32_to_utf8.cpp */
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=haswell/avx2_convert_utf32_to_utf16.cpp
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=haswell/avx2_convert_utf32_to_utf16.cpp
- /* begin file src/haswell/avx2_convert_utf32_to_utf16.cpp */
- template <endianness big_endian>
- std::pair<const char32_t*, char16_t*> avx2_convert_utf32_to_utf16(const char32_t* buf, size_t len, char16_t* utf16_output) {
-@@ -21412,7 +21412,7 @@ std::pair<result, char16_t*> avx2_convert_utf32_to_utf16_with_errors(const char3
- } // namespace haswell
- } // namespace simdutf
- 
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=generic/buf_block_reader.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=generic/buf_block_reader.h
- /* begin file src/generic/buf_block_reader.h */
- namespace simdutf {
- namespace haswell {
-@@ -21507,7 +21507,7 @@ simdutf_really_inline void buf_block_reader<STEP_SIZE>::advance() {
- } // namespace haswell
- } // namespace simdutf
- /* end file src/generic/buf_block_reader.h */
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=generic/utf8_validation/utf8_lookup4_algorithm.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=generic/utf8_validation/utf8_lookup4_algorithm.h
- /* begin file src/generic/utf8_validation/utf8_lookup4_algorithm.h */
- namespace simdutf {
- namespace haswell {
-@@ -21696,7 +21696,7 @@ using utf8_validation::utf8_checker;
- } // namespace haswell
- } // namespace simdutf
- /* end file src/generic/utf8_validation/utf8_lookup4_algorithm.h */
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=generic/utf8_validation/utf8_validator.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=generic/utf8_validation/utf8_validator.h
- /* begin file src/generic/utf8_validation/utf8_validator.h */
- namespace simdutf {
- namespace haswell {
-@@ -21823,7 +21823,7 @@ result generic_validate_ascii_with_errors(const char * input, size_t length) {
- } // namespace simdutf
- /* end file src/generic/utf8_validation/utf8_validator.h */
- // transcoding from UTF-8 to UTF-16
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=generic/utf8_to_utf16/valid_utf8_to_utf16.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=generic/utf8_to_utf16/valid_utf8_to_utf16.h
- /* begin file src/generic/utf8_to_utf16/valid_utf8_to_utf16.h */
- 
- 
-@@ -21898,7 +21898,7 @@ simdutf_warn_unused size_t convert_valid(const char* input, size_t size,
- } // namespace haswell
- } // namespace simdutf
- /* end file src/generic/utf8_to_utf16/valid_utf8_to_utf16.h */
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=generic/utf8_to_utf16/utf8_to_utf16.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=generic/utf8_to_utf16/utf8_to_utf16.h
- /* begin file src/generic/utf8_to_utf16/utf8_to_utf16.h */
- 
- 
-@@ -22206,7 +22206,7 @@ using namespace simd;
- } // namespace simdutf
- /* end file src/generic/utf8_to_utf16/utf8_to_utf16.h */
- // transcoding from UTF-8 to UTF-32
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=generic/utf8_to_utf32/valid_utf8_to_utf32.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=generic/utf8_to_utf32/valid_utf8_to_utf32.h
- /* begin file src/generic/utf8_to_utf32/valid_utf8_to_utf32.h */
- 
- namespace simdutf {
-@@ -22252,7 +22252,7 @@ simdutf_warn_unused size_t convert_valid(const char* input, size_t size,
- } // namespace haswell
- } // namespace simdutf
- /* end file src/generic/utf8_to_utf32/valid_utf8_to_utf32.h */
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=generic/utf8_to_utf32/utf8_to_utf32.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=generic/utf8_to_utf32/utf8_to_utf32.h
- /* begin file src/generic/utf8_to_utf32/utf8_to_utf32.h */
- 
- 
-@@ -22553,7 +22553,7 @@ using namespace simd;
- } // namespace simdutf
- /* end file src/generic/utf8_to_utf32/utf8_to_utf32.h */
- // other functions
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=generic/utf8.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=generic/utf8.h
- /* begin file src/generic/utf8.h */
- 
- namespace simdutf {
-@@ -22600,7 +22600,7 @@ simdutf_really_inline size_t utf32_length_from_utf8(const char* in, size_t size)
- } // namespace haswell
- } // namespace simdutf
- /* end file src/generic/utf8.h */
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=generic/utf16.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=generic/utf16.h
- /* begin file src/generic/utf16.h */
- namespace simdutf {
- namespace haswell {
-@@ -23128,7 +23128,7 @@ simdutf_warn_unused size_t implementation::utf32_length_from_utf8(const char * i
- } // namespace haswell
- } // namespace simdutf
- 
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=simdutf/haswell/end.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=simdutf/haswell/end.h
- /* begin file src/simdutf/haswell/end.h */
- #if SIMDUTF_CAN_ALWAYS_RUN_HASWELL
- // nothing needed.
-@@ -23144,14 +23144,14 @@ SIMDUTF_POP_DISABLE_WARNINGS
- /* end file src/haswell/implementation.cpp */
- #endif
- #if SIMDUTF_IMPLEMENTATION_PPC64
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=ppc64/implementation.cpp
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=ppc64/implementation.cpp
- /* begin file src/ppc64/implementation.cpp */
- 
- 
- 
- 
- 
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=simdutf/ppc64/begin.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=simdutf/ppc64/begin.h
- /* begin file src/simdutf/ppc64/begin.h */
- // redefining SIMDUTF_IMPLEMENTATION to "ppc64"
- // #define SIMDUTF_IMPLEMENTATION ppc64
-@@ -23189,7 +23189,7 @@ simdutf_really_inline simd8<bool> must_be_2_3_continuation(const simd8<uint8_t>
- } // namespace ppc64
- } // namespace simdutf
- 
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=generic/buf_block_reader.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=generic/buf_block_reader.h
- /* begin file src/generic/buf_block_reader.h */
- namespace simdutf {
- namespace ppc64 {
-@@ -23284,7 +23284,7 @@ simdutf_really_inline void buf_block_reader<STEP_SIZE>::advance() {
- } // namespace ppc64
- } // namespace simdutf
- /* end file src/generic/buf_block_reader.h */
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=generic/utf8_validation/utf8_lookup4_algorithm.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=generic/utf8_validation/utf8_lookup4_algorithm.h
- /* begin file src/generic/utf8_validation/utf8_lookup4_algorithm.h */
- namespace simdutf {
- namespace ppc64 {
-@@ -23473,7 +23473,7 @@ using utf8_validation::utf8_checker;
- } // namespace ppc64
- } // namespace simdutf
- /* end file src/generic/utf8_validation/utf8_lookup4_algorithm.h */
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=generic/utf8_validation/utf8_validator.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=generic/utf8_validation/utf8_validator.h
- /* begin file src/generic/utf8_validation/utf8_validator.h */
- namespace simdutf {
- namespace ppc64 {
-@@ -23600,7 +23600,7 @@ result generic_validate_ascii_with_errors(const char * input, size_t length) {
- } // namespace simdutf
- /* end file src/generic/utf8_validation/utf8_validator.h */
- // transcoding from UTF-8 to UTF-16
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=generic/utf8_to_utf16/valid_utf8_to_utf16.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=generic/utf8_to_utf16/valid_utf8_to_utf16.h
- /* begin file src/generic/utf8_to_utf16/valid_utf8_to_utf16.h */
- 
- 
-@@ -23675,7 +23675,7 @@ simdutf_warn_unused size_t convert_valid(const char* input, size_t size,
- } // namespace ppc64
- } // namespace simdutf
- /* end file src/generic/utf8_to_utf16/valid_utf8_to_utf16.h */
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=generic/utf8_to_utf16/utf8_to_utf16.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=generic/utf8_to_utf16/utf8_to_utf16.h
- /* begin file src/generic/utf8_to_utf16/utf8_to_utf16.h */
- 
- 
-@@ -23983,7 +23983,7 @@ using namespace simd;
- } // namespace simdutf
- /* end file src/generic/utf8_to_utf16/utf8_to_utf16.h */
- // transcoding from UTF-8 to UTF-32
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=generic/utf8_to_utf32/valid_utf8_to_utf32.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=generic/utf8_to_utf32/valid_utf8_to_utf32.h
- /* begin file src/generic/utf8_to_utf32/valid_utf8_to_utf32.h */
- 
- namespace simdutf {
-@@ -24029,7 +24029,7 @@ simdutf_warn_unused size_t convert_valid(const char* input, size_t size,
- } // namespace ppc64
- } // namespace simdutf
- /* end file src/generic/utf8_to_utf32/valid_utf8_to_utf32.h */
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=generic/utf8_to_utf32/utf8_to_utf32.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=generic/utf8_to_utf32/utf8_to_utf32.h
- /* begin file src/generic/utf8_to_utf32/utf8_to_utf32.h */
- 
- 
-@@ -24330,7 +24330,7 @@ using namespace simd;
- } // namespace simdutf
- /* end file src/generic/utf8_to_utf32/utf8_to_utf32.h */
- // other functions
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=generic/utf8.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=generic/utf8.h
- /* begin file src/generic/utf8.h */
- 
- namespace simdutf {
-@@ -24377,7 +24377,7 @@ simdutf_really_inline size_t utf32_length_from_utf8(const char* in, size_t size)
- } // namespace ppc64
- } // namespace simdutf
- /* end file src/generic/utf8.h */
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=generic/utf16.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=generic/utf16.h
- /* begin file src/generic/utf16.h */
- namespace simdutf {
- namespace ppc64 {
-@@ -24676,15 +24676,15 @@ simdutf_warn_unused size_t implementation::utf32_length_from_utf8(const char * i
- } // namespace ppc64
- } // namespace simdutf
- 
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=simdutf/ppc64/end.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=simdutf/ppc64/end.h
- /* begin file src/simdutf/ppc64/end.h */
- /* end file src/simdutf/ppc64/end.h */
- /* end file src/ppc64/implementation.cpp */
- #endif
- #if SIMDUTF_IMPLEMENTATION_WESTMERE
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=westmere/implementation.cpp
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=westmere/implementation.cpp
- /* begin file src/westmere/implementation.cpp */
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=simdutf/westmere/begin.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=simdutf/westmere/begin.h
- /* begin file src/simdutf/westmere/begin.h */
- // redefining SIMDUTF_IMPLEMENTATION to "westmere"
- // #define SIMDUTF_IMPLEMENTATION westmere
-@@ -24722,7 +24722,7 @@ simdutf_really_inline simd8<bool> must_be_2_3_continuation(const simd8<uint8_t>
-   return simd8<int8_t>(is_third_byte | is_fourth_byte) > int8_t(0);
- }
- 
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=westmere/sse_detect_encodings.cpp
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=westmere/sse_detect_encodings.cpp
- /* begin file src/westmere/sse_detect_encodings.cpp */
- template<class checker>
- // len is known to be a multiple of 2 when this is called
-@@ -24932,7 +24932,7 @@ int sse_detect_encodings(const char * buf, size_t len) {
- }
- /* end file src/westmere/sse_detect_encodings.cpp */
- 
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=westmere/sse_validate_utf16.cpp
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=westmere/sse_validate_utf16.cpp
- /* begin file src/westmere/sse_validate_utf16.cpp */
- /*
-     In UTF-16 words in range 0xD800 to 0xDFFF have special meaning.
-@@ -25132,7 +25132,7 @@ const result sse_validate_utf16_with_errors(const char16_t* input, size_t size)
-     return result(error_code::SUCCESS, input - start);
- }
- /* end file src/westmere/sse_validate_utf16.cpp */
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=westmere/sse_validate_utf32le.cpp
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=westmere/sse_validate_utf32le.cpp
- /* begin file src/westmere/sse_validate_utf32le.cpp */
- /* Returns:
-    - pointer to the last unprocessed character (a scalar fallback should check the rest);
-@@ -25198,7 +25198,7 @@ const result sse_validate_utf32le_with_errors(const char32_t* input, size_t size
- }
- /* end file src/westmere/sse_validate_utf32le.cpp */
- 
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=westmere/sse_convert_utf8_to_utf16.cpp
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=westmere/sse_convert_utf8_to_utf16.cpp
- /* begin file src/westmere/sse_convert_utf8_to_utf16.cpp */
- // depends on "tables/utf8_to_utf16_tables.h"
- 
-@@ -25383,7 +25383,7 @@ size_t convert_masked_utf8_to_utf16(const char *input,
-   return consumed;
- }
- /* end file src/westmere/sse_convert_utf8_to_utf16.cpp */
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=westmere/sse_convert_utf8_to_utf32.cpp
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=westmere/sse_convert_utf8_to_utf32.cpp
- /* begin file src/westmere/sse_convert_utf8_to_utf32.cpp */
- // depends on "tables/utf8_to_utf16_tables.h"
- 
-@@ -25515,7 +25515,7 @@ size_t convert_masked_utf8_to_utf32(const char *input,
- }
- /* end file src/westmere/sse_convert_utf8_to_utf32.cpp */
- 
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=westmere/sse_convert_utf16_to_utf8.cpp
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=westmere/sse_convert_utf16_to_utf8.cpp
- /* begin file src/westmere/sse_convert_utf16_to_utf8.cpp */
- /*
-     The vectorized algorithm works on single SSE register i.e., it
-@@ -26043,7 +26043,7 @@ std::pair<result, char*> sse_convert_utf16_to_utf8_with_errors(const char16_t* b
-   return std::make_pair(result(error_code::SUCCESS, buf - start), utf8_output);
- }
- /* end file src/westmere/sse_convert_utf16_to_utf8.cpp */
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=westmere/sse_convert_utf16_to_utf32.cpp
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=westmere/sse_convert_utf16_to_utf32.cpp
- /* begin file src/westmere/sse_convert_utf16_to_utf32.cpp */
- /*
-     The vectorized algorithm works on single SSE register i.e., it
-@@ -26227,7 +26227,7 @@ std::pair<result, char32_t*> sse_convert_utf16_to_utf32_with_errors(const char16
- }
- /* end file src/westmere/sse_convert_utf16_to_utf32.cpp */
- 
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=westmere/sse_convert_utf32_to_utf8.cpp
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=westmere/sse_convert_utf32_to_utf8.cpp
- /* begin file src/westmere/sse_convert_utf32_to_utf8.cpp */
- std::pair<const char32_t*, char*> sse_convert_utf32_to_utf8(const char32_t* buf, size_t len, char* utf8_output) {
-   const char32_t* end = buf + len;
-@@ -26728,7 +26728,7 @@ std::pair<result, char*> sse_convert_utf32_to_utf8_with_errors(const char32_t* b
-   return std::make_pair(result(error_code::SUCCESS, buf - start), utf8_output);
- }
- /* end file src/westmere/sse_convert_utf32_to_utf8.cpp */
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=westmere/sse_convert_utf32_to_utf16.cpp
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=westmere/sse_convert_utf32_to_utf16.cpp
- /* begin file src/westmere/sse_convert_utf32_to_utf16.cpp */
- template <endianness big_endian>
- std::pair<const char32_t*, char16_t*> sse_convert_utf32_to_utf16(const char32_t* buf, size_t len, char16_t* utf16_output) {
-@@ -26867,7 +26867,7 @@ std::pair<result, char16_t*> sse_convert_utf32_to_utf16_with_errors(const char32
- } // namespace westmere
- } // namespace simdutf
- 
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=generic/buf_block_reader.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=generic/buf_block_reader.h
- /* begin file src/generic/buf_block_reader.h */
- namespace simdutf {
- namespace westmere {
-@@ -26962,7 +26962,7 @@ simdutf_really_inline void buf_block_reader<STEP_SIZE>::advance() {
- } // namespace westmere
- } // namespace simdutf
- /* end file src/generic/buf_block_reader.h */
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=generic/utf8_validation/utf8_lookup4_algorithm.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=generic/utf8_validation/utf8_lookup4_algorithm.h
- /* begin file src/generic/utf8_validation/utf8_lookup4_algorithm.h */
- namespace simdutf {
- namespace westmere {
-@@ -27151,7 +27151,7 @@ using utf8_validation::utf8_checker;
- } // namespace westmere
- } // namespace simdutf
- /* end file src/generic/utf8_validation/utf8_lookup4_algorithm.h */
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=generic/utf8_validation/utf8_validator.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=generic/utf8_validation/utf8_validator.h
- /* begin file src/generic/utf8_validation/utf8_validator.h */
- namespace simdutf {
- namespace westmere {
-@@ -27278,7 +27278,7 @@ result generic_validate_ascii_with_errors(const char * input, size_t length) {
- } // namespace simdutf
- /* end file src/generic/utf8_validation/utf8_validator.h */
- // transcoding from UTF-8 to UTF-16
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=generic/utf8_to_utf16/valid_utf8_to_utf16.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=generic/utf8_to_utf16/valid_utf8_to_utf16.h
- /* begin file src/generic/utf8_to_utf16/valid_utf8_to_utf16.h */
- 
- 
-@@ -27353,7 +27353,7 @@ simdutf_warn_unused size_t convert_valid(const char* input, size_t size,
- } // namespace westmere
- } // namespace simdutf
- /* end file src/generic/utf8_to_utf16/valid_utf8_to_utf16.h */
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=generic/utf8_to_utf16/utf8_to_utf16.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=generic/utf8_to_utf16/utf8_to_utf16.h
- /* begin file src/generic/utf8_to_utf16/utf8_to_utf16.h */
- 
- 
-@@ -27661,7 +27661,7 @@ using namespace simd;
- } // namespace simdutf
- /* end file src/generic/utf8_to_utf16/utf8_to_utf16.h */
- // transcoding from UTF-8 to UTF-32
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=generic/utf8_to_utf32/valid_utf8_to_utf32.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=generic/utf8_to_utf32/valid_utf8_to_utf32.h
- /* begin file src/generic/utf8_to_utf32/valid_utf8_to_utf32.h */
- 
- namespace simdutf {
-@@ -27707,7 +27707,7 @@ simdutf_warn_unused size_t convert_valid(const char* input, size_t size,
- } // namespace westmere
- } // namespace simdutf
- /* end file src/generic/utf8_to_utf32/valid_utf8_to_utf32.h */
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=generic/utf8_to_utf32/utf8_to_utf32.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=generic/utf8_to_utf32/utf8_to_utf32.h
- /* begin file src/generic/utf8_to_utf32/utf8_to_utf32.h */
- 
- 
-@@ -28008,7 +28008,7 @@ using namespace simd;
- } // namespace simdutf
- /* end file src/generic/utf8_to_utf32/utf8_to_utf32.h */
- // other functions
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=generic/utf8.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=generic/utf8.h
- /* begin file src/generic/utf8.h */
- 
- namespace simdutf {
-@@ -28055,7 +28055,7 @@ simdutf_really_inline size_t utf32_length_from_utf8(const char* in, size_t size)
- } // namespace westmere
- } // namespace simdutf
- /* end file src/generic/utf8.h */
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=generic/utf16.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=generic/utf16.h
- /* begin file src/generic/utf16.h */
- namespace simdutf {
- namespace westmere {
-@@ -28587,7 +28587,7 @@ simdutf_warn_unused size_t implementation::utf32_length_from_utf8(const char * i
- } // namespace westmere
- } // namespace simdutf
- 
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/src, filename=simdutf/westmere/end.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/src, filename=simdutf/westmere/end.h
- /* begin file src/simdutf/westmere/end.h */
- #if SIMDUTF_CAN_ALWAYS_RUN_WESTMERE
- // nothing needed.
-diff --git a/deps/simdutf/simdutf.h b/deps/simdutf/simdutf.h
-index 56ab9ecd5256..f63c163c0f2b 100644
---- a/deps/simdutf/simdutf.h
-+++ b/deps/simdutf/simdutf.h
-@@ -1,11 +1,11 @@
--/* auto-generated on 2023-05-22 21:46:48 -0400. Do not edit! */
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/include, filename=simdutf.h
-+/* auto-generated on 2023-06-05 08:58:28 -0400. Do not edit! */
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/include, filename=simdutf.h
- /* begin file include/simdutf.h */
- #ifndef SIMDUTF_H
- #define SIMDUTF_H
- #include <cstring>
- 
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/include, filename=simdutf/compiler_check.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/include, filename=simdutf/compiler_check.h
- /* begin file include/simdutf/compiler_check.h */
- #ifndef SIMDUTF_COMPILER_CHECK_H
- #define SIMDUTF_COMPILER_CHECK_H
-@@ -43,13 +43,13 @@
- 
- #endif // SIMDUTF_COMPILER_CHECK_H
- /* end file include/simdutf/compiler_check.h */
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/include, filename=simdutf/common_defs.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/include, filename=simdutf/common_defs.h
- /* begin file include/simdutf/common_defs.h */
- #ifndef SIMDUTF_COMMON_DEFS_H
- #define SIMDUTF_COMMON_DEFS_H
- 
- #include <cassert>
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/include, filename=simdutf/portability.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/include, filename=simdutf/portability.h
- /* begin file include/simdutf/portability.h */
- #ifndef SIMDUTF_PORTABILITY_H
- #define SIMDUTF_PORTABILITY_H
-@@ -280,7 +280,7 @@ use a 64-bit target such as x64, 64-bit ARM or 64-bit PPC.")
- 
- #endif // SIMDUTF_PORTABILITY_H
- /* end file include/simdutf/portability.h */
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/include, filename=simdutf/avx512.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/include, filename=simdutf/avx512.h
- /* begin file include/simdutf/avx512.h */
- #ifndef SIMDUTF_AVX512_H_
- #define SIMDUTF_AVX512_H_
-@@ -460,19 +460,21 @@ use a 64-bit target such as x64, 64-bit ARM or 64-bit PPC.")
- 
- #endif // MSC_VER
- 
--#if defined(SIMDUTF_VISUAL_STUDIO)
--    /**
--     * It does not matter here whether you are using
--     * the regular visual studio or clang under visual
--     * studio.
--     */
--    #if SIMDUTF_USING_LIBRARY
--    #define SIMDUTF_DLLIMPORTEXPORT __declspec(dllimport)
-+#ifndef SIMDUTF_DLLIMPORTEXPORT
-+    #if defined(SIMDUTF_VISUAL_STUDIO)
-+      /**
-+       * It does not matter here whether you are using
-+       * the regular visual studio or clang under visual
-+       * studio.
-+       */
-+      #if SIMDUTF_USING_LIBRARY
-+      #define SIMDUTF_DLLIMPORTEXPORT __declspec(dllimport)
-+      #else
-+      #define SIMDUTF_DLLIMPORTEXPORT __declspec(dllexport)
-+      #endif
-     #else
--    #define SIMDUTF_DLLIMPORTEXPORT __declspec(dllexport)
-+      #define SIMDUTF_DLLIMPORTEXPORT
-     #endif
--#else
--    #define SIMDUTF_DLLIMPORTEXPORT
- #endif
- 
- /// If EXPR is an error, returns it.
-@@ -481,7 +483,7 @@ use a 64-bit target such as x64, 64-bit ARM or 64-bit PPC.")
- 
- #endif // SIMDUTF_COMMON_DEFS_H
- /* end file include/simdutf/common_defs.h */
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/include, filename=simdutf/encoding_types.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/include, filename=simdutf/encoding_types.h
- /* begin file include/simdutf/encoding_types.h */
- #include <string>
- 
-@@ -529,7 +531,7 @@ size_t bom_byte_size(encoding_type bom);
- } // BOM namespace
- } // simdutf namespace
- /* end file include/simdutf/encoding_types.h */
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/include, filename=simdutf/error.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/include, filename=simdutf/error.h
- /* begin file include/simdutf/error.h */
- #ifndef ERROR_H
- #define ERROR_H
-@@ -566,7 +568,7 @@ SIMDUTF_PUSH_DISABLE_WARNINGS
- SIMDUTF_DISABLE_UNDESIRED_WARNINGS
- 
- // Public API
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/include, filename=simdutf/simdutf_version.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/include, filename=simdutf/simdutf_version.h
- /* begin file include/simdutf/simdutf_version.h */
- // /include/simdutf/simdutf_version.h automatically generated by release.py,
- // do not change by hand
-@@ -574,7 +576,7 @@ SIMDUTF_DISABLE_UNDESIRED_WARNINGS
- #define SIMDUTF_SIMDUTF_VERSION_H
- 
- /** The version of simdutf being used (major.minor.revision) */
--#define SIMDUTF_VERSION "3.2.12"
-+#define SIMDUTF_VERSION "3.2.14"
- 
- namespace simdutf {
- enum {
-@@ -589,13 +591,13 @@ enum {
-   /**
-    * The revision (major.minor.REVISION) of simdutf being used.
-    */
--  SIMDUTF_VERSION_REVISION = 12
-+  SIMDUTF_VERSION_REVISION = 14
- };
- } // namespace simdutf
- 
- #endif // SIMDUTF_SIMDUTF_VERSION_H
- /* end file include/simdutf/simdutf_version.h */
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/include, filename=simdutf/implementation.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/include, filename=simdutf/implementation.h
- /* begin file include/simdutf/implementation.h */
- #ifndef SIMDUTF_IMPLEMENTATION_H
- #define SIMDUTF_IMPLEMENTATION_H
-@@ -605,7 +607,7 @@ enum {
- #endif
- #include <vector>
- #include <tuple>
--// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/include, filename=simdutf/internal/isadetection.h
-+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/include, filename=simdutf/internal/isadetection.h
- /* begin file include/simdutf/internal/isadetection.h */
- /* From
- https://github.com/endorno/pytorch/blob/master/torch/lib/TH/generic/simd/simd.h
diff --git a/net-libs/nodejs/nodejs-18.16.1.ebuild b/net-libs/nodejs/nodejs-18.16.1.ebuild
deleted file mode 100644
index 7d3a5354397e..000000000000
--- a/net-libs/nodejs/nodejs-18.16.1.ebuild
+++ /dev/null
@@ -1,256 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CONFIG_CHECK="~ADVISE_SYSCALLS"
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit bash-completion-r1 check-reqs flag-o-matic linux-info pax-utils python-any-r1 toolchain-funcs xdg-utils
-
-DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
-HOMEPAGE="https://nodejs.org/"
-LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/nodejs/node"
-	SLOT="0"
-else
-	SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
-	SLOT="0/$(ver_cut 1)"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
-	S="${WORKDIR}/node-v${PV}"
-fi
-
-IUSE="cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax-kernel +snapshot +ssl +system-icu +system-ssl systemtap test"
-REQUIRED_USE="inspector? ( icu ssl )
-	npm? ( ssl )
-	system-icu? ( icu )
-	system-ssl? ( ssl )"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=app-arch/brotli-1.0.9:=
-	>=dev-libs/libuv-1.44.0:=
-	>=net-dns/c-ares-1.18.1:=
-	>=net-libs/nghttp2-1.41.0:=
-	sys-libs/zlib
-	system-icu? ( >=dev-libs/icu-67:= )
-	system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
-	sys-devel/gcc:*"
-BDEPEND="${PYTHON_DEPS}
-	sys-apps/coreutils
-	virtual/pkgconfig
-	systemtap? ( dev-util/systemtap )
-	test? ( net-misc/curl )
-	pax-kernel? ( sys-apps/elfix )"
-DEPEND="${RDEPEND}"
-
-# These are measured on a loong machine with -ggdb on, and only checked
-# if debugging flags are present in CFLAGS.
-#
-# The final link consumed a little more than 7GiB alone, so 8GiB is the lower
-# limit for memory usage. Disk usage was 19.1GiB for the build directory and
-# 1.2GiB for the installed image, so we leave some room for architectures with
-# fatter binaries and set the disk requirement to 22GiB.
-CHECKREQS_MEMORY="8G"
-CHECKREQS_DISK_BUILD="22G"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-fix-incomplete-type.patch
-)
-
-pkg_pretend() {
-	(use x86 && ! use cpu_flags_x86_sse2) && \
-		die "Your CPU doesn't support the required SSE2 instruction."
-
-	if [[ ${MERGE_TYPE} != "binary" ]]; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space and memory to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-	fi
-}
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	tc-export AR CC CXX PKG_CONFIG
-	export V=1
-	export BUILDTYPE=Release
-
-	# fix compilation on Darwin
-	# https://code.google.com/p/gyp/issues/detail?id=260
-	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
-
-	# less verbose install output (stating the same as portage, basically)
-	sed -i -e "/print/d" tools/install.py || die
-
-	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
-	local LIBDIR=$(get_libdir)
-	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
-	sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die
-
-	# Avoid writing a depfile, not useful
-	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
-
-	sed -i -e "/'-O3'/d" common.gypi node.gypi || die
-
-	# debug builds. change install path, remove optimisations and override buildtype
-	if use debug; then
-		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
-		BUILDTYPE=Debug
-	fi
-
-	# We need to disable mprotect on two files when it builds Bug 694100.
-	use pax-kernel && PATCHES+=( "${FILESDIR}"/${P}-paxmarking.patch )
-
-	default
-}
-
-src_configure() {
-	xdg_environment_reset
-
-	# LTO compiler flags are handled by configure.py itself
-	filter-lto
-	# nodejs unconditionally links to libatomic #869992
-	# specifically it requires __atomic_is_lock_free which
-	# is not yet implemented by sys-libs/compiler-rt (see
-	# https://reviews.llvm.org/D85044?id=287068), therefore
-	# we depend on gcc and force using libgcc as the support lib
-	tc-is-clang && append-ldflags "--rtlib=libgcc --unwindlib=libgcc"
-
-	local myconf=(
-		--shared-brotli
-		--shared-cares
-		--shared-libuv
-		--shared-nghttp2
-		--shared-zlib
-	)
-	use debug && myconf+=( --debug )
-	use lto && myconf+=( --enable-lto )
-	if use system-icu; then
-		myconf+=( --with-intl=system-icu )
-	elif use icu; then
-		myconf+=( --with-intl=full-icu )
-	else
-		myconf+=( --with-intl=none )
-	fi
-	use inspector || myconf+=( --without-inspector )
-	use npm || myconf+=( --without-npm )
-	use snapshot || myconf+=( --without-node-snapshot )
-	if use ssl; then
-		use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store )
-	else
-		myconf+=( --without-ssl )
-	fi
-
-	local myarch=""
-	case "${ARCH}:${ABI}" in
-		*:amd64) myarch="x64";;
-		*:arm) myarch="arm";;
-		*:arm64) myarch="arm64";;
-		loong:lp64*) myarch="loong64";;
-		riscv:lp64*) myarch="riscv64";;
-		*:ppc64) myarch="ppc64";;
-		*:x32) myarch="x32";;
-		*:x86) myarch="ia32";;
-		*) myarch="${ABI}";;
-	esac
-
-	GYP_DEFINES="linux_use_gold_flags=0
-		linux_use_bundled_binutils=0
-		linux_use_bundled_gold=0" \
-	"${EPYTHON}" configure.py \
-		--prefix="${EPREFIX}"/usr \
-		--dest-cpu=${myarch} \
-		$(use_with systemtap dtrace) \
-		"${myconf[@]}" || die
-}
-
-src_compile() {
-	emake -C out
-}
-
-src_install() {
-	local LIBDIR="${ED}/usr/$(get_libdir)"
-	default
-
-	pax-mark -m "${ED}"/usr/bin/node
-
-	# set up a symlink structure that node-gyp expects..
-	dodir /usr/include/node/deps/{v8,uv}
-	dosym . /usr/include/node/src
-	for var in deps/{uv,v8}/include; do
-		dosym ../.. /usr/include/node/${var}
-	done
-
-	if use doc; then
-		docinto html
-		dodoc -r "${S}"/doc/*
-	fi
-
-	if use npm; then
-		keepdir /etc/npm
-		echo "NPM_CONFIG_GLOBALCONFIG=${EPREFIX}/etc/npm/npmrc" > "${T}"/50npm
-		doenvd "${T}"/50npm
-
-		# Install bash completion for `npm`
-		local tmp_npm_completion_file="$(TMPDIR="${T}" mktemp -t npm.XXXXXXXXXX)"
-		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
-		newbashcomp "${tmp_npm_completion_file}" npm
-
-		# Move man pages
-		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
-
-		# Clean up
-		rm -f "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile}
-		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man}
-
-		local find_exp="-or -name"
-		local find_name=()
-		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
-			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
-			"*.md" "*.markdown" "*.bat" "*.cmd"; do
-			find_name+=( ${find_exp} "${match}" )
-		done
-
-		# Remove various development and/or inappropriate files and
-		# useless docs of dependend packages.
-		find "${LIBDIR}"/node_modules \
-			\( -type d -name examples \) -or \( -type f \( \
-				-iname "LICEN?E*" \
-				"${find_name[@]}" \
-			\) \) -exec rm -rf "{}" \;
-	fi
-
-	mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die
-}
-
-src_test() {
-	local drop_tests=(
-		test/parallel/test-dns-setserver-when-querying.js
-		test/parallel/test-fs-mkdir.js
-		test/parallel/test-fs-utimes-y2K38.js
-		test/parallel/test-release-npm.js
-		test/parallel/test-socket-write-after-fin-error.js
-		test/parallel/test-strace-openat-openssl.js
-		test/sequential/test-util-debug.js
-	)
-	rm "${drop_tests[@]}" || die "disabling tests failed"
-
-	out/${BUILDTYPE}/cctest || die
-	"${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} --flaky-tests=dontcare -J message parallel sequential || die
-}
-
-pkg_postinst() {
-	if use npm; then
-		ewarn "remember to run: source /etc/profile if you plan to use nodejs"
-		ewarn "	in your current shell"
-	fi
-}
diff --git a/net-libs/nodejs/nodejs-20.3.0.ebuild b/net-libs/nodejs/nodejs-20.3.0.ebuild
deleted file mode 100644
index 79527eca7d1c..000000000000
--- a/net-libs/nodejs/nodejs-20.3.0.ebuild
+++ /dev/null
@@ -1,255 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CONFIG_CHECK="~ADVISE_SYSCALLS"
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit bash-completion-r1 check-reqs flag-o-matic linux-info pax-utils python-any-r1 toolchain-funcs xdg-utils
-
-DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
-HOMEPAGE="https://nodejs.org/"
-LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/nodejs/node"
-	SLOT="0"
-else
-	SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
-	SLOT="0/$(ver_cut 1)"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
-	S="${WORKDIR}/node-v${PV}"
-fi
-
-IUSE="cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax-kernel +snapshot +ssl +system-icu +system-ssl test"
-REQUIRED_USE="inspector? ( icu ssl )
-	npm? ( ssl )
-	system-icu? ( icu )
-	system-ssl? ( ssl )
-	x86? ( cpu_flags_x86_sse2 )"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=app-arch/brotli-1.0.9:=
-	>=dev-libs/libuv-1.44.0:=
-	>=net-dns/c-ares-1.18.1:=
-	>=net-libs/nghttp2-1.41.0:=
-	sys-libs/zlib
-	system-icu? ( >=dev-libs/icu-67:= )
-	system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
-	sys-devel/gcc:*"
-BDEPEND="${PYTHON_DEPS}
-	dev-util/ninja
-	sys-apps/coreutils
-	virtual/pkgconfig
-	test? ( net-misc/curl )
-	pax-kernel? ( sys-apps/elfix )"
-DEPEND="${RDEPEND}"
-
-# These are measured on a loong machine with -ggdb on, and only checked
-# if debugging flags are present in CFLAGS.
-#
-# The final link consumed a little more than 7GiB alone, so 8GiB is the lower
-# limit for memory usage. Disk usage was 19.1GiB for the build directory and
-# 1.2GiB for the installed image, so we leave some room for architectures with
-# fatter binaries and set the disk requirement to 22GiB.
-CHECKREQS_MEMORY="8G"
-CHECKREQS_DISK_BUILD="22G"
-
-PATCHES=(
-	"${FILESDIR}"/"${P}"-gcc14.patch
-"${FILESDIR}"/"${P}"-simdutf-2.3.14.patch
-	)
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]]; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space and memory to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-	fi
-}
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	tc-export AR CC CXX PKG_CONFIG
-	export V=1
-	export BUILDTYPE=Release
-
-	# fix compilation on Darwin
-	# https://code.google.com/p/gyp/issues/detail?id=260
-	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
-
-	# less verbose install output (stating the same as portage, basically)
-	sed -i -e "/print/d" tools/install.py || die
-
-	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
-	local LIBDIR=$(get_libdir)
-	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
-	sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die
-
-	# Avoid writing a depfile, not useful
-	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
-
-	sed -i -e "/'-O3'/d" common.gypi node.gypi || die
-
-	# debug builds. change install path, remove optimisations and override buildtype
-	if use debug; then
-		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
-		BUILDTYPE=Debug
-	fi
-
-	# We need to disable mprotect on two files when it builds Bug 694100.
-	use pax-kernel && PATCHES+=( "${FILESDIR}"/${PN}-18.16.0-paxmarking.patch )
-
-	default
-}
-
-src_configure() {
-	xdg_environment_reset
-
-	# LTO compiler flags are handled by configure.py itself
-	filter-lto
-	# nodejs unconditionally links to libatomic #869992
-	# specifically it requires __atomic_is_lock_free which
-	# is not yet implemented by sys-libs/compiler-rt (see
-	# https://reviews.llvm.org/D85044?id=287068), therefore
-	# we depend on gcc and force using libgcc as the support lib
-	tc-is-clang && append-ldflags "--rtlib=libgcc --unwindlib=libgcc"
-
-	local myconf=(
-	--ninja
-		--shared-brotli
-		--shared-cares
-		--shared-libuv
-		--shared-nghttp2
-		--shared-zlib
-	)
-	use debug && myconf+=( --debug )
-	use lto && myconf+=( --enable-lto )
-	if use system-icu; then
-		myconf+=( --with-intl=system-icu )
-	elif use icu; then
-		myconf+=( --with-intl=full-icu )
-	else
-		myconf+=( --with-intl=none )
-	fi
-	use inspector || myconf+=( --without-inspector )
-	use npm || myconf+=( --without-npm )
-	use snapshot || myconf+=( --without-node-snapshot )
-	if use ssl; then
-		use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store )
-	else
-		myconf+=( --without-ssl )
-	fi
-
-	local myarch=""
-	case "${ARCH}:${ABI}" in
-		*:amd64) myarch="x64";;
-		*:arm) myarch="arm";;
-		*:arm64) myarch="arm64";;
-		loong:lp64*) myarch="loong64";;
-		riscv:lp64*) myarch="riscv64";;
-		*:ppc64) myarch="ppc64";;
-		*:x32) myarch="x32";;
-		*:x86) myarch="ia32";;
-		*) myarch="${ABI}";;
-	esac
-
-	GYP_DEFINES="linux_use_gold_flags=0
-		linux_use_bundled_binutils=0
-		linux_use_bundled_gold=0" \
-	"${EPYTHON}" configure.py \
-		--prefix="${EPREFIX}"/usr \
-		--dest-cpu=${myarch} \
-		"${myconf[@]}" || die
-}
-
-src_compile() {
-	emake
-}
-
-src_install() {
-	local LIBDIR="${ED}/usr/$(get_libdir)"
-	default
-
-	pax-mark -m "${ED}"/usr/bin/node
-
-	# set up a symlink structure that node-gyp expects..
-	dodir /usr/include/node/deps/{v8,uv}
-	dosym . /usr/include/node/src
-	for var in deps/{uv,v8}/include; do
-		dosym ../.. /usr/include/node/${var}
-	done
-
-	if use doc; then
-		docinto html
-		dodoc -r "${S}"/doc/*
-	fi
-
-	if use npm; then
-		keepdir /etc/npm
-		echo "NPM_CONFIG_GLOBALCONFIG=${EPREFIX}/etc/npm/npmrc" > "${T}"/50npm
-		doenvd "${T}"/50npm
-
-		# Install bash completion for `npm`
-		local tmp_npm_completion_file="$(TMPDIR="${T}" mktemp -t npm.XXXXXXXXXX)"
-		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
-		newbashcomp "${tmp_npm_completion_file}" npm
-
-		# Move man pages
-		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
-
-		# Clean up
-		rm -f "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile}
-		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man}
-
-		local find_exp="-or -name"
-		local find_name=()
-		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
-			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
-			"*.md" "*.markdown" "*.bat" "*.cmd"; do
-			find_name+=( ${find_exp} "${match}" )
-		done
-
-		# Remove various development and/or inappropriate files and
-		# useless docs of dependend packages.
-		find "${LIBDIR}"/node_modules \
-			\( -type d -name examples \) -or \( -type f \( \
-				-iname "LICEN?E*" \
-				"${find_name[@]}" \
-			\) \) -exec rm -rf "{}" \;
-	fi
-
-	mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die
-}
-
-src_test() {
-	local drop_tests=(
-		test/parallel/test-dns-setserver-when-querying.js
-		test/parallel/test-fs-mkdir.js
-		test/parallel/test-fs-utimes-y2K38.js
-		test/parallel/test-release-npm.js
-		test/parallel/test-socket-write-after-fin-error.js
-		test/parallel/test-strace-openat-openssl.js
-		test/sequential/test-util-debug.js
-	)
-	rm "${drop_tests[@]}" || die "disabling tests failed"
-
-	out/${BUILDTYPE}/cctest || die
-	"${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} --flaky-tests=dontcare -J message parallel sequential || die
-}
-
-pkg_postinst() {
-	if use npm; then
-		ewarn "remember to run: source /etc/profile if you plan to use nodejs"
-		ewarn "	in your current shell"
-	fi
-}
diff --git a/net-libs/nodejs/nodejs-20.3.1.ebuild b/net-libs/nodejs/nodejs-20.3.1.ebuild
deleted file mode 100644
index a04ed3137482..000000000000
--- a/net-libs/nodejs/nodejs-20.3.1.ebuild
+++ /dev/null
@@ -1,255 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CONFIG_CHECK="~ADVISE_SYSCALLS"
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit bash-completion-r1 check-reqs flag-o-matic linux-info pax-utils python-any-r1 toolchain-funcs xdg-utils
-
-DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
-HOMEPAGE="https://nodejs.org/"
-LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/nodejs/node"
-	SLOT="0"
-else
-	SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
-	SLOT="0/$(ver_cut 1)"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
-	S="${WORKDIR}/node-v${PV}"
-fi
-
-IUSE="cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax-kernel +snapshot +ssl +system-icu +system-ssl test"
-REQUIRED_USE="inspector? ( icu ssl )
-	npm? ( ssl )
-	system-icu? ( icu )
-	system-ssl? ( ssl )
-	x86? ( cpu_flags_x86_sse2 )"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=app-arch/brotli-1.0.9:=
-	>=dev-libs/libuv-1.44.0:=
-	>=net-dns/c-ares-1.18.1:=
-	>=net-libs/nghttp2-1.41.0:=
-	sys-libs/zlib
-	system-icu? ( >=dev-libs/icu-67:= )
-	system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
-	sys-devel/gcc:*"
-BDEPEND="${PYTHON_DEPS}
-	dev-util/ninja
-	sys-apps/coreutils
-	virtual/pkgconfig
-	test? ( net-misc/curl )
-	pax-kernel? ( sys-apps/elfix )"
-DEPEND="${RDEPEND}"
-
-# These are measured on a loong machine with -ggdb on, and only checked
-# if debugging flags are present in CFLAGS.
-#
-# The final link consumed a little more than 7GiB alone, so 8GiB is the lower
-# limit for memory usage. Disk usage was 19.1GiB for the build directory and
-# 1.2GiB for the installed image, so we leave some room for architectures with
-# fatter binaries and set the disk requirement to 22GiB.
-CHECKREQS_MEMORY="8G"
-CHECKREQS_DISK_BUILD="22G"
-
-PATCHES=(
-	"${FILESDIR}"/"${PN}"-20.3.0-gcc14.patch
-	"${FILESDIR}"/"${PN}"-20.3.0-simdutf-2.3.14.patch
-	)
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]]; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space and memory to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-	fi
-}
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	tc-export AR CC CXX PKG_CONFIG
-	export V=1
-	export BUILDTYPE=Release
-
-	# fix compilation on Darwin
-	# https://code.google.com/p/gyp/issues/detail?id=260
-	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
-
-	# less verbose install output (stating the same as portage, basically)
-	sed -i -e "/print/d" tools/install.py || die
-
-	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
-	local LIBDIR=$(get_libdir)
-	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
-	sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die
-
-	# Avoid writing a depfile, not useful
-	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
-
-	sed -i -e "/'-O3'/d" common.gypi node.gypi || die
-
-	# debug builds. change install path, remove optimisations and override buildtype
-	if use debug; then
-		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
-		BUILDTYPE=Debug
-	fi
-
-	# We need to disable mprotect on two files when it builds Bug 694100.
-	use pax-kernel && PATCHES+=( "${FILESDIR}"/${PN}-18.16.0-paxmarking.patch )
-
-	default
-}
-
-src_configure() {
-	xdg_environment_reset
-
-	# LTO compiler flags are handled by configure.py itself
-	filter-lto
-	# nodejs unconditionally links to libatomic #869992
-	# specifically it requires __atomic_is_lock_free which
-	# is not yet implemented by sys-libs/compiler-rt (see
-	# https://reviews.llvm.org/D85044?id=287068), therefore
-	# we depend on gcc and force using libgcc as the support lib
-	tc-is-clang && append-ldflags "--rtlib=libgcc --unwindlib=libgcc"
-
-	local myconf=(
-	--ninja
-		--shared-brotli
-		--shared-cares
-		--shared-libuv
-		--shared-nghttp2
-		--shared-zlib
-	)
-	use debug && myconf+=( --debug )
-	use lto && myconf+=( --enable-lto )
-	if use system-icu; then
-		myconf+=( --with-intl=system-icu )
-	elif use icu; then
-		myconf+=( --with-intl=full-icu )
-	else
-		myconf+=( --with-intl=none )
-	fi
-	use inspector || myconf+=( --without-inspector )
-	use npm || myconf+=( --without-npm )
-	use snapshot || myconf+=( --without-node-snapshot )
-	if use ssl; then
-		use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store )
-	else
-		myconf+=( --without-ssl )
-	fi
-
-	local myarch=""
-	case "${ARCH}:${ABI}" in
-		*:amd64) myarch="x64";;
-		*:arm) myarch="arm";;
-		*:arm64) myarch="arm64";;
-		loong:lp64*) myarch="loong64";;
-		riscv:lp64*) myarch="riscv64";;
-		*:ppc64) myarch="ppc64";;
-		*:x32) myarch="x32";;
-		*:x86) myarch="ia32";;
-		*) myarch="${ABI}";;
-	esac
-
-	GYP_DEFINES="linux_use_gold_flags=0
-		linux_use_bundled_binutils=0
-		linux_use_bundled_gold=0" \
-	"${EPYTHON}" configure.py \
-		--prefix="${EPREFIX}"/usr \
-		--dest-cpu=${myarch} \
-		"${myconf[@]}" || die
-}
-
-src_compile() {
-	emake
-}
-
-src_install() {
-	local LIBDIR="${ED}/usr/$(get_libdir)"
-	default
-
-	pax-mark -m "${ED}"/usr/bin/node
-
-	# set up a symlink structure that node-gyp expects..
-	dodir /usr/include/node/deps/{v8,uv}
-	dosym . /usr/include/node/src
-	for var in deps/{uv,v8}/include; do
-		dosym ../.. /usr/include/node/${var}
-	done
-
-	if use doc; then
-		docinto html
-		dodoc -r "${S}"/doc/*
-	fi
-
-	if use npm; then
-		keepdir /etc/npm
-		echo "NPM_CONFIG_GLOBALCONFIG=${EPREFIX}/etc/npm/npmrc" > "${T}"/50npm
-		doenvd "${T}"/50npm
-
-		# Install bash completion for `npm`
-		local tmp_npm_completion_file="$(TMPDIR="${T}" mktemp -t npm.XXXXXXXXXX)"
-		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
-		newbashcomp "${tmp_npm_completion_file}" npm
-
-		# Move man pages
-		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
-
-		# Clean up
-		rm -f "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile}
-		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man}
-
-		local find_exp="-or -name"
-		local find_name=()
-		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
-			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
-			"*.md" "*.markdown" "*.bat" "*.cmd"; do
-			find_name+=( ${find_exp} "${match}" )
-		done
-
-		# Remove various development and/or inappropriate files and
-		# useless docs of dependend packages.
-		find "${LIBDIR}"/node_modules \
-			\( -type d -name examples \) -or \( -type f \( \
-				-iname "LICEN?E*" \
-				"${find_name[@]}" \
-			\) \) -exec rm -rf "{}" \;
-	fi
-
-	mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die
-}
-
-src_test() {
-	local drop_tests=(
-		test/parallel/test-dns-setserver-when-querying.js
-		test/parallel/test-fs-mkdir.js
-		test/parallel/test-fs-utimes-y2K38.js
-		test/parallel/test-release-npm.js
-		test/parallel/test-socket-write-after-fin-error.js
-		test/parallel/test-strace-openat-openssl.js
-		test/sequential/test-util-debug.js
-	)
-	rm "${drop_tests[@]}" || die "disabling tests failed"
-
-	out/${BUILDTYPE}/cctest || die
-	"${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} --flaky-tests=dontcare -J message parallel sequential || die
-}
-
-pkg_postinst() {
-	if use npm; then
-		ewarn "remember to run: source /etc/profile if you plan to use nodejs"
-		ewarn "	in your current shell"
-	fi
-}
diff --git a/net-libs/nodejs/nodejs-20.5.0.ebuild b/net-libs/nodejs/nodejs-20.5.0.ebuild
index 16a9fd20c640..9dbd8b3044cf 100644
--- a/net-libs/nodejs/nodejs-20.5.0.ebuild
+++ b/net-libs/nodejs/nodejs-20.5.0.ebuild
@@ -229,7 +229,7 @@ src_install() {
 				"${find_name[@]}" \
 			\) \) -exec rm -rf "{}" \;
 	fi
- 
+
 	use corepack &&
 		"${D}"/usr/bin/corepack enable --install-directory "${D}"/usr/bin
 
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index dddba08368e0..744aff13209a 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,3 +1,4 @@
+AUX 2.40.5-Fix-build-failure-when-gstreamer-support-is-disabled.patch 1059 BLAKE2B de9edffeb14808fc7b04339af660343e8faeb599254157cd31cca0ef7b012526c9d27e44fbb8c27881c3836d80b65493081fd314e891cd29af147242b4a863b2 SHA512 b7ece6ebd90cf6c04e26cae1a809d7ec3925405a17b709809648b216426d19bbacdd6810390927622f965c334a220c4614a98fe38514246cf445a415859bd2bd
 DIST webkitgtk-2.40.3.tar.xz 40064488 BLAKE2B b88b3d9bb6729de8a1b667575acbc9e42c39a222c191ef666f1a58fc593047de1530c597fc2cbc657da845f6262bd4014995fea0cd9776ef60b931769a89594d SHA512 2b10d36427c6cf44c66bb9ddb166363dfc34e23c9b6095eb457d61514298103487a7e80096ead9e653da1b4c0db42613c3a83aa28b19298ec62f50da289eb42e
 DIST webkitgtk-2.40.4.tar.xz 40065340 BLAKE2B a6bab5ede61d85d93c61f70222156123ebbe8d352d00004e9aa317c3902745530676f40c9caef93485d2e0c227882554623dd4bee6343360bb914c4ccaefb8ad SHA512 3b9118f81d463d4d19d217abd0c4e109a159785bc5effe93188f62bca71f2d3124b232c969710ed958c58519b62cf2753bbdfbd2396e6200cc623a3343cdfc44
 DIST webkitgtk-2.40.5.tar.xz 40066432 BLAKE2B 67b8f429af8b746a256ca36c335c33ab4fef92a4699b09b87c38e81d56e0da7b5fb20d9e0dbbc32016025e60ca2c6e44d9032c300bfbdc931f4097d5608bb62f SHA512 a8c9f04e971e0464ea39a5d1dacb6251a08c5a851def21bfeb990beebb82d1a2a97e7cfc65ae3ed1f6fe76ac6f6463b1f64a6a2a341d266c381710dd84c4082a
@@ -7,7 +8,7 @@ EBUILD webkit-gtk-2.40.3.ebuild 7599 BLAKE2B 635def522e5cfc7126b0fb1962d3097ee1d
 EBUILD webkit-gtk-2.40.4-r410.ebuild 7875 BLAKE2B aa9ed3ce3537d60f701ab2ede0f4e64a610fbc8bb2a86b491d72542bb99cc67d3f7b9ae01bb2c56ae37cf80ee19eb22a4735a2d54734367e472599792b5212f5 SHA512 dd45395abac1b4842a82ee8a4272f2eb20ee9e885d8a7bcf87aada162f0ce02493a1da62b9cde7be4f0a829b8082ed6ff69f2fab123f8b023fa57b4978161ffe
 EBUILD webkit-gtk-2.40.4-r600.ebuild 7748 BLAKE2B 11ac66a2b5ba1446b860529f466ca682c8877cfd80aa883bbbb3390cbd603014b204412cfe6a1d80e6c5fe28b56c53904866e16a58fd87027e66b2208b959260 SHA512 5629d7021d56a1c3a387687acbfe322b8761184e01186e4000e65ce063957db4e5dc7194fd8e510056c210eeec232d03ff76d7586a990473f9c93a1554edc620
 EBUILD webkit-gtk-2.40.4.ebuild 7601 BLAKE2B 2984369cfae09a7d10f8c0d237089ad8d08b6377f4311e56741462f9aa6dc0c86360955c428964ec8041a01dbf44d3fefb2e7a260a85422ec6c9784be997cc30 SHA512 d9c5e2682a43893339bbc5763ff20017f1e0fe0358be833d08c9009979a16beb085a9c70971a94d49542898b7fb8fadb396fc8fee1728864bc2b37e7f20cd239
-EBUILD webkit-gtk-2.40.5-r410.ebuild 7880 BLAKE2B c41526d723fc5a0804120a88b2075efd717f3d5cf49e1cfe884e119b111679f2f084c9b60f596334df2f6e6d85afc009736a9d15a24a38271ef9e356e2014681 SHA512 73e84efca6750422835d4ca20b072ad0462b3402a53a94bb1ed43d117fb2ed8d3951e5e98f5d121ba520f4a3475c5f015e895abc1c64837a19d86f032eff69af
-EBUILD webkit-gtk-2.40.5-r600.ebuild 7753 BLAKE2B 626ac6c35aa06a49a5441a86afa42ffeb853ae7931aaa906000a37576495e5dd1bda4aea6b075cbe378f0e4b3d2b430a1abca471a89d1a484fbdf58f8aabf724 SHA512 6dec4465f21b97d950d000f8f171f5f352ef9cfa28e478ef995a943e7eb2ee78418824ec756c18164c9c3ef7cfe5319ae44388af4c5196074f2276abdbebf6be
-EBUILD webkit-gtk-2.40.5.ebuild 7606 BLAKE2B edbe7e9828a0680dbe59918b469179675b4e15c9a010996ee5e2200b284ebf1e5512c4fe2a45258f7ce327acf3e84febf4cd3795890615fdd9a51e81f91870c2 SHA512 df388ae055f88c453f2d117502c100a8158a4ca12f80c3e215e86b0f0673a33f71e73477f9b58435970adb63a04ea74caafec1b5f36c78e1506a6edcbdc71e87
+EBUILD webkit-gtk-2.40.5-r410.ebuild 8105 BLAKE2B 695cf350254a23081cdf1450cc0977bbb4ed8837b879aeede7a17b1079d384dddb9b353efad4f47974efffac45926c1d7f58ed8b3e7a00081e082a87a72c2393 SHA512 68c85e551d14ddb7f09c2fa843d279dce0d28ab839581ce1fa4d4d956018990c9fbe8a3ac70e8d8890d33aeec6fb69a6c0484a0b1cff5c7191ce626398b0f9e1
+EBUILD webkit-gtk-2.40.5-r600.ebuild 7978 BLAKE2B fd91e102e4e493f6682146a9dd9cb8b8aa584a1d2df155b00f93e0ccc8a8bcd7b519d6842c61b78aae5f20118d8838bd7fd5fca9dfbdf153c29528d6274b9b5e SHA512 3419aec4fb03acc2aec5d17a46bbd3bab5b8d6b7dee89fcf6b140d1fd8a4dd08b661fac4363d2e75e15a9d575a67588f883f190ae763753622afe4e7e5fb6cfc
+EBUILD webkit-gtk-2.40.5.ebuild 7831 BLAKE2B 876ade75ad21dd453c262dc205a74b31f56b0384ada162dae34d9d89759c2017d86b61c80f1e68061effb7f7cf41a4c2456e493617b1af06bacd169fca9884b5 SHA512 aba80603848c57812ee10d2070b1c148a6f26602f7dfd057c7161cb67080c0b2813414aa0f69ff64987f5bdeda74122b683ad2a122e6976f4c3347210e052394
 MISC metadata.xml 709 BLAKE2B 270bd59a793199307b37c8899bdec1438c4576a6221926af6a81ae612e31269ba128b571e184ccf245cb6e82d73b2365adfa33a31cb79857dc2d0502b8fd1614 SHA512 37fa190e40b0b3fc2838ac39f7ee5915547b412692894ffdb72cc91e69236accdb3570f8d20b057fbd4db9d0b4e8d1cee638bce0720ceadd95cfec1ef8b53581
diff --git a/net-libs/webkit-gtk/files/2.40.5-Fix-build-failure-when-gstreamer-support-is-disabled.patch b/net-libs/webkit-gtk/files/2.40.5-Fix-build-failure-when-gstreamer-support-is-disabled.patch
new file mode 100644
index 000000000000..f59f3ee09780
--- /dev/null
+++ b/net-libs/webkit-gtk/files/2.40.5-Fix-build-failure-when-gstreamer-support-is-disabled.patch
@@ -0,0 +1,33 @@
+https://github.com/WebKit/WebKit/pull/16398
+
+From f5ceef5bf2e3c4d7203a37b9e2d2fdd9b1bb2732 Mon Sep 17 00:00:00 2001
+From: Matt Turner <mattst88@gmail.com>
+Date: Tue, 8 Aug 2023 16:51:25 -0700
+Subject: [PATCH] Fix build failure when gstreamer support is disabled
+ https://bugs.webkit.org/show_bug.cgi?id=259931 https://bugs.gentoo.org/911663
+
+Reviewed by Carlos Alberto Lopez Perez.
+
+* Source/WebCore/loader/MixedContentChecker.cpp:
+
+Canonical link: https://commits.webkit.org/260527.429@fix-build
+---
+ Source/WebCore/loader/MixedContentChecker.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/Source/WebCore/loader/MixedContentChecker.cpp b/Source/WebCore/loader/MixedContentChecker.cpp
+index 9b4c7fe62020..ac4733bc08bc 100644
+--- a/Source/WebCore/loader/MixedContentChecker.cpp
++++ b/Source/WebCore/loader/MixedContentChecker.cpp
+@@ -33,6 +33,8 @@
+ #include "ContentSecurityPolicy.h"
+ #include "Document.h"
+ #include "Frame.h"
++#include "FrameLoader.h"
++#include "FrameLoaderClient.h"
+ #include "SecurityOrigin.h"
+ 
+ namespace WebCore {
+-- 
+2.41.0
+
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.5-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.5-r410.ebuild
index 46521ce3874e..0a80902a1200 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.5-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.5-r410.ebuild
@@ -122,6 +122,10 @@ S="${WORKDIR}/${MY_P}"
 
 CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
 
+# We cannot use PATCHES because src_prepare() calls cmake_src_prepare and
+# gnome2_src_prepare, and both apply ${PATCHES[@]}
+PATCHES=()
+
 pkg_pretend() {
 	if [[ ${MERGE_TYPE} != "binary" ]] ; then
 		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
@@ -146,6 +150,8 @@ pkg_setup() {
 src_prepare() {
 	cmake_src_prepare
 	gnome2_src_prepare
+
+	eapply "${FILESDIR}/${PV}-Fix-build-failure-when-gstreamer-support-is-disabled.patch"
 }
 
 src_configure() {
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.5-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.5-r600.ebuild
index 4e2e199e53c8..eebf464f2fd0 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.5-r600.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.5-r600.ebuild
@@ -123,6 +123,10 @@ S="${WORKDIR}/${MY_P}"
 
 CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
 
+# We cannot use PATCHES because src_prepare() calls cmake_src_prepare and
+# gnome2_src_prepare, and both apply ${PATCHES[@]}
+PATCHES=()
+
 pkg_pretend() {
 	if [[ ${MERGE_TYPE} != "binary" ]] ; then
 		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
@@ -147,6 +151,8 @@ pkg_setup() {
 src_prepare() {
 	cmake_src_prepare
 	gnome2_src_prepare
+
+	eapply "${FILESDIR}/${PV}-Fix-build-failure-when-gstreamer-support-is-disabled.patch"
 }
 
 src_configure() {
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.5.ebuild
index 0af88789a7fa..460653b5eb96 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.5.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.5.ebuild
@@ -120,6 +120,10 @@ S="${WORKDIR}/${MY_P}"
 
 CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
 
+# We cannot use PATCHES because src_prepare() calls cmake_src_prepare and
+# gnome2_src_prepare, and both apply ${PATCHES[@]}
+PATCHES=()
+
 pkg_pretend() {
 	if [[ ${MERGE_TYPE} != "binary" ]] ; then
 		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
@@ -144,6 +148,8 @@ pkg_setup() {
 src_prepare() {
 	cmake_src_prepare
 	gnome2_src_prepare
+
+	eapply "${FILESDIR}/${PV}-Fix-build-failure-when-gstreamer-support-is-disabled.patch"
 }
 
 src_configure() {