gentoo auto-resync : 29:10:2024 - 03:04:53

4 files changed, 51 insertions, 30 deletions

diff --git a/www-client/elinks/Manifest b/www-client/elinks/Manifest
index f905473d00dc..1007e8af0fdd 100644
--- a/www-client/elinks/Manifest
+++ b/www-client/elinks/Manifest
@@ -2,12 +2,12 @@ AUX elinks-0.16.1.1-ecmascript-implicit-declaration.patch 1092 BLAKE2B 405c7a670
 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
 AUX elinks-0.17.1.1-gettext.patch 1863 BLAKE2B 114cc2c7496e4278441b3f0e434552eb1f3c7ebcc13f8b62580eae7cc1a9d8a13eacee3f5e96581b4c43ecd83f47e1f8f9df244749bf42dee1e13ef38a1ded83 SHA512 398ff4b8da7d560091eb55a645128a5fd1721c46cfba52381d17749f21b323188191d523ef9ff4954193f931dfff33cbc4f166930c500bb1dcf4a8337fa379db
-AUX elinks-0.17.1.1-sftp.patch 4290 BLAKE2B aa6865cb1403ebef0434b3952e7f41c7fafbd5e26204712f625e80ad751d5b7e749dd9ce0f9ac23ef80f988762e6b58dee6745a8cd0b1c799963f3ab1b440709 SHA512 740576b39faf3ca5a21a959ed73c31a35ceed7be0f8850e1d4068b22e410db99055aaaa3c9b81377d475788d990fa2504ce09e21a397114f1492424e5afcd8b9
+AUX elinks-0.17.1.1-sftp.patch 3976 BLAKE2B 7f06783866e0213bd368237b1b226e8733e8f731979ce7b930f0d0dba4893e05fd8f28f0972e44993d9eb5493584b021a578ccc3ffafa89f0f448fefc17df682 SHA512 83b871e93a80cec4cce79631ba247e2b96d2ada396e6ab7613088123af1580e125d159ba79ee190e183e19d6b6c298421788ba5dee5c68097b6287d67b755668
 DIST elinks-0.16.1.1.tar.xz 2037292 BLAKE2B 05578eaa7a88f0abe4472b876a1f72645d32119ce807a61962f8d24a5b444240d3b94189bf25142c0e51e2d404d5992ace07ecc23ef1316d5f3942736b265267 SHA512 49e03ff4766e29b6fd4324d226e415ca1329a84d4a44fac40ecd72186dd104de88c3e541810a008dc6f1d1ed889a45edbef159cbc6ac3860756ca21261ffec8a
 DIST elinks-0.17.1.1.tar.xz 2001036 BLAKE2B 2158e7630e64977b5250d544159bff0b90953ef7d51870d5e96ce8e36858596e6341bf774ad1717ed4808859d4be316fe75587552e61a8bbfcb00a0366a85e81 SHA512 7ad78f7d6a43341ae252c29f0c338e466cbedf8b40aefa9fa1939dbc62a9c9307b0a423b17181fce3bce1364fe6b6bdb80509ed90719965de174c9258b90902f
 EBUILD elinks-0.16.1.1-r100.ebuild 5191 BLAKE2B 45c67d5e778020f3bdf16d320a814977855e3f0c5b98c4ba8267b2778c0b05efd1c04669325fff6667fe8ed00e724fd823f87db4908c0e4d86be04932ed09034 SHA512 d7203d99155d7dae2069a7ff24276c4046f84d52e9f4dad46f5d4f59dc0ac73df0a11672c075bed222c7b89ca89336481b79cce43f54d700b89be49632a0b0ca
 EBUILD elinks-0.16.1.1-r2.ebuild 4831 BLAKE2B f22e74c3057c6e61b16bbce7b8180c95b6211c727cf24991b8feea6a691875ff204aae1f1245004c97aff5dc207103ef836f3fa10e49ff121ec1703287193270 SHA512 a348da4be7064de605a0854d511c879ff0b14b30b4bc4f7e7c62241705c7d05ee3855e05177f438d963a06ea5fd79431085e097b4556c4def83918d893811c41
 EBUILD elinks-0.16.1.1-r4.ebuild 4980 BLAKE2B 0838214e3b5a02be9b143c87541fdd2c5587ad85a43319b97ee05bfc7757a8296f7b248e404401e161e91920717afa8695a7f38850c4311e0266ac650b84a050 SHA512 846afba108f271d81d25a0b521842436d55bcc28eaf1f58449499c8bf56c52f1022860755e99751865936d0d15f56d449704ad6b0f1af5c545732a72ae772f7c
