gentoo resync : 15.06.2021

8 files changed, 109 insertions, 410 deletions

diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 4ea3052de88c..50d65aeaf516 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -1,10 +1,5 @@
 AUX libreoffice-5.3.4.2-kioclient5.patch 605 BLAKE2B 30961066c080c4d06ca978b7c0ad4b57a3739d6d34a2941f2ea57d3a5c4ab65e3f3c2376243aa88c9c05b1038cf9bfb7605a370d11513bb4553de2d268010519 SHA512 2aa6d1fc96749b79b3291f6e27630c6cf59d2c743f0dd8603867ba8aec2c17f87b70e1dd031365013f7e9ea53c160e9cb3f48af592a587dc05f3ae4cc1b35df6
 AUX libreoffice-6.1-nomancompress.patch 967 BLAKE2B e60afbfd7007a5fab7291ffba34369137336327f4d1ee27789c5f6229b9a82f4aeab0eaeaf494e60b992c66fcdb276b6423b87713febb14e9eeaffa388369ca8 SHA512 f82e23f15cefd947af20a50e1e4168c9023d5f8b9e19da7f76b141a60be4fa3516ad16400ce26e4d0ff293c570031ac87bbbf6766444e1b31e7bc3ee8ef58083
-AUX libreoffice-6.4.3.2-boost-1.73.patch 4356 BLAKE2B 3fc87602e75c612d03cd657ec82598bd11238bb97acac2f070ee11758c229d4e481b76125206fbdc5d8966ae3f5f9586798f73136b87f2556bb9c859642eca94 SHA512 927a3ee94ca1e9eae34768b688b980ec937abccbab4d5b12409b0c459c92a7c666d4ffbb113b9173c1e29ced1cbd67df12335acca62e8377278d8b53ed89380e
-AUX libreoffice-6.4.6.2-llvm-10.patch 4901 BLAKE2B 967a2c1c4ed8ee094351c0a7194445685ddba68c81ddf48a3a49c804a12a2d75bb9c13bd80a08b73c5ff87ea7e62f78c443e520fd30fbd33d61910980f5b6d00 SHA512 51016fcdd9b00abe79be523b37cc21b81f549ee47a5776d299975c8fad8020d047884b3ad7a2004044a14782301f14f1f02b223eb6cfc4850c1e6523cd78be5c
-AUX libreoffice-6.4.7.2-fix-wrong-setting-for-doc-properties.patch 3460 BLAKE2B 9062dd92bc65df16473aa6e31237e0a9dadad647812d11d62f1da17e530deed8f6e541a98c9deaeece0c976b7499dbe500fa3f61ef0ebdb91a6e2ee498284cdf SHA512 12f9c53e3e0c11d02a7cb96df5279400a9609ae1ef6729609a7061f52c74b1e69d22cc3bde56d6d0cd52310848b48a181d8b424039c528171a4a90edf04ba27f
-AUX libreoffice-6.4.7.2-icu-68-1.patch 1930 BLAKE2B 20a59bb0141d9e5831963f79ab59aeaf7a137b619b1ad55a3a6825f944f25a241c951164f00ca2c4f90de5713b8b0392768d9fc429d67cc5ac1343972842271f SHA512 501fc1b980727bdbf4e0bfa319a3df16aa065829bcbd9f8c7689de4bbae5ae73535a5547c8d69916966e3b83fdf817159db52f5b617a127eccdb761ed47a4177
-AUX libreoffice-6.4.7.2-icu-68-2.patch 961 BLAKE2B 610ba98ae4c57f79bb6b950081e4b565937d5f9fa38eeed4a086f7790adf65064e3b114aedcfdfa6dd328acd41f43520e4ee033e160f481567452782f92e552c SHA512 5e70548d52d693602f7fe40c2d9486158e5fa3c0d43c8e1ae87a014781966b39219a82c456e71e561d6c2b2c7da258dcb77ba70712b3677801ac28b2a5a1cc82
 AUX libreoffice-7.0.3.1-qt5detect.patch 1065 BLAKE2B bce0bb8d36f903516f437520e0b1a99080984933173ac30686136632a795f16b8e82f7bfb9dfe77b048154cf3616b3c6c96fd7c563284212ce4b3f9a4490f368 SHA512 e4273fcb2140c50c9030ef3ffeb451169c2e04fcf7e43650ad1d0928fa18ebe77dd482e2686fbaf9660aebfc17b9ce22b3dfa76f2248ae4af9bc51826e2785c2
 AUX libreoffice-7.1.3.2-bashism.patch 1092 BLAKE2B 0c14e7a282cafe030a39b15551695e61bd9fd70090589e4b94b0839a31b28e634f927b7a21e73de74ea890fc575ab23923a14ad9e226a626dec331db9014391f SHA512 abafcf90b93078c1ec8cc8bf807ec089fc0f79a3eb0823a1da4026a40281369998b72a2c894dc268c56af586476d39991099b99a2f9a74d03fac98b856d4e84d
 DIST 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip 3519470 BLAKE2B ccfdf6b7f88f22d3ec7898c529c374f13059979450aabdccc9781ca91dd27d0119dfec3d33dda073c2973fa4a8aacae13924c9a67e38a1422c48bfee41b6f3e8 SHA512 a231eba4a1baca11766ef292ab45e302081115477fe23018652882923308856835cf8c9ecba61a5cf22543474ccef3136965d794a90c9e4e9e6dcc21f9af6e1a
