gentoo auto-resync : 17:07:2024 - 12:28:31

8 files changed, 72 insertions, 8 deletions

diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 360f3503d929..28054a23dc96 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/elinks/Manifest b/www-client/elinks/Manifest
index eb22ce31395c..d2e8c222fcc8 100644
--- a/www-client/elinks/Manifest
+++ b/www-client/elinks/Manifest
@@ -1,6 +1,8 @@
+AUX elinks-0.16.1.1-ecmascript-implicit-declaration.patch 1092 BLAKE2B 405c7a670ac059a4772d348b2a8d904caa21992a9d0c6ce9e9e727f08815e38c58bafc412505504d0321017f692edd4dde1846de8ec9da26b2837350bd33415e SHA512 815f9f4e6623e04770a91b006f5711a3ffe408640f125e75141f3d63502821a65b1ca5bac0f8e49bb48f2910bc268f52305fc70736803f0adc744dddd60cac47
 AUX elinks-0.16.1.1-perl-5.38.patch 1527 BLAKE2B 1a39c77ef9d29490c745e58998e6798dbb74faf399a50cbba32beac2b5e09ec55f047594d120c9c8db79201ef0f24633e5cd96b16a7eb9c201a061bf5372636b SHA512 64dbe341b15eea0cb0795909e745f74bee17ff6a3e38425a3fc48c5881fccf48d510ca4e2737e44e87dee9700b774a86700ec256a5fc0c6fe6540fca0ad33d2e
+AUX elinks-0.16.1.1-python-3.12.patch 974 BLAKE2B 65d50497cf889704ea9a4c0c23b6ee2108fd2c8312ea5be7758dc6e99d06edb57a30533b92e1893829549009c46a4cfb37e726f1a1cff203f48e5d394c1cd826 SHA512 a0b457e47762dd0c25d49d8c98f9d325e21232e431b6569c16cd9c6b989e79791bf182c1790f9193370c9abd31235ab1408c14384a70138b4e2d707f12067948
 DIST elinks-0.16.1.1.tar.xz 2037292 BLAKE2B 05578eaa7a88f0abe4472b876a1f72645d32119ce807a61962f8d24a5b444240d3b94189bf25142c0e51e2d404d5992ace07ecc23ef1316d5f3942736b265267 SHA512 49e03ff4766e29b6fd4324d226e415ca1329a84d4a44fac40ecd72186dd104de88c3e541810a008dc6f1d1ed889a45edbef159cbc6ac3860756ca21261ffec8a
