gentoo auto-resync : 18:07:2023 - 00:58:24

author: V3n3RiX <venerix@koprulu.sector> 2023-07-18 00:58:25 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2023-07-18 00:58:25 +0100
commit: 5e0a5ca921524f8859808527a57655eec16efa52 (patch)
tree: 7c58411b1e81478df4e20082a6adec2553c24c5c /net-libs
parent: 4c16e0a214824f15f09396e359db4f1f5c086fec (diff)
29 files changed, 141 insertions, 1678 deletions
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index e71ae9813b6a..a0346aef9b4c 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/dleyna-connector-dbus/Manifest b/net-libs/dleyna-connector-dbus/Manifest
index fbbb7115e0e8..38e6ac6c514d 100644
--- a/net-libs/dleyna-connector-dbus/Manifest
+++ b/net-libs/dleyna-connector-dbus/Manifest
@@ -1,3 +1,4 @@
+AUX meson-1.2.0.patch 255 BLAKE2B b91a499edc578c42d0840f58f914af2163d6029518cf74065cf17e42a19dc5a87dba64062bc59d764215a1468a4f17c249c8884fcc3a1f2f8f945ca6a7692c37 SHA512 c40e81e3758790484b63eaf6511b9e02dda98898f1bfa5ee304d25ef90c826198347f15e94515dd7a7ebcf8310897e0883a84019b741dc7bfc263b660e25f139
 DIST dleyna-connector-dbus-0.4.1.tar.gz 15081 BLAKE2B aaff6588da05920b108da5c89c457bc1eeb9d7330ae1c06bc3f95f4d4467c93a6524602cedc455f3db324f0a1fca121d52fdbae135eb57d4fe6face9f86ac680 SHA512 43d9f13304c19bd2fc975283ebc68359d5a7bf174221a8877e31994e393b9c1421440acbbd1b2e9945953c1248e596168aac74b50922080ee6db1b02dac03315
-EBUILD dleyna-connector-dbus-0.4.1.ebuild 543 BLAKE2B 5ef64cf0c83e989e9c2bf3ade98445568da30acfdb44d9b46e7a7d589550f0ffd181cf1ecdfbe649418637631d82438a770218c18f73102f64fcd809a1d778a4 SHA512 d17af0735d4f1b0590e637c4a9e6c411d3b86cebf4be631f46622a05cb6b22a2be00b07117469f1256b0884cf99a85ad0cc43a9486475b8d438889142baeea13
-MISC metadata.xml 356 BLAKE2B 1a274036e3e937e13be72acccb5130f65fe925483b32164d890161594075f51d2cde187e40717fa093e2854aa23ad882c268cf6de43a5cfbda80f331be4d1e77 SHA512 1ee3b7354c653298410d3a340f2e515850835f411fd7080f3f3184c58f6b4c18631c7ecd771e7d60262ba461367609ac38947752cc56356b0071196189089656
+EBUILD dleyna-connector-dbus-0.4.1.ebuild 627 BLAKE2B ea1affd7b149d9cab781edfcb6484b22dbb15393a27e5d1b10d94ec2f0e78a97df9019b118f711a043221ac3a541de22149503bb943980281161d4f8cc92df53 SHA512 e29fba48a47e8881e3edc6de27623ef4f2fc13a955ce457befc827a4078baabfcc713831aabd6e095fb56b773e02e95981f7748d16ca7e5389bc330c567b1039
+MISC metadata.xml 416 BLAKE2B 1058c38770186fcfd5fb8472dc9da1b08e8a327e0bba1842ad0ca4334aabfd699c0d6dc4e57b8cbff24afcdc407c6de903755e74c65088ac1e0f1d3cd578608e SHA512 8023c98a901fdcca84056a2d77b3cfde54bcb87f07c0ea8ed9c81847a290bacc87c3b083ba99cfb964af9053e6a0c0fb69270eaa56d2fe6665da9fc461c56b3c
diff --git a/net-libs/dleyna-connector-dbus/dleyna-connector-dbus-0.4.1.ebuild b/net-libs/dleyna-connector-dbus/dleyna-connector-dbus-0.4.1.ebuild
index 4b30995f9e4a..4b046274dcf2 100644
--- a/net-libs/dleyna-connector-dbus/dleyna-connector-dbus-0.4.1.ebuild
+++ b/net-libs/dleyna-connector-dbus/dleyna-connector-dbus-0.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,7 +6,7 @@ EAPI=7
 inherit meson
 
 DESCRIPTION="utility library for higher level dLeyna libraries"
-HOMEPAGE="https://github.com/phako/dleyna-connector-dbus"
+HOMEPAGE="https://gitlab.gnome.org/World/dLeyna https://github.com/phako/dleyna-connector-dbus"
 SRC_URI="https://github.com/phako/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
@@ -21,3 +21,7 @@ RDEPEND="${DEPEND}
 	>=sys-apps/dbus-1
 "
 BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/meson-1.2.0.patch
+)
diff --git a/net-libs/dleyna-connector-dbus/files/meson-1.2.0.patch b/net-libs/dleyna-connector-dbus/files/meson-1.2.0.patch
new file mode 100644
index 000000000000..7f43851e447c
--- /dev/null
+++ b/net-libs/dleyna-connector-dbus/files/meson-1.2.0.patch
@@ -0,0 +1,10 @@
+--- a/subprojects/dleyna-core-1.0.wrap
++++ b/subprojects/dleyna-core-1.0.wrap
+@@ -2,5 +2,5 @@
+ url = https://github.com/phako/dleyna-core.git
+ revision = head
+ 
+-[provides]
+-dependency_name = dleyna-core-1.0
++[provide]
++dependency_names = dleyna-core-1.0
diff --git a/net-libs/dleyna-connector-dbus/metadata.xml b/net-libs/dleyna-connector-dbus/metadata.xml
index 8269f9c91880..dc68fe46c89e 100644
--- a/net-libs/dleyna-connector-dbus/metadata.xml
+++ b/net-libs/dleyna-connector-dbus/metadata.xml
@@ -6,6 +6,7 @@
     <name>Gentoo GNOME Desktop</name>
   </maintainer>
   <upstream>
+    <remote-id type="gnome-gitlab">World/dLeyna</remote-id>
     <remote-id type="github">phako/dleyna-connector-dbus</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/net-libs/dleyna-core/Manifest b/net-libs/dleyna-core/Manifest
index b243957d9ae2..43b0a583f4eb 100644
--- a/net-libs/dleyna-core/Manifest
+++ b/net-libs/dleyna-core/Manifest
@@ -1,3 +1,3 @@
 DIST dleyna-core-0.7.0.tar.gz 28354 BLAKE2B cfc21da2be908701ffe87f653ddbb3e8241f3842031987de9a0615ccc5dcd4f2180aaf9caaf981c6421d9cbfdc4cecb359998988f13f48ac5a5696bf56d7ae79 SHA512 02509d2fc386bc1d7f9295df7a12315a664a9dc4cced871da193dc79e15c3291ad4497cd18c655a7eb3e4d865a6448526c6abc1df2dc086cb7fc94f44c09b7f0
-EBUILD dleyna-core-0.7.0.ebuild 545 BLAKE2B 7c9b6c9a8e7a9ee7a0fa94891b0d5e2674d77af41116b98acc290cf2415f2aa10d3e60635fd1ac0c988d5f52b5fbb0ba2f86759a00506137febca63dcada16c0 SHA512 9cbbe6c201109924be87764b957a7974274ebe4b1d36b2bc0f0dd0114401636405797cd816e2f426ba3b6c9313ad7103e8888e391bc6810099e39a8bb7e7b840
-MISC metadata.xml 346 BLAKE2B 7510f36f29ec04595b0bf96d0e2bb774abd8841f347c7f78bdb5084286c0f037865b8b4798c6d4da06129024b70318aab601475c93be2c4a8bec80634a60dab3 SHA512 21c349ffc5a3e949a685fd63285726778184f682687a586e9d207e86870e2a7a8f34b3a2444dccf8778eedaf97566f2c92bcde9f6e29c25b12e300e9145ef901
+EBUILD dleyna-core-0.7.0.ebuild 583 BLAKE2B 258219c0653145f8de9078843c0fe7ed4ef92384e5eebeea1644ea0dfe6368a12f340cf46c077d8634985d2b9c936d6dbe08f1945773a6adfe3de659fd74e7b1 SHA512 c6f83444b77b6b25e78fb2f267ad6ebf98c2b84601b9b00eae15382e732c68088d073eea4cfc6491977408140fe4d09e2933b489bcf874a668d4a4f89f2e914d
+MISC metadata.xml 406 BLAKE2B fd672477fd9bd4960d15eb8863228c84eab6b01d1c8fec9d161583fbc67e25ceb638f136e510babd6103ca2485c9797c21b34cb8c24d72f9ce36fc516a188699 SHA512 1a150edea3fcec323b59f15008c4b3d21fbed91e3bdef819170a240bcffadf868e0c57310ff98eb84edf23ae18fc77ccb68fd43f6b770a4fccb9e87bb6beb6c7
diff --git a/net-libs/dleyna-core/dleyna-core-0.7.0.ebuild b/net-libs/dleyna-core/dleyna-core-0.7.0.ebuild
index 80fdf7522e8e..b4e26168cbb2 100644
--- a/net-libs/dleyna-core/dleyna-core-0.7.0.ebuild
+++ b/net-libs/dleyna-core/dleyna-core-0.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,7 +6,7 @@ EAPI=7
 inherit meson
 
 DESCRIPTION="utility library for higher level dLeyna libraries"
-HOMEPAGE="https://github.com/phako/dleyna-core"
+HOMEPAGE="https://gitlab.gnome.org/World/dLeyna https://github.com/phako/dleyna-core"
 SRC_URI="https://github.com/phako/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
diff --git a/net-libs/dleyna-core/metadata.xml b/net-libs/dleyna-core/metadata.xml
index 8fd8d958fd0a..4a687f5fec55 100644
--- a/net-libs/dleyna-core/metadata.xml
+++ b/net-libs/dleyna-core/metadata.xml
@@ -6,6 +6,7 @@
     <name>Gentoo GNOME Desktop</name>
   </maintainer>
   <upstream>
+    <remote-id type="gnome-gitlab">World/dLeyna</remote-id>
     <remote-id type="github">phako/dleyna-core</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/net-libs/dleyna-renderer/Manifest b/net-libs/dleyna-renderer/Manifest
