gentoo auto-resync : 20:01:2024 - 20:08:51

3 files changed, 357 insertions, 2 deletions

diff --git a/media-gfx/iscan/Manifest b/media-gfx/iscan/Manifest
index 7371da31568f..d39a842cda25 100644
--- a/media-gfx/iscan/Manifest
+++ b/media-gfx/iscan/Manifest
@@ -15,11 +15,12 @@ AUX iscan-3.62.0-tests-boost.patch 2819 BLAKE2B 8c11f7bd80c5cbc0c34c0aacf605a914
 AUX iscan-3.62.0-tests-linkage.patch 3921 BLAKE2B 0dedae75fbbe387d2db900eb88b0e839746cfcbfa2b2ed7d52f9fd1b6756f14aa8fc53708ab2d1e461dff25ebe4e73e97f647ba4792bd263021f9b94f7b50139 SHA512 0b84829871ef45acf0ac209a0ba315b88409429c454b4655a4004c9d1afddf88d1ae0b1fff891078f5cf68541f7a8d896d50a550b650f1157517d5dbc99bfbd4
 AUX iscan-3.62.0-tests-tesseract.patch 3825 BLAKE2B ee16bab5f36e866d2a212f832f90b8fa078cfea51dd81ae8175086ce896b718c52f2dd5c56ba15ddf89427abde6231b93672a71467d18fc47c45fdd166efce54 SHA512 63cf6b7f42f6cc1dfc05e9a5d333514aa56ba658e96a860b753d9a120df79a41abbd0fcc04070e103908bf05648dcdff96eab343981fa0f5293aee4258309980
 AUX iscan-3.63.0-autoconf-2.70.patch 1147 BLAKE2B d87e32fa8510096fe965ec24a21276e0c7ba0b838cb2eb5228bb0a336db037dd77240895d61eb574abbc03334d44b0c1467c4bf1dc48a69c72518cfd64d90a51 SHA512 6a58a0df2cd579ea85ea30c263d4538dae8abbfc65d3e102ac546e282bbc8ef72762894c926fc0500322b99364b815f29eb86a098989e4c67675d5d92efa304a
+AUX iscan-3.65.0-boost-1.84-headers.patch 14361 BLAKE2B c007e82f8491420e18cf126db3f33328213ffd70c0380cba5d5b4698ceb932bf3e4c312a068ce9f5baea9ed010a5d2ad0e7416236fd57ab543cf471edcb0273a SHA512 4535388021b7c62a9f915bb7fb9a459dbe44b5684382ee3f31a71e6eea39f07b4c2d1135dd9f475483bcfa63934df2ea3f1e65241d70d41093440a89005e56cb
 AUX iscan-3.65.0-sane-backends-1.1.patch 353 BLAKE2B 07ddf999ab1c3b1cd9fae482425ef86080dc07cb5323093cd89a9f0622db6efc0bb5473fd45d913459aebb2052eeb2b2c65dd2c0223b3be51d791fe28f688a39 SHA512 e88f6aa3b0f86153db1c24ad19862fe97dd6a71dcc5b822e643d50d0e0c82ec4cea1fa61f1809f382fd0abb7568ab3b42b1c8587d2f6e49cacb29a5b30c151c6
 DIST imagescan_3.65.0.orig.tar.gz 12651383 BLAKE2B e1436b6d6bf9fc3fc4e5185706fc814e1a4351bf37cd733a3fb88cd16a1c3422ebe0bf4cca77ac00c431edc990aaa50b8994e3bc0f72acba3b0e0608882b63ae SHA512 c719ac540af496efe72b2be87a2b89cbec8eee61a2a985574d0db766c00b7187315378382d8501e26dad132e93de3d3e9431c8e679b569f3c35ea8181b1ca022
 DIST iscan_2.30.4-2.tar.gz 1236167 BLAKE2B 598e55aa7099f7973b38f5c3227415c8ddfa7e8c645521981b4e8979047ab692427f5c1719fd83fe0635f2d4604f32f0baff8542f3e1a333298799c4cad7b980 SHA512 b12f374ff8ee1e1879fc6dbc579de39d7bcd4777ec7ad6e4345046f77b4ec13ae45ebdc2803d6907bc2747776aa7e32c313866138c7b8c7bcb53110a214154d2
 DIST userg_revQ_e.pdf 627189 BLAKE2B ff57871c58dc541e30d65127bd8f4cc2a20ec5341c1d0914116f7ec4ae002d896853b99488eec71e5f8cb150e6b63d353efb9be11977de26d017701bc051014a SHA512 b09d5143855a759e0fa3e74794762566b6fbf734642f9d7f712e5f2f20e3dce6b830465fd65f83f9cc368292ce7a2c0cec709b0eba6356d95e1ba5114b3348fc
 DIST userg_revQ_j.pdf 734920 BLAKE2B ed2cffdc2dbf0a2403dcbd93cef3349b9e35afb305f9b36f92b8f11bd42b5281fc7bfbec108703f327fb538868c530418406d37505e6eb6afa621d2d49d007ba SHA512 d5cb0cebaae0ac36951379cad516f0575e85e0bb509cf88549239e300c7d6c6a4996497145acaa9e9783de6b08c6e352c7ffbedb23ed04c15eefbe9c3cf0bc90
 EBUILD iscan-2.30.4.2-r3.ebuild 4012 BLAKE2B 11bba57421eda6c24c285fb0bd1e39e2e9618790b48dded5cace806a3b15fff661fcaef9ca0dddef13589387c0b490036c279b5026e1cfde3edd1519bc89c89c SHA512 27dafa8850935ab565f174b343c341bc96035ff3522fd33b32ec2642a85ec60173b231b7fa18ab5e2d7425fde7494c1c7e7f0a276519c36fa496e9518ad281ec