@@ -26,14 +21,14 @@ DIST db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip 1396007 BLAKE2B 8012d
 DIST dtoa-20180411.tgz 48893 BLAKE2B 4a03dc67e44353ae1c0653c8305d2df9bcfef16b48dff6df5c857a6bd0510a92aa6d9b9660ad63b2344d5195fef072e526f8d7900791b15442923b63196dda3f SHA512 722aa814c33a34bfffe6c0201b0035cc3b65854a0ba9ae2f51620a89d68019353e2c306651b35bca337186b22b2e9865ef3c5e3df8e9328006f882e4577f8c85
 DIST eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip 427800 BLAKE2B d3ac085a39ee9798182b70ba650fa954234b964e33278ac4fe3f84f8c3218ad49f12d139079328036b4f9d80cde967888c0a66393c34dedf27af69dac02c5aff SHA512 9091d3628d9c75c068507537afc9e10bfb79c1abfd36ad697af3d592a1cc049ba6640f665bfc53cc520b6a26c21d70b0275106843444b441484c2178f2784743
 DIST f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip 211919 BLAKE2B 2c72493e44d3ad1714d294fb7baaa85d33fef2eb4ce75bf507b65f78f1d9d399bb5eb72cee188a8abc4b234eb2845a26755791fb3ac104ffe6e55013ab41ca8b SHA512 c1a15ebbfe817ec79d4b3f1c97d096bf8511737d7d35d97302856ccfb3de14a1cd16bd31000415d9ab24bbd9ef770d37855cee4b819ff0e8fca2f2766920a114
-DIST libreoffice-6.4.7.2.tar.xz 232364676 BLAKE2B 1df8f2a3aa00bd057dd1d6d9665a541330ceeabb2bb5d46351449cf9b916a5649f38dc0e0175cf3733123f9247157f5fd0f2c34c8dad1d676da6c31d8346927b SHA512 ba6ff5948624d7a76025406c38728d643be656091d79320a1c5ddba10000411662951a0b02de7a9e796e76d8185b6e9113882406bb0c1452b4c988ac3095afa8
 DIST libreoffice-7.1.3.2.tar.xz 244104432 BLAKE2B f73bd448f94bc88a1dc775d032ce849ee1dd610c4077c709ffbe40d8c99527c7775cfe2309a636093182ac988ecf44a4b61df0e0a83b332fcc77a05edb602791 SHA512 d7329475cad5bece9358b29bc590da1841c3c0b4aef511508d9398519c514fa176c90675857f1830925818f2dcc8b9c0986e5d34d3a33cce617e4ada23c60a72
+DIST libreoffice-7.1.4.2.tar.xz 244336900 BLAKE2B 97374216593edb0b33fda80b19686bd95f517c36e9b2a347854af915be169b4d22963f765dbfa48ded75f64e94212e6d5cc862809ac775dc25c6b6bf1c1cc2c0 SHA512 b6c0d5ed91cd69e20e70b2fd5e6f53f05eb0fbd73c41208c317116c636b2ee8cfd848370389dd61d3c243b259ae66b9bd5de9341cd9009279ccfd299015c88c8
 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
-DIST libreoffice-help-6.4.7.2.tar.xz 88296892 BLAKE2B 9ee12ec6aa6d5539408e0206e313901540533e28686585fa0bb4edbeaa482bb0ad1cd4ae37ac18dab66bb3e2ea32d52d9960236cbf3e0f8fb5ca07c007f38794 SHA512 a5381a8cca9988998dc01d3815869e47193c1da814b714cbedb51a2099f7dc5444315c657e32defab2eb0b9a9e2a922bc4c5fbc36b7a2b60e7c551887a9cdbb3
 DIST libreoffice-help-7.1.3.2.tar.xz 111785416 BLAKE2B 12d97764976ae0e4736638e9b758c5920d38d608e66fc3343d74178a935632396e1e07fbb98b6f380fd103c3f5e2edf917726a760420f6dfd3d2e42aaa215096 SHA512 576dbea391777a907275b630ed704dd3d9ad0627f8a18da1cbd23fe28df04c3a509583c2404f810df3aaac15ef0881e2c1e0a55c9f31618715586628873367eb
+DIST libreoffice-help-7.1.4.2.tar.xz 111785284 BLAKE2B 66b7da9d986a6abbc314dbb33be8297e7241f98983c4a864c26e3b6984d10d79f36a5307e11ed549289f2ab5e15ab05e7e81c9fad3d2ccd43dff114b327d266f SHA512 7730a17cd171d126b3b094abde1797524ff7250a5895d6d80b10b30944225d318001cbc66bdff06019be69434278dfd864aec71b0b9572c6385639620b416268
 DIST skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz 10420480 BLAKE2B 83bcc9ff3a3a916ccb92f49ef69f99386e89b636d37679ab17735625c56c4bb31ca89a7034d9282c905b405e0b31215de5fd3734061d323d48db440e4ad52643 SHA512 8e5c37b895d7f5fe15f491005ac46b39efe3bfb3af5dc805bf1226b2112496bdb9e433cc3b313f8fc185fe1f898d126b8a557d23485615cdbe917f0b76855f3d