index c7622980076c..eacf50571436 100644
--- a/net-libs/dleyna-renderer/Manifest
+++ b/net-libs/dleyna-renderer/Manifest
@@ -1,3 +1,4 @@
+AUX meson-1.2.0.patch 366 BLAKE2B ec5e0367ea6be6733268c57e0c7beb95018fda510704bf17dfa5c07a94c62d4f344f1c95fc8ab715108ae40e0111ecde0ae2a8f85aac8036404c4496b42885e7 SHA512 83c34b0ffa60a2d0333099a6984afd2c03178367cbc13d46ef6f3372ce7442d384c100c45a1bb407a804bbe3dd55dee33de51a70b81cececa6ca2356945b1e0e
 DIST dleyna-renderer-0.7.2.tar.gz 66365 BLAKE2B 6e033f4d93f14e855aeeabfa1d31fdf4db499b1a2773c55c2631cef1c5bad850e162926554203585e490ac24d9e23eb33028052b26dc4585540eff1ee93d334c SHA512 a36ee90c30c8dece0e7c65855d6b01f92840bd26380e3553a4b0df910b3f593eb9b4cb932ad084b30c36396e819cd6841c080fe49d7032052d3ce40498e978cb
-EBUILD dleyna-renderer-0.7.2.ebuild 708 BLAKE2B a067cf67e6680acd8e4a3a3155cbfd48f96855b7f514e7f8bef1057f18dbc343adbf95c14d4cc20dc41da51ee8444a38bb526c570d03ec8cc7205bae621d3040 SHA512 dcb79b1b93df868f36b6f4c845dd60fafad3e50a93f70e9f48c27b3e15e63fd4a6a48dd1097ff77c893e30a7a909bf05d8b8a0dd69331cd0bee370565f691600
-MISC metadata.xml 350 BLAKE2B c365b033dc672cf08a0c53b3a0d4883bfd6d51702f0f9892992d7ec257a1fd64c27f7b8227ebd8e572c07aa4bdecacc706027cf2f0250c296004cd3e9002ee37 SHA512 5015008087d5c504b755f2a1bbbf6abc10e910418d856c417d537a1e86cc1d5b944618d9764660fbd46f15c21d599fee7e6a8681123d435e15fbaa56c29d4a63
+EBUILD dleyna-renderer-0.7.2.ebuild 795 BLAKE2B 107861c1c2ac65bd36cda47d2ad967b5c01eea29164be7a8c0ec876b978641247746a1c78c6aa1eed990da31cf3c25db3d64220829740488ee9650ef75e86a13 SHA512 fffc36405020638d7fac1a3923a77b378a039b645ded7e9898705fb832964ee917694102b77bcf74ed7cf9c1cab32743e4ff661f78520509705cbbf5c5e2f191
+MISC metadata.xml 410 BLAKE2B f36d7c8e32f1e822a253962b868c930ad8dda7b8549fb42053113a670ee5d6ed80576f84c03c9c9e489a6b3af3f7b2227640555826d567c9b0452252840ceec7 SHA512 435cf0a47eebf8dbc0b5ac17c1c800a4f377325435b1b74c7a8302f72e23cc645b96f3ec3e386b86160f64e654dec8a93c04abc7d7f27a0a5c0a3b66a5fa8276
diff --git a/net-libs/dleyna-renderer/dleyna-renderer-0.7.2.ebuild b/net-libs/dleyna-renderer/dleyna-renderer-0.7.2.ebuild
index 804a16ccd15c..53e53be64de5 100644
--- a/net-libs/dleyna-renderer/dleyna-renderer-0.7.2.ebuild
+++ b/net-libs/dleyna-renderer/dleyna-renderer-0.7.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,7 +6,7 @@ EAPI=7
 inherit meson
 
 DESCRIPTION="A library to discover and manipulate DLNA renderers"
-HOMEPAGE="https://github.com/phako/dleyna-renderer"
+HOMEPAGE="https://github.com/phako/dleyna-renderer https://github.com/phako/dleyna-renderer"
 SRC_URI="https://github.com/phako/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
@@ -29,3 +29,7 @@ BDEPEND="
 	dev-libs/libxslt
 	virtual/pkgconfig
 "
+
+PATCHES=(
+	"${FILESDIR}"/meson-1.2.0.patch
+)
diff --git a/net-libs/dleyna-renderer/files/meson-1.2.0.patch b/net-libs/dleyna-renderer/files/meson-1.2.0.patch
new file mode 100644
index 000000000000..b4b13f7a9deb
--- /dev/null
+++ b/net-libs/dleyna-renderer/files/meson-1.2.0.patch
@@ -0,0 +1,12 @@
+diff --git a/subprojects/dleyna-core-1.0.wrap b/subprojects/dleyna-core-1.0.wrap
+index 8cf3b48..c8707be 100644
+--- a/subprojects/dleyna-core-1.0.wrap
++++ b/subprojects/dleyna-core-1.0.wrap
+@@ -2,5 +2,5 @@
+ url = https://github.com/phako/dleyna-core.git
+ revision = head
+ 
+-[provides]
+-dependency_name = dleyna-core-1.0
++[provide]
++dependency_names = dleyna-core-1.0
diff --git a/net-libs/dleyna-renderer/metadata.xml b/net-libs/dleyna-renderer/metadata.xml
index e198e4520fcd..f7abf65f4b5b 100644
--- a/net-libs/dleyna-renderer/metadata.xml
+++ b/net-libs/dleyna-renderer/metadata.xml
@@ -6,6 +6,7 @@
     <name>Gentoo GNOME Desktop</name>
   </maintainer>
   <upstream>
+    <remote-id type="gnome-gitlab">World/dLeyna</remote-id>
     <remote-id type="github">phako/dleyna-renderer</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/net-libs/dleyna/Manifest b/net-libs/dleyna/Manifest
index f79871a7ec93..beb5872151a2 100644
--- a/net-libs/dleyna/Manifest
+++ b/net-libs/dleyna/Manifest
@@ -1,3 +1,4 @@
+AUX meson-1.2.0.patch 1105 BLAKE2B ca7ef61e431d29839fd6e750fba923f68ec45a9f472a68021429dd1b9aef6444abe09ecee86a1bc65aeacff3d566453cd567047f128c3534099034964a819fba SHA512 6c701f7a90223c152d4387fae7a8159d21513f5fc431e6642284e6dd7f84b6bcb4994b14f26b716430a31c793543c7e6985ccd1eb30fb256e1038bb342c9ccf6
 DIST dLeyna-v0.8.2.tar.bz2 149691 BLAKE2B c9837da15c18b25c0e9021776cabdcffe52acfaac0f2858ab004b554d9a212ca45cc08f2893383248c5bb5ce57df854d79c329f80511b9f098663326f1badecc SHA512 25a62ad6b623a8d67d90af608d0fa68e4dcef916c5b44f51eb927f6e276555b978414c95f59a680c5938c7b67abe0cc09afa4e58d068f115d73ce6cb40959144
-EBUILD dleyna-0.8.2.ebuild 1191 BLAKE2B 62cb03f39240316fa43e3a3ef7719f7e244147f202dba258a7f1fa054a3a356573dbbd3d4920e2a965158a5fcdeb0faa277f3ae1fea09bf2e02c55436030c193 SHA512 516dc4a2e887afd89b7d924ebe4dc799b0dc80757867c2505ff3609b954552de83a43588498672429e37c9ce3679ce65adc73dbf7ca1803086998d6844dab883
+EBUILD dleyna-0.8.2.ebuild 1237 BLAKE2B a01c30d36dd50e53ea68eacb353e5b00606b354e9ca51207de76772e04067636e3a4deae95bc4a8aa83acbcb4f68b9e4b46d13766b7cd641c4aa7caa8b072bcd SHA512 e6482cc68be9e3df31157bcc1a6b842864269641120cf86e496c6c901353e064bdc59e812122f3823009265a3b6882701fdcacb7fe369c08a3c2afdf7b4a9d6e
 MISC metadata.xml 347 BLAKE2B f530e4051daea6e7c842e14aab33cd08680f7414dd5bb06fb0c4e7aafc9c851daff77752e77e1f12b333e992854ae97217f78d30a2be2b601ea3465b4e0ff31e SHA512 e5d55300134824082f76ed5fd0a9e5753ef74e98796b17da4c47e7b5e0e5480e82b3e6db6d4880e2ca00b12e01c1514736a41ae0967226283d329f576ab497a3
diff --git a/net-libs/dleyna/dleyna-0.8.2.ebuild b/net-libs/dleyna/dleyna-0.8.2.ebuild
index 5d61120d598d..0be4bdcfce23 100644
--- a/net-libs/dleyna/dleyna-0.8.2.ebuild
+++ b/net-libs/dleyna/dleyna-0.8.2.ebuild
@@ -39,6 +39,10 @@ BDEPEND="
 
 S="${WORKDIR}"/dLeyna-v${PV}
 