-EBUILD iscan-3.65.0-r1.ebuild 3017 BLAKE2B d05fcf13d112e68b4282e61845bc3b060d453bd199c79e6205253926377bf3634ab79cd978c2d80aeed7f7251f6f644c029685abd8b43475b2eedc5a48cfebfb SHA512 31a2426f7ccad6d7b960b017691e8ddce83ee880342151cedf8d43f797ad7dbd50079c1079a4c4e6a7388c9ab6ad7108df6e8522362df0d05fb07e72dac2280a
+EBUILD iscan-3.65.0-r2.ebuild 3070 BLAKE2B c52c3d075b0fd665bb3fb3449b7065e8cf4b70b2392335f3e7466a952c60a820ad1d60dcb7a7416e411a4328e87ad50b6c61ecc07a6e1a8dd51d552d8eee1aac SHA512 93cce9123d8a71543dcd708b0736f7751b48113b22fcb801067888be5028f74fb09ef36a07a422f975e5b5abf29a32fc297765900923b708f464987b6375085d
 MISC metadata.xml 817 BLAKE2B 950bbe19f60e4a52f29d7a2a00dc5c48383dfcd7ce194fc8f8be7265e65de3bfd59235697e3d9ed11bd44c3ef576a711e989da568794bf28b6d67a1c042ebabc SHA512 938ae05d7f9f6ebb283a9e6b36a6279a54e891f1f1ce569cc77dfc7fe306857d7dc9d3cd410b0e4b949530870cd5d13b4c3e2fc7d70bb3c754b42bc12001ee49
