gentoo auto-resync : 01:09:2024 - 12:01:15

11 files changed, 113 insertions, 6 deletions

diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index b3e559b22f1f..40b109e3c9e1 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/ghostscript-gpl/Manifest b/app-text/ghostscript-gpl/Manifest
index 4b50b1b1d17f..df8cf273c1bb 100644
--- a/app-text/ghostscript-gpl/Manifest
+++ b/app-text/ghostscript-gpl/Manifest
@@ -1,6 +1,7 @@
 AUX ghostscript-gpl-10.02.1-c99-2.patch 1892 BLAKE2B 912ec6edaae2f25237190f559a96f746ab42fb484aefe1d3b74a84e624b737fe31585655ff9a8e66d65d0eaa9668e3db35d8eb1e4a745deaedf90af2bc8df02d SHA512 9b2545a76be50d8667c3bd5438ab87b7a11f0e2103372cb62bfeefff229daaba1e739538de083b91b99e34f24635797bc737d4924f474945f63bdfef41083080
 AUX ghostscript-gpl-10.02.1-c99.patch 956 BLAKE2B 9b157eee6f49ae8ef696fc5fa548b5baa3839eb46e17025ccaa1b542d1a29abcca9a004fb297c0f8fd7a41653ee7f961130c8de2edfc4169ac95fce414c039cd SHA512 d5211435f39f76c25cd4f9d4743db789a1c4e7a72ca9aa389f4d83327f227effeeb74edd7938f845d06aa2034942670a5d31a26da8a1ea845439a0cc48c3f758
 AUX ghostscript-gpl-10.03.0-c99.patch 932 BLAKE2B 7cc3ff7557b6f844d58ce45e4b74685a356544288f386a412dfd5e9b38d2c85bc6aaec78e017c1e7a989bab2b10f680fb8ba9a4289f1f243516ce541443bcb46 SHA512 64effbee63e46e46a0b212c703d4892de27f4f56c0864b52866dc4da370070d36da6f89dcc358c01745d51428bd6b8526505b85d32ff19f6f69819d31ab3dce1
+AUX ghostscript-gpl-10.03.1-arm64-neon-tesseract.patch 1395 BLAKE2B 198e8a0c7e3a225b394a5dd1014b1f9413fa67bec54c67d8d3a3445473b2386053b1064ab7335e07affb34515572bedcf89adf41c9f5a64d191f4b4848c0fb3f SHA512 5a8fc4cf38fea58e1e6fe3b7d08850b8374f241edaf39167fae192264c5ddd0d791004fdfcf830a262db476b764f5c09b003db9ee0ce9214b99f162984db1349
 DIST ghostscript-10.02.1.tar.xz 68017088 BLAKE2B b491473f0b3d50121e4373e21af3d8cdf55d9ca4390b240c4cb88d0d44e707e32570a7f1f05cb656d1b65443fcd7e37f5eab404d72a20f83d8fd87370a585467 SHA512 ee0f754c1bd8a18428ad14eaa3ead80ff8b96275af5012e7a8384f1f10490da056eec9ae3cc791a7a13a24e16e54df5bccdd109c7d53a14534bbd7360a300b11
 DIST ghostscript-10.03.0.tar.xz 68041176 BLAKE2B c64e0fc9dd290b81e61793671e8645f16b04070685f6ab9d35a60cb910d7504e1e686525af8b74121ae31a5b344e2332efd8bdf99f2a4c5586bff747b8df78d7 SHA512 74d7da586eefbf3fb3c085bb4d2b73ee667fd0ae9cff73ece613c77c443148b847086f91802124baf91ac35cdc83be07199799378def92c8fbd96ced7d0ee9a8
 DIST ghostscript-10.03.1.tar.xz 68048612 BLAKE2B 991e81c4a9f8459220f6af988fb533cc3c2393fef0c57b35da5685fb6f8b0e76af00457f9b0e552ea241b272cdfaa90cf4a06d6cb1008b55efe782faa14c90da SHA512 59e071cd23aed246b51317d3cccd9ccf8e1e84c4ecf9b22fb938e561eff42cec61915b0bdd96a313a3ea27750579c54ca0d0862b65edd306a621731c0063ffd3