-EBUILD libreoffice-6.4.7.2.ebuild 17756 BLAKE2B ecd2929b57fb0dd0b06017f2940018e324c83ef7dd752528a87e69358e644ec7a26f32b24a3174f45d29e14c0060e099d31e7ed6f1d0a0afbd98eaf157257729 SHA512 9319d0a04425e38feedecaf9542d6d0636b950ed8c5733f8eedf47dd16b89b69538fd96ec9fd9458a5ea54b775387ac8fd0dbe80cc842090d8c35b13ba06aa21
-EBUILD libreoffice-7.1.3.2.ebuild 19603 BLAKE2B 9628f154b069a29937a1d5bf8662ef81db8e11ce63bc7e0bf39d37fa1bb944dafc7c5ebc82b062013ba590b0ae76c8bca3ff4bb8a2fa194e0d9bf86f23f1a0b4 SHA512 55100197f8b17b23bdc243bafdbfaeb1c49bda18dc0bea06a202cbce95e608e4de9d3712d40fb3ea06fa5b56120a3b816223e5ac86b42233400e5ff1fd029b8b
+EBUILD libreoffice-7.1.3.2.ebuild 19601 BLAKE2B 16986ed9efe1ef7f36ea49e28523b01ade69adae78a6f093feddc00343b4ee0bf7e7b4a90894776f334af954cdb4b5702825838cf331b42cd9f10023db5d4d65 SHA512 3e6938b66c63c71063edff5663e2297fd4baebc9baae00fb3861f79c5919ebd2debc2cde99e61a98112899f673cc2d09afa54168cfa648ee2ba10c47b790c061
+EBUILD libreoffice-7.1.4.2.ebuild 19612 BLAKE2B 526428ed9d9678992bac63476cd973cb2a81cb33e169f2d7fe47a54f3469b141ab75f04af4750a7221a67e8a403f9860cc497072dbf8259aedbd25447993d0e1 SHA512 6acfaf9d821fed2fabcb9399d48c759b6219c81af8612e3b083b8fe22e887984c7f56bb705ad31560ed78a49cb105e8e4e34401eb7a21006ac0ece8a530db81b
 EBUILD libreoffice-7.1.9999.ebuild 19533 BLAKE2B a8188e1fed67316f27c43c98ee9ec5401c0c452aea17ee1d67be489d60cca8b6fb12738bfd3536e6f057e4ca329cf269ed4abd3f9ac2c27a4ff4955340b27454 SHA512 1ad4750417630ed56700da1ac658c9d65e71de7bc36155cf3e5be70fc747197912c77830c751603ee697ffe1e6dd26db96b7ed6579cac99e85b8ac8863841ae0
 EBUILD libreoffice-9999.ebuild 19517 BLAKE2B 409577c0d2592cffe177102833b3a2531846f65bd8cf78a8db077304e1f151d6d9b2fa73829bfa32a3244dd7037a180faadd4b94a749fb6ddcc15495a1fd53a6 SHA512 327c5140f8d5b852b0de3469a05cf43c9fc6b0184f6b671ea4b3116d3637400e6be990d3756fe334a937950f19b47559adb0317e8f9d7afdc344c3fc4af4da16
 MISC metadata.xml 1221 BLAKE2B 2cc713dbc6d112ac21f8846f9dad48c09972c0d6846a253773280564cf9370934ec798a1579d894d7679c591045542cf2c8cb8a308bf097ce5eac64f40fda3f0 SHA512 c1ab6a23d6fa4ed6b2d77b08c895f653890998a8ed7fb2fa69251adacc9a96e32c0d1298a2b7c287efe85d37a2707e740b6b036174b7b6e39d37a25e3866e957