-EBUILD elinks-0.16.1.1-r2.ebuild 4769 BLAKE2B e141e9a71a8a20dec53491bfa2178a58c920d1592970883fc169850b48f6b7dea4bbbc1cfb10676f3c287f5bceb55e681a048c531f549093019ad3bfb6245229 SHA512 62b64d6335da8478ee7ee5bc89b0eae20207fb3bcf51b65147d10e60b3495d1e6e4586d6d575efa2742aee9b3f757b8bf5384cc706d3f4578ea41fd7e8fda7a8
-EBUILD elinks-0.16.1.1-r3.ebuild 4875 BLAKE2B 4add3c143298f045d6e196331b5943282bc5a3cc923b553398f0173f09feb5876731ad33ed696df3b085284c6cebce124c38db28edf1e04aedefa9c362e4cab3 SHA512 a265704a66e67fdcc1504f5cbaae8c505aa61cd8a7d8acd2388be283712822b20a65ee91c54c366599cff7c164db6c2fa607bee826c958e6818dca5df2bdfc4e
+EBUILD elinks-0.16.1.1-r2.ebuild 4837 BLAKE2B 84697e3d1b34f8bf3cef12bf811c2f7abab371e51fd3cdb252e93a2be41dc87d5fe0073acd9303651b8da39e22f1c3e30c6e88d41f7e70b5215ad200a7d624c8 SHA512 77052e3de0c3dc652809856081f174400c68e8184b27d6f76dcb5e4655b77a2dc64c9ef36a31c6a27700a688826eabf409565d7ea6320764005c507f36f9c669
+EBUILD elinks-0.16.1.1-r4.ebuild 4991 BLAKE2B 376f07508ceab6c8dd26ec471001a5946c90f9fde39d86e99f71aab94ee4f03c72dc9b9d8cdd70aac4d86b9c2bc0466ab69ca706729c8b61997c3a86d4837594 SHA512 31772266848bf2ae8e817d8f8c5c5d3ac4ca37ef15fbd3eff081cab41f7d616caed9fc1d0ce4cef4c2713245de299131bf573f3a60ade778c8399b243c30429f
 EBUILD elinks-9999.ebuild 4818 BLAKE2B 49ebb2eaba85fd8968a41625a400e88071617821664254420d3ddcac370e4fdadee1d008baa10ae8de94a0e34ecccc9837bcef196af3b4a64f71e4cdff69c942 SHA512 87459f2d656f09005659d0719c08d82416ce44df1b414e9fc48a65682d10dbe1a645cb8a713550779a9cd4db1b5e07d2b5ce953983f872680824b3db10b905b0
 MISC metadata.xml 938 BLAKE2B 93a927137d89d306b73f04faad6f43714b00349810b0531e274b90d086fda7285d992734263dee5b5274857af1d615e61871d9348e0e8dc759717a7fc4332e50 SHA512 9ba6c3d9228c5f74304447d469afa2ff2984fa3d637faaee7946d442b979c6c99eab87726b4f88aef4af43c515f3105c97fc8d6d64965794bbd6c4c539ac199c
diff --git a/www-client/elinks/elinks-0.16.1.1-r2.ebuild b/www-client/elinks/elinks-0.16.1.1-r2.ebuild
index 2dc43c6bdc37..6f3d271ae412 100644
--- a/www-client/elinks/elinks-0.16.1.1-r2.ebuild
+++ b/www-client/elinks/elinks-0.16.1.1-r2.ebuild
@@ -69,6 +69,7 @@ BDEPEND="
 "
 
 PATCHES=(
+	"${FILESDIR}"/${PN}-0.16.1.1-ecmascript-implicit-declaration.patch
 	"${FILESDIR}"/${PN}-0.16.1.1-perl-5.38.patch
 )
 