+PATCHES=(
+	"${FILESDIR}"/meson-1.2.0.patch
+)
+
 src_configure() {
 	local emesonargs=(
 		-Ddbus_service_dir="${EPREFIX}/usr/share/dbus-1/services"
diff --git a/net-libs/dleyna/files/meson-1.2.0.patch b/net-libs/dleyna/files/meson-1.2.0.patch
new file mode 100644
index 000000000000..222ba8c5ea20
--- /dev/null
+++ b/net-libs/dleyna/files/meson-1.2.0.patch
@@ -0,0 +1,44 @@
+https://gitlab.gnome.org/World/dLeyna/-/merge_requests/6
+
+From 61d24fdccadc1c9a94f1351744376edcc2048105 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Mon, 17 Jul 2023 13:29:55 +0100
+Subject: [PATCH] subprojects: Fix typos for Meson 1.2 compatibility
+
+Bug: https://bugs.gentoo.org/909405
+Bug: https://bugs.gentoo.org/909431
+--- a/subprojects/gssdp-1.6.wrap
++++ b/subprojects/gssdp-1.6.wrap
+@@ -3,6 +3,6 @@ url = https://gitlab.gnome.org/GNOME/gssdp.git
+ revision = master
+ depth = 1
+  
+-[provides]
+-dependency_name = gssdp-1.6
++[provide]
++dependency_names = gssdp-1.6
+ 
+--- a/subprojects/gupnp-1.6.wrap
++++ b/subprojects/gupnp-1.6.wrap
+@@ -3,6 +3,6 @@ url = https://gitlab.gnome.org/GNOME/gupnp.git
+ revision = master
+ depth = 1
+  
+-[provides]
+-dependency_name = gupnp-1.6
++[provide]
++dependency_names = gupnp-1.6
+ 
+--- a/subprojects/gupnp-av-1.0.wrap
++++ b/subprojects/gupnp-av-1.0.wrap
+@@ -3,6 +3,6 @@ url = https://gitlab.gnome.org/GNOME/gupnp-av.git
+ revision = master
+ depth = 1
+  
+-[provides]
+-dependency_name = gupnp-av-1.0
++[provide]
++dependency_names = gupnp-av-1.0
+ 
+-- 
+GitLab
diff --git a/net-libs/gupnp/Manifest b/net-libs/gupnp/Manifest
index e359b8a82554..5e2693c78d6c 100644
--- a/net-libs/gupnp/Manifest
+++ b/net-libs/gupnp/Manifest
@@ -1,7 +1,8 @@
+AUX gupnp-1.6.4-meson-1.2.0-fix.patch 1098 BLAKE2B 9ca3a52c8d3569081bdbc5bafdfe8ab8c9e63f34281a98ca4011fbc48654b81aab1b696b751b7fc5c61dbdaff08a36329767ffb83da4be64977a044e9afe6d71 SHA512 162d8b0dc45b027fed6b73c5ee9e8774b40b1b6ec473561b1665fa588986b4336839d4278ba05237cbe8cbbec6b7b00455c57a2219ea3e4dadaa89e7460913e5
 DIST gupnp-1.4.3.tar.xz 154812 BLAKE2B b41a8805853061399412f5eb7267e9913adb3054ebf8a3bd78f6df4c1607d4a944654f3bc6e154fefa98f1289a80055d0feb0168801d83a1ad59c25f5fcac784 SHA512 1963ce917458168c8bc5d669ee30a4071d83d3768ce1be8cbbd81c767853ca01950623a88628a0b1e403d1cce1f0bbc9df80acf4b75f91bfc0403e0d0e6bcedb
 DIST gupnp-1.6.3.tar.xz 2216496 BLAKE2B 635aafa78f8cb7b9542eab14545864a93d5fe01296444397ddb1d1868d51c9bb8013e17e659dce550581f7ae9cbc31a74fb30563d1961b341c3f672390d08f6a SHA512 423605e15dafb1f3789910289604912212a04595bad174654cce5b7717ab0d307ad7e021fc8f0ce59fb090d285fbcf633de63dc40c5f6cebad6a28553a5d6f17
 DIST gupnp-1.6.4.tar.xz 242944 BLAKE2B 485052a7f6448b8a09767987aaf679ee5a5946557ef49e402b94d05218fcedf646a45e89f670a1bce5b54951aeb85f327dfdc7094b22d8e02cff27551fad2ea3 SHA512 00fe34960f366f69915f3627637905d3a32d1a2757155f16f67fd434601106b38368a5e28c8f13dc57030e4fcf74755e5149f7e36b6a4a4abe6fe12a41034333
 EBUILD gupnp-1.4.3.ebuild 2219 BLAKE2B d53e8ca34548f02b0f4677e0bdedd20531bfb9241abbdc9f5aa1ffbfcb3f227d4ff2dbd3716984d3c51f5ce3c9d9aeaa6a2541e0d98b1fd97f4435dca0b9f4f6 SHA512 2cb909e5c68bb34d067393724daa1b15a06a9a15fdd34b3977317553eed9c42e666193cffa4e6f7b2f1dfea92f18dde771242f16b35b6e240522e59faf971af0
 EBUILD gupnp-1.6.3.ebuild 2294 BLAKE2B c634fc67d9e0354b7de70d6a3f39d9b1744b731c0fd0cb64b80e01ef89932e766dfc196d3f85484e7f1af7c1c1c8f7611319cb05ae5447ba27fbd1d393a9edae SHA512 6bc932d0d5e5dc35dd7082490a77ef4534a699257e1f2ca75d0dc286a967eb929e62a52db1a4afc9f9621e3e8647855ae714e6020b1cbea531b2d8297866da82
-EBUILD gupnp-1.6.4.ebuild 2299 BLAKE2B adb3fdea8a176e69bb0290499d4163f14894ef176ff667f3b2e94ebc74c3165fc6064c6b4b72a5e758abae0c050b590eef9be4882fd0e7746f9a35a401162f36 SHA512 397a21666fbd618901d97f95fc41b905acb2d196e452c7f99041fe2c153d6e8330bc6ef54fb59a356ee3fdb8aab49d10e6bd950d091e913c4b7400a67ffcd892
+EBUILD gupnp-1.6.4.ebuild 2354 BLAKE2B 611c59626aa0f0ae1ea3a55db0c0d78ae3654ac1b56c903088effdc633f68cac1df830fdd658641ae81dbd16edca0c2f379c8c4b6539da7098116a698cb2b9bf SHA512 d9877495ce5df27d9903127466b7e5ce9512a47972b4630ad1d6b613a57f8d0628aeefa12d222fbcdcfb1ca9afe735d58413eb79aa85fc18c9e65f9ac96dbfd5
 MISC metadata.xml 346 BLAKE2B c0c2d7c5a0f1906cc1789a30daec476919e7332f2a8aed9ec78e824be2776e7a18202b8fe19e519340cc9437d4147e223eb6830460c2a4c499cd483c77524cd5 SHA512 84998e9f5ebf374d1bfea85f7eb4b89f8459ee62ec89dc8b9bd36de354a307ad854cd7521eecd31b410659d5128a4dd9545ab7037eb5b7f8b41efdb8054b9b2c
diff --git a/net-libs/gupnp/files/gupnp-1.6.4-meson-1.2.0-fix.patch b/net-libs/gupnp/files/gupnp-1.6.4-meson-1.2.0-fix.patch
new file mode 100644
index 000000000000..05314a417c6d
--- /dev/null
+++ b/net-libs/gupnp/files/gupnp-1.6.4-meson-1.2.0-fix.patch
@@ -0,0 +1,38 @@
+https://gitlab.gnome.org/GNOME/gupnp/-/commit/884639bd29323cbb8fbd36bc69d08097a2ae2cd1
+https://gitlab.gnome.org/GNOME/gupnp/-/commit/a10c57bd32fbd0dc59eb6703454360ea564e2ffc
+
+From 884639bd29323cbb8fbd36bc69d08097a2ae2cd1 Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Sun, 9 Jul 2023 03:30:47 +0000
+Subject: [PATCH] build: properly spell [provide] in *.wrap files
+
+meson.build:1:0: ERROR: Unexpected "[provides]" section, did you mean "[provide]"?
+--- a/subprojects/gssdp-1.6.wrap
++++ b/subprojects/gssdp-1.6.wrap
+@@ -3,6 +3,6 @@ url = https://gitlab.gnome.org/GNOME/gssdp.git
+ revision = master
+ depth = 1
+  
+-[provides]
++[provide]
+ dependency_name = gssdp-1.6
+ 
+-- 
+GitLab
+
+From a10c57bd32fbd0dc59eb6703454360ea564e2ffc Mon Sep 17 00:00:00 2001
+From: Jens Georg <mail@jensge.org>
+Date: Sun, 9 Jul 2023 21:49:47 +0200
+Subject: [PATCH] build: Add missing "s" to wrap file syntax
+
+--- a/subprojects/gssdp-1.6.wrap
++++ b/subprojects/gssdp-1.6.wrap
+@@ -4,5 +4,5 @@ revision = master
+ depth = 1
+  
+ [provide]
+-dependency_name = gssdp-1.6
++dependency_names = gssdp-1.6
+ 
+-- 
+GitLab
diff --git a/net-libs/gupnp/gupnp-1.6.4.ebuild b/net-libs/gupnp/gupnp-1.6.4.ebuild
index 65a1aa08e3f7..0e5d39866c9f 100644
--- a/net-libs/gupnp/gupnp-1.6.4.ebuild
+++ b/net-libs/gupnp/gupnp-1.6.4.ebuild
@@ -44,6 +44,10 @@ BDEPEND="
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}"/${P}-meson-1.2.0-fix.patch
+)
+
 src_prepare() {
 	default
 	use vala && vala_setup
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 63bb23d9f243..a811778516dd 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,16 +1,4 @@
-AUX 2.40.0-respect-RUBY.patch 1447 BLAKE2B 2212d15e50362004349245ee75285d96951d2ca8d15a30b8a4b6707bea93ea0e12a5993ec88848085e4ec71ac835b5d87a18f26240e014a4cf3812ef2c8096f9 SHA512 430bad9af15922cb9e4b879694a5759f8e30c56b75b7d90d91ef96dabb94ae023dd80a87d436bef3d13bb3a0c7b971af9639f654a587886413e4ed5f355ccb51
-AUX 2.40.1-Cherry-pick-262461-main-b36decf27ea9-.-https-bugs.we.patch 1140 BLAKE2B 55fcb2cbcad9fd62f77b5b00b1b85641fd3e99558d0729e3b42c2070d760db9ea5059d04303d8abfefdf2a9f554ca81ab9362c6f3a4a0730b1b1aeccfff468bc SHA512 02de018aed6fead34522febb04709aa347636c5cc7e344628249c4a9d81d9add49c6f844d0468a088781a9929adedd74cb1d0a921d01eb4f7841ad14994f7464
-AUX 2.40.1-gcc-13.patch 850 BLAKE2B fb972f818990265d8640d1c13b4bbb0eee10c81a023feb551e9bba40172564ee10167bec64b7684af564c96e43c5002d24ec3830717df7fd72532dd0d9bd65c5 SHA512 57f37285e295e0e74d7704564fc85e7b5857d938a88f5ab53742e818151125b60c4e76e0d2eae185294795de3b5e8a1c6af4606110bb4f1a3a726bf5ac1236db
-AUX 2.40.2-Cherry-pick-264395-main-4977290ab4ab-.-https-bugs.we.patch 1344 BLAKE2B 73d315c4944b81a150c7836f836301cb84fb12d238cdd641260ccbf9b10d9c4872d3fd088f654af68d024969601d8914cd5302f7376eddd918f7d1b55d71776c SHA512 e5666b26bdf43fa93dbc96e8cdca00f5c8f8ae6d5560db88cd220893cc652e80840c1d243235de5c7a9bb7480ccc7be391ca68d807031375e21c615e149aa14b
-DIST webkitgtk-2.40.1.tar.xz 39599544 BLAKE2B b50c983eafdb215e62e1509873691bc3f932c8b5daf0ceeaefc041d3bc6c5ff804f25af5f761837a3f37df07c1c598f5984e40b116e70a3523d508d13594dc4d SHA512 e94b9a651b3c120e3dc918831c8a7fcfbd35f6760a53b7b39a07c7d792ddf99082030bf8b44a522001df4a7368c2b9145606f7a1cc8e0ed60498a0b78325bc5c
-DIST webkitgtk-2.40.2.tar.xz 40065104 BLAKE2B 177ac87de1c17768c50761f4146f3c8dc218abacb9de0c811ec4acf2ea7117cd62e256cb09345c55ee8da7479c8df3faf3c1b09d0876be33dd740bf6541af27d SHA512 2fea73faffe171845f3710995bb27eb7350aa9ba7b513e7f0fc163c09fc63d73112a55dbc010af67e422c59baa9bfc85018f470a0255e43eb17aae465946eef7
 DIST webkitgtk-2.40.3.tar.xz 40064488 BLAKE2B b88b3d9bb6729de8a1b667575acbc9e42c39a222c191ef666f1a58fc593047de1530c597fc2cbc657da845f6262bd4014995fea0cd9776ef60b931769a89594d SHA512 2b10d36427c6cf44c66bb9ddb166363dfc34e23c9b6095eb457d61514298103487a7e80096ead9e653da1b4c0db42613c3a83aa28b19298ec62f50da289eb42e
-EBUILD webkit-gtk-2.40.1-r410.ebuild 8030 BLAKE2B ee467dfd5ce6f705486b06b16083dcd7653db507965b7234bc9f2a9149972089e8d66802ada90c625256af53acadfbd7a1c648586005e7821a2e6c5c1dde5bf3 SHA512 e39a94c5e6afd41f77ac5fda8bef1564c482439045889830dfeda29a3aa066c2e02396ee6f6057c634c3c445de3a20f37dd0222609b779786aaed904ba21d5ee
-EBUILD webkit-gtk-2.40.1-r600.ebuild 7909 BLAKE2B 2e8c22850cf8cd1c9e8c8c040b161d290394ace2790cb24d106ad23a0ff85e2c0d36089f7a18ec22a9388e820ea46bb9f74223cc57364cebfb6739d1514a6a6a SHA512 b450774370f501b8790a4f58b07bbf24dd28650257cf55aa8e8ee0f24768f9051bd81726d90594f051c5bf67e9d858c6aaffb1bce9ec8c23dc4c459d9756fb13
-EBUILD webkit-gtk-2.40.1.ebuild 7756 BLAKE2B a4ca1a9aed73893ac75c78b4a21fc1e23802fe04e38d8f7fce2af747aa8586485f54397f99d785b4498f176641c4640a9066c37ea2321a82c9313497edaf646c SHA512 33d75aa7a06079fa45e64115cda7ac3610b36f522af7301859fae491bd994f3078786a18fcdb93ef1a5451c061fe0ce53fc0f0cbdab0a4f46895c5dc85e00966
-EBUILD webkit-gtk-2.40.2-r410.ebuild 7962 BLAKE2B c26c5283b3207851353aa0a8784ff9c98208e2e73e1ceb1c96647e4a7c03ffa1a957732c1cd5460068c1e19f13aa0cfc492cea2857268742d50a8581c01483e5 SHA512 44ed58463ec9dcd200af0d36e8715f16f67e05126bb4349234fc9be0c72077f61872f65fee634fa5656fcf5508fc9bc1fb928ce489e07d42006339e10f49c080
-EBUILD webkit-gtk-2.40.2-r600.ebuild 7835 BLAKE2B 87f051a87519f3e4e089783ebe9507149c1a4a5d0f9d14cb20380a471d74eb2b677a3c208183ef050417a7892f8a65914b1359fc28ee992576758e66cf6968eb SHA512 e40eda93dc634f696be70cbe6ffc8ce932385b6438db75aad807d15d82e2417ad46dff41828d60000d1ac337ba0ab89201291732ebb62562e8273f649b728490
-EBUILD webkit-gtk-2.40.2.ebuild 7688 BLAKE2B 6796f73ee80a6714fa580b97a058775949665bd473cfd4e4b3702ce32d65d9d275e6c583a15cf8829a7f79b9dc421bb11f0c84af2be240991e670749e1873018 SHA512 5ed1067adebd1be6943651ec4474357c935cf28e75bf4fe7cf6f1fc668d931ec0d0a50fb64a451c8d62d2b3fcf351b643d9cd1eb0f3dfd1c66ac99cc2b4ed82f
 EBUILD webkit-gtk-2.40.3-r410.ebuild 7873 BLAKE2B 9f475f99351c85fb5d80387925794ae22da644acda257619e474964de9dd83b72eb438bf2f22771607bdc8928ccc44e4d001836a4fbb8779e88d0a3017dfb7a1 SHA512 650ebd896a24be9c5fd1e55e3439917ae34e285d97cc957ba22f8d45f74821308a6e76fe917425470472009316bfbdd3838883d37eb53621ea2157389330f7d4
 EBUILD webkit-gtk-2.40.3-r600.ebuild 7746 BLAKE2B 4a14ff8acd0fc2e0f29ff06cd5f339c0c59d00cc161f47f125cb9b15b03264a2a5269b38ab3e633f45c6a32dcd25ac0d6cf5e0d23d2595b8259d6d54604eb14d SHA512 8a03535e28aaaeeda2a6cfcd1d7f52ea78b9653f0f00828eb6933201a61050d65302d1d94afc3447b78d68219d11b5522a6c15fe11258cd2edb10994959f9ed4
 EBUILD webkit-gtk-2.40.3.ebuild 7599 BLAKE2B 635def522e5cfc7126b0fb1962d3097ee1dbfa17d62fb2b7b484c3553e69d84a30ca2cc5da608ef7dc2394dbdbbd29fd1fb0ceb4b0e18000157d2d6f90501d99 SHA512 c8e68d54181433fcb14c8d0b5be7a4c74b9aa6cbf0fc3390849ad8748dd5328c7fa892d85d5645d7f9f4a8d0d241b408c6a7e1db27d8f4800650c01d31c54ffd
diff --git a/net-libs/webkit-gtk/files/2.40.0-respect-RUBY.patch b/net-libs/webkit-gtk/files/2.40.0-respect-RUBY.patch
deleted file mode 100644
index 058dbb36cb96..000000000000
--- a/net-libs/webkit-gtk/files/2.40.0-respect-RUBY.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-https://bugs.gentoo.org/771744
-https://github.com/WebKit/WebKit/pull/12358
-
-From 5cda2bac84e6900401810b56ba4de82de714cae0 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Tue, 4 Apr 2023 04:31:01 +0100
-Subject: [PATCH] postprocess-asm rule doesn't respect RUBY_EXECUTABLE
- https://bugs.webkit.org/show_bug.cgi?id=254965
-
-Reviewed by NOBODY (OOPS!).
-
-postprocess-asm is a Ruby script with #/!/usr/bin/env ruby as its shebang which
-looks up Ruby in PATH. webkit, however, has RUBY_EXECUTABLE as a CMake option.
-It's possible for the Ruby used by CMake (and the other rules during the build)
-to be different to the first Ruby found in PATH. This makes the usage for postprocess-asm
-consistent with other uses in webkit.
-
-* Source/JavaScriptCore/CMakeLists.txt
---- a/Source/JavaScriptCore/CMakeLists.txt
-+++ b/Source/JavaScriptCore/CMakeLists.txt
-@@ -1507,7 +1507,7 @@ endif ()
- if (CMAKE_COMPILER_IS_GNUCXX AND GCC_OFFLINEASM_SOURCE_MAP)
-     message(STATUS "Enabling asm postprocessing")
- 
--    set(LowLevelInterpreter_LAUNCHER "${JavaScriptCore_SCRIPTS_SOURCES_DIR}/postprocess-asm")
-+    set(LowLevelInterpreter_LAUNCHER "${RUBY_EXECUTABLE} ${JavaScriptCore_SCRIPTS_SOURCES_DIR}/postprocess-asm")
-     get_target_property(PROP_RULE_LAUNCH_COMPILE LowLevelInterpreterLib RULE_LAUNCH_COMPILE)
-     if (PROP_RULE_LAUNCH_COMPILE)
-         set(LowLevelInterpreter_LAUNCHER "${LowLevelInterpreter_LAUNCHER} ${PROP_RULE_LAUNCH_COMPILE}")
-
diff --git a/net-libs/webkit-gtk/files/2.40.1-Cherry-pick-262461-main-b36decf27ea9-.-https-bugs.we.patch b/net-libs/webkit-gtk/files/2.40.1-Cherry-pick-262461-main-b36decf27ea9-.-https-bugs.we.patch
deleted file mode 100644
index feac03354071..000000000000
--- a/net-libs/webkit-gtk/files/2.40.1-Cherry-pick-262461-main-b36decf27ea9-.-https-bugs.we.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From cfa5e2a8dab746c14c2e5876a48ff0d66cdf7486 Mon Sep 17 00:00:00 2001
-From: Don Olmstead <don.olmstead@sony.com>
-Date: Fri, 31 Mar 2023 19:46:07 -0700
-Subject: [PATCH] Cherry-pick 262461@main (b36decf27ea9).
- https://bugs.webkit.org/show_bug.cgi?id=254852
-
-    Fix !ENABLE(WEB_AUDIO) build after 262451@main
-    https://bugs.webkit.org/show_bug.cgi?id=254852
-
-    Unreviewed build fix.
-
-    Add !ENABLE(WEB_AUDIO) guard.
-
-    * Source/WebCore/page/MemoryRelease.cpp:
-
-    Canonical link: https://commits.webkit.org/262461@main
----
- Source/WebCore/page/MemoryRelease.cpp | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/Source/WebCore/page/MemoryRelease.cpp b/Source/WebCore/page/MemoryRelease.cpp
-index d2d5009785bc..aa0c8cff9571 100644
---- a/Source/WebCore/page/MemoryRelease.cpp
-+++ b/Source/WebCore/page/MemoryRelease.cpp
-@@ -103,7 +103,9 @@ static void releaseCriticalMemory(Synchronous synchronous, MaintainBackForwardCa
-     }
- 
-     CSSValuePool::singleton().drain();
-+#if ENABLE(WEB_AUDIO)
-     HRTFElevation::clearCache();
-+#endif
- 
-     Page::forEachPage([](auto& page) {
-         page.cookieJar().clearCache();
--- 
-2.39.2
-
diff --git a/net-libs/webkit-gtk/files/2.40.1-gcc-13.patch b/net-libs/webkit-gtk/files/2.40.1-gcc-13.patch
deleted file mode 100644
index 6a532924121b..000000000000
--- a/net-libs/webkit-gtk/files/2.40.1-gcc-13.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-https://github.com/WebKit/WebKit/pull/11910
-https://github.com/WebKit/WebKit/commit/93920b55f52ff8b883296f4845269e2ed746acb3
-
---- a/Source/WebCore/platform/graphics/SourceBrush.cpp
-+++ b/Source/WebCore/platform/graphics/SourceBrush.cpp
-@@ -65,12 +65,12 @@
- 
- void SourceBrush::setGradient(Ref<Gradient>&& gradient, const AffineTransform& spaceTransform)
- {
--    m_brush = { Brush::LogicalGradient { WTFMove(gradient), spaceTransform } };
-+    m_brush = Brush { Brush::LogicalGradient { WTFMove(gradient), spaceTransform } };
- }
- 
- void SourceBrush::setPattern(Ref<Pattern>&& pattern)
- {
--    m_brush = { Brush::Variant { std::in_place_type<Ref<Pattern>>, WTFMove(pattern) } };
-+    m_brush = Brush { Brush::Variant { std::in_place_type<Ref<Pattern>>, WTFMove(pattern) } };
- }
- 
- WTF::TextStream& operator<<(TextStream& ts, const SourceBrush& brush)
-
diff --git a/net-libs/webkit-gtk/files/2.40.2-Cherry-pick-264395-main-4977290ab4ab-.-https-bugs.we.patch b/net-libs/webkit-gtk/files/2.40.2-Cherry-pick-264395-main-4977290ab4ab-.-https-bugs.we.patch
deleted file mode 100644
index c16fa332226f..000000000000
--- a/net-libs/webkit-gtk/files/2.40.2-Cherry-pick-264395-main-4977290ab4ab-.-https-bugs.we.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 9df022bd38f7eea9b7a693ea1101611d19127189 Mon Sep 17 00:00:00 2001
-From: Diego Pino Garcia <dpino@igalia.com>
-Date: Mon, 22 May 2023 19:58:50 -0700
-Subject: [PATCH] Cherry-pick 264395@main (4977290ab4ab).
- https://bugs.webkit.org/show_bug.cgi?id=256917
-
-    [GLIB] Fix build error after 264196@main
-    https://bugs.webkit.org/show_bug.cgi?id=256917
-
-    Reviewed by Michael Catanzaro.
-
-    Variable BWRAP_EXECUTABLE is only defined when BUBBLEWRAP_SANDBOX is
-    enabled.
-
-    * Source/WTF/wtf/glib/Sandbox.cpp:
-    (WTF::isInsideUnsupportedContainer):
-
-    Canonical link: https://commits.webkit.org/264395@main
-
-Canonical link: https://commits.webkit.org/260527.371@webkitglib/2.40
----
- Source/WTF/wtf/glib/Sandbox.cpp | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/Source/WTF/wtf/glib/Sandbox.cpp b/Source/WTF/wtf/glib/Sandbox.cpp
-index 7d84e830ab33..9b07bb8cb5a9 100644
---- a/Source/WTF/wtf/glib/Sandbox.cpp
-+++ b/Source/WTF/wtf/glib/Sandbox.cpp
-@@ -36,6 +36,7 @@ bool isInsideFlatpak()
-     return returnValue;
- }
- 
-+#if ENABLE(BUBBLEWRAP_SANDBOX)
- bool isInsideUnsupportedContainer()
- {
-     static bool inContainer = g_file_test("/run/.containerenv", G_FILE_TEST_EXISTS);
-@@ -64,6 +65,7 @@ bool isInsideUnsupportedContainer()
- 
-     return inContainer && !supportedContainer;
- }
-+#endif
- 
- bool isInsideSnap()
- {
--- 
-2.39.3
-
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.1-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.1-r410.ebuild
deleted file mode 100644
index c1e983e7035a..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.1-r410.ebuild
+++ /dev/null
@@ -1,258 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_REQ_USE="xml(+)"
-PYTHON_COMPAT=( python3_{9..11} )
-USE_RUBY="ruby30 ruby31 ruby32"
-
-inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="https://www.webkitgtk.org"
-SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2+ BSD"
-SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86"
-
-IUSE="aqua avif examples gamepad gles2-only keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
-REQUIRED_USE="|| ( aqua wayland X )"
-
-# Tests do not run when built from tarballs
-# https://bugs.webkit.org/show_bug.cgi?id=215986
-RESTRICT="test"
-
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
-# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
-# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
-# Softblocking webkit-gtk-2.38:4 as we going to use webkit-2.38:4.1's WebKitDriver binary
-RDEPEND="
-	>=x11-libs/cairo-1.16.0[X?]
-	>=media-libs/fontconfig-2.13.0:1.0
-	>=media-libs/freetype-2.9.0:2
-	>=dev-libs/libgcrypt-1.7.0:0=
-	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
-	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
-	>=dev-libs/icu-61.2:=
-	media-libs/libjpeg-turbo:0=
-	>=media-libs/libepoxy-1.4.0
-	>=net-libs/libsoup-3.0.8:3.0[introspection?]
-	>=dev-libs/libxml2-2.8.0:2
-	>=media-libs/libpng-1.4:0=
-	dev-db/sqlite:3
-	sys-libs/zlib:0
-	>=app-accessibility/at-spi2-core-2.46.0:2
-	media-libs/libwebp:=
-
-	>=dev-libs/glib-2.70.0:2
-	>=dev-libs/libxslt-1.1.7
-	media-libs/woff2
-	keyring? ( app-crypt/libsecret )
-	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
-	dev-libs/libtasn1:=
-	spell? ( >=app-text/enchant-0.22:2 )
-	gstreamer? (
-		>=media-libs/gstreamer-1.20:1.0
-		>=media-libs/gst-plugins-base-1.20:1.0[egl,X?]
-		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
-		!gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
-		>=media-plugins/gst-plugins-opus-1.20:1.0
-		>=media-libs/gst-plugins-bad-1.20:1.0
-	)
-
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXrender
-		x11-libs/libXt
-	)
-
-	dev-libs/hyphen
-	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
-	avif? ( >=media-libs/libavif-0.9.0:= )
-	lcms? ( media-libs/lcms:2 )
-
-	media-libs/mesa
-	media-libs/libglvnd
-	wayland? (
-		dev-libs/wayland
-		>=dev-libs/wayland-protocols-1.12
-		>=gui-libs/libwpe-1.5.0:1.0
-		>=gui-libs/wpebackend-fdo-1.7.0:1.0
-	)
-
-	seccomp? (
-		>=sys-apps/bubblewrap-0.3.1
-		sys-libs/libseccomp
-		sys-apps/xdg-dbus-proxy
-	)
-
-	systemd? ( sys-apps/systemd:= )
-	gamepad? ( >=dev-libs/libmanette-0.2.4 )
-	!<net-libs/webkit-gtk-2.38:4
-"
-DEPEND="${RDEPEND}"
-# Need real bison, not yacc
-BDEPEND="
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=app-accessibility/at-spi2-core-2.5.3
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/gperf-3.0.1
-	dev-util/unifdef
-	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	>=dev-lang/perl-5.10
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-	virtual/perl-JSON-PP
-"
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++17 ; then
-			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
-		fi
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-	gnome2_src_prepare
-	eapply "${FILESDIR}/${PV}"-Cherry-pick-262461-main-b36decf27ea9-.-https-bugs.we.patch
-	eapply "${FILESDIR}/${PV}"-gcc-13.patch
-	eapply "${FILESDIR}"/2.40.0-respect-RUBY.patch
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
-	fi
-
-	# Ruby situation is a bit complicated. See bug 513888
-	local rubyimpl
-	local ruby_interpreter=""
-	local RUBY
-	for rubyimpl in ${USE_RUBY}; do
-		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}(-)]"; then
-			RUBY="$(type -P ${rubyimpl})"
-			ruby_interpreter="-DRUBY_EXECUTABLE=${RUBY}"
-		fi
-	done
-	# This will rarely occur. Only a couple of corner cases could lead us to
-	# that failure. See bug 513888
-	[[ -z ${ruby_interpreter} ]] && die "No suitable ruby interpreter found"
-	# JavaScriptCore/Scripts/postprocess-asm invokes another Ruby script directly
-	# so it doesn't respect RUBY_EXECUTABLE, bug #771744.
-	sed -i -e "s:#!/usr/bin/env ruby:#!${RUBY}:" $(grep -rl "/usr/bin/env ruby" Source/JavaScriptCore || die) || die
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-
-	local mycmakeargs=(
-		-DPython_EXECUTABLE="${PYTHON}"
-		${ruby_interpreter}
-		$(cmake_use_find_package gles2-only OpenGLES2)
-		$(cmake_use_find_package !gles2-only OpenGL)
-		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
-		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
-		-DPORT=GTK
-		# Source/cmake/WebKitFeatures.cmake
-		-DENABLE_API_TESTS=OFF
-		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
-		-DENABLE_GAMEPAD=$(usex gamepad)
-		-DENABLE_MINIBROWSER=$(usex examples)
-		-DENABLE_PDFJS=$(usex pdf)
-		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
-		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
-		-DENABLE_WEBDRIVER=ON
-		-DENABLE_WEBGL=ON
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		-DUSE_AVIF=$(usex avif)
-		# Source/cmake/OptionsGTK.cmake
-		-DENABLE_GLES2=$(usex gles2-only)
-		-DENABLE_DOCUMENTATION=OFF
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DENABLE_JOURNALD_LOG=$(usex systemd)
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DUSE_GBM=ON
-		-DUSE_GTK4=OFF
-		-DUSE_JPEGXL=OFF
-		-DUSE_LCMS=$(usex lcms)
-		-DUSE_LIBHYPHEN=ON
-		-DUSE_LIBSECRET=$(usex keyring)
-		-DUSE_OPENGL_OR_ES=ON
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_SOUP2=OFF
-		-DUSE_WOFF2=ON
-	)
-
-	# https://bugs.gentoo.org/761238
-	append-cppflags -DNDEBUG
-
-	WK_USE_CCACHE=NO cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	insinto /usr/share/gtk-doc/html
-	# This will install API docs specific to webkit2gtk-4.1
-	doins -r "${S}"/Documentation/{jsc-glib,webkit2gtk,webkit2gtk-web-extension}-${SLOT%/*}
-}
-
-pkg_postinst() {
-	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
-	optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta"
-	optfeature "(MPEG-)DASH support" "media-plugins/gst-plugins-dash"
-	optfeature "HTTP-Live-Streaming support" "media-plugins/gst-plugins-hls"
-}
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.1-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.1-r600.ebuild
deleted file mode 100644
index 5f1d979eeb72..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.1-r600.ebuild
+++ /dev/null
@@ -1,251 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_REQ_USE="xml(+)"
-PYTHON_COMPAT=( python3_{9..11} )
-USE_RUBY="ruby30 ruby31 ruby32"
-
-inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="https://www.webkitgtk.org"
-SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2+ BSD"
-SLOT="6/0" # soname version of libwebkit2gtk-6.0
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86"
-
-IUSE="aqua avif examples gamepad gles2-only keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
-REQUIRED_USE="|| ( aqua wayland X )"
-
-# Tests do not run when built from tarballs
-# https://bugs.webkit.org/show_bug.cgi?id=215986
-RESTRICT="test"
-
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
-# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
-# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
-# Softblocking webkit-gtk-2.38:4 as we going to use webkit-2.38:4.1's WebKitDriver binary
-RDEPEND="
-	>=x11-libs/cairo-1.16.0[X?]
-	>=media-libs/fontconfig-2.13.0:1.0
-	>=media-libs/freetype-2.9.0:2
-	>=dev-libs/libgcrypt-1.7.0:0=
-	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
-	gui-libs/gtk:4
-	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
-	>=dev-libs/icu-61.2:=
-	media-libs/libjpeg-turbo:0=
-	>=media-libs/libepoxy-1.4.0
-	>=net-libs/libsoup-3.0.8:3.0[introspection?]
-	>=dev-libs/libxml2-2.8.0:2
-	>=media-libs/libpng-1.4:0=
-	dev-db/sqlite:3
-	sys-libs/zlib:0
-	>=app-accessibility/at-spi2-core-2.46.0:2
-	media-libs/libwebp:=
-
-	>=dev-libs/glib-2.70.0:2
-	>=dev-libs/libxslt-1.1.7
-	media-libs/woff2
-	keyring? ( app-crypt/libsecret )
-	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
-	dev-libs/libtasn1:=
-	spell? ( >=app-text/enchant-0.22:2 )
-	gstreamer? (
-		>=media-libs/gstreamer-1.20:1.0
-		>=media-libs/gst-plugins-base-1.20:1.0[egl,X?]
-		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
-		!gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
-		>=media-plugins/gst-plugins-opus-1.20:1.0
-		>=media-libs/gst-plugins-bad-1.20:1.0
-	)
-
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXrender
-		x11-libs/libXt
-	)
-
-	dev-libs/hyphen
-	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
-	avif? ( >=media-libs/libavif-0.9.0:= )
-	lcms? ( media-libs/lcms:2 )
-
-	media-libs/mesa
-	media-libs/libglvnd
-	wayland? (
-		dev-libs/wayland
-		>=dev-libs/wayland-protocols-1.12
-		>=gui-libs/libwpe-1.5.0:1.0
-		>=gui-libs/wpebackend-fdo-1.7.0:1.0
-	)
-
-	seccomp? (
-		>=sys-apps/bubblewrap-0.3.1
-		sys-libs/libseccomp
-		sys-apps/xdg-dbus-proxy
-	)
-
-	systemd? ( sys-apps/systemd:= )
-	gamepad? ( >=dev-libs/libmanette-0.2.4 )
-	!<net-libs/webkit-gtk-2.38:4
-"
-DEPEND="${RDEPEND}"
-# Need real bison, not yacc
-BDEPEND="
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=app-accessibility/at-spi2-core-2.5.3
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/gperf-3.0.1
-	dev-util/unifdef
-	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	>=dev-lang/perl-5.10
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-	virtual/perl-JSON-PP
-"
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++17 ; then
-			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
-		fi
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-	gnome2_src_prepare
-	eapply "${FILESDIR}/${PV}"-Cherry-pick-262461-main-b36decf27ea9-.-https-bugs.we.patch
-	eapply "${FILESDIR}/${PV}"-gcc-13.patch
-	eapply "${FILESDIR}"/2.40.0-respect-RUBY.patch
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
-	fi
-
-	# Ruby situation is a bit complicated. See bug 513888
-	local rubyimpl
-	local ruby_interpreter=""
-	local RUBY
-	for rubyimpl in ${USE_RUBY}; do
-		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}(-)]"; then
-			RUBY="$(type -P ${rubyimpl})"
-			ruby_interpreter="-DRUBY_EXECUTABLE=${RUBY}"
-		fi
-	done
-	# This will rarely occur. Only a couple of corner cases could lead us to
-	# that failure. See bug 513888
-	[[ -z ${ruby_interpreter} ]] && die "No suitable ruby interpreter found"
-	# JavaScriptCore/Scripts/postprocess-asm invokes another Ruby script directly
-	# so it doesn't respect RUBY_EXECUTABLE, bug #771744.
-	sed -i -e "s:#!/usr/bin/env ruby:#!${RUBY}:" $(grep -rl "/usr/bin/env ruby" Source/JavaScriptCore || die) || die
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-
-	local mycmakeargs=(
-		-DPython_EXECUTABLE="${PYTHON}"
-		${ruby_interpreter}
-		$(cmake_use_find_package gles2-only OpenGLES2)
-		$(cmake_use_find_package !gles2-only OpenGL)
-		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
-		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
-		-DPORT=GTK
-		# Source/cmake/WebKitFeatures.cmake
-		-DENABLE_API_TESTS=OFF
-		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
-		-DENABLE_GAMEPAD=$(usex gamepad)
-		-DENABLE_MINIBROWSER=$(usex examples)
-		-DENABLE_PDFJS=$(usex pdf)
-		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
-		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
-		-DENABLE_WEBDRIVER=OFF # Disable WebDriver for webkit2gtk-5.0 and use the webkit2gtk-4.1
-		-DENABLE_WEBGL=ON
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		-DUSE_AVIF=$(usex avif)
-		# Source/cmake/OptionsGTK.cmake
-		-DENABLE_GLES2=$(usex gles2-only)
-		-DENABLE_DOCUMENTATION=OFF
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DENABLE_JOURNALD_LOG=$(usex systemd)
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DUSE_GBM=ON
-		-DUSE_GTK4=ON # webkit2gtk-6.0
-		-DUSE_JPEGXL=OFF
-		-DUSE_LCMS=$(usex lcms)
-		-DUSE_LIBHYPHEN=ON
-		-DUSE_LIBSECRET=$(usex keyring)
-		-DUSE_OPENGL_OR_ES=ON
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_SOUP2=OFF
-		-DUSE_WOFF2=ON
-	)
-
-	# https://bugs.gentoo.org/761238
-	append-cppflags -DNDEBUG
-
-	WK_USE_CCACHE=NO cmake_src_configure
-}
-
-pkg_postinst() {
-	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
-	optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta"
-	optfeature "(MPEG-)DASH support" "media-plugins/gst-plugins-dash"
-	optfeature "HTTP-Live-Streaming support" "media-plugins/gst-plugins-hls"
-}
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.1.ebuild
deleted file mode 100644
index d7290f880277..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.1.ebuild
+++ /dev/null
@@ -1,248 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_REQ_USE="xml(+)"
-PYTHON_COMPAT=( python3_{9..11} )
-USE_RUBY="ruby30 ruby31 ruby32"
-
-inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="https://www.webkitgtk.org"
-SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2+ BSD"
-SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86"
-
-IUSE="aqua avif examples gamepad gles2-only keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
-REQUIRED_USE="|| ( aqua wayland X )"
-
-# Tests do not run when built from tarballs
-# https://bugs.webkit.org/show_bug.cgi?id=215986
-RESTRICT="test"
-
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
-# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
-# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
-RDEPEND="
-	>=x11-libs/cairo-1.16.0[X?]
-	>=media-libs/fontconfig-2.13.0:1.0
-	>=media-libs/freetype-2.9.0:2
-	>=dev-libs/libgcrypt-1.7.0:0=
-	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
-	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
-	>=dev-libs/icu-61.2:=
-	media-libs/libjpeg-turbo:0=
-	>=media-libs/libepoxy-1.4.0
-	>=net-libs/libsoup-2.54:2.4[introspection?]
-	>=dev-libs/libxml2-2.8.0:2
-	>=media-libs/libpng-1.4:0=
-	dev-db/sqlite:3
-	sys-libs/zlib:0
-	>=app-accessibility/at-spi2-core-2.46.0:2
-	media-libs/libwebp:=
-
-	>=dev-libs/glib-2.70.0:2
-	>=dev-libs/libxslt-1.1.7
-	media-libs/woff2
-	keyring? ( app-crypt/libsecret )
-	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
-	dev-libs/libtasn1:=
-	spell? ( >=app-text/enchant-0.22:2 )
-	gstreamer? (
-		>=media-libs/gstreamer-1.20:1.0
-		>=media-libs/gst-plugins-base-1.20:1.0[egl,X?]
-		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
-		!gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
-		>=media-plugins/gst-plugins-opus-1.20:1.0
-		>=media-libs/gst-plugins-bad-1.20:1.0
-	)
-
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXrender
-		x11-libs/libXt
-	)
-
-	dev-libs/hyphen
-	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
-	avif? ( >=media-libs/libavif-0.9.0:= )
-	lcms? ( media-libs/lcms:2 )
-
-	media-libs/mesa
-	media-libs/libglvnd
-	wayland? (
-		dev-libs/wayland
-		>=dev-libs/wayland-protocols-1.12
-		>=gui-libs/libwpe-1.5.0:1.0
-		>=gui-libs/wpebackend-fdo-1.7.0:1.0
-	)
-
-	seccomp? (
-		>=sys-apps/bubblewrap-0.3.1
-		sys-libs/libseccomp
-		sys-apps/xdg-dbus-proxy
-	)
-
-	systemd? ( sys-apps/systemd:= )
-	gamepad? ( >=dev-libs/libmanette-0.2.4 )
-"
-DEPEND="${RDEPEND}"
-# Need real bison, not yacc
-BDEPEND="
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=app-accessibility/at-spi2-core-2.5.3
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/gperf-3.0.1
-	dev-util/unifdef
-	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	>=dev-lang/perl-5.10
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-	virtual/perl-JSON-PP
-"
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++17 ; then
-			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
-		fi
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-	gnome2_src_prepare
-	eapply "${FILESDIR}/${PV}"-Cherry-pick-262461-main-b36decf27ea9-.-https-bugs.we.patch
-	eapply "${FILESDIR}/${PV}"-gcc-13.patch
-	eapply "${FILESDIR}"/2.40.0-respect-RUBY.patch
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
-	fi
-
-	# Ruby situation is a bit complicated. See bug 513888
-	local rubyimpl
-	local ruby_interpreter=""
-	local RUBY
-	for rubyimpl in ${USE_RUBY}; do
-		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}(-)]"; then
-			RUBY="$(type -P ${rubyimpl})"
-			ruby_interpreter="-DRUBY_EXECUTABLE=${RUBY}"
-		fi
-	done
-	# This will rarely occur. Only a couple of corner cases could lead us to
-	# that failure. See bug 513888
-	[[ -z ${ruby_interpreter} ]] && die "No suitable ruby interpreter found"
-	# JavaScriptCore/Scripts/postprocess-asm invokes another Ruby script directly
-	# so it doesn't respect RUBY_EXECUTABLE, bug #771744.
-	sed -i -e "s:#!/usr/bin/env ruby:#!${RUBY}:" $(grep -rl "/usr/bin/env ruby" Source/JavaScriptCore || die) || die
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-
-	local mycmakeargs=(
-		-DPython_EXECUTABLE="${PYTHON}"
-		${ruby_interpreter}
-		$(cmake_use_find_package gles2-only OpenGLES2)
-		$(cmake_use_find_package !gles2-only OpenGL)
-		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
-		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
-		-DPORT=GTK
-		# Source/cmake/WebKitFeatures.cmake
-		-DENABLE_API_TESTS=OFF
-		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
-		-DENABLE_GAMEPAD=$(usex gamepad)
-		-DENABLE_MINIBROWSER=$(usex examples)
-		-DENABLE_PDFJS=$(usex pdf)
-		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
-		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
-		-DENABLE_WEBDRIVER=OFF # Disable WebDriver for webkit2gtk-4.0 and use the webkit2gtk-4.1
-		-DENABLE_WEBGL=ON
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		-DUSE_AVIF=$(usex avif)
-		# Source/cmake/OptionsGTK.cmake
-		-DENABLE_GLES2=$(usex gles2-only)
-		-DENABLE_DOCUMENTATION=OFF
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DENABLE_JOURNALD_LOG=$(usex systemd)
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DUSE_GBM=ON
-		-DUSE_GTK4=OFF
-		-DUSE_JPEGXL=OFF
-		-DUSE_LCMS=$(usex lcms)
-		-DUSE_LIBHYPHEN=ON
-		-DUSE_LIBSECRET=$(usex keyring)
-		-DUSE_OPENGL_OR_ES=ON
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_SOUP2=ON
-		-DUSE_WOFF2=ON
-	)
-
-	# https://bugs.gentoo.org/761238
-	append-cppflags -DNDEBUG
-
-	WK_USE_CCACHE=NO cmake_src_configure
-}
-
-pkg_postinst() {
-	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
-	optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta"
-	optfeature "(MPEG-)DASH support" "media-plugins/gst-plugins-dash"
-	optfeature "HTTP-Live-Streaming support" "media-plugins/gst-plugins-hls"
-}
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.2-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.2-r410.ebuild
deleted file mode 100644
index 615d7ada0f6c..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.2-r410.ebuild
+++ /dev/null
@@ -1,259 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_REQ_USE="xml(+)"
-PYTHON_COMPAT=( python3_{9..12} )
-USE_RUBY="ruby30 ruby31 ruby32"
-
-inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="https://www.webkitgtk.org"
-SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2+ BSD"
-SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
-KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
-
-IUSE="aqua avif examples gamepad gles2-only keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
-REQUIRED_USE="|| ( aqua wayland X )"
-
-# Tests do not run when built from tarballs
-# https://bugs.webkit.org/show_bug.cgi?id=215986
-RESTRICT="test"
-
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is
-# experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
-# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
-# TODO: gst-plugins-base[X] is only needed when build configuration ends up
-#       with GLX set, but that's a bit automagic too to fix
-# Softblocking webkit-gtk-2.38:4 as we going to use webkit-2.38:4.1's WebKitDriver binary
-RDEPEND="
-	>=x11-libs/cairo-1.16.0[X?]
-	>=media-libs/fontconfig-2.13.0:1.0
-	>=media-libs/freetype-2.9.0:2
-	>=dev-libs/libgcrypt-1.7.0:0=
-	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
-	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
-	>=dev-libs/icu-61.2:=
-	media-libs/libjpeg-turbo:0=
-	>=media-libs/libepoxy-1.4.0
-	>=net-libs/libsoup-3.0.8:3.0[introspection?]
-	>=dev-libs/libxml2-2.8.0:2
-	>=media-libs/libpng-1.4:0=
-	dev-db/sqlite:3
-	sys-libs/zlib:0
-	>=app-accessibility/at-spi2-core-2.46.0:2
-	media-libs/libwebp:=
-
-	>=dev-libs/glib-2.70.0:2
-	>=dev-libs/libxslt-1.1.7
-	media-libs/woff2
-	keyring? ( app-crypt/libsecret )
-	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
-	dev-libs/libtasn1:=
-	spell? ( >=app-text/enchant-0.22:2 )
-	gstreamer? (
-		>=media-libs/gstreamer-1.20:1.0
-		>=media-libs/gst-plugins-base-1.20:1.0[egl,X?]
-		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
-		!gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
-		>=media-plugins/gst-plugins-opus-1.20:1.0
-		>=media-libs/gst-plugins-bad-1.20:1.0
-	)
-
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXrender
-		x11-libs/libXt
-	)
-
-	dev-libs/hyphen
-	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
-	avif? ( >=media-libs/libavif-0.9.0:= )
-	lcms? ( media-libs/lcms:2 )
-
-	media-libs/mesa
-	media-libs/libglvnd
-	wayland? (
-		dev-libs/wayland
-		>=dev-libs/wayland-protocols-1.12
-		>=gui-libs/libwpe-1.5.0:1.0
-		>=gui-libs/wpebackend-fdo-1.7.0:1.0
-	)
-
-	seccomp? (
-		>=sys-apps/bubblewrap-0.3.1
-		sys-libs/libseccomp
-		sys-apps/xdg-dbus-proxy
-	)
-
-	systemd? ( sys-apps/systemd:= )
-	gamepad? ( >=dev-libs/libmanette-0.2.4 )
-	!<net-libs/webkit-gtk-2.38:4
-"
-DEPEND="${RDEPEND}"
-# Need real bison, not yacc
-BDEPEND="
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=app-accessibility/at-spi2-core-2.5.3
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/gperf-3.0.1
-	dev-util/unifdef
-	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	>=dev-lang/perl-5.10
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-	virtual/perl-JSON-PP
-"
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++17 ; then
-			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
-		fi
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-	gnome2_src_prepare
-	eapply "${FILESDIR}/${PV}"-Cherry-pick-264395-main-4977290ab4ab-.-https-bugs.we.patch
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
-	fi
-
-	# Ruby situation is a bit complicated. See bug 513888
-	local rubyimpl
-	local ruby_interpreter=""
-	local RUBY
-	for rubyimpl in ${USE_RUBY}; do
-		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}(-)]"; then
-			RUBY="$(type -P ${rubyimpl})"
-			ruby_interpreter="-DRUBY_EXECUTABLE=${RUBY}"
-		fi
-	done
-	# This will rarely occur. Only a couple of corner cases could lead us to
-	# that failure. See bug 513888
-	[[ -z ${ruby_interpreter} ]] && die "No suitable ruby interpreter found"
-	# JavaScriptCore/Scripts/postprocess-asm invokes another Ruby script directly
-	# so it doesn't respect RUBY_EXECUTABLE, bug #771744.
-	sed -i -e "s:#!/usr/bin/env ruby:#!${RUBY}:" $(grep -rl "/usr/bin/env ruby" Source/JavaScriptCore || die) || die
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-
-	local mycmakeargs=(
-		-DPython_EXECUTABLE="${PYTHON}"
-		${ruby_interpreter}
-		$(cmake_use_find_package gles2-only OpenGLES2)
-		$(cmake_use_find_package !gles2-only OpenGL)
-		# If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
-		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap
-		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
-		-DPORT=GTK
-		# Source/cmake/WebKitFeatures.cmake
-		-DENABLE_API_TESTS=OFF
-		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
-		-DENABLE_GAMEPAD=$(usex gamepad)
-		-DENABLE_MINIBROWSER=$(usex examples)
-		-DENABLE_PDFJS=$(usex pdf)
-		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
-		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
-		-DENABLE_WEBDRIVER=ON
-		-DENABLE_WEBGL=ON
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		-DUSE_AVIF=$(usex avif)
-		# Source/cmake/OptionsGTK.cmake
-		-DENABLE_GLES2=$(usex gles2-only)
-		-DENABLE_DOCUMENTATION=OFF
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DENABLE_JOURNALD_LOG=$(usex systemd)
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DUSE_GBM=ON
-		-DUSE_GTK4=OFF
-		-DUSE_JPEGXL=OFF
-		-DUSE_LCMS=$(usex lcms)
-		-DUSE_LIBHYPHEN=ON
-		-DUSE_LIBSECRET=$(usex keyring)
-		-DUSE_OPENGL_OR_ES=ON
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_SOUP2=OFF
-		-DUSE_WOFF2=ON
-	)
-
-	# https://bugs.gentoo.org/761238
-	append-cppflags -DNDEBUG
-
-	WK_USE_CCACHE=NO cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	insinto /usr/share/gtk-doc/html
-	# This will install API docs specific to webkit2gtk-4.1
-	doins -r "${S}"/Documentation/{jsc-glib,webkit2gtk,webkit2gtk-web-extension}-${SLOT%/*}
-}
-
-pkg_postinst() {
-	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
-	optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta"
-	optfeature "(MPEG-)DASH support" "media-plugins/gst-plugins-dash"
-	optfeature "HTTP-Live-Streaming support" "media-plugins/gst-plugins-hls"
-}
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.2-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.2-r600.ebuild
deleted file mode 100644
index 5d85b604bbdf..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.2-r600.ebuild
+++ /dev/null
@@ -1,252 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_REQ_USE="xml(+)"
-PYTHON_COMPAT=( python3_{9..12} )
-USE_RUBY="ruby30 ruby31 ruby32"
-
-inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="https://www.webkitgtk.org"
-SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2+ BSD"
-SLOT="6/0" # soname version of libwebkit2gtk-6.0
-KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
-
-IUSE="aqua avif examples gamepad gles2-only keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
-REQUIRED_USE="|| ( aqua wayland X )"
-
-# Tests do not run when built from tarballs
-# https://bugs.webkit.org/show_bug.cgi?id=215986
-RESTRICT="test"
-
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is
-# experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
-# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
-# TODO: gst-plugins-base[X] is only needed when build configuration ends up
-# with GLX set, but that's a bit automagic too to fix
-# Softblocking webkit-gtk-2.38:4 as we going to use webkit-2.38:4.1's WebKitDriver binary
-RDEPEND="
-	>=x11-libs/cairo-1.16.0[X?]
-	>=media-libs/fontconfig-2.13.0:1.0
-	>=media-libs/freetype-2.9.0:2
-	>=dev-libs/libgcrypt-1.7.0:0=
-	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
-	gui-libs/gtk:4
-	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
-	>=dev-libs/icu-61.2:=
-	media-libs/libjpeg-turbo:0=
-	>=media-libs/libepoxy-1.4.0
-	>=net-libs/libsoup-3.0.8:3.0[introspection?]
-	>=dev-libs/libxml2-2.8.0:2
-	>=media-libs/libpng-1.4:0=
-	dev-db/sqlite:3
-	sys-libs/zlib:0
-	>=app-accessibility/at-spi2-core-2.46.0:2
-	media-libs/libwebp:=
-
-	>=dev-libs/glib-2.70.0:2
-	>=dev-libs/libxslt-1.1.7
-	media-libs/woff2
-	keyring? ( app-crypt/libsecret )
-	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
-	dev-libs/libtasn1:=
-	spell? ( >=app-text/enchant-0.22:2 )
-	gstreamer? (
-		>=media-libs/gstreamer-1.20:1.0
-		>=media-libs/gst-plugins-base-1.20:1.0[egl,X?]
-		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
-		!gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
-		>=media-plugins/gst-plugins-opus-1.20:1.0
-		>=media-libs/gst-plugins-bad-1.20:1.0
-	)
-
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXrender
-		x11-libs/libXt
-	)
-
-	dev-libs/hyphen
-	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
-	avif? ( >=media-libs/libavif-0.9.0:= )
-	lcms? ( media-libs/lcms:2 )
-
-	media-libs/mesa
-	media-libs/libglvnd
-	wayland? (
-		dev-libs/wayland
-		>=dev-libs/wayland-protocols-1.12
-		>=gui-libs/libwpe-1.5.0:1.0
-		>=gui-libs/wpebackend-fdo-1.7.0:1.0
-	)
-
-	seccomp? (
-		>=sys-apps/bubblewrap-0.3.1
-		sys-libs/libseccomp
-		sys-apps/xdg-dbus-proxy
-	)
-
-	systemd? ( sys-apps/systemd:= )
-	gamepad? ( >=dev-libs/libmanette-0.2.4 )
-	!<net-libs/webkit-gtk-2.38:4
-"
-DEPEND="${RDEPEND}"
-# Need real bison, not yacc
-BDEPEND="
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=app-accessibility/at-spi2-core-2.5.3
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/gperf-3.0.1
-	dev-util/unifdef
-	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	>=dev-lang/perl-5.10
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-	virtual/perl-JSON-PP
-"
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++17 ; then
-			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
-		fi
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-	gnome2_src_prepare
-	eapply "${FILESDIR}/${PV}"-Cherry-pick-264395-main-4977290ab4ab-.-https-bugs.we.patch
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
-	fi
-
-	# Ruby situation is a bit complicated. See bug 513888
-	local rubyimpl
-	local ruby_interpreter=""
-	local RUBY
-	for rubyimpl in ${USE_RUBY}; do
-		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}(-)]"; then
-			RUBY="$(type -P ${rubyimpl})"
-			ruby_interpreter="-DRUBY_EXECUTABLE=${RUBY}"
-		fi
-	done
-	# This will rarely occur. Only a couple of corner cases could lead us to
-	# that failure. See bug 513888
-	[[ -z ${ruby_interpreter} ]] && die "No suitable ruby interpreter found"
-	# JavaScriptCore/Scripts/postprocess-asm invokes another Ruby script directly
-	# so it doesn't respect RUBY_EXECUTABLE, bug #771744.
-	sed -i -e "s:#!/usr/bin/env ruby:#!${RUBY}:" $(grep -rl "/usr/bin/env ruby" Source/JavaScriptCore || die) || die
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-
-	local mycmakeargs=(
-		-DPython_EXECUTABLE="${PYTHON}"
-		${ruby_interpreter}
-		$(cmake_use_find_package gles2-only OpenGLES2)
-		$(cmake_use_find_package !gles2-only OpenGL)
-		# If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
-		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap
-		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
-		-DPORT=GTK
-		# Source/cmake/WebKitFeatures.cmake
-		-DENABLE_API_TESTS=OFF
-		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
-		-DENABLE_GAMEPAD=$(usex gamepad)
-		-DENABLE_MINIBROWSER=$(usex examples)
-		-DENABLE_PDFJS=$(usex pdf)
-		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
-		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
-		-DENABLE_WEBDRIVER=OFF # Disable WebDriver for webkit2gtk-5.0 and use the webkit2gtk-4.1
-		-DENABLE_WEBGL=ON
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		-DUSE_AVIF=$(usex avif)
-		# Source/cmake/OptionsGTK.cmake
-		-DENABLE_GLES2=$(usex gles2-only)
-		-DENABLE_DOCUMENTATION=OFF
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DENABLE_JOURNALD_LOG=$(usex systemd)
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DUSE_GBM=ON
-		-DUSE_GTK4=ON # webkit2gtk-6.0
-		-DUSE_JPEGXL=OFF
-		-DUSE_LCMS=$(usex lcms)
-		-DUSE_LIBHYPHEN=ON
-		-DUSE_LIBSECRET=$(usex keyring)
-		-DUSE_OPENGL_OR_ES=ON
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_SOUP2=OFF
-		-DUSE_WOFF2=ON
-	)
-
-	# https://bugs.gentoo.org/761238
-	append-cppflags -DNDEBUG
-
-	WK_USE_CCACHE=NO cmake_src_configure
-}
-
-pkg_postinst() {
-	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
-	optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta"
-	optfeature "(MPEG-)DASH support" "media-plugins/gst-plugins-dash"
-	optfeature "HTTP-Live-Streaming support" "media-plugins/gst-plugins-hls"
-}
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.2.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.2.ebuild
deleted file mode 100644
index a7bc67cdb5e0..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.2.ebuild
+++ /dev/null
@@ -1,249 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_REQ_USE="xml(+)"
-PYTHON_COMPAT=( python3_{9..12} )
-USE_RUBY="ruby30 ruby31 ruby32"
-
-inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="https://www.webkitgtk.org"
-SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2+ BSD"
-SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
-
-IUSE="aqua avif examples gamepad gles2-only keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
-REQUIRED_USE="|| ( aqua wayland X )"
-
-# Tests do not run when built from tarballs
-# https://bugs.webkit.org/show_bug.cgi?id=215986
-RESTRICT="test"
-
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is
-# experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
-# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
-# TODO: gst-plugins-base[X] is only needed when build configuration ends up
-#       with GLX set, but that's a bit automagic too to fix
-RDEPEND="
-	>=x11-libs/cairo-1.16.0[X?]
-	>=media-libs/fontconfig-2.13.0:1.0
-	>=media-libs/freetype-2.9.0:2
-	>=dev-libs/libgcrypt-1.7.0:0=
-	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
-	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
-	>=dev-libs/icu-61.2:=
-	media-libs/libjpeg-turbo:0=
-	>=media-libs/libepoxy-1.4.0
-	>=net-libs/libsoup-2.54:2.4[introspection?]
-	>=dev-libs/libxml2-2.8.0:2
-	>=media-libs/libpng-1.4:0=
-	dev-db/sqlite:3
-	sys-libs/zlib:0
-	>=app-accessibility/at-spi2-core-2.46.0:2
-	media-libs/libwebp:=
-
-	>=dev-libs/glib-2.70.0:2
-	>=dev-libs/libxslt-1.1.7
-	media-libs/woff2
-	keyring? ( app-crypt/libsecret )
-	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
-	dev-libs/libtasn1:=
-	spell? ( >=app-text/enchant-0.22:2 )
-	gstreamer? (
-		>=media-libs/gstreamer-1.20:1.0
-		>=media-libs/gst-plugins-base-1.20:1.0[egl,X?]
-		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
-		!gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
-		>=media-plugins/gst-plugins-opus-1.20:1.0
-		>=media-libs/gst-plugins-bad-1.20:1.0
-	)
-
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXrender
-		x11-libs/libXt
-	)
-
-	dev-libs/hyphen
-	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
-	avif? ( >=media-libs/libavif-0.9.0:= )
-	lcms? ( media-libs/lcms:2 )
-
-	media-libs/mesa
-	media-libs/libglvnd
-	wayland? (
-		dev-libs/wayland
-		>=dev-libs/wayland-protocols-1.12
-		>=gui-libs/libwpe-1.5.0:1.0
-		>=gui-libs/wpebackend-fdo-1.7.0:1.0
-	)
-
-	seccomp? (
-		>=sys-apps/bubblewrap-0.3.1
-		sys-libs/libseccomp
-		sys-apps/xdg-dbus-proxy
-	)
-
-	systemd? ( sys-apps/systemd:= )
-	gamepad? ( >=dev-libs/libmanette-0.2.4 )
-"
-DEPEND="${RDEPEND}"
-# Need real bison, not yacc
-BDEPEND="
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=app-accessibility/at-spi2-core-2.5.3
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/gperf-3.0.1
-	dev-util/unifdef
-	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	>=dev-lang/perl-5.10
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-	virtual/perl-JSON-PP
-"
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++17 ; then
-			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
-		fi
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-	gnome2_src_prepare
-	eapply "${FILESDIR}/${PV}"-Cherry-pick-264395-main-4977290ab4ab-.-https-bugs.we.patch
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
-	fi
-
-	# Ruby situation is a bit complicated. See bug 513888
-	local rubyimpl
-	local ruby_interpreter=""
-	local RUBY
-	for rubyimpl in ${USE_RUBY}; do
-		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}(-)]"; then
-			RUBY="$(type -P ${rubyimpl})"
-			ruby_interpreter="-DRUBY_EXECUTABLE=${RUBY}"
-		fi
-	done
-	# This will rarely occur. Only a couple of corner cases could lead us to
-	# that failure. See bug 513888
-	[[ -z ${ruby_interpreter} ]] && die "No suitable ruby interpreter found"
-	# JavaScriptCore/Scripts/postprocess-asm invokes another Ruby script directly
-	# so it doesn't respect RUBY_EXECUTABLE, bug #771744.
-	sed -i -e "s:#!/usr/bin/env ruby:#!${RUBY}:" $(grep -rl "/usr/bin/env ruby" Source/JavaScriptCore || die) || die
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-
-	local mycmakeargs=(
-		-DPython_EXECUTABLE="${PYTHON}"
-		${ruby_interpreter}
-		$(cmake_use_find_package gles2-only OpenGLES2)
-		$(cmake_use_find_package !gles2-only OpenGL)
-		# If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
-		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap
-		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
-		-DPORT=GTK
-		# Source/cmake/WebKitFeatures.cmake
-		-DENABLE_API_TESTS=OFF
-		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
-		-DENABLE_GAMEPAD=$(usex gamepad)
-		-DENABLE_MINIBROWSER=$(usex examples)
-		-DENABLE_PDFJS=$(usex pdf)
-		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
-		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
-		-DENABLE_WEBDRIVER=OFF # Disable WebDriver for webkit2gtk-4.0 and use the webkit2gtk-4.1
-		-DENABLE_WEBGL=ON
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		-DUSE_AVIF=$(usex avif)
-		# Source/cmake/OptionsGTK.cmake
-		-DENABLE_GLES2=$(usex gles2-only)
-		-DENABLE_DOCUMENTATION=OFF
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DENABLE_JOURNALD_LOG=$(usex systemd)
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DUSE_GBM=ON
-		-DUSE_GTK4=OFF
-		-DUSE_JPEGXL=OFF
-		-DUSE_LCMS=$(usex lcms)
-		-DUSE_LIBHYPHEN=ON
-		-DUSE_LIBSECRET=$(usex keyring)
-		-DUSE_OPENGL_OR_ES=ON
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_SOUP2=ON
-		-DUSE_WOFF2=ON
-	)
-
-	# https://bugs.gentoo.org/761238
-	append-cppflags -DNDEBUG
-
-	WK_USE_CCACHE=NO cmake_src_configure
-}
-
-pkg_postinst() {
-	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
-	optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta"
-	optfeature "(MPEG-)DASH support" "media-plugins/gst-plugins-dash"
-	optfeature "HTTP-Live-Streaming support" "media-plugins/gst-plugins-hls"
-}
author	V3n3RiX <venerix@koprulu.sector>	2023-07-18 00:58:25 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2023-07-18 00:58:25 +0100
commit	5e0a5ca921524f8859808527a57655eec16efa52 (patch)
tree	7c58411b1e81478df4e20082a6adec2553c24c5c /net-libs
parent	4c16e0a214824f15f09396e359db4f1f5c086fec (diff)