diff --git a/app-office/libreoffice/files/libreoffice-6.4.3.2-boost-1.73.patch b/app-office/libreoffice/files/libreoffice-6.4.3.2-boost-1.73.patch
deleted file mode 100644
index 0eb406999223..000000000000
--- a/app-office/libreoffice/files/libreoffice-6.4.3.2-boost-1.73.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-From 55c724b93dfd4c9a1afb10d60fbc2d7a9a66cf61 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
-Date: Wed, 29 Jan 2020 12:44:52 +0000
-Subject: replace boost::bimap in sdext pdfimport
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-the error message with boost 1.69 and gcc 10 is so ungodly its easier to throw
-bimap out and use something simpler
-
-Change-Id: Ie324a0b81931bbd427483878a87beeca455ada18
-Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87683
-Tested-by: Jenkins
-Reviewed-by: Caolán McNamara <caolanm@redhat.com>
----
- sdext/source/pdfimport/inc/pdfiprocessor.hxx  | 12 ++++--------
- sdext/source/pdfimport/tree/pdfiprocessor.cxx | 21 ++++++++++++---------
- 2 files changed, 16 insertions(+), 17 deletions(-)
-
-diff --git a/sdext/source/pdfimport/inc/pdfiprocessor.hxx b/sdext/source/pdfimport/inc/pdfiprocessor.hxx
-index 89f9d601b7b0..9e08d6a6a765 100644
---- a/sdext/source/pdfimport/inc/pdfiprocessor.hxx
-+++ b/sdext/source/pdfimport/inc/pdfiprocessor.hxx
-@@ -37,9 +37,6 @@
- #include "treevisitorfactory.hxx"
- #include "genericelements.hxx"
- 
--#include <boost/bimap/bimap.hpp>
--#include <boost/bimap/unordered_set_of.hpp>
--
- namespace pdfi
- {
- 
-@@ -160,10 +157,8 @@ namespace pdfi
-         typedef std::unordered_map<sal_Int32,FontAttributes> IdToFontMap;
-         typedef std::unordered_map<FontAttributes,sal_Int32,FontAttrHash> FontToIdMap;
- 
--        typedef boost::bimaps::bimap<
--                             boost::bimaps::unordered_set_of<GraphicsContext, GraphicsContextHash>,
--                             boost::bimaps::unordered_set_of<sal_Int32>
--                            > GCToIdBiMap;
-+        typedef std::unordered_map<sal_Int32,GraphicsContext> IdToGCMap;
-+        typedef std::unordered_map<GraphicsContext, sal_Int32, GraphicsContextHash> GCToIdMap;
- 
-         typedef std::vector<GraphicsContext> GraphicsContextStack;
- 
-@@ -178,7 +173,8 @@ namespace pdfi
- 
-         GraphicsContextStack               m_aGCStack;
-         sal_Int32                          m_nNextGCId;
--        GCToIdBiMap                        m_aGCToId;
-+        IdToGCMap                          m_aIdToGC;
-+        GCToIdMap                          m_aGCToId;
- 
-         ImageContainer                     m_aImages;
- 
-diff --git a/sdext/source/pdfimport/tree/pdfiprocessor.cxx b/sdext/source/pdfimport/tree/pdfiprocessor.cxx
-index c6baa7fee8b2..ed2eaf6510b9 100644
---- a/sdext/source/pdfimport/tree/pdfiprocessor.cxx
-+++ b/sdext/source/pdfimport/tree/pdfiprocessor.cxx
-@@ -54,6 +54,7 @@ namespace pdfi
-     m_aFontToId(),
-     m_aGCStack(),
-     m_nNextGCId( 1 ),
-+    m_aIdToGC(),
-     m_aGCToId(),
-     m_aImages(),
-     m_nPages(0),
-@@ -65,12 +66,13 @@ namespace pdfi
-     aDefFont.isBold     = false;
-     aDefFont.isItalic   = false;
-     aDefFont.size       = 10*PDFI_OUTDEV_RESOLUTION/72;
--    m_aIdToFont[ 0 ]    = aDefFont;
--    m_aFontToId[ aDefFont ] = 0;
-+    m_aIdToFont.insert({0, aDefFont});
-+    m_aFontToId.insert({aDefFont, 0});
- 
-     GraphicsContext aDefGC;
-     m_aGCStack.push_back( aDefGC );
--    m_aGCToId.insert(GCToIdBiMap::relation(aDefGC, 0));
-+    m_aGCToId.insert({aDefGC, 0});
-+    m_aIdToGC.insert({0, aDefGC});
- }
- 
- void PDFIProcessor::setPageNum( sal_Int32 nPages )
-@@ -468,12 +470,13 @@ const FontAttributes& PDFIProcessor::getFont( sal_Int32 nFontId ) const
- sal_Int32 PDFIProcessor::getGCId( const GraphicsContext& rGC )
- {
-     sal_Int32 nGCId = 0;
--    auto it = m_aGCToId.left.find( rGC );
--    if( it != m_aGCToId.left.end() )
-+    auto it = m_aGCToId.find( rGC );
-+    if( it != m_aGCToId.end() )
-         nGCId = it->second;
-     else
-     {
--        m_aGCToId.insert(GCToIdBiMap::relation(rGC, m_nNextGCId));
-+        m_aGCToId.insert({rGC, m_nNextGCId});
-+        m_aIdToGC.insert({m_nNextGCId, rGC});
-         nGCId = m_nNextGCId;
-         m_nNextGCId++;
-     }
-@@ -483,9 +486,9 @@ sal_Int32 PDFIProcessor::getGCId( const GraphicsContext& rGC )
- 
- const GraphicsContext& PDFIProcessor::getGraphicsContext( sal_Int32 nGCId ) const
- {
--    auto it = m_aGCToId.right.find( nGCId );
--    if( it == m_aGCToId.right.end() )
--        it = m_aGCToId.right.find( 0 );
-+    auto it = m_aIdToGC.find( nGCId );
-+    if( it == m_aIdToGC.end() )
-+        it = m_aIdToGC.find( 0 );
-     return it->second;
- }
- 
--- 
-cgit v1.2.1
diff --git a/app-office/libreoffice/files/libreoffice-6.4.6.2-llvm-10.patch b/app-office/libreoffice/files/libreoffice-6.4.6.2-llvm-10.patch
deleted file mode 100644
index 4a1ff5160297..000000000000
--- a/app-office/libreoffice/files/libreoffice-6.4.6.2-llvm-10.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-From 986bd28388df745dd969e7be7c3bda36b2b2cb0e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
-Date: Thu, 6 Aug 2020 10:50:47 +0100
-Subject: [PATCH] ofz#24641 libc++abi __cxa_exception has grown another member
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-https: //github.com/llvm/llvm-project/commit/f2a436058fcbc11291e73badb44e243f61046183
-
-this is the same problem as
-
-commit f4b6f6a8ae60bdec53512728d00853b73fa18500
-Author: Stephan Bergmann <sbergman@redhat.com>
-Date:   Thu Feb 13 08:40:11 2020 +0100
-
-    Hack to dynamically adapt to __cxa_exceptiom in LLVM 11 libcxxabi
-
-    (where the new change to __cxa_exception effectively reverts the change that
-    prompted 7a9dd3d482deeeb3ed1d50074e56adbd3f928296 "Hack to dynamically adapt to
-    __cxa_exceptiom in LLVM 5.0 libcxxabi")
-
-    Change-Id: Iec4ef1dc188bea2223d99b1b7eb8adec636c98e7
-    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88583
-    Tested-by: Jenkins
-    Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
-
-so c-n-p that solution here
-
-Change-Id: I4475757a766e3ade7b9fcaf6149e535c9f9a4fa4
-Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100209
-Tested-by: Caolán McNamara <caolanm@redhat.com>
-Reviewed-by: Caolán McNamara <caolanm@redhat.com>
----
- .../cpp_uno/gcc3_linux_x86-64/except.cxx      | 28 +++++++++++++++++++
- .../cpp_uno/gcc3_linux_x86-64/share.hxx       | 14 ++++++++++
- 2 files changed, 42 insertions(+)
-
-diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx
-index e9e861f1c210..25931671f7dc 100644
---- a/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx
-+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx
-@@ -150,6 +150,34 @@ void fillUnoException(uno_Any * pUnoExc, uno_Mapping * pCpp2Uno)
-         return;
-     }
- 
-+#if defined _LIBCPPABI_VERSION // detect libc++abi
-+    // Very bad HACK to find out whether we run against a libcxxabi that has a new
-+    // __cxa_exception::reserved member at the start, introduced with LLVM 11
-+    // <https://github.com/llvm/llvm-project/commit/f2a436058fcbc11291e73badb44e243f61046183>
-+    // "[libcxxabi] Insert padding in __cxa_exception struct for compatibility".  The layout of the
-+    // start of __cxa_exception is
-+    //
-+    //  [8 byte  void *reserve]
-+    //   8 byte  size_t referenceCount
-+    //
-+    // where the (bad, hacky) assumption is that reserve (if present) is null
-+    // (__cxa_allocate_exception in at least LLVM 11 zero-fills the object, and nothing actively
-+    // sets reserve) while referenceCount is non-null (__cxa_throw sets it to 1, and
-+    // __cxa_decrement_exception_refcount destroys the exception as soon as it drops to 0; for a
-+    // __cxa_dependent_exception, the referenceCount member is rather
-+    //
-+    //   8 byte  void* primaryException
-+    //
-+    // but which also will always be set to a non-null value in __cxa_rethrow_primary_exception).
-+    // As described in the definition of __cxa_exception
-+    // (bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx), this hack (together with the "#if 0"
-+    // there) can be dropped once we can be sure that we only run against new libcxxabi that has the
-+    // reserve member:
-+    if (*reinterpret_cast<void **>(header) == nullptr) {
-+        header = reinterpret_cast<__cxxabiv1::__cxa_exception*>(reinterpret_cast<void **>(header) + 1);
-+    }
-+#endif
-+
-     std::type_info *exceptionType = __cxxabiv1::__cxa_current_exception_type();
- 
-     typelib_TypeDescription * pExcTypeDescr = nullptr;
-diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx
-index e8afe35c4f59..53c8841fbbcb 100644
---- a/bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx
-+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx
-@@ -108,6 +108,20 @@ namespace __cxxabiv1 {
- struct __cxa_exception {
- #if defined _LIBCPPABI_VERSION // detect libc++abi
- #if defined __LP64__ || LIBCXXABI_ARM_EHABI
-+#if 0
-+    // This is a new field added with LLVM 11
-+    // <https://github.com/llvm/llvm-project/commit/f2a436058fcbc11291e73badb44e243f61046183>
-+    // "[libcxxabi] Insert padding in __cxa_exception struct for compatibility".  The HACK in
-+    // fillUnoException (bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx) tries to find out at
-+    // runtime whether a __cxa_exception has this member.  Once we can be sure that we only run
-+    // against new libcxxabi that has this member, we can drop the "#if 0" here and drop the hack
-+    // in fillUnoException.
-+
-+    // Now _Unwind_Exception is marked with __attribute__((aligned)),
-+    // which implies __cxa_exception is also aligned. Insert padding
-+    // in the beginning of the struct, rather than before unwindHeader.
-+    void *reserve;
-+#endif
-     std::size_t referenceCount;
- #endif
- #endif
diff --git a/app-office/libreoffice/files/libreoffice-6.4.7.2-fix-wrong-setting-for-doc-properties.patch b/app-office/libreoffice/files/libreoffice-6.4.7.2-fix-wrong-setting-for-doc-properties.patch
deleted file mode 100644
index 9c9d417cde9f..000000000000
--- a/app-office/libreoffice/files/libreoffice-6.4.7.2-fix-wrong-setting-for-doc-properties.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 188ddcd482150b5fdeb44d97e57831e3e27b3f5b Mon Sep 17 00:00:00 2001
-From: Justin Luth <justin_luth@sil.org>
-Date: Mon, 28 Sep 2020 20:21:52 +0300
-Subject: tdf#136983 partial revert NFC ww8 cleanup: remove unused variables
-
-This is a partial revert of LO 6.2
-commit 2ec0cf500222aef55d02df80154b47fbb92970c9
-
-I can't think of any excuse for how I possibly missed that
-xDocProps was being defined/used outside of this clause.
-Just plain stupid and blind.
-
-The good news is that the create and modified date still
-seem to be getting saved somehow/somewhere. So it isn't
-the disaster that it looks like it could have been.
-
-Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103565
-Tested-by: Jenkins
-Reviewed-by: Justin Luth <justin_luth@sil.org>
-(cherry picked from commit 1086654d6e8cc22f1f99195668db3f305437e570)
-Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104495
-Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
-(cherry picked from commit 19b8ded3ae18dd4070a3e21d7b980782a27e5547)
-
-Change-Id: I72ef56fa50b9e92e4ce687b132b1919cfae6c1f6
-Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104497
-Tested-by: Jenkins
-Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
----
- sw/qa/extras/ww8export/ww8export3.cxx | 5 +++++
- sw/source/filter/ww8/wrtww8.cxx       | 6 +++++-
- 2 files changed, 10 insertions(+), 1 deletion(-)
-
-diff --git a/sw/qa/extras/ww8export/ww8export3.cxx b/sw/qa/extras/ww8export/ww8export3.cxx
-index 764ae66a20fa..9c83b6f62fa9 100644
---- a/sw/qa/extras/ww8export/ww8export3.cxx
-+++ b/sw/qa/extras/ww8export/ww8export3.cxx
-@@ -14,6 +14,7 @@
- #include <com/sun/star/container/XIndexAccess.hpp>
- #include <com/sun/star/drawing/FillStyle.hpp>
- #include <com/sun/star/drawing/LineDash.hpp>
-+#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
- #include <com/sun/star/graphic/XGraphic.hpp>
- #include <com/sun/star/text/XFormField.hpp>
- #include <com/sun/star/text/XTextTable.hpp>
-@@ -49,6 +50,10 @@ DECLARE_WW8EXPORT_TEST(testTdf37778_readonlySection, "tdf37778_readonlySection.d
-     // tdf#127862: page fill color (in this case white) was lost
-     uno::Reference<beans::XPropertySet> xStyle(getStyles("PageStyles")->getByName("Standard"), uno::UNO_QUERY);
-     CPPUNIT_ASSERT(drawing::FillStyle_NONE != getProperty<drawing::FillStyle>(xStyle, "FillStyle"));
-+
-+    // tdf#136983
-+    uno::Reference<document::XDocumentPropertiesSupplier> xDPS(mxComponent, uno::UNO_QUERY);
-+    CPPUNIT_ASSERT_EQUAL_MESSAGE("Last printed date", sal_Int16(2009), xDPS->getDocumentProperties()->getPrintDate().Year);
- }
- 
- DECLARE_WW8EXPORT_TEST(testTdf122429_header, "tdf122429_header.doc")
-diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
-index e908cab35162..8d4add7b34bf 100644
---- a/sw/source/filter/ww8/wrtww8.cxx
-+++ b/sw/source/filter/ww8/wrtww8.cxx
-@@ -501,7 +501,11 @@ static void WriteDop( WW8Export& rWrt )
-     uno::Reference<beans::XPropertySet> xProps;
-     if ( pDocShell )
-     {
--        xProps.set(pDocShell->GetModel(), uno::UNO_QUERY);
-+        uno::Reference<lang::XComponent> xModelComp(pDocShell->GetModel(), uno::UNO_QUERY);
-+        xProps.set(xModelComp, uno::UNO_QUERY);
-+        uno::Reference<document::XDocumentPropertiesSupplier> xDPS(xModelComp, uno::UNO_QUERY_THROW);
-+        xDocProps = xDPS->getDocumentProperties();
-+        OSL_ENSURE(xDocProps.is(), "DocumentProperties is null");
- 
-         rDop.lKeyProtDoc = pDocShell->GetModifyPasswordHash();
-     }
--- 
-cgit v1.2.1
diff --git a/app-office/libreoffice/files/libreoffice-6.4.7.2-icu-68-1.patch b/app-office/libreoffice/files/libreoffice-6.4.7.2-icu-68-1.patch
deleted file mode 100644
index fe20e3435d2a..000000000000
--- a/app-office/libreoffice/files/libreoffice-6.4.7.2-icu-68-1.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 0b14b9ec55fb2a8dd0ec24e1c03702bc4bbf1878 Mon Sep 17 00:00:00 2001
-From: Rene Engelhard <rene@debian.org>
-Date: Sun, 1 Nov 2020 18:30:49 +0100
-Subject: fix build with ICU 68
-
-use standard true.
-
-/home/rene/LibreOffice/git/master/i18npool/source/calendar/calendar_gregorian.cxx: In member function 'virtual void i18npool::Calendar_gregorian::setLocalDateTime(double)':
-/home/rene/LibreOffice/git/master/i18npool/source/calendar/calendar_gregorian.cxx:363:40: error: 'TRUE' was not declared in this scope
-  363 |     body->getTimeZone().getOffset( fR, TRUE, nZoneOffset, nDSTOffset, status );
-      |                                        ^~~~
-
-/usr/include/unicode/umachine.h says:
-
-@deprecated ICU 68 Use standard "true" instead.
-
-Change-Id: I45d2b0afa6a9043767af5c2cf41ba24377f2cdc4
-Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105057
-Tested-by: Jenkins
-Reviewed-by: Eike Rathke <erack@redhat.com>
----
- i18npool/source/calendar/calendar_gregorian.cxx | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/i18npool/source/calendar/calendar_gregorian.cxx b/i18npool/source/calendar/calendar_gregorian.cxx
-index b7ae49fbd96e..59ee46fa0e0f 100644
---- a/i18npool/source/calendar/calendar_gregorian.cxx
-+++ b/i18npool/source/calendar/calendar_gregorian.cxx
-@@ -347,7 +347,14 @@ Calendar_gregorian::setLocalDateTime( double fTimeInDays )
-             "Calendar_gregorian::setLocalDateTime: " << std::fixed << fM << " rounded to " << fR);
-     int32_t nZoneOffset, nDSTOffset;
-     UErrorCode status = U_ZERO_ERROR;
--    body->getTimeZone().getOffset( fR, TRUE, nZoneOffset, nDSTOffset, status );
-+    body->getTimeZone().getOffset( fR,
-+#if U_ICU_VERSION_MAJOR_NUM >= 68
-+    true,
-+#else
-+    TRUE,
-+#endif
-+    nZoneOffset, nDSTOffset, status );
-+
-     if ( !U_SUCCESS(status) ) throw ERROR;
-     status = U_ZERO_ERROR;
-     body->setTime( fR - (nZoneOffset + nDSTOffset), status );
--- 
-cgit v1.2.1
diff --git a/app-office/libreoffice/files/libreoffice-6.4.7.2-icu-68-2.patch b/app-office/libreoffice/files/libreoffice-6.4.7.2-icu-68-2.patch
deleted file mode 100644
index bd7dc04cffe5..000000000000
--- a/app-office/libreoffice/files/libreoffice-6.4.7.2-icu-68-2.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 523f8613c124b722b721c8055db2085a005e09dd Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Fri, 6 Nov 2020 02:43:07 +0100
-Subject: [PATCH] Fix build with ICU 68, use standard true. (part 2/2 missing
- from 0b14b9ec)
-
-Change-Id: I776dd4e1fc92ef1ef09b88e239bf0d6942c28ca3
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- svx/source/dialog/fntctrl.cxx | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx
-index d312d7ad5f49..10c84ca95222 100644
---- a/svx/source/dialog/fntctrl.cxx
-+++ b/svx/source/dialog/fntctrl.cxx
-@@ -1014,7 +1014,7 @@ void SvxFontPrevWindow::SetFromItemSet(const SfxItemSet &rSet, bool bPreviewBack
-          rCTLFont.SetFillColor( rColor );
-     }
-     else
--        bTransparent = TRUE;
-+        bTransparent = true;
- 
-     rFont.SetTransparent( bTransparent );
-     rCJKFont.SetTransparent( bTransparent );
--- 
-2.29.2
-
diff --git a/app-office/libreoffice/libreoffice-7.1.3.2.ebuild b/app-office/libreoffice/libreoffice-7.1.3.2.ebuild
index 57948352e89d..83fd2fd63bfe 100644
--- a/app-office/libreoffice/libreoffice-7.1.3.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.1.3.2.ebuild
@@ -102,7 +102,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"
 
 BDEPEND="
 	dev-util/intltool
diff --git a/app-office/libreoffice/libreoffice-6.4.7.2.ebuild b/app-office/libreoffice/libreoffice-7.1.4.2.ebuild
index c5ed22d98a2b..e90810957e90 100644
--- a/app-office/libreoffice/libreoffice-6.4.7.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.1.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
+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
 
 DESCRIPTION="A full office productivity suite"
 HOMEPAGE="https://www.libreoffice.org"
@@ -44,7 +44,11 @@ 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=(
-	# QR code generating library for >=libreoffice-6.4
+	# 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-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz"
+	# QR code generating library for >=libreoffice-6.4, bug #691740
 	"${ADDONS_URI}/QR-Code-generator-1.4.0.tar.gz"
 	"base? (
 		${ADDONS_URI}/commons-logging-1.2-src.tar.gz
@@ -78,8 +82,8 @@ unset ADDONS_SRC
 # Extensions that need extra work:
 LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
 
-IUSE="accessibility base bluetooth +branding coinmp +cups +dbus debug eds firebird
-googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres test
+IUSE="accessibility base bluetooth +branding clang coinmp +cups custom-cflags +dbus debug eds firebird
+googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres test vulkan
 $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
@@ -98,7 +102,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )"
 SLOT="0"
 
 [[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux"
 
 BDEPEND="
 	dev-util/intltool
@@ -121,7 +125,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	app-text/liblangtag
 	>=app-text/libmspub-0.1.0
 	>=app-text/libmwaw-0.3.1
-	app-text/libnumbertext
+	>=app-text/libnumbertext-1.0.6
 	>=app-text/libodfgen-0.1.0
 	app-text/libqxp
 	app-text/libstaroffice
@@ -132,6 +136,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	>=dev-cpp/clucene-2.3.3.4-r2
 	>=dev-cpp/libcmis-0.5.2
 	dev-db/unixODBC
+	>=games-engines/box2d-2.4.1:0
 	dev-lang/perl
 	>=dev-libs/boost-1.72.0:=[nls]
 	dev-libs/expat
@@ -139,7 +144,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	dev-libs/icu:=
 	dev-libs/libassuan
 	dev-libs/libgpg-error
-	dev-libs/liborcus:0/0.15
+	dev-libs/liborcus:0/0.16
 	dev-libs/librevenge
 	dev-libs/libxml2
 	dev-libs/libxslt
@@ -160,7 +165,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	>=media-libs/libpng-1.4:0=
 	>=media-libs/libvisio-0.1.0
 	media-libs/libzmf
-	net-libs/neon
+	>=net-libs/neon-0.31.1:=
 	net-misc/curl
 	sci-mathematics/lpsolve
 	sys-libs/zlib
@@ -178,6 +183,19 @@ COMMON_DEPEND="${PYTHON_DEPS}
 		dev-libs/glib:2
 		net-wireless/bluez
 	)
+	clang? (
+		|| (
+			(	sys-devel/clang:12
+				sys-devel/llvm:12
+				=sys-devel/lld-12*	)
+			(	sys-devel/clang:11
+				sys-devel/llvm:11
+				=sys-devel/lld-11*	)
+			(	sys-devel/clang:10
+				sys-devel/llvm:10
+				=sys-devel/lld-10*	)
+		)
+	)
 	coinmp? ( sci-libs/coinor-mp )
 	cups? ( net-print/cups )
 	dbus? ( sys-apps/dbus[X] )
@@ -196,7 +214,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 		dev-libs/gobject-introspection
 		gnome-base/dconf
 		media-libs/mesa[egl]
-		x11-libs/gtk+:3
+		x11-libs/gtk+:3[X]
 		x11-libs/pango
 	)
 	kde? (
@@ -235,7 +253,10 @@ DEPEND="${COMMON_DEPEND}
 	x11-libs/libXtst
 	java? (
 		dev-java/ant-core
-		>=virtual/jdk-1.8
+		|| (
+			dev-java/openjdk:11
+			dev-java/openjdk-bin:11
+		)
 	)
 	test? (
 		app-crypt/gnupg
@@ -247,10 +268,13 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
 	!app-office/libreoffice-bin
 	!app-office/libreoffice-bin-debug
-	!app-office/openoffice
 	media-fonts/liberation-fonts
 	|| ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
-	java? ( >=virtual/jre-1.8 )
+	java? ( || (
+		dev-java/openjdk:11
+		dev-java/openjdk-jre-bin:11
+		>=virtual/jre-1.8
+	) )
 	kde? ( kde-frameworks/breeze-icons:* )
 "
 if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
@@ -269,13 +293,8 @@ PATCHES=(
 	"${FILESDIR}/${PN}-6.1-nomancompress.patch"
 	"${FILESDIR}/${PN}-7.0.3.1-qt5detect.patch"
 
-	# 6.4 branch (fixed in 6.4.8)
-	"${FILESDIR}/${P}-fix-wrong-setting-for-doc-properties.patch"
-
-	# git master
-	"${FILESDIR}/${PN}-6.4.3.2-boost-1.73.patch" # bug 721806
-	"${FILESDIR}/${PN}-6.4.6.2-llvm-10.patch" # bug 713574
-	"${FILESDIR}"/${P}-icu-68-{1,2}.patch # bug 752021, +downstream backport
+	# master branch
+	"${FILESDIR}/${PN}-7.1.3.2-bashism.patch" # bug 780432
 )
 
 S="${WORKDIR}/${PN}-${MY_PV}"
@@ -291,10 +310,16 @@ _check_reqs() {
 }
 
 pkg_pretend() {
-	use base ||
-		ewarn "If you plan to use Base application you must enable USE base."
-	use java ||
-		ewarn "Without USE java, several wizards are not going to be available."
+	if use x86; then
+		elog "Unfortunately for packaging reasons on x86, various Java-based wizards,"
+		elog "most notably Report Builder in LibreOffice Base, will not be available."
+		elog "See also: https://bugs.gentoo.org/785640"
+	else
+		use base ||
+			ewarn "If you plan to use Base application you must enable USE base."
+		use java ||
+			ewarn "Without USE java, several wizards are not going to be available."
+	fi
 
 	[[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
 }
@@ -372,6 +397,50 @@ src_configure() {
 	local google_default_client_id="329227923882.apps.googleusercontent.com"
 	local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
 
+	# Show flags set at the beginning
+	einfo "Preset CFLAGS:    ${CFLAGS}"
+	einfo "Preset LDFLAGS:   ${LDFLAGS}"
+
+	if use clang ; then
+		# Force clang
+		einfo "Enforcing the use of clang due to USE=clang ..."
+		AR=llvm-ar
+		CC=${CHOST}-clang
+		CXX=${CHOST}-clang++
+		NM=llvm-nm
+		RANLIB=llvm-ranlib
+		LDFLAGS+=" -fuse-ld=lld"
+	else
+		# Force gcc
+		einfo "Enforcing the use of gcc due to USE=-clang ..."
+		AR=gcc-ar
+		CC=${CHOST}-gcc
+		CXX=${CHOST}-g++
+		NM=gcc-nm
+		RANLIB=gcc-ranlib
+	fi
+
+	if use custom-cflags ; then
+		elog "USE=custom-cflags has been selected. You are on your own to make sure that"
+		elog "the build succeeds. Good luck!"
+	else
+		strip-flags
+	fi
+
+	export LO_CLANG_CC=${CC}
+	export LO_CLANG_CXX=${CXX}
+
+	# Show flags set at the end
+	einfo "  Used CFLAGS:    ${CFLAGS}"
+	einfo "  Used LDFLAGS:   ${LDFLAGS}"
+
+	# Ensure we use correct toolchain
+	tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
+
+	if use vulkan && ! use clang ; then
+		ewarn "Building skia with gcc may lead to performance issues. Disable vulkan or enable clang."
+	fi
+
 	# optimization flags
 	export GMAKE_OPTIONS="${MAKEOPTS}"
 	# System python enablement:
@@ -397,7 +466,7 @@ src_configure() {
 	# --without-system-sane: just sane.h header that is used for scan in writer,
 	#   not linked or anything else, worthless to depend on
 	# --disable-pdfium: not yet packaged
-	# --without-system-qrencode: has no real build system and LO is the only user
+	# --without-system-qrcodegen: has no real build system and LO is the only user
 	local myeconfargs=(
 		--with-system-dicts
 		--with-system-epoxy
@@ -422,7 +491,7 @@ src_configure() {
 		--disable-openssl
 		--disable-pdfium
 		--disable-vlc
-		--with-build-version="${gentoo_buildid}"
+		--with-extra-buildid="${gentoo_buildid}"
 		--enable-extension-integration
 		--with-external-dict-dir="${EPREFIX}/usr/share/myspell"
 		--with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
@@ -459,6 +528,7 @@ src_configure() {
 		$(use_enable odk)
 		$(use_enable pdfimport)
 		$(use_enable postgres postgresql-sdbc)
+		$(use_enable vulkan skia)
 		$(use_with accessibility lxml)
 		$(use_with coinmp system-coinmp)
 		$(use_with googledrive gdrive-client-id ${google_default_client_id})
@@ -488,9 +558,12 @@ src_configure() {
 			--without-junit
 			--without-system-hsqldb
 			--with-ant-home="${ANT_HOME}"
-			--with-jdk-home=$(java-config --jdk-home 2>/dev/null)
-			--with-jvm-path="${EPREFIX}/usr/lib/"
 		)
+		if has_version "dev-java/openjdk:11"; then
+			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" )
+		fi
 
 		use libreoffice_extensions_scripting-beanshell && \
 			myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
@@ -568,12 +641,12 @@ EOF
 
 	python_optimize "${D}"${lodir}/program
 	# link python bridge in site-packages, bug 667802
-	local py pyc loprogdir=$(get_libdir)/libreoffice/program
+	local py pyc loprogdir=/usr/$(get_libdir)/libreoffice/program
 	for py in uno.py unohelper.py officehelper.py; do
-		dosym ../../../${loprogdir}/${py} $(python_get_sitedir)/${py}
+		dosym8 -r ${loprogdir}/${py} $(python_get_sitedir)/${py}
 		while IFS="" read -d $'\0' -r pyc; do
 			pyc=${pyc//*\/}
-			dosym ../../../../${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
+			dosym8 -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
 		done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
 	done
 }