gentoo auto-resync : 01:01:2023 - 02:21:02

5 files changed, 75 insertions, 3 deletions

diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index de3de7a9bd60..b9634d1d7115 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/elinks/Manifest b/www-client/elinks/Manifest
index 27e88b549d4d..7abd475b9b19 100644
--- a/www-client/elinks/Manifest
+++ b/www-client/elinks/Manifest
@@ -1,10 +1,12 @@
 AUX elinks-0.13.5-parallel-make.patch 1620 BLAKE2B d3b345813b9c9c82a93f2709036d9ae63f8014b6ff50d96f5534d1c08a0eaf73825da5cf1605d8a0997c6bd659b621b8f174a555f1adc026823fd2f87196eadb SHA512 bdd612c1ce226115170e97d70519b5ec4816d8469e0cd31ec66000b603c92913645f2b57eca9f030b90af811e43db5647928d27f7bc3a8c06560be40a8063248
 AUX elinks-0.15.1-no-mouse-build.patch 1363 BLAKE2B 226f194389aa48520089c62a15c9c910aa7db9cac56c2922c321d5e7cda08df09a2075fd2a077dbe3fbaab5b4b60809d69e6536ae3f5a4ddfb64b97f60e30824 SHA512 faa9dcd6cce8dda22e4a9366b8b0af282b720b2232fa8012d15762cad233429ae4bb1c763a8cb630155d845e4c089e2f01bea3bce1529c5fb7a686170351d76d
+AUX elinks-0.16.0-fix-build-mujs.patch 1352 BLAKE2B e87a02d985cb7972646ab667dc8ad6818c0bf7b2f18bc830fd8b83bb3af9f95bd8bbcefd2771de77de1c55fc19b30fe88c285d4b430e600f5c07ed6e5a07e551 SHA512 de310b2c35cf4dae7a6655c39c0698dc24a16268f036a57c42f1d000f6ebf67a26535fa9f93b6de5f6c604afe152a44ece763923e4377f0e6137320d331c0137
+AUX elinks-0.16.0-fix-tests.patch 694 BLAKE2B c56212b531da4ddf4500a1e995a064e39d64c095bfd34616235a3ff317e845b4ee60d921e62a3e6aeb2187a98fa648ecb25f0331c6e8a20e8580872033d5e4c3 SHA512 c85f48f31180f477470559955768fbb4e46acc340d0efa568804b064f2ec0dea0c94bb4ce80bacd0960f65b809895e30185cd7037070fddad1fe80c4b29cecdf
 DIST elinks-0.13.5.tar.gz 3600196 BLAKE2B e1e51674b5630d6dab3de3030aee671876750fc97808bf4dca50b505fa2c31af669c4c3773b3830186fb98acda5c692ff1902c6e1240251ea699103a70bb4e43 SHA512 786f6142c03bca4a47a1043ca4f9c36aab431d192eb13bcad14c1da391f5746779a8f65e53eb781dff79f619ceb3ed30ef939eae8d81f64251fad9b803c0ae7b
 DIST elinks-0.15.1.tar.xz 1997208 BLAKE2B dcec7054d417842e709f26bab53ddb1bf43556de4c69d116ad1e049664bc7c5a5513f02cee500d591252b439a66f354079e2e3eff5692202102cb900e06340c2 SHA512 677eeeeab3fc24dcfe4e7248a9c1a8e07083ebd13bd9923d89702a04dbe1c3e4d4038029c095881183d7f11ae2c5317ff7e5458320644fde0c176378b89068d8
 DIST elinks-0.16.0.tar.xz 2029708 BLAKE2B b81dfeb303d2e33c88f063925f61dbf50a1cf8462cf3d000b70e01b210855682352303646c7d4dc2c5bdd0de41c3ce33d222c636be4d8292cbe8379b4b043ef8 SHA512 b1d6040b691610d596e0d1eae26bfe52d702272c71a2e5100ab7d6b05b24a0b88524d4fc7be3f6371e0bada1e6f0992da7505a72419ca642dec778424629a522
 EBUILD elinks-0.13.5-r100.ebuild 3790 BLAKE2B 776e05d0e117f418c3a6b287e458b7fc928769516b1212518c369f2f3c8fd060ae8650dfec516dde7181ae8baa03f607d4b67732af5c629e6c60b5dd856ef7e3 SHA512 e05697df2ea94642e0a5cc8a970b4a52e2bd50b4013d4db0f2dc8b6d9337f2dd8416fc4a1f8ae7e8cefc4087c595014d3a772c1344e08cac8a793808bd1badcc
 EBUILD elinks-0.15.1-r1.ebuild 3978 BLAKE2B 4f63ecb1b0014efaa34dd4ecac26df07b05e6e4d35a1cf71c4e5e957b4bf1d192875b108626730044aed00e96a6b965159d392433e3b591a7d7755c2b7052477 SHA512 3b2fe6c3bb9b56f9ecfe46f6b4b7e5ae5f779abb76747e67d303879edd91d31c6ca2237245b14683c969f4e2c87126ee2d9d41a2cbd90a5f8c31cbf187159130