diff --git a/media-gfx/iscan/files/iscan-3.65.0-boost-1.84-headers.patch b/media-gfx/iscan/files/iscan-3.65.0-boost-1.84-headers.patch
new file mode 100644
index 000000000000..426b3345f1c7
--- /dev/null
+++ b/media-gfx/iscan/files/iscan-3.65.0-boost-1.84-headers.patch
@@ -0,0 +1,353 @@
+--- utsushi-0.65.0/drivers/esci/grammar-automatic-feed.hpp	2024-01-08 22:20:05.171112996 +0100
++++ utsushi-0.65.0/drivers/esci/grammar-automatic-feed.hpp	2024-01-08 22:25:43.442258670 +0100
+@@ -24,8 +24,7 @@
+ //! \copydoc grammar.hpp
+ 
+ #include <boost/operators.hpp>
+-#include <boost/spirit/include/karma_rule.hpp>
+-#include <boost/spirit/include/karma_symbols.hpp>
++#include <boost/spirit/include/karma.hpp>
+ 
+ #include "buffer.hpp"
+ #include "code-token.hpp"
+--- utsushi-0.65.0/drivers/esci/grammar-automatic-feed.ipp	2024-01-08 22:20:05.167779489 +0100
++++ utsushi-0.65.0/drivers/esci/grammar-automatic-feed.ipp	2024-01-08 22:22:23.921745849 +0100
+@@ -24,11 +24,7 @@
+ //! \copydoc grammar.ipp
+ 
+ //  encoding::basic_grammar_automatic_feed<T> implementation requirements
+-#include <boost/spirit/include/karma_binary.hpp>
+-#include <boost/spirit/include/karma_char_.hpp>
+-
+-//  Support for debugging of parser and generator rules
+-#include <boost/spirit/include/karma_nonterminal.hpp>
++#include <boost/spirit/include/karma.hpp>
+ 
+ #include "code-point.hpp"
+ #include "grammar-automatic-feed.hpp"
+--- utsushi-0.65.0/drivers/esci/grammar-capabilities.hpp	2024-01-08 22:21:32.725717869 +0100
++++ utsushi-0.65.0/drivers/esci/grammar-capabilities.hpp	2024-01-08 22:27:49.542243597 +0100
+@@ -28,7 +28,7 @@
+ 
+ #include <boost/operators.hpp>
+ #include <boost/optional.hpp>
+-#include <boost/spirit/include/qi_rule.hpp>
++#include <boost/spirit/include/qi.hpp>
+ #include <boost/variant.hpp>
+ 
+ #include <utsushi/constraint.hpp>
+--- utsushi-0.65.0/drivers/esci/grammar-capabilities.ipp	2024-01-08 22:21:32.722384361 +0100
++++ utsushi-0.65.0/drivers/esci/grammar-capabilities.ipp	2024-01-08 22:26:39.831899213 +0100
+@@ -24,23 +24,11 @@
+ //! \copydoc grammar.ipp
+ 
+ //  decoding::basic_grammar_capabilities<T> implementation requirements
+-#include <boost/spirit/include/qi_alternative.hpp>
+-#include <boost/spirit/include/qi_and_predicate.hpp>
+-#include <boost/spirit/include/qi_binary.hpp>
+-#include <boost/spirit/include/qi_difference.hpp>
+-#include <boost/spirit/include/qi_eoi.hpp>
+-#include <boost/spirit/include/qi_expect.hpp>
+-#include <boost/spirit/include/qi_matches.hpp>
+-#include <boost/spirit/include/qi_permutation.hpp>
+-#include <boost/spirit/include/qi_plus.hpp>
+-#include <boost/spirit/include/qi_skip.hpp>
++#include <boost/spirit/include/qi.hpp>
+ 
+ //  *::basic_grammar_capabilities<T> implementation requirements
+ #include <boost/fusion/include/adapt_struct.hpp>
+ 
+-//  Support for debugging of parser rules
+-#include <boost/spirit/include/qi_nonterminal.hpp>
+-
+ #include "grammar-capabilities.hpp"
+ 
+ namespace utsushi {
+--- utsushi-0.65.0/drivers/esci/grammar-formats.hpp	2024-01-08 22:21:32.725717869 +0100
++++ utsushi-0.65.0/drivers/esci/grammar-formats.hpp	2024-01-08 22:23:48.012841294 +0100
+@@ -26,10 +26,8 @@
+ #include <sstream>
+ #include <string>
+ 
+-#include <boost/spirit/include/karma_generate.hpp>
+-#include <boost/spirit/include/karma_rule.hpp>
+-#include <boost/spirit/include/qi_parse.hpp>
+-#include <boost/spirit/include/qi_rule.hpp>
++#include <boost/spirit/include/karma.hpp>
++#include <boost/spirit/include/qi.hpp>
+ 
+ #include <utsushi/cstdint.hpp>
+ 
+--- utsushi-0.65.0/drivers/esci/grammar-formats.ipp	2024-01-08 22:21:32.725717869 +0100
++++ utsushi-0.65.0/drivers/esci/grammar-formats.ipp	2024-01-08 22:28:50.565464000 +0100
+@@ -24,37 +24,16 @@
+ //! \copydoc grammar.ipp
+ 
+ //  decoding::basic_grammar_formats<T> implementation requirements
+-#include <boost/spirit/include/qi_action.hpp>
+-#include <boost/spirit/include/qi_alternative.hpp>
+-#include <boost/spirit/include/qi_and_predicate.hpp>
+-#include <boost/spirit/include/qi_binary.hpp>
+-#include <boost/spirit/include/qi_char_class.hpp>
+-#include <boost/spirit/include/qi_repeat.hpp>
+-#include <boost/spirit/include/qi_sequence.hpp>
+-#include <boost/spirit/include/qi_uint.hpp>
++#include <boost/spirit/include/qi.hpp>
+ 
+ //  encoding::basic_grammar_formats<T> implementation requirements
+-#include <boost/spirit/include/karma_action.hpp>
+-#include <boost/spirit/include/karma_alternative.hpp>
+-#include <boost/spirit/include/karma_binary.hpp>
+-#include <boost/spirit/include/karma_char_.hpp>
+-#include <boost/spirit/include/karma_eps.hpp>
+-#include <boost/spirit/include/karma_int.hpp>
+-#include <boost/spirit/include/karma_repeat.hpp>
+-#include <boost/spirit/include/karma_right_alignment.hpp>
+-#include <boost/spirit/include/karma_sequence.hpp>
+-#include <boost/spirit/include/karma_upper_lower_case.hpp>
++#include <boost/spirit/include/karma.hpp>
+ #include "upstream/include/no_attribute_directive.hpp"
+ 
+ //  *::basic_grammar_formats<T> implementation requirements
+-#include <boost/spirit/include/phoenix_container.hpp>
+-#include <boost/spirit/include/phoenix_operator.hpp>
++#include <boost/phoenix.hpp>
+ #include <boost/spirit/include/support_ascii.hpp>
+ 
+-//  Support for debugging of parser and generator rules
+-#include <boost/spirit/include/qi_nonterminal.hpp>
+-#include <boost/spirit/include/karma_nonterminal.hpp>
+-
+ #include "code-point.hpp"
+ #include "grammar-formats.hpp"
+ 
+--- utsushi-0.65.0/drivers/esci/grammar.hpp	2024-01-08 22:21:32.719050852 +0100
++++ utsushi-0.65.0/drivers/esci/grammar.hpp	2024-01-08 22:22:42.532725739 +0100
+@@ -35,10 +35,8 @@
+ 
+ #include <boost/operators.hpp>
+ #include <boost/optional.hpp>
+-#include <boost/spirit/include/karma_delimit.hpp>
+-#include <boost/spirit/include/karma_rule.hpp>
+-#include <boost/spirit/include/karma_symbols.hpp>
+-#include <boost/spirit/include/qi_rule.hpp>
++#include <boost/spirit/include/karma.hpp>
++#include <boost/spirit/include/qi.hpp>
+ 
+ #include "buffer.hpp"
+ #include "code-token.hpp"
+--- utsushi-0.65.0/drivers/esci/grammar-information.hpp	2024-01-08 22:21:32.719050852 +0100
++++ utsushi-0.65.0/drivers/esci/grammar-information.hpp	2024-01-08 22:26:20.097525012 +0100
+@@ -28,7 +28,7 @@
+ 
+ #include <boost/operators.hpp>
+ #include <boost/optional.hpp>
+-#include <boost/spirit/include/qi_rule.hpp>
++#include <boost/spirit/include/qi.hpp>
+ 
+ #include "code-token.hpp"
+ #include "grammar-formats.hpp"
+--- utsushi-0.65.0/drivers/esci/grammar-information.ipp	2024-01-08 22:21:32.722384361 +0100
++++ utsushi-0.65.0/drivers/esci/grammar-information.ipp	2024-01-08 22:27:01.883062422 +0100
+@@ -24,23 +24,11 @@
+ //! \copydoc grammar.ipp
+ 
+ //  decoding::basic_grammar_information<T> implementation requirements
+-#include <boost/spirit/include/qi_alternative.hpp>
+-#include <boost/spirit/include/qi_and_predicate.hpp>
+-#include <boost/spirit/include/qi_binary.hpp>
+-#include <boost/spirit/include/qi_difference.hpp>
+-#include <boost/spirit/include/qi_eoi.hpp>
+-#include <boost/spirit/include/qi_expect.hpp>
+-#include <boost/spirit/include/qi_matches.hpp>
+-#include <boost/spirit/include/qi_permutation.hpp>
+-#include <boost/spirit/include/qi_plus.hpp>
+-#include <boost/spirit/include/qi_skip.hpp>
++#include <boost/spirit/include/qi.hpp>
+ 
+ //  *::basic_grammar_information<T> implementation requirements
+ #include <boost/fusion/include/adapt_struct.hpp>
+ 
+-//  Support for debugging of parser rules
+-#include <boost/spirit/include/qi_nonterminal.hpp>
+-
+ #include "grammar-information.hpp"
+ 
+ namespace utsushi {
+--- utsushi-0.65.0/drivers/esci/grammar.ipp	2024-01-08 22:21:32.725717869 +0100
++++ utsushi-0.65.0/drivers/esci/grammar.ipp	2024-01-08 22:29:05.462917002 +0100
+@@ -33,31 +33,14 @@
+  */
+ 
+ //  decoding::basic_grammar<T> implementation requirements
+-#include <boost/spirit/include/qi_action.hpp>
+-#include <boost/spirit/include/qi_alternative.hpp>
+-#include <boost/spirit/include/qi_and_predicate.hpp>
+-#include <boost/spirit/include/qi_attr.hpp>
+-#include <boost/spirit/include/qi_binary.hpp>
+-#include <boost/spirit/include/qi_difference.hpp>
+-#include <boost/spirit/include/qi_eoi.hpp>
+-#include <boost/spirit/include/qi_expect.hpp>
+-#include <boost/spirit/include/qi_kleene.hpp>
+-#include <boost/spirit/include/qi_omit.hpp>
+-#include <boost/spirit/include/qi_optional.hpp>
+-#include <boost/spirit/include/qi_permutation.hpp>
++#include <boost/spirit/include/qi.hpp>
+ 
+ //  encoding::basic_grammar<T> implementation requirements
+-#include <boost/spirit/include/karma_binary.hpp>
+-#include <boost/spirit/include/karma_char_.hpp>
+-#include <boost/spirit/include/karma_sequence.hpp>
++#include <boost/spirit/include/karma.hpp>
+ 
+ //  *::basic_grammar<T> implementation requirements
+ #include <boost/fusion/include/adapt_struct.hpp>
+-#include <boost/spirit/include/phoenix_operator.hpp>
+-
+-//  Support for debugging of parser and generator rules
+-#include <boost/spirit/include/qi_nonterminal.hpp>
+-#include <boost/spirit/include/karma_nonterminal.hpp>
++#include <boost/phoenix.hpp>
+ 
+ #include "grammar.hpp"
+ 
+--- utsushi-0.65.0/drivers/esci/grammar-mechanics.hpp	2024-01-08 22:20:05.171112996 +0100
++++ utsushi-0.65.0/drivers/esci/grammar-mechanics.hpp	2024-01-08 22:22:23.921745849 +0100
+@@ -24,8 +24,7 @@
+ //! \copydoc grammar.hpp
+ 
+ #include <boost/operators.hpp>
+-#include <boost/spirit/include/karma_rule.hpp>
+-#include <boost/spirit/include/karma_symbols.hpp>
++#include <boost/spirit/include/karma.hpp>
+ 
+ #include "buffer.hpp"
+ #include "code-token.hpp"
+--- utsushi-0.65.0/drivers/esci/grammar-mechanics.ipp	2024-01-08 22:20:05.167779489 +0100
++++ utsushi-0.65.0/drivers/esci/grammar-mechanics.ipp	2024-01-08 22:22:23.921745849 +0100
+@@ -24,21 +24,11 @@
+ //! \copydoc grammar.ipp
+ 
+ //  encoding::basic_grammar_mechanics<T> implementation requirements
+-#include <boost/spirit/include/karma_alternative.hpp>
+-#include <boost/spirit/include/karma_and_predicate.hpp>
+-#include <boost/spirit/include/karma_binary.hpp>
+-#include <boost/spirit/include/karma_bool.hpp>
+-#include <boost/spirit/include/karma_buffer.hpp>
+-#include <boost/spirit/include/karma_char_.hpp>
+-#include <boost/spirit/include/karma_optional.hpp>
+-#include <boost/spirit/include/karma_sequence.hpp>
++#include <boost/spirit/include/karma.hpp>
+ 
+ //  *::basic_grammar_mechanics<T> implementation requirements
+ #include <boost/fusion/include/adapt_struct.hpp>
+ 
+-//  Support for debugging of parser and generator rules
+-#include <boost/spirit/include/karma_nonterminal.hpp>
+-
+ #include "code-point.hpp"
+ #include "grammar-mechanics.hpp"
+ 
+--- utsushi-0.65.0/drivers/esci/grammar-parameters.hpp	2024-01-08 22:21:32.722384361 +0100
++++ utsushi-0.65.0/drivers/esci/grammar-parameters.hpp	2024-01-08 22:22:55.200059463 +0100
+@@ -28,9 +28,8 @@
+ 
+ #include <boost/operators.hpp>
+ #include <boost/optional.hpp>
+-#include <boost/spirit/include/karma_rule.hpp>
+-#include <boost/spirit/include/karma_symbols.hpp>
+-#include <boost/spirit/include/qi_rule.hpp>
++#include <boost/spirit/include/karma.hpp>
++#include <boost/spirit/include/qi.hpp>
+ 
+ #include <utsushi/cstdint.hpp>
+ #include <utsushi/quantity.hpp>
+--- utsushi-0.65.0/drivers/esci/grammar-parameters.ipp	2024-01-08 22:21:32.722384361 +0100
++++ utsushi-0.65.0/drivers/esci/grammar-parameters.ipp	2024-01-08 22:23:31.538640070 +0100
+@@ -24,35 +24,14 @@
+ //! \copydoc grammar.ipp
+ 
+ //  decoding::basic_grammar_parameters<T> implementation requirements
+-#include <boost/spirit/include/qi_alternative.hpp>
+-#include <boost/spirit/include/qi_and_predicate.hpp>
+-#include <boost/spirit/include/qi_binary.hpp>
+-#include <boost/spirit/include/qi_eoi.hpp>
+-#include <boost/spirit/include/qi_expect.hpp>
+-#include <boost/spirit/include/qi_kleene.hpp>
+-#include <boost/spirit/include/qi_permutation.hpp>
+-#include <boost/spirit/include/qi_plus.hpp>
+-#include <boost/spirit/include/qi_repeat.hpp>
+-#include <boost/spirit/include/qi_skip.hpp>
++#include <boost/spirit/include/qi.hpp>
+ 
+ //  encoding::basic_grammar_parameters<T> implementation requirements
+-#include <boost/spirit/include/karma_alternative.hpp>
+-#include <boost/spirit/include/karma_binary.hpp>
+-#include <boost/spirit/include/karma_buffer.hpp>
+-#include <boost/spirit/include/karma_char_.hpp>
+-#include <boost/spirit/include/karma_kleene.hpp>
+-#include <boost/spirit/include/karma_optional.hpp>
+-#include <boost/spirit/include/karma_plus.hpp>
+-#include <boost/spirit/include/karma_repeat.hpp>
+-#include <boost/spirit/include/karma_sequence.hpp>
++#include <boost/spirit/include/karma.hpp>
+ 
+ //  *::basic_grammar_parameters<T> implementation requirements
+ #include <boost/fusion/include/adapt_struct.hpp>
+ 
+-//  Support for debugging of parser and generator rules
+-#include <boost/spirit/include/qi_nonterminal.hpp>
+-#include <boost/spirit/include/karma_nonterminal.hpp>
+-
+ #include "grammar-parameters.hpp"
+ 
+ namespace utsushi {
+--- utsushi-0.65.0/drivers/esci/grammar-status.hpp	2024-01-08 22:21:32.722384361 +0100
++++ utsushi-0.65.0/drivers/esci/grammar-status.hpp	2024-01-08 22:27:35.678178729 +0100
+@@ -27,7 +27,7 @@
+ 
+ #include <boost/operators.hpp>
+ #include <boost/optional.hpp>
+-#include <boost/spirit/include/qi_rule.hpp>
++#include <boost/spirit/include/qi.hpp>
+ 
+ #include <utsushi/media.hpp>
+ 
+--- utsushi-0.65.0/drivers/esci/grammar-status.ipp	2024-01-08 22:21:32.722384361 +0100
++++ utsushi-0.65.0/drivers/esci/grammar-status.ipp	2024-01-08 22:27:22.694160350 +0100
+@@ -24,21 +24,11 @@
+ //! \copydoc grammar.ipp
+ 
+ //  decoding::basic_grammar_status<T> implementation requirements
+-#include <boost/spirit/include/qi_alternative.hpp>
+-#include <boost/spirit/include/qi_and_predicate.hpp>
+-#include <boost/spirit/include/qi_attr.hpp>
+-#include <boost/spirit/include/qi_binary.hpp>
+-#include <boost/spirit/include/qi_eoi.hpp>
+-#include <boost/spirit/include/qi_expect.hpp>
+-#include <boost/spirit/include/qi_permutation.hpp>
+-#include <boost/spirit/include/qi_skip.hpp>
++#include <boost/spirit/include/qi.hpp>
+ 
+ //  *::basic_grammar_status<T> implementation requirements
+ #include <boost/fusion/include/adapt_struct.hpp>
+ 
+-//  Support for debugging of parser rules
+-#include <boost/spirit/include/qi_nonterminal.hpp>
+-
+ #include "grammar-status.hpp"
+ 
+ namespace utsushi {
+--- utsushi-0.65.0/drivers/esci/grammar-tracer.hpp	2024-01-08 22:21:32.725717869 +0100
++++ utsushi-0.65.0/drivers/esci/grammar-tracer.hpp	2024-01-08 22:25:58.496385824 +0100
+@@ -24,8 +24,8 @@
+ #include <string>
+ 
+ #include <boost/fusion/include/empty.hpp>
+-#include <boost/spirit/include/karma_nonterminal.hpp>
+-#include <boost/spirit/include/qi_nonterminal.hpp>
++#include <boost/spirit/include/karma.hpp>
++#include <boost/spirit/include/qi.hpp>
+ #include <boost/spirit/include/support_attributes.hpp>
+ 
+ #if !defined (ESCI_GRAMMAR_TRACE_INDENT)
diff --git a/media-gfx/iscan/iscan-3.65.0-r1.ebuild b/media-gfx/iscan/iscan-3.65.0-r2.ebuild
index 21dc24242f01..fe66b5c9f143 100644
--- a/media-gfx/iscan/iscan-3.65.0-r1.ebuild
+++ b/media-gfx/iscan/iscan-3.65.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -49,6 +49,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-3.62.0-tests-linkage.patch
 	"${FILESDIR}"/${PN}-3.63.0-autoconf-2.70.patch
 	"${FILESDIR}"/${PN}-3.65.0-sane-backends-1.1.patch
+	"${FILESDIR}"/${PN}-3.65.0-boost-1.84-headers.patch
 )
 
 src_prepare() {