-EBUILD elinks-0.17.1.1.ebuild 5342 BLAKE2B 55a7aa67585f7df0599b87a631155dff7d1c9de120975404ff394407dd2a9f042ff67894fa15d274fa64958f2a831c6a6f0a9935a64189a06871bf6781e18fe8 SHA512 ea2d7c5fefb9ee4ccddf1ac523144d0641cbc0297676d5875e243366a8268e8c43fa200259eff0e7eb53250b01282d3c709a40147ab3fb2e33a30d8f667a9770
-EBUILD elinks-9999.ebuild 5264 BLAKE2B 0553d382fe48d418c2d56d9ee68dafa8638e79b5ed2fdf2435f8b12d2c1753563e7c4c3d0583d24a97b10419ebd817b7df9764790b68fee85745a51365986d32 SHA512 f6a4fa76b05914af760d26c8146b76105a08b3670977c20c5275463b85d22572f420e68624c8506a5b6930cba392019c50367065e0221a66116e5dea8b584516
+EBUILD elinks-0.17.1.1.ebuild 5497 BLAKE2B ffb87b9dbeb5a617e53434e8892f78b3076a86a4661cdcf9b85095cfc9e18ad341d9330b4da80dcf316c289bc584945655fb3a295824f89f48c7dc9cc1c927fa SHA512 15da1070391a124c9a9f92f0dbbf620203d01281d7755a8cc9ccd18751f0dc9fa5ce7f7e010fe4c2e2610a5c797ab6e54e539b16908ca38bd5ab6eeb068f2530
+EBUILD elinks-9999.ebuild 5296 BLAKE2B e77536bc7f8e0f117575026360d0643f9f6c4f2b26dc002d6f6816bc03f484908bc29e63f28fc327a987cea33e323862d638c0c049ee8bcc773e69e2d94c42bf SHA512 57a18adee8d60bca924f15c0e818f83ca5432722b6e86354328496d6b4248f657c02f20401a2c55da441a2821c0a5a41d901ab92a4cf9e2a4a464075ca9f9328
 MISC metadata.xml 1108 BLAKE2B c1606bb87c902d273a083406ed4b8aeee0a9fb3af56813fe4c9fd34bfb8aaf04a67540ef8daf193c4378810134f36784e755317fdf7fd6357e109d60c20bd756 SHA512 372652a1744438df72d47d57ac05b1f737665e991eff04fe31c5dd3d22b4694053429b71a34a72b80d1c6f60c023a89572fbad734b8b5359ee1df04e86315d55
diff --git a/www-client/elinks/elinks-0.17.1.1.ebuild b/www-client/elinks/elinks-0.17.1.1.ebuild
index ba0f3ed2a59c..9b8c200b66dd 100644
--- a/www-client/elinks/elinks-0.17.1.1.ebuild
+++ b/www-client/elinks/elinks-0.17.1.1.ebuild
@@ -29,6 +29,7 @@ IUSE+=" javascript libcss lua lzma +mouse nls nntp perl python samba ssl test tr
 RESTRICT="!test? ( test )"
 REQUIRED_USE="
 	guile? ( ${GUILE_REQUIRED_USE} )
+	javascript? ( libcss )
 	lua? ( ${LUA_REQUIRED_USE} )
 	python? ( ${PYTHON_REQUIRED_USE} )
 "
