gentoo resync : 12.05.2022

8 files changed, 151 insertions, 99 deletions

diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 04a228610099..dd3c3fd3456c 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -2,8 +2,9 @@ AUX libreoffice-5.3.4.2-kioclient5.patch 605 BLAKE2B 30961066c080c4d06ca978b7c0a
 AUX libreoffice-6.1-nomancompress.patch 967 BLAKE2B e60afbfd7007a5fab7291ffba34369137336327f4d1ee27789c5f6229b9a82f4aeab0eaeaf494e60b992c66fcdb276b6423b87713febb14e9eeaffa388369ca8 SHA512 f82e23f15cefd947af20a50e1e4168c9023d5f8b9e19da7f76b141a60be4fa3516ad16400ce26e4d0ff293c570031ac87bbbf6766444e1b31e7bc3ee8ef58083
 AUX libreoffice-7.2.0.4-qt5detect.patch 536 BLAKE2B fd77876d1ca3973ad30c9ebb60bf28e163dd29dcaebaa2b94d84f4c2ab060617d96f4df3d5114f17f882b0cb8b9e2ecdb284fdd1e4aaf8a34cc0c1f06a295c04 SHA512 e1ac7dfc4743cbdea3050b18c1714d06c8bcca4abc51d56e13362c8379fbdd3d37a1916c962fcb1389783c9b1fd72783c9ee45fbb649538ca0fc0cb7b05bcacf
 AUX libreoffice-7.2.2.2-makefile-gengal.patch 11807 BLAKE2B 6d8547d64df433f7786a538d29e8462af031e3a7cfc78b22940e1df18d9d684611a4a0340d4e495a0ed8bae70d5bde44c8805821d7e579fb7476abd360dc6d64 SHA512 0844af3144a437288cc05e8dc8e69125e273ba869232f9b6800889db2a82aa7026b337e439231a9ea40cf6a9f8199f939bc3fc5828acb0f8575346d109eab242
-AUX libreoffice-7.2.5.2-kf591.patch 1978 BLAKE2B 1be47ae06aa917a8356fe4f683ed748ef443a5dc91b3aa72de2f54d1ac5af36f655e5bbf7887beaeae57da1633f8a0f024f7a7af2466729ab43ce8307269c7aa SHA512 b8fb98285f3304580ae581dc9c10cf01f50d2dc38b966769c7f05a86c0b8b3d7149eabe1df90b2d961d8800aa6918eb4374c7c85304b86ccb4df62f891af7099
 AUX libreoffice-7.2.6.2-poppler-22.03.0.patch 1361 BLAKE2B da788c4de7203ab20337a1d92cb4478f7a7db3f54e05054e5943d8acf78eb0907f9510c6bdf5bfc5466171322af98f55fe68ee0678e2a08856f6247b1981840b SHA512 f2cb95d52a97b1f3dc985e391df333159b2754ba3a386b71479c584363022c54b09125bfedaf61c72f056e12677a4dd1eac1d3074adaadc084243ddea05392c6
+AUX libreoffice-7.3.3.2-Add-missing-nSize-set-for-Poppler-22.04.0.patch 1122 BLAKE2B 7f6c0d006fda26d868f2b4a193c8280ac3048233a2e796d1a10ec7210e68ecc391d6c4aa88a28c42bfb053fe418abe5fbbb1c3eeb8521990f692fb94387c334e SHA512 3abdc14a55cea3829cac8c652fcbe6cbbbae45b1ba8e02bf8654f8b8c45780d73eb094968985fe98e10b014c2e2b8b3fd82a830af297902644e2ceffe3a02ad1
+AUX libreoffice-7.3.3.2-Import-FreeBSD-patch-for-Poppler-22.04.0-build.patch 2462 BLAKE2B bb49834014847b2cba163cbb946d865f3dee13a3a9fc04fa74ff9526ae089f8213ae2f094170d41e909ae77d93e468cbf06eefdd05262a305d52a3300a2b4b88 SHA512 d47885a5476bb81243a93729f176902144134c66914ad7e8ec9032c85bb9b5f19040236da883d7cc0dec14d05af32771be06c3a686d0b9587721b8aed65aa5ad
 DIST 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip 3519470 BLAKE2B ccfdf6b7f88f22d3ec7898c529c374f13059979450aabdccc9781ca91dd27d0119dfec3d33dda073c2973fa4a8aacae13924c9a67e38a1422c48bfee41b6f3e8 SHA512 a231eba4a1baca11766ef292ab45e302081115477fe23018652882923308856835cf8c9ecba61a5cf22543474ccef3136965d794a90c9e4e9e6dcc21f9af6e1a
 DIST 185d60944ea767075d27247c3162b3bc-unowinreg.dll 12288 BLAKE2B c067f60d0ee325feae4f168ad0f84602708fe724a1d9a9a054ed4991992c1d4637b31083cf569326b8aac1ec598e71ec65fb31ee16233b9c736e97ef062b47d7 SHA512 854b8ae29b57b40ba6bb6ff66e723a0e8dad053fcc2849f0ad763cd8a31352f4aeba9636fd4e3f0f2a0cd985a6f49b4261b9ace68d6be821ed42cfa7a73eb13c
 DIST 3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip 1180582 BLAKE2B b2b91f608cccdc823c11ce946ecf12b8cb7b1218fa8763ed7b64cf2567114f0703b4103a4eb2369874a4006112396470d1a0a72e6f186c9fac629cbca0fe18d6 SHA512 9fe106bbdb55365f589246e5a0d10bbe9b35224132b66a1823dc6361633a67f2acc0e8c393dc7ed70d086858d16d242b8806b8b2184c98e3d20d0be85bed9c44