diff --git a/www-client/elinks/elinks-0.16.1.1-r3.ebuild b/www-client/elinks/elinks-0.16.1.1-r4.ebuild
index bef5b7bb9a45..a56703fb7e56 100644
--- a/www-client/elinks/elinks-0.16.1.1-r3.ebuild
+++ b/www-client/elinks/elinks-0.16.1.1-r4.ebuild
@@ -72,7 +72,9 @@ BDEPEND="
 "
 
 PATCHES=(
+	"${FILESDIR}"/${PN}-0.16.1.1-ecmascript-implicit-declaration.patch
 	"${FILESDIR}"/${PN}-0.16.1.1-perl-5.38.patch
+	"${FILESDIR}"/${PN}-0.16.1.1-python-3.12.patch
 )
 
 pkg_setup() {
diff --git a/www-client/elinks/files/elinks-0.16.1.1-ecmascript-implicit-declaration.patch b/www-client/elinks/files/elinks-0.16.1.1-ecmascript-implicit-declaration.patch
new file mode 100644
index 000000000000..58c98cc27da0
--- /dev/null
+++ b/www-client/elinks/files/elinks-0.16.1.1-ecmascript-implicit-declaration.patch
@@ -0,0 +1,36 @@
+--- elinks-0.16.1.1/src/document/html/parser/general.c	2024-06-06 07:10:40.163191871 +0200
++++ elinks-0.16.1.1/src/document/html/parser/general.c	2024-06-06 07:11:45.913711031 +0200
+@@ -38,6 +38,10 @@
+ #include "util/memory.h"
+ #include "util/string.h"
+ 
++#ifdef CONFIG_ECMASCRIPT
++#include "ecmascript/ecmascript.h"
++#endif
++
+ /* Unsafe macros */
+ #include "document/html/internal.h"
+ 
+--- elinks-0.16.1.1/src/document/html/parser/stack.c	2023-05-01 10:45:22.000000000 +0200
++++ elinks-0.16.1.1/src/document/html/parser/stack.c	2024-06-06 07:11:29.892765184 +0200
+@@ -24,6 +24,10 @@
+ #include "util/memory.h"
+ #include "util/string.h"
+ 
++#ifdef CONFIG_ECMASCRIPT
++#include "ecmascript/ecmascript.h"
++#endif
++
+ /* Unsafe macros */
+ #include "document/html/internal.h"
+ 
+--- elinks-0.16.1.1/src/ecmascript/ecmascript.h.orig	2024-06-06 07:18:53.237018842 +0200
++++ elinks-0.16.1.1/src/ecmascript/ecmascript.h	2024-06-06 07:20:04.434093077 +0200
+@@ -26,6 +26,7 @@
+ #include "main/module.h"
+ #include "main/timer.h"
+ #include "util/time.h"
++#include <stdbool.h>
+ 
+ //#define ECMASCRIPT_DEBUG 1
+ 
diff --git a/www-client/elinks/files/elinks-0.16.1.1-python-3.12.patch b/www-client/elinks/files/elinks-0.16.1.1-python-3.12.patch
new file mode 100644
index 000000000000..e6ac9f004463
--- /dev/null
+++ b/www-client/elinks/files/elinks-0.16.1.1-python-3.12.patch
@@ -0,0 +1,26 @@
+From 2577da89420ce2a1d58fadd7f2e6809d2ba70dd8 Mon Sep 17 00:00:00 2001
+From: Witold Filipczyk <witekfl@poczta.onet.pl>
+Date: Mon, 10 Jun 2024 13:07:23 +0200
+Subject: [PATCH] [python] module imp is deprecated. Refs #313
+
+---
+ src/scripting/python/core.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/scripting/python/core.c b/src/scripting/python/core.c
+index 185561108..4a69e4293 100644
+--- a/src/scripting/python/core.c
++++ b/src/scripting/python/core.c
+@@ -138,10 +138,10 @@ hooks_module_exists(void)
+ 	 * indicates that no such module was found; any other exception will
+ 	 * be reported as an error.
+ 	 */
+-	imp_module = PyImport_ImportModule("imp");
++	imp_module = PyImport_ImportModule("importlib.util");
+ 	if (!imp_module) goto python_error;
+ 
+-	result = PyObject_CallMethod(imp_module, "find_module", "s", "hooks");
++	result = PyObject_CallMethod(imp_module, "find_spec", "s", "hooks");
+ 	if (result) {
+ 		found_hooks = 1;
+ 		goto end;
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index cebf850c050d..5ba4878c046a 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -211,6 +211,6 @@ DIST firefox-128.0-xh.xpi 417021 BLAKE2B 50961db41b3ea9a1cac9f5ca60ff7c69c262b7f
 DIST firefox-128.0-zh-CN.xpi 654723 BLAKE2B 55a9f29335f9d75f71b01aef5b13afd7bc4d74d334a85d97c89212d8e127c9732f494afa39cedcab6efecf59997c967e593478ffd48e6dfb25e2aa6ecb0fcf58 SHA512 a9f11798976e69b2faf44dfd2bcbd1294b0c771f9673ba168c2e0a351a1df346c3c74670fae9ed729cc37f1dc4c19df92b20e977da4d60a8a016383ff9192d32
 DIST firefox-128.0-zh-TW.xpi 656867 BLAKE2B a0a83d940a8a78a8436f5b708d4443ed448d0b676bd6c52901d58c557d28c4cd17c54bbfdc8fbed8cd5b8f522da646ab80927bcbf516ac572db0c1a53472ee07 SHA512 1617aa2937547da420fa95c40cef125898967912c2d1030488ffb4ec953432df75cacd2af7a6907684491ee3f52e52b1d0e855759a141ee2cf605714d0e80a0f
 DIST firefox-128.0.source.tar.xz 560761840 BLAKE2B a50c7ded69d86c9d45475e701f83295ab6ccfc4eb59d9c91379504bc35dd0e7e1fb59e8c7737684709fe62969b9762e2960fa90607c83f9e8d637b78e60f56b3 SHA512 309c0e2a0bea5699e6daf4fa02300ad7fd118d2c02c35cb5fa97a5fcc6e250cc7aec34e50fe872b8fd516436bfcfe37ddf33c9d0f9291860388cd6f3f08ea9f1
-EBUILD firefox-115.13.0.ebuild 40747 BLAKE2B 3ad1298d9dc4f602a0128b248e4c3776574a9bbd24e2d9416440510f5e0a6ca106e7384f88ac2c2daedb469178b898d38dc1a6bad944e93cfea5445b68a7a943 SHA512 72bfaedc12948dc72530cc4a10ca3dbb522fd5f54a19d7456b13f040323cce84930092381269a723b23e212224cec25ac886f44b7cf20a1f8afb05d02a696a90
+EBUILD firefox-115.13.0.ebuild 40710 BLAKE2B 6d1aa7f38c5370a656b8a224f71ebfd929d1751adbcb8e0606fe6aaf59a5c19b880a4c7f77a313cf374125e6ded3df02a234db3f08e6dc6470bd7c79e7b5a0ea SHA512 33c6623fb27a7162f52b6bd0e611162c88d556b7bb139acaf2de526a96d42fcba6704323320fb61d78096f1969e2d36fcc528c45e2b09349e0fdc703b0b3f406
 EBUILD firefox-128.0.ebuild 41898 BLAKE2B 84e0433817a5fdc4b0f899bd5f590fd86bdcdd83da6263c08ecbd78e12d867072321ba97fcb36f0b4e0d17fbccd49f7344cc8f0ed1c822dc96b03f03eb2151e3 SHA512 44615b70e22242decb263dad08f9bbbb67704280276f1c6f19ddb9b879718acbccf6038e6865d59156fb6e3e8d0cdad475c89196151dfadeb656f64a92f1c267
 MISC metadata.xml 2597 BLAKE2B b449997bc096ed8fb7bde41a5acb8d9f4c1c8cfc9663c06ff603cca756e8868d40049fd292a459a00d80b4e8c3a74e91e29fcb04abe87277640fe65d070f0bda SHA512 703c7f6a2b46748786145b0973a7b8439e530c96fd7c50d773efac7d5d9bf74ccb4f0c252f2701459944f2b3ced22d3e57ddf049b9aed0c8f0e094cabddda251
diff --git a/www-client/firefox/firefox-115.13.0.ebuild b/www-client/firefox/firefox-115.13.0.ebuild
index 2402163d52e3..5890b9ed1acc 100644
--- a/www-client/firefox/firefox-115.13.0.ebuild
+++ b/www-client/firefox/firefox-115.13.0.ebuild
@@ -123,13 +123,10 @@ BDEPEND="${PYTHON_DEPS}
 	>=dev-util/cbindgen-0.24.3
 	net-libs/nodejs
 	virtual/pkgconfig
-	!clang? (
-		>=virtual/rust-1.65
-		<virtual/rust-1.78
-	)
+	!clang? ( virtual/rust )
 	!elibc_glibc? (
 		|| (
-			<dev-lang/rust-1.78
+			dev-lang/rust
 			<dev-lang/rust-bin-1.73
 		)
 	)