-EBUILD elinks-0.16.0.ebuild 4156 BLAKE2B 0146011c3ecbf5f8eec21e98c621a1dcbb7b18d9934ab6fc3a9aad80fe3a53c246ef645db25fa7044a02ee153bdf1ff5f088bae295a75bcc18ab9d4aa68a2f7b SHA512 65ebd103c7f61d855cdead32c27dbdc4f4ee8124b0c368eec8468158e7c681acba052ed7abee9eb69e930080b267d77664324ed1b8710e5d7852ebbc5e13114a
+EBUILD elinks-0.16.0.ebuild 4183 BLAKE2B 2945a3bc8272717493e3d667412f42b9c5ac02582c680a1669f43299c16d1c0c4b2b7394ca854fcf9073f9421e76cd5be54d3a751e2f9165b165ca1043fd3b30 SHA512 adadc97f979ceea064b67eeb9ed04d1b5b6120c56df2685008b97498051fdca06526992a583ede43f3f49fa9ce9dd4eb56d23055aa14e314d6a44cfec6e142b7
 EBUILD elinks-9999.ebuild 4156 BLAKE2B 0146011c3ecbf5f8eec21e98c621a1dcbb7b18d9934ab6fc3a9aad80fe3a53c246ef645db25fa7044a02ee153bdf1ff5f088bae295a75bcc18ab9d4aa68a2f7b SHA512 65ebd103c7f61d855cdead32c27dbdc4f4ee8124b0c368eec8468158e7c681acba052ed7abee9eb69e930080b267d77664324ed1b8710e5d7852ebbc5e13114a
 MISC metadata.xml 1005 BLAKE2B 1e40dd6ba072df609a2ec93e5ae5af079137e19d38b058df45dbe63e4ecfb6facc9d89a206991713616d9c0671eece6ebbe8eeaa9e4c284e982bada17c149570 SHA512 432636be610931a5087b3ebcf70d250b212b8c4f7c236679a2a5207996393329b3db31432228fa6ac2e2fd8348d8e2c04dba9b817526ecbe314276f55e0dfe2e
diff --git a/www-client/elinks/elinks-0.16.0.ebuild b/www-client/elinks/elinks-0.16.0.ebuild
index 4c021b32fc24..c6a436b48a77 100644
--- a/www-client/elinks/elinks-0.16.0.ebuild
+++ b/www-client/elinks/elinks-0.16.0.ebuild
@@ -24,8 +24,7 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="bittorrent brotli bzip2 debug finger ftp gopher gpm gnutls guile idn"
 IUSE+=" javascript lua lzma +mouse nls nntp perl samba ssl test tre unicode X xml zlib zstd"