@@ -24,18 +25,18 @@ DIST eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip 427800 BLAKE2B d3ac085a3
 DIST f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip 211919 BLAKE2B 2c72493e44d3ad1714d294fb7baaa85d33fef2eb4ce75bf507b65f78f1d9d399bb5eb72cee188a8abc4b234eb2845a26755791fb3ac104ffe6e55013ab41ca8b SHA512 c1a15ebbfe817ec79d4b3f1c97d096bf8511737d7d35d97302856ccfb3de14a1cd16bd31000415d9ab24bbd9ef770d37855cee4b819ff0e8fca2f2766920a114
 DIST libcmis-0.5.2.tar.xz 484404 BLAKE2B 7de242393c28fc8289bb598b34e704eb2affaaa8b9e470e10044dbfd3812391f29e1421df8d7ac3869955698ddbc9575feebcfbac27bb074a60ccc0527dca1c3 SHA512 295ab15115e75b1f6074f17d3538afe0de9b2b77ab454f5c63cb05e8df11886d82942fbf21ba01486052e3f6c75b0636b99d8e660cd3472dc4b87c31d3cd557b
 DIST libcuckoo-93217f8d391718380c508a722ab9acd5e9081233.tar.gz 5005888 BLAKE2B 836ec268c19c27ac079ea1084587c3e999f39ad2188be1a5cf8337ad0473ffda6c32d0695254d3797d1607707329befa88da6043f424544487238e550eda8590 SHA512 4159dfb4d08e359feb23127e12db590260913e70774161ac9513abb5183ad6ed6d2bdfbe56fc8aa68e2fc57ee29eae67aa0180e1a7d955016884ecba2ca60ff8
-DIST libreoffice-7.2.5.2.tar.xz 252977224 BLAKE2B c8221824ed4747ad7fd9534c6c3d612fa711f78b382587345c5a5604a263b7697fb03c77c1927343052ebcd0aa8db2d693208599137bc8884eeb1bf408951463 SHA512 a84682597e10fabb8c1605b785510fa5fe861f3056f61bd01513e1de6ebdb8a343d254af063cd977e4379348ad28d8a457989b3d42014f1c18d5d85626f6dfe8
 DIST libreoffice-7.2.6.2.tar.xz 252995284 BLAKE2B b807e666d39b4302b0a33f84f7e8797bc41ec9e1814bfe57f0e06c8bbbf3b8bf89a70a25caa65401f402a593acce04cb1118bd13bbd961d7feeac295511e36e4 SHA512 2b1a92d98595d4a40bf699ebf5ee3cbf4daeb765a8d37ae035f459f2a74c2ce27e53747307d9875aaec7d1d5a2693266ea81b7fe1281c33653c9fa4bbd727242
 DIST libreoffice-7.3.2.2.tar.xz 255657596 BLAKE2B ef362c6e53ab8668309f1f9b10a8cbb87e8027aaf56a3d1185494757376b89bdf126fe08ef3e416d0330bb96df4ac046b8c60d535eeef8430c60485313e80b5f SHA512 c9f0deaf812425cfc08649f5a9f88c56a9f9221a6b117f9fece56ed17984fec25446ccad52ff2f22ebdfa1db495289edb22a8b7b1fec7a0e42d4b3cd2e81363b
+DIST libreoffice-7.3.3.2.tar.xz 256036064 BLAKE2B 8a96121448e3cc1f81990c837d36191a6127e3ff78773440a4ecdfb5f178f7ab522298fec1d0dd872afe38b67ec102d4f5ea4b0cde64caf5d6420a7f02f25e1b SHA512 242d5694b6d09c669992ea68223b62fb8e418e886f68c7e5d843272d55ad2de34e5207180b7a541fd97cbe678c2d12d5290ebd8b82d47c88f1607e6736413c96
 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