@@ -8,5 +9,5 @@ DIST ghostscript-gpl-10.0-patches.tar.xz 2980 BLAKE2B e2c20195b153bf45f374e84d91
 EBUILD ghostscript-gpl-10.02.1-r1.ebuild 5563 BLAKE2B e6fd8545f17bf87d10a82ea39e70e2a84cbd477c02cd505915176c6939dd2717bf481effc203e788392ee7adaf04f189ca3ecebd331f259604eeba9391811cb4 SHA512 5e602155880d64b95980cf60d77089ecc627f21d1636a0d6b4ea6d73f8909091b6aae9049291a4e88faba5f6e9265c06f70548521bb2471d14fc3e0b167c5008
 EBUILD ghostscript-gpl-10.02.1.ebuild 5514 BLAKE2B b895b5d272942e3c94554e4e212de9755f3d0a2eaf3eaec1ed5e0e8da0690d0650e01d7286bd8cdc97644026d1590888b18c815453ef60ead482053826cb1e5f SHA512 acf696db220c37538286de745ac9cc4a901b3519535c14ce3db1f968c85e4f7e3c410ed4d55d7cb6ff54a5211b3569b05a2b609686ed030c06f00b0bd1c4edbf
 EBUILD ghostscript-gpl-10.03.0-r1.ebuild 5539 BLAKE2B 4feea0e467735aa17d3b64cda357ea7e22c03e005c4feab5b8b0616a25f99a471306533f4fe86da8fe7053f16c354b950e8a9fa3d203c710314d19801cb564e8 SHA512 b4e42085c0e1995104a1664765992154863d628ecbeff0cffb527a9ff3a7a409a4f0a4273598374f08e19106845e04c9c68825458ddd2575b007fbb236a7dda3
-EBUILD ghostscript-gpl-10.03.1.ebuild 5539 BLAKE2B 4feea0e467735aa17d3b64cda357ea7e22c03e005c4feab5b8b0616a25f99a471306533f4fe86da8fe7053f16c354b950e8a9fa3d203c710314d19801cb564e8 SHA512 b4e42085c0e1995104a1664765992154863d628ecbeff0cffb527a9ff3a7a409a4f0a4273598374f08e19106845e04c9c68825458ddd2575b007fbb236a7dda3
+EBUILD ghostscript-gpl-10.03.1.ebuild 5595 BLAKE2B db30e61a8be65e86b65cbb8b2eed5afa97c6e98bf652e0be7ffa5e08136807072fa4b0a9bc0a940fc036ad081e0c56bb91eb80e6deaf1bc1b1256907aec1adea SHA512 72452148d8090b7c56a6b9d6bb866d8a50f49556b643d1d82349e28409a196a6843d0f0ad3aa32a94e58b4d74dced9601bd816feb90320531ee8d5cfc0073899
 MISC metadata.xml 831 BLAKE2B e594fcc7ef78d3eb9f157a46c63f33fd35887fa82cdc304bc4b2db4e772473e8ba695b0ef932a69df0c8a5ac5269955ae600b436444782820475f44c6fc1d9f1 SHA512 2b067dfde63ffd8da3afb27c889884e51a3e1158cef153bc30ffb10a69cb0f7d409bc38a335651010d4e1dddad3bf09a9873445d77416da2bbd2ac7af5ab1598