-# tests restricted for https://github.com/rkd77/elinks/issues/203
-RESTRICT="!test? ( test ) test"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
 
 RDEPEND="
@@ -65,6 +64,11 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-tests.patch
+	"${FILESDIR}"/${PN}-0.16.0-fix-build-mujs.patch
+)
+
 pkg_setup() {
 	use lua && lua-single_pkg_setup
 
diff --git a/www-client/elinks/files/elinks-0.16.0-fix-build-mujs.patch b/www-client/elinks/files/elinks-0.16.0-fix-build-mujs.patch
new file mode 100644
index 000000000000..030280c61f1e
--- /dev/null
+++ b/www-client/elinks/files/elinks-0.16.0-fix-build-mujs.patch
@@ -0,0 +1,47 @@
+https://github.com/rkd77/elinks/issues/204
+https://github.com/rkd77/elinks/pull/205
+
+From 5cb602191830737531f8c715f47f7429959b2471 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sat, 31 Dec 2022 21:06:57 +0000
+Subject: [PATCH] Fix build failures with mujs
+
+Closes: https://github.com/rkd77/elinks/issues/204
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/src/document/html/parser/general.c
++++ b/src/document/html/parser/general.c
+@@ -41,6 +41,9 @@
+ /* Unsafe macros */
+ #include "document/html/internal.h"
+ 
++#if defined(CONFIG_ECMASCRIPT_SMJS) || defined(CONFIG_QUICKJS) || defined(CONFIG_MUJS)
++#include "ecmascript/ecmascript.h"
++#endif
+ 
+ void
+ html_span(struct html_context *html_context, char *a,
+--- a/src/document/html/parser/stack.c
++++ b/src/document/html/parser/stack.c
+@@ -27,6 +27,10 @@
+ /* Unsafe macros */
+ #include "document/html/internal.h"
+ 
++#if defined(CONFIG_ECMASCRIPT_SMJS) || defined(CONFIG_QUICKJS) || defined(CONFIG_MUJS)
++#include "ecmascript/ecmascript.h"
++#endif
++
+ #if 0 //def CONFIG_XML
+ #include <libxml++/libxml++.h>
+ #endif
+--- a/src/ecmascript/ecmascript.h
++++ b/src/ecmascript/ecmascript.h
+@@ -5,6 +5,8 @@
+ /* In the future you will get DOM, a complete ECMAScript interface and free
+  * plasm displays for everyone. */
+ 
++#include <stdbool.h>
++
+ #ifdef HAVE_CONFIG_H
+ #include "config.h"
+ #endif
+
diff --git a/www-client/elinks/files/elinks-0.16.0-fix-tests.patch b/www-client/elinks/files/elinks-0.16.0-fix-tests.patch
new file mode 100644
index 000000000000..6b46b63afcdd
--- /dev/null
+++ b/www-client/elinks/files/elinks-0.16.0-fix-tests.patch
@@ -0,0 +1,19 @@
+https://github.com/rkd77/elinks/issues/203
+https://github.com/rkd77/elinks/commit/aa8d7989815d48b6afdc3e321bd859f4453bacf2
+
+From aa8d7989815d48b6afdc3e321bd859f4453bacf2 Mon Sep 17 00:00:00 2001
+From: Witold Filipczyk <witekfl@poczta.onet.pl>
+Date: Fri, 30 Dec 2022 09:35:41 +0100
+Subject: [PATCH] [test] Strange endif . Refs #203
+
+--- a/src/dom/test/meson.build
++++ b/src/dom/test/meson.build
+@@ -28,7 +28,6 @@ meson.source_root()+'/src/dom/sgml/xbel/xbel.c',
+ testdeps,
+ c_args:['-DHAVE_CONFIG_H'], cpp_args:['-DHAVE_CONFIG_H'], include_directories:['.', '../..', '../../..'],
+ build_by_default:false)
+-endif
+ 
+ test_lib = environment({'TEST_LIB': meson.source_root()+'/test/libtest.sh'})
+ 
+