-DIST libreoffice-help-7.2.5.2.tar.xz 112080572 BLAKE2B 9c07cec6cd6c639335c38af65f3dccf331200422f670fa225e355117062f5ad2a8173c5f59ee63137aa480e8db307b0671e4a7a0ff503ea3a034e126e0464120 SHA512 70ffcb1a96637dabd9a658151d2b88a92dd8a89cd396609339ec5470b93fbc2ae589a434b4f09d22fc8ad515369a646dd8040c33e6a91977dd7158f57cd48e00
 DIST libreoffice-help-7.2.6.2.tar.xz 112079748 BLAKE2B f9d96d6d72e70f28f12dcf656cf8fd22bc8e563ec53c840cf7cd668e3de677ee73a3f3099e7c62c6034cd4d23915b9e7a94012340c6a7db7f8822e4c8c6d0887 SHA512 05f02eb1afaa90547ca388008e02c4a48c191984e77d4022adf02089f69a3b4792cdc065e160f59fbf2f5554b062ff0d6853b12aa9abb9b180dd7c4c855e4d8b
 DIST libreoffice-help-7.3.2.2.tar.xz 112209056 BLAKE2B 320aa76bdce62b94707cd3b6fafd72ce0322e22f28fbb6059b8e1b5b4ef5e99796aee01592a84bf19527bffc0553b937f2d13451e75f105338beb6c1ac1ca077 SHA512 a1f5b1763841b159c623008075ad48ed916c78a856b557553c498590a7c9cd52e23487652c4ab4e4201fc829e7bf4a489ab467e4f412b5538252d893bd74341d
+DIST libreoffice-help-7.3.3.2.tar.xz 112209704 BLAKE2B b0e92b88aeb866d3f611fe89d723287cf037bca1772a861cb8b76ee046ae0d039d67648e121aa253eccbfa132c8d252b947bdcbbc3ee6178b6defd3c876749d0 SHA512 f70e747c5b78be20bbe4dd0c20840923d14b4278c00a12a60f5e58e3226abc0c218ac3cce4885cf5a440ace92141bf0428df40a4d1469edb91103167c5e3d46f
 DIST skia-m90-45c57e116ee0ce214bdf78405a4762722e4507d9.tar.xz 10630696 BLAKE2B a3d42d08a0622de591d177184b6225cf62e3048d02d8f2012b6b02aae186b644c899c4e73b528b3528a4acec6cec07e3576dd6d97b130fedf3b2ec5b2ddf4ed7 SHA512 625ed461d85ce5c5c73ffd20bc3f2c9b5fe6ba557693b793b387ffb434d4f0d9056bd9befe6760c55e9e47f09c02373a49b8ac106162a40d940ea351e8c873c0
 DIST skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz 11826600 BLAKE2B 2985ba0318fd72ac216fda33c6961eaa8ee649d2a850eb736accbd91fbc9cee7dc4e5752b2696a35204770a188412e2ecd0cc128cec324c682f9bc35e68358b3 SHA512 fbf5cfef66991565dbad928091a4e795a5b5b79a1e062a98ab9135b9972827de703c449507957294e7471c422c2e2ed239d6df61ffb9b9581a9ca3d848687a76
-EBUILD libreoffice-7.2.5.2-r1.ebuild 19589 BLAKE2B 6bb1e37e1a1d9f32ba6b3e021a4ef795144da6bd7b2d32526486e864f1c14501ff84666f3edaf4354ceec60b0fad7067c40cd39b945c07e96a31867120991c1e SHA512 4197850f5f8b310f4a136dd6ce187297249fb6de4eea1dbfdcb789afbe53b3ed758b875d63250665873f4e86e0d1f9b6c9c8accda801462f62d5e9b92dcb819a
-EBUILD libreoffice-7.2.6.2-r1.ebuild 19613 BLAKE2B 4bf35d3df838b2f6ba8cfd842a693a4d8a6f98a0271d1d752c63d1b9ab3e3515ee9bc98e584767e145bb6cdb921faa4eb454b3f52e87e1217d59f1d59e4d76cc SHA512 93dba8899724a7a22b8e76cf6baf0283a4738450cfd3f0b9deadd95732e06114a16fc8a26b6dc0b61f635ee4f644ccc457c26d73b0f0a3b92791e0f7a74e3704
+EBUILD libreoffice-7.2.6.2-r1.ebuild 19610 BLAKE2B 911bf949f45c111a6649c3b34f3f5357a0aced00b8015568eebbb2ec38824c0b76624a6f9bae045d388ad109e4f25e43e4efca80ba812bbee122cfadad507193 SHA512 619efe64bc029bd5ae01a225d65d1efccd2833cde0750814c2800c052876dff0fe827f01d49584072d36288c6acb43f100de802986d46ed049c005f290703d52
 EBUILD libreoffice-7.3.2.2-r1.ebuild 19804 BLAKE2B 46be04c1904c79870dd783ee35f20e9ba8076d2620d1903cedf9955b47a3255c128cb654fd39a3fe9e5b699f57846df43b73271a1db05e1d5df6f9e6536f6997 SHA512 75802c61344f218c02067ce1bbd9ddba07d829aeb6a4fd749e3cebf9f710c461eec52ef93f6f9dd6c94a55c59d645c6afa377c77b0155c375cfa19056366683e