diff --git a/app-text/ghostscript-gpl/files/ghostscript-gpl-10.03.1-arm64-neon-tesseract.patch b/app-text/ghostscript-gpl/files/ghostscript-gpl-10.03.1-arm64-neon-tesseract.patch
new file mode 100644
index 000000000000..4b64fff16f5e
--- /dev/null
+++ b/app-text/ghostscript-gpl/files/ghostscript-gpl-10.03.1-arm64-neon-tesseract.patch
@@ -0,0 +1,35 @@
+https://bugs.gentoo.org/926891
+https://bugs.gentoo.org/924757
+https://src.fedoraproject.org/rpms/tesseract/raw/rawhide/f/tesseract_neon.patch
+(See https://github.com/tesseract-ocr/tesseract/pull/4154 too)
+--- a/tesseract/CMakeLists.txt
++++ b/tesseract/CMakeLists.txt
+@@ -249,7 +249,7 @@ elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "arm64|aarch64.*|AARCH64.*")
+   set(HAVE_AVX512F FALSE)
+   set(HAVE_FMA FALSE)
+   set(HAVE_SSE4_1 FALSE)
+-  set(HAVE_NEON TRUE)
++  check_cxx_compiler_flag("-mfpu=neon" HAVE_NEON)
+ 
+ elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "arm.*")
+ 
+--- a/tesseract/src/arch/simddetect.cpp
++++ b/tesseract/src/arch/simddetect.cpp
+@@ -254,7 +254,7 @@ SIMDDetect::SIMDDetect() {
+     // SSE detected.
+     SetDotProduct(DotProductSSE, &IntSimdMatrix::intSimdMatrixSSE);
+ #endif
+-#if defined(HAVE_NEON) || defined(__aarch64__)
++#if defined(HAVE_NEON)
+   } else if (neon_available_) {
+     // NEON detected.
+     SetDotProduct(DotProductNEON, &IntSimdMatrix::intSimdMatrixNEON);
+@@ -311,7 +311,7 @@ void SIMDDetect::Update() {
+   } else if (dotproduct == "accelerate") {
+     SetDotProduct(DotProductAccelerate, IntSimdMatrix::intSimdMatrix);
+ #endif
+-#if defined(HAVE_NEON) || defined(__aarch64__)
++#if defined(HAVE_NEON)
+   } else if (dotproduct == "neon" && neon_available_) {
+     // NEON selected by config variable.
+     SetDotProduct(DotProductNEON, &IntSimdMatrix::intSimdMatrixNEON);
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-10.03.1.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-10.03.1.ebuild
index 54f3cdcf36f3..663558774565 100644
--- a/app-text/ghostscript-gpl/ghostscript-gpl-10.03.1.ebuild
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-10.03.1.ebuild
@@ -63,6 +63,7 @@ RDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-10.03.0-c99.patch
+	"${FILESDIR}"/${PN}-10.03.1-arm64-neon-tesseract.patch
 )
 
 src_prepare() {
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 82fc16cf00b6..9ce0a8247207 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -7,6 +7,6 @@ DIST poppler-24.08.0.tar.xz 1912592 BLAKE2B f76ccb8d596909d671df34f6c028e6161ad7
 DIST poppler-24.08.0.tar.xz.sig 833 BLAKE2B d257fc092c8541daf2e88a852655827470fb4890316f0a9b334b18c736ea33500e52c3b6b238047e8e3ded6a155b4466dcfa3afabfede11ed89b3fa17553577e SHA512 5e5c0185db2f3c1e1639e1eead93cf9e282db403edb91750d8ec325ca69f4bfb026345f2e9a8a18ed23a5a02b308163f9b4a8d6a75f9e760414cd709681a25a7
 DIST poppler-test-ff3133cdb6cb496ee1d2c3231bfa35006a5e8410.tar.bz2 5207226 BLAKE2B 15153457989a53301bcdc3468ab2b06b637457199004651b39ea848f488f8a2ba594ce2e36091de4fd06fc0a52b783c6b2ee243ac5d95ce1e9db7483ea880829 SHA512 335cd3d55fc6e28331e791e5b63a08d293abc70764a9f314b2c590c26a5a78b38243c74f988bb95afffe0bdcc54dee1e633dbf1672b19a290be40a298e16995f
 EBUILD poppler-24.06.1.ebuild 4462 BLAKE2B 3140159843c7f88d80405c60f3127ac5a5132c06738ba6035c177b202a3a21d6f1630b1ed9a29d9a5e3f0e7429c865889bb309b9a7a7e9b61b5d347d9b499dd0 SHA512 62a677fb497f87d155222974e0c4c1923f98f714914702858c2861212eb5c8375de6cdae15ef1b9406b07d236a84fd02b032b12883f6d0befccc4dcc751b0b04
-EBUILD poppler-24.08.0.ebuild 4470 BLAKE2B 16fe6d27117e3741032506a11e31d61c404c1a0da08f5feb81fb2ef941cf45346edfbb0ac8ada9c8542bee1f8eca8bc070c27d2485fae2f7664a726f1439ec75 SHA512 951e53f9c1f0210993fe2554b35291d4f1a4d1670d87985ec2db633d33f2d3b90bee840da6feb49d0a16c12724db1f6ce1f407c6885e4699c7a10fdb09f7fe51
+EBUILD poppler-24.08.0.ebuild 4469 BLAKE2B ae715bb79b4cda1d3049028fa368b59d644326ed7ab7638272bdc22d57a7b346726cab055129568f00a298c838535f9001fa3a2cb80accbd865a84533ccff864 SHA512 7bf83e036924d4ae8352beefc6e7ca55ee4db7e5190f1dd38ee8fe107fd8e72fb324cc876c70de1459ca3da0aeddc5aeca72df865ba3cfefd327e0a6ba08f841
 EBUILD poppler-9999.ebuild 4470 BLAKE2B 16fe6d27117e3741032506a11e31d61c404c1a0da08f5feb81fb2ef941cf45346edfbb0ac8ada9c8542bee1f8eca8bc070c27d2485fae2f7664a726f1439ec75 SHA512 951e53f9c1f0210993fe2554b35291d4f1a4d1670d87985ec2db633d33f2d3b90bee840da6feb49d0a16c12724db1f6ce1f407c6885e4699c7a10fdb09f7fe51
 MISC metadata.xml 1230 BLAKE2B e537b88babbb0c4ef5355c57c226d1c27b8b058e85c437962afe3610cf7dcdd4fea4a7694e508314cc5111d7bf09dc67881f0268a5cc8c2ce1e569a6f8c7699d SHA512 92b0a2fb9bf788eab1187657485698322cec7623da7b861ed5134089d0f3fc05f42138f734aa78bb811679203af2c6bf0dad7e78a091d5a51ba16a2aac60a227
diff --git a/app-text/poppler/poppler-24.08.0.ebuild b/app-text/poppler/poppler-24.08.0.ebuild
index 06e7220bfbba..b5f33e74d33d 100644
--- a/app-text/poppler/poppler-24.08.0.ebuild
+++ b/app-text/poppler/poppler-24.08.0.ebuild
@@ -17,7 +17,7 @@ else
 	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
 	SRC_URI+=" test? ( https://gitlab.freedesktop.org/poppler/test/-/archive/${TEST_COMMIT}/test-${TEST_COMMIT}.tar.bz2 -> ${PN}-test-${TEST_COMMIT}.tar.bz2 )"
 	SRC_URI+=" verify-sig? ( https://poppler.freedesktop.org/${P}.tar.xz.sig )"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 	SLOT="0/140"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
diff --git a/app-text/tesseract/Manifest b/app-text/tesseract/Manifest
index 0997ba8da714..ef85d5915fb8 100644
--- a/app-text/tesseract/Manifest
+++ b/app-text/tesseract/Manifest
@@ -1,9 +1,10 @@
 AUX tesseract-5.3.0-gcc-13.patch 748 BLAKE2B de4ce0e2a312497621f1e037aa0e61b1b0b41b23aaca52ba23f331ee415b6f150ca1487806be5373ed68c46265c74137f5b6e5db9eab8940927d5b05eec89c4b SHA512 4bd7db8ade5f40e92f48f0e4771d9f55c738cb74becaa22c823cb03123ef6d56662e59829015aa5c326e790c5d45d9f6ad7d8be253f9d9f08eebb228a54ee6b9
+AUX tesseract-5.4.1-arm64-neon-tesseract.patch 2065 BLAKE2B 1d91cd4d73bd34657f3b2e09372857b4b5f315b72468538e6be61a6526e4ee6f18e50d3f29f54cb86a6dee1625fa8629151fb5aa6deee4f8a250d71d4715baea SHA512 275a6475291d8a218f99258948960115b6a3b83209897d08e914549cf249896ba4c816d6a5c9f97a91e78421066438fa7a0d4276d8b20bd7ef250640a4cb5243
 DIST tesseract-5.3.0.tar.gz 1913678 BLAKE2B 975b3a50dc2c9ec7ded82caaa068d2d9d362ee0bc6d51b41a52c692ac7f51231d4c64a9dda9e7b850297d4c1f13eb40a709e59eebe143df4f5e2a060cfbbfd3a SHA512 fc0cfda980059390b7d6d3d8e475b4ecc9dcfee1abc3b16fc9ffc8904db0a0847a5f6f1b32bd2e1f6f5a714a8c4df0fb3dc7c6aa25ece6162bf52fe86b4d0f34
 DIST tesseract-5.3.4.tar.gz 1918319 BLAKE2B f4becd425594be132df2c206847faa91daf9bc58d83eac31096f92cf7d7b6c9234ae224ee94ed1f3099414bde393bb86f94d1f76fdc05b4310b415b0d7eb05af SHA512 a81c98c3754a71093df7b51390ccd43d05f661352b4cb564e403b96d81909664c2ecbf2eb6f37614c4639e6dadbf2329b926d09271dbbdaa302f2d7b6b0d628a
 DIST tesseract-5.4.1.tar.gz 1899949 BLAKE2B 8e9ff54902d467a4ef0dc61665570a6d34ecdd2d89fd0023775212eb531e3c11659d17e5bb1733f570f785af4714d5a5259d1f809f6e28c0a65375ba02d21bdc SHA512 a97a31d1b735930a3e8b17bc2eae24210d8242d31399822f8bc2e9f18903d513cf6d02b2274e2f3ce431183467570b3327e01cbc49dca80e38acb90327cc235e
 EBUILD tesseract-5.3.0.ebuild 2139 BLAKE2B 5b9be5f2561db2e2da0ad18eb2bfaf160000bd6aff60f6e38640c841681966f389baa61078a7295c860cc01e19ff55ebb0afbbc58f09b2be830c3666899d27b2 SHA512 255492086b001b95a92741e5f3a049e94d1f04deb3542d3cf9e075d2ac7181ff0bae79ad9207f2b10457122ef3c34a5aa32c6535844db585baeca7823c28e674
-EBUILD tesseract-5.3.4.ebuild 2094 BLAKE2B 9362c5b5b5e10282f5c06197e93e544688919fc1f5821327314ee1aa738f579ca27d0f0f68671d2c26b3d8803f3ec19cb586e6d449a12b56844c79997c42e70a SHA512 76d3d13460c5191f56289a5432e0af00beb45452a36ae8531a71ba1c360cb5602bada2da77f1f4226a548b6fd84318ecfc9ec37a6859146d066e41e09614deed
-EBUILD tesseract-5.4.1.ebuild 1947 BLAKE2B 9dc1f43a91a825497d321e6e6e9e688b796545a8397b6409ea6ff111f75e5359515790c3ee0ea6b7db187edd7b70e5504b51a18630ec5be648e11c0ab7b9a268 SHA512 fdefd88563793b9279c741d89abe8a69a35e7067e3c3019785740294540d1089890c03c8f09f08b35302a08a607f7e7dc9e9b2c8a78684e25a3bfede68799f57
-EBUILD tesseract-9999.ebuild 1864 BLAKE2B 5aaf23d01dc425180b0d07210d10e50526ac0037fc579feb42424c521830b64caa7ac00a8aa4a258b09c965037f9c368279d8d7c0376289c276d50237dd72d4f SHA512 0fce3ad6adf33ba6a87ffb8899a309bbbed66cc74eb4ba4f57b0c6bf8533a84dc7836eefd394f5b20cab2d6d2f3fd6aba2f778e79170bbb0bd5f53232ed4dda6
+EBUILD tesseract-5.3.4.ebuild 2161 BLAKE2B b1f0a178aebb45200a31eafd3f53ea9124caa39724dbcbbf612b0f78961a213290ce51a9e5ca1fa514fc38823a3a643736a0da082f3d91c23f07aea8e89b2e9c SHA512 61c5224c482c7b25ebaa99af2046868c03a6b9fe207e73ed07186be4de07396b72dff2c51bb03bcac8b4e683b9e108d7471d9c0d64733eb776669bfb478707fc
+EBUILD tesseract-5.4.1.ebuild 2014 BLAKE2B ee1331a6256ee890407a9e3486a71810005b4dd1b4fe019e81ad383f770f89b1948854878fd1c1074f60430e154edfcd27362874efbeb2349e25f8010ad1f961 SHA512 698b48ced9deceda68390a1d3a96dc4f4d06e373afb117488902629439382401204a1a32028199a1842122f45b1000d31f3c13ed77bb6f856a46f1f5c17e643c
+EBUILD tesseract-9999.ebuild 1931 BLAKE2B 72d131d97c12fada255afe3d09cecc450baba90f341c6501d21cb9fba902ba82f0ec31eeeb09921fb0f0f92014cc9d7d1255e9d79f06151bf1ac08bb869e4e8f SHA512 996557d564fd9634785e8f0c2d38acbd3b355cec06f99bf27a4975b2a163aca7616a2f1280b474af0ea7f2e23b74318b125791b0fde958971bd9b19d9b201b0e
 MISC metadata.xml 1020 BLAKE2B 77f6c8f3962e00b65495fff0176e7765a9583de651db12b0e532ad5ff4b8005ede93d42d58093ae3b397c40d085963f47ef0e41cfed609b581c1a2f8231ccc72 SHA512 d9ea277a6ad9ec5178252863d60bac1244e372ab6c4f4ce3fe4f7220492e78dec2349742699031ed727251f87173e821c64dec44fb9787c08aad216cad64fa05
diff --git a/app-text/tesseract/files/tesseract-5.4.1-arm64-neon-tesseract.patch b/app-text/tesseract/files/tesseract-5.4.1-arm64-neon-tesseract.patch
new file mode 100644
index 000000000000..d3869cfea1dd
--- /dev/null
+++ b/app-text/tesseract/files/tesseract-5.4.1-arm64-neon-tesseract.patch
@@ -0,0 +1,57 @@
+https://bugs.gentoo.org/924757
+https://bugs.gentoo.org/926891
+https://github.com/tesseract-ocr/tesseract/pull/4154
+
+(Note that if moving to CMake, can use the patch from ghostscript-gpl
+instead, i.e. https://src.fedoraproject.org/rpms/tesseract/blob/rawhide/f/tesseract_neon.patch).
+
+From b1e48789d61d995740762f66f505385db42410a5 Mon Sep 17 00:00:00 2001
+From: Jan Palus <jpalus@fastmail.com>
+Date: Mon, 30 Oct 2023 01:36:57 +0100
+Subject: [PATCH] Check if NEON extension are actually available
+
+User may pass own compiler flags to configure which override those
+provided by project through automake. Therefore it is possible for user
+on ARM platform to pass CXXFLAGS=-mfpu=vfp which will effectively
+disable NEON even though used compiler supports -mfpu=neon (since user
+supplied flags take precedence compiler invocation will use flags:
+-mfpu=neon -mfpu=vfp). Instead of checking whether compiler supports
+-mfpu=neon flag, check if NEON extensions are available by checking if
+__ARM_NEON is defined when compiling with -mfpu=neon and user supplied
+flags combined.
+
+Signed-off-by: Jan Palus <jpalus@fastmail.com>
+---
+ configure.ac | 18 ++++++++++++++----
+ 1 file changed, 14 insertions(+), 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 0b38537229..0514b619c5 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -178,10 +178,20 @@ case "${host_cpu}" in
+     ;;
+ 
+   arm*)
+-
+-    AX_CHECK_COMPILE_FLAG([-mfpu=neon], [neon=true], [neon=false], [$WERROR])
+-    AM_CONDITIONAL([HAVE_NEON], $neon)
+-    if $neon; then
++    SAVE_CXXFLAGS="$CXXFLAGS"
++    CXXFLAGS="-mfpu=neon $CXXFLAGS"
++    AC_MSG_CHECKING([for NEON support])
++    AC_COMPILE_IFELSE(
++    [AC_LANG_PROGRAM([], [[
++    #ifndef __ARM_NEON
++           #error
++    #endif
++    ]])],
++    [neon=yes], [neon=no])
++    AC_MSG_RESULT([$neon])
++    CXXFLAGS="$SAVE_CXXFLAGS"
++    AM_CONDITIONAL([HAVE_NEON], test "xyes" = "x$neon")
++    if test "xyes" = "$neon"; then
+       AC_DEFINE([HAVE_NEON], [1], [Enable NEON instructions])
+       NEON_CXXFLAGS="-mfpu=neon"
+       AC_SUBST([NEON_CXXFLAGS])
+
diff --git a/app-text/tesseract/tesseract-5.3.4.ebuild b/app-text/tesseract/tesseract-5.3.4.ebuild
index d90adb970643..af83b0284a3a 100644
--- a/app-text/tesseract/tesseract-5.3.4.ebuild
+++ b/app-text/tesseract/tesseract-5.3.4.ebuild
@@ -37,6 +37,10 @@ DEPEND="${COMMON_DEPEND}
 	dev-libs/libxslt
 	doc? ( app-text/doxygen )"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.4.1-arm64-neon-tesseract.patch
+)
+
 pkg_pretend() {
 	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }
diff --git a/app-text/tesseract/tesseract-5.4.1.ebuild b/app-text/tesseract/tesseract-5.4.1.ebuild
index 1469566c29ed..d4438214a13d 100644
--- a/app-text/tesseract/tesseract-5.4.1.ebuild
+++ b/app-text/tesseract/tesseract-5.4.1.ebuild
@@ -32,6 +32,10 @@ DEPEND="${COMMON_DEPEND}
 	dev-libs/libxslt
 	doc? ( app-text/doxygen )"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.4.1-arm64-neon-tesseract.patch
+)
+
 pkg_pretend() {
 	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }
diff --git a/app-text/tesseract/tesseract-9999.ebuild b/app-text/tesseract/tesseract-9999.ebuild
index 4c31653fca31..d3c34531c724 100644
--- a/app-text/tesseract/tesseract-9999.ebuild
+++ b/app-text/tesseract/tesseract-9999.ebuild
@@ -32,6 +32,10 @@ DEPEND="${COMMON_DEPEND}
 	dev-libs/libxslt
 	doc? ( app-text/doxygen )"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.4.1-arm64-neon-tesseract.patch
+)
+
 pkg_pretend() {
 	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }