gentoo resync : 14.12.2020

6 files changed, 17 insertions, 719 deletions

diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 73423179e8cf..1c14ec48150d 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -2,7 +2,6 @@ AUX libreoffice-5.3.4.2-kioclient5.patch 605 BLAKE2B 30961066c080c4d06ca978b7c0a
 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.6.2-qaccessiblecache-assert.patch 4237 BLAKE2B ee118712472c3b3fc0804f677ddcc8846574205d8413ae0c2b3b7e89e2daea6a5abacbf401214ccfba06adf6f0a84caee4e8e031945387065e9611f434942568 SHA512 6afe89d6d2bb6896adfc34d57b4621b0e7a446c617d8c79a7d53b610d113ef0b439db0ae0bb6a9e0c61b2eeb6eadf73a54312c2a3dd005695ea6b5444337bd0f
 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
@@ -27,17 +26,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.6.2.tar.xz 232180876 BLAKE2B b2e01cc8e56b36c16fc3e39ff88617d7c31d6b0a0f4a5c05c8536313e7129862fb962e1a6efc7e86e9b56c34dff7c2d895416f33fbb23dc45e447b25813b5654 SHA512 377675494d4422c4d9363fe3857a8587e38f6ccd39aebec9c23337aa3a88cb2526608b8d0bcb27985ed8f821a98ca541dad4b48d69db441bcb27e9fb81beb9ba
 DIST libreoffice-6.4.7.2.tar.xz 232364676 BLAKE2B 1df8f2a3aa00bd057dd1d6d9665a541330ceeabb2bb5d46351449cf9b916a5649f38dc0e0175cf3733123f9247157f5fd0f2c34c8dad1d676da6c31d8346927b SHA512 ba6ff5948624d7a76025406c38728d643be656091d79320a1c5ddba10000411662951a0b02de7a9e796e76d8185b6e9113882406bb0c1452b4c988ac3095afa8
 DIST libreoffice-7.0.3.1.tar.xz 240706432 BLAKE2B 4bf075fedb445a60a971adfb029fb7843afab1ee2009d32b149c91970d8eae990e4ac3ea7075d58815288f1f174846e0e9de7ce00655840ad97622a3790b43a2 SHA512 1680b5166ead7ca521130f7d23cb2bd73d3d4f801f94c9a3ab0066fb7763ced3c01d89fbe1b7a79a1826bcfd6ebcd3ce5fb3014ab6583034f08ed25969ab5f36
 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
-DIST libreoffice-help-6.4.6.2.tar.xz 88297908 BLAKE2B 919758e81ed46138331b49668f89c6bf7f50253d7632d113aa957f524ae26e2b99f2ba490b405830314822ea91185eb2308018df77c5bd3d7197cbba940ae2ba SHA512 8ada2568a40dc4f1c843cb37dde6abe3bd61b6e5d9910b985096821e1fce5af47d4a10bff8ae91913298e593130bc1f8668b4e1c59c46591d457157e3d4b7501
 DIST libreoffice-help-6.4.7.2.tar.xz 88296892 BLAKE2B 9ee12ec6aa6d5539408e0206e313901540533e28686585fa0bb4edbeaa482bb0ad1cd4ae37ac18dab66bb3e2ea32d52d9960236cbf3e0f8fb5ca07c007f38794 SHA512 a5381a8cca9988998dc01d3815869e47193c1da814b714cbedb51a2099f7dc5444315c657e32defab2eb0b9a9e2a922bc4c5fbc36b7a2b60e7c551887a9cdbb3
 DIST libreoffice-help-7.0.3.1.tar.xz 110855688 BLAKE2B 3b0e845087fe0bd25ad3c06b8a8eac548f05568cf279efc10f7190ee51e8a9922c64749ad57c21b150aaac9b3249a6e184583f389a191fc6b86128153ff363be SHA512 1acbc7575da99ce0a09a3092a8612f47c432ffd8d4b6029c885c782a857c6b0812bb2eee3873b0cdfa41ee42f84a0843c3d06109ccb651b5bba5ade1a6725a78
 DIST skia-m85-e684c6daef6bfb774a325a069eda1f76ca6ac26c.tar.xz 8375536 BLAKE2B 8e3849123ce426a4dc43705537b176df82c6039a23911d75b7b3b26ca44f4a600c96c67c5f4d935a8d6a5064362f7f2167231b2aafbc44533c07299a8980aafe SHA512 4aeba56400d20e5fe234c7927b3d196233e19513a3202e074a88fad0d14d168221574a5a72b8dd9398cf3a9453c46eba4e4ed23d8d2031522b6cb11bc8bb43c1
-EBUILD libreoffice-6.4.6.2-r2.ebuild 17744 BLAKE2B f4024ee09916c9568d25dc39170bf9d0a0426934b8ada515c9295ad426b0993c5787bf7687987fdcfe31ae3fec07eaf1a90cfcbd4b87714cd8e0861d1daae035 SHA512 4f2c0a7993d457698e6ea30bb2cd4fc32582167a652ee54788a5785c8baa32dfab924c67413c4cbedd92f411d348762e19b89458166c194a0077b480a117db0d
 EBUILD libreoffice-6.4.7.2.ebuild 17758 BLAKE2B b7ab4b5999623779e9a76787cde54424f2c3d7ef112c5e9af544cbcab500402ad12e82b91433236c68916ed5cd0f2106197bb92854d264c9d39055663bac3f40 SHA512 91c4e17ef404caf7c3ee97a7ae613b7e758cd7acddaa8da56f80adfc07bd960aac0045a9f185067bcf331dc2025f08e09869b630a5f74b26ed99c1c9d78c797f
-EBUILD libreoffice-7.0.3.1.ebuild 19568 BLAKE2B ece6e822dee5dbb506dc7f5c3384f4ef7bc31b61e17db96168736d7b429e3475f006b0224a88eaa64790d26b89d591160ec11e1d4ba95594e58caa16b7e319d7 SHA512 7110e26e3bafe2a093d9213172a28b1c6ff1e5f4c708d836c930cf3209a3e6018d4bccb65106f9de999408d49ce4fbac5234548ee440124bb18756d830398ffe
-EBUILD libreoffice-7.0.9999.ebuild 19468 BLAKE2B 2b8743e26af363888aae618a8e362b3e0d78665821b1dc51de892cadb67d5040926c18e6fb771a5652cf8a717b14312ae486ee7bb38fa1227c69f2dbce201f3e SHA512 96b5ae90f387b9af31a354b1994e1affdd4fc86d78878e1219b6ae2216e5053a27fce6933e2b451bb939921574f4df19136da5d97794d2f9ab39c8bcb137e163
-EBUILD libreoffice-9999.ebuild 19474 BLAKE2B 34cd4cb51f1c6f27126b4a5d6b67eb16dd4fbbd1e43b33c9de580007b0d34d2e054ca8a1aa55763234847b14266df6a6b5ea03c1198c2a0c577958053c3ee13f SHA512 658a596b44569fdfe505943a35673937a8576f3c39993c5708e86c5f04b7f908d64ba5c2255b399ca7076bcc734c3195e5adfd8fc82702c4138e64a4ee94b12a
+EBUILD libreoffice-7.0.3.1.ebuild 19546 BLAKE2B 67bed07b412293b856b646fe65f6c85bb7a4bb41f6f304c317fd6da9512e5d49e1c88452bc4412493ed95e0a66a2d8eca15d739fdbc2780b27b8c1b9de5d1fc1 SHA512 544ad9ec14073dffbc3f0d8e2050d9328ca35367619b107e4279ce63ed5e4627a9917427edd3411be098af424c815fcf4a9817875bde9cafa363404cd6608738
+EBUILD libreoffice-7.0.9999.ebuild 19423 BLAKE2B 868cfdf80d5bd2bddff6174abee16dd318760c1b6e818b53c386ea980bbb660c3f522905d0d8d6539c886fbb60479a3d63477c11a73cc62d0a42bc12da8a54ae SHA512 4718cfda95f46483ba0a914a30fba3bbfa141caf5ac00fa8e908e40fa4d10d3557b0b4cd7b907ec54682010f56bbbc58980d10979fa751afec1b2556fd47bde3
+EBUILD libreoffice-9999.ebuild 19429 BLAKE2B ecb63814004cf3e6ec4c4c2ba73a15346225343a94e55242338e909216f74db5db251354263a8609cd47903a9d1143f74bf37a59212c97aab472532f03dbfe4f SHA512 1087949fe23c5a8ffb2062bf9fad91272129cc73be5744bb212d14b10986be4278e17e37e81787340a045d2d8802a23ce3e2ee324bdfb3f3b06b66afa5a304fb
 MISC metadata.xml 1221 BLAKE2B 2cc713dbc6d112ac21f8846f9dad48c09972c0d6846a253773280564cf9370934ec798a1579d894d7679c591045542cf2c8cb8a308bf097ce5eac64f40fda3f0 SHA512 c1ab6a23d6fa4ed6b2d77b08c895f653890998a8ed7fb2fa69251adacc9a96e32c0d1298a2b7c287efe85d37a2707e740b6b036174b7b6e39d37a25e3866e957
diff --git a/app-office/libreoffice/files/libreoffice-6.4.6.2-qaccessiblecache-assert.patch b/app-office/libreoffice/files/libreoffice-6.4.6.2-qaccessiblecache-assert.patch
deleted file mode 100644
index baeabcbad4e2..000000000000
--- a/app-office/libreoffice/files/libreoffice-6.4.6.2-qaccessiblecache-assert.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-From 8e6b7d5696378e946e904c1df87da83e139af90d Mon Sep 17 00:00:00 2001
-From: Michael Weghorn <m.weghorn@posteo.de>
-Date: Mon, 7 Sep 2020 20:08:57 +0200
-Subject: tdf#136323 qt5: Remember accessible object
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-'QAccessibleCache::insert' from the Qt library has a
-'Q_ASSERT' checking that the corresponding 'QObject' for
-which the 'QAccessibleInterface' provides information
-is actually the same as the object passed as a parameter:
-
-    QAccessible::Id QAccessibleCache::insert(QObject *object, QAccessibleInterface *iface) const
-    {
-        // ...
-        QObject *obj = iface->object();
-->      Q_ASSERT(object == obj);
-
-However, 'Qt5AccessibleWidget::object' so far was always returning
-'nullptr', triggering this assert when using a Qt version
-not built with 'QT_NO_DEBUG'.
-
-To fix this, remember and return the object as needed.
-
-Change-Id: I4015b4c37aa8a073b02465df580a7235884e6cf3
-Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102196
-Tested-by: Jenkins
-Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
-(cherry picked from commit 4461d49c6cfce22c2c96185b0a1d07bfe9709268)
-Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102126
-Reviewed-by: Caolán McNamara <caolanm@redhat.com>
----
- vcl/inc/qt5/Qt5AccessibleWidget.hxx | 4 +++-
- vcl/qt5/Qt5AccessibleWidget.cxx     | 9 +++++----
- 2 files changed, 8 insertions(+), 5 deletions(-)
-
-diff --git a/vcl/inc/qt5/Qt5AccessibleWidget.hxx b/vcl/inc/qt5/Qt5AccessibleWidget.hxx
-index 6b0d71cba9f5..0f62d2a8a5b8 100644
---- a/vcl/inc/qt5/Qt5AccessibleWidget.hxx
-+++ b/vcl/inc/qt5/Qt5AccessibleWidget.hxx
-@@ -41,7 +41,8 @@ class VCLPLUG_QT5_PUBLIC Qt5AccessibleWidget : public QObject,
-     Q_OBJECT
- 
- public:
--    Qt5AccessibleWidget(const css::uno::Reference<css::accessibility::XAccessible> xAccessible);
-+    Qt5AccessibleWidget(const css::uno::Reference<css::accessibility::XAccessible> xAccessible,
-+                        QObject* pObject);
-     QWindow* window() const override;
-     int childCount() const override;
-     int indexOfChild(const QAccessibleInterface* child) const override;
-@@ -137,6 +138,7 @@ public:
- private:
-     css::uno::Reference<css::accessibility::XAccessible> m_xAccessible;
-     css::uno::Reference<css::accessibility::XAccessibleContext> getAccessibleContextImpl() const;
-+    QObject* m_pObject;
- };
- 
- /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
-diff --git a/vcl/qt5/Qt5AccessibleWidget.cxx b/vcl/qt5/Qt5AccessibleWidget.cxx
-index 6a828865036e..7136e0823790 100644
---- a/vcl/qt5/Qt5AccessibleWidget.cxx
-+++ b/vcl/qt5/Qt5AccessibleWidget.cxx
-@@ -58,8 +58,9 @@ using namespace css::accessibility;
- using namespace css::beans;
- using namespace css::uno;
- 
--Qt5AccessibleWidget::Qt5AccessibleWidget(const Reference<XAccessible> xAccessible)
-+Qt5AccessibleWidget::Qt5AccessibleWidget(const Reference<XAccessible> xAccessible, QObject* pObject)
-     : m_xAccessible(xAccessible)
-+    , m_pObject(pObject)
- {
-     Reference<XAccessibleContext> xContext = xAccessible->getAccessibleContext();
-     Reference<XAccessibleEventBroadcaster> xBroadcaster(xContext, UNO_QUERY);
-@@ -698,7 +699,7 @@ bool Qt5AccessibleWidget::isValid() const
-     return xAc.is();
- }
- 
--QObject* Qt5AccessibleWidget::object() const { return nullptr; }
-+QObject* Qt5AccessibleWidget::object() const { return m_pObject; }
- 
- void Qt5AccessibleWidget::setText(QAccessible::Text /* t */, const QString& /* text */) {}
- 
-@@ -721,13 +722,13 @@ QAccessibleInterface* Qt5AccessibleWidget::customFactory(const QString& classnam
-         vcl::Window* pWindow = pWidget->frame().GetWindow();
- 
-         if (pWindow)
--            return new Qt5AccessibleWidget(pWindow->GetAccessible());
-+            return new Qt5AccessibleWidget(pWindow->GetAccessible(), object);
-     }
-     if (classname == QLatin1String("Qt5XAccessible") && object)
-     {
-         Qt5XAccessible* pXAccessible = dynamic_cast<Qt5XAccessible*>(object);
-         if (pXAccessible && pXAccessible->m_xAccessible.is())
--            return new Qt5AccessibleWidget(pXAccessible->m_xAccessible);
-+            return new Qt5AccessibleWidget(pXAccessible->m_xAccessible, object);
-     }
- 
-     return nullptr;
--- 
-cgit v1.2.1
-
diff --git a/app-office/libreoffice/libreoffice-6.4.6.2-r2.ebuild b/app-office/libreoffice/libreoffice-6.4.6.2-r2.ebuild
deleted file mode 100644
index a7c3258853ee..000000000000
--- a/app-office/libreoffice/libreoffice-6.4.6.2-r2.ebuild
+++ /dev/null
@@ -1,593 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9} )
-PYTHON_REQ_USE="threads(+),xml"
-
-MY_PV="${PV/_alpha/.alpha}"
-MY_PV="${MY_PV/_beta/.beta}"
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make everyone happy.
-DEV_URI="
-	https://dev-builds.libreoffice.org/pre-releases/src
-	https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
-	https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
-"
-ADDONS_URI="https://dev-www.libreoffice.org/src/"
-
-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
-
-DESCRIPTION="A full office productivity suite"
-HOMEPAGE="https://www.libreoffice.org"
-SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
-
-# Split modules following git/tarballs; Core MUST be first!
-# Help is used for the image generator
-# Only release has the tarballs
-if [[ ${MY_PV} != *9999* ]]; then
-	for i in ${DEV_URI}; do
-		SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
-		SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
-	done
-	unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# 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
-	"${ADDONS_URI}/QR-Code-generator-1.4.0.tar.gz"
-	"base? (
-		${ADDONS_URI}/commons-logging-1.2-src.tar.gz
-		${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
-		${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
-		${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
-		${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
-		${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
-		${ADDONS_URI}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
-		${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
-		${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
-		${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
-		${ADDONS_URI}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
-		${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
-	)"
-	"java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
-	# no release for 8 years, should we package it?
-	"libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
-	# Does not build with 1.6 rhino at all
-	"libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
-	# requirement of rhino
-	"libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
-	# not packageable
-	"odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-)
-SRC_URI+=" ${ADDONS_SRC[*]}"
-
-unset ADDONS_URI
-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
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	base? ( firebird java )
-	bluetooth? ( dbus )
-	gtk? ( dbus )
-	libreoffice_extensions_nlpsolver? ( java )
-	libreoffice_extensions_scripting-beanshell? ( java )
-	libreoffice_extensions_scripting-javascript? ( java )
-	libreoffice_extensions_wiki-publisher? ( java )
-"
-
-RESTRICT="!test? ( test )"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-
-[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="
-	dev-util/intltool
-	sys-devel/bison
-	sys-devel/flex
-	sys-devel/gettext
-	virtual/pkgconfig
-	odk? ( >=app-doc/doxygen-1.8.4 )
-"
-COMMON_DEPEND="${PYTHON_DEPS}
-	app-arch/unzip
-	app-arch/zip
-	app-crypt/gpgme[cxx]
-	app-text/hunspell:=
-	>=app-text/libabw-0.1.0
-	>=app-text/libebook-0.1
-	app-text/libepubgen
-	>=app-text/libetonyek-0.1
-	app-text/libexttextcat
-	app-text/liblangtag
-	>=app-text/libmspub-0.1.0
-	>=app-text/libmwaw-0.3.1
-	app-text/libnumbertext
-	>=app-text/libodfgen-0.1.0
-	app-text/libqxp
-	app-text/libstaroffice
-	app-text/libwpd:0.10[tools]
-	app-text/libwpg:0.3
-	>=app-text/libwps-0.4
-	app-text/mythes
-	>=dev-cpp/clucene-2.3.3.4-r2
-	>=dev-cpp/libcmis-0.5.2
-	dev-db/unixODBC
-	dev-lang/perl
-	>=dev-libs/boost-1.72.0:=[nls]
-	dev-libs/expat
-	dev-libs/hyphen
-	dev-libs/icu:=
-	dev-libs/libassuan
-	dev-libs/libgpg-error
-	>=dev-libs/liborcus-0.15.0
-	dev-libs/librevenge
-	dev-libs/libxml2
-	dev-libs/libxslt
-	dev-libs/nspr
-	dev-libs/nss
-	>=dev-libs/redland-1.0.16
-	>=dev-libs/xmlsec-1.2.28[nss]
-	media-gfx/fontforge
-	media-gfx/graphite2
-	media-libs/fontconfig
-	media-libs/freetype:2
-	>=media-libs/harfbuzz-0.9.42:=[graphite,icu]
-	media-libs/lcms:2
-	>=media-libs/libcdr-0.1.0
-	>=media-libs/libepoxy-1.3.1[X]
-	>=media-libs/libfreehand-0.1.0
-	media-libs/libpagemaker
-	>=media-libs/libpng-1.4:0=
-	>=media-libs/libvisio-0.1.0
-	media-libs/libzmf
-	net-libs/neon
-	net-misc/curl
-	sci-mathematics/lpsolve
-	sys-libs/zlib
-	virtual/glu
-	virtual/jpeg:0
-	virtual/opengl
-	x11-libs/cairo[X]
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	accessibility? (
-		$(python_gen_cond_dep 'dev-python/lxml[${PYTHON_MULTI_USEDEP}]')
-	)
-	bluetooth? (
-		dev-libs/glib:2
-		net-wireless/bluez
-	)
-	coinmp? ( sci-libs/coinor-mp )
-	cups? ( net-print/cups )
-	dbus? ( sys-apps/dbus[X] )
-	eds? (
-		dev-libs/glib:2
-		gnome-base/dconf
-		gnome-extra/evolution-data-server
-	)
-	firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	gtk? (
-		dev-libs/glib:2
-		dev-libs/gobject-introspection
-		gnome-base/dconf
-		media-libs/mesa[egl]
-		x11-libs/gtk+:3
-		x11-libs/pango
-	)
-	kde? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtx11extras:5
-		kde-frameworks/kconfig:5
-		kde-frameworks/kcoreaddons:5
-		kde-frameworks/ki18n:5
-		kde-frameworks/kio:5
-		kde-frameworks/kwindowsystem:5
-	)
-	ldap? ( net-nds/openldap )
-	libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
-	libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
-	mariadb? ( dev-db/mariadb-connector-c )
-	!mariadb? ( dev-db/mysql-connector-c )
-	pdfimport? ( app-text/poppler:=[cxx] )
-	postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
-"
-# FIXME: cppunit should be moved to test conditional
-#        after everything upstream is under gbuild
-#        as dmake execute tests right away
-#        tests apparently also need google-carlito-fonts (not packaged)
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/libatomic_ops-7.2d
-	dev-perl/Archive-Zip
-	>=dev-util/cppunit-1.14.0
-	>=dev-util/gperf-3.1
-	dev-util/mdds:1/1.5
-	media-libs/glm
-	sys-devel/ucpp
-	x11-base/xorg-proto
-	x11-libs/libXt
-	x11-libs/libXtst
-	java? (
-		dev-java/ant-core
-		>=virtual/jdk-1.8
-	)
-	test? (
-		app-crypt/gnupg
-		dev-util/cppunit
-		media-fonts/dejavu
-		media-fonts/liberation-fonts
-	)
-"
-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 )
-	kde? ( kde-frameworks/breeze-icons:* )
-"
-if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
-	PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
-else
-	# Translations are not reliable on live ebuilds
-	# rather force people to use english only.
-	PDEPEND="!app-office/libreoffice-l10n"
-fi
-
-PATCHES=(
-	# "${WORKDIR}"/${PATCHSET/.tar.xz/}
-
-	# not upstreamable stuff
-	"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
-	"${FILESDIR}/${PN}-6.1-nomancompress.patch"
-
-	# 6.4 branch (in 6.4.7)
-	"${FILESDIR}/${P}-qaccessiblecache-assert.patch" # bug 680186
-
-	# 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
-)
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-_check_reqs() {
-	CHECKREQS_MEMORY="512M"
-	if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		CHECKREQS_DISK_BUILD="22G"
-	else
-		CHECKREQS_DISK_BUILD="6G"
-	fi
-	check-reqs_$1
-}
-
-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."
-
-	[[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
-}
-
-pkg_setup() {
-	java-pkg-opt-2_pkg_setup
-	python-single-r1_pkg_setup
-	xdg_environment_reset
-
-	[[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
-}
-
-src_unpack() {
-	default
-
-	if [[ ${MY_PV} = *9999* ]]; then
-		local base_uri branch mypv
-		base_uri="https://anongit.freedesktop.org/git"
-		branch="master"
-		mypv=${MY_PV/.9999}
-		[[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
-		git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
-		git-r3_checkout "${base_uri}/${PN}/core"
-		LOCOREGIT_VERSION=${EGIT_VERSION}
-
-		git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
-		git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
-	fi
-}
-
-src_prepare() {
-	default
-
-	# sandbox violations on many systems, we don't need it. Bug #646406
-	sed -i \
-		-e "/KF5_CONFIG/s/kf5-config/no/" \
-		configure.ac || die "Failed to disable kf5-config"
-
-	AT_M4DIR="m4" eautoreconf
-	# hack in the autogen.sh
-	touch autogen.lastrun
-
-	# sed in the tests
-	sed -i \
-		-e "s#all : build unitcheck#all : build#g" \
-		solenv/gbuild/Module.mk || die
-	sed -i \
-		-e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
-		-e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
-		Makefile.in || die
-
-	sed -i \
-		-e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
-		-e "s,\$INSTALLDIRNAME.sh,${PN}," \
-		bin/distro-install-desktop-integration || die
-
-	if use branding; then
-		# hack...
-		mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
-	fi
-
-	# Don't list pdfimport support in desktop when built with none, bug # 605464
-	if ! use pdfimport; then
-		sed -i \
-			-e ":MimeType: s:application/pdf;::" \
-			-e ":Keywords: s:pdf;::" \
-			sysui/desktop/menus/draw.desktop || die
-	fi
-}
-
-src_configure() {
-	# Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
-	# Note: these are for Gentoo use ONLY. For your own distribution, please get
-	# your own set of keys. Feel free to contact chromium@gentoo.org for more info.
-	local google_default_client_id="329227923882.apps.googleusercontent.com"
-	local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-
-	# optimization flags
-	export GMAKE_OPTIONS="${MAKEOPTS}"
-	# System python enablement:
-	export PYTHON_CFLAGS=$(python_get_CFLAGS)
-	export PYTHON_LIBS=$(python_get_LIBS)
-
-	if use kde; then
-		export QT_SELECT=5 # bug 639620 needs proper fix though
-		export QT5DIR="$(qt5_get_bindir)/../"
-		export MOC5="$(qt5_get_bindir)/moc"
-	fi
-
-	local gentoo_buildid="Gentoo official package"
-	if [[ -n ${LOCOREGIT_VERSION} ]]; then
-		gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
-	fi
-
-	# system headers/libs/...: enforce using system packages
-	# --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
-	# --enable-cairo: ensure that cairo is always required
-	# --enable-*-link: link to the library rather than just dlopen on runtime
-	# --enable-release-build: build the libreoffice as release
-	# --disable-fetch-external: prevent dowloading during compile phase
-	# --enable-extension-integration: enable any extension integration support
-	# --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
-	# --disable-report-builder: too much java packages pulled in without pkgs
-	# --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
-	local myeconfargs=(
-		--with-system-dicts
-		--with-system-epoxy
-		--with-system-headers
-		--with-system-jars
-		--with-system-libs
-		--enable-build-opensymbol
-		--enable-cairo-canvas
-		--enable-largefile
-		--enable-mergelibs
-		--enable-neon
-		--enable-python=system
-		--enable-randr
-		--enable-release-build
-		--disable-breakpad
-		--disable-bundle-mariadb
-		--disable-ccache
-		--disable-epm
-		--disable-fetch-external
-		--disable-gtk3-kde5
-		--disable-online-update
-		--disable-openssl
-		--disable-pdfium
-		--disable-vlc
-		--with-build-version="${gentoo_buildid}"
-		--enable-extension-integration
-		--with-external-dict-dir="${EPREFIX}/usr/share/myspell"
-		--with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
-		--with-external-thes-dir="${EPREFIX}/usr/share/myspell"
-		--with-external-tar="${DISTDIR}"
-		--with-lang=""
-		--with-parallelism=$(makeopts_jobs)
-		--with-system-ucpp
-		--with-tls=nss
-		--with-vendor="Gentoo Foundation"
-		--with-x
-		--without-fonts
-		--without-myspell-dicts
-		--with-help="html"
-		--without-helppack-integration
-		--with-system-gpgmepp
-		--without-system-jfreereport
-		--without-system_apache_commons
-		--without-system-sane
-		--without-system-qrcodegen
-		$(use_enable base report-builder)
-		$(use_enable bluetooth sdremote-bluetooth)
-		$(use_enable coinmp)
-		$(use_enable cups)
-		$(use_enable dbus)
-		$(use_enable debug)
-		$(use_enable eds evolution2)
-		$(use_enable firebird firebird-sdbc)
-		$(use_enable gstreamer gstreamer-1-0)
-		$(use_enable gtk gtk3)
-		$(use_enable kde kf5)
-		$(use_enable kde qt5)
-		$(use_enable ldap)
-		$(use_enable odk)
-		$(use_enable pdfimport)
-		$(use_enable postgres postgresql-sdbc)
-		$(use_with accessibility lxml)
-		$(use_with coinmp system-coinmp)
-		$(use_with googledrive gdrive-client-id ${google_default_client_id})
-		$(use_with googledrive gdrive-client-secret ${google_default_client_secret})
-		$(use_with java)
-		$(use_with odk doxygen)
-	)
-
-	if use eds || use gtk; then
-		myeconfargs+=( --enable-dconf --enable-gio )
-	else
-		myeconfargs+=( --disable-dconf --disable-gio )
-	fi
-
-	# libreoffice extensions handling
-	for lo_xt in ${LO_EXTS}; do
-		if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
-			myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
-		else
-			myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
-		fi
-	done
-
-	if use java; then
-		# hsqldb: system one is too new
-		myeconfargs+=(
-			--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/"
-		)
-
-		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) )
-	fi
-
-	is-flagq "-flto*" && myeconfargs+=( --enable-lto )
-
-	MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	# more and more LO stuff tries to use OpenGL, including tests during build
-	# bug 501508, bug 540624, bug 545974 and probably more
-	addpredict /dev/dri
-	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
-}
-
-src_test() {
-	make unitcheck || die
-	make slowcheck || die
-}
-
-src_install() {
-	# This is not Makefile so no buildserver
-	emake DESTDIR="${D}" distro-pack-install -o build -o check
-
-	# bug 593514
-	if use gtk; then
-		dosym libreoffice/program/liblibreofficekitgtk.so \
-			/usr/$(get_libdir)/liblibreofficekitgtk.so
-	fi
-
-	# bash completion aliases
-	bashcomp_alias \
-		libreoffice \
-		unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
-
-	if use branding; then
-		insinto /usr/$(get_libdir)/${PN}/program
-		newins "${WORKDIR}/branding-sofficerc" sofficerc
-		dodir /etc/env.d
-		echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
-	fi
-
-	# bug 703474
-	insinto /usr/include
-	doins -r include/LibreOfficeKit
-
-	local lodir=/usr/$(get_libdir)/libreoffice
-	# patching this would break tests
-	cat <<-EOF > "${T}"/uno.py
-import sys, os
-sys.path.append('${EPREFIX}${lodir}/program')
-os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:${EPREFIX}${lodir}/program/fundamentalrc')
-EOF
-	sed -e "/^import sys/d" -e "/^import os/d" \
-		-i "${D}"${lodir}/program/uno.py || die "cleanup dupl imports failed"
-	cat "${D}"${lodir}/program/uno.py >> "${T}"/uno.py || die
-	cp "${T}"/uno.py "${D}"${lodir}/program/uno.py || die
-
-	# more system pyuno mess
-	sed -e "/sOffice = \"\" # lets hope for the best/s:\"\":\"${EPREFIX}${lodir}/program\":" \
-		-i "${D}"${lodir}/program/officehelper.py || die
-
-	python_optimize "${D}"${lodir}/program
-	# link python bridge in site-packages, bug 667802
-	local py pyc loprogdir=$(get_libdir)/libreoffice/program
-	for py in uno.py unohelper.py officehelper.py; do
-		dosym ../../../${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}
-		done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
-	done
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/app-office/libreoffice/libreoffice-7.0.3.1.ebuild b/app-office/libreoffice/libreoffice-7.0.3.1.ebuild
index 753ef4fb54d4..2d3f699e1f94 100644
--- a/app-office/libreoffice/libreoffice-7.0.3.1.ebuild
+++ b/app-office/libreoffice/libreoffice-7.0.3.1.ebuild
@@ -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"
@@ -418,7 +418,6 @@ src_configure() {
 	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!"
-		strip-unsupported-flags
 	else
 		strip-flags
 	fi
@@ -637,12 +636,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
 
diff --git a/app-office/libreoffice/libreoffice-7.0.9999.ebuild b/app-office/libreoffice/libreoffice-7.0.9999.ebuild
index 754be8f900f1..ac7501070b51 100644
--- a/app-office/libreoffice/libreoffice-7.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.0.9999.ebuild
@@ -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"
@@ -102,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 ~amd64-linux"
 
 BDEPEND="
 	dev-util/intltool
@@ -414,7 +414,6 @@ src_configure() {
 	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!"
-		strip-unsupported-flags
 	else
 		strip-flags
 	fi
@@ -633,12 +632,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
 
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 67f8c3b2d866..f1d212b63e48 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -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"
@@ -102,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 ~amd64-linux"
 
 BDEPEND="
 	dev-util/intltool
@@ -414,7 +414,6 @@ src_configure() {
 	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!"
-		strip-unsupported-flags
 	else
 		strip-flags
 	fi
@@ -633,12 +632,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