-EBUILD libreoffice-7.3.9999.ebuild 19725 BLAKE2B 8d8c3a7d4f69b6d9cfb40f075bef6a70c4f133d307f6ab04df19fb696e615a49418412dd480b48df8082ba0812a2dd118bfcec5a4ff116d0e9c730703be1c1c2 SHA512 21c1599770337abbcbc0b3be2e0ff1a6ffc162bbb6da8fc9095ba4edc96b4ec01cc6b04fc790cc4dcdca83cee4f34bc37ebe481fe61503e857744bf00da2a297
-EBUILD libreoffice-9999.ebuild 19727 BLAKE2B 8f3e1819904ac26dd845af5ccbc68499325199b2d8a1f770a8d2b97c4818dcc90dafa236bc0c8f2a7c47a9bb1a843540355d5c0c27b52b27366fc39b9de991eb SHA512 cddd2bb7a8c6eae4a40d9ff92dfc18e2646c62a93b04599c9dc3e628ffc2de2706519f24edd2176a1d368e597e2cb75703873d108c36313cb9648551c71c3d77
+EBUILD libreoffice-7.3.3.2-r2.ebuild 19946 BLAKE2B 2a6508a2c6ff5c6e4a14f1d0750c915da25ffbb8c9e7d5f630e52fba1605fa50b625c8dfc7575870130f40008a6a5ab61dce7b584cc14886a521b9a9ef125a43 SHA512 a3c765e4ee0e27f0ad9c7eebf0e6a4106d55c97ee44022f7e79839af7334a5d1750bd437426343bd157106127b6e746af42f13b78345aa91d7578e5b5b7b4f92
+EBUILD libreoffice-7.3.9999.ebuild 19666 BLAKE2B 425d6f5a980893241efde0dd42d7d397e0be033589bf0128c674df177c4df0889514556f8a174d444bb086f1e291fec0d2befb8c98fa5fb0a2cee0ec03e8c931 SHA512 859dd5c032ead1f780e572ee071bd0d58f95edd316be67a26b38983caae24d5a807c5449f55b3ff6fa04b0a1877970530ef76e7109bdfce1efbb3d3a78693cfb
+EBUILD libreoffice-9999.ebuild 19668 BLAKE2B 411702b3544132876bd90d5e6bdef5d7e7e4d35d95dc907f29a2f3d282e8af04ec62f9793648ed38f4ead41c7056245dce7ff2a469d8f080a9087f0b850981e9 SHA512 4de66d3eed4932301809158d86469293e1378c22b4c58c477816b46d29bade6e8f958aa74865b55f50e262c5d50c70368dab01d8eaaae20dee4a25f8ce4ed610
 MISC metadata.xml 1222 BLAKE2B 02bb2d5bae26c3a97d77a36d90a2ffa0cac1eb2a0aabfac7d7f11d6b685264b7daad1a860598940af0fe9411068830d7eaf8553cbe4f69afedb092669b719cf1 SHA512 4ad197bb97eab3e860ba163b4c63839949fc9280a2ab53abc81ebb6c351d633e65ef3335a2d3af718d0e4a64e3312dfaff58f6cbab55507c57a6663c2850c3fd
diff --git a/app-office/libreoffice/files/libreoffice-7.2.5.2-kf591.patch b/app-office/libreoffice/files/libreoffice-7.2.5.2-kf591.patch
deleted file mode 100644
index ac920867e4d5..000000000000
--- a/app-office/libreoffice/files/libreoffice-7.2.5.2-kf591.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 5fd5e42bf28a7910321c6b6d76257e7386839fbc Mon Sep 17 00:00:00 2001
-From: Michael Weghorn <m.weghorn@posteo.de>
-Date: Wed, 16 Feb 2022 13:38:47 +0100
-Subject: configure.ac: Update kf5 include/lib check to work with KF5 >= 5.91
-
-The 'kcoreaddons_version.h' header was moved to the 'KCoreAddons'
-subdirectory in kcoreaddons commit
-
-    commit d971ba9bb27a3e8f18a116692fdf98c1729ac244
-    Author: Ahmad Samir <a.samirh78@gmail.com>
-    Date:   Sat Jan 15 14:14:13 2022 +0200
-
-        Install kcoreaddons_version.h in /usr/include/KF5/KCoreAddons/
-
-        Instead of /usr/include/KF5/kcoreaddons_version.h.
-
-        For more details see:
-        https://invent.kde.org/frameworks/kservice/-/merge_requests/79
-
-        GIT_SILENT
-
-Adapt the KF5 check to check for the 'KFileWidget' header and
-the 'libKF5KIOFileWidgets.so' library instead.
-This is more exact anyway, since we require KIOFileWidgets,
-and the previous check didn't ensure that.
-(So in case only KF5CoreAddons but not KIOFileWidgets was installed,
-configure would previously pass, but the build fail.)
-
-[1] https://invent.kde.org/frameworks/kcoreaddons/-/commit/d971ba9bb27a3e8f18a116692fdf98c1729ac244
-
-Change-Id: I7ecf7f29dce85e1a6e6b0d4f2519fa37ab04ca84
-Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129996
-Tested-by: Jenkins
-Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
----
- configure.ac | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 6acb3107cea3..4e84f9a33980 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -13017,8 +13017,8 @@ then
-         kf5_libdirs="$kf5_libdirs /usr/lib64 /usr/lib64/kf5 /usr/lib64/kf5/devel"
-     fi
- 
--    kf5_test_include="KF5/kcoreaddons_version.h"
--    kf5_test_library="libKF5CoreAddons.so"
-+    kf5_test_include="KF5/KIOFileWidgets/KFileWidget"
-+    kf5_test_library="libKF5KIOFileWidgets.so"
-     kf5_libdirs="$qt5_libdir $kf5_libdirs"
- 
-     dnl kf5 KDE4 support compatibility installed
--- 
-cgit v1.2.1
-
diff --git a/app-office/libreoffice/files/libreoffice-7.3.3.2-Add-missing-nSize-set-for-Poppler-22.04.0.patch b/app-office/libreoffice/files/libreoffice-7.3.3.2-Add-missing-nSize-set-for-Poppler-22.04.0.patch
new file mode 100644
index 000000000000..22de747e01e4
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-7.3.3.2-Add-missing-nSize-set-for-Poppler-22.04.0.patch
@@ -0,0 +1,31 @@
+https://bugs.gentoo.org/843311
+
+From: Sam James <sam@gentoo.org>
+Date: Sun, 8 May 2022 21:22:49 +0000
+Subject: [PATCH] Add missing nSize set for Poppler 22.04.0
+
+Thanks-to: Stephan Hartmann <sultan@gentoo.org>
+--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
++++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+@@ -478,6 +478,10 @@ int PDFOutDev::parseFont( long long nNewId, GfxFont* gfxFont, const GfxState* st
+         char* pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef(), &nSize );
+ #else
+         std::optional<std::vector<unsigned char>> pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef() );
++        if( pBuf )
++        {
++            nSize = pBuf->size();
++        }
+ #endif
+         if( pBuf )
+         {
+@@ -502,6 +506,10 @@ void PDFOutDev::writeFontFile( GfxFont* gfxFont ) const
+         char* pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef(), &nSize );
+ #else
+         std::optional<std::vector<unsigned char>> pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef() );
++        if( pBuf )
++        {
++            nSize = pBuf->size();
++        }
+ #endif
+     if( !pBuf )
+         return;
diff --git a/app-office/libreoffice/files/libreoffice-7.3.3.2-Import-FreeBSD-patch-for-Poppler-22.04.0-build.patch b/app-office/libreoffice/files/libreoffice-7.3.3.2-Import-FreeBSD-patch-for-Poppler-22.04.0-build.patch
new file mode 100644
index 000000000000..39cb13bbc7d6
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-7.3.3.2-Import-FreeBSD-patch-for-Poppler-22.04.0-build.patch
@@ -0,0 +1,78 @@
+https://bugs.gentoo.org/843311
+https://cgit.freebsd.org/ports/commit/?id=d9b5ef800dbd0366eae81b03bfa89689ec73c6f7
+
+(sam: adapt version check to 22.4.0)
+
+From: Sam James <sam@gentoo.org>
+Date: Sun, 8 May 2022 21:20:25 +0000
+Subject: [PATCH 1/2] Import FreeBSD patch for Poppler 22.04.0 build
+
+--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
++++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+@@ -474,11 +474,17 @@ int PDFOutDev::parseFont( long long nNewId, GfxFont* gfxFont, const GfxState* st
+     {
+         // TODO(P3): Unfortunately, need to read stream twice, since
+         // we must write byte count to stdout before
++#if !POPPLER_CHECK_VERSION(22, 4, 0)
+         char* pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef(), &nSize );
++#else
++        std::optional<std::vector<unsigned char>> pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef() );
++#endif
+         if( pBuf )
+         {
+             aNewFont.isEmbedded = true;
++#if !POPPLER_CHECK_VERSION(22, 4, 0)
+             gfree(pBuf);
++#endif
+         }
+     }
+ 
+@@ -492,21 +498,32 @@ void PDFOutDev::writeFontFile( GfxFont* gfxFont ) const
+         return;
+ 
+     int nSize = 0;
+-    char* pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef(), &nSize );
++#if !POPPLER_CHECK_VERSION(22, 4, 0)
++        char* pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef(), &nSize );
++#else
++        std::optional<std::vector<unsigned char>> pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef() );
++#endif
+     if( !pBuf )
+         return;
+ 
+     // ---sync point--- see SYNC STREAMS above
+     fflush(stdout);
+-
++#if !POPPLER_CHECK_VERSION(22, 4, 0)
+     if( fwrite(pBuf, sizeof(char), nSize, g_binary_out) != static_cast<size_t>(nSize) )
++#else
++    if( fwrite(reinterpret_cast<char*>(pBuf.value().data()), sizeof(char), nSize, g_binary_out) != static_cast<size_t>(nSize) )
++#endif
+     {
+-        gfree(pBuf);
++#if !POPPLER_CHECK_VERSION(22, 4, 0)
++            gfree(pBuf);
++#endif
+         exit(1); // error
+     }
+     // ---sync point--- see SYNC STREAMS above
+     fflush(g_binary_out);
+-    gfree(pBuf);
++#if !POPPLER_CHECK_VERSION(22, 4, 0)
++            gfree(pBuf);
++#endif
+ }
+ 
+ #if POPPLER_CHECK_VERSION(0, 83, 0)
+@@ -759,7 +776,11 @@ void PDFOutDev::updateFont(GfxState *state)
+ {
+     assert(state);
+ 
++#if !POPPLER_CHECK_VERSION(22, 4, 0)
+     GfxFont *gfxFont = state->getFont();
++#else
++    GfxFont *gfxFont = state->getFont().get();
++#endif
+     if( !gfxFont )
+         return;
+ 
diff --git a/app-office/libreoffice/libreoffice-7.2.6.2-r1.ebuild b/app-office/libreoffice/libreoffice-7.2.6.2-r1.ebuild
index 82b0fcb88f40..62e42b1e8c03 100644
--- a/app-office/libreoffice/libreoffice-7.2.6.2-r1.ebuild
+++ b/app-office/libreoffice/libreoffice-7.2.6.2-r1.ebuild
@@ -103,7 +103,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )"
 SLOT="0"
 
 [[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~amd64-linux"
 
 COMMON_DEPEND="${PYTHON_DEPS}
 	app-arch/unzip
diff --git a/app-office/libreoffice/libreoffice-7.2.5.2-r1.ebuild b/app-office/libreoffice/libreoffice-7.3.3.2-r2.ebuild
index 58d6d820c38c..22d36d585f5f 100644
--- a/app-office/libreoffice/libreoffice-7.2.5.2-r1.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.3.2-r2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="threads(+),xml"
@@ -21,7 +21,7 @@ BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
 # PATCHSET="${P}-patchset-01.tar.xz"
 
 [[ ${MY_PV} == *9999* ]] && inherit git-r3
-inherit autotools bash-completion-r1 check-reqs eapi8-dosym flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
+inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
 
 DESCRIPTION="A full office productivity suite"
 HOMEPAGE="https://www.libreoffice.org"
@@ -44,13 +44,15 @@ unset DEV_URI
 # These are bundles that can't be removed for now due to huge patchsets.
 # If you want them gone, patches are welcome.
 ADDONS_SRC=(
+	# not packaged in Gentoo, https://github.com/efficient/libcuckoo/
+	"${ADDONS_URI}/libcuckoo-93217f8d391718380c508a722ab9acd5e9081233.tar.gz"
 	# broken against latest upstream release, too many patches on top:
 	# https://github.com/tdf/libcmis/pull/43
 	"${ADDONS_URI}/libcmis-0.5.2.tar.xz"
 	# not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c
 	"${ADDONS_URI}/dtoa-20180411.tgz"
 	# not packaged in Gentoo, https://skia.org/
-	"${ADDONS_URI}/skia-m90-45c57e116ee0ce214bdf78405a4762722e4507d9.tar.xz"
+	"${ADDONS_URI}/skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz"
 	"base? (
 		${ADDONS_URI}/commons-logging-1.2-src.tar.gz
 		${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
@@ -103,7 +105,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )"
 SLOT="0"
 
 [[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux"
 
 COMMON_DEPEND="${PYTHON_DEPS}
 	app-arch/unzip
@@ -126,6 +128,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	app-text/libwpg:0.3
 	>=app-text/libwps-0.4
 	app-text/mythes
+	dev-cpp/abseil-cpp:=
 	>=dev-cpp/clucene-2.3.3.4-r2
 	>=dev-cpp/libcmis-0.5.2
 	dev-db/unixODBC
@@ -136,7 +139,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	dev-libs/icu:=
 	dev-libs/libassuan
 	dev-libs/libgpg-error
-	dev-libs/liborcus:0/0.16
+	>=dev-libs/liborcus-0.17.2:0/0.17
 	dev-libs/librevenge
 	dev-libs/libxml2
 	dev-libs/libxslt
@@ -154,16 +157,17 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	>=media-libs/libcdr-0.1.0
 	>=media-libs/libepoxy-1.3.1[X]
 	>=media-libs/libfreehand-0.1.0
+	media-libs/libjpeg-turbo:=
 	media-libs/libpagemaker
 	>=media-libs/libpng-1.4:0=
 	>=media-libs/libvisio-0.1.0
 	media-libs/libzmf
+	media-libs/openjpeg:=
 	media-libs/zxing-cpp
 	>=net-libs/neon-0.31.1:=
 	net-misc/curl
 	sci-mathematics/lpsolve
 	sys-libs/zlib
-	virtual/jpeg:0
 	virtual/opengl
 	x11-libs/cairo[X]
 	x11-libs/libXinerama
@@ -210,7 +214,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	)
 	ldap? ( net-nds/openldap:= )
 	libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
-	libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
+	libreoffice_extensions_scripting-javascript? ( >=dev-java/rhino-1.7.14:1.6 )
 	mariadb? ( dev-db/mariadb-connector-c:= )
 	!mariadb? ( dev-db/mysql-connector-c:= )
 	pdfimport? ( app-text/poppler:=[cxx] )
@@ -225,7 +229,7 @@ DEPEND="${COMMON_DEPEND}
 	dev-perl/Archive-Zip
 	>=dev-util/cppunit-1.14.0
 	>=dev-util/gperf-3.1
-	dev-util/mdds:1/1.5
+	dev-util/mdds:1/2.0
 	media-libs/glm
 	sys-devel/ucpp
 	x11-base/xorg-proto
@@ -265,15 +269,16 @@ BDEPEND="
 	virtual/pkgconfig
 	clang? (
 		|| (
+			(
+				sys-devel/clang:14
+				sys-devel/llvm:14
+				=sys-devel/lld-14*	)
 			(	sys-devel/clang:13
 				sys-devel/llvm:13
 				=sys-devel/lld-13*	)
 			(	sys-devel/clang:12
 				sys-devel/llvm:12
 				=sys-devel/lld-12*	)
-			(	sys-devel/clang:11
-				sys-devel/llvm:11
-				=sys-devel/lld-11*	)
 		)
 	)
 	odk? ( >=app-doc/doxygen-1.8.4 )
@@ -294,11 +299,10 @@ PATCHES=(
 	"${FILESDIR}/${PN}-6.1-nomancompress.patch"
 	"${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch"
 
-	# 7.3 branch
-	"${FILESDIR}/${PN}-7.2.2.2-makefile-gengal.patch"
-
-	# master branch
-	"${FILESDIR}/${PN}-7.2.5.2-kf591.patch"
+	# TODO: upstream
+	"${FILESDIR}/${PN}-7.2.6.2-poppler-22.03.0.patch" # by Archlinux
+	"${FILESDIR}/${PN}-7.3.3.2-Import-FreeBSD-patch-for-Poppler-22.04.0-build.patch" # from FreeBSD
+	"${FILESDIR}/${PN}-7.3.3.2-Add-missing-nSize-set-for-Poppler-22.04.0.patch" # fixup for FreeBSD patch
 )
 
 S="${WORKDIR}/${PN}-${MY_PV}"
@@ -492,6 +496,7 @@ src_configure() {
 		--disable-online-update
 		--disable-openssl
 		--disable-pdfium
+		--disable-qt6
 		--with-extra-buildid="${gentoo_buildid}"
 		--enable-extension-integration
 		--with-external-dict-dir="${EPREFIX}/usr/share/myspell"
@@ -500,16 +505,19 @@ src_configure() {
 		--with-external-tar="${DISTDIR}"
 		--with-lang=""
 		--with-parallelism=$(makeopts_jobs)
+		--with-system-abseil
+		--with-system-openjpeg
 		--with-system-ucpp
 		--with-tls=nss
 		--with-vendor="Gentoo Foundation"
-		--with-webdav
+		--with-webdav="neon"
 		--with-x
 		--without-fonts
 		--without-myspell-dicts
 		--with-help="html"
 		--without-helppack-integration
 		--with-system-gpgmepp
+		--without-system-cuckoo
 		--without-system-jfreereport
 		--without-system-libcmis
 		--without-system-sane
@@ -561,16 +569,16 @@ src_configure() {
 			--with-ant-home="${ANT_HOME}"
 		)
 		if has_version "dev-java/openjdk:11"; then
-			myeconfargs+=( -with-jdk-home="${EPREFIX}/usr/$(get_libdir)/openjdk-11" )
+			myeconfargs+=( --with-jdk-home="${EPREFIX}/usr/$(get_libdir)/openjdk-11" )
 		elif has_version "dev-java/openjdk-bin:11"; then
-			myeconfargs+=( --with-jdk-home="/opt/openjdk-bin-11" )
+			myeconfargs+=( --with-jdk-home="${EPREFIX}/opt/openjdk-bin-11" )
 		fi
 
 		use libreoffice_extensions_scripting-beanshell && \
 			myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
 
 		use libreoffice_extensions_scripting-javascript && \
-			myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
+			myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 rhino.jar) )
 	fi
 
 	is-flagq "-flto*" && myeconfargs+=( --enable-lto )
@@ -586,11 +594,7 @@ src_compile() {
 	addpredict /dev/ati
 	addpredict /dev/nvidiactl
 
-	local target
-	use test && target="build" || target="build-nocheck"
-
-	# this is not a proper make script
-	make ${target} || die
+	default
 }
 
 src_test() {
@@ -644,10 +648,10 @@ EOF
 	# link python bridge in site-packages, bug 667802
 	local py pyc loprogdir=/usr/$(get_libdir)/libreoffice/program
 	for py in uno.py unohelper.py officehelper.py; do
-		dosym8 -r ${loprogdir}/${py} $(python_get_sitedir)/${py}
+		dosym -r ${loprogdir}/${py} $(python_get_sitedir)/${py}
 		while IFS="" read -d $'\0' -r pyc; do
 			pyc=${pyc//*\/}
-			dosym8 -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
+			dosym -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
 		done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
 	done
 }
diff --git a/app-office/libreoffice/libreoffice-7.3.9999.ebuild b/app-office/libreoffice/libreoffice-7.3.9999.ebuild
index d21640a76c4a..68cf55317be3 100644
--- a/app-office/libreoffice/libreoffice-7.3.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.9999.ebuild
@@ -157,6 +157,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	>=media-libs/libcdr-0.1.0
 	>=media-libs/libepoxy-1.3.1[X]
 	>=media-libs/libfreehand-0.1.0
+	media-libs/libjpeg-turbo:=
 	media-libs/libpagemaker
 	>=media-libs/libpng-1.4:0=
 	>=media-libs/libvisio-0.1.0
@@ -167,7 +168,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	net-misc/curl
 	sci-mathematics/lpsolve
 	sys-libs/zlib
-	virtual/jpeg:0
 	virtual/opengl
 	x11-libs/cairo[X]
 	x11-libs/libXinerama
@@ -279,9 +279,6 @@ BDEPEND="
 			(	sys-devel/clang:12
 				sys-devel/llvm:12
 				=sys-devel/lld-12*	)
-			(	sys-devel/clang:11
-				sys-devel/llvm:11
-				=sys-devel/lld-11*	)
 		)
 	)
 	odk? ( >=app-doc/doxygen-1.8.4 )
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 60baac70da26..b155f2f2f525 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -157,6 +157,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	>=media-libs/libcdr-0.1.0
 	>=media-libs/libepoxy-1.3.1[X]
 	>=media-libs/libfreehand-0.1.0
+	media-libs/libjpeg-turbo:=
 	media-libs/libpagemaker
 	>=media-libs/libpng-1.4:0=
 	>=media-libs/libvisio-0.1.0
@@ -167,7 +168,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	net-misc/curl
 	sci-mathematics/lpsolve
 	sys-libs/zlib
-	virtual/jpeg:0
 	virtual/opengl
 	x11-libs/cairo[X]
 	x11-libs/libXinerama
@@ -279,9 +279,6 @@ BDEPEND="
 			(	sys-devel/clang:12
 				sys-devel/llvm:12
 				=sys-devel/lld-12*	)
-			(	sys-devel/clang:11
-				sys-devel/llvm:11
-				=sys-devel/lld-11*	)
 		)
 	)
 	odk? ( >=app-doc/doxygen-1.8.4 )