@@ -86,12 +87,17 @@ PATCHES=(
 pkg_setup() {
 	use guile && guile-single_pkg_setup
 	use lua && lua-single_pkg_setup
-	use python && python-single-r1_pkg_setup
+	python-single-r1_pkg_setup
 }
 
 src_prepare() {
 	default
 	use guile && guile_bump_sources
+	python_fix_shebang .
+
+	# https://bugs.gentoo.org/show_bug.cgi?id=942286
+	sed -i -e '/find_library/s/, dirs: \[[^]]*\]//' \
+		meson.build || die
 }
 
 src_configure() {
diff --git a/www-client/elinks/elinks-9999.ebuild b/www-client/elinks/elinks-9999.ebuild
index 385322847846..daa906d436ce 100644
--- a/www-client/elinks/elinks-9999.ebuild
+++ b/www-client/elinks/elinks-9999.ebuild
@@ -29,6 +29,7 @@ IUSE+=" javascript libcss lua lzma +mouse nls nntp perl python samba ssl test tr
 RESTRICT="!test? ( test )"
 REQUIRED_USE="
 	guile? ( ${GUILE_REQUIRED_USE} )
+	javascript? ( libcss )
 	lua? ( ${LUA_REQUIRED_USE} )
 	python? ( ${PYTHON_REQUIRED_USE} )
 "
@@ -81,12 +82,13 @@ BDEPEND="
 pkg_setup() {
 	use guile && guile-single_pkg_setup
 	use lua && lua-single_pkg_setup
-	use python && python-single-r1_pkg_setup
+	python-single-r1_pkg_setup
 }
 
 src_prepare() {
 	default
 	use guile && guile_bump_sources
+	python_fix_shebang .
 }
 
 src_configure() {
diff --git a/www-client/elinks/files/elinks-0.17.1.1-sftp.patch b/www-client/elinks/files/elinks-0.17.1.1-sftp.patch
index 2607c90b4fbd..f8f1d5092bff 100644
--- a/www-client/elinks/files/elinks-0.17.1.1-sftp.patch
+++ b/www-client/elinks/files/elinks-0.17.1.1-sftp.patch
@@ -1,18 +1,7 @@
-From 1f0ee66aecbb52f8c423128aa7e0dd35822e989c Mon Sep 17 00:00:00 2001
-From: Witold Filipczyk <witekfl@poczta.onet.pl>
-Date: Mon, 27 May 2024 10:23:46 +0200
-Subject: [PATCH] [protolcols] Do not compile-in SFTP when ftp was disabled.
- Refs #304
+Combination of upstream commits:
+1f0ee66aecbb52f8c423128aa7e0dd35822e989c
+a198d2da3cf958d7c1de3bc02a2ea49c25a3f785
 
----
- src/protocol/curl/ftp.c  | 42 +++-------------------------------------
- src/protocol/curl/http.c | 42 ++++++++++++++++++++++++++++++++++++++++
- src/protocol/curl/sftp.h |  2 +-
- src/protocol/protocol.c  |  2 +-
- 4 files changed, 47 insertions(+), 41 deletions(-)
-
-diff --git a/src/protocol/curl/ftp.c b/src/protocol/curl/ftp.c
-index 5f3d462ac..73120a67d 100644
 --- a/src/protocol/curl/ftp.c
 +++ b/src/protocol/curl/ftp.c
 @@ -55,6 +55,8 @@
@@ -24,7 +13,16 @@ index 5f3d462ac..73120a67d 100644
  static char el_curlversion[256];
  
  static void
-@@ -641,45 +643,6 @@ ftp_curl_handle_error(struct connection *conn, CURLcode res)
+@@ -616,7 +618,7 @@
+ 	abort_connection(conn, connection_state(S_OK));
+ }
+ 
+-static void
++void
+ ftp_curl_handle_error(struct connection *conn, CURLcode res)
+ {
+ 	if (res == CURLE_OK) {
+@@ -635,45 +637,6 @@
  	abort_connection(conn, connection_state(S_CURL_ERROR - res));
  }
  
@@ -70,17 +68,36 @@ index 5f3d462ac..73120a67d 100644
  void
  ftpes_protocol_handler(struct connection *conn)
  {
-@@ -695,3 +658,4 @@ sftp_protocol_handler(struct connection *conn)
+@@ -689,3 +652,4 @@
  		do_ftpes(conn);
  	}
  }
 +#endif
 \ No newline at end of file
-diff --git a/src/protocol/curl/http.c b/src/protocol/curl/http.c
-index e2349489a..25d0eb36d 100644
+--- a/src/protocol/curl/ftpes.h
++++ b/src/protocol/curl/ftpes.h
+@@ -1,6 +1,10 @@
+ #ifndef EL__PROTOCOL_CURL_FTPES_H
+ #define EL__PROTOCOL_CURL_FTPES_H
+ 
++#ifdef CONFIG_LIBCURL
++#include <curl/curl.h>
++#endif
++
+ #include "main/module.h"
+ #include "protocol/protocol.h"
+ 
+@@ -12,6 +16,7 @@
+ 
+ #if defined(CONFIG_FTP) && defined(CONFIG_LIBCURL)
+ extern protocol_handler_T ftpes_protocol_handler;
++void ftp_curl_handle_error(struct connection *conn, CURLcode res);
+ #else
+ #define ftpes_protocol_handler NULL
+ #endif
 --- a/src/protocol/curl/http.c
 +++ b/src/protocol/curl/http.c
-@@ -505,3 +505,45 @@ http_curl_protocol_handler(struct connection *conn)
+@@ -461,3 +461,45 @@
  		do_http(conn);
  	}
  }
@@ -126,11 +143,9 @@ index e2349489a..25d0eb36d 100644
 +	}
 +#endif
 +}
-diff --git a/src/protocol/curl/sftp.h b/src/protocol/curl/sftp.h
-index f9167c3fa..cdcafd572 100644
 --- a/src/protocol/curl/sftp.h
 +++ b/src/protocol/curl/sftp.h
-@@ -10,7 +10,7 @@ extern "C" {
+@@ -10,7 +10,7 @@
  
  extern struct module sftp_protocol_module;
  
@@ -139,11 +154,9 @@ index f9167c3fa..cdcafd572 100644
  extern protocol_handler_T sftp_protocol_handler;
  #else
  #define sftp_protocol_handler NULL
-diff --git a/src/protocol/protocol.c b/src/protocol/protocol.c
-index 930a4f86b..d3fae896c 100644
 --- a/src/protocol/protocol.c
 +++ b/src/protocol/protocol.c
-@@ -336,7 +336,7 @@ static struct module *protocol_submodules[] = {
+@@ -336,7 +336,7 @@
  #ifdef CONFIG_NNTP
  	&nntp_protocol_module,
  #endif