gentoo resync : 25.08.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-08-25 10:45:55 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-08-25 10:45:55 +0100
commit: 3cf7c3ef441822c889356fd1812ebf2944a59851 (patch)
tree: c513fe68548b40365c1c2ebfe35c58ad431cdd77 /app-office
parent: 05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff)
71 files changed, 1874 insertions, 2364 deletions
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 87049a96b760..f8e2e06d6acb 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest
index 965413ebc0fa..b27d2d002d68 100644
--- a/app-office/calligra/Manifest
+++ b/app-office/calligra/Manifest
@@ -1,18 +1,4 @@
-AUX calligra-3.1.0-doc.patch 323 BLAKE2B 56a886a5b4a4f371eebe3c4f72d5a4817b2fa19af29e55ee0af1f84751a84ec28df8794b8cb7ceb026c701843356ef83d0310dfc2454815d09c95edbb93a0c08 SHA512 6254828157896b44ba77ae36f99876a2806dd917e65a36fdf25ee75e1a6683678ef1dd4275d6712d4f25f808d53dcb20bc3787bb4217e77054e9797bf0ccef72
-AUX calligra-3.1.0-missing-header.patch 663 BLAKE2B 5c1a224f26ef3aaade9e00f30fd59d79fc45def89f3bc14a21e8c315415f05dd327184756bdc99c89bbcfdacdb0eb6276e782efb1add7d956c91d0cb05100b87 SHA512 bc2a196e75b943df71e3e0eeeebea964d3738380b629b37fba116be70435116193717f1a313c411ae520c29fdf8ae58a08d57a5960a3ec3e867455aad48f067e
-AUX calligra-3.1.0-no-arch-detection.patch 436 BLAKE2B 117544b6089912f34b3c4cb3ee7837fb4f4377cdc0edc8a6de91156fb99ce010bc857752cf683f7f57ca604dd6393b36eeb807a6007e59bf589e404d02d0cef1 SHA512 f8f747279eabb165da68fe83300223a2bd49a530116c04c9a31de2a32f9f2b3eb46f7866ce194c91d9fcb0ab77fde628574dc9a55e6a08c327e2716849a0da8d
-AUX calligra-3.1.0-no-webkit.patch 2587 BLAKE2B 9c5de12f3fe100060ec89eec8190ac2d5e97cc0e3f6e97e8b5e6f9c6c46f80e49b1e85e052dc16831aaf0a2b70abd9ecb4fa787bcefdeb2685c72dc59f2ea0ef SHA512 582d5e532ab237ee3f4bb87b12e47272d27f8c57448056a8900df7a76b38e8831dd2d352e0d4a3eb6bd1d651c5a34a7714a307c32ed218ce225ac17723615479
-AUX calligra-3.1.0-poppler-0.69.patch 2963 BLAKE2B 8fac1f298d414ac52073dfdb645d00eab1f2c71f876eea08feb8d9057f33b3ff5dbf69abe10984aa15717ef505522b07153341e846ace24a5f80f175dfed4600 SHA512 b408f1333af40c7270a2f14fa5f9069ec16baeceac7e2b91be2e9759d095d6df92a16b33e0b7c6897dbb15f01ae789436f8864cd1dd38ff009c1a77501e32083
-AUX calligra-3.1.0-poppler-0.71.patch 6868 BLAKE2B 3787bcc3564598450ec14b9bd4e63559af6ebd3a92f9c80560812f7b9a8f94681987ca6dfa49faee7ed3985d09a7f49d2a2499f9c6acfb5a96a0f8c86d7b8484 SHA512 1376ac7940e6ca0e9615445dc9c16f5ff75db547944dc8a5006520ff30b9d34eced1e5fa679a82535ceb581ae96352d1b6c039b54038290973f456de4d792917
-AUX calligra-3.1.0-poppler-0.72.patch 1777 BLAKE2B 28db9f2f6a69c4460fe5be2907f3ff38b7e1b1ff8e6b5480c1ac532f7884706f47da45709f0791a43146dc58e99e3a789700ac53afba9e99a28e8c0c96913a46 SHA512 4e50c321875a0a685d5401c0b8f8f85a76f873cbc0cd6faeb6798d5a3119e4a8123742d58348752ec7d87c1a3055161aaabbda15759cf8e22f2752ef25375376
-AUX calligra-3.1.0-poppler-0.73.patch 1342 BLAKE2B e36495c1f1f6c546666f30473fea46dfbdf47906ee61c2fed325a27117c14d3899703c6ca4667b3185ab9cacf3a5aa79a0c829777100d3088711f8fa359f5752 SHA512 ef5710d4f7fcc8015ce725b6f2f26ae1a8cd9bfe2e857633662696453104661f154309f0d0cc5e30b15b868bb43549d5ab8f81ee4cde31f0465cf795d453d233
-AUX calligra-3.1.0-poppler-0.82.patch 1601 BLAKE2B abfa73ee6c675f644ac62f6601fa1d5991259197902d0e8c88ce5a69ffc3862277c1ee7f528d7bed3167c5e11e369c8c691d556c18e7d2bfd704c04f34d8644f SHA512 7525d2df828f0853bd731357381e691dc04c3b4697b16e84128cd4206281c3ae74bc95227c39b15e899b0c6e5401fcea66e2dae3440a7230d47a65ea93c2d72e
-AUX calligra-3.1.0-poppler-0.83.patch 2617 BLAKE2B 52c493fcaf6e01ad7095a2625def03392699c3d1183aab16bdd2a54ba419237948026ae6a9a1b2ef004d826442b051552e59c4700f8fe32b48d5bf68078d9fd4 SHA512 3683ce8c657ff63a89a2a083c70bcbd8c46583a2c7f9797ca81bdd4bdb0d93866cf4b6eb43fd88358c2a033e93f78bf2257d34eff7b8661dc01a2034bd665116
-AUX calligra-3.1.0-qt-5.11.patch 3537 BLAKE2B 25aa9f832eb49876e0ee28d3af945658f9e93610fa894cb73dc274083febf5d62c97de427c10277f07aa7ef8054f4e0c811c70d4b0c4068cd018a3475c9a7e80 SHA512 f895ee2b9999ab4ff6dae523e4f4ea6f72bd05a8f8163a33f05401b63c08cc3c987a1207d1008ae808db0564c0036194e3d6ab5806c681b793c5191f9e585a7e
-AUX calligra-3.1.0-stage-qt-5.11.patch 656 BLAKE2B 1a4d8f005fd03395617ba0b225302e40b4aaf75c2a838a3009a3b3b6df7e75afdc798f27f08e76b7ad0ea60766612912d06eebe87c209ad9cab45db4bb3ccf54 SHA512 685bfca658404dc9920c805b97832b0a481a0ec0614bf142978c4ae03329e5e93b28d5af09d021b53c6d7a1316404f87612ab316f6a47c3f174572b50c65989b
 AUX calligra-3.1.89-no-arch-detection.patch 404 BLAKE2B ef2ea38d3fdabedd98eafd4b9526a3dd5a7c02f4af8109301f3535969475034795483cfb0fa1f1ddad9fa41ef81409d39bf3a06fb781016217355be646d1affd SHA512 d97d2a26622f43987446ac87b14952b9e46f3b919c84c6ada4b18ebde5aa94e6f69b931ec5d61ab391f9a4811e81eb11f2136f0a3384f644679c0db87943102a
-DIST calligra-3.1.0.tar.xz 58037392 BLAKE2B b933012fe0031f4d6eac626054e7fb248f85635e5873224328d30f9aed31dce0a0a49f99cf6eea9c232477400af1d16ffc4dae483cdfd5081720434e95684e50 SHA512 ad1b689a5b36deafcf6985d4a0a1e8148d10e19fb4a0be8343c6e1d24146b9a8ffa0890ab5bbb21816b3134d21150b57f6159db1a30cc54c0fde5bf7bdf4537b
 DIST calligra-3.2.1.tar.xz 55207684 BLAKE2B 332629f18adbee649e8d25a1eedf4ee48af7d8cbb79382c70678bacfa89d9a10797eb0ff42cb5aad51ef2c28aa7071e687bd34053cadcc40ac1936bb9a40dc20 SHA512 e53a939aa1b277c2291cfd626868c77085fc9cc7774df160b5b1afceb33314b4381fa8ffe03636cbde6e35cc2abd170a51e7f9c1a99191339313b9c9c3b1526f
-EBUILD calligra-3.1.0-r4.ebuild 6221 BLAKE2B 8630aeac685fb914e46be46f4dfa33c92881af8ebed52aa838b3611532efacac93e2a0d0f5d78b142bfce08c368f03408935c2ca0900328b2d52b45237decf61 SHA512 a4785918d0f7e6c08e3524f2b8373ebf477dc0845d3c96d4749af53282ab343e19b25207340efe9d2c5d510af8ae09744047f97645affda26e01d2ef4dc12f89
-EBUILD calligra-3.2.1.ebuild 5300 BLAKE2B 0d171d8f3fbe3f520b2fbdb84d05e74b03de6d89bd43716b248d528cf724be6cb220edf0e3b1c398bba8cbb95dcf9b75f29996bc6f673b6ad9cc4b530ebe7e7e SHA512 3e863f34dd8d9d7b205ae9f32419b2c7f38ca639a8572369911b2840a25e6459fe207c20955aae43c25c68c53dc42676651bf0f8697dbe9390834d0ab25f2e2b
+EBUILD calligra-3.2.1.ebuild 5298 BLAKE2B cfcd589ff42cabd21a8f475d08fb3bf9d8bd7626998da55493b01992c3c5621864c1ddb910dc73f8f43bd4fcc7afaf4a6daca8c82bffac730864d86ea83e25fd SHA512 28eb4aa8ffdee09267802cea1911284b50a94c638f6d437825068fce8d228a07f634f71f86360826980a99a2e1bd4eb8963ae62d44406c80d5ccf45e464d62e7
 MISC metadata.xml 1149 BLAKE2B e5461ec7fe1747ce0f4f1b68e3573bcad14183e9a6522f4e2a47fc14cb2a2c968f1bee6d6bf91304d23b981df8c2bdf086222f823ccc6abbe44ff3fcd630ceb0 SHA512 2c6b8ac3f48fa278faf079cfc42b6bdc8ecba994222adfe735489088e1fbb26c60f5f6ef4ff773a64e9a6e5026ef4dff368ec3c2c3c96cd6b0a38b6711b2d7a9
diff --git a/app-office/calligra/calligra-3.1.0-r4.ebuild b/app-office/calligra/calligra-3.1.0-r4.ebuild
deleted file mode 100644
index 9e095aa47228..000000000000
--- a/app-office/calligra/calligra-3.1.0-r4.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CHECKREQS_DISK_BUILD="4G"
-ECM_HANDBOOK_DIR="xxx" # contains no language subdirs
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit check-reqs ecm
-
-DESCRIPTION="KDE Office Suite"
-HOMEPAGE="https://www.calligra.org/"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="5"
-KEYWORDS="amd64 x86"
-
-CAL_FTS=( karbon sheets stage words )
-
-IUSE="activities +charts +crypt +fontconfig gemini gsl import-filter +lcms okular openexr
-	+pdf phonon spacenav +truetype X $(printf 'calligra_features_%s ' ${CAL_FTS[@]})"
-
-# TODO: Not packaged: Cauchy (https://bitbucket.org/cyrille/cauchy)
-# Required for the matlab/octave formula tool
-BDEPEND="
-	sys-devel/gettext
-"
-COMMON_DEPEND="
-	dev-lang/perl
-	>=dev-qt/designer-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtscript-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdelibs4support-${KFMIN}:5
-	>=kde-frameworks/kemoticons-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kross-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/sonnet-${KFMIN}:5
-	sys-libs/zlib
-	virtual/libiconv
-	activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
-	charts? ( dev-libs/kdiagram:5 )
-	crypt? ( app-crypt/qca:2[qt5(+)] )
-	fontconfig? ( media-libs/fontconfig )
-	gemini? ( >=dev-qt/qtdeclarative-${QTMIN}:5[widgets] )
-	gsl? ( sci-libs/gsl )
-	import-filter? (
-		app-text/libetonyek
-		app-text/libodfgen
-		app-text/libwpd:*
-		app-text/libwpg:*
-		>=app-text/libwps-0.4
-		dev-libs/librevenge
-		>=kde-frameworks/khtml-${KFMIN}:5
-		media-libs/libvisio
-	)
-	lcms? (
-		media-libs/ilmbase:=
-		media-libs/lcms:2
-	)
-	openexr? ( media-libs/openexr )
-	pdf? ( >=app-text/poppler-0.73:=[qt5] )
-	phonon? ( media-libs/phonon[qt5(+)] )
-	spacenav? ( dev-libs/libspnav )
-	truetype? ( media-libs/freetype:2 )
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libX11
-	)
-	calligra_features_sheets? ( dev-cpp/eigen:3 )
-	calligra_features_stage? ( okular? ( >=kde-apps/okular-19.04.3:5 ) )
-	calligra_features_words? (
-		dev-libs/libxslt
-		okular? ( >=kde-apps/okular-19.04.3:5 )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	test? ( >=kde-frameworks/threadweaver-${KFMIN}:5 )
-"
-RDEPEND="${COMMON_DEPEND}
-	calligra_features_karbon? ( media-gfx/pstoedit[plotutils] )
-	!app-office/calligra:4
-	!app-office/calligra-l10n:4
-"
-RESTRICT+=" test"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-no-arch-detection.patch
-	"${FILESDIR}"/${P}-doc.patch
-	"${FILESDIR}"/${P}-{,stage-}qt-5.11.patch
-	"${FILESDIR}"/${P}-poppler-0.{69,71,72,73}.patch
-	"${FILESDIR}"/${P}-no-webkit.patch
-	"${FILESDIR}"/${P}-missing-header.patch
-)
-
-pkg_pretend() {
-	check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	ecm_pkg_setup
-	check-reqs_pkg_setup
-}
-
-src_prepare() {
-	ecm_src_prepare
-
-	if has_version ">=app-text/poppler-0.82"; then
-		eapply "${FILESDIR}/${P}-poppler-0.82.patch" # TODO: make upstreamable patch
-	fi
-
-	if has_version ">=app-text/poppler-0.83"; then
-		eapply "${FILESDIR}/${P}-poppler-0.83.patch" # TODO: make upstreamable patch
-	fi
-
-	if ! use test; then
-		sed -e "/add_subdirectory( *benchmarks *)/s/^/#DONT/" \
-			-i libs/pigment/CMakeLists.txt || die
-	fi
-
-	# Unconditionally disable deprecated deps (required by QtQuick1)
-	ecm_punt_bogus_dep Qt5 Declarative
-	ecm_punt_bogus_dep Qt5 OpenGL
-
-	# Hack around the excessive use of CMake macros
-	if use okular && ! use calligra_features_words; then
-		sed -i -e "/add_subdirectory( *okularodtgenerator *)/ s/^/#DONT/" \
-			extras/CMakeLists.txt || die "Failed to disable OKULAR_GENERATOR_ODT"
-	fi
-
-	if use okular && ! use calligra_features_stage; then
-		sed -i -e "/add_subdirectory( *okularodpgenerator *)/ s/^/#DONT/" \
-			extras/CMakeLists.txt || die "Failed to disable OKULAR_GENERATOR_ODP"
-	fi
-}
-
-src_configure() {
-	local cal_ft myproducts
-
-	# applications
-	for cal_ft in ${CAL_FTS[@]}; do
-		use calligra_features_${cal_ft} && myproducts+=( "${cal_ft^^}" )
-	done
-
-	use lcms && myproducts+=( PLUGIN_COLORENGINES )
-	use spacenav && myproducts+=( PLUGIN_SPACENAVIGATOR )
-
-	local mycmakeargs=(
-		-DPACKAGERS_BUILD=OFF
-		-DRELEASE_BUILD=ON
-		-DWITH_Iconv=ON
-		-DPRODUCTSET="${myproducts[*]}"
-		$(cmake_use_find_package activities KF5Activities)
-		$(cmake_use_find_package charts KChart)
-		-DWITH_Qca-qt5=$(usex crypt)
-		-DWITH_Fontconfig=$(usex fontconfig)
-		$(cmake_use_find_package gemini Libgit2)
-		$(cmake_use_find_package gemini Qt5QuickWidgets)
-		-DWITH_GSL=$(usex gsl)
-		-DWITH_LibEtonyek=$(usex import-filter)
-		-DWITH_LibOdfGen=$(usex import-filter)
-		-DWITH_LibRevenge=$(usex import-filter)
-		-DWITH_LibVisio=$(usex import-filter)
-		-DWITH_LibWpd=$(usex import-filter)
-		-DWITH_LibWpg=$(usex import-filter)
-		-DWITH_LibWps=$(usex import-filter)
-		$(cmake_use_find_package phonon Phonon4Qt5)
-		-DCMAKE_DISABLE_FIND_PACKAGE_KF5CalendarCore=ON
-		-DWITH_LCMS2=$(usex lcms)
-		-DWITH_Okular5=$(usex okular)
-		-DWITH_OpenEXR=$(usex openexr)
-		-DWITH_Poppler=$(usex pdf)
-		-DWITH_Eigen3=$(usex calligra_features_sheets)
-		-DBUILD_UNMAINTAINED=$(usex calligra_features_stage)
-		-ENABLE_CSTESTER_TESTING=$(usex test)
-		-DWITH_Freetype=$(usex truetype)
-	)
-
-	ecm_src_configure
-}
diff --git a/app-office/calligra/calligra-3.2.1.ebuild b/app-office/calligra/calligra-3.2.1.ebuild
index 240ca9b02ecf..df46c7181c60 100644
--- a/app-office/calligra/calligra-3.2.1.ebuild
+++ b/app-office/calligra/calligra-3.2.1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://calligra.org/"
 
 if [[ ${KDE_BUILD_TYPE} == release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 CAL_FTS=( karbon sheets stage words )
diff --git a/app-office/calligra/files/calligra-3.1.0-doc.patch b/app-office/calligra/files/calligra-3.1.0-doc.patch
deleted file mode 100644
index ad150edbf8a4..000000000000
--- a/app-office/calligra/files/calligra-3.1.0-doc.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/CMakeLists.txt	2018-03-15 16:59:36.624682111 +0100
-+++ b/CMakeLists.txt	2018-03-15 17:07:02.306267220 +0100
-@@ -1160,9 +1160,7 @@
-   add_subdirectory(braindump)
- endif()
- 
--if(SHOULD_BUILD_DOC)
--    add_subdirectory(doc)
--endif()
-+add_subdirectory(doc)
- 
- if(SHOULD_BUILD_PART_QTQUICK)
-     add_subdirectory(qtquick)
diff --git a/app-office/calligra/files/calligra-3.1.0-missing-header.patch b/app-office/calligra/files/calligra-3.1.0-missing-header.patch
deleted file mode 100644
index f15c3787172d..000000000000
--- a/app-office/calligra/files/calligra-3.1.0-missing-header.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 0c5430697bdcf41a45046107b28014e40c49a11a Mon Sep 17 00:00:00 2001
-From: David Faure <faure@kde.org>
-Date: Tue, 23 Jul 2019 13:02:34 +0200
-Subject: Fix compilation with Qt 5.13 (missing include)
-
----
- sheets/plugins/calendar/CalendarToolWidget.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/sheets/plugins/calendar/CalendarToolWidget.cpp b/sheets/plugins/calendar/CalendarToolWidget.cpp
-index b10b230..0c5eeb6 100644
---- a/sheets/plugins/calendar/CalendarToolWidget.cpp
-+++ b/sheets/plugins/calendar/CalendarToolWidget.cpp
-@@ -30,6 +30,7 @@
- #include <kdatepicker.h>
- 
- #include <QPushButton>
-+#include <QDate>
- 
- namespace Calligra
- {
--- 
-cgit v1.1
diff --git a/app-office/calligra/files/calligra-3.1.0-no-arch-detection.patch b/app-office/calligra/files/calligra-3.1.0-no-arch-detection.patch
deleted file mode 100644
index aa83ba1a3010..000000000000
--- a/app-office/calligra/files/calligra-3.1.0-no-arch-detection.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Avoid automagic CXXFLAG detection courtesy of dev-libs/vc.
-
-Gentoo-bug: 584118
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -617,10 +617,6 @@
-         endif()
-         endmacro()
- 
--        if (NOT PACKAGERS_BUILD)
--        # Optimize the whole Calligra for current architecture
--        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Vc_DEFINITIONS}")
--        endif ()
-     endif()
-     set(CMAKE_MODULE_PATH ${OLD_CMAKE_MODULE_PATH} )
- 
diff --git a/app-office/calligra/files/calligra-3.1.0-no-webkit.patch b/app-office/calligra/files/calligra-3.1.0-no-webkit.patch
deleted file mode 100644
index f126e2e51386..000000000000
--- a/app-office/calligra/files/calligra-3.1.0-no-webkit.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 9817c4c2ee1e11ae1d2eacb31b8a2a65d6ea6e8d Mon Sep 17 00:00:00 2001
-From: Dag Andersen <danders@get2net.dk>
-Date: Mon, 22 Oct 2018 09:41:53 +0200
-Subject: Stage does not use WebKit, so remove
-
----
- CMakeLists.txt            | 21 +--------------------
- stage/part/CMakeLists.txt |  1 -
- 2 files changed, 1 insertion(+), 21 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8b148c0..1e29140 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -272,14 +272,7 @@ find_package(Qt5 ${REQUIRED_QT_VERSION} QUIET
-         Quick
-         QuickWidgets
-         Sql
--        WebKit
--#         WebKitWidgets
--)
--message("**********************************************************************************************************************")
--message("**********************************************************************************************************************")
--message("Qt WebKitWidgets is required for Stage's html export preview. This will need porting, as that module no longer exists.")
--message("**********************************************************************************************************************")
--message("**********************************************************************************************************************")
-+)
- 
- # Qt5Declarative was removed in Qt 5.6.0 so search for it in a separate call
- # Including it in a collected find_package(Qt5 ...) call can lead to a fatal not-found error:
-@@ -313,14 +306,6 @@ set_package_properties(Qt5WebKit PROPERTIES
-     PURPOSE "Required for Braindump's Web shape"
-     TYPE OPTIONAL
- )
--set_package_properties(Qt5WebKitWidget PROPERTIES
--    PURPOSE "Required for Stage"
--    TYPE RECOMMENDED
--)
--
--if(Qt5WebKit_FOUND)
--    add_definitions( -DCAN_USE_QTWEBKIT )
--endif()
- 
- set(HAVE_OPENGL ${Qt5OpenGL_FOUND})
- 
-@@ -983,10 +968,6 @@ calligra_drop_product_on_bad_condition( FEATURE_RDF
-     Soprano_FOUND "Soprano not found"
-     )
- 
--# calligra_drop_product_on_bad_condition( PART_STAGE
--#     Qt5WebKitWidgets_FOUND "Qt5WebKitWidgets devel not found"
--# )
--
- calligra_drop_product_on_bad_condition( PART_SHEETS
-     EIGEN3_FOUND "Eigen devel not found"
-     )
-diff --git a/stage/part/CMakeLists.txt b/stage/part/CMakeLists.txt
-index d6000a1..9bdc840 100644
---- a/stage/part/CMakeLists.txt
-+++ b/stage/part/CMakeLists.txt
-@@ -165,7 +165,6 @@ target_link_libraries(calligrastageprivate
-         KF5::IconThemes
-         KF5::Completion
-         Qt5::Svg
--#         Qt5::WebKitWidgets
- )
- if(HAVE_OPENGL)
-     target_link_libraries(calligrastageprivate PRIVATE Qt5::OpenGL)
--- 
-cgit v1.1
diff --git a/app-office/calligra/files/calligra-3.1.0-poppler-0.69.patch b/app-office/calligra/files/calligra-3.1.0-poppler-0.69.patch
deleted file mode 100644
index c82fbd242b8a..000000000000
--- a/app-office/calligra/files/calligra-3.1.0-poppler-0.69.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From 56bd4bab320b0c0a893751caee9a15a2241e3ef8 Mon Sep 17 00:00:00 2001
-From: Antonio Rojas <arojas@archlinux.org>
-Date: Wed, 24 Oct 2018 08:28:00 +0200
-Subject: Fix build with poppler>=0.69
-
-Remove no longer available Object::memCheck usage (which didn't do anything anyway since DEBUG_MEM was not set); add some const's
-
-Differential Revision: https://phabricator.kde.org/D16388
----
- filters/karbon/pdf/PdfImport.cpp    | 3 ---
- filters/karbon/pdf/SvgOutputDev.cpp | 8 ++++----
- filters/karbon/pdf/SvgOutputDev.h   | 2 +-
- 3 files changed, 5 insertions(+), 8 deletions(-)
-
-diff --git a/filters/karbon/pdf/PdfImport.cpp b/filters/karbon/pdf/PdfImport.cpp
-index c3e96b0..48b08df 100644
---- a/filters/karbon/pdf/PdfImport.cpp
-+++ b/filters/karbon/pdf/PdfImport.cpp
-@@ -102,9 +102,6 @@ KoFilter::ConversionStatus PdfImport::convert(const QByteArray& from, const QByt
-     delete globalParams;
-     globalParams = 0;
- 
--    // check for memory leaks
--    Object::memCheck(stderr);
--
-     return KoFilter::OK;
- }
- 
-diff --git a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp
-index 931917a..7901317 100644
---- a/filters/karbon/pdf/SvgOutputDev.cpp
-+++ b/filters/karbon/pdf/SvgOutputDev.cpp
-@@ -212,7 +212,7 @@ QString SvgOutputDev::convertMatrix(const QMatrix &matrix)
-            .arg(matrix.dx()) .arg(matrix.dy());
- }
- 
--QString SvgOutputDev::convertMatrix(double * matrix)
-+QString SvgOutputDev::convertMatrix(const double * matrix)
- {
-     return QString("matrix(%1 %2 %3 %4 %5 %6)")
-            .arg(matrix[0]).arg(matrix[1])
-@@ -402,7 +402,7 @@ void SvgOutputDev::drawString(GfxState * state, GooString * s)
- 
-     QString str;
- 
--    char * p = s->getCString();
-+    const char * p = s->getCString();
-     int len = s->getLength();
-     CharCode code;
-     Unicode *u = nullptr;
-@@ -429,7 +429,7 @@ void SvgOutputDev::drawString(GfxState * state, GooString * s)
-     double x = state->getCurX();
-     double y = state->getCurY();
- 
--    double * ctm = state->getCTM();
-+    const double * ctm = state->getCTM();
-     QMatrix transform(ctm[0], ctm[1], ctm[2], ctm[3], ctm[4], ctm[5]);
- 
-     QMatrix mirror;
-@@ -522,7 +522,7 @@ void SvgOutputDev::drawImage(GfxState *state, Object */*ref*/, Stream *str,
-         return;
-     }
- 
--    double * ctm = state->getCTM();
-+    const double * ctm = state->getCTM();
-     QMatrix m;
-     m.setMatrix(ctm[0] / width, ctm[1] / width, -ctm[2] / height, -ctm[3] / height, ctm[2] + ctm[4], ctm[3] + ctm[5]);
- 
-diff --git a/filters/karbon/pdf/SvgOutputDev.h b/filters/karbon/pdf/SvgOutputDev.h
-index 85fe55d..2a44908 100644
---- a/filters/karbon/pdf/SvgOutputDev.h
-+++ b/filters/karbon/pdf/SvgOutputDev.h
-@@ -84,7 +84,7 @@ public:
- private:
-     QString convertPath(GfxPath *path);
-     QString convertMatrix(const QMatrix &matrix);
--    QString convertMatrix(double * matrix);
-+    QString convertMatrix(const double * matrix);
-     QString printFill();
-     QString printStroke();
- 
--- 
-cgit v1.1
diff --git a/app-office/calligra/files/calligra-3.1.0-poppler-0.71.patch b/app-office/calligra/files/calligra-3.1.0-poppler-0.71.patch
deleted file mode 100644
index 6b50e3a42ed0..000000000000
--- a/app-office/calligra/files/calligra-3.1.0-poppler-0.71.patch
+++ /dev/null
@@ -1,202 +0,0 @@
-From fa4c2961b8280456d4c1484565b973d312e0bd1c Mon Sep 17 00:00:00 2001
-From: Albert Astals Cid <aacid@kde.org>
-Date: Thu, 25 Oct 2018 23:04:39 +0200
-Subject: Mark the functions as override
-
-So when poppler API breaks (as it often does) it stops compiling and
-someone has to fix it
-
-From 82d68cebf870ac97fd27b626a08c3fb4dd94ea3e Mon Sep 17 00:00:00 2001
-From: Albert Astals Cid <aacid@kde.org>
-Date: Thu, 25 Oct 2018 23:06:34 +0200
-Subject: GBool -> bool
-
-It was just a typedef in poppler and it'll die in next versions
-
-From f099b8e143bbeb1de3c7e89f4764006c3de61ae4 Mon Sep 17 00:00:00 2001
-From: Antonio Rojas <arojas@archlinux.org>
-Date: Fri, 2 Nov 2018 21:23:13 +0100
-Subject: Fix build with poppler 0.71
-
-Port away from removed API
-
-diff -u a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp
---- a/filters/karbon/pdf/SvgOutputDev.cpp
-+++ b/filters/karbon/pdf/SvgOutputDev.cpp
-@@ -39,7 +39,7 @@
- {
- public:
-     Private(const QString &fname)
--            : svgFile(fname), defs(0), body(0), state(gTrue)
-+            : svgFile(fname), defs(0), body(0), state(true)
-             , brush(Qt::SolidPattern) {}
- 
-     ~Private() {
-@@ -52,7 +52,7 @@
-     QString defsData;
-     QTextStream * defs;
-     QTextStream * body;
--    GBool state;
-+    bool state;
-     QSizeF pageSize;
-     QPen pen;
-     QBrush brush;
-@@ -62,7 +62,7 @@
-         : d(new Private(fileName))
- {
-     if (! d->svgFile.open(QIODevice::WriteOnly)) {
--        d->state = gFalse;
-+        d->state = false;
-         return;
-     }
- 
-@@ -75,24 +75,24 @@
-     delete d;
- }
- 
--GBool SvgOutputDev::isOk()
-+bool SvgOutputDev::isOk()
- {
-     return d->state;
- }
- 
--GBool SvgOutputDev::upsideDown()
-+bool SvgOutputDev::upsideDown()
- {
--    return gTrue;
-+    return true;
- }
- 
--GBool SvgOutputDev::useDrawChar()
-+bool SvgOutputDev::useDrawChar()
- {
--    return gFalse;
-+    return false;
- }
- 
--GBool SvgOutputDev::interpretType3Chars()
-+bool SvgOutputDev::interpretType3Chars()
- {
--    return gFalse;
-+    return false;
- }
- 
- void SvgOutputDev::startPage(int pageNum, GfxState *state, XRef */*xref*/)
-@@ -387,7 +387,7 @@
-     return stroke;
- }
- 
--void SvgOutputDev::drawString(GfxState * state, GooString * s)
-+void SvgOutputDev::drawString(GfxState * state, const GooString * s)
- {
-     int render = state->getRender();
-     // check for invisible text -- this is used by Acrobat Capture
-@@ -476,7 +476,7 @@ void SvgOutputDev::drawString(GfxState * state, const GooString * s)
- 
- void SvgOutputDev::drawImage(GfxState *state, Object *ref, Stream *str,
-                              int width, int height, GfxImageColorMap *colorMap,
--                             int *maskColors, GBool /*inlineImg*/)
-+                             bool /*interpolate*/, int *maskColors, bool inlineImg)
- {
-     ImageStream * imgStr = new ImageStream(str, width, colorMap->getNumPixelComps(), colorMap->getBits());
-     imgStr->reset();
-@@ -550,7 +549,0 @@
--void SvgOutputDev::drawImage(GfxState *state, Object *ref, Stream *str,
--                             int width, int height, GfxImageColorMap *colorMap,
--                             GBool /*interpolate*/, int *maskColors, GBool inlineImg)
--{
--    drawImage(state, ref, str, width, height, colorMap, maskColors, inlineImg);
--}
--
-
---- a/filters/karbon/pdf/SvgOutputDev.h
-+++ b/filters/karbon/pdf/SvgOutputDev.h
-@@ -20,11 +20,6 @@
- #ifndef SVGOUTPUTDEV_H
- #define SVGOUTPUTDEV_H
- 
--// Don't show this warning: it's an issue in poppler
--#ifdef __GNUC__
--#pragma GCC diagnostic ignored "-Wunused-parameter"
--#endif
--
- #include <poppler/Object.h>
- #include <poppler/OutputDev.h>
- 
-@@ -44,40 +44,37 @@
-     explicit SvgOutputDev(const QString &fileName);
-     virtual ~SvgOutputDev();
- 
--    GBool isOk();
-+    bool isOk();
- 
--    virtual GBool upsideDown();
--    virtual GBool useDrawChar();
--    virtual GBool interpretType3Chars();
--    virtual void startPage(int pageNum, GfxState *state, XRef *xref);
--    virtual void endPage();
-+    bool upsideDown() override;
-+    bool useDrawChar() override;
-+    bool interpretType3Chars() override;
-+    void startPage(int pageNum, GfxState *state, XRef *xref) override;
-+    void endPage() override;
- 
-     // path painting
--    virtual void stroke(GfxState * state);
--    virtual void fill(GfxState * state);
--    virtual void eoFill(GfxState *state);
-+    void stroke(GfxState * state) override;
-+    void fill(GfxState * state) override;
-+    void eoFill(GfxState *state) override;
- 
-     // text
--    virtual void drawString(GfxState * state, GooString * s);
-+    void drawString(GfxState * state, const GooString * s) override;
- 
-     // images
--    virtual void drawImage(GfxState *state, Object *ref, Stream *str,
-+    void drawImage(GfxState *state, Object *ref, Stream *str,
-                            int width, int height, GfxImageColorMap *colorMap,
--                           int *maskColors, GBool inlineImg);
--    virtual void drawImage(GfxState *state, Object *ref, Stream *str,
--                           int width, int height, GfxImageColorMap *colorMap,
--                           GBool interpolate, int *maskColors, GBool inlineImg);
-+                           bool interpolate, int *maskColors, bool inlineImg) override;
- 
-     // styles
--    virtual void updateAll(GfxState *state);
--    virtual void updateFillColor(GfxState *state);
--    virtual void updateStrokeColor(GfxState *state);
--    virtual void updateFillOpacity(GfxState *state);
--    virtual void updateStrokeOpacity(GfxState *state);
--    virtual void updateLineJoin(GfxState *state);
--    virtual void updateLineCap(GfxState *state);
--    virtual void updateMiterLimit(GfxState *state);
--    virtual void updateLineWidth(GfxState *state);
-+    void updateAll(GfxState *state) override;
-+    void updateFillColor(GfxState *state) override;
-+    void updateStrokeColor(GfxState *state) override;
-+    void updateFillOpacity(GfxState *state) override;
-+    void updateStrokeOpacity(GfxState *state) override;
-+    void updateLineJoin(GfxState *state) override;
-+    void updateLineCap(GfxState *state) override;
-+    void updateMiterLimit(GfxState *state) override;
-+    void updateLineWidth(GfxState *state) override;
- 
-     /// Dumps content to svg file
-     void dumpContent();
---- a/filters/karbon/pdf/PdfImport.cpp
-+++ b/filters/karbon/pdf/PdfImport.cpp
-@@ -88,9 +88,9 @@ KoFilter::ConversionStatus PdfImport::convert(const QByteArray& from, const QByt
-     SvgOutputDev * dev = new SvgOutputDev(m_chain->outputFile());
-     if (dev->isOk()) {
-         int rotate = 0;
--        GBool useMediaBox = gTrue;
--        GBool crop = gFalse;
--        GBool printing = gFalse;
-+        bool useMediaBox = true;
-+        bool crop = false;
-+        bool printing = false;
-         pdfDoc->displayPages(dev, firstPage, lastPage, hDPI, vDPI, rotate, useMediaBox, crop, printing);
-         dev->dumpContent();
-     }
diff --git a/app-office/calligra/files/calligra-3.1.0-poppler-0.72.patch b/app-office/calligra/files/calligra-3.1.0-poppler-0.72.patch
deleted file mode 100644
index 817a8ddcd679..000000000000
--- a/app-office/calligra/files/calligra-3.1.0-poppler-0.72.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 3784fdf0259a14f1f7b20c156dcfe42b45d76896 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Thu, 24 Jan 2019 23:55:02 +0100
-Subject: [PATCH] Fix build with poppler-0.72
-
-This is a downstream fix without backwards compat, not upstreamable.
----
- filters/karbon/pdf/SvgOutputDev.cpp | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp
-index 391e86cc117..bc72a003efb 100644
---- a/filters/karbon/pdf/SvgOutputDev.cpp
-+++ b/filters/karbon/pdf/SvgOutputDev.cpp
-@@ -402,7 +402,7 @@ void SvgOutputDev::drawString(GfxState * state, const GooString * s)
- 
-     QString str;
- 
--    const char * p = s->getCString();
-+    const char * p = s->c_str();
-     int len = s->getLength();
-     CharCode code;
-     Unicode *u = nullptr;
-@@ -451,10 +451,10 @@ void SvgOutputDev::drawString(GfxState * state, const GooString * s)
-     *d->body << " y=\"" << y << "px\"";
- 
-     if (font && font->getFamily()) {
--        *d->body << " font-family=\"" << QString::fromLatin1(font->getFamily()->getCString()) << "\"";
-+        *d->body << " font-family=\"" << QString::fromLatin1(font->getFamily()->c_str()) << "\"";
-         //debugPdf << "font family:" << QString::fromLatin1( font->getFamily()->getCString() );
-     } else if (font && font->getName()) {
--        *d->body << " font-family=\"" << QString::fromLatin1(font->getName()->getCString()) << "\"";
-+        *d->body << " font-family=\"" << QString::fromLatin1(font->getName()->c_str()) << "\"";
-         //debugPdf << "font name:" << QString::fromLatin1( font->getName()->getCString() );
-     }
-     *d->body << " font-size=\"" << qMax(state->getFontSize(), state->getTransformedFontSize()) << "px\"";
--- 
-2.20.1
-
diff --git a/app-office/calligra/files/calligra-3.1.0-poppler-0.73.patch b/app-office/calligra/files/calligra-3.1.0-poppler-0.73.patch
deleted file mode 100644
index 727f6edf3f12..000000000000
--- a/app-office/calligra/files/calligra-3.1.0-poppler-0.73.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From a1ddd91e6c354e8f0dda40f8a522053c3fa19c39 Mon Sep 17 00:00:00 2001
-From: Albert Astals Cid <aacid@kde.org>
-Date: Tue, 15 Jan 2019 22:24:08 +0100
-Subject: Guchar -> unsigned char
-
-It was just a typdef and it's now gone
----
- filters/karbon/pdf/SvgOutputDev.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp
-index 80f01a5..1a5aa30b 100644
---- a/filters/karbon/pdf/SvgOutputDev.cpp
-+++ b/filters/karbon/pdf/SvgOutputDev.cpp
-@@ -496,7 +496,7 @@ void SvgOutputDev::drawImage(GfxState *state, Object *ref, Stream *str,
-     if (maskColors) {
-         for (int y = 0; y < height; y++) {
-             dest = (unsigned int *)(buffer + y * 4 * width);
--            Guchar * pix = imgStr->getLine();
-+            unsigned char * pix = imgStr->getLine();
-             colorMap->getRGBLine(pix, dest, width);
- 
-             for (int x = 0; x < width; x++) {
-@@ -515,7 +515,7 @@ void SvgOutputDev::drawImage(GfxState *state, Object *ref, Stream *str,
-     } else {
-         for (int y = 0; y < height; y++) {
-             dest = (unsigned int *)(buffer + y * 4 * width);
--            Guchar * pix = imgStr->getLine();
-+            unsigned char * pix = imgStr->getLine();
-             colorMap->getRGBLine(pix, dest, width);
-         }
- 
--- 
-cgit v1.1
-
diff --git a/app-office/calligra/files/calligra-3.1.0-poppler-0.82.patch b/app-office/calligra/files/calligra-3.1.0-poppler-0.82.patch
deleted file mode 100644
index 4cb9d1872ebb..000000000000
--- a/app-office/calligra/files/calligra-3.1.0-poppler-0.82.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Patch stolen from Mageia Cauldron but had to be modified quite a bit.
-
-diff --git a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp
-index ffdbf01..70bc9f8 100644
---- a/filters/karbon/pdf/SvgOutputDev.cpp
-+++ b/filters/karbon/pdf/SvgOutputDev.cpp
-@@ -405,7 +405,7 @@ void SvgOutputDev::drawString(GfxState * state, GooString * s)
-     const char * p = s->c_str();
-     int len = s->getLength();
-     CharCode code;
--    Unicode *u = nullptr;
-+    const Unicode *u = nullptr;
-     int uLen;
-     double dx, dy, originX, originY;
-     while (len > 0) {
-@@ -545,7 +545,7 @@ void SvgOutputDev::drawImage(GfxState *state, Object */*ref*/, Stream *str,
- 
- void SvgOutputDev::drawImage(GfxState *state, Object *ref, Stream *str,
-                              int width, int height, GfxImageColorMap *colorMap,
--                             bool /*interpolate*/, int *maskColors, bool inlineImg)
-+                             bool /*interpolate*/, const int *maskColors, bool inlineImg)
- {
-     drawImage(state, ref, str, width, height, colorMap, maskColors, inlineImg);
- }
---- a/filters/karbon/pdf/SvgOutputDev.h
-+++ b/filters/karbon/pdf/SvgOutputDev.h
-@@ -63,7 +63,7 @@ public:
-     // images
-     void drawImage(GfxState *state, Object *ref, Stream *str,
-                            int width, int height, GfxImageColorMap *colorMap,
--                           bool interpolate, int *maskColors, bool inlineImg) override;
-+                           bool interpolate, const int *maskColors, bool inlineImg) override;
- 
-     // styles
-     virtual void updateAll(GfxState *state);
diff --git a/app-office/calligra/files/calligra-3.1.0-poppler-0.83.patch b/app-office/calligra/files/calligra-3.1.0-poppler-0.83.patch
deleted file mode 100644
index 383131ab3871..000000000000
--- a/app-office/calligra/files/calligra-3.1.0-poppler-0.83.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-Source: Timo Gurr <tgurr@exherbo.org>
-Upstream: Reported, https://bugs.kde.org/show_bug.cgi?id=414795
-Reason: Fix build with poppler 0.83.0
-
-diff -Naur calligra-3.1.0/filters/karbon/pdf/PdfImport.cpp calligra-3.1.0.new/filters/karbon/pdf/PdfImport.cpp
---- calligra-3.1.0/filters/karbon/pdf/PdfImport.cpp	2019-12-04 12:41:13.000000000 +0100
-+++ calligra-3.1.0.new/filters/karbon/pdf/PdfImport.cpp	2019-12-04 12:39:03.000000000 +0100
-@@ -60,19 +60,17 @@
-     }
- 
-     // read config file
--    globalParams = new GlobalParams();
-+    globalParams.reset(new GlobalParams());
-     if (! globalParams)
-         return KoFilter::NotImplemented;
- 
-     GooString * fname = new GooString(QFile::encodeName(m_chain->inputFile()).data());
-     PDFDoc * pdfDoc = new PDFDoc(fname, 0, 0, 0);
-     if (! pdfDoc) {
--        delete globalParams;
-         return KoFilter::StupidError;
-     }
- 
-     if (! pdfDoc->isOk()) {
--        delete globalParams;
-         delete pdfDoc;
-         return KoFilter::StupidError;
-     }
-@@ -99,7 +97,6 @@
- 
-     delete dev;
-     delete pdfDoc;
--    delete globalParams;
-     globalParams = 0;
- 
-     return KoFilter::OK;
-diff -Naur calligra-3.1.0/filters/karbon/pdf/SvgOutputDev.cpp calligra-3.1.0.new/filters/karbon/pdf/SvgOutputDev.cpp
---- calligra-3.1.0/filters/karbon/pdf/SvgOutputDev.cpp	2019-12-04 12:41:14.000000000 +0100
-+++ calligra-3.1.0.new/filters/karbon/pdf/SvgOutputDev.cpp	2019-12-04 12:35:30.000000000 +0100
-@@ -172,7 +172,7 @@
-     *d->body << "/>" << endl;
- }
- 
--QString SvgOutputDev::convertPath(GfxPath *path)
-+QString SvgOutputDev::convertPath(const GfxPath *path)
- {
-     if (! path)
-         return QString();
-@@ -180,7 +180,7 @@
-     QString output;
- 
-     for (int i = 0; i < path->getNumSubpaths(); ++i) {
--        GfxSubpath * subpath = path->getSubpath(i);
-+        const GfxSubpath * subpath = path->getSubpath(i);
-         if (subpath->getNumPoints() > 0) {
-             output += QString("M%1 %2").arg(subpath->getX(0)).arg(subpath->getY(0));
-             int j = 1;
-diff -Naur calligra-3.1.0/filters/karbon/pdf/SvgOutputDev.h calligra-3.1.0.new/filters/karbon/pdf/SvgOutputDev.h
---- calligra-3.1.0/filters/karbon/pdf/SvgOutputDev.h	2019-12-04 12:41:14.000000000 +0100
-+++ calligra-3.1.0.new/filters/karbon/pdf/SvgOutputDev.h	2019-12-04 12:30:41.000000000 +0100
-@@ -83,7 +83,7 @@
-     /// Dumps content to svg file
-     void dumpContent();
- private:
--    QString convertPath(GfxPath *path);
-+    QString convertPath(const GfxPath *path);
-     QString convertMatrix(const QMatrix &matrix);
-     QString convertMatrix(const double * matrix);
-     QString printFill();
diff --git a/app-office/calligra/files/calligra-3.1.0-qt-5.11.patch b/app-office/calligra/files/calligra-3.1.0-qt-5.11.patch
deleted file mode 100644
index bdbe4b6e8559..000000000000
--- a/app-office/calligra/files/calligra-3.1.0-qt-5.11.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-From f53805bdc108b608e40f217e6a78e7e4df4284f2 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Sun, 18 Mar 2018 11:56:57 +0100
-Subject: [PATCH] Fix build with Qt 5.11 (missing headers)
-
-Reviewers: #calligra:_3.0
-
-Tags: #calligra:_3.0
-
-Differential Revision: https://phabricator.kde.org/D11454
----
- libs/widgets/KoCsvImportDialog.cpp                         | 1 +
- libs/widgets/KoPageLayoutWidget.cpp                        | 2 ++
- plugins/chartshape/dialogs/TableEditorDialog.cpp           | 1 +
- plugins/formulashape/FormulaToolWidget.cpp                 | 1 +
- sheets/dialogs/LayoutDialog.cpp                            | 1 +
- words/part/dialogs/KWAnchoringProperties.cpp               | 1 +
- words/part/dialogs/KWRunAroundProperties.cpp               | 2 ++
- 15 files changed, 18 insertions(+), 1 deletion(-)
-
-diff --git a/libs/widgets/KoCsvImportDialog.cpp b/libs/widgets/KoCsvImportDialog.cpp
-index 0ffdcf62a70..cdca006dc62 100644
---- a/libs/widgets/KoCsvImportDialog.cpp
-+++ b/libs/widgets/KoCsvImportDialog.cpp
-@@ -21,6 +21,7 @@
- #include "KoCsvImportDialog.h"
- 
- // Qt
-+#include <QButtonGroup>
- #include <QTextCodec>
- #include <QTextStream>
- 
-diff --git a/libs/widgets/KoPageLayoutWidget.cpp b/libs/widgets/KoPageLayoutWidget.cpp
-index f91555ca262..a3816f96d8a 100644
---- a/libs/widgets/KoPageLayoutWidget.cpp
-+++ b/libs/widgets/KoPageLayoutWidget.cpp
-@@ -23,6 +23,8 @@
- 
- #include <KoUnit.h>
- 
-+#include <QButtonGroup>
-+
- class Q_DECL_HIDDEN KoPageLayoutWidget::Private
- {
- public:
-diff --git a/plugins/chartshape/dialogs/TableEditorDialog.cpp b/plugins/chartshape/dialogs/TableEditorDialog.cpp
-index c0d5136f09e..d2a772e83c2 100644
---- a/plugins/chartshape/dialogs/TableEditorDialog.cpp
-+++ b/plugins/chartshape/dialogs/TableEditorDialog.cpp
-@@ -24,6 +24,7 @@
- 
- // Qt
- #include <QAbstractItemModel>
-+#include <QAction>
- 
- // Calligra
- #include <KoIcon.h>
-diff --git a/plugins/formulashape/FormulaToolWidget.cpp b/plugins/formulashape/FormulaToolWidget.cpp
-index ed109192cc5..8f521779617 100644
---- a/plugins/formulashape/FormulaToolWidget.cpp
-+++ b/plugins/formulashape/FormulaToolWidget.cpp
-@@ -30,6 +30,7 @@
- #include <QWidgetAction>
- #include <QTableWidget>
- #include <QAction>
-+#include <QHeaderView>
- #include <QMenu>
- 
- FormulaToolWidget::FormulaToolWidget( KoFormulaTool* tool, QWidget* parent )
-diff --git a/sheets/dialogs/LayoutDialog.cpp b/sheets/dialogs/LayoutDialog.cpp
-index a0a9832ddfc..7d7db53823b 100644
---- a/sheets/dialogs/LayoutDialog.cpp
-+++ b/sheets/dialogs/LayoutDialog.cpp
-@@ -36,6 +36,7 @@
- #include <math.h>
- 
- #include <QIntValidator>
-+#include <QButtonGroup>
- #include <QCheckBox>
- #include <QFrame>
- #include <QLabel>
-diff --git a/words/part/dialogs/KWAnchoringProperties.cpp b/words/part/dialogs/KWAnchoringProperties.cpp
-index d64208cbdb6..bfddb3a03f5 100644
---- a/words/part/dialogs/KWAnchoringProperties.cpp
-+++ b/words/part/dialogs/KWAnchoringProperties.cpp
-@@ -35,6 +35,7 @@
- 
- #include <kundo2command.h>
- 
-+#include <QButtonGroup>
- #include <QComboBox>
- 
- const int KWAnchoringProperties::vertRels[4][20] = {
-diff --git a/words/part/dialogs/KWRunAroundProperties.cpp b/words/part/dialogs/KWRunAroundProperties.cpp
-index e38599a06d7..7e8b2d51ef9 100644
---- a/words/part/dialogs/KWRunAroundProperties.cpp
-+++ b/words/part/dialogs/KWRunAroundProperties.cpp
-@@ -28,6 +28,8 @@
- 
- #include <kundo2command.h>
- 
-+#include <QButtonGroup>
-+
- KWRunAroundProperties::KWRunAroundProperties(FrameConfigSharedState *state)
-         : m_state(state)
- {
--- 
-2.16.2
-
diff --git a/app-office/calligra/files/calligra-3.1.0-stage-qt-5.11.patch b/app-office/calligra/files/calligra-3.1.0-stage-qt-5.11.patch
deleted file mode 100644
index 120864e11d45..000000000000
--- a/app-office/calligra/files/calligra-3.1.0-stage-qt-5.11.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From ee83e0f2c251072e47a2799619cdc79efe67e651 Mon Sep 17 00:00:00 2001
-From: David Faure <faure@kde.org>
-Date: Tue, 3 Apr 2018 00:31:19 +0200
-Subject: Fix compilation with Qt 5.11 (missing include)
-
----
- stage/part/KPrPresentationTool.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/stage/part/KPrPresentationTool.cpp b/stage/part/KPrPresentationTool.cpp
-index ae743da..3007f91 100644
---- a/stage/part/KPrPresentationTool.cpp
-+++ b/stage/part/KPrPresentationTool.cpp
-@@ -32,6 +32,7 @@
- #include <QDesktopServices>
- #include <QUrl>
- #include <QDBusConnection>
-+#include <QFrame>
- 
- #include <KoShape.h>
- #include <KoShapeManager.h>
--- 
-cgit v0.11.2
diff --git a/app-office/gnucash/Manifest b/app-office/gnucash/Manifest
index ab346644f9df..9f04685a262c 100644
--- a/app-office/gnucash/Manifest
+++ b/app-office/gnucash/Manifest
@@ -2,6 +2,10 @@ AUX gnucash-3.2-no-gui.patch 440 BLAKE2B 223d9527e0f290e73774b39ee25dae2c1740d4e
 AUX gnucash-3.8-examples-subdir.patch 316 BLAKE2B 77779cebb75896e8d51981f5fc0cbc09aa51e83ea0823b1055d5e6bf9b420492f039e7e39985e405304819a46bbd178d10c2a55188e956c9b71b2c20842f947e SHA512 d4fc9a3e062ff25f65b82253c563c0d291d461b44d47f30c33a8041908a59fa23ce3e127b885690b1ec55d17222cac2c3679d49d962bb5be998f9611467e88f8
 AUX gnucash-3.8-exclude-license.patch 634 BLAKE2B d6b86102a4ced983684e75f4f4801b7da096923a65c7fca10f13e9da45adb70ac5c2c3c5af9151a14e6f1eb3a3711d6283840db232ee6113818e1f1b215be9dc SHA512 a9c43405226d2256c0b3c981e70a4fc79bd126c08089e68ac01edc86070a2936eaa3f77ac16bad94954addd2085ca0bf1c62bec3d31840559bbf213e1b530f2d
 DIST gnucash-3.8b.tar.bz2 14285584 BLAKE2B 304d73b04883b61b8a4e174f458206769483ca0f6d28d284c760397e0bc4061dbdb379ff3cca35e80d6736516549a8733bf36895a11c2202fb9f8f25e591e1d9 SHA512 e0529934e9ccafbef2b724f5fca9a0e300c78cf21596f0dcd4b5c11ff300c06a963b68eff1efe00834dc488ced604b86011075bb22480488ddf31d2d4c94ddca
+DIST gnucash-4.0.tar.bz2 13978744 BLAKE2B 9718e365e1a3939357fabb98f43a95ed22d4d4ee13bb17a7dda5da8ed2c4fe6c4ec4951eb1b5a66bd71feb3f26a4e896d5cb7a177cd7d1b773ac26e643a24f0a SHA512 29fd61352932ff0962e5c634711bc1ae09020e457bace5d2954b743976b607ad3632ddf6a7024148e989dc8e69769400cb7795eee097f8d88dea3ac8d6b7c7ee
+DIST gnucash-4.1.tar.bz2 13994973 BLAKE2B 875ec0d9b2b6b8ec7144ad52f172f6727078746884d8d1d369a4b7535ebe5bcc0c70b4a25f1ba8e3f97d0603a8d511c9911e343f2610b557511b56eafbea8f39 SHA512 caf25d4ca0a950b1aa0c236c801938ff2235dc7c7710065a5b78fd3745904dd5e5103c6ed8abebfe3a4a68c8048372802f856c63cdde8aeaf71840daf2e9ec07
 EBUILD gnucash-3.8b-r1.ebuild 4990 BLAKE2B 7b7770b70f859016731a4e4f86ef50428b03a035d299c2fcde92fe14334725ac1d75025bc112c6878088311b4a8417552c07eb8603406fc1596738f1cc5a99eb SHA512 92d6a36a0a8bf6c498bb8e670c6bafcd24f1d18637310a6bce8afb0338073c320d28786eef703e1388c01139ea94af02f3d74f55cc1a87db4f3a6015644a1cab
 EBUILD gnucash-3.8b.ebuild 4885 BLAKE2B ccf9b8ce5d1a7bfacaf2100fec3ed8bfc866736860b05e66241758f8c9ead88ec89ba3ad5ed5227cd6ac81277bd7f9278f674faddf7dd74413ccb6995861e83c SHA512 ad13bf23ed4d1988c3eca3a10d1f7317f9fa92b0692a3e91185100f92dee9422091a0e9971626c7938c66730024fe2f4d9210c51b0442e48da4f736935f51a58
+EBUILD gnucash-4.0.ebuild 5548 BLAKE2B 6cd515f53187ac4520f152540db46e50f66010abfd58bfc60347140ab80b587abcf872a30537fd137e9bb63ab838c958f0beb7e55aced7b8be312a4a9c69bfab SHA512 a0ca0287d1a20516639856650c0cca416b8df953c8746012a529b996caaf45cc2cc771f0e5e145a68c35dcb0091951d17008bdbd62ed7c977de453261d863de5
+EBUILD gnucash-4.1.ebuild 5476 BLAKE2B d911f9b12f6aa79c4a5fc123a5f725d157b07190f76a34d9e4fa5b8c88fd24cf05c55b0aba255772326bfb678bb70b34d95304b1474c63ffb1022afed77a2021 SHA512 a3cff0bb0292ef6604560a09b844ed317928eb6d37ae21d4c0f0cbbea64062a1b4e6f3313b2e20a74afd2a99aa382e46bfc84e550c9faf4056554a506d884edf
 MISC metadata.xml 562 BLAKE2B 07fb70bae76794f49e852dc2840b13b811e3e8b28cd1f504d693662e6530591d337f993248fd80868c08b2c1cb9a648c7fcf8f964e74eeef70c5815946edad64 SHA512 659ded7048ced517f06d94952df08694ae5d2775aec8bb9adaf658d5151048ec1b612d6bf54af664a44b5510406b4ed02809ee0c150159eb6c2652186589c4a2
diff --git a/app-office/gnucash/gnucash-4.0.ebuild b/app-office/gnucash/gnucash-4.0.ebuild
new file mode 100644
index 000000000000..71a42926ae21
--- /dev/null
+++ b/app-office/gnucash/gnucash-4.0.ebuild
@@ -0,0 +1,235 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit cmake gnome2-utils python-single-r1 toolchain-funcs xdg-utils
+
+DESCRIPTION="A personal finance manager"
+HOMEPAGE="http://www.gnucash.org/"
+SRC_URI="https://github.com/Gnucash/${PN}/releases/download/${PV}/${P}.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+IUSE="aqbanking debug doc examples gnome-keyring +gui mysql nls ofx postgres
+	  python quotes -register2 smartcard sqlite test"
+RESTRICT="!test? ( test )"
+
+# Examples doesn't build unless GUI is also built
+REQUIRED_USE="
+	examples? ( gui )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	smartcard? ( aqbanking )"
+
+# dev-libs/boost must always be built with nls enabled.
+# dev-scheme/guile[deprecated] because of SCM_LIST*() use.
+# net-libs/aqbanking dropped gtk with v6. So, to simplify the
+#   dependency, we just rely on that.
+RDEPEND="
+	>=dev-libs/glib-2.56.1:2
+	>=dev-scheme/guile-2.2.0:12=[deprecated,regex]
+	>=sys-libs/zlib-1.1.4
+	dev-libs/boost:=[icu,nls]
+	dev-libs/icu:=
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	aqbanking? (
+		>=net-libs/aqbanking-6[ofx?]
+		sys-libs/gwenhywfar
+		smartcard? ( sys-libs/libchipcard )
+	)
+	gnome-keyring? ( >=app-crypt/libsecret-0.18 )
+	gui? (
+		>=x11-libs/gtk+-3.22.30:3
+		gnome-base/dconf
+		net-libs/webkit-gtk:4=
+		aqbanking? ( sys-libs/gwenhywfar[gtk] )
+	)
+	mysql? (
+		dev-db/libdbi
+		dev-db/libdbi-drivers[mysql]
+	)
+	ofx? ( >=dev-libs/libofx-0.9.1:= )
+	postgres? (
+		dev-db/libdbi
+		dev-db/libdbi-drivers[postgres]
+	)
+	python? ( ${PYTHON_DEPS} )
+	quotes? (
+		>=dev-perl/Finance-Quote-1.11
+		dev-perl/Date-Manip
+		dev-perl/HTML-TableExtract
+	)
+	sqlite? (
+		dev-db/libdbi
+		dev-db/libdbi-drivers[sqlite]
+	)
+"
+
+DEPEND="${RDEPEND}
+	>=dev-cpp/gtest-1.8.0
+	>=sys-devel/gettext-0.20
+	dev-lang/perl
+	dev-perl/XML-Parser
+	sys-devel/libtool
+"
+
+BDEPEND="
+	dev-lang/swig
+	dev-util/cmake
+	virtual/pkgconfig
+	|| (
+		>=sys-devel/gcc-8:*
+		>=sys-devel/clang-6:*
+	)
+"
+
+PDEPEND="doc? (
+	~app-doc/gnucash-docs-${PV}
+	gnome-extra/yelp
+)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.2-no-gui.patch
+	"${FILESDIR}"/${PN}-3.8-examples-subdir.patch
+	"${FILESDIR}"/${PN}-3.8-exclude-license.patch
+)
+
+S="${WORKDIR}/${PN}-$(ver_cut 1-2)"
+
+pkg_pretend() {
+	if tc-is-gcc; then
+		if [[ $(gcc-major-version) -lt 8 ]]; then
+			die "GnuCash needs at least GCC version 8."
+		fi
+	elif tc-is-clang; then
+		if [[ $(clang-major-version) -lt 6 ]]; then
+			die "GnuCash needs at least clang version 6."
+		fi
+	fi
+}
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+	xdg_environment_reset
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# Fix tests writing to /tmp
+	local fixtestfiles=(
+		gnucash/report/test/test-report-html.scm
+		gnucash/report/reports/standard/test/test-invoice.scm
+		gnucash/report/reports/standard/test/test-new-owner-report.scm
+		gnucash/report/reports/standard/test/test-owner-report.scm
+		gnucash/report/reports/standard/test/test-transaction.scm
+		gnucash/report/reports/standard/test/test-portfolios.scm
+		gnucash/report/reports/standard/test/test-charts.scm
+		gnucash/report/test/test-report.scm
+		gnucash/report/test/test-commodity-utils.scm
+		gnucash/report/test/test-report-extras.scm
+		libgnucash/backend/dbi/test/test-backend-dbi-basic.cpp
+		libgnucash/backend/xml/test/test-xml-pricedb.cpp
+	)
+	for x in "${fixtestfiles[@]}"; do
+		sed -i -e "s|\"/tmp/|\"${T}/|g" "${S}/${x}" || die "sed of "${S}/${x}" failed"
+	done
+}
+
+src_configure() {
+	export GUILE_AUTO_COMPILE=0
+
+	local sql_on_off="OFF"
+	if use mysql || use postgres || use sqlite ; then
+		sql_on_off="ON"
+	fi
+
+	local mycmakeargs=(
+		-DCOMPILE_GSCHEMAS=OFF
+		-DDISABLE_NLS=$(usex !nls)
+		-DENABLE_REGISTER2=$(usex register2)
+		-DWITH_AQBANKING=$(usex aqbanking)
+		-DWITH_OFX=$(usex ofx)
+		-DWITH_PYTHON=$(usex python)
+		-DWITH_SQL=${sql_on_off}
+		-DWITH_GNUCASH=$(usex gui)
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	if use python ; then
+		cp common/test-core/unittest_support.py \
+		   "${BUILD_DIR}"/common/test-core/ || die
+	fi
+
+	LOCALE_TESTS=
+	if type locale >/dev/null 2>&1; then
+		MY_LOCALES="$(locale -a)"
+		if [[ "${MY_LOCALES}" != *en_US* ||
+				"${MY_LOCALES}" != *en_GB* ||
+				"${MY_LOCALES}" != *fr_FR* ]] ; then
+			ewarn "Missing one or more of en_US, en_GB, or fr_FR locales."
+		else
+			LOCALE_TESTS=true
+		fi
+	else
+		ewarn "'locale' not found."
+	fi
+
+	if [[ ! ${LOCALE_TESTS} ]]; then
+		ewarn "Disabling test-qof and test-gnc-numeric."
+		echo 'set(CTEST_CUSTOM_TESTS_IGNORE test-qof test-gnc-numeric)' \
+			> "${BUILD_DIR}"/CTestCustom.cmake || die
+	fi
+
+	cd "${BUILD_DIR}" || die
+	XDG_DATA_HOME="${T}/$(whoami)" eninja check
+}
+
+src_install() {
+	cmake_src_install
+
+	# strip is unable to recognise the format of the input files (*.go)
+	dostrip -x /usr/$(get_libdir)/guile
+
+	if use examples ; then
+		docompress -x /usr/share/doc/${PF}/examples
+	else
+		rm -r "${ED}"/usr/share/doc/${PF}/examples
+	fi
+
+	if use python ; then
+		python_optimize
+		python_optimize "${ED}"/usr/share/gnucash/python
+	fi
+}
+
+pkg_postinst() {
+	if use gui ; then
+		xdg_icon_cache_update
+		gnome2_schemas_update
+	fi
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+
+	ewarn "Backup all financial files or databases before using GnuCash >=2.7.0!"
+	ewarn
+	ewarn "GnuCash 2.7.0 introduced large changes in its file format and database"
+	ewarn "schema that WILL prevent you from reverting back to GnuCash 2.6."
+}
+
+pkg_postrm() {
+	if use gui ; then
+		xdg_icon_cache_update
+		gnome2_schemas_update
+	fi
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/app-office/gnucash/gnucash-4.1.ebuild b/app-office/gnucash/gnucash-4.1.ebuild
new file mode 100644
index 000000000000..0b6edcc84098
--- /dev/null
+++ b/app-office/gnucash/gnucash-4.1.ebuild
@@ -0,0 +1,234 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit cmake gnome2-utils python-single-r1 toolchain-funcs xdg-utils
+
+DESCRIPTION="A personal finance manager"
+HOMEPAGE="http://www.gnucash.org/"
+SRC_URI="https://github.com/Gnucash/${PN}/releases/download/${PV}/${P}.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+IUSE="aqbanking debug doc examples gnome-keyring +gui mysql nls ofx postgres
+	  python quotes -register2 smartcard sqlite test"
+RESTRICT="!test? ( test )"
+
+# Examples doesn't build unless GUI is also built
+REQUIRED_USE="
+	examples? ( gui )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	smartcard? ( aqbanking )"
+
+# dev-libs/boost must always be built with nls enabled.
+# net-libs/aqbanking dropped gtk with v6. So, to simplify the
+#   dependency, we just rely on that.
+RDEPEND="
+	>=dev-libs/glib-2.56.1:2
+	>=dev-scheme/guile-2.2.0:=[regex]
+	>=sys-libs/zlib-1.1.4
+	dev-libs/boost:=[icu,nls]
+	dev-libs/icu:=
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	aqbanking? (
+		>=net-libs/aqbanking-6[ofx?]
+		sys-libs/gwenhywfar
+		smartcard? ( sys-libs/libchipcard )
+	)
+	gnome-keyring? ( >=app-crypt/libsecret-0.18 )
+	gui? (
+		>=x11-libs/gtk+-3.22.30:3
+		gnome-base/dconf
+		net-libs/webkit-gtk:4=
+		aqbanking? ( sys-libs/gwenhywfar[gtk] )
+	)
+	mysql? (
+		dev-db/libdbi
+		dev-db/libdbi-drivers[mysql]
+	)
+	ofx? ( >=dev-libs/libofx-0.9.1:= )
+	postgres? (
+		dev-db/libdbi
+		dev-db/libdbi-drivers[postgres]
+	)
+	python? ( ${PYTHON_DEPS} )
+	quotes? (
+		>=dev-perl/Finance-Quote-1.11
+		dev-perl/Date-Manip
+		dev-perl/HTML-TableExtract
+	)
+	sqlite? (
+		dev-db/libdbi
+		dev-db/libdbi-drivers[sqlite]
+	)
+"
+
+DEPEND="${RDEPEND}
+	>=dev-cpp/gtest-1.8.0
+	>=sys-devel/gettext-0.20
+	dev-lang/perl
+	dev-perl/XML-Parser
+	sys-devel/libtool
+"
+
+BDEPEND="
+	dev-lang/swig
+	dev-util/cmake
+	virtual/pkgconfig
+	|| (
+		>=sys-devel/gcc-8:*
+		>=sys-devel/clang-6:*
+	)
+"
+
+PDEPEND="doc? (
+	~app-doc/gnucash-docs-${PV}
+	gnome-extra/yelp
+)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.2-no-gui.patch
+	"${FILESDIR}"/${PN}-3.8-examples-subdir.patch
+	"${FILESDIR}"/${PN}-3.8-exclude-license.patch
+)
+
+S="${WORKDIR}/${PN}-$(ver_cut 1-2)"
+
+pkg_pretend() {
+	if tc-is-gcc; then
+		if [[ $(gcc-major-version) -lt 8 ]]; then
+			die "GnuCash needs at least GCC version 8."
+		fi
+	elif tc-is-clang; then
+		if [[ $(clang-major-version) -lt 6 ]]; then
+			die "GnuCash needs at least clang version 6."
+		fi
+	fi
+}
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+	xdg_environment_reset
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# Fix tests writing to /tmp
+	local fixtestfiles=(
+		gnucash/report/test/test-report-html.scm
+		gnucash/report/reports/standard/test/test-invoice.scm
+		gnucash/report/reports/standard/test/test-new-owner-report.scm
+		gnucash/report/reports/standard/test/test-owner-report.scm
+		gnucash/report/reports/standard/test/test-transaction.scm
+		gnucash/report/reports/standard/test/test-portfolios.scm
+		gnucash/report/reports/standard/test/test-charts.scm
+		gnucash/report/test/test-report.scm
+		gnucash/report/test/test-commodity-utils.scm
+		gnucash/report/test/test-report-extras.scm
+		libgnucash/backend/dbi/test/test-backend-dbi-basic.cpp
+		libgnucash/backend/xml/test/test-xml-pricedb.cpp
+	)
+	for x in "${fixtestfiles[@]}"; do
+		sed -i -e "s|\"/tmp/|\"${T}/|g" "${S}/${x}" || die "sed of "${S}/${x}" failed"
+	done
+}
+
+src_configure() {
+	export GUILE_AUTO_COMPILE=0
+
+	local sql_on_off="OFF"
+	if use mysql || use postgres || use sqlite ; then
+		sql_on_off="ON"
+	fi
+
+	local mycmakeargs=(
+		-DCOMPILE_GSCHEMAS=OFF
+		-DDISABLE_NLS=$(usex !nls)
+		-DENABLE_REGISTER2=$(usex register2)
+		-DWITH_AQBANKING=$(usex aqbanking)
+		-DWITH_OFX=$(usex ofx)
+		-DWITH_PYTHON=$(usex python)
+		-DWITH_SQL=${sql_on_off}
+		-DWITH_GNUCASH=$(usex gui)
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	if use python ; then
+		cp common/test-core/unittest_support.py \
+		   "${BUILD_DIR}"/common/test-core/ || die
+	fi
+
+	LOCALE_TESTS=
+	if type locale >/dev/null 2>&1; then
+		MY_LOCALES="$(locale -a)"
+		if [[ "${MY_LOCALES}" != *en_US* ||
+				"${MY_LOCALES}" != *en_GB* ||
+				"${MY_LOCALES}" != *fr_FR* ]] ; then
+			ewarn "Missing one or more of en_US, en_GB, or fr_FR locales."
+		else
+			LOCALE_TESTS=true
+		fi
+	else
+		ewarn "'locale' not found."
+	fi
+
+	if [[ ! ${LOCALE_TESTS} ]]; then
+		ewarn "Disabling test-qof and test-gnc-numeric."
+		echo 'set(CTEST_CUSTOM_TESTS_IGNORE test-qof test-gnc-numeric)' \
+			> "${BUILD_DIR}"/CTestCustom.cmake || die
+	fi
+
+	cd "${BUILD_DIR}" || die
+	XDG_DATA_HOME="${T}/$(whoami)" eninja check
+}
+
+src_install() {
+	cmake_src_install
+
+	# strip is unable to recognise the format of the input files (*.go)
+	dostrip -x /usr/$(get_libdir)/guile
+
+	if use examples ; then
+		docompress -x /usr/share/doc/${PF}/examples
+	else
+		rm -r "${ED}"/usr/share/doc/${PF}/examples
+	fi
+
+	if use python ; then
+		python_optimize
+		python_optimize "${ED}"/usr/share/gnucash/python
+	fi
+}
+
+pkg_postinst() {
+	if use gui ; then
+		xdg_icon_cache_update
+		gnome2_schemas_update
+	fi
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+
+	ewarn "Backup all financial files or databases before using GnuCash >=2.7.0!"
+	ewarn
+	ewarn "GnuCash 2.7.0 introduced large changes in its file format and database"
+	ewarn "schema that WILL prevent you from reverting back to GnuCash 2.6."
+}
+
+pkg_postrm() {
+	if use gui ; then
+		xdg_icon_cache_update
+		gnome2_schemas_update
+	fi
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/app-office/gtg/Manifest b/app-office/gtg/Manifest
index 666ca0c54866..dfd469b7d22a 100644
--- a/app-office/gtg/Manifest
+++ b/app-office/gtg/Manifest
@@ -1,4 +1,3 @@
-AUX fix-help-open.patch 1628 BLAKE2B 47f6cc0f7a88a60408884805781410298239d064fa58c36ee57cf777a5fbb7ff0a7f032d1e5e0d30e903d14b33cea1daaadb8461099cae9e3e36aeedbc513922 SHA512 e0968c48ad22b405b0aa353da21cd199c4cc665a7d1e94ea52bba726798f4e403384a4394d87fbf4a225723c2cb1f2eb54ecd0659f5be869dd36e5ee034e477e
-DIST gtg-0.4.0_pre20200613.tar.gz 4827071 BLAKE2B 80515f064b4a034066a86c1b63dcb4e2510e49493b067991b7135a3914b1d75ebfc7f18132d6db81e55fdec34a0225c3147b55dc1e0c891540b2b895f3768f2d SHA512 8d4c9460693f7a913c224bd22aacec5b7db67faa5e74e8575fe99d2e792e8f95f6480e1d0ecc3ac77b0533403b8baa41ece315bd14782fb3c783315aa3d7a5fb
-EBUILD gtg-0.4.0_pre20200613.ebuild 1537 BLAKE2B 8fde70a21d8a9163ccd1506758710b1e0c050b3dff8edb6598476d313a5edb96c161718672435f69b7564d46c4cdc433e64c145d4b57eb6d1f4f0d53a3d84633 SHA512 60062306cccbd7ccf607667076f413e90e4346c675d6ab6d03236b65d24f8ffe4cb488cbc38bca0f960f51424b894d8bb81facc690d2ccef1b5bae3cdc04c0c4
+DIST gtg-0.4.0.tar.xz 3744752 BLAKE2B fdeabe32135dea24ac6113a486650b66b5143aa745117029b03e26e1bb3f2e8629623b26efdae0c8217741a2b4964b5dc060f0e450c05c950e21ea360f3f3823 SHA512 f2677f6bbc0b6cb21b7882a2bd0342b4919581c12e4aa43c13b5dbc48740418c512a41619584d0d75bfa63ebc4a5460abfbc27360e1817c8832cbecf3c34a60e
+EBUILD gtg-0.4.0.ebuild 1329 BLAKE2B a4da48e80920c74e1f7249e5dda2c3cdb2aea8bb636c776053d531da02531a88911e5c28057d6d0963e7ee9d04db9e8ba12f836378c5d830dd5e2829897fc709 SHA512 c1d6f91a67cf4c0b41d462426bd69bcfa12e2f0f605fc06e1848a9b03402f47207d187aca0456495a23dac89c00b770ff9f497de283dfa3c5e490b7e9ea97c1c
 MISC metadata.xml 886 BLAKE2B 5f0068ca29003ca7dc9988c6e648076eb612103a30c0d5bbf60faec65c7e859d8546243d42764f2b09c000c37ad05e665646aefc6493288c856e2ee96f3187ff SHA512 9676a4693ee4c934eb22673f80b13fe61531e6c82b821990d070ad7c3b709a416c14741c870c3845e5d49a1b4c91b7c8fd16b7812d5e7466ebf352f53328f945
diff --git a/app-office/gtg/files/fix-help-open.patch b/app-office/gtg/files/fix-help-open.patch
deleted file mode 100644
index a66d8e95bdd9..000000000000
--- a/app-office/gtg/files/fix-help-open.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From f8f4cbf0beda0e82388748c916c6152996b12a8e Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Sat, 20 Jun 2020 01:06:04 +0300
-Subject: [PATCH] Fix opening of the help files
-
-webbrowser python module just opens things in the browser for me, which
-doesn't understand what a "help:gtg" is and routes it back to external
-program dialog if lucky.
-Use Gtk.show_uri instead, which will properly open it in help handler (yelp).
-
-I believe we should be using Gtk.show_uri instead of webbrowser in other
-places as well, but that's something for a different release.
----
- GTG/gtk/application.py | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/GTG/gtk/application.py b/GTG/gtk/application.py
-index 39a8a5b3..e8091973 100644
---- a/GTG/gtk/application.py
-+++ b/GTG/gtk/application.py
-@@ -28,7 +28,6 @@ from GTG.gtk.browser.main_window import MainWindow
- from GTG.gtk.editor.editor import TaskEditor
- from GTG.gtk.preferences import Preferences
- from GTG.gtk.plugins import PluginsDialog
--from webbrowser import open as openurl
- from GTG.core import clipboard
- from GTG.core.plugins.engine import PluginEngine
- from GTG.core.plugins.api import PluginAPI
-@@ -251,7 +250,10 @@ class Application(Gtk.Application):
-     def open_help(self, action, param):
-         """Open help callback."""
- 
--        openurl("help:gtg")
-+        try:
-+            Gtk.show_uri(None, "help:gtg", Gdk.CURRENT_TIME)
-+        except GLib.Error:
-+            log.error('Could not open help')
- 
-     def open_backends_manager(self, action, param):
-         """Callback to open the backends manager dialog."""
--- 
-2.20.1
-
diff --git a/app-office/gtg/gtg-0.4.0_pre20200613.ebuild b/app-office/gtg/gtg-0.4.0.ebuild
index d9f3109d2424..135111e7c824 100644
--- a/app-office/gtg/gtg-0.4.0_pre20200613.ebuild
+++ b/app-office/gtg/gtg-0.4.0.ebuild
@@ -9,14 +9,12 @@ inherit meson python-single-r1 xdg
 
 DESCRIPTION="Personal organizer for the GNOME desktop environment"
 HOMEPAGE="https://wiki.gnome.org/Apps/GTG/"
-COMMIT="abe2a9110dd0fc6a46f2d095013972877ea67d78"
-SRC_URI="https://github.com/getting-things-gnome/gtg/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/gtg-${COMMIT}"
+SRC_URI="https://github.com/getting-things-gnome/gtg/releases/download/v0.4/${P}.tar.xz"
 
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="gnome-keyring test"
+IUSE="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
 
@@ -32,7 +30,6 @@ RDEPEND="
 	x11-libs/pango[introspection]
 	x11-libs/gdk-pixbuf[introspection]
 	x11-libs/gtk+:3[introspection]
-	gnome-keyring? ( gnome-base/libgnome-keyring[introspection] )
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
@@ -49,8 +46,6 @@ BDEPEND="
 	)
 "
 
-PATCHES=( "${FILESDIR}"/fix-help-open.patch )
-
 src_install() {
 	meson_src_install
 	python_fix_shebang "${ED}"/usr/bin/gtg
diff --git a/app-office/impressive/Manifest b/app-office/impressive/Manifest
index 8eb0798f47b9..f2371bc3350d 100644
--- a/app-office/impressive/Manifest
+++ b/app-office/impressive/Manifest
@@ -1,5 +1,3 @@
-DIST Impressive-0.13.0-beta1a.tar.gz 213098 BLAKE2B c76ce023f9c44865db68d1d2049aba022581d5e62cf027cc4df63ae541a8471867e75749a2f72c8e1f9e2e7ca2640611e090080ac563cff54f521ea47a351304 SHA512 5484f9764848129150d03233a9b270d2c31ec5f5083100662dd3cca85d3c7ead0000bd23b7d531ad45667410e1a1ea5d97ca1a2f4e8a2449dc730273144e56e8
 DIST Impressive-0.13.0-beta2.tar.gz 311905 BLAKE2B fb912ada1f44b2af9bd1eed4c7e1d4bfae5ba42449a9b1a154500a9d892c1070c9da127c8c3cbd35ce033a768a00db359deb1a045996cfeb7253f92d289aed82 SHA512 45c094d30e898a1843869cdcd490315c8280bbe2f5cc58f7695be2f0876075718517a502af16e040981b3f3a8fd955000d9ff76e20850b4bedf52c0d2bbd098e
-EBUILD impressive-0.13.0_beta1.ebuild 1282 BLAKE2B 058ecb21e342d3fb13332c83c828e29f0f99d37ee06f4dc1bdae49f324317dae339d528e1168e139b2c1960f691692d6fa650a93be9d44c418bf3faae6559f08 SHA512 1204fd9c2b7879b86f401a1857bb2b3424ca9c4c6f99860b88922592052c0a3b215f364d3df0f1bc006b4cc2a9653da49339bea6c1b98c0d6ad660416e74b9c3
 EBUILD impressive-0.13.0_beta2.ebuild 1180 BLAKE2B 7c3a56dfc999efa0efdce7d9dfcacbe1e6d9d3cdbf1fc66648ec276c9428ad3abc093880382aac49c018dd9f296e135a8d7002b0f81ef71396932ea52fdd46d5 SHA512 49787deec55a0f32cd170b414d2d87325ad1b57555a1ed4a314e58a1401de9a727078f0bb950bffeee51948fd29c8603d148c6d29a741793e5cdfd7127854a15
 MISC metadata.xml 333 BLAKE2B 145c89f4cff6275c14079657c04fd3806149b7d24e497df4673a09e868b2deb9cd3fea9bd888765aa7a7301148d71db47dd1a4100695cc5fbf6e268dd72c81ac SHA512 2c4d3cf1dbcadd548b1999c81105be623a9347e0ec290f21be1333ecf64649d75e3a3f6ddcbf61cefbb80a5053897aa94abaf976bdf5a2d0a18135e760e70a23
diff --git a/app-office/impressive/impressive-0.13.0_beta1.ebuild b/app-office/impressive/impressive-0.13.0_beta1.ebuild
deleted file mode 100644
index f1f11adfb70a..000000000000
--- a/app-office/impressive/impressive-0.13.0_beta1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit eutils python-r1
-
-MY_PN="Impressive"
-
-DESCRIPTION="Stylish way of giving presentations with Python"
-HOMEPAGE="http://impressive.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_PN}/${PV/_/-}/${MY_PN}-${PV/_/-}a.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND=""
-RDEPEND="${PYTHON_DEPS}
-	dev-python/pygame[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	x11-apps/xrandr
-	app-text/mupdf
-	|| ( media-fonts/dejavu media-fonts/corefonts )
-"
-
-DOCS=(
-	changelog.txt
-	demo.pdf
-)
-HTML_DOCS=(
-	impressive.html
-)
-
-S="${WORKDIR}/${MY_PN}-${PV/_/-}a"
-
-src_install() {
-	default
-	python_foreach_impl python_doscript ${PN}.py
-	doman impressive.1
-}
-
-pkg_postinst() {
-	elog "The experience with ${PN} can be enhanced by folowing packages:"
-	optfeature "starting web or e-mail hyperlinks from PDF documents" x11-misc/xdg-utils
-	optfeature "sound and video playback" media-video/ffmpeg
-	optfeature "sound and video playback" media-video/mplayer
-	optfeature "sound and video playback" media-video/mplayer2
-	optfeature "extraction of PDF page titles" app-text/pdftk
-}
diff --git a/app-office/kmymoney/Manifest b/app-office/kmymoney/Manifest
index 6d8ebef4984d..1fa083b1721e 100644
--- a/app-office/kmymoney/Manifest
+++ b/app-office/kmymoney/Manifest
@@ -1,5 +1,3 @@
-DIST kmymoney-5.0.8.tar.xz 11753276 BLAKE2B 0c4967b3f39ec675b9bd7e8e81e230c7f5efa574671138db57396984add802d9b6c28e383eaaddb4ee8d486e6dcc2b0ac54f5cf1129aa4dafb9bd1cf4235914f SHA512 f332327dd40cc5667cd0141bd8e0c9cd81a2d996a4d482b2976f6bbd258cc27c73b2190d4631b8e0b9ee9d435ef8934312da399234830eb51b3e4ec942350988
 DIST kmymoney-5.1.0.tar.xz 12005824 BLAKE2B 4eaeefba29d4df85c485d8d94db80b418c0086f6cac81295f1251e3d4883a78c71d0401286a918831ee2a39571a70583675ee303775bffdb3333e11d5624bbf6 SHA512 143161efd708ae05923d68510945c24f08d85cd6482b3e6015c6061bc28c80e095ca56b768e595bfae50ea3340855e021dde5c715546c0641f94adcd91639334
-EBUILD kmymoney-5.0.8-r1.ebuild 3462 BLAKE2B 331250e84ccd0c2529f9fa2a403d4ace132291cec1464e4e04c21e8403b3775d351c34510aefcaa893cf915ee4e1501cef2e28b90c73b49d86be05ad58a585c2 SHA512 ed3ac3d35531752656a072b610fe201a5a365447d2e10d209835e66538db12b23cc61a6f0c0af97556a3651643effb25caf2999875b88457e44e5c56a73abbde
-EBUILD kmymoney-5.1.0.ebuild 3500 BLAKE2B 85c2940dccb780a454a4854df2b319e94025da6b593963020a563e994b5b775c57bb7a4f41291b8022239d65c33e6869a793e1185182cea6dd7a995beba81ee7 SHA512 39e70bbfe80617711071e4bccf120bb80f3054f01f0377801c861d67f35e7eae29d0bf745d01dd12a8502b39e56f730d2af3bc8171f0d12c3f44dd6129300433
-MISC metadata.xml 793 BLAKE2B 0ecca47b6d189eb9d19c4b61d43579429def819e075267f203a382fe3fb55cedfc14faeb409efed1e975688df260e3574bf03c29601e102f9cce662ecc15d81c SHA512 5c52ef57a4c75b2b439036ba561fed505a9bb331e1eac61a0816287b068687cfe3c22c260baba788aae68c0a304ad9e6aa72599d12a1fb511765d9722749e06c
+EBUILD kmymoney-5.1.0.ebuild 3498 BLAKE2B c7db2eb105dd2c370045cc8ca7845e738675b864ca912c25d7451373e2ab77d585ec20d6658c7bea473252ac9d1cee9d9b6d8784f483d325365bc8ae71cbe90c SHA512 2a81a7aab57e4dad9548c1f097aa3dd26783010535c27bf203843aa01524e61b2f5b99e274e728e417fac772d36e372f89bfc927155ed177831edd64048946e8
+MISC metadata.xml 677 BLAKE2B 64f8cdbad4f22f9203f04bbe4a93da432fb7689fc9bbdb072c9f0d16e71b2908ddd95bc452e2fd561981f60cca8638275ef740c00c9a5e1ad020077b0afae97f SHA512 5908450c3761f8bdbfbcc58c3aae5e80737a07ac43107f9c16ba06ee9acae07c60ccbc12f70db7562a807e38e597510cef790220c13204e6e39746528f3fd0c3
diff --git a/app-office/kmymoney/kmymoney-5.0.8-r1.ebuild b/app-office/kmymoney/kmymoney-5.0.8-r1.ebuild
deleted file mode 100644
index 51b2398057d0..000000000000
--- a/app-office/kmymoney/kmymoney-5.0.8-r1.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-ECM_HANDBOOK="optional"
-ECM_TEST="forceoptional"
-KFMIN=5.60.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-VIRTUALDBUS_TEST="true"
-inherit ecm kde.org python-single-r1
-
-DESCRIPTION="Personal finance manager based on KDE Frameworks"
-HOMEPAGE="https://kmymoney.org"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-	KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="5"
-IUSE="activities addressbook calendar hbci holidays ofx quotes webkit weboob"
-
-REQUIRED_USE="weboob? ( ${PYTHON_REQUIRED_USE} )"
-
-BDEPEND="virtual/pkgconfig"
-COMMON_DEPEND="
-	>=app-crypt/gpgme-1.7.1-r1[cxx]
-	>=app-office/libalkimia-7.0.0:=
-	dev-libs/gmp:0=[cxx]
-	dev-libs/kdiagram:5
-	dev-libs/libgpg-error
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/sonnet-${KFMIN}:5
-	activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
-	addressbook? (
-		>=kde-frameworks/kcontacts-${KFMIN}:5
-		kde-apps/akonadi:5
-		kde-apps/kidentitymanagement:5
-	)
-	calendar? ( dev-libs/libical:= )
-	hbci? (
-		>=net-libs/aqbanking-6.0.1
-		>=sys-libs/gwenhywfar-5.1.2:=[qt5]
-	)
-	holidays? ( >=kde-frameworks/kholidays-${KFMIN}:5 )
-	ofx? ( dev-libs/libofx )
-	webkit? (
-		>=kde-frameworks/kdewebkit-${KFMIN}:5
-		>=dev-qt/qtwebkit-5.212.0_pre20180120:5
-	)
-	!webkit? ( >=dev-qt/qtwebengine-${QTMIN}:5[widgets] )
-	weboob? (
-		${PYTHON_DEPS}
-		>=dev-qt/qtconcurrent-${QTMIN}:5
-		$(python_gen_cond_dep '
-			www-client/weboob[${PYTHON_MULTI_USEDEP}]
-		')
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-"
-RDEPEND="${COMMON_DEPEND}
-	!app-office/kmymoney:4
-	quotes? ( dev-perl/Finance-Quote )
-"
-
-pkg_setup() {
-	use weboob && python_setup
-	ecm_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_QT_DESIGNER=OFF
-		$(cmake_use_find_package activities KF5Activities)
-		$(cmake_use_find_package addressbook KF5Akonadi)
-		$(cmake_use_find_package addressbook KF5Contacts)
-		$(cmake_use_find_package addressbook KF5IdentityManagement)
-		-DENABLE_LIBICAL=$(usex calendar)
-		-DENABLE_KBANKING=$(usex hbci)
-		$(cmake_use_find_package holidays KF5Holidays)
-		-DENABLE_OFXIMPORTER=$(usex ofx)
-		-DENABLE_WEBENGINE=$(usex !webkit)
-		-DENABLE_WEBOOB=$(usex weboob)
-		$(cmake_use_find_package weboob PythonLibs)
-	)
-	ecm_src_configure
-}
-
-src_test() {
-	# bug 652636; bug 673052: needs kmymoney installed to succeed
-	local myctestargs=(
-		-E "(reports-chart-test|qsqlcipher-test)"
-	)
-
-	ecm_src_test
-}
diff --git a/app-office/kmymoney/kmymoney-5.1.0.ebuild b/app-office/kmymoney/kmymoney-5.1.0.ebuild
index f43a35d8d49f..b4054dec6101 100644
--- a/app-office/kmymoney/kmymoney-5.1.0.ebuild
+++ b/app-office/kmymoney/kmymoney-5.1.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://kmymoney.org"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/app-office/kmymoney/metadata.xml b/app-office/kmymoney/metadata.xml
index 34cd0358c540..d9c0e04abc20 100644
--- a/app-office/kmymoney/metadata.xml
+++ b/app-office/kmymoney/metadata.xml
@@ -11,6 +11,5 @@
 		<flag name="hbci">Enable HBCI support using <pkg>net-libs/aqbanking</pkg></flag>
 		<flag name="holidays">Enable <pkg>kde-frameworks/kholidays</pkg> integration</flag>
 		<flag name="quotes">Enable Online Stock Quote retrieval</flag>
-		<flag name="weboob">Enable import of online banking transactions extracted by <pkg>www-client/weboob</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/app-office/ledger/Manifest b/app-office/ledger/Manifest
index 21e4c0faaf46..5a9f44b0d0e0 100644
--- a/app-office/ledger/Manifest
+++ b/app-office/ledger/Manifest
@@ -1,5 +1,5 @@
 DIST ledger-3.1.2.tar.gz 801112 BLAKE2B 71b907a83fe10857d17de746c0d124572859c9eca237130ebbfa5b730406470a5d31025736e80516feaac7daf14a4edb8b644ed72a0827f9714ac9cb2b79c0fb SHA512 445d9a9c70aa3e59718f8fb75e4110c73f2f476436149fdd456b5fe7b9cee9333c09647080049989599dfac491e5bdd0d143717e58e15989db0fcaad4e5a958d
 DIST ledger-3.2.0.tar.gz 790404 BLAKE2B 081ca5d857238aecbeae5a0ba3267864442a8c1772a71b1894f5a9fb33173f9a0bd488ad4db3844fce8172268e516ebb92ba0556ced6e67b2a089fbb5adfde36 SHA512 580f4f39d7c3cd2bd1d05bcc36b127cfb311219f39fe50dbf23f582f73dd986729d4b5fa76bfd89cd5db9bfdfcdd5dca5b9d6b24766650040e45b881726e65ea
 EBUILD ledger-3.1.2-r1.ebuild 2608 BLAKE2B 74a23d6a6f61cc0237100038af83f4241098e1f34487da11538dddef5ef540fd4d7adc5bc8422906caeee999ab5558395ddeeaf8bc3fd4e62b353ef9211947c0 SHA512 91e7ee6e7ae984d166c725979128f5e5686b60fd8836fbeafddc4f769c8edf6a3370a7f292bf67ec1889ddb35c5c14eed3753c73ddac2267f180bdcfae1aa0f1
-EBUILD ledger-3.2.0.ebuild 2381 BLAKE2B 50339d6e2269e22a0666f54d43fdbeadeb342cbbce863a1b4dae0cd22d98d3e9ddea4ae0fd68fe705a787bd5a2f3c2cb91edf2bc90d0cb4487a9f725c65b0db6 SHA512 0c5f77434d0a09b7d68e8e7a21a43cc341395644fb814fbacf1e9a10d1e784cb5a232b83f6a4f6c2fa7fd8bd8a52cef125f988f45d70f795056d39e3876755c4
+EBUILD ledger-3.2.0.ebuild 2379 BLAKE2B 9351ffa064c471b465fe239b3cd46c86c01897adf1f83083f1a98d093a0b13c4b5357881c6d905896c499a4aceb9f51b23e5330587dfd73912f2122e76077f86 SHA512 5a5b3fd9cc844ac10c1a9f04b899c756bca2d1b7a08a56efbec5bb0b8702d9bda5a74718e66a5236e2baf8d916dc9ea97d0e86a94ec71ba1867950aeb6cfdc28
 MISC metadata.xml 306 BLAKE2B 58c3d0307a4358f50e8ede8ddf3f598a55ad03dd9af3351b4f15a46465a844c24f9d5966ee5fbbcb9a68d65eb509a18a87aa95400094539475f65493e34f1839 SHA512 c83b1be9474bbfa3296040c56bf14e22afd214835a44907bcb4db2a8047f05e1fe49b1d1ebe5bcd72fe5ed2f27c832d20169aa813f0d9bd619fc1f7a1c5e15cb
diff --git a/app-office/ledger/ledger-3.2.0.ebuild b/app-office/ledger/ledger-3.2.0.ebuild
index 938e0bf46202..d9edbeb5e8be 100644
--- a/app-office/ledger/ledger-3.2.0.ebuild
+++ b/app-office/ledger/ledger-3.2.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug doc python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/app-office/libalkimia/Manifest b/app-office/libalkimia/Manifest
index a63afa7ea9e1..68a0f3f66095 100644
--- a/app-office/libalkimia/Manifest
+++ b/app-office/libalkimia/Manifest
@@ -1,7 +1,5 @@
 AUX libalkimia-8.0.3-cmake.patch 1447 BLAKE2B 0e6c9d928461943950f6e3c49188c3a9e7c53061b43ec6683e76f44fe731a2eeabe74e5a6d49cd56a3e975093ac2b031a48d6bb9514e22e4cbd1f7434fcead37 SHA512 6353bb424077df9befa451df792c2c94d96e70572ae50b2f9ed122d9fa36fe2bc268d2b75a21fd35b25b2ab3c17296e9b2153e5051c241ecc710cc0be156b356
 AUX libalkimia-8.0.3-no-financequote.patch 6420 BLAKE2B f30f9de62f71a2276473817373add651384805666a087993bddae49d8cfeeaf9addb545cfa1be815c0c0dec1618b124fa3ebdfed77d1d890fb96c1a19e5afc8a SHA512 e85d527cbe9fa24ebbdfd916346e06e3b57072760c3f17644bc7bd1a7de7de016b3b1d8d368a57fdfb06f04eb3e38f8282ae859b0807452ec6af08991c16f4e3
-DIST alkimia-7.0.2.tar.xz 38420 BLAKE2B ea2cc8dd80e2b9b2501d26936aa7d2799d040e8cf86f9adb4785e676046f3c76d0cbe3267e4159582086d910be35020bbc634140d32cc7e5588d06cf75a115a3 SHA512 275ea48cd33caed9393a170efcc6053a581c1cc000862dd73a63bdb6de3e3c3ad2e492901a859e517033e1239e297a43088580553efe32f1d99a85051f5af3e4
 DIST alkimia-8.0.3.tar.xz 212780 BLAKE2B 4863bd2fba7e92518618da250b08772e288697eab9e45980c72c4a29d51f3df94899ead344a9dd5f16ea73cab8dc5596c696156f7da678a030623e77c766949c SHA512 04debd3adeba6380ffe7e9d3949e927dca12ecd7f83dea7b7ba6295b158272c636978c89800757166889e632fed09f3e8b3ce19adc9b91e3369e3b16a5b6cb1e
-EBUILD libalkimia-7.0.2-r1.ebuild 888 BLAKE2B 38d97a237f8fa4685f70406b29b14c79108ef9c92e279f745733cc0242a8c708da84afc9d77536980eb265732142fb37ad26b839ea15e0cf41a9fc206a334341 SHA512 0bffdaf405a4ef13ca20d35787ac73856a0266909d693a48261a55cf49c1296a7561f2aecc1e001eac721b9afdb7d3b49323f324767c376c015483cb200aefb9
-EBUILD libalkimia-8.0.3.ebuild 1729 BLAKE2B 87b639266136ac2b558378d2fde5baf1ab4d04fb7f7849ed5f1d41df868b700e066a800426d80296b27ba196523dec471c54de0605d887e985ca6ccfe646565d SHA512 b81af15a235bcdb1739d63308d756cc1d1e9ca56ee6718b80157ad2f436efb9d8038ea5e99ccc85d54695c5d8514a00fa218616dcaa9a23fd3a7d1f39d76c6aa
+EBUILD libalkimia-8.0.3.ebuild 1879 BLAKE2B 3fb216ce72fcfa1d5d34089a4329ea8a102bb5fb4664368cc88ea47fd5d6cc6b8c573804f2f040b349a5fbebd64be99460ee25239fc2d25a7023fc448f09eef4 SHA512 976efc8e606e35ee05f12a1c80e013d48f1b5a45f496cf06e7a34e842e2bc3c9291a0115fa2747333a2396de0e83b200f6f5fe777a32b2edfa24dcf5a413c5d4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/app-office/libalkimia/libalkimia-7.0.2-r1.ebuild b/app-office/libalkimia/libalkimia-7.0.2-r1.ebuild
deleted file mode 100644
index eab11cea7ef3..000000000000
--- a/app-office/libalkimia/libalkimia-7.0.2-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional"
-KDE_ORG_NAME="alkimia"
-QTMIN=5.12.3
-inherit ecm kde.org
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${KDE_ORG_NAME}/${PV}/${KDE_ORG_NAME}-${PV}.tar.xz"
-	KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="Library with common classes and functionality used by KDE finance applications"
-HOMEPAGE="https://www.linux-apps.com/content/show.php/libalkimia?content=137323"
-
-LICENSE="LGPL-2.1"
-SLOT="0/7"
-IUSE="doc gmp"
-
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	!gmp? ( sci-libs/mpir:=[cxx] )
-	gmp? ( dev-libs/gmp:0=[cxx] )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package doc Doxygen)
-		$(cmake_use_find_package !gmp MPIR)
-	)
-	ecm_src_configure
-}
diff --git a/app-office/libalkimia/libalkimia-8.0.3.ebuild b/app-office/libalkimia/libalkimia-8.0.3.ebuild
index 65225f915781..6a102d8a6201 100644
--- a/app-office/libalkimia/libalkimia-8.0.3.ebuild
+++ b/app-office/libalkimia/libalkimia-8.0.3.ebuild
@@ -7,11 +7,12 @@ ECM_TEST="forceoptional"
 KDE_ORG_NAME="alkimia"
 KFMIN=5.60.0
 QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${KDE_ORG_NAME}/${PV}/${KDE_ORG_NAME}-${PV}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="Library with common classes and functionality used by KDE finance applications"
@@ -66,3 +67,11 @@ src_configure() {
 	)
 	ecm_src_configure
 }
+
+src_test() {
+	# Depends on BUILD_WITH_WEBKIT, bug 736128
+	local myctestargs=(
+		-E "(alkonlinequotestest)"
+	)
+	ecm_src_test
+}
diff --git a/app-office/libreoffice-l10n/Manifest b/app-office/libreoffice-l10n/Manifest
index b6f7c9231f39..2624c941c482 100644
--- a/app-office/libreoffice-l10n/Manifest
+++ b/app-office/libreoffice-l10n/Manifest
@@ -335,6 +335,175 @@ DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_xh.tar.gz 292841 BLAKE2B de54
 DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_zh-CN.tar.gz 844811 BLAKE2B ff9efb6ce3208c52f9c4157de8541f3ac660ef95da1bc635625e7ec4912dd896cabf94254409a3b18e973ab75af69001e2e48f78ab151dffdcd93704ffa6f26e SHA512 2fc8de8aabeb91aa41baddc17bc4f8c257ca37e82a6d2f9df95fdb4ab6a6b732489159975614df0daad9d09a7dd33ad4e97471b22801b85812cb14d9e6465243
 DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_zh-TW.tar.gz 845987 BLAKE2B 0d99b01aef5dd828d2cfb23c52527313de15fbd9aa197d3351977fa571b966bdef5a3b06f7d86625d7bb4ff8987ebf23a73449e645ec125e924307a7031928fc SHA512 a1b6d235bb9e0e85d80a5b4a993520a94180abc78b11f26062746903302d2561ca67cd63441b88472cd85038fa132eaa6f0533edb47768e0e7df0deef05fdc05
 DIST LibreOffice_6.4.5.2_Linux_x86-64_rpm_langpack_zu.tar.gz 323261 BLAKE2B 6d77026a0f011c371b5b42572a7a2cc3ef6be22492b138baf29735a287939bf76f159a37898d687f60b8b9387a89f9ce6de33a14b75b83f71b16219ca24df6d1 SHA512 11313d12673754c8ec70b3dc1537d8737b5a8dd9da81389163d6d3f1d59d359f261697e1ba7d259d49723caad8fcba7638a3ff7ccff3d7efabc455f12ed787c4
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_am.tar.gz 3552566 BLAKE2B 10e0ebcb1df1149a1b3ad58a4abf18f1697ea43edeb96a9ce233cdfe9d34c8e8e359df7894e160333596601937ab7cbc49e3a906279f0946dc5576f296d9a7a0 SHA512 bb236a44f692361ca6cd7f2956a2b6d98477e055cd1b61858faecc534b108906bd25d3f02bd55d2b5f8163835c2547052f445ca66465f6e78f24d591f8ee6421
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_ast.tar.gz 3294553 BLAKE2B 752aca2a433121b8fac50f68749471a627589e254c648815526367cff1c16dc89aa69a6561b059c91820f34184a0d4f805b6fdad0adef270b6ce344e10abd456 SHA512 02181d26bfd29c0b096a49af39ca8294ab8ac97e71a1f830e8c4a700be52d75864ac5d059f34e9cd78d4027847ed08afbbbf62064034cf3abfa1779ce48fa5e8
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_bg.tar.gz 3579900 BLAKE2B 4d0e6a209979e0a800d946bb6870b176ca0ceae7190e19421163113c25f48656d84d24ac5d0c8ac81612981436fc139ce3e6d37377682b25a9913dfb49deda7f SHA512 10f86be1bddad902f96b3d9c30933d08437c86f35a7ecaae1018d50fc8a4a10caad0829396869e8c03a41fbf3528eb0176c80c1fed6962240c65a615826c5e30
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_bn-IN.tar.gz 3705312 BLAKE2B ce8ee1ac3f3fb2352b2630dffe3788a9542410744aee603e798665dc58808ad5cfbc54c9a72d97d722366535ef5fa9ed8190abc670658cc9bb0e1a8985463390 SHA512 687922a253058b22d99401d8cf59154d16f5dd2ad3cc26d9eb2c74f219c27e65aa4e6bf3db5324fa5743f3d760e846df99385d42b275c053030a21143fabcc7d
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_bn.tar.gz 3437497 BLAKE2B f6a18e50ead418e977ac2f14b9471c4da1d003fe6cf2a1560a391f3921391e0db2a81915aa57f73af07bedbbbd4b3027763007caf677af89251259847bebb707 SHA512 0975b9472e22d51649c6c5bf1ca9cd8b8c8a03efc969bc50876314b943b06a666eb0ae56d00bf718e5e6f7f15ff0c81e3a84f37ab3dff74960a565b184d90309
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_bo.tar.gz 3455482 BLAKE2B d391e10bcdcf1f1f49b9c08e3b03b7e3c467b77df648340863efd39e4dc1afb8c6241bbb2a475494e9b6bb126fcdf1b4c8f640c6a1e2d6f58e0e673a19067b20 SHA512 e74695efdce1db2bd05e14d91ddc13c72bb000f9e7b76216740c1187a8e291243c8ea320e64f47a9c2f75148c93ffb56a86cd07f4bfbedec74f0e1ac23930394
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_bs.tar.gz 3187275 BLAKE2B 35ae7fc8976c76cc8976f7827f61864e59afb38165216f57fd8271a49d18c79d246e7b0f3017da359f89d21dac30f63982a77093f35120180ffefa6fb2835301 SHA512 6300ffeaa1ed9e975a5dee32d0436b5cd67e32818645e3ea6288e20d82d8153ffdd19742a5e69e1149dc92e11642c6e9cdde344f072dab7ad899c0c16cc0d81d
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_ca-valencia.tar.gz 3299746 BLAKE2B c34da6e03bcbe175f161f295e71c3f114650c2299122737bb5a6286fc0e19ab007e4426f1933b23192d3f161b5487bf775bd9f6acddc85193752e85312892839 SHA512 304b6f2a9fe2589de954027c3caf0b48de9249c28ce1958ea085a03b9c853cd12b0202299f30ea7e54705fcfb3c3d2b68acfca63518fee56729572872f05fd8a
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_ca.tar.gz 3289469 BLAKE2B 9218be2a980eba316723abb431c6849302e5e759af63b918c28e9257872b6333583101f06fcd78603f4a81fcf9bf4bdbfca0f30dbaead72a2b668faf2fc7e789 SHA512 cd8994b340d4bc41d16633b1cc26aabad99547928bcd4f6047ead5f25db5a3c55e830e3ce7e4bab73ed2156200b85aaabc299ef734443ef2b8af967130f20bfe
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_cs.tar.gz 3318338 BLAKE2B 877075a1069ad11f758dc5319263ac76ef4a0051c594e38a41e1787f44e6ec99e3bad33f0cb5b4e47e34f8282a1469884368b06f2505b9261c052e8f9c70c323 SHA512 5aa53ac37de7a9a8784547c7e3cc9bf9c55fea69c97be2bbd734b328b8b5f069ff1a740608e4e0674e06d8ce79ed1f6c46996d169584e87667b367985f15090a
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_da.tar.gz 3238117 BLAKE2B 3d8c64a27a46cc79faa8f9878c5cba522247b1e6492ecfb5b45a8f78c7d595d9ba874392956e339cead7093116236805982b2850419f529fb60922df9343d9b2 SHA512 f389f83b00aaa9ab41bb23ff58ff2135d33fd89a5d8b8ac9ca551c4330d216e67f945984f0262e5c511c1e32e32dd6e27573c2029b7a5541a9153bdf8b1925c6
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_de.tar.gz 3379373 BLAKE2B 398a3fdfba83e0dd3cb4fd450561fee2700980abf379f5f5a775a2552c96fb8d08944a0f88857e7c342ced4653ccc7517a2fa2c5e769c729894442394665ad7b SHA512 11b48232cbe17ec2a28a61bfae21349263e4811f9ca345b3944dc33f644ad6f710c30f9e7725702e546385a8e20ee84da0d8eb064dadf60601dcf7c702e2d079
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_dz.tar.gz 3604279 BLAKE2B f87ad5ec22dad1456b5359f26c6a141194ca4268f5ee684217549750ffbbeadaa5bac10cee552434bd53ecd67e9e201e70e7356e4fe90290ead3e3d1b4065ac5 SHA512 cb8f3bec010682ac76464f198187280c9baf9c707c294e036b51e5378049b1101d6c982352f19626796a308b4e85068954ffcc575e5b255684714496d3142926
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_el.tar.gz 3958491 BLAKE2B 2c0233a48f0e577ead67e400b5f3d98e508b2397eb84174b25af898b2d68a4e708faca1ea57a2b1f6097251319ed255e53da2fc5c58ccd590015237a8a6053cd SHA512 5afd950af10a0347fcb35fc5d037eed3b91c5372a0df6e7b12fe5070a5e6d4fb089379ebbc97c90aebbf9267b511ec182b4808beecb3293cf64e1f107cce59da
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_en-GB.tar.gz 3082304 BLAKE2B d2dc411b0c45ca62b16bdcb979d1e2b9e344ced3621cb5a6e75eee083e9cfcd9193e5cbbf7c0e0078cf7860bdf524cb3a44a8507ce126a401c3327e2153aa4e0 SHA512 12f22fd0b6f4a61cc7e0c64436140bf3e138028e40c810fd4df6a012e94709b6b47d92071141dcff447a7fc171ebde7ac4e80ac0f294b03ed4c5349bd4e58815
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_en-US.tar.gz 2178843 BLAKE2B 5e94031d447b1a055f97b148c0f817dd6834def9c8e7ce8c08aeec78a72ffc850390572394590587dd90715d6e4fbc1e3bfc23964c777e9a41ea59b0fa44f0fb SHA512 beef883da0a2fd9f50d2e89ec2f0e8170cb609dd9c0d4260fcaaedcae232c5a8850644d37af4f0d691870f4d366ce1d3fb29709445e3db630dbc910e5b60f9da
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_en-ZA.tar.gz 3074544 BLAKE2B 73ca7b3723f79297735a3b5baea43b1038eb70540e3a070834f665ded317593bc823680cdf73ac71cd8467d9490902b2c77f44617f542cdafbd7523b27f30dec SHA512 9a91477d76b14fe7e21f9420e33339e10168cca4920e91b3853f827691b736d80aec3fbb9fab9b06633cda8266a464a9f0b1c110242a3ce19f89b4299d471cb2
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_eo.tar.gz 3159192 BLAKE2B e5b2400345a27df171c1c9297ba37de8ff33aac53c8bf7038e5c04ceefe8647a4aa0755d2d627863c7c5481e7232d4f3d69e8ee0da6174468a75a7f3e71f765b SHA512 8a95034256650bcba2a0b57c18ec13e90fba9fa5acd9dc352e18fd464415c519b0a506743d12fe6f499a43514748d70528527fab82190f89e6f6ee5e49dfd870
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_es.tar.gz 3334578 BLAKE2B 275759361d6bf0b7221245fd388f393e8f6d6da1f0acb8986acb3d7fe2627d471c2fa1a395c23d3e63f77ff3853781c52257647f9f4e0eb9ab93b00b05c77d38 SHA512 63aef7ecdf3c31a3221ec48b90b366031090cb6851973ba623a52954e6910e42d98bc3372f4189c47e7e4cd370f0910cbb5cd03ea177e500d1486ba588ea2c6e
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_et.tar.gz 3215616 BLAKE2B e972654949e735537cfc48688fb8a61f513816d96dae180bfe8e8929a5eed2742fa2a7d0f0f8b9f92936c1ccfebdfa1c1aa9c8c4008b3bd9d0bdbb7ef87469c2 SHA512 e420d674f0fb5f5d0562c1dc28277ad1c7ee5af56446b5e957f5e444152813c39c3bd5db743f001664762843d8b95e51ac6bcf142435637b756fbecf7aba877a
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_eu.tar.gz 3175165 BLAKE2B f1b6f546efd513b6bf2794bbb6a107cfbb4ff9d37765d7be50a7085dc972ee348c4f9ef8b42d07261ebfbdafbcf0bc2058878526a13343d7e3e158f15a29782c SHA512 8442be48f6fc8e9c656e082a1cb7c7f144dd9b22d860f3b1ccb2d7298b1761cee582b78d1a0b9bbfaf423a182fa71323739ba8c4c5b91fbc80cd6a9bde40ada5
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_fi.tar.gz 3223508 BLAKE2B 1452a87ceacb16140bf720c9865e8c675bd284bd5de1bf3df1a57847348a6d6494236ae592858794f5b6ba287bc5c8086dc98f2f16c9859dc2fb5a21e4f26546 SHA512 0e6ba6ff83faf6817ba93362266b4ed853038bab34c879c25295661e596b0e06b1df16a549efb5e1f2e6bd28c40e8c8818cd75cfd245de7d6365007d41749c65
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_fr.tar.gz 3328654 BLAKE2B 86bd8c6496478b0465ebf6b89387dd102782e53f1d70796e1ca89f8e60b70465a2f995c73bbd7c16e0f73e8b39094de7d2897d1875d2e19985929f3d3b0d3ab9 SHA512 75e71e80946774044916be8b2abceec43a2b3da47efb2323b0b36299bad5710530481fe8fd72475ce2207faa1b04590d0f01b86d5e2e2c7bdbb7532d464f26ca
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_gl.tar.gz 3282815 BLAKE2B 79387ab593966a85cfcc4b2fde70c9e215d59963345c52d27946e54f47a55109c0f582866a6a281afff833cb54aad15f27b0a1341179d5ce6513aae7c280c8a1 SHA512 3537d8c1197c9a49d381516bec97ea95ac137fa067745627b66cd0ffd7d5ccdd468a0de29c2c20d5796793364450f65b4c2fe3c96d60e42cad405a10f2dcc242
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_gu.tar.gz 3144724 BLAKE2B c2434a6941a481078d87c8613bebe1d0639fc456600a8ccd626241a3f8d12dc0ac8c2401c57fed986a49d6b21ad16005ee754b776f95f23fa24f3ff32b650a4e SHA512 a71ea69d66700e06fe6581db71a9c3c94a198f7852d222d2b9ae002eea1afd053b3007a5391488308e4783d4482ed9745579160ae85bed0244b55e0d55619462
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_he.tar.gz 2965629 BLAKE2B 4f12a88aef5dce0e862a59e54c40c925dfe438f652055bd4cf2842ffb486477a040309221117727d0cbd11d052495fcff32a006fb57b17130974db88f3b73eed SHA512 8bc4af53220e09da7a92700aafce41a00fb288b9adc07c7b84a05cfee520f826ce76a29d3c35bd22f0c5bca1ccf7dda346d502bf4d2132005c3263abcb3f593d
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_hi.tar.gz 3268631 BLAKE2B f25686b69d556951cc40e2223c2ad93ba7dc952b3f68a857c0b55cbca1b530f2bf162ed8d0d9b59abf9969d2c0072dd16133012356a6515e9407e87ae93f436d SHA512 283793a4765a904f3df7f6c18951cc80b585c1ba2928d10084f1f66c0066b42cc1f75ba690025727d820793582ac1566c7457863c416233cbcb8ae8e69a3b190
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_hr.tar.gz 3188094 BLAKE2B 307261d10b35eb2a6b29845dcb137e67234ce8c9d83302ceeb545b61e05d2b4a96e7b62880292ce25759bd0662f04e2ceb3a87fbfae5c61c798ee33e07ec776d SHA512 2969efd1f654d2ba045da1f02b78078a2ef07900467a2aad23c3b4c8f26ffa69cacba3035d5e96ea116e8e550285d4d0536d29347c73ecc597093f708ed32a54
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_hu.tar.gz 3443642 BLAKE2B 0f71af1d36bc0c62bf58de2d7d436c758b00590ac10e849fd299b1b0028675f852d8daf58718c2987b459e89633cce4f0c62d159406595dd67a98dca7a7e8686 SHA512 c6b59d28e9781e3780dbe6c03a6ca44ede123c7e99360204921f08dfc5af5be3a69be26425504b594308677f7036eab0930e2ea514136fdadc7f85d9f59e6397
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_id.tar.gz 3135118 BLAKE2B fc7dea46ed82a710160791ab3cde95395be9b50d2f2363fda5bfe1aa24676452163b808e0d4f947a83ec4e9f3b95149f3ec31fe26b83da67b7ca8a5240456c94 SHA512 d9d1a4e703a0c06eb3f6e9e9da8f05668dec6b41230f0ff21a085c042539fde13fb1658c409c0257c8b2fb4fafa8035c9c4d65eecc5f6f7c3d5f2a10b2377d41
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_is.tar.gz 3208789 BLAKE2B 88b803327d800da74b1db007cdde585e3744ea28bea2902271cdf079cbecd0d768129f008e0ef40a4cf72ab9d516e6aa9716af0ec859a990c59a7365af447d3f SHA512 b982c9e80da089f459bf97a4f0a70b79846509d08064de3105d52947700f96640ae8e2495c2e9d9a3dfa5a7dbc4af22d76508196b3ed2849ad4521fbe7b99a6b
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_it.tar.gz 3254257 BLAKE2B 0cf816c216eaa1caaa1981a68017a6dc3d6b71ef438236da314305d96d9f01cc24530cd93085f65e5a6ac1dedca103ae6b56f6d6864722cfb4c150330661b94c SHA512 6057ad53eace64940fb39a8158cf6803de4de7809b0e68b154860c9ee65561eb3708597ecee9829eec1547a95300f2c16c748a19bf40e9147c71e7501b3d3739
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_ja.tar.gz 3757336 BLAKE2B f4f773743054c6c4ff2b6bb36b1d257fd01c68f920a61d2582846ce318345cc158218b5469b6946c1db2ecb7945fcb4a96cf6e019863054bc201dfe918d318dd SHA512 35fb1abcb260d1261d029255609811cdfa0c04a7c584e8a3a3cc8585d6e9eec624340ab872e0da3d987748b579918f76a6451994547c2e284f026b8f2f0af4a3
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_ka.tar.gz 3372056 BLAKE2B 60ace6259e2b06ba0ab96e1ef7570510776717e1096a43f8534f23c29a4b63a0623e16c1a4ff3c2d1145a44196e3ea6f064d145bbf1fbf11668f434e0830dd7b SHA512 10fbaf41849d5174d9cd6feb9842dc7e31af1761982b92412d6109837720e1f640a4be2f34162df52ad56555a6eb830d850b5a39ab7e8d68c247609e616184f5
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_km.tar.gz 3706412 BLAKE2B 099f73e3610d2756b9ab8eaf136fda8d4894f5a6e4929aedf9923b682041ff48071a20ba3fd399ef5b7e2a23dfaaed823531c582f2e319e2127c69b6c9aa5761 SHA512 bc8cf14862cac93d0faffff3e997e0a6adf30335ccbfa5fdf08e6d987efbf33da888c59540a2cb79953d7527545108e9a47901aa9c0803046c19c50782dcb9f1
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_ko.tar.gz 3338318 BLAKE2B 8baa5e1de6be05360ace165561675f358be60ad9ec3ed0002075351d8e5d0ab6271bfde58a380952af1b2b45e97a53d30c4541c8cb83b7cdf2cf73d55dc5e6a7 SHA512 b022fe83d0b6af827dcb4940b7286649659b42abb783ed5534b9637634f87458281aef0d79f1b9dba83be2f28273138fc510baa61bf6bc2bb528f86e33d07cb1
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_mk.tar.gz 3254871 BLAKE2B f4618b789240e52277a3eb84c0a379b5f3e729d681fe2ed2d026f743ed1aec1e4d53cd0faaf447b8a202ef0d55001993fc54c7b5a8d61d83f525801a50efa215 SHA512 8e1c71c0c3af6fa1ac7e7b11a492dbbf64cd48b357fa08112efb2c6ca3bbe1022dd529e4b0384b22c95ea1736e79140e97d6637a1f1e7cd22020fb2f0e8d76c8
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_nb.tar.gz 3192042 BLAKE2B f384e987626d8819246e39ea8a1a743c7de2cc5a033bd89c51a56ad1b4120f0609d337f52a49e3a9f2a6131f90b8fb89772e24e9a8131d2a4cb2ec70f8e6ce62 SHA512 93c448e1416bc442e895e5d78319945878743006b08af112f11cf5d29b0fec44ef54b58124d5ef245e064bbcae5c5a70be606bbb9e3069d3a66ae470824bc9b8
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_ne.tar.gz 3482518 BLAKE2B f20b96d545c93afd98f6b8368b91c58f24e099cd460dc6a5d5148b634492605a640f60e93b4746ade836e1170d540bd94ef6ef7bb3eb3b4daaa4bc05778754de SHA512 3c7d00c069b366cba53a9e83ad691febbcbc8a6cbb2a4ae30c2878270aeccccb56909db863761cb60e39b516fe7b4318b42c80f265aa09467792b9252ad54281
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_nl.tar.gz 3302979 BLAKE2B f1a938eaf37e432a9d0a4a09d729ea44a4f39d010f57bb37e5641cf26695c54f097dd82efe8b6d552c980cffa19021a29ab61fd446a1557043b55625d22dd481 SHA512 91563cf6f1f98b6f1f9a4ab50bc855318ecaed63610611924cfa124f4223cd7c2d1d6eec2a5e0f06da86504a778e6b761501a56200e9a923ae9060188d8fc9f9
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_nn.tar.gz 3193088 BLAKE2B c7017928d5b57e096b618ebabd1c0583f8f3c87e961ac6c7c7f357d12989afa613d73542d015bf102d410db69dfd5713da89da94987dcbd90248f6134fa73862 SHA512 c5a676250bc67e150edddcb647911678cdad4a6518b22743d551ce09b1f28204c9fe339bcbb0a421c4cb5764e6b494eef29396b6872a5b9b71e4064020ea5e41
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_om.tar.gz 3258532 BLAKE2B 1b293c9ada05c68f87fee0731ba7761be94faa9a5dc317b543536e4225f081c5e3998418aa3a06bdfd3ae843a47dc93a6c68f614b69f9ed49e0cac38dbe3a7d2 SHA512 805b55b1c2d8a8ca737c7bf0767730e5482d665e593379a9c2078f9bfdc98803c9ca379023d6b0224bdb159439413171c7d3388df64f7b4eb701374fbae08635
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_pl.tar.gz 3469304 BLAKE2B 00421210a3a77580e243de3a6ea321e71cd6ad5972283a3778445cce86b53ec558e9140aec327ab91b2d592cd366d30a56964769bc7b7f1784931ac0795e2834 SHA512 78fae88828ecaca03727793ddf034c5d50663ceeefefd5f47d14e1c0968522374b955ae9953e2990dcdf31ebece5a7730c22ebcbc2515db68e6f89c0de3fa277
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_pt-BR.tar.gz 3304969 BLAKE2B b6d6257a24fa8b98ee8d6f0335ae80bfd51e566f3cfe9163b777b31a5c4e5ae20d411074bf9904667595d1c8d038dbe80bfb6f52916493cfeafb0b92758771fc SHA512 468e5d3865a1734151644a26e639e6bdee15f1e49fbaf209452b96f1f99a4753f70b143039d6a232c1a1010db4d490efe49d1bc04c21b69b45adfbdf232e50a5
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_pt.tar.gz 3266464 BLAKE2B bd1b5c4f37226694ccff2c01cec3c094eca4be339dbcbbe844af7666df5edad0e9f8726470723232ae197fbb76d94b2bf1c4aa78fce49c99330ffa8c384e4245 SHA512 1fda1b3ab574d41d3534b84b8cc73213f53673f604fdde5405d816fcd921fa13448d5453ea60f73e4ee9680181759f28418a0c27fba699defc937bbcfc938e27
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_ru.tar.gz 3625838 BLAKE2B 00b2d38daa0584a52c42c18d42966b9c9784317cb3765734fa2bae4e8ca13b319272daa624d761b25f548a0d473b02fbebfccf56e5e50423e2b5bc26b39df019 SHA512 4809615dca889f9f270523713e35374aba1a332e12c98f47dc00efd0f9e65f89d063414bc6c5024fe7395b4a190074758826dd41638d28963cfa789dbfb31da7
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_si.tar.gz 3347978 BLAKE2B ce80c4ae880fd43461703f35fd90fba718783aa9321df36618e20a770182591d4f43e187a971d100e223f2c782ce1fa6214503210af49ab89ea5b4527e08c693 SHA512 2b9094d45c811e02ed7c90e51a3c0f9de3b80c8eee730d375ecd2839fb764daca4802d7d281d4c0b0c8d4aff84aed420aad5db3a7a8b166104024b3231990076
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_sk.tar.gz 3365561 BLAKE2B b3cf327c5ef09c8d230fd8aa8c9df02a3c2596518dd35ad07d1f3e59dd4a26542143dda857cd79cb365a7b426c18220909fe35676caabd639e16b7b203a53183 SHA512 224f11515e4748e79308335ab2749ac45998704728ed2e2b6a9c956c75ea2572302124d083793529ada809df1ac45892ef2241e5200ec28bdaab2163694a4e90
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_sl.tar.gz 3248380 BLAKE2B 01d9e475c51743ba68fb6ad63cf89582cef9f941b4a9ac2de89179a8989cebac821686c67855bfb78ebe435b1696d5053710fda71f29a99683f699acb38a2236 SHA512 6da98e27f322f1795b9ca1d7ea218081bdfbeec95cfd0912242d9809daf6b92c4d7081b809b5b41ac486f9b8899f70e8023193bcc2c9ae894b23bc93e5251578
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_sq.tar.gz 3162590 BLAKE2B 7e0df43986f2ce1c68fcd0eef3e4b8db9a80e2108168602f877c5b4308a3105bc9d6c4fecef435da85342cca0bc9f88683af86c4242c5effa43f94a1d2540d55 SHA512 a5fea3a4feb206d376150cbb2275019969ea99071aebb9d5823fc445c3ab439f818de966e92855c91e1a5416d38712219f883aed693cf0d74b6807f2d1e460b2
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_sv.tar.gz 3238201 BLAKE2B 1b33251ee9eab335acf8ae7ea54a3e5db47a49beb47715f1b9c68a593633611977e9a1d072139727cc86b3c017adf6c531514f77c956a12f9958ec17202fee60 SHA512 54dd7288055e0cdd843f3e9d92511abf737ae8344aa4a4634698d2cad457ba78399c08d65974fcab2d7dc4ba2f94beba06625c100a4f0e93f36843acc51bc2bf
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_tg.tar.gz 3218439 BLAKE2B 42d8a3e97b8383f77a85dee4c92f4f8e0d102b17463b9e7776d825303982272062a178408770c58b4fda9490be582a9c6ac9105b7341f31edf60e3f1acabb5e3 SHA512 b981781889f9858c56751df73bb214fb0fce10b6f53c1bd7fe2fe796c812093dfc24fcdabec6edf99fd07677effa2e78a83216921a4fd258a51a9ed7a66be189
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_tr.tar.gz 3298570 BLAKE2B d40c27607ba5b31064455ef87f4175a0e861c68a95f44720a13016c406b88570c2863c4527b472f188adc0dff14d84c549de423adef8ceadd42cdaf5b94ba46b SHA512 a16c136c1c6b8c0d375539c6cf32853654ff4e972aea8bdbbb43e41be24fefb9c9ed4f7436727120911701e618c9800de1259e78581f56a07884c176e9ff25bb
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_ug.tar.gz 3307026 BLAKE2B 36b09893c1f8f1a93fa16f3a8fe6d99150e0a80d95e5db6e8d4c47e9c2960dccb8a24ec1fe1d74181fc73f232d314994ca2cdca4d93c7ed0fd0e6e16311c4acc SHA512 652fb2f30b31ca6e493d7f5bd5218877317304e1b515bd2d1a9fe23f1468ba7e1648d3461f9fdbb7ea661190e612f7a9a0c6e9dda6fdcb7fe4022eded19e38cc
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_uk.tar.gz 3597262 BLAKE2B 06ff8b52f1a90234d5c18279eace74777421052c02d95391c0279c9ba1586bf5c77652880a0d8a47dff0a97746d11fcd361fa6e2e7a61bd9daad56d720fca17e SHA512 af082b1ae21cea4325cecc68efd8e18cdb7b6a7a2d5a6a902cc7a465ce44f7629dc246671d366ac917e022e7408ae140315d458ae411173e3e49655b6cc78512
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_vi.tar.gz 3285326 BLAKE2B 6f9fa50ec7b02b994e0dc3a77ffa033f4c2b82a049dbe43a077eb26beb04d55fd5596018e4da0bf2bd7cadfc03af5cc1f10b1cee6568b65c2e3f8032485c3454 SHA512 6ae946a2fc6bb1e5679321e72dede57ea99fa4643823d306af668d66ddeb2d64aa727429ba87b6d402faaa5e9841b62c0e9b6ea47e6b3f29f4fbc23b572e319f
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_zh-CN.tar.gz 3395607 BLAKE2B fba902b2850831c40d2299eaada0416a08dea769d01b21cf42cd8db7cc1376b18d33c8de6e8278084e5d764653b09e9034cddc801a627a4fb4036f8047308c16 SHA512 4f08aafede40c5949fd8dab10e9ace8f2552d9a69c21ef3122cbce3e87a2367bc3846fe374aea5911f9cafe807b8a3895a50274012bcec2075542bff3f757072
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_helppack_zh-TW.tar.gz 3525913 BLAKE2B f8645024c866de71fb10c5a8550582a0bd11811ddb9e2d99c83f578d85f0e79ec862133a43ec71db34f8d5fba0b1b2ed52b6c56e5d80cd37d04d7e2be4eae0a5 SHA512 f611d8c1508a8e9d2aae3f7883fc0cb2c3370c79145b3ecbaf0091819b66c0bc493d8d41579fc20f9cad03b42095c264e3a1681fb9cbbe2bca834fa06c8232ce
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_af.tar.gz 1125331 BLAKE2B 465102dd2a2a8ab785547bfac27f4d2fd5efe91bf02cc06c9a65d28996d6d489f865be689de3acbf2521d3e0795e5f3281e2bc1b2e5e359778026f0a224f49d8 SHA512 bb57fd7717246dfe01c865f8bae397e2d1770dadd6b23b0d6e1fed51bf3a3d9f721e2dde6896fb5fec7bb59bc12577473af1845f2711ebac354fe3f2647a4f79
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_am.tar.gz 771641 BLAKE2B 8088674a585059a0baf901976cbb0466a50fb2fa2ae83dc486ca1b2b7808b5f545a44cd88f2fd2e3ec92ce5ebf7f311491d2facbf7eab7f979e44bffd1cda45f SHA512 a9643cec49e6ee2852fb8990af749df8d295ec876122090d4ef367fea7b7a07acba98ce6c8aae2941d271fae957edf18883eab6277ed4c4279e605716ac658d1
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_ar.tar.gz 2410517 BLAKE2B e34711d8fc79a2eb26b331fecbf7488c318a402341460004aec669479eb3ee17bebea12f8cfc4e389986665df899c3289c74fadca9eb515c68dfda8cf4028914 SHA512 1f252a160747b088575fbea74b17a0593451c2509229bd27414ec99d5c68ea806589e56f3751c0851b3c405b16c03f956c7dca6ba0acb05b8aa35d95cbcec0d7
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_as.tar.gz 529968 BLAKE2B 9a95d74d7e4d2f6f9bafec6004775c12d274d9e2fbf255fd6aae89a721ad905b4bfd75d2e6020fa03c5da3e3894a0cf6ccbb1582c2d59d2995c203189755e942 SHA512 6cdfc86de3b5870fb9d724f70b4ea8fc62fe53aa2bd3192f3a1514c34022e871f325e8e73bf9387c7c788ea29d68705c456c6f04a0f710907786c539c1ac7e1d
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_ast.tar.gz 491595 BLAKE2B e175969f44a7b442e5289d9f192a870b73b5f08048dd42c3c85a0736d7be1097e54aca07915e95948652f0e47fd57b10e0b4e4cca45cb1e35665180118bd2bda SHA512 2ff406aa00ce9c12ac94ee9551c6fd877d325a31072b410774235266dc71f5943b485aacb231e575fdb3427414cc1cafd399e91b64d84509edf94c5b6b1bf231
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_be.tar.gz 1048969 BLAKE2B fca830c89a1e705b535da960e6564fecdb51711fca6372b4a30bb9e83c63dafc4287cda392d589f83197d1987f1740e9ef6f9b9d3be5146074de608f457624a2 SHA512 463872e9d58ee89c477aff02d6baa74503a97abca633120f71ee8a26d8233aba524c27319ba2f5d3f14ffc7713e3d72c932abfcd3c52840645f1b52a5a927d77
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_bg.tar.gz 2487720 BLAKE2B 3a11a110285851e16aa31ca918d5cbdc518f0bfe505eea83fd4d65f31f211c3bacea61d62fd3b13dfddd9fa1171626ebde3128c4c2af0c3fb3df9f514b9c5d5d SHA512 e85f27b743d38b3ce03fc2250ddd5a9b341002e0f5d3c6b03ee9993d54aaf29f15ef5d11647bf9be955e5f7f92110e44c7000932ee612d7c087953e3a3cc066c
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_bn-IN.tar.gz 643845 BLAKE2B 6c3326541224f4570584654c945a4b20651ddba5d22d2dbeec360c94d108ef4affe2a8bf7432bcfde5bd04c172d867809ddfdf03d0dc0857a32e2746b9fd2ac0 SHA512 128b96bba53139fef45f89597539e0fd55e2be0fa85d1f56d12862a061b0394e346b5a2bbd683717e4ef21fa935ebbda7e518557090c72cc3b5debefdf95305a
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_bn.tar.gz 789548 BLAKE2B 3f14041d5dcffaf0cfc2182d6e9cc0b8173e566631bc59cb718a064fb9fe7f7bcd57e5e473ee025c1876175730117434b19a73bd40dd1322ae55b960cfb2fc5d SHA512 610c74f83f1fe1248dd636b962a1c9511a14b8718e5929eb51961c8f9f422aa3d458b58838bf85a7bcc1fc60d50d9972be906f2f42bbd3be6c0460a17963a8d6
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_bo.tar.gz 382543 BLAKE2B 4b80988f44d0442a19e7a90424aa79b03bc3b1c586863fda38aeda73560d58eadda50dbdf6f0d00740b4edfcb7aaa39c17ceb90fd9dbbad104710a1b15be4a10 SHA512 2b82d3ab8f3397843a7a8e8f89da05d1382b556f267888d41a44d9e091e1beebfa6f09e28ba64e2934b51ed6a333675fb82e6a70ad2bce6fd81e429a84341985
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_br.tar.gz 1534315 BLAKE2B 9359697810ab9c08dfc7a0ede39390467f96b64c306181a1192aac9d4126aa36e44c21415f407cacac6b9c7b8e0dcb5abd3bfdfef7b6125b5860b4f4060c5160 SHA512 ef1be437e712ea47d3a802bdc1db30f8afcfbc1a27be3a97c5afadbfbc57d7bbb5db7f4372f8fc953c9589d6597ab53cfb3e677b2687cd40225f8bf6e1567568
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_brx.tar.gz 339486 BLAKE2B ba9a9bc0b38be48837583e83e360f2e8bba0519388b63f5e6992cb59c3e221b8bd0caad80ff84a6ac2fe33ca506b0ef4992e1c202e43733c23b5c0eeba6a0dad SHA512 23a38ca0c1e3f5823a96c5cf3235543013e5fdea4069c270e49ce46bde472e9f7ee98dc3b563908f038d67ccbce5aed9f2bdfea539b68bdf2a2c08a529bb8b13
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_bs.tar.gz 635680 BLAKE2B 2fafb7f9e4198d64ddfbebe73f085ec6834cfbfb2e0711848cfe4894ba6c9b618e8766c36cd7ac17e9e4533d8ce37aa22866288407c2590532480c70005bd48c SHA512 2e2fb2ef756edf2d5d64199f9ce0add97bb66458d4c5227e34ad3c80e28299611be5b418cc0d85d64b991a0767bc53ad73a8b376f3649a78ac604e71e1a068ec
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_ca-valencia.tar.gz 2045806 BLAKE2B a50244adb60d7b8dd28d178bc0bdcd0912920df30fe38fbcf2a634ba4e103336efd8de53421b6ae5e3e30992f119439e5d6ffd3667bf6729e9fa0b286df0b0cd SHA512 a7f355178703c71c42e874dfbf06d5cf4b63f89c8d0a82833e6b9a8627a860b1eaa21a079b977dd27fe1b067976d40c9752de5305654b169b3aa7eb5f60f0c31
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_ca.tar.gz 2058253 BLAKE2B aba7d4a577bd9c0e51a387f4d28db2d11465e524e3772bddf0691286a125e3faa8c6d2d219945193bb39100cedd0c2fd9e790b8732efe9d91db85bb87d2421cf SHA512 4cfe0c414a909e3448573f8392be6583aa6700d077ecbc69954b23d0215b189b4aca627b960eab5df4d8ca07243b2d7ac4f3306a7ac68ea61227079b1f517650
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_cs.tar.gz 3227773 BLAKE2B 9e7de335fee010175365d70c960974703971ab7b431b543a3b4990f82268a470848f01231280b5df399f556259aae3a981db56cc24ad2cabe6fe944149a70293 SHA512 2c324b225369fd66d55d257e30d5fa5b74e2e3266f46349ba04b25dfcc388fbfb3a59447b3cb8fc65117b864c425fecb034c423135a702a709ca54d5a1903b2c
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_cy.tar.gz 766513 BLAKE2B 2526be7ec703f7c1349223fdeb9951db99fd91a0026ef208a36b7878a6c1abf449fb22392afbc5361e25d9802db952837c5cc185d33bbb0b899ba27c7e49e728 SHA512 41601b8548601d1af007c5c50741debb5de4f5566a1fbe35696071b85d0b9a7b619ab5b2e4a45dd90c339ccc292ff09c291ac01bcf4592f347212860cbc6a29b
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_da.tar.gz 2865234 BLAKE2B f5c088c8060f33b97d77f5c12969c7e1f46360657cfd83aadc77b160e4c55c214225f424adc2496cc652a11bf2acec1be5fa68c4701dfd6e411bb0d9913436aa SHA512 9558f79d51b614b7413ba3e8e76864fb3450efb50b5cf718e558f1ef5ad017d663060ea1b7e2679db53b8b1d202945c65887b06d7d17b766c349db6f5cacb010
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_de.tar.gz 21794850 BLAKE2B 1c5c93633b244daf5d90fef7aadee16d1bfa5a1dfc9e8619c0128ceffae25d43894841c0609b1e394484c0c5b9b32430da3643bae898431e58476df63b4194da SHA512 7b1d0f6c2cdd99b803dcd0536a003f91752753ccff913a80ebb197f9dfcca352339efe17243f71c1985689b829bc226afc0f446a94cfd09fe67c52086a0ca3db
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_dgo.tar.gz 441219 BLAKE2B c606b7873ef2e0c854d42128be596251124a27b42b6ac887d685de9f24dc23ea6ee2bb0aa3f72b80d18dcb1abc3b2c25ebe0782dc01b734c49493a5773a9b340 SHA512 e6eb317f3db468ace3ce45eec82bd48987309fa5f92ccde65fd149f77a26581fc82680f68f4e53dd1640257423c1512d5347f77907e7b3b0e6f8273c85e80613
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_dz.tar.gz 369464 BLAKE2B d9a713b00e0990b9cb0703fd966335145166cebd8dc9c5888a89c6f1ccf1a1db724f0d351d7e05b46204cb635656f33570cf45dc174bd9c609fcd8f7ac5b20e8 SHA512 a73496c3dbcc7cfefcefe8942d3c4178e2c569e6c5932d3e279bae911655d0f7e8acd3252bc3b241507ba521c7afd20ea8d0529f752e05f815471e8443eb0bc9
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_el.tar.gz 2875293 BLAKE2B 39d9feaaec32fa24c692363552c2bf2e3595acf7db41335ebe54a135a6950f0a22a47363701d13e5186343ceaeb688125d5411544bd5684364f4fbdfa5b4c756 SHA512 9fdc00d85f717412544d0544cad8e1875b6a36b67365f345d2663d24dfe067cae1a180395d8babf7d8f217db6d076d2643007f13165f2ee9288009b04c7e5dde
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_en-GB.tar.gz 7379672 BLAKE2B bc7afc361b47ec7aab20e9d957227179c0eb8e1d534aff867dbe1ab61303364fc97cb6143a34312bc6882755083ee1e00c8513060f9c4041bf9fcc5eecaee338 SHA512 bd0603baf16c20c0b95605a6837a4f73c2f7967ecb33afa9035463a90a5996d567ef07168584138df82513931b70fdac732f6f40b58f86f7254de2734de4252e
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_en-ZA.tar.gz 6930208 BLAKE2B bdf172c20531abd3871adcf845d6e886a0dd7ef63ea5b5c26f5b1521f9c6169d0dcd43d524083d75facc53a4fb585b1a623aeecd1eaa78ef1f2a9cdf326c4a68 SHA512 f6ef493180f917a4ff534bb9f2727051d2915cfd8f6de9480c5b224751452c9860231fccc90ff1bca01d31bb199f2a6370835b11a96056787e20f10178c62e50
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_eo.tar.gz 762771 BLAKE2B bc934ba16847d17a1c1efe7929ece3fdeec20496b3a1a8cddc6da578b60d81e393466628117422c405b2730bf4e206ecaa2a83274acec8ea62ebe93ca4616664 SHA512 ba5ed92e146777219854e414614e40ffa6289b20175ac628bb0b9734e78c779816faf8372b1429036a6684a09e80df260bf609950b9f08ea12bd01e8d7118d35
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_es.tar.gz 2278080 BLAKE2B 795e8b1375f3db7c57943886e2caeb19748776ef2da67270d68f65c671137ea5a6f595b39f651fa1aecb32ae4dac4185858b806876278e113b22f31c71a75c2f SHA512 dfe0ae6768c000e9fe8bcd4e8db72dddef6a65a38e52f1601a35542c28b5715cf263264049e45bf6133de91b270b0171ac7b132b3023cab4bc5e0a6ce16ef6a0
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_et.tar.gz 1677620 BLAKE2B ff01c38d2656732dde2f519aadb3c8789ca9fcab8af118a809cfefafaeb489feece0db3bce12a671972f462a2c389385bfb4a6b5d559a48d0ef85d9b6f3c4bf7 SHA512 80f180ea61a72d96f00055d843b83424ff973e7ef282e23c855be0ecf8dc972f0ec17029b1e63ad7b542f03cae9909fee7c07dbcc413b609c5fe11ae0e794220
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_eu.tar.gz 771844 BLAKE2B c846df09e0a1637f479e50250cf9c7f08836e93f3b4884ab4227275bdc7dd88cee36324c3acbe9ac0aa334371a537e0451efae995092b1dece300a2368c9ae52 SHA512 38e575a7fdbc4e375892e3918d52831fad2e59af593e5065ad857aa89946ac1bf41228b088f073d183589763025b228646d7854af048c39d2cc2e13b968aad46
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_fa.tar.gz 339530 BLAKE2B c700f270daaa796b96e2ed0266b86354d016599e0c4d54609189c4fc4d2e7907c66841a622463dc39c1429349566d017707622f738e3e325d1aaf0a350947dcd SHA512 2ed86dc31ef7f5c0cb1988d1fea6a6119045459058bc3fc9fe2ee1eb2a0791295c733a27777bf5d97814219b8c2c12d6123cbad3b6fe24d78ce5fcb8cb7b9773
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_fi.tar.gz 746395 BLAKE2B e7e7b30a55e05a2c3c39226b9f99d11bb5a9a874dd46f5d32618de226c136c14de11682c1d9dd7a4c57b905b6cf01b9290426304932bba629a4290626c873f7e SHA512 837ddbacefd3123ff0fd7cf771e3e61ce72a258945c6754aa5efa79e3a9e1dc9cdc8106fb07bd0e064c660218b0b70bc25b8f8161cf4f4714580f06799d66704
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_fr.tar.gz 3074273 BLAKE2B af38ec29efb128a16696ee0bcd055265df1afcaf268ef24657baa4049d4ccdc76f0880e2e38326ac70d40e124741a9ae804207133c8817e03d116b6c95970ee8 SHA512 8bcd749570964e3ec629a3f32c955f8b6491b5216550f4216f2efd4395c1407bede8ea37b08bddb2821444a0aa224ff5fa2df59f50b76eb13f21a26d1a867a0f
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_ga.tar.gz 737454 BLAKE2B d2295cc0f4a1b8ac84a15d1e14d9a228332fbfedb658f0748bba6937339e5a412937e97f1db6d269aff243f54a09190dd018b507513bd7dc57916317bb7cac35 SHA512 fbbc55fa7da06b80600aaad8365ec9d613c96261878aefada1f0c6b0ac82cace778a3e7f81289db7aafbedf213623be33724ec43911d8ec1f21ec458b03d3b33
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_gd.tar.gz 1792202 BLAKE2B 04526775fc6db68c5c5e4f7348095eb5b3b31495c62e8587f8c9ebfee5d5046fddcee23f8764bd9f91503173657760294cd90596d771bb61b2ce2a48ff02187d SHA512 ba1a044963cba449cd2263ffee497bc9db5f33edfb948d6aba2310f58208d7a3d38ee87db649f4a30cc94137d1044b11454a1c7bbb350b9c36fd586f62f6e203
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_gl.tar.gz 2664152 BLAKE2B b3dc5a56ad53c74518e4a6633b2c8ffaaf7584a37bc6d2eae2d71950842e0f94839d5339cd2340e3d2042acf4afb6b54588ae016d8a635ecf9b838c3cfd84870 SHA512 4a4a91ffec419851cb33e5345eb0787c529979aa55c5196638e6a1cc4d561b605752bc508604dc19dfdc4264b09447ce0a335c7eb3b8dc0513446ce0fac03f6b
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_gu.tar.gz 1227328 BLAKE2B dbb56480ca6fa5ed79c3292729ca33e8e191ac43b3dcc206c28e3954acc16ab8e5ec0f09ec031ea7753e4f8887b93fa4c87dd3ee672b9b93f8aa3341d590055c SHA512 a5c3b20199b579b184463f4efd50dcabcfdb5291064b4f12b67ac9b905f103db952af067195bb8678e4e9eb1813f159eaa7cce354bdf1cefb1105e5d3e68b6e0
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_gug.tar.gz 520854 BLAKE2B 604fb6d17b9f61ce0d42b0eb8581fe30b1afd5d721493fab07b642af5582002c1eaf69c6efd89e40ac9ef2b738b76edd71b24438b152505547dbfe9eeac2145a SHA512 aefd7d9c98f7bed9037accab54e4a5e3b3b62be06c61a9e18b790cf3a242d760931f1f00c931a90341dd2d6a64b965c83b1e6d56c29a340434934d0455cb24c2
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_he.tar.gz 1654719 BLAKE2B 457122985c8e5a8643457a804470f4d50de596d661b77ca0e322d213df728d66e45afb9004053ef8428e8bc18e62930f4d46013fce24eeb34c4ea80797a9a43e SHA512 931cd86fbde5ecf05bc2fb0055e967a30a39a7da2fd42ad3523badf9db32ee14a1280564758c0f70b1ee68b553bc01d965ff6b23fa4ca884a013e382a03e4e33
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_hi.tar.gz 570003 BLAKE2B e0fb885fe1b3dac6f3ea36d5cd5af1ce81801c7a3f932e71cb48d8248edc90ac621848b6eca5084e96cd82f5f34c9df515ab02c60845f9737b4997474b8ed318 SHA512 d698edb5f5b90a9f48526d52bb65dc8716ad9150cd199972c22d146bbee96eefbe91dfc39798d03563722f1c5a10bbb944995578aacfc70d947e25694240d8fa
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_hr.tar.gz 1005131 BLAKE2B 02826ce9982af86a8aeb172649c0346d5a00cfb944522cc7e76f5311c2fe512a9c526394b45b57f5139f8fc784bc8a703d401029e74b34a38c719b7398f7d9be SHA512 a66a3ea07bd287a5f142d4dc2f13149fd1f6045ed7b77f6592aacdee7ea856c430228ce8f988ea36dab3b2246ac374147a6c7f90507c288e4fb100f54496784e
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_hu.tar.gz 3044216 BLAKE2B 3d03a12e1fa8a84aae4b35897d28c899305e35a808edc1c8ff43268cbdf0c727cd6224ab5e94384b5e719e09235eba33a25f37e28c0107a2848f752f9f0013ee SHA512 62ae33b1ff36702d84fa381907b089704f1cf3125b8c878ead34cba1f836960c8146d2253b5739d562b4a60a7382b002cec716bc8ae3f3110eebd4858e12ddf0
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_id.tar.gz 1630101 BLAKE2B f7bcedc669cf855684fd2ad2a03abf075f4a64d06302295450c4dc18afd509fbe9988da22d20acabb28ed87bed918a1bc4dcd0d1076a6c3e8daf0bbf1d17b3c7 SHA512 1090c40337d95d7e07112e3190ba39d1a59e734d4524db1b91e3ac66d45ad94048951df552431313cd2655ee30c1ac5aa751e83378d6bca916b0582b2a098c74
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_is.tar.gz 1540182 BLAKE2B 9f4ecbe85f9792145a6f4683d6b452c59c9de08a0b341c342078b9da894963a030c9b2830eb319557dd8a412b6f596cf84a1656ae596de0ec6434753bbbca83c SHA512 4cf8492ed3726b1818dc45a990c33b5c26a4db76a34da10cf2106514210e63803f3b41bbee9396b2bc69eacb2b0f7f4ffc1b0a18b5c108f5310f628310893ec2
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_it.tar.gz 2106150 BLAKE2B ca7f2e8db8717680d3d5eec8129d05309b461d0c772cb8d4c6b5c9d86ab9ae22a6048c27f0de519db71f285609df454fb1a5af74b3f8c37a4137014893beb7f9 SHA512 115b31b70038a315e43fba53f5b95ab91fc929f72591bb896eb22423e0d3941d1a90cd9f986f891aac218032ae5d8ecedbe613244e1f66a199c38005d6c4af07
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_ja.tar.gz 825453 BLAKE2B f831f32a2741900a4274c3f48d5b78490338381584299b5ef329dd08387e2895aca1379126fa470955cd5b7ec093c66297a921b7fb7590bc59a6b67e3191ee8e SHA512 55d54ce7877092e95ec02cfdfea09c70edb21e4e5da47e03c4bec4bcaeabda9bc95bcb0d1b648e4878b1e4c349bd46eea11b468082862b077d0c18f977427e03
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_ka.tar.gz 361796 BLAKE2B de84877d8d936b206188fe1df80f66ac7a038390c6e4eca0364673fb46166bbb6004bf5b736b622da34cde2e7479d1baa1b339b5d060169c2536c868abfbe0bf SHA512 ba0d4d57c606e3c0f1350806f7e376da93180f0587eb513d969a27175849296392715104231691e6be70775868c15d1a8b582ee900dc0b43a9adb6345e1a8d10
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_kk.tar.gz 829501 BLAKE2B c682f29dceb68a25649424fa4278062995bd4aeaeda73177b06f2841b5df76290b2c634d25440f60b64463fa1d1434059fe0fd9442fd515c85ea4e90a106581c SHA512 94a9f9d5bb2bd965dd823fa1e1cb11f8bcf4e41d9f3674f394a9a19263e6028246c0d4bbcbf19d9b7a5bc17a34c6c6d077702adb615cb39dd4cfbbf06366516f
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_km.tar.gz 676255 BLAKE2B bc72e5982d5b5121b25181e5188b299960ca40ed84309b84fd9ada2a0f8d6be0f6a5a8cc93e37cf7b3d23ece7864b632f711005b74adef3ee30c664f587119cb SHA512 b35d91d14d814ffb3ba30ff5f426cf480e3c74e7cb52097bb34c917668d6cf097978a8320c09a8d8ad4161b915ffca507e2d000e05252465fb8dce798eae1129
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_kmr-Latn.tar.gz 338983 BLAKE2B df2d2145f347ec952783ac8d6b238143045a66f6088bca2ac0e79c09853799bb15d0f6f5710d0719fe5029d01f7e4c3992b4e850fbc6f9d8fe84a12a2f3459b0 SHA512 0fc2e69e98dbee07cc1c34d98bb99cffaeaa67376c9a01baecfbb2424f6eec11c77bcad70c6fe52499e49488384ebcb9b11b4daafde94d0c03eacdf19caa2800
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_kn.tar.gz 582845 BLAKE2B 617db29925890d1edabbfa40904b5f925f77ac310ee30b72743d92e0fc60cfeb8d1d262979d9bf112b9ea07446a3b8b2a2affa623af273d236674a34683e6286 SHA512 92623fc87aa74661b62fd1df0a4c6c391025db4d02e4b22e19ca4de94566fe434a88903a4ca5cddfdacfec6ee5a36074e6a90b3c778481b576995e3d11799736
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_ko.tar.gz 801804 BLAKE2B 12a5d41554274de2d8ac5bdeb191a06395f57a39cb3a9b74757a6232e0e7dae58dfbeb0ed6f1c2ca16ddf6dd91e129825230ffb747095356c4221ea489322c28 SHA512 8268e66d3f10366b740a33925b8c2a67a8aafb270bf1f5e7eb8e0286e72bb17469e4501b0e01379b27dbd6f6e5ba076a88096eefeefba853be9440cf40784393
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_kok.tar.gz 413983 BLAKE2B e2f792cc03c093d034dd251f4dc245c5c946a90ce185f6ecc379e67ffe3a0371871235f0886bfded26161331d2de7f7f5713df644ff6be8faf2440dab596a707 SHA512 dd667bf1e6d77969dad19a126be8376b76bc8e31d1ad08f296ff3defc01de77246d837983fd3b2a604c338a7eb78c7e61a056d824af030f41cb843d40e2e9415
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_ks.tar.gz 332634 BLAKE2B f74f1d179c67433504680b21ace9347dc57abedd488ea8808b296208f38cbac87ac3d2df6b819d0dca2f9caf2fc355db1bc3f4018d6995f7b99cfc26725e8897 SHA512 1166b7f3df6a8256c9965a7cb89674e248ad16019f92d07f6df72a960e06fd634b5e0f84bef820726c9791538824c21412c8e33bf704be9ba735eec5815f8315
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_lb.tar.gz 147870 BLAKE2B 2a586882bf80530fc1b48c67b4cfa9de733c90a90deb198aeaed772e243682a25c6f8a672ef977709651c115a3f28b7743814d35464d9e98e238059cf6db8220 SHA512 f91607f5737309dfa8f9749608a98074628bca07830e42728fee491306df2c7616c0eb08c44de042633818e471f4237bcbb4b7e490c502eff1cd1efacab6736b
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_lo.tar.gz 435574 BLAKE2B 498db91a5858782870ef895440816d88d71031da9258923eccc7340243a3f777b01be1d8658a7e702600c24da1752316ac053fcc0ea0f13fa5e6ccc6f2a3bf04 SHA512 0e6103babfb6eb3ff869b876e5e6c0cc2c48494c9ce0dbf7cd7db9cb84405dfb129f05d4ac51e5bdab5bc9b7520a28233a5a07ea53dfe11b4e932615d5828b75
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_lt.tar.gz 1073444 BLAKE2B 5154424960cd205e9a852b0f4e03d09faf0547d2c08b92ff607dd8839a1c27a1a80dd1c8a1aa9aed2db7c8f77f4df1dd1309c9071be71a507eb5d5a9b887c6a3 SHA512 218a9bad8e9a5cb61fc14d853add6072173397606c0e32c6949203b399fd4d1f84c5855445d1a9ea56b36591fe09f57f275776750f1c5e49efb6a2015d7f405b
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_lv.tar.gz 1510402 BLAKE2B 73ab5c4fd231290efba613ec21b22f639576ae2f7cb905aa5730e6d67b67b6386aac350009e08b38a5401f8d7bf40a2bfe3397a29e6e336c26335d3783e900b8 SHA512 2d1c7dfe8612f6dac19cb7ea7e87f3121e56de72964def19fed4af6f2889a412015e725978ef81451db722174cb99b87cd9a386471ff1e224e320e3d7066c086
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_mai.tar.gz 334565 BLAKE2B 4525150551890f12230a602066c55bdf68334c9c65ecb3eb3abd077210ed54b74eaf371121862705f124e5a64f1fab5181f6ae4daabdcdcbd476d20cfaf13089 SHA512 085c862a930a54f72a78d16275c2fcd98fdc5f18054df04ab38f71529c05b3e1fb9130e84de3c7d1d3f13a27a757c15cbfac286a843bb30d60410b74a56cea67
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_mk.tar.gz 386083 BLAKE2B 64b654252281d0244c5a443646f91ba366f42faebfd093a2bf752a2dafc76507271c32e8dff0c980670c4e608fb72f2aa570f238032e67ce5cdeb2b0f083cf70 SHA512 046d94e54a16a47cf732b257db5cc1a35e1cc22b75042547758838ca236506b956c87e400c1392f205836e8714f0f2f10bcc42164d3d6963eab0ef653bf330bb
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_ml.tar.gz 540989 BLAKE2B 1d79bfab2ec2e720b11eff56c965b1f33dea038c8f7d1d38fdf624082a2d811fbe882acf7036770e0852adb12a40f5b9d6bd208320f77f938c9ce82efe42e086 SHA512 5bec9545968e899f4a39f78f1d628ae878c48f3fb0fd8e9f99ac11bda414d68963cc0af53f5945211092f671a280cc40546953040bec3caf9876dd7b7eec8f1a
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_mn.tar.gz 583797 BLAKE2B 88d54e3569c6538ac399294be66741d1909ad4d483e9b2ee5b4df449c0bdbf60c794603f28daff93aac54e332e954b98e4801093ad957bd6e3528e2e30a6b444 SHA512 dc8455821e43e9a36c35197340afe5da16f5c860b61b75b3302058c1ec5daaee481c475834e937714a59aca12dd0c517c31b0537ea595a58627a491ba1877baa
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_mni.tar.gz 404454 BLAKE2B 720b99c21b24000ff52e14799fd9387246602f625205b701cb5638ec823080f20b3325529955f64e65e09b03a7d9661e446d0f1e2d88815361b2df220e08d9ee SHA512 ac274e3337eb1d9e5707ae378422e7bed8b894bb6bc10979d00d3b23f83bce92c89a4c60806bfc9b6de1039896d613d0afffc4195e69c6fdd63e6505489e51d6
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_mr.tar.gz 575861 BLAKE2B 9b2db9b5c6693b40c00e05e2cb6d0005e524cbb3aef0675af0e8185be62217b9bdb24b030bd7bc028221367ed1f0f8c0207cef39230753e1edd1013eec908554 SHA512 483b5a496173aa5f94b260cc76fe94405a3553c100841bf6db34fb8a281d89f8d754cd2c94c7efb0ce02f3207f1b63484d039374967552689de5184c79bff98d
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_my.tar.gz 465583 BLAKE2B 22ed0bd1ae5fe37b07b2b41223b9a339d025aee41b0657df940f1240ec7141a87edb5922ecbe2d2c3e8f65da9757ae14de8b056a5e7217cf5f9bc71c54b11779 SHA512 066507d9e9a28228e1385580a9af6d77afa0b0a3480c669efb682b6ebcad056f87de39f1a361761d438ec67cf50ff9be10e779c19d084eaace388466a82504aa
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_nb.tar.gz 4106808 BLAKE2B 8f9fb276754b0abe20d997e733754281bb2d1f282bac063706788b4269425ad07a049fce58940a8c3e49d5cac8a276ed80f12ca80c38a196f8247ed133385fdb SHA512 c7dd8dba05576ff29295efeee7cfb6dcf64aa792d363e140c131e5e60efcf54db184e40f5fda3b11f2fcc3e353c0ed214c0a4f578eff0186bdc838831fd250ae
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_ne.tar.gz 846015 BLAKE2B c1ccbf1545e475d7d4189f2522b9aaa9209d6dc806c171789666fc9491f57b3820190a30c68da3a7e8176b3d66dc229a3a7ae10a2fa7e861cdecf1195128b9a4 SHA512 f118313db3b466011abac3514e2ba629452cab83f5dceca6f0ec226a334bfe631ed65a318c58fbc71b97b1505643d1e20e56a9e2ccb8fab167cc3b723a6aa160
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_nl.tar.gz 1561359 BLAKE2B 41682e3f126b1a4e816a9ff673d3fec6a387bbed93bc9858886d1f26c138a32e048a8ebf844799e0cf708bd2cbfd0f222ab540846f5287f190834cb2d82bd94f SHA512 8987abdfe024531bcd1ac47ec5bdc844b8a63cb177507dcbaff8cb65c55f950ea667a47c2eb031cad81d3134ae600379cbe2da2027c8c42ecdcdb1fa023a9c6a
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_nn.tar.gz 4106270 BLAKE2B f760bd6c5423e878e5cd70ebc8da49d82ccabbc2443b6433e3d8e99bbd72eb3a7da98e358deb4725756de926d9590c31f1bcd14dfbc46a4f99ce263622deb52c SHA512 44c5a56e8cc325c1e47608bf2cc57f5d9aa54f3a159da867f0d8a45eb43ff1baa8aa87e85c978004fa01ce78a34906c55f28f0972be80246cf7ac721500891f7
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_nr.tar.gz 281641 BLAKE2B b3e901f208e709d2e7af97bf39c238e61a1048e35b38ff9faf9223ebd53c28b45d23188996c6f51c2aa90684d87c76d887463accaa14f2077f5e0b104e0c7466 SHA512 c6460cc0200f3f8a0d4dd84dbb5217b7be7f6789b1111fb2d4b145632d2d5d612042fb3e3935f6a9d62b17befc0165f4ba91a6db92d788fadb36262ad52de27f
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_nso.tar.gz 325216 BLAKE2B 34fdc426ffd775784376a01ef3ec28e356073b25bf9df70d320b3f206f1c4d5f7a02cb0ed3e58651615b474ccde858106512278ed085bef297a242a79313e93f SHA512 186cdaa671f3cca06c8e6ca88d6d1985b1228516104cd8722cdaa9dca6833e4f325286bae64844a2f82d228f0c6f789c8a59706c7938ad368b03d89c3c1fde12
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_oc.tar.gz 885097 BLAKE2B da120ad32e005340d5cab2c351b39051c4cc8901c14d2e64951b93d52280ae76d09bb86150dd9674cf8c03e9162fa7919d61fd7d5ec40582f0ec345c544a2ccc SHA512 838075293055f26483e71833aa0f12d0bdefc1f35cf248e15948767677874aac177a93696042498adf34aa3db5964c0db843023f21c5bd5a8bf0672eca8eae28
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_om.tar.gz 373552 BLAKE2B d68f56f1bd5e5da30755128d33cb39338da6c02f6da510eacd280ef9d4b4807db1b92a48c9a8a7578db9e2140cf7fe0e81fbdd35a501ecaad788b76bdb66a011 SHA512 98fb9346568b5c07c7989426eee535ca75cf40a930138a21df61803997e6c7a2339b2bc46adfb82baf7d2b2679855ca99d199f539e7e74cae09ba1c77a5eebef
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_or.tar.gz 598809 BLAKE2B aee920d708bc3a5a11c1918697a6b263f568f79f2138c64a3c05966e7062808ac65dde056a07d220b277505e652c0851a81cfc743898cb282aa8660f7f2530fe SHA512 bedbde3e9df5bbc0bdbd9ad897d99152343033df8ea0e02f180b3e307e6fafe7b69de2bf7c6220b6baf016993831bd8d9b9522176ec64ee3d52e6381f62069f9
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_pa-IN.tar.gz 475904 BLAKE2B d6dda6cc049383ec13247c74edb6420dfc547b989fd48f76e6b6d183bfd9d3ada6451b8c04ab97fce74528fc0a812a4c700d1bcaf92681e5f0857da2474da5c0 SHA512 48bf1e9397d95dcc12a26a57d1e49fb0b2ce76036d3d900848dbf143f6677b37e8e08b4c4375f446948a760816c50d01c43d203bc2ce1e9b40a8cc1534d3a90b
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_pl.tar.gz 3133264 BLAKE2B 190f592d1caeddbf27284c32776cb892e8829488b34041a37cc6be0aa448e1d588b12696b7551735497cdedcdcb14e4f1c906af20b27c3a74aece3084e62d9ab SHA512 c8cfe01cfad6572e258e42db72c095d779ea5bbf4d21b8b611fbc4d5356dbb3db00d4b7a3c63bba62a87f761d38cf29d3a74bdae8e811aa45ca2931bd8b061aa
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_pt-BR.tar.gz 2853689 BLAKE2B 92f4b5f423d4a315e08f0f004fc902b42f9fbbc3acfd4f8a5c25600c0e18d7f5c46186dfe61eab8dbe440dbf8b982a0a81751e500febce0aacedd5c4cc8c3cad SHA512 36f9860576ac0431a670f49db381fd4bd83399537c8ac7abce84d723ccafe8373d2a35998117a23a1d36f23aa59a92254dc0af00c55078ef2fb043893d60de28
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_pt.tar.gz 2408074 BLAKE2B 35c2b242c72b75e1dc382030309d6c83f87e3f72f3f12280fc31d6995e6092810f9d379d990ae3c7dd5ae87c25d51a4823a13f34da788f647f4ff1fa69cde86b SHA512 b97152b09c3241da095848cd79400a5c1209dcadc65ece8ba3621c28b513c2dafbbe97af4d41268f9f8f69cce29d627df03d6952a72f4852eb742c2c1a9b890b
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_ro.tar.gz 2523479 BLAKE2B febd27a0e4f5ff8507adfd4c0c2f90938dc3eb709cd51ea8a9886112b4f92814ca68679cb84e19ade1f39a7688a3e36935b8fe74d4506122e8dc0a98b8560fa5 SHA512 24d155862dcd9aa00af2e2e88ef710cfdcc81c413e6d0c55a73d51ff443b6a72bf32866d8aab1bd729e2a9ad305f798e62b22f6711631aa7973908c1fd1c5a3a
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_ru.tar.gz 1941678 BLAKE2B e54bfcab81717142ffdb5afdafcf24cfb80fbfb3b338fa318040be29b0d036d019aebbe302c9a150764cd1ed9218d0ff1de6b79d4be168e0467c4dc30aeb9cbe SHA512 5516ee9535b7d3f52f3791e468749267a05c97ceb4fa56ad3abf2d379e51e750f775b1202c2a549c09f7f321242694dab25f576014206b8e9053dcccc606a8c3
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_rw.tar.gz 348541 BLAKE2B 52fabe2d14256b712a61d19c1bf1e7f609107040fc1cb58e8ad70b88df3f04c7a90d489c17cff332e73715ba4eeb26f35de89ce1e9ef8174c1897c1072b9a494 SHA512 a789be74b6321a5a3acaf24a2429a14d6e2b99d270231ff7751682fedeb4188727169bcb7861c981ec868ba037600b18b1b326c7dcb75f7f2c434575050f9550
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_sa-IN.tar.gz 451425 BLAKE2B fb4a008cb81f44ef1b89a6e27ae288cb70b5e93531118bf586c0377cf593761250f87019a31d0ed4eaa1f3cbaef4381123c3cf9930baa86d614d0af8995cc40c SHA512 5fe3ca959458ed041507f666895f9a234018755afc5a9df968170c35fab737d4cb936d9b5bbcadb54cdf59bf062ab35a604621e16e8c32196a11a967286b519c
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_sat.tar.gz 522023 BLAKE2B ac2fa4b54bf9eeb4788da60853c8990c28b36a413e7d36590d83370d845ebbc2341787c83d494c78f2a5638ea9a38bc73d3f992d6a5bf3477c3eaa775ce7dd10 SHA512 7c58f48df9b533ea32f64dac64e8839e18c3904ace28b1414a228f9d08a070e35ef0b6ff7c985c593483b6b0f1cc3ffe277ee8a71a024882792a1677fa6f19f0
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_sd.tar.gz 438551 BLAKE2B ffdb96a0ad08d692178554249900d353745d5e4966712e24ffb063fe6d305d26271837a2038d1619f7426a8b8fa1a4ce98a02a7a895cb5d3e2de7d7451cb503e SHA512 e5c78952904c4deaf3f0aa30ba663d2cee2d00670a5da671cdb8f3095d593b8a0cac3e8b5e9843a3c3784840199bbedb4cece971aee2aa20184075688392db9c
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_si.tar.gz 738095 BLAKE2B b73c9432f35ce2e1154aab1005dd4d37afbd43f81aaa7d9ccdcdac7800e12062dcfe1664e0973b3e9f5e2878102d60d2998911ea2dc25eefd23551acf326ddb3 SHA512 3e0c57ba4227fec2c4e04a9edefbabccd27d01b3d84291c104d1581db7fea5cd163f458b371a1464f90ff6a784505f562bff4ecf075b165199593f854c3eac78
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_sid.tar.gz 451389 BLAKE2B f6a5029798ecac1620aad8ca84eb84bdde3c24758808efd8eb0f1c839b529b7bd7a1575648204e0f58f17564eadc82c0d987c6ca24869f84b3997dd662e58256 SHA512 3bac560fb56a5abe2a6771950e70a8ddfd4d05c1aeec2934401af8129662961ba043623be725683579a4058d6870a9824fc6363482f5cc0cdb5e523dfe88997e
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_sk.tar.gz 2100850 BLAKE2B 141df0d802640b2a7f8050f0b215b2b2f3b6d3c03a37d6b134f8e4f085958358c2ecea7bf5b0d312a50f3f304d09c5c5c4c2ccce04fdb93491b418072c66d84f SHA512 6224ffd0c9558a834a3c4c0a269b28da8f0f60b49ee6c8f837f9b3d64246e98da7118a24cdff9a1ace652485968230b8aa48bc60752cc32645602075f767b48a
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_sl.tar.gz 2500756 BLAKE2B cda9f1a3e43521f82007204115b8a35cfd7d33a2c861ebb6709e86a4a08411396cde6d65256de4d5f7fe8f20972abeccfd83060eb0bf5ca09d76e09e8196decd SHA512 bd388489297fd038ce7bea29d804b944797a48828e0285bdd15729e64842d7a2bd9a2d1eab75da46129aebf251c3bffdfd56a65d80be499c998f4a51ad4ab932
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_sq.tar.gz 1176141 BLAKE2B e596097ca81cfb893ce5ddfe2f849f42a99a5f330f2c1e811b4d7325a7328f579fddbbaedb750332b2a2e8a300e712dc9ed32dfb93d6b015800f868910e44481 SHA512 4dd1177108a718396a9347cb88b34d42c93a68446672883260e5895a9a9250f710959b1955379090946bf216673ca6abb8a31dd2790b869c410033ab9a9adae9
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_sr-Latn.tar.gz 2408335 BLAKE2B e04def1757dcef8527de392d4438eef7e55b3d7cddcb609b2fa7fdc7bc3c37ae7bf7c573274f65b2b994a198802d045a896a5d6ba19362da0133b15622b915f5 SHA512 5a3aaec0534ded05951ebad21ea35b4a3806bfbbb65a08ef3f03043351daf0ef4ba3c3205f9082b18203a75b228e46a4e4134035140666368b33cc8a8f241e25
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_sr.tar.gz 2471855 BLAKE2B 50c8b6c248ef32fbd1d97b470cbfd0947f293d2df5d649a4d08f81082c4b6acc5898f244fba95025b44e40f5c38fded23ab2af98713f99cd65500b0a34408df0 SHA512 69d17151d352e7c2a483bb0a84e0cb9dd8407fbede88a77309170d4cd8c54a79f8b1cd36600690ff69fee4619a9cc5d08ea655e525e0673661bd3eca12ee7b0e
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_ss.tar.gz 289692 BLAKE2B 1a6c7de19e795f4c55f7a51f2a9689b261fda0c360811002436f2da862bb25de061fac2f052f48b4171ed309fae33a465963339026b1cf8b13a2d105b1f1eac7 SHA512 20f1b19fe2a03e42689117ac8cf49785c28e5e4136cd810b389422ded96a5a89efc33dc76978e52490ac7e2dd6b1f6d0300685358f577cde2ff45b1e326e5460
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_st.tar.gz 283981 BLAKE2B 107a1b1102047ff171bf7977dc0b1ff3e51c0888d4fc7a72a780b8e9633e35473b1c06e6d13e7e8e5c122fba55ee5e3b08ba3bb65f161eece9da4b8a232a2328 SHA512 497ec25f62ba215df48d65c09c835df482dd829df9878aed2d0dcbfdf979c165723fd9132fb777f2a88745436828047f334f86f9286d55578f5b90a0287a0f69
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_sv.tar.gz 2648479 BLAKE2B b8d07b93d37ae071c6cf252e7e95ff366d67e4a714bbbf259a4be9a3d0b184086052fcd51d9d4a72d487bd320a36c0f510400066b53437cc3c8650d13c2b91f5 SHA512 b6485e7382b7640d27be22bec54795ee4c939cb9966ddbc6b2162b0b2b3706ae14c16b7ca8f10b5c11aad1ec43f222ba9b5436145c312b708a2a297fa30436d5
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_sw-TZ.tar.gz 321814 BLAKE2B fc989f586c696e4030b7b4cce94001fde06e2995ffc065ee93333c77e9cb8fbc8bbb4fde08ee2ffa965984cb4da009f76fabba0648b0df2db3cc353e8a34a8d3 SHA512 b351c58d700d96312fe85be11f958be43d1232b4239851875e53cc4e913c6cc0f9d72f714feb53d5c0627e3a838bc4341315a7d1dbb35250adc661e97a7630ab
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_ta.tar.gz 680894 BLAKE2B 40a6e34058147a3784b7b0804f1f67465a7f9611ccfb3909f8c65c9909f33677cd734e40a4aa4f16175beeb76c312e79b3a33934cc50980ca7ec25fb0095c72b SHA512 041fc2cd27128654ba0395e5275e4f4dd01e78c1682cfdd748f67259f3ee775f987c2beac1d38c5d1c7d763787c9309aaec1dd73894476976bcc0a2a504671d2
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_te.tar.gz 1085831 BLAKE2B 588791be8353bf79ebb2fb2fcbf42f92ac9d535140b01f1ec5b2f87bf3cba5c7cc523c68110672e89744da5e87d7409ea075922d285dc21e5d43fbd37ddeb4eb SHA512 461f3b333619df432269aead97a03c3022bbd2b558c953fe71eb3b661ea624f2611687d2ee1c415863d794fb378fae9dbd2787f54d629e397cd35f9db60463e0
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_tg.tar.gz 360839 BLAKE2B 54fe56036128d6e0a5e5a936c715bf6e770324970cf940561e0476c7c5b311bdd75fd3051678738df460c4c223ea859d348e55586b2ecd369b2be5a720b14c0f SHA512 67e7ce3ad613ce3292c682496ed182a683ebc1c5a6121517e9a96341d677dc892aa3fbe3b0d5fc361294cb0299495b4ad004651a1860a87467810e72605b44c6
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_th.tar.gz 746989 BLAKE2B 8fdda3e60508fcd7e8344d9f4d2c744c83160c6c0fe7eba2c5d020cf1fee9bc23c55c8036f8866c0fa911cb9f9b6a73c3bb72232d736f7873964332dd8d50280 SHA512 e8b3c8232f9371898ffac87ea18bbbb40ecc4ebd62c7c0fa0390db20815f8dbb4206a39d658436f13c2f0f81f106930114a688f9ea8523523e236e1574d6e67a
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_tn.tar.gz 263849 BLAKE2B f6dc5e54b8a60a16043a9fcefcd52e8581b4c52475860a9cbd882b13938ba306d427d5d324d2711ef0a8c64e105c2187528fc22a84d6fa0bdb42c9b351075ef3 SHA512 e11eeef90bbfe3a78ec3e2fa563184d8770f0814e38f0da90679b878389ad8f4ce49d591a3ccbbbf090bab7816b7406ba43fe814a698d13f921e746e8ec00eda
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_tr.tar.gz 791474 BLAKE2B 1389ca4451a1d48e3df3db9db646ae73704936810d43b01f067fc90ac5a6a959e628643cf5a5a61c0052c7e8373a2b94e6b7f7d62297c1d8260e97b8e9a66d2a SHA512 de012938859b72000831fb09d7c9787e2d3780952ca3ff628b093cb0c581d16dd62a33ddc13b40d5734d42564f79f32d7fb5d152413ee3f8251f46a833721143
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_ts.tar.gz 281348 BLAKE2B 027b7e4d91911d4c7e1ca1b39df3fa48edbb91a94fa4507e4c986ea8ffe05221c9073e928a4b189ef97769eb33dbc8b4a4d626598abde1dbb5b8dd56a3c0aedb SHA512 540bb3203344aa47da7e8bc581f4f78d18b0777c892ca66c193d8f591982a7cda0217747f59db5a98bea325e6098839dbcc77990eeaf024575c3152b99e2a2be
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_tt.tar.gz 188288 BLAKE2B c281e20ffbf693b8ff0922123c9ba1000e3183c535c07d70c50fef6f9642a1109b9d5863e9a1da7ab36f35660671afa789a32c0c0708a8d334d234b4a283b993 SHA512 9f25d11ff2c9ce04f21b07066fc1957095c767b96b3cc9b7906519fc0f12fcaddc0c17ceb289d3fdcfbd1f7a0c7d98f7fb2929bb16d252c633c75c9a2608a3e2
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_ug.tar.gz 546880 BLAKE2B dd19940335b1e48931cfef0c42bb62765ebf04d6aae208f2ca5c52697a08e593b124a04de75a241883b2c8f31fbec5e082195de1ee1ab5d1b0974468107dd2be SHA512 7da47ade970529d3c9be0f6cc1b6489c9eb8262542ccf72f7c982236222cbda58a68cb5b2899bfec27e598e627a3039ebccdf5b09a47f0d12e393796fe601035
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_uk.tar.gz 1655565 BLAKE2B 738ceb70b12df9fefdde800e871dac7f4a77392fa2e328bea7403941a94fe23b2cb22de71ec4fd1ab48003d7fddaef5a616ae716db8d815425403188293502bc SHA512 a4a2330b59bfe523c2239dbe0f351634337135f6c1c4c46b6c562d4db677271d65e708f796f06987cfc796323c195bffc059cf6e29385e09b2997fab76f92b88
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_uz.tar.gz 317719 BLAKE2B 510621d129cce1cc1939eaf5221f9a58139362e53e1908712f15f0c61b887329cde50187bec83a8b4cec319515a3734dca79d7c4b14f4d0f6e8630c93a143ae0 SHA512 448cb888479b2c2f33ce400d22990d5b3a59d342ffa097de7c6acdeb6bfd5a7868c3957fa9c345f5c63e513391f50c45ee230fa1421148ca58c0747656634a2a
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_ve.tar.gz 286272 BLAKE2B 68a148866188082860f487f7abbab235a34e5f4a064bd27f4df36d43ddcd8fd14bf8cfabda8783ccbd696e552c0e19b7edec84713d303fb1d914064f86747abc SHA512 2c47bc5f5e202165515eaf3e47f560a6196ce7ac9a20fbb6df550be2d45316401488d6cfe58095f5d66f1f6736676f4a737e7b4add6a78f47547a9091482a546
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_vi.tar.gz 460220 BLAKE2B 2a0a082f13e45d7796098a4e38e3f9efd862f3a9167ca4796d90810570df8f21399236d81d420c3bc94e6a0e85f1b6a58907f88d55391c75b7555f878164febc SHA512 0596398b2df6d66392aeabdcbdd0fabcc1a05cef53de7aab08774526577474ef854f94894b37ea533b76e2d0c6ba564440cc544156b52bbbedbcdb6553102f94
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_xh.tar.gz 293524 BLAKE2B cb510ce1b97f7d1d56299414f4faf66d02b8c62a58d4ecce5713743b18bc63c4e29efeca1e46433367a3acb75d88e77bce02f7803b6278506ba2b52454d32d62 SHA512 561ce4c9387c455216637acbd98c5067e7c49ca8c12fd6c76f403e53e3d9ab3e6c89e8c571f76a6bb9fc28e0ab37cf5396f6c055ee1002425e584fb02841b91a
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_zh-CN.tar.gz 844352 BLAKE2B 3db3ebb2f04c6a349c608ab42b18e8a01faaaf60f348347a15aa0c2a65534acd084113b37b283ec04ae5ea9431556b9ddf208450de17d9bb42cfd23b2abfeb47 SHA512 baf8dcaa236043ce6efd8798dc4184e61b7616a75abb92c0d5c5be1cc9381264a5951469ef3a6c375692695e83a3f7f157c2e6bc8c12ba52719f4cd6695f9ce4
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_zh-TW.tar.gz 846016 BLAKE2B 769bf1243d9f8bc105c5a0d5acf8f298e765a76b12c347a13c258614000746cb479a7dff5617746b023e908c4a4c0ee5c601104fe4ddca42405945e970f167b2 SHA512 0dcdb9e859082ad7847afa2ccbd60bbd4958b8b74857d4a9aace72014b2eea491833d7c54b1c87aeba3ad69e71c9a5e62ac6d97962a7fdbfb6679d14298f5e6c
+DIST LibreOffice_6.4.6.2_Linux_x86-64_rpm_langpack_zu.tar.gz 323905 BLAKE2B 0a2e0a157748b6d56fd711647108fb5bf1821950d9f3fd5be68ebc59736e4b27829909ec31e6420a6f03feee50b8c2d6f10a2958a9508f1925254e22ffbc5f9d SHA512 b132e43362ea7e44f6b080c3c02026ebe13c9f4b152a619e97443952f907ee45a7272bd04f6e066611f6f3ece6866b1b26e421232bc78002a68ce4aedbccbf29
 EBUILD libreoffice-l10n-6.4.3.2.ebuild 3666 BLAKE2B a92cc04049b2c291c0d9d9ab1b2de57aa3d183ec7b6c17a49b5852367380620f730f02b30a0472d5e6514e73efd181cfd4e26cc8f6dd18b9e25bb277ce008b37 SHA512 c9cb96aeb7fc40138b78beb3865f441df3ed644d594ee25790412eb952c5d3ee0ac3507a3fa7f5f5a2c7ae4134aa5a5a70af94d71c42c4309e6a015a8bf2fc4c
 EBUILD libreoffice-l10n-6.4.5.2.ebuild 3668 BLAKE2B fbc125fad00192ac341515af6db62649fc5f7db51253c7d45f7737e62a9510f180dfc56a5963b1ed73ddc9ad062a6d764e4400ed6a9c3b0811c3f65ed0e31ea0 SHA512 59a3ff2a3c756a28e22af165267215ff9a7ea23fd68639a87cd04fd7e6afc9e0789b54c907506bf5251ef3b4249c91b77c22f12e59b8af03af5771f3f5496a08
+EBUILD libreoffice-l10n-6.4.6.2.ebuild 3668 BLAKE2B fbc125fad00192ac341515af6db62649fc5f7db51253c7d45f7737e62a9510f180dfc56a5963b1ed73ddc9ad062a6d764e4400ed6a9c3b0811c3f65ed0e31ea0 SHA512 59a3ff2a3c756a28e22af165267215ff9a7ea23fd68639a87cd04fd7e6afc9e0789b54c907506bf5251ef3b4249c91b77c22f12e59b8af03af5771f3f5496a08
 MISC metadata.xml 369 BLAKE2B 7629064f409fe8ba7f0daa435ff56eaf0870f70b45961c635119725e9a78ca40bbdf77a39e70f83a31103944f579b13db5fb07f8dc9e7ecb77491d36220370e9 SHA512 8cc7592062150a5472a5b8cf4106d0c3fd7270c7e6d0d566852bbc6670a90be2c73e6c04f085e32b41f40dd1adf9800a53a1af8df5cb297c20394c55e3df45c6
diff --git a/app-office/libreoffice-l10n/libreoffice-l10n-6.4.6.2.ebuild b/app-office/libreoffice-l10n/libreoffice-l10n-6.4.6.2.ebuild
new file mode 100644
index 000000000000..b20d07acc9c3
--- /dev/null
+++ b/app-office/libreoffice-l10n/libreoffice-l10n-6.4.6.2.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit rpm
+
+BASE_PV=$(ver_cut 1-3)
+MY_PV="${PV/_alpha/.alpha}"
+MY_PV="${MY_PV/_beta/.beta}"
+[[ ${PV} == *alpha* || ${PV} == *beta* ]] && PN_DEV="Dev"
+
+DESCRIPTION="Translations for the Libreoffice suite"
+HOMEPAGE="https://www.libreoffice.org"
+BASE_SRC_URI_TESTING="https://download.documentfoundation.org/${PN/-l10n/}/testing/${BASE_PV}/rpm"
+BASE_SRC_URI_STABLE="https://download.documentfoundation.org/${PN/-l10n/}/stable/${BASE_PV}/rpm"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="offlinehelp"
+
+#
+# when changing the language lists, please be careful to preserve the spaces (bug 491728)
+#
+# "en:en-US" for mapping from Gentoo "en" to upstream "en-US" etc.
+LANGUAGES_HELP=" am ast bg bn-IN bn bo bs ca-valencia ca cs da de dz el en-GB en:en-US en-ZA eo es et eu fi fr gl gu he hi hr hu id is it ja ka km ko mk nb ne nl nn om pl pt-BR pt ru si sk sl sq sv tg tr ug uk vi zh-CN zh-TW "
+LANGUAGES="${LANGUAGES_HELP}af ar as be br brx cy dgo fa ga gd gug kk kmr-Latn kn kok ks lb lo lt lv mai ml mn mni mr my nr nso oc or pa:pa-IN ro rw sa:sa-IN sat sd sid sr-Latn sr ss st sw-TZ ta te th tn ts tt uz ve xh zu "
+
+for lang in ${LANGUAGES_HELP}; do
+	helppack="offlinehelp? ( ${BASE_SRC_URI_STABLE}/x86_64/LibreOffice${PN_DEV}_${BASE_PV}_Linux_x86-64_rpm_helppack_${lang#*:}.tar.gz -> LibreOffice_${MY_PV}_Linux_x86-64_rpm_helppack_${lang#*:}.tar.gz ${BASE_SRC_URI_TESTING}/x86_64/LibreOffice${PN_DEV}_${MY_PV}_Linux_x86-64_rpm_helppack_${lang#*:}.tar.gz -> LibreOffice_${MY_PV}_Linux_x86-64_rpm_helppack_${lang#*:}.tar.gz )"
+	SRC_URI+=" l10n_${lang%:*}? ( ${helppack} )"
+done
+for lang in ${LANGUAGES}; do
+	if [[ ${lang%:*} != en ]]; then
+		langpack="${BASE_SRC_URI_STABLE}/x86_64/LibreOffice${PN_DEV}_${BASE_PV}_Linux_x86-64_rpm_langpack_${lang#*:}.tar.gz -> LibreOffice_${MY_PV}_Linux_x86-64_rpm_langpack_${lang#*:}.tar.gz ${BASE_SRC_URI_TESTING}/x86_64/LibreOffice${PN_DEV}_${MY_PV}_Linux_x86-64_rpm_langpack_${lang#*:}.tar.gz -> LibreOffice_${MY_PV}_Linux_x86-64_rpm_langpack_${lang#*:}.tar.gz"
+		SRC_URI+=" l10n_${lang%:*}? ( ${langpack} )"
+	fi
+	IUSE+=" l10n_${lang%:*}"
+done
+unset lang helppack langpack
+
+RDEPEND+="app-text/hunspell"
+
+RESTRICT="strip"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	default
+
+	local lang dir rpmdir
+
+	# First remove dictionaries, we want to use system ones.
+	find "${S}" -name *dict*.rpm -delete || die "Failed to remove dictionaries"
+
+	for lang in ${LANGUAGES}; do
+		# break away if not enabled
+		use l10n_${lang%:*} || continue
+
+		dir=${lang#*:}
+
+		# for english we provide just helppack, as translation is always there
+		if [[ ${lang%:*} != en ]]; then
+			rpmdir="LibreOffice_${MY_PV}_Linux_x86-64_rpm_langpack_${dir}/RPMS/"
+			[[ -d ${rpmdir} ]] || die "Missing directory: ${rpmdir}"
+			rpm_unpack ./${rpmdir}/*.rpm
+		fi
+		if [[ "${LANGUAGES_HELP}" =~ " ${lang} " ]] && use offlinehelp; then
+			rpmdir="LibreOffice_${MY_PV}_Linux_x86-64_rpm_helppack_${dir}/RPMS/"
+			[[ -d ${rpmdir} ]] || die "Missing directory: ${rpmdir}"
+			rpm_unpack ./${rpmdir}/*.rpm
+		fi
+	done
+}
+
+src_configure() { :; }
+src_compile() { :; }
+
+src_install() {
+	local dir="${S}"/opt/${PN/-l10n/}$(ver_cut 1-2)/
+	# Condition required for people who do not install anything e.g. no l10n
+	# or just english with no offlinehelp.
+	if [[ -d "${dir}" ]] ; then
+		insinto /usr/$(get_libdir)/${PN/-l10n/}/
+		doins -r "${dir}"/*
+	fi
+	# remove extensions that are in l10n for some weird reason
+	rm -rf "${ED}"/usr/$(get_libdir)/${PN/-l10n/}/share/extensions/ || \
+		die "Failed to remove extensions"
+}
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 25bf0cf99a97..0e409aa1ebe4 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -3,6 +3,7 @@ AUX libreoffice-5.4-system-pyuno.patch 1399 BLAKE2B d7516b0ac19509dae8eaaac94aca
 AUX libreoffice-6.1-nomancompress.patch 967 BLAKE2B e60afbfd7007a5fab7291ffba34369137336327f4d1ee27789c5f6229b9a82f4aeab0eaeaf494e60b992c66fcdb276b6423b87713febb14e9eeaffa388369ca8 SHA512 f82e23f15cefd947af20a50e1e4168c9023d5f8b9e19da7f76b141a60be4fa3516ad16400ce26e4d0ff293c570031ac87bbbf6766444e1b31e7bc3ee8ef58083
 AUX libreoffice-6.4.2.2-poppler-0.86.patch 777 BLAKE2B 1e798ef4a66dd872963e3436e6b38d0a1741a1ddc4f3615f70d322d1ec506a66ac1d9306af95c7cd0b8b40d8347384f74928ece93a4484a8c36ce96b14977531 SHA512 dc34c2c86661760975ade1777d46899e05436819f82ada97f2ff9feb8a80a67d881c90c8157f3e3fd0850cdd5eb12c0000dc8670943d85d4dd19e0cfa772f4bd
 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
 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,12 +25,15 @@ DIST eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip 427800 BLAKE2B d3ac085a3
 DIST f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip 211919 BLAKE2B 2c72493e44d3ad1714d294fb7baaa85d33fef2eb4ce75bf507b65f78f1d9d399bb5eb72cee188a8abc4b234eb2845a26755791fb3ac104ffe6e55013ab41ca8b SHA512 c1a15ebbfe817ec79d4b3f1c97d096bf8511737d7d35d97302856ccfb3de14a1cd16bd31000415d9ab24bbd9ef770d37855cee4b819ff0e8fca2f2766920a114
 DIST libreoffice-6.4.3.2.tar.xz 230409812 BLAKE2B f9cdad1540c45525bd70596dc3033e3466fcdf3d96547222b936141e49ff6d45581ca59d0e42c4bb79fcb63586d748ccafae712369e024105235e2a9b69be7ce SHA512 ee11c704fa7184ffe371aa36c835c4c7fb06ef03d08fa0a5a9e647e80610db275e091d1ac79c1fe11af0c7f14dd72c821da9e7e6ba59573fc88cec79f84c873a
 DIST libreoffice-6.4.5.2.tar.xz 236255044 BLAKE2B a83ad0c50d1b7e686188c35c5f319b73e7984ad214e125102824789d1f56083a4ed8795cf7d8942fc0b3ddf3cad13f326225812458007a97a166bc5543c47eda SHA512 f0a5ac37b9c8e46bfd50bf9137d193a83d55d8d451c5b27d86b7f257633e861eb79422e1e64f7c462ae4a9045e00827beed302ab6f0773f8864c03bb11d3b752
+DIST libreoffice-6.4.6.2.tar.xz 232180876 BLAKE2B b2e01cc8e56b36c16fc3e39ff88617d7c31d6b0a0f4a5c05c8536313e7129862fb962e1a6efc7e86e9b56c34dff7c2d895416f33fbb23dc45e447b25813b5654 SHA512 377675494d4422c4d9363fe3857a8587e38f6ccd39aebec9c23337aa3a88cb2526608b8d0bcb27985ed8f821a98ca541dad4b48d69db441bcb27e9fb81beb9ba
 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
 DIST libreoffice-help-6.4.3.2.tar.xz 88297704 BLAKE2B bbd1af159c8b8db1909335f37095812ec3ce81d73644a30a85f3e37daeabeb9a158451b8e586f24d4b7544c8cd0948eeb20ede464384c3277d196f33322e63fb SHA512 9f8c1bcde27d153389d124af1393d0939262c85a1624f0b475a5515b5737612cb607d04742a069534771eee51ba98896926804ec7001d6bc2110dccdd6e7615a
 DIST libreoffice-help-6.4.5.2.tar.xz 88376816 BLAKE2B 8c5f8a3379dd77f41e3350314fa250ede503d998afda3cb2c8c95a4dd3b565bd6d0004b4dd7ff7b079fdb4de766fa105a8dbbd49b5ced5587e5a716aba31ba26 SHA512 fffa5338baa5ebd7bdf607f83b31440c66c19c42136b41505074fe1a7a4bb1630e080e4fc2dd114f8ab0654507f4a84d4190bb134a4756d895ec350cccc10e11
+DIST libreoffice-help-6.4.6.2.tar.xz 88297908 BLAKE2B 919758e81ed46138331b49668f89c6bf7f50253d7632d113aa957f524ae26e2b99f2ba490b405830314822ea91185eb2308018df77c5bd3d7197cbba940ae2ba SHA512 8ada2568a40dc4f1c843cb37dde6abe3bd61b6e5d9910b985096821e1fce5af47d4a10bff8ae91913298e593130bc1f8668b4e1c59c46591d457157e3d4b7501
 DIST skia-m83-8ce842d38d0b32149e874d6855c91e8c68ba65a7.tar.xz 8218672 BLAKE2B cfeb805d82ce1f5dd70c7365983fa8107d5ccda9409b2654c032115cdf8a1c32fa0451162b0cceec3dcc0054e3d0d0e13583ea93843b0d0a6eb948cc31c15ce0 SHA512 1018fc1cc8a7edc15745cc20791f9a22e5b318018ba619d6cb5b6995d3e81ab93c910bb3a42734872d3be54893c2ce7db507b2c61088660b2ce6630ff9b36ebb
 EBUILD libreoffice-6.4.3.2.ebuild 15773 BLAKE2B 58373db2eb7ec7afe91cdb5cfa9632cedb8ff375ff07474aaffcbbe3c6ce150644d7d49639bfff3c2c8aa1eaa689e1ee3ac5348d8e1272bc0232d8a0a92eaf2a SHA512 15b27b4dbf1e4ba5938e506eca8265a717dd660046be6bdee4e06f8188fb9d51a9483b3b4149734419b9c6528405b47acf5f9c86e0ddec457ddad15e653adeee
 EBUILD libreoffice-6.4.5.2.ebuild 16573 BLAKE2B c786f7472fb30d5723e0c2abea419d4760f8af80f239c93f597829a67bf40aa15b2f8462bd741aa61c37cc91d97bff448f98806b2a637270cc8f655e65f59b2d SHA512 00cbc216a08f76a75dc91cdb0314849597ac6ca7e880347e417409896b3775edca3748f2a444e9ec057f7c8337479a08301f62e152918e9f1103890ac8c3422e
-EBUILD libreoffice-6.4.9999.ebuild 16499 BLAKE2B 9e8d530dd8e39d33e0912442012c9ec8cf1ffba8b6284ad09812fc76b6f22c8c0daafae9274167aee9f73a88be550aa52c0eb69950d525dc6a4eba0fe01a7ee7 SHA512 ee1dd9f1b844f8f546f321ae5307c4c077b7f1a383cf2002afbe7893dff08fba52f80d2bd18a9c020d7a884b59546114ff8600fa0dd6e43f6219a46bdf06b4a0
-EBUILD libreoffice-9999.ebuild 16713 BLAKE2B 2e327cfac337d2182052ae46d0759f0fc252aa404f2f0c7c39d380d0410ace457b131e828e92fb85ca4639747234a7406ee76e54f770defa7682d10fe3cb7a12 SHA512 5ba0132582197dbace16f978bacf9e2da6355b6211beee8ac5e27469720919019da377d7c75b12c5eb8b12f6bcad72359f4a402b508521986140742d52c25ec9
+EBUILD libreoffice-6.4.6.2.ebuild 17669 BLAKE2B bb95da70812e494911b729dd48cf91090cb333c474c65960793a43609da305d142b460558c3ea53ca1927a70831e0c1256bef584d39b6c1c653d94225e5494cc SHA512 8a1d8b17ba01aaa220df162b9b162155ebda4646f0e1f94eae1e98cc632bbbea1426b6bead834b5a52323378275796692cdde10f74bd154732a60f4cd6ffa806
+EBUILD libreoffice-6.4.9999.ebuild 16701 BLAKE2B f75ca84ea20c010607f1c5f3ea2291130bfa68d5ff7e3fd573fe2f18cbe47d6cc57c78713f1dfd52fd456804cdf2aa0db4e9c933dc7520c6fe7b1b148a66c6db SHA512 f268ebc8da5246c6295904b05d6810bf4be24c62636a8bc106e848ce0e41d9c3ddcf3deb403e014f3b796b147630de7b3d58b787c496387faebb601fd2a4c2da
+EBUILD libreoffice-9999.ebuild 16785 BLAKE2B 11148bcd232c3adfdfbf8ea1e6aac3fede40916040ddec13bf89c31c2eebb29b0f27b73c829f62faeed458c8f8e4996059e4ea81731a35d50256d534a3098478 SHA512 8b7c261d4e72029bed1b7e7a6c6e7a3b60082f99441c03b8b165a7ebecd0c3047640531786b7fc015677dc85912412ddb2ec6c4b24759b42a74a34d81f12ccc2
 MISC metadata.xml 1065 BLAKE2B 3ff11b03c5ab432a25d91b6e727f964c82fb31f23663669dbe5f85e2b425bb99ee3d7dd2f2fe3fe95063e0403bb4561487566e213125e861711ef79912747980 SHA512 da4cf59feab680dbcfa9a3e4f7760315c9f99aaff105b9712304c64e2ae3b7c2535f96c3cfb8e9b08124b59e55b460c831a0e116d6ec5bd670cecdfc85323b18
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
new file mode 100644
index 000000000000..4a1ff5160297
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-6.4.6.2-llvm-10.patch
@@ -0,0 +1,102 @@
+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/libreoffice-6.4.6.2.ebuild b/app-office/libreoffice/libreoffice-6.4.6.2.ebuild
new file mode 100644
index 000000000000..291eb07b6f02
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-6.4.6.2.ebuild
@@ -0,0 +1,590 @@
+# 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"
+
+	# 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}/libreoffice/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-6.4.9999.ebuild b/app-office/libreoffice/libreoffice-6.4.9999.ebuild
index 727d2c010c58..6f4a72b4e475 100644
--- a/app-office/libreoffice/libreoffice-6.4.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.4.9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 PYTHON_REQ_USE="threads(+),xml"
 
 MY_PV="${PV/_alpha/.alpha}"
@@ -268,6 +268,10 @@ PATCHES=(
 	"${FILESDIR}/${PN}-5.4-system-pyuno.patch"
 	"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
 	"${FILESDIR}/${PN}-6.1-nomancompress.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
 )
 
 S="${WORKDIR}/${PN}-${MY_PV}"
@@ -547,6 +551,10 @@ src_install() {
 		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
 }
 
 pkg_postinst() {
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 3e8136e6a80a..3cd82d82602e 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 PYTHON_REQ_USE="threads(+),xml"
 
 MY_PV="${PV/_alpha/.alpha}"
@@ -551,6 +551,10 @@ src_install() {
 		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
 }
 
 pkg_postinst() {
diff --git a/app-office/lyx/Manifest b/app-office/lyx/Manifest
index a5236b8ce0c1..352a8781e00f 100644
--- a/app-office/lyx/Manifest
+++ b/app-office/lyx/Manifest
@@ -1,4 +1,6 @@
 AUX lyx-2.3.0-python.patch 1049 BLAKE2B 94591099e6b0d52429fa1e066475283ae35ba89a5d07f190dd80aa38ad040cbf53dda3f85f4f12894fc39822309aa7b4cc2bf947d8720caf228c734b7fcee8b1 SHA512 8f2fda91c4c35ffdf3325fc6613df1c5ecd87ced88e4d690aef5c7085edda1b66c0ae704e266521627f7a82eb8b4e2f35fed0f14b37feb367422ef1c5693e31d
 DIST lyx-2.3.3.tar.xz 15998188 BLAKE2B 491732d1e567dfc8372a7dc7810cfc46cbe7e3b6a67637f772adddcff96225e174fe8c3db4c7f9e663cf3423da8b4bf08f67679874c9aaf556973ad46159a6cc SHA512 7b42df9da9f2906f626d568222e559bb921d003674d70c805657488180856a77143b2a3d073686116c95034e84fe8f58ee1ff8a74d47a40bd5fda7564335a0c3
+DIST lyx-2.3.5.2.tar.xz 16139804 BLAKE2B e6ea7b2fbec330bfe31b8f88e0a5cc25ff65991421f99b04e98d26945bba48a95f389e2a7e6023d4c9720d43f80136682eb40ac4be51799f01e038e4b0fad206 SHA512 90c5459ad0a77568d588e05a360482985988382927583b14914d6a23b788756e957d0237c18b9ab0681dfc2ad7aa34d21e97304e3a74d19ef047c38f692fba03
 EBUILD lyx-2.3.3.ebuild 4096 BLAKE2B 2854d008f01580d04ba6bfce00cd92eab9b69795e3d3627c8c763f545a04343525e3b37bf2f11fda31f7f0ff7a894e1edbdb1140c7abac0b9e98df0f02c177f4 SHA512 5749fdb27e9766fba637a88cc5ce6c2c7cf3207b809b2e9c336d4473ebd5fff7511714032bd6a84d985c10631ecca9d9186db0364a990a3966063da8ac5d160e
+EBUILD lyx-2.3.5.2.ebuild 4052 BLAKE2B 0925c05565172fe4c7fdce447529005dd4c5bb724af7556858f2333da2eccff75fc7a6ae0321d67b0c21b1c8ab5a89cee2607220e5339d7af8a59276fa74ff82 SHA512 bd3ae841210af4ba9352899042bb1b6bb14f419050d875ebb70733c6fa66fc40eac2a48fb65b3ef06ff8338e8ea0e8f29e1073c88cae55a4d9697997d82bddfa
 MISC metadata.xml 1429 BLAKE2B a1bcde398c387c4d6f468a296144ca8d75a2dc78b170d0b94f6cd0c8896583d878bb423f039e509f40eefa634b1be96ea9211f1c4841fbd30684e32e172410f7 SHA512 79ed9557e4883159a71f9ed2a5ebdd5507924a6ed5a0f50dad3047a1d51638847f5facfe757548b6bf9fe781026ff8987cadf84498a6f6aa8e3d260e19e7284e
diff --git a/app-office/lyx/lyx-2.3.5.2.ebuild b/app-office/lyx/lyx-2.3.5.2.ebuild
new file mode 100644
index 000000000000..a128d6f301cc
--- /dev/null
+++ b/app-office/lyx/lyx-2.3.5.2.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+MY_P="${P/_}"
+inherit desktop flag-o-matic font python-single-r1 qmake-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="WYSIWYM frontend for LaTeX, DocBook, etc."
+HOMEPAGE="https://www.lyx.org/"
+SRC_URI="ftp://ftp.lyx.org/pub/lyx/stable/2.3.x/${MY_P}.tar.xz
+	ftp://ftp.lyx.org/pub/lyx/devel/lyx-2.3/${MY_P}/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x86-macos"
+IUSE="aspell cups debug docbook dia dot enchant gnumeric html +hunspell +latex monolithic-build nls rcs rtf subversion svg l10n_he"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	app-text/mythes
+	dev-libs/boost:=
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	dev-texlive/texlive-fontsextra
+	sys-apps/file
+	sys-libs/zlib
+	virtual/imagemagick-tools[png,svg?]
+	aspell? ( app-text/aspell )
+	cups? ( net-print/cups )
+	dia? ( app-office/dia )
+	docbook? ( app-text/sgmltools-lite )
+	dot? ( media-gfx/graphviz )
+	enchant? ( app-text/enchant:0 )
+	gnumeric? ( app-office/gnumeric )
+	html? ( dev-tex/html2latex )
+	hunspell? ( app-text/hunspell )
+	l10n_he? ( dev-tex/culmus-latex )
+	latex? (
+		app-text/dvipng
+		app-text/ghostscript-gpl
+		app-text/ps2eps
+		app-text/texlive
+		dev-tex/chktex
+		dev-tex/dvipost
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-mathscience
+		dev-texlive/texlive-pictures
+		dev-texlive/texlive-plaingeneric
+		|| (
+			dev-tex/hevea
+			dev-tex/latex2html
+			dev-tex/tex4ht[java]
+			dev-tex/tth
+		)
+	)
+	rcs? ( dev-vcs/rcs )
+	rtf? (
+		app-text/unrtf
+		dev-tex/html2latex
+		dev-tex/latex2rtf
+	)
+	subversion? ( dev-vcs/subversion )
+	svg? ( || ( gnome-base/librsvg media-gfx/inkscape ) )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	dev-qt/qtconcurrent:5
+	nls? ( sys-devel/gettext )
+"
+
+DOCS=( ANNOUNCE NEWS README RELEASE-NOTES UPGRADING )
+
+S="${WORKDIR}/${MY_P}"
+
+FONT_S="${S}/lib/fonts"
+FONT_SUFFIX="ttf"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	font_pkg_setup
+}
+
+src_prepare() {
+	default
+	sed "s:python -tt:${EPYTHON} -tt:g" -i lib/configure.py || die
+}
+
+src_configure() {
+	tc-export CXX
+	#bug 221921
+	export VARTEXFONTS="${T}"/fonts
+
+	econf \
+		$(use_with aspell) \
+		$(use_enable debug) \
+		$(use_with enchant) \
+		$(use_with hunspell) \
+		$(use_enable monolithic-build) \
+		$(use_enable nls) \
+		--enable-qt5 \
+		--with-qt-dir=$(qt5_get_libdir)/qt5 \
+		--disable-stdlib-debug \
+		--without-included-boost \
+		--with-packaging=posix
+}
+
+src_install() {
+	default
+
+	if use l10n_he ; then
+		echo "\bind_file cua" > "${T}"/hebrew.bind || die
+		echo "\bind \"F12\" \"language hebrew\"" >> "${T}"/hebrew.bind || die
+
+		insinto /usr/share/lyx/bind
+		doins "${T}"/hebrew.bind
+	fi
+
+	newicon -s 32 "development/Win32/packaging/icons/lyx_32x32.png" ${PN}.png
+	doicon -s 48 "lib/images/lyx.png"
+	doicon -s scalable "lib/images/lyx.svg"
+
+	# fix for bug 91108
+	if use latex ; then
+		dosym ../../../lyx/tex /usr/share/texmf-site/tex/latex/lyx
+	fi
+
+	# fonts needed for proper math display, see also bug #15629
+	font_src_install
+
+	python_fix_shebang "${ED}"/usr/share/${PN}
+
+	if use hunspell ; then
+		dosym ../myspell /usr/share/lyx/dicts
+		dosym ../myspell /usr/share/lyx/thes
+	fi
+}
+
+pkg_postinst() {
+	font_pkg_postinst
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+
+	# fix for bug 91108
+	if use latex ; then
+		texhash
+	fi
+
+	# instructions for RTL support. See also bug 168331.
+	if use l10n_he || has he ${LINGUAS} || has ar ${LINGUAS} ; then
+		elog
+		elog "Enabling RTL support in LyX:"
+		elog "If you intend to use a RTL language (such as Hebrew or Arabic)"
+		elog "You must enable RTL support in LyX. To do so start LyX and go to"
+		elog "Tools->Preferences->Language settings->Language"
+		elog "and make sure the \"Right-to-left language support\" is checked"
+		elog
+	fi
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+
+	if use latex ; then
+		texhash
+	fi
+}
diff --git a/app-office/moneydance/Manifest b/app-office/moneydance/Manifest
index 3a3a9580df42..a7b1f7ae8e69 100644
--- a/app-office/moneydance/Manifest
+++ b/app-office/moneydance/Manifest
@@ -1,7 +1,7 @@
 AUX moneydance-bin 567 BLAKE2B 4a1f80df1e5e20c08ba95168b680f8e0cdd7413fdc7991b12d40048dde6465db8c4d3a18c7b3f70bb829a2f5d2002258a8e6ccefcc64afbf419633ff948f3e15 SHA512 344e05050f28ea61264899b62f3e14844371ef452b0b84c6146abdecd2b9fc1230102bf2685b6c0649e014048c82ecd5dd7ce3117e65a9a22a2737eb39f4ca9a
 DIST moneydance-2017.10-amd64.tar.gz 132116528 BLAKE2B f5ba44a89944657c6c1380226dc512729825b084783e6d70dd7b2b731411294c7333bae858b2be3d5321e5145230257b325dc2b72a22744a877673c1c934d854 SHA512 175ff470b5fb5c3851eae708cc641777d7bdf1ede40366ccf5a135d6c813c08d9ce32665a2307c3aefa63eeb2206ad0874cb989aa998415abb86184a2b114ce8
 DIST moneydance-2017.10-x86.tar.gz 134860964 BLAKE2B 92181a6c6a81063377823b0fd9ed652036cf1f633c2cab57f19d1dbb18a2542361fc2bafab8852c11b941a24532f662351ea2d05bc928818db24a4cf3cae7112 SHA512 18d9d4ce7b0b65566ac81fea66ba34d66173559ca90ac166cc9b90631400845ae1c9d92ae781a618cacc57cd4f630f079736101d29b66d9c6cee7d32c7c15c22
-DIST moneydance-2019.3.1880-amd64.tar.gz 134414524 BLAKE2B fa6991b245efb76d9af17611ce5f24c4c77fe171417f41ccdccccbfa0b6795fbcb1c56c072dc7382e85f81ec57302040eb0cb091162964026fd230e6b5b3eecd SHA512 1e0cedb759168123de357cf4f69691ac4bd9868524d012f924d00c8f653a3505d3defe8c79e0c151d2b9163dfa40b551b0cc86fd7da678e841902bab812a1d2c
+DIST moneydance-2020.0.1919-amd64.tar.gz 146128581 BLAKE2B a7c2bfd940b4203beeaaeefd018746920f26c6902a9b942f7498fbd1184a5c5d5363d2b46238119b8dcbd963c1b584ab66f1101825ac1f31157a4907938557dc SHA512 c67b284f610fe14809bf1382371fba72e792f938e12ef1b8ee032b161a2547cad3579d5b0d41644566b37f35591d42d77a4fdc3515bb95da772054ac10c083f6
 EBUILD moneydance-2017.10.ebuild 1503 BLAKE2B 26cde10e7460a69484a3449f288e0a2f55925a55a7e8144650e563a00ed8395c9c95680034878af75195e858389bf30954bc7cfc679ada7a10f2f7081d61412e SHA512 207e71aa55a9f194c5f23d04c6626687c34d5717a80c64a30590623e5396912fd26e874bad4f29b63627800806ab8a3af0685be4854d9cfa27536c270427a268
-EBUILD moneydance-2019.3.1880.ebuild 1368 BLAKE2B 46bf27fe15c0e9f5a4e1094ae28ad3ff1a613c7b781163b85afab7c81e3145e9659fe0e59c32f2fef12af9415488d63d0e7424c87bceb89bcee67c88f2770238 SHA512 d693047132cc62d4cb9710dd2d92dde3eff331b46b6aaf14b34d792ab3449ee00045205d542824c5e324d7b284587093f9ef01cd211aeec2d7de0155abcb7b46
+EBUILD moneydance-2020.0.1919.ebuild 1358 BLAKE2B 65b96d03b4ed568ef7911a7b5eddc44c8d5f5ffba76f4b91b7586430103d0937038660ee4fbe0717d70c6191da6507779a8c22b50e7a3fcf23ba1f6331285dab SHA512 96360ab6569e72334087c2c2a28df425fcd4c74abcec1b3eb6f44a759f2c32c56c7d081e6081a209f669645df33e816a0ff238c3ad7db998c34ba61e61b13fca
 MISC metadata.xml 482 BLAKE2B 1ecfa1f0e8d8f5d67c8b60ddbcae821ac1ea776e984a3db7c0480e7e16872ef29c562bfd2963252ebc9f23b208ae70a1d9391fd5ae592074a2d4bcbbde637b78 SHA512 5b4c0c6b163ddce368d7f64e64550f988fd0b302024a50e4f07b5f13826e9fc7407109d4b04129fb01d62cd1f1d69de3d4814ce0e0fb1b744455ac2e2bf725d2
diff --git a/app-office/moneydance/moneydance-2019.3.1880.ebuild b/app-office/moneydance/moneydance-2020.0.1919.ebuild
index 7b33f4976477..0e4d364fca1f 100644
--- a/app-office/moneydance/moneydance-2019.3.1880.ebuild
+++ b/app-office/moneydance/moneydance-2020.0.1919.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2018-2019 Gentoo Authors
+# Copyright 2018-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit desktop eapi7-ver java-pkg-2 xdg-utils
+inherit desktop java-pkg-2 xdg-utils
 
 MY_PN="Moneydance"
 MY_PV="$(ver_cut 1-2)_$(ver_cut 3)"
diff --git a/app-office/orage/Manifest b/app-office/orage/Manifest
index 5ab777ae2cd4..e8b4b286c7df 100644
--- a/app-office/orage/Manifest
+++ b/app-office/orage/Manifest
@@ -1,4 +1,4 @@
 AUX 0001-fix-build-with-libical-version-3.patch 2947 BLAKE2B 240a87ca1ca6d383a7a31724a1dc32dc4266210d883fc0e3d327238451b70abf2f6b51f05a0b4c8b167ebad3a200759b1f9c133e20eddc68310fa79b5dfbac39 SHA512 4f46c99ee3354861d2dca34b9a87bdacc8cd9ad0ad935a364b45b850c08b461c32550bb4df185b66c3963c12f8171ba700c46c263baf92ded8eabc2476bb8cc0
 DIST orage-4.12.1.tar.bz2 2590788 BLAKE2B 0f00b5704e11923c2ceaac81f0956457402a90f65709c165c98b6942745ea3adee176691555a18548ead258951693187e1b3ce9a718abb3b13c2a1c2a4754e7e SHA512 3fec0201171140586cdc9bcf151450a7086515e18b5815afe4fe4c4726ba554c50582b0479e52985b330140c51b7233ef81f678f986f848afbeee74c66b2d196
-EBUILD orage-4.12.1-r1.ebuild 1610 BLAKE2B d236b513cd02b4d3b7b4f48eddd4b7f4ea3f1d805ffcdd0608d67ddaa65a38c26e5af4419b0a9c181ab3415db9bdf7be74c96c3af6a819eeb82e5138d0443820 SHA512 3d3147b6ea687b690c1c9122e511eb9f4ef99b3bf67da962b08a081a69f4d098939e0bc863d81a65de79c9224c126496e9143889ab2e53802f0dd3299121f25a
+EBUILD orage-4.12.1-r2.ebuild 1618 BLAKE2B 6021f8208ec66a1151023fef2fab820afa26aa3ea7e2614d8bfbcf72cd55e20367cbe1a497dc4e57f9dbdf47f42fc065930748e0f12b49206f63690c60b1a5b1 SHA512 fc5d622d707e2a938ca719f0ed03511f1e8025d18bf898a0107a0cbe773966b69ce2c3cc5b4a475ae5a541294730bf2c03ecbd3c44c5b3fdc6b0dcdf0b6bf7ef
 MISC metadata.xml 355 BLAKE2B 4ddbf38a80be81b7e131d7c616dfb88dff1e900952c17c4cc4dd26711e720351177d92d8225825dd57354399ecdb8b7bccd18f883fcd927846e8614dd4ac4a99 SHA512 a5d3f875ac31caa10ca77ce8eb38449b3007094d1b9d7d307bd15ee29644c09530d44ac6a4953e10adfa3bd45b6a3fe44dbbb3b80ab7d0c8572c48523ef287eb
diff --git a/app-office/orage/orage-4.12.1-r1.ebuild b/app-office/orage/orage-4.12.1-r2.ebuild
index fc906148f933..266c7de0db42 100644
--- a/app-office/orage/orage-4.12.1-r1.ebuild
+++ b/app-office/orage/orage-4.12.1-r2.ebuild
@@ -18,7 +18,7 @@ RDEPEND=">=dev-libs/libical-0.48:=
 	dev-libs/popt:=
 	>=x11-libs/gtk+-2.10:2=
 	berkdb? ( >=sys-libs/db-4:= )
-	clock-panel-plugin? ( >=xfce-base/xfce4-panel-4.10:= )
+	clock-panel-plugin? ( <xfce-base/xfce4-panel-4.15:=[gtk2(+)] )
 	dbus? ( >=dev-libs/dbus-glib-0.100:= )
 	libnotify? ( >=x11-libs/libnotify-0.7:= )"
 DEPEND="${RDEPEND}
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index d676b659a569..c5f0f953f3c2 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -1,17 +1,8 @@
 AUX scribus-1.5.3-fpic.patch 499 BLAKE2B 68790e6d7a76c4ae01490956b0db09bc79e1c27269fa4cd4c4752bd60b228e36973a1c32d5d8156c12782091fa15614ba274be07dee0d92df9ef521f2d4361a2 SHA512 e38fc85e72af67c0fea4c14dad92a759f5065cd4e337ef2257a90f27e39297c6991c467e53e9c51ae247bf2f8c34fa62fa76cf839a53b386c9c378e53756d015
-AUX scribus-1.5.5-docdir.patch 1053 BLAKE2B 3efadd63156463cd0d955b8de072082a3d958849e1c2107eb9bf16260048ad5e9f162162a4f148025fcad091dd44a1f291a6ae708f17014205791e5fcc24b613 SHA512 cae03652fcf541bdce1c89f60e7ba7e2cd14ad3846bbaa7c832e97ee7617188310f51e72c5e88947b51892b61c174f18db35785cf5631b436fc63d35056e2bf1
 AUX scribus-1.5.5-findhyphen-1.patch 1118 BLAKE2B c542a292601b43f12ee2b682225064bd650f2017466aed4aa3a256610dfe1aaa662857cf60682b3c8f1a0dd1b22b34b8c058967bc4879412e8599a641e254b18 SHA512 d536cce91eb161e2d8ead619f932111bcfe661bae9e0706567a0a789ef80eef28e6f81c357bd7bdaaeb97f8c6a872deb7147fea7fef84e279b7e8e812a821cef
-AUX scribus-1.5.5-findhyphen-2.patch 567 BLAKE2B c0aac324b9dc2238d5fd4ae857bcd2a704d10a936a6c152d83c824b0cd4979126f0c1e234e18430ed7894a06a0f000f851b462f8c8bd677f34695773b33f1b55 SHA512 bbcd503a33434625a4eb4f5661cec88aca88f64b078085872ba193ed1651e015a81bf7c0f2fa89588bce2247d286488bcdeacc9cad8e473bee08faa39a9df0e5
-AUX scribus-1.5.5-poppler-0.82.patch 5228 BLAKE2B 4d3dac11d77a41bca4ace028a249acacd07d4595dbd1611b15ad697fd6da5848cea880cb5edbc4411ed512bc3414261129b95984510750bdd5c1066185833d78 SHA512 8621876aa7ba5d91f48e2d4b1c9d865b2179e4029fdf1b122defa619454690328cc30d03963aad0865fe6dff480285fb21ba44c82d57d81f5b7ce1d687c34cc4
-AUX scribus-1.5.5-poppler-0.83.patch 5538 BLAKE2B 0d4b14e157f47dc6f0811918a2423f726c7a7019f75e99fc98744ece42b9516e15612879d16705d585c56d7ccd15ed7f0381787915958bd104076c527552e971 SHA512 1866f9f7c0ba51cb2030ab3fc0905dc49ba905f8400adbcdcc0395c46196b042fce07d67aab70f5d3847c1c2e5a74468375c20e90b222d9e27141a1ce85fb01c
-AUX scribus-1.5.5-poppler-0.84.patch 1359 BLAKE2B 7c0b3998fce5149a0b3d2e8d9f01ef66b2bd13d909d029f7970e264fa0d5fcc9e9beb16ecb77b858ff8ce237fb2d3ad8b7affa2d57b1d2719437869fc8bfafda SHA512 f593d62d3c7002e536f5d24c29ec7b54a6fb7f82ffb3c9363fc4816a27487a4c6929f174cb8808920d91ea2a57e181a9579b1d4182676a7e329775c1581143b6
-AUX scribus-1.5.5-poppler-0.86.patch 14366 BLAKE2B 868382aa0bce211465ebe26a704b784fe44fe67bc39bdc62532a3e1ae29766cb077d1b3cba9c9f5aeebe2cdbfdcbd1d7b37e33ef747cd212e6dec10cbe250b77 SHA512 5aef27942d02097e2b67c8249188e885086046399edcbf41018fe7480c5d1b6705609326a0823d7aec9c5b20fc8dfb16cc6435118792952a5e141bd434550583
-AUX scribus-1.5.5-qt-5.15.patch 695 BLAKE2B 040f9736e94bf5137c5e4f049095186c9383ee49619015d62b4799501702117884315c05f838345158b7b9878bc4349115bec4d4ea47634a3eecc3b3011c5c36 SHA512 a614838aa44ace29fddc359fa4b9bf7e5955aafe2efc248646e2e72eea0ba73f77794783397c2e1b4a92e9687cc562e721c3b462b180d308124a3d9b94520574
 AUX scribus-1.5.6-docdir.patch 1107 BLAKE2B 2bd9aa5bfc6b3b125cfdee0ff513749c9cc5fe1e5b5d12da1c92b14397e50d3a9ae40b20c2638e9e0eada080f3b9df30ddba3190f25bbde4102a887101d1b609 SHA512 fb6d23f6e5a53246a8f1dd168195c8f101d8ff3e2f05b7af09e1a58a4c3ed3ab05b07803cf5e7877da1b9e9c17dd0677580dbdeeeacd83063ab0bf4bbf60ae06
 AUX scribus-1.5.6-findhyphen.patch 597 BLAKE2B 166e71a1efd00262b9eead90e6b47457e4b8760e9df6607e551dc02ba8975ebbde52519b8c3b2327d6b78f2c2cca1f9a929367666fec017ce1ec4c9f70b30740 SHA512 9ea5fefb6d714e14d4be592db2e146d43d7af02d8343b6724ca919952c4840d2760f0f988d3d778c56aa7d3b8b571ac8e005f9e4acf2708e3aafab46e8ca16c9
-DIST scribus-1.5.5.tar.xz 73861836 BLAKE2B 1a10878eaba67116d72c20d8ecd8952764c709ad14d575e4eb921b4f8a7c4525b73e6722f610b1cce57c08540f619d6ebd3d32e04b653b310e475026c185561b SHA512 2d62424ad609296df33ced550940fceb4e15133a595a740cc4f4b4ffbc92aa31737336ac7716c2eed20d2866e37f5a9b780a44d86128daa6bbad3ccb58168b50
 DIST scribus-1.5.5_p20200626.tar.gz 87557791 BLAKE2B 183b035901f5a19ffbf5890acc6037eb5483a0b5837b244b39838ca03d13bd4afc76c3c41345123aec402c602177c5fff7183deba10f8e33e980659c4ef7881e SHA512 ff6cf0d86c874b7f03c8be9675f92c6cc7797e3a344326824e4f01f0b02ec02d6fdf5b52924e51b3436d9a6d78eda47a5e9987507721d18985768cc5a3c77245
-EBUILD scribus-1.5.5-r1.ebuild 4437 BLAKE2B bbdc4aca01970266c1f266609e4b7a43c760bcab70b05455f70e274a388d1e017330f387f1219b57f354a96f2c1493c4c6b41027d374f45f316c00ea277bf51b SHA512 d522010993b6805df278f55c62b876286d9cc700b46bbb3e1345a4a0cba23e0864c06f395f8c78a95731b2f7fc7c01df1ac0d613d6977b2864210b62c5805d95
-EBUILD scribus-1.5.5_p20200626.ebuild 4082 BLAKE2B 50a7feb8b12cf20ad57182dde2119cc22b1eab12bf3cde70a1288baa9acbc7ecf428736843d60663f409caba87b749656547eff738f03ee235a4ef14c8421eb6 SHA512 24f5d2dae11f2691aa054ccc4af537a06af4617e8b4852a3cd1d5a4761139b3427ed58d73d306ca129fb3a7884f1c1b2186c069a8916a51276b32b43c12a007c
+EBUILD scribus-1.5.5_p20200626.ebuild 4078 BLAKE2B 28b48945c2f0cfbe409a1b390c42eeaed0db28a0592284c67c62855c11f52415ded2b0eeb2f65d359c6af6535ebc74928d7786a4abcde191ffdeb02b5870b661 SHA512 ff283fe98f0ce8929a7456316ced12d97d0e8df373af0fde09e49af37ccf5f29a0569ceb65ef21a03ea3444ccaa4c65d33d3753a5ba6390fa1f6f87d47ce273a
 EBUILD scribus-9999.ebuild 3986 BLAKE2B f856409e29e5d57bb527f463ddada1e7461f48d16c872fec92328e781ef5a9e130b1c8fc0d06ffac59262ad28f22f7a9fb4cd387b96c0172b4cf6eeed72b205b SHA512 31fa1efd6797d803f6e5db8703fe3d40f2978f87dc9229872f5313b01ebeb6febb98d4f15ebf5c5a9afaf60d4e7de90b80b0d48e91c7e55915e66a703dd6f186
-MISC metadata.xml 845 BLAKE2B 6522fd7c428e4f5f8bd77c03a09408e443e91d45fb0bbe72a312d48f1cdee38ab62a4059940237f18aa2e63b0595b79598846d5acb3d7289427b9d1cae768510 SHA512 18872713a1aa8d6739186ffa60f8f747f8ee9de41339c8a2d20c49d97771ce3967839044f7573bab2d7717a73c2705722071d16441bb458060db5f9e5c15f3d1
+MISC metadata.xml 881 BLAKE2B 3cbd9331bb4a2a5c04529c21f9fbe08fc02ad12317b93867cc57e3b4a9d11ccd37f2842b63f6a609d093cf9f4e395a4ab412250d422c61f282339f4af78c33dd SHA512 571c8e45e1bd4cb783e635db4bf6e870dfc1efd593df275c61820ed9f9135659e5486d5c702d0f283323a8944390fe9f1b49b8929e92cd37b02a66b6b6a67ed9
diff --git a/app-office/scribus/files/scribus-1.5.5-docdir.patch b/app-office/scribus/files/scribus-1.5.5-docdir.patch
deleted file mode 100644
index 897a8a75ae95..000000000000
--- a/app-office/scribus/files/scribus-1.5.5-docdir.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f5b3e77..4c5fd3f 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -313,14 +313,16 @@ else()
- endif()
- 
- #SHARE - use the default on Apple as TAG_VERSION is empty
--if(WIN32 OR OS2)
--	set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/")
--elseif(TAG_VERSION OR BUILD_OSX_BUNDLE)
--	set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}${TAG_VERSION}/")
--elseif(NOT WANT_VERSIONING)
--	set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}/")
--else()
--	set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}-${VERSION}/")
-+if(NOT DOCDIR)
-+	if(WIN32 OR OS2)
-+		set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/")
-+	elseif(TAG_VERSION OR BUILD_OSX_BUNDLE)
-+		set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}${TAG_VERSION}/")
-+	elseif(NOT WANT_VERSIONING)
-+		set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}/")
-+	else()
-+		set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}-${VERSION}/")
-+	endif()
- endif()
- 
- if(IS_ABSOLUTE ${DOCDIR} AND WANT_RELOCATABLE)
diff --git a/app-office/scribus/files/scribus-1.5.5-findhyphen-2.patch b/app-office/scribus/files/scribus-1.5.5-findhyphen-2.patch
deleted file mode 100644
index a8993ca63874..000000000000
--- a/app-office/scribus/files/scribus-1.5.5-findhyphen-2.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/CMakeLists.txt	2019-07-31 00:34:43.000000000 +0200
-+++ b/CMakeLists.txt	2019-10-02 00:17:34.968355656 +0200
-@@ -954,6 +954,16 @@
- endif()
- #>>HUNSPELL for Speelling support
- 
-+#<<HYPHEN for Hyphenation support
-+find_package(HYPHEN)
-+if(HYPHEN_FOUND)
-+	message("System Hyphen Found OK")
-+	set(HAVE_HYPHEN ON)
-+else()
-+	message("Hyphen or its developer libraries NOT found - using bundled Hyphen instead")
-+endif()
-+#>>HYPHEN for Hyphenation support
-+
- #<<PoDoFo for AI PDF import
- option(WITH_PODOFO "Enable support for PDF embedded in AI" ON)
- if (WITH_PODOFO)
diff --git a/app-office/scribus/files/scribus-1.5.5-poppler-0.82.patch b/app-office/scribus/files/scribus-1.5.5-poppler-0.82.patch
deleted file mode 100644
index f1eb1e887da0..000000000000
--- a/app-office/scribus/files/scribus-1.5.5-poppler-0.82.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From 615b6185c70c70928cab1aab6e1340ba5f80c174 Mon Sep 17 00:00:00 2001
-From: Craig Bradney <mrb@scribus.info>
-Date: Mon, 28 Oct 2019 22:11:56 +0000
-Subject: [PATCH] Work around poppler 0.82 signature changes
-
-git-svn-id: svn://scribus.net/trunk/Scribus@23287 11d20701-8431-0410-a711-e3c959e3b870
-
-Use same mechanism as with previous poppler versions to support change of constness in function signatures
-
-git-svn-id: svn://scribus.net/trunk/Scribus@23289 11d20701-8431-0410-a711-e3c959e3b870
----
- scribus/plugins/import/pdf/importpdfconfig.h | 6 ++++++
- scribus/plugins/import/pdf/slaoutput.cpp     | 6 +++---
- scribus/plugins/import/pdf/slaoutput.h       | 6 +++---
- 3 files changed, 12 insertions(+), 6 deletions(-)
-
-diff --git a/scribus/plugins/import/pdf/importpdfconfig.h b/scribus/plugins/import/pdf/importpdfconfig.h
-index 2a13b0d10..9913ee382 100644
---- a/scribus/plugins/import/pdf/importpdfconfig.h
-+++ b/scribus/plugins/import/pdf/importpdfconfig.h
-@@ -52,4 +52,10 @@ for which a new license (GPL+exception) is in place.
- #define POPPLER_REF
- #endif
- 
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 82, 0)
-+#define POPPLER_CONST_082 const
-+#else
-+#define POPPLER_CONST_082
-+#endif
-+
- #endif
-diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp
-index 6094f3d9e..520474f65 100644
---- a/scribus/plugins/import/pdf/slaoutput.cpp
-+++ b/scribus/plugins/import/pdf/slaoutput.cpp
-@@ -2784,7 +2784,7 @@ void SlaOutputDev::drawMaskedImage(GfxState *state, Object *ref, Stream *str,  i
- 	delete[] mbuffer;
- }
- 
--void SlaOutputDev::drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, GBool interpolate, int *maskColors, GBool inlineImg)
-+void SlaOutputDev::drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, GBool interpolate, POPPLER_CONST_082 int* maskColors, GBool inlineImg)
- {
- 	ImageStream * imgStr = new ImageStream(str, width, colorMap->getNumPixelComps(), colorMap->getBits());
- //	qDebug() << "Image Components" << colorMap->getNumPixelComps() << "Mask" << maskColors;
-@@ -3365,7 +3365,7 @@ err1:
- 		fontsrc->unref();
- }
- 
--void SlaOutputDev::drawChar(GfxState *state, double x, double y, double dx, double dy, double originX, double originY, CharCode code, int nBytes, Unicode *u, int uLen)
-+void SlaOutputDev::drawChar(GfxState *state, double x, double y, double dx, double dy, double originX, double originY, CharCode code, int nBytes, POPPLER_CONST_082 Unicode *u, int uLen)
- {
- 	double x1, y1, x2, y2;
- 	int render;
-@@ -3452,7 +3452,7 @@ void SlaOutputDev::drawChar(GfxState *state, double x, double y, double dx, doub
- 	}
- }
- 
--GBool SlaOutputDev::beginType3Char(GfxState *state, double x, double y, double dx, double dy, CharCode code, Unicode *u, int uLen)
-+GBool SlaOutputDev::beginType3Char(GfxState *state, double x, double y, double dx, double dy, CharCode code, POPPLER_CONST_082 Unicode *u, int uLen)
- {
- //	qDebug() << "beginType3Char";
- 	GfxFont *gfxFont;
-diff --git a/scribus/plugins/import/pdf/slaoutput.h b/scribus/plugins/import/pdf/slaoutput.h
-index bc4350a03..14a590d55 100644
---- a/scribus/plugins/import/pdf/slaoutput.h
-+++ b/scribus/plugins/import/pdf/slaoutput.h
-@@ -229,7 +229,7 @@ public:
- 
- 	//----- image drawing
- 	void drawImageMask(GfxState *state, Object *ref, Stream *str, int width, int height, GBool invert, GBool interpolate, GBool inlineImg) override;
--	void drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, GBool interpolate, int *maskColors, GBool inlineImg) override;
-+	void drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, GBool interpolate, POPPLER_CONST_082 int *maskColors, GBool inlineImg) override;
- 	void drawSoftMaskedImage(GfxState *state, Object *ref, Stream *str,
- 				   int width, int height,
- 				   GfxImageColorMap *colorMap,
-@@ -261,8 +261,8 @@ public:
- 	//----- text drawing
- 	void  beginTextObject(GfxState *state) override;
- 	void  endTextObject(GfxState *state) override;
--	void  drawChar(GfxState *state, double /*x*/, double /*y*/, double /*dx*/, double /*dy*/, double /*originX*/, double /*originY*/, CharCode /*code*/, int /*nBytes*/, Unicode * /*u*/, int /*uLen*/) override;
--	GBool beginType3Char(GfxState * /*state*/, double /*x*/, double /*y*/, double /*dx*/, double /*dy*/, CharCode /*code*/, Unicode * /*u*/, int /*uLen*/) override;
-+	void  drawChar(GfxState *state, double /*x*/, double /*y*/, double /*dx*/, double /*dy*/, double /*originX*/, double /*originY*/, CharCode /*code*/, int /*nBytes*/, POPPLER_CONST_082 Unicode * /*u*/, int /*uLen*/) override;
-+	GBool beginType3Char(GfxState * /*state*/, double /*x*/, double /*y*/, double /*dx*/, double /*dy*/, CharCode /*code*/, POPPLER_CONST_082 Unicode * /*u*/, int /*uLen*/) override;
- 	void  endType3Char(GfxState * /*state*/) override;
- 	void  type3D0(GfxState * /*state*/, double /*wx*/, double /*wy*/) override;
- 	void  type3D1(GfxState * /*state*/, double /*wx*/, double /*wy*/, double /*llx*/, double /*lly*/, double /*urx*/, double /*ury*/) override;
--- 
-2.23.0
-
diff --git a/app-office/scribus/files/scribus-1.5.5-poppler-0.83.patch b/app-office/scribus/files/scribus-1.5.5-poppler-0.83.patch
deleted file mode 100644
index 0d52486da924..000000000000
--- a/app-office/scribus/files/scribus-1.5.5-poppler-0.83.patch
+++ /dev/null
@@ -1,153 +0,0 @@
-Source/Upstream: Yes fixed in svn
-Reason: Fix build with poppler 0.83.0
-
-From b51c2bab4d57d685f96d427d6816bdd4ecfb4674 Mon Sep 17 00:00:00 2001
-From: Jean Ghali <jghali@libertysurf.fr>
-Date: Wed, 4 Dec 2019 05:51:19 +0000
-Subject: [PATCH] #15985: Fix failure to build against poppler 0.83.0
-
-git-svn-id: svn://scribus.net/trunk/Scribus@23395 11d20701-8431-0410-a711-e3c959e3b870
----
- scribus/plugins/import/pdf/importpdf.cpp     | 22 ++++++++++++++++++++
- scribus/plugins/import/pdf/importpdfconfig.h |  6 ++++++
- scribus/plugins/import/pdf/slaoutput.cpp     |  4 ++--
- scribus/plugins/import/pdf/slaoutput.h       |  2 +-
- 4 files changed, 31 insertions(+), 3 deletions(-)
-
-diff --git a/scribus/plugins/import/pdf/importpdf.cpp b/scribus/plugins/import/pdf/importpdf.cpp
-index 2ab38ac758..427cd66ef2 100644
---- a/scribus/plugins/import/pdf/importpdf.cpp
-+++ b/scribus/plugins/import/pdf/importpdf.cpp
-@@ -74,7 +74,11 @@ PdfPlug::PdfPlug(ScribusDoc* doc, int flags)
- QImage PdfPlug::readThumbnail(const QString& fName)
- {
- 	QString pdfFile = QDir::toNativeSeparators(fName);
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 83, 0)
-+	globalParams.reset(new GlobalParams());
-+#else
- 	globalParams = new GlobalParams();
-+#endif
- 	if (globalParams)
- 	{
- #if defined(Q_OS_WIN32) && POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 62, 0)
-@@ -89,7 +93,9 @@ QImage PdfPlug::readThumbnail(const QString& fName)
- 			if (pdfDoc->getErrorCode() == errEncrypted)
- 			{
- 				delete pdfDoc;
-+#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(0, 83, 0)
- 				delete globalParams;
-+#endif
- 				return QImage();
- 			}
- 			if (pdfDoc->isOk())
-@@ -133,11 +139,15 @@ QImage PdfPlug::readThumbnail(const QString& fName)
- 				image.setText("YSize", QString("%1").arg(h));
- 				delete dev;
- 				delete pdfDoc;
-+#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(0, 83, 0)
- 				delete globalParams;
-+#endif
- 				return image;
- 			}
- 			delete pdfDoc;
-+#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(0, 83, 0)
- 			delete globalParams;
-+#endif
- 		}
- 	}
- 	return QImage();
-@@ -343,7 +353,11 @@ bool PdfPlug::convert(const QString& fn)
- 		qApp->processEvents();
- 	}
- 
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 83, 0)
-+	globalParams.reset(new GlobalParams());
-+#else
- 	globalParams = new GlobalParams();
-+#endif
- 	GooString *userPW = nullptr;
- 	if (globalParams)
- 	{
-@@ -385,7 +399,9 @@ bool PdfPlug::convert(const QString& fn)
- 					if (progressDialog)
- 						progressDialog->close();
- 					delete pdfDoc;
-+#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(0, 83, 0)
- 					delete globalParams;
-+#endif
- 					return false;
- 				}
- 				if (progressDialog)
-@@ -430,7 +446,9 @@ bool PdfPlug::convert(const QString& fn)
- 							progressDialog->close();
- 						delete optImp;
- 						delete pdfDoc;
-+#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(0, 83, 0)
- 						delete globalParams;
-+#endif
- 						return false;
- 					}
- 					pageString = optImp->getPagesString();
-@@ -843,8 +861,12 @@ bool PdfPlug::convert(const QString& fn)
- 		}
- 		delete pdfDoc;
- 	}
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 83, 0)
-+	globalParams.release();
-+#else
- 	delete globalParams;
- 	globalParams = nullptr;
-+#endif
- 
- //	qDebug() << "converting finished";
- //	qDebug() << "Imported" << Elements.count() << "Elements";
-diff --git a/scribus/plugins/import/pdf/importpdfconfig.h b/scribus/plugins/import/pdf/importpdfconfig.h
-index 9913ee382c..5a7e0d2162 100644
---- a/scribus/plugins/import/pdf/importpdfconfig.h
-+++ b/scribus/plugins/import/pdf/importpdfconfig.h
-@@ -58,4 +58,10 @@ for which a new license (GPL+exception) is in place.
- #define POPPLER_CONST_082
- #endif
- 
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 83, 0)
-+#define POPPLER_CONST_083 const
-+#else
-+#define POPPLER_CONST_083
-+#endif
-+
- #endif
-diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp
-index 5e4d32a551..ffcfa8450b 100644
---- a/scribus/plugins/import/pdf/slaoutput.cpp
-+++ b/scribus/plugins/import/pdf/slaoutput.cpp
-@@ -3678,7 +3678,7 @@ QString SlaOutputDev::getAnnotationColor(const AnnotColor *color)
- 	return fNam;
- }
- 
--QString SlaOutputDev::convertPath(GfxPath *path)
-+QString SlaOutputDev::convertPath(POPPLER_CONST_083 GfxPath *path)
- {
- 	if (! path)
- 		return QString();
-@@ -3688,7 +3688,7 @@ QString SlaOutputDev::convertPath(GfxPath *path)
- 
- 	for (int i = 0; i < path->getNumSubpaths(); ++i)
- 	{
--		GfxSubpath * subpath = path->getSubpath(i);
-+		POPPLER_CONST_083 GfxSubpath * subpath = path->getSubpath(i);
- 		if (subpath->getNumPoints() > 0)
- 		{
- 			output += QString("M %1 %2").arg(subpath->getX(0)).arg(subpath->getY(0));
-diff --git a/scribus/plugins/import/pdf/slaoutput.h b/scribus/plugins/import/pdf/slaoutput.h
-index 60fb900618..d928fada81 100644
---- a/scribus/plugins/import/pdf/slaoutput.h
-+++ b/scribus/plugins/import/pdf/slaoutput.h
-@@ -282,7 +282,7 @@ class SlaOutputDev : public OutputDev
- 	void getPenState(GfxState *state);
- 	QString getColor(GfxColorSpace *color_space, POPPLER_CONST_070 GfxColor *color, int *shade);
- 	QString getAnnotationColor(const AnnotColor *color);
--	QString convertPath(GfxPath *path);
-+	QString convertPath(POPPLER_CONST_083 GfxPath *path);
- 	int getBlendMode(GfxState *state);
- 	void applyMask(PageItem *ite);
- 	void pushGroup(const QString& maskName = "", GBool forSoftMask = gFalse, GBool alpha = gFalse, bool inverted = false);
diff --git a/app-office/scribus/files/scribus-1.5.5-poppler-0.84.patch b/app-office/scribus/files/scribus-1.5.5-poppler-0.84.patch
deleted file mode 100644
index de1f39411e8e..000000000000
--- a/app-office/scribus/files/scribus-1.5.5-poppler-0.84.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 3742559924136c2471ab15081c5b600dd5feaeb0 Mon Sep 17 00:00:00 2001
-From: Jean Ghali <jghali@libertysurf.fr>
-Date: Sat, 28 Dec 2019 21:32:29 +0000
-Subject: [PATCH] Fix failure to build with poppler 0.84.0
-
-git-svn-id: svn://scribus.net/trunk/Scribus@23429 11d20701-8431-0410-a711-e3c959e3b870
----
- scribus/plugins/import/pdf/slaoutput.cpp | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp
-index ffcfa8450b..d788f9f06c 100644
---- a/scribus/plugins/import/pdf/slaoutput.cpp
-+++ b/scribus/plugins/import/pdf/slaoutput.cpp
-@@ -1189,6 +1189,11 @@ void SlaOutputDev::startDoc(PDFDoc *doc, XRef *xrefA, Catalog *catA)
- 	catalog = catA;
- 	pdfDoc = doc;
- 	updateGUICounter = 0;
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 84, 0)
-+	m_fontEngine = new SplashFontEngine(true, true, true, true);
-+#elif POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 61, 0)
-+	m_fontEngine = new SplashFontEngine(globalParams->getEnableFreeType(), true, true, true);
-+#else
- 	m_fontEngine = new SplashFontEngine(
- #if HAVE_T1LIB_H
- 	globalParams->getEnableT1lib(),
-@@ -1199,6 +1204,7 @@ void SlaOutputDev::startDoc(PDFDoc *doc, XRef *xrefA, Catalog *catA)
- 	true,
- #endif
- 	true);
-+#endif
- }
- 
- void SlaOutputDev::startPage(int pageNum, GfxState *, XRef *)
diff --git a/app-office/scribus/files/scribus-1.5.5-poppler-0.86.patch b/app-office/scribus/files/scribus-1.5.5-poppler-0.86.patch
deleted file mode 100644
index e91bb3afdb6c..000000000000
--- a/app-office/scribus/files/scribus-1.5.5-poppler-0.86.patch
+++ /dev/null
@@ -1,459 +0,0 @@
-From 67f8771aaff2f55d61b8246f420e762f4b526944 Mon Sep 17 00:00:00 2001
-From: Jean Ghali <jghali@libertysurf.fr>
-Date: Mon, 2 Mar 2020 14:45:59 +0000
-Subject: [PATCH] PDF import plugin: support poppler 0.86.x
-
-git-svn-id: svn://scribus.net/trunk/Scribus@23478 11d20701-8431-0410-a711-e3c959e3b870
----
- scribus/plugins/import/pdf/importpdf.cpp |  51 +++++++-
- scribus/plugins/import/pdf/importpdf.h   |  19 +--
- scribus/plugins/import/pdf/slaoutput.cpp | 154 +++++++++++++++++++++--
- scribus/plugins/import/pdf/slaoutput.h   |  13 +-
- 4 files changed, 215 insertions(+), 22 deletions(-)
-
-diff --git a/scribus/plugins/import/pdf/importpdf.cpp b/scribus/plugins/import/pdf/importpdf.cpp
-index 427cd66ef2..4679674a4d 100644
---- a/scribus/plugins/import/pdf/importpdf.cpp
-+++ b/scribus/plugins/import/pdf/importpdf.cpp
-@@ -791,11 +791,20 @@ bool PdfPlug::convert(const QString& fn)
- 								names = catDict.dictLookup("OpenAction");
- 								if (names.isDict())
- 								{
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0)
-+									std::unique_ptr<LinkAction> linkAction;
-+									linkAction = LinkAction::parseAction(&names, pdfDoc->getCatalog()->getBaseURI());
-+#else
- 									LinkAction *linkAction = nullptr;
- 									linkAction = LinkAction::parseAction(&names, pdfDoc->getCatalog()->getBaseURI());
-+#endif
- 									if (linkAction)
- 									{
--										LinkJavaScript *jsa = (LinkJavaScript*)linkAction;
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0)
-+										LinkJavaScript *jsa = (LinkJavaScript*) linkAction.get();
-+#else
-+										LinkJavaScript *jsa = (LinkJavaScript*) linkAction;
-+#endif
- 										if (jsa->isOk())
- 										{
- 											QString script = UnicodeParsedString(jsa->getScript());
-@@ -1003,3 +1012,43 @@ QString PdfPlug::UnicodeParsedString(POPPLER_CONST GooString *s1)
- 	}
- 	return result;
- }
-+
-+QString PdfPlug::UnicodeParsedString(const std::string& s1)
-+{
-+	if (s1.length() == 0)
-+		return QString();
-+	GBool isUnicode;
-+	int i;
-+	Unicode u;
-+	QString result;
-+	if ((s1.at(0) & 0xff) == 0xfe && (s1.length() > 1 && (s1.at(1) & 0xff) == 0xff))
-+	{
-+		isUnicode = gTrue;
-+		i = 2;
-+		result.reserve((s1.length() - 2) / 2);
-+	}
-+	else
-+	{
-+		isUnicode = gFalse;
-+		i = 0;
-+		result.reserve(s1.length());
-+	}
-+	while (i < s1.length())
-+	{
-+		if (isUnicode)
-+		{
-+			u = ((s1.at(i) & 0xff) << 8) | (s1.at(i+1) & 0xff);
-+			i += 2;
-+		}
-+		else
-+		{
-+			u = s1.at(i) & 0xff;
-+			++i;
-+		}
-+		// #15616: imagemagick may write unicode strings incorrectly in PDF
-+		if (u == 0)
-+			continue;
-+		result += QChar( u );
-+	}
-+	return result;
-+}
-diff --git a/scribus/plugins/import/pdf/importpdf.h b/scribus/plugins/import/pdf/importpdf.h
-index bb58fd208f..bc55819618 100644
---- a/scribus/plugins/import/pdf/importpdf.h
-+++ b/scribus/plugins/import/pdf/importpdf.h
-@@ -82,6 +84,7 @@ class PdfPlug : public QObject
- 	bool convert(const QString& fn);
- 	QRectF getCBox(int box, int pgNum);
- 	QString UnicodeParsedString(POPPLER_CONST GooString *s1);
-+	QString UnicodeParsedString(const std::string& s1);
- 	
- 	QList<PageItem*> Elements;
- 	double baseX, baseY;
-diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp
-index 93ceb1e305..6e73049ef7 100644
---- a/scribus/plugins/import/pdf/slaoutput.cpp
-+++ b/scribus/plugins/import/pdf/slaoutput.cpp
-@@ -273,9 +273,15 @@ LinkAction* SlaOutputDev::SC_getAction(AnnotWidget *ano)
- }
- 
- /* Replacement for the crippled Poppler function LinkAction* AnnotWidget::getAdditionalAction(AdditionalActionsType type) */
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0)
-+std::unique_ptr<LinkAction> SlaOutputDev::SC_getAdditionalAction(const char *key, AnnotWidget *ano)
-+{
-+	std::unique_ptr<LinkAction> linkAction;
-+#else
- LinkAction* SlaOutputDev::SC_getAdditionalAction(const char *key, AnnotWidget *ano)
- {
- 	LinkAction *linkAction = nullptr;
-+#endif
- 	Object obj;
- 	Ref refa = ano->getRef();
- 
-@@ -420,7 +426,11 @@ bool SlaOutputDev::handleLinkAnnot(Annot* annota, double xCoor, double yCoor, do
- 			POPPLER_CONST GooString *ndst = gto->getNamedDest();
- 			if (ndst)
- 			{
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0)
-+				std::unique_ptr<LinkDest> dstn = pdfDoc->findDest(ndst);
-+#else
- 				LinkDest *dstn = pdfDoc->findDest(ndst);
-+#endif
- 				if (dstn)
- 				{
- 					if (dstn->getKind() == destXYZ)
-@@ -464,7 +474,11 @@ bool SlaOutputDev::handleLinkAnnot(Annot* annota, double xCoor, double yCoor, do
- 			POPPLER_CONST GooString *ndst = gto->getNamedDest();
- 			if (ndst)
- 			{
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0)
-+				std::unique_ptr<LinkDest> dstn = pdfDoc->findDest(ndst);
-+#else
- 				LinkDest *dstn = pdfDoc->findDest(ndst);
-+#endif
- 				if (dstn)
- 				{
- 					if (dstn->getKind() == destXYZ)
-@@ -932,7 +946,11 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotWidget *ano)
- 				POPPLER_CONST GooString *ndst = gto->getNamedDest();
- 				if (ndst)
- 				{
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0)
-+					std::unique_ptr<LinkDest> dstn = pdfDoc->findDest(ndst);
-+#else
- 					LinkDest *dstn = pdfDoc->findDest(ndst);
-+#endif
- 					if (dstn)
- 					{
- 						if (dstn->getKind() == destXYZ)
-@@ -984,7 +1002,11 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotWidget *ano)
- 				POPPLER_CONST GooString *ndst = gto->getNamedDest();
- 				if (ndst)
- 				{
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0)
-+					std::unique_ptr<LinkDest> dstn = pdfDoc->findDest(ndst);
-+#else
- 					LinkDest *dstn = pdfDoc->findDest(ndst);
-+#endif
- 					if (dstn)
- 					{
- 						if (dstn->getKind() == destXYZ)
-@@ -1053,96 +1075,148 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotWidget *ano)
- 		else
- 			qDebug() << "Found unsupported Action of type" << Lact->getKind();
- 	}
--	LinkAction *Aact = SC_getAdditionalAction("D", ano);
-+	auto Aact = SC_getAdditionalAction("D", ano);
- 	if (Aact)
- 	{
- 		if (Aact->getKind() == actionJavaScript)
- 		{
--			LinkJavaScript *jsa = (LinkJavaScript*)Aact;
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0)
-+			LinkJavaScript *jsa = (LinkJavaScript*) Aact.get();
-+#else
-+			LinkJavaScript *jsa = (LinkJavaScript*) Aact;
-+#endif
- 			if (jsa->isOk())
- 			{
- 				ite->annotation().setD_act(UnicodeParsedString(jsa->getScript()));
- 				ite->annotation().setAAact(true);
- 			}
- 		}
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0)
-+		Aact.reset();
-+#else
- 		Aact = nullptr;
-+#endif
- 	}
- 	Aact = SC_getAdditionalAction("E", ano);
- 	if (Aact)
- 	{
- 		if (Aact->getKind() == actionJavaScript)
- 		{
--			LinkJavaScript *jsa = (LinkJavaScript*)Aact;
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0)
-+			LinkJavaScript *jsa = (LinkJavaScript*) Aact.get();
-+#else
-+			LinkJavaScript *jsa = (LinkJavaScript*) Aact;
-+#endif
- 			if (jsa->isOk())
- 			{
- 				ite->annotation().setE_act(UnicodeParsedString(jsa->getScript()));
- 				ite->annotation().setAAact(true);
- 			}
- 		}
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0)
-+		Aact.reset();
-+#else
- 		Aact = nullptr;
-+#endif
- 	}
- 	Aact = SC_getAdditionalAction("X", ano);
- 	if (Aact)
- 	{
- 		if (Aact->getKind() == actionJavaScript)
- 		{
--			LinkJavaScript *jsa = (LinkJavaScript*)Aact;
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0)
-+			LinkJavaScript *jsa = (LinkJavaScript*) Aact.get();
-+#else
-+			LinkJavaScript *jsa = (LinkJavaScript*) Aact;
-+#endif
- 			if (jsa->isOk())
- 			{
- 				ite->annotation().setX_act(UnicodeParsedString(jsa->getScript()));
- 				ite->annotation().setAAact(true);
- 			}
- 		}
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0)
-+		Aact.reset();
-+#else
- 		Aact = nullptr;
-+#endif
- 	}
- 	Aact = SC_getAdditionalAction("Fo", ano);
- 	if (Aact)
- 	{
- 		if (Aact->getKind() == actionJavaScript)
- 		{
--			LinkJavaScript *jsa = (LinkJavaScript*)Aact;
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0)
-+			LinkJavaScript *jsa = (LinkJavaScript*) Aact.get();
-+#else
-+			LinkJavaScript *jsa = (LinkJavaScript*) Aact;
-+#endif
- 			if (jsa->isOk())
- 			{
- 				ite->annotation().setFo_act(UnicodeParsedString(jsa->getScript()));
- 				ite->annotation().setAAact(true);
- 			}
- 		}
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0)
-+		Aact.reset();
-+#else
- 		Aact = nullptr;
-+#endif
- 	}
- 	Aact = SC_getAdditionalAction("Bl", ano);
- 	if (Aact)
- 	{
- 		if (Aact->getKind() == actionJavaScript)
- 		{
--			LinkJavaScript *jsa = (LinkJavaScript*)Aact;
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0)
-+			LinkJavaScript *jsa = (LinkJavaScript*) Aact.get();
-+#else
-+			LinkJavaScript *jsa = (LinkJavaScript*) Aact;
-+#endif
- 			if (jsa->isOk())
- 			{
- 				ite->annotation().setBl_act(UnicodeParsedString(jsa->getScript()));
- 				ite->annotation().setAAact(true);
- 			}
- 		}
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0)
-+		Aact.reset();
-+#else
- 		Aact = nullptr;
-+#endif
- 	}
- 	Aact = SC_getAdditionalAction("C", ano);
- 	if (Aact)
- 	{
- 		if (Aact->getKind() == actionJavaScript)
- 		{
--			LinkJavaScript *jsa = (LinkJavaScript*)Aact;
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0)
-+			LinkJavaScript *jsa = (LinkJavaScript*) Aact.get();
-+#else
-+			LinkJavaScript *jsa = (LinkJavaScript*) Aact;
-+#endif
- 			if (jsa->isOk())
- 			{
- 				ite->annotation().setC_act(UnicodeParsedString(jsa->getScript()));
- 				ite->annotation().setAAact(true);
- 			}
- 		}
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0)
-+		Aact.reset();
-+#else
- 		Aact = nullptr;
-+#endif
- 	}
- 	Aact = SC_getAdditionalAction("F", ano);
- 	if (Aact)
- 	{
- 		if (Aact->getKind() == actionJavaScript)
- 		{
--			LinkJavaScript *jsa = (LinkJavaScript*)Aact;
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0)
-+			LinkJavaScript *jsa = (LinkJavaScript*) Aact.get();
-+#else
-+			LinkJavaScript *jsa = (LinkJavaScript*) Aact;
-+#endif
- 			if (jsa->isOk())
- 			{
- 				ite->annotation().setF_act(UnicodeParsedString(jsa->getScript()));
-@@ -1150,14 +1224,22 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotWidget *ano)
- 				ite->annotation().setFormat(5);
- 			}
- 		}
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0)
-+		Aact.reset();
-+#else
- 		Aact = nullptr;
-+#endif
- 	}
- 	Aact = SC_getAdditionalAction("K", ano);
- 	if (Aact)
- 	{
- 		if (Aact->getKind() == actionJavaScript)
- 		{
--			LinkJavaScript *jsa = (LinkJavaScript*)Aact;
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0)
-+			LinkJavaScript *jsa = (LinkJavaScript*) Aact.get();
-+#else
-+			LinkJavaScript *jsa = (LinkJavaScript*) Aact;
-+#endif
- 			if (jsa->isOk())
- 			{
- 				ite->annotation().setK_act(UnicodeParsedString(jsa->getScript()));
-@@ -1165,21 +1247,33 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotWidget *ano)
- 				ite->annotation().setFormat(5);
- 			}
- 		}
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0)
-+		Aact.reset();
-+#else
- 		Aact = nullptr;
-+#endif
- 	}
- 	Aact = SC_getAdditionalAction("V", ano);
- 	if (Aact)
- 	{
- 		if (Aact->getKind() == actionJavaScript)
- 		{
--			LinkJavaScript *jsa = (LinkJavaScript*)Aact;
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0)
-+			LinkJavaScript *jsa = (LinkJavaScript*) Aact.get();
-+#else
-+			LinkJavaScript *jsa = (LinkJavaScript*) Aact;
-+#endif
- 			if (jsa->isOk())
- 			{
- 				ite->annotation().setV_act(UnicodeParsedString(jsa->getScript()));
- 				ite->annotation().setAAact(true);
- 			}
- 		}
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0)
-+		Aact.reset();
-+#else
- 		Aact = nullptr;
-+#endif
- 	}
- }
- 
-@@ -3901,6 +3995,46 @@ QString SlaOutputDev::UnicodeParsedString(POPPLER_CONST GooString *s1)
- 	return result;
- }
- 
-+QString SlaOutputDev::UnicodeParsedString(const std::string& s1)
-+{
-+	if (s1.length() == 0)
-+		return QString();
-+	GBool isUnicode;
-+	int i;
-+	Unicode u;
-+	QString result;
-+	if ((s1.at(0) & 0xff) == 0xfe && (s1.length() > 1 && (s1.at(1) & 0xff) == 0xff))
-+	{
-+		isUnicode = gTrue;
-+		i = 2;
-+		result.reserve((s1.length() - 2) / 2);
-+	}
-+	else
-+	{
-+		isUnicode = gFalse;
-+		i = 0;
-+		result.reserve(s1.length());
-+	}
-+	while (i < s1.length())
-+	{
-+		if (isUnicode)
-+		{
-+			u = ((s1.at(i) & 0xff) << 8) | (s1.at(i+1) & 0xff);
-+			i += 2;
-+		}
-+		else
-+		{
-+			u = s1.at(i) & 0xff;
-+			++i;
-+		}
-+		// #15616: imagemagick may write unicode strings incorrectly in PDF
-+		if (u == 0)
-+			continue;
-+		result += QChar( u );
-+	}
-+	return result;
-+}
-+
- bool SlaOutputDev::checkClip()
- {
- 	bool ret = false;
-diff --git a/scribus/plugins/import/pdf/slaoutput.h b/scribus/plugins/import/pdf/slaoutput.h
-index d928fada81..67b5a51937 100644
---- a/scribus/plugins/import/pdf/slaoutput.h
-+++ b/scribus/plugins/import/pdf/slaoutput.h
-@@ -20,6 +20,8 @@ for which a new license (GPL+exception) is in place.
- #include <QTextStream>
- #include <QTransform>
- 
-+#include <memory>
-+
- #include "fpointarray.h"
- #include "importpdfconfig.h"
- #include "pageitem.h"
-@@ -159,7 +161,11 @@ class SlaOutputDev : public OutputDev
- 	virtual ~SlaOutputDev();
- 
- 	LinkAction* SC_getAction(AnnotWidget *ano);
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0)
-+	std::unique_ptr<LinkAction> SC_getAdditionalAction(const char *key, AnnotWidget *ano);
-+#else
- 	LinkAction* SC_getAdditionalAction(const char *key, AnnotWidget *ano);
-+#endif
- 	static GBool annotations_callback(Annot *annota, void *user_data);
- 	bool handleTextAnnot(Annot* annota, double xCoor, double yCoor, double width, double height);
- 	bool handleLinkAnnot(Annot* annota, double xCoor, double yCoor, double width, double height);
-@@ -287,6 +293,7 @@ class SlaOutputDev : public OutputDev
- 	void applyMask(PageItem *ite);
- 	void pushGroup(const QString& maskName = "", GBool forSoftMask = gFalse, GBool alpha = gFalse, bool inverted = false);
- 	QString UnicodeParsedString(POPPLER_CONST GooString *s1);
-+	QString UnicodeParsedString(const std::string& s1);
- 	bool checkClip();
- 	bool pathIsClosed {false};
- 	QString CurrColorFill;
diff --git a/app-office/scribus/files/scribus-1.5.5-qt-5.15.patch b/app-office/scribus/files/scribus-1.5.5-qt-5.15.patch
deleted file mode 100644
index 4ece0feb8e44..000000000000
--- a/app-office/scribus/files/scribus-1.5.5-qt-5.15.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 17d6a9833488163d7c33c3f2233916b18550e253 Mon Sep 17 00:00:00 2001
-From: Jean Ghali <jghali@libertysurf.fr>
-Date: Sun, 29 Mar 2020 10:55:06 +0000
-Subject: [PATCH] #16076: Fix build with Qt 5.15 <heirecka>
-
-git-svn-id: svn://scribus.net/trunk/Scribus@23541 11d20701-8431-0410-a711-e3c959e3b870
----
- scribus/ui/scresizecursor.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/scribus/ui/scresizecursor.cpp b/scribus/ui/scresizecursor.cpp
-index f2c78e5ae7..85271ed861 100644
---- a/scribus/ui/scresizecursor.cpp
-+++ b/scribus/ui/scresizecursor.cpp
-@@ -12,6 +12,7 @@
- 
- #include <QDebug>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QPixmap>
- #include <QPen>
- #include <QBrush>
diff --git a/app-office/scribus/metadata.xml b/app-office/scribus/metadata.xml
index 02d7f56a4fef..ab1b2fa6c137 100644
--- a/app-office/scribus/metadata.xml
+++ b/app-office/scribus/metadata.xml
@@ -2,7 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
-    <email>jlec@gentoo.org</email>
+    <email>fordfrog@gentoo.org</email>
+    <name>Miroslav Šulc</name>
   </maintainer>
   <use>
     <flag name="boost">Enable support for Boost based enhancement</flag>
diff --git a/app-office/scribus/scribus-1.5.5-r1.ebuild b/app-office/scribus/scribus-1.5.5-r1.ebuild
deleted file mode 100644
index 9ba577497293..000000000000
--- a/app-office/scribus/scribus-1.5.5-r1.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="tk?"
-inherit cmake desktop flag-o-matic python-single-r1 xdg
-
-DESCRIPTION="Desktop publishing (DTP) and layout program"
-HOMEPAGE="https://www.scribus.net/"
-SRC_URI="mirror://sourceforge/project/${PN}/${PN}-devel/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts +templates tk"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	tk? ( scripts )"
-
-# osg
-# couple of third_party libs bundled
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-DEPEND="${PYTHON_DEPS}
-	app-text/libmspub
-	app-text/libqxp
-	app-text/poppler:=
-	dev-libs/hyphen
-	>=dev-libs/icu-58.2:0=
-	dev-libs/librevenge
-	dev-libs/libxml2
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5[-gles2-only]
-	dev-qt/qtnetwork:5
-	dev-qt/qtopengl:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	media-libs/fontconfig
-	media-libs/freetype:2
-	>=media-libs/harfbuzz-0.9.42:0=[icu]
-	media-libs/lcms:2
-	media-libs/libcdr
-	media-libs/libfreehand
-	media-libs/libpagemaker
-	media-libs/libpng:0=
-	media-libs/libvisio
-	media-libs/libzmf
-	media-libs/tiff:0
-	net-print/cups
-	sys-libs/zlib[minizip]
-	virtual/jpeg:0=
-	>=x11-libs/cairo-1.10.0[X,svg]
-	boost? ( >=dev-libs/boost-1.67:= )
-	hunspell? ( app-text/hunspell:= )
-	graphicsmagick? ( media-gfx/graphicsmagick:= )
-	osg? ( dev-games/openscenegraph:= )
-	pdf? ( app-text/podofo:0= )
-	scripts? (
-		$(python_gen_cond_dep '
-			dev-python/pillow[tk?,${PYTHON_MULTI_USEDEP}]
-		')
-	)
-"
-RDEPEND="${DEPEND}
-	app-text/ghostscript-gpl
-"
-
-PATCHES=(
-	# upstream svn trunk
-	"${FILESDIR}"/${P}-poppler-0.82.patch
-	"${FILESDIR}"/${P}-poppler-0.83.patch
-	"${FILESDIR}"/${P}-poppler-0.84.patch
-	"${FILESDIR}"/${P}-poppler-0.86.patch
-	"${FILESDIR}"/${P}-qt-5.15.patch # bug 726046
-	# non(?)-upstreamable
-	"${FILESDIR}"/${PN}-1.5.3-fpic.patch
-	"${FILESDIR}"/${P}-docdir.patch
-	"${FILESDIR}"/${P}-findhyphen-{1,2}.patch
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	rm -r codegen/cheetah scribus/third_party/hyphen || die
-
-	cat > cmake/modules/FindZLIB.cmake <<- EOF || die
-	find_package(PkgConfig)
-	pkg_check_modules(ZLIB minizip zlib)
-	SET( ZLIB_LIBRARY \${ZLIB_LIBRARIES} )
-	SET( ZLIB_INCLUDE_DIR \${ZLIB_INCLUDE_DIRS} )
-	MARK_AS_ADVANCED( ZLIB_LIBRARY ZLIB_INCLUDE_DIR )
-	EOF
-	sed \
-		-e "/^\s*unzip\.[ch]/d" \
-		-e "/^\s*ioapi\.[ch]/d" \
-		-i scribus/CMakeLists.txt Scribus.pro || die
-	rm scribus/ioapi.[ch] || die
-
-	sed \
-		-e 's:\(${CMAKE_INSTALL_PREFIX}\):./\1:g' \
-		-i resources/templates/CMakeLists.txt || die
-
-	sed \
-		-e "/^add_subdirectory(ui\/qml)/s/^/#DONT/" \
-		-i scribus/CMakeLists.txt || die # nothing but a bogus Hello World test
-}
-
-src_configure() {
-	# bug #550818
-	append-cppflags -DHAVE_MEMRCHR
-
-	local mycmakeargs=(
-		-DHAVE_PYTHON=ON
-		-DPYTHON_INCLUDE_PATH=$(python_get_includedir)
-		-DPYTHON_LIBRARY=$(python_get_library_path)
-		-DWANT_DISTROBUILD=ON
-		-DDOCDIR="${EPREFIX}"/usr/share/doc/${PF}/
-		-DWITH_BOOST=$(usex boost)
-		-DWANT_DEBUG=$(usex debug)
-		-DWANT_NOEXAMPLES=$(usex !examples)
-		-DWANT_GRAPHICSMAGICK=$(usex graphicsmagick)
-		-DWANT_HUNSPELL=$(usex hunspell)
-		-DWANT_HEADERINSTALL=$(usex !minimal)
-		-DWANT_NOOSG=$(usex !osg)
-		-DWITH_PODOFO=$(usex pdf)
-		-DWANT_NOTEMPLATES=$(usex !templates)
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	if ! use tk; then
-		rm "${ED}"/usr/share/scribus/scripts/{FontSample,CalendarWizard}.py || die
-	fi
-	if use scripts; then
-		python_fix_shebang "${ED}"/usr/share/scribus/scripts
-		python_optimize "${ED}"/usr/share/scribus/scripts
-	else
-		rm "${ED}"/usr/share/scribus/scripts/*.py || die
-	fi
-
-	mv "${ED}"/usr/share/doc/${PF}/{en,html} || die
-	ln -sf html "${ED}"/usr/share/doc/${PF}/en || die
-
-	# These files are parsed to populate the help/about window.
-	cat >> "${T}"/COPYING <<- EOF || die
-	${PN} is licensed under the "${LICENSE}".
-	Please visit https://www.gnu.org/licenses/gpl-2.0.html for the complete license text.
-	EOF
-	dodoc "${T}"/COPYING
-	docompress -x /usr/share/doc/${PF}/en /usr/share/doc/${PF}/{AUTHORS,TRANSLATION,LINKS,COPYING}
-
-	local size
-	for size in 16 32 128 256 512; do
-		newicon -s $size resources/iconsets/artwork/icon_${size}x${size}.png scribus.png
-	done
-	newicon -s 64 resources/iconsets/artwork/icon_32x32@2x.png scribus.png
-	doicon resources/iconsets/*/scribus.png
-	domenu scribus.desktop
-}
diff --git a/app-office/scribus/scribus-1.5.5_p20200626.ebuild b/app-office/scribus/scribus-1.5.5_p20200626.ebuild
index a017d67eb016..2b4f3fb49c3c 100644
--- a/app-office/scribus/scribus-1.5.5_p20200626.ebuild
+++ b/app-office/scribus/scribus-1.5.5_p20200626.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}project/${PN}/archive/${COMMIT}.tar.gz -> ${P}.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts +templates tk"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
diff --git a/app-office/skrooge/Manifest b/app-office/skrooge/Manifest
index 221c73b84f53..37a59e7775cf 100644
--- a/app-office/skrooge/Manifest
+++ b/app-office/skrooge/Manifest
@@ -1,3 +1,5 @@
 DIST skrooge-2.22.1.tar.xz 21559588 BLAKE2B 1f08a5357af4b792ba3d3eb4d460604fa23914aa5924ac9405019fbcce50efa96441b84bcd1142469f00eab89daa7c8175c5c33821190b7a09b7c565880f55b4 SHA512 0bbc4e98293f73a3ffe1243246fbd88c5d4d45fec8d67e8daebbe8ed08365c897b734cc5dd2a2104e608a13546f383b618d12c3523425d1a513511301c510f43
+DIST skrooge-2.23.0.tar.xz 22403128 BLAKE2B e8b4e33e80f307f2c7e6c984199c116aee1d7cabe0ac4ee9461ba10289adc0a15ba5e5d8efb93d49ec8f22104462d572a8ee52b08df84d0379fa77ce56a4ddc9 SHA512 4592deb159aa310f36f8950cf0a65d811624b40dc8b05cdefc271b95885bc6db5ac15f7b4c5299b1468ac92b7e560636bf95ddd6d31340993d9184ba0b150a76
 EBUILD skrooge-2.22.1.ebuild 2756 BLAKE2B 8635c6811904b0fa990e4751b1c45cca81f6840c8a5c6b9633d2b232faec20e796cdccef508aefa88d7bf1a5fe48ad30fd190e4bcce39769c4a0ee45e5662f7e SHA512 b278fca5a79b40daccfeeaea726a73bacbe5d8a88b6d12d42001cc70e2b2dcd5c7cc1c73b9c5ad786881ab610314db819129e04dbfa7018ea5bb31bcdaf8ea33
+EBUILD skrooge-2.23.0.ebuild 2757 BLAKE2B 98d05402add21c9614078f6b5cdcc21c0fe98ceca79b8516a1497c01cc2731ebe4f64b4245ee2ffd9fc82663fa34a5f585a902cbf91f90f314456b58d7db0c86 SHA512 8df6891916d7bb8430e350a15be393cc2403413ce3493233d4175f08e30dac2714ac007c301b5e518373795995fce4f18004d8647a9c4fcc7207d0e9e9689506
 MISC metadata.xml 508 BLAKE2B b55c79406982c895e2c0a3f680944fb561823a3713408f67b4f8de74d03246cd9b52a654d4ec97935d4f7740b9d9f4ebf27d81a9c226dc67d9922500c6e6bde0 SHA512 0b38f9d35783e7fbf2b86b9ead3772416b7080d3df07b801ecd9ef4e5329f7690e6e1b9f817d2fd8947d6735f89cfa57fb516fbcc2b383d5278f27fd89390e97
diff --git a/app-office/skrooge/skrooge-2.23.0.ebuild b/app-office/skrooge/skrooge-2.23.0.ebuild
new file mode 100644
index 000000000000..e78009944068
--- /dev/null
+++ b/app-office/skrooge/skrooge-2.23.0.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="optional"
+ECM_TEST="forceoptional"
+KFMIN=5.60.0
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Personal finances manager, aiming at being simple and intuitive"
+HOMEPAGE="https://skrooge.org/"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
+	KEYWORDS="amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="5"
+IUSE="activities designer kde ofx webkit"
+
+REQUIRED_USE="test? ( designer )"
+
+BDEPEND="
+	dev-libs/libxslt
+	virtual/pkgconfig
+"
+COMMON_DEPEND="
+	app-crypt/qca:2[qt5(+)]
+	dev-db/sqlcipher
+	dev-libs/grantlee:5
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtscript-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5=
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/knotifyconfig-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwallet-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
+	kde? ( >=kde-frameworks/krunner-${KFMIN}:5 )
+	ofx? ( dev-libs/libofx )
+	webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 )
+	!webkit? ( >=dev-qt/qtwebengine-${QTMIN}:5[widgets] )
+"
+DEPEND="${COMMON_DEPEND}
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	designer? (
+		>=kde-frameworks/kdesignerplugin-${KFMIN}:5
+		>=dev-qt/designer-${QTMIN}:5
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	>=dev-qt/qtquickcontrols-${QTMIN}:5
+"
+
+# hangs + installs files
+RESTRICT+=" test"
+
+src_configure() {
+	local mycmakeargs=(
+		-DSKG_BUILD_TEST=$(usex test)
+		-DSKG_DESIGNER=$(usex designer)
+		$(cmake_use_find_package activities KF5Activities)
+		$(cmake_use_find_package kde KF5Runner)
+		$(cmake_use_find_package ofx LibOfx)
+		-DSKG_WEBENGINE=$(usex !webkit)
+	)
+
+	ecm_src_configure
+}
+
+src_test() {
+	local mycmakeargs=(
+		-DSKG_BUILD_TEST=ON
+	)
+	ecm_src_test
+}
diff --git a/app-office/taskcoach/Manifest b/app-office/taskcoach/Manifest
deleted file mode 100644
index 13c96a31dd65..000000000000
--- a/app-office/taskcoach/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX taskcoach-1.4.3-version-check.patch 771 BLAKE2B c11431b1cfa0aee1911e2478cc8abd2a5d0389f22b8046851530794f3d8ebe889e335897cb986a936106399fa784532a0bf668edcbe8974d2f0d8a1caf8b0ff2 SHA512 018a9c1b678e07d1f7433e28b631917c551da4e65a5544a4cc1b1824cbb14d7c207361c6c5844c30686852d2f295fc1b6dd15095a53f371b20ac1d183e45d2cc
-DIST TaskCoach-1.4.6.tar.gz 2927090 BLAKE2B 24f7b2f293d34d8ef0084c7065fdf5de6b01f437c971ad0d504125793ec71581ccedbd6db0701653db409ce04fb99b55f995037510daa58f10e2b15b439dc64b SHA512 f393f9e7d8422e1453a1bd711d08ba6bdcccd5634095262475538dfbd1fb7a943798b6ff197e38367cf8e6162e25fef50178458f73b76f483495d61545bec8fe
-EBUILD taskcoach-1.4.6.ebuild 990 BLAKE2B 0153e5ae0b8690944a2f38d9ddff70d3e24555b8c4c452f6ef5b35c01de8c08942a78aa53de6fd4413b8508d2bff2677453dac271988b663cd2a8c536bc30186 SHA512 f62492a72cd1fb846b5e7d98f2e876b0b484e44aa23b3eb0d0bd39ac91354235dbfc4c2c822d684d89e898222f4bb7a9c1ee517cf47d79eb34a239fc4aa7786f
-MISC metadata.xml 742 BLAKE2B 26655a8f07586e447245578ec5405c455b0b796cb61f3f43c90f5b8bc55adffe60dad39c9636e5d5478bf2c9b94326745ffcc0d6d10c6b52b93b256fd977c832 SHA512 1e8ad0e623b769b5060bf50a7b3f9ecd0981039c7e6cc994413f16382e16e8b9515c7bf0901968ea6f17ace60dbd2f155a285f77678d5446c8560c5ac2d9d329
diff --git a/app-office/taskcoach/files/taskcoach-1.4.3-version-check.patch b/app-office/taskcoach/files/taskcoach-1.4.3-version-check.patch
deleted file mode 100644
index f869c9930b25..000000000000
--- a/app-office/taskcoach/files/taskcoach-1.4.3-version-check.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 8967c58a435ad8c1db5599edd044de2902399459 Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Fri, 24 Jun 2016 15:54:24 +0200
-Subject: [PATCH] Disable check for new version by default
-
----
- taskcoachlib/config/defaults.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/taskcoachlib/config/defaults.py b/taskcoachlib/config/defaults.py
-index 77a3809..5025af3 100644
---- a/taskcoachlib/config/defaults.py
-+++ b/taskcoachlib/config/defaults.py
-@@ -538,7 +538,7 @@ defaults = {
-     'pythonfrozen': '',  # Idem
-     'current': meta.data.version,
-     'notified': meta.data.version,
--    'notify': 'True' 
-+    'notify': 'False'
-     },
- 'behavior': {
-     'markparentcompletedwhenallchildrencompleted': 'False',
--- 
-2.9.0
-
diff --git a/app-office/taskcoach/metadata.xml b/app-office/taskcoach/metadata.xml
deleted file mode 100644
index c3028aa25110..000000000000
--- a/app-office/taskcoach/metadata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>bugs@chead.ca</email>
-		<name>Christopher Head</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<longdescription>
-		Task Coach is an open source todo manager to manage personal tasks and
-		todo lists. It supports composite tasks, i.e. tasks within tasks. In
-		addition, Task Coach allows you to categorize your tasks, track efforts
-		against a budget per task, and much more.
-	</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">taskcoach</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-office/taskcoach/taskcoach-1.4.6.ebuild b/app-office/taskcoach/taskcoach-1.4.6.ebuild
deleted file mode 100644
index 25f50aec9ceb..000000000000
--- a/app-office/taskcoach/taskcoach-1.4.6.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 )
-
-inherit desktop distutils-r1
-
-MY_PN="TaskCoach"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Simple personal tasks and todo lists manager"
-HOMEPAGE="https://www.taskcoach.org https://pypi.org/project/TaskCoach/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-LICENSE="GPL-3+"
-
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-# Task Coach can also optionally use igraph to draw task dependency graphs
-# since 1.4.4, but that is not packaged in Gentoo at this time.
-
-DEPEND="
-	dev-python/wxpython:3.0[${PYTHON_USEDEP}]
-	>=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
-"
-RDEPEND="${DEPEND}
-	x11-libs/libXScrnSaver
-"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( CHANGES.txt README.txt )
-PATCHES=( "${FILESDIR}/${PN}-1.4.3-version-check.patch" )
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	doicon "icons.in/${PN}.png"
-	make_desktop_entry ${PN}.py "Task Coach" ${PN} Office
-}
diff --git a/app-office/texstudio/Manifest b/app-office/texstudio/Manifest
index ebf470cd32aa..0bf1b00316b9 100644
--- a/app-office/texstudio/Manifest
+++ b/app-office/texstudio/Manifest
@@ -4,6 +4,6 @@ DIST texstudio-2.12.22.tar.gz 35965795 BLAKE2B 28d78e4c429d306e86abf54701395bcc6
 DIST texstudio-3.0.0_pre20200601.tar.gz 35982392 BLAKE2B 1eed56fe21aac141df41f251621a902a20153b0eaafc995b56fa8c3fbcc213685710e45202fbb90a071a0efac591c86588d4c5fe3727e603e0a58e149ed6864e SHA512 d922f576055fc345e7e0125074c6dbb473c6fb95aa06ae1ffc15f3b89fbdc7c5a44a13d4a32b770bef10c7bae7211a4bf3a269996eda1b3a0c8fd1ed8f3c4bb1
 EBUILD texstudio-2.12.16.ebuild 1846 BLAKE2B fbdd57c5d8193cd0ca80acd88e44fa1b2ec98b0d31fb10e049f81b3b13fc9a14ad5cad140f6a15e7a3c8abb729592433fb47dd9f0410cfad10ce1b53ef41b7f6 SHA512 58dafa200d68e6253c368f28db95c2ec4b1caedd2e8830a8e3c12e4c2c71619365671732c33fdce1d7c2c24cbd16a8fa7958222b4d5c7438a29b1d02c1a2e35d
 EBUILD texstudio-2.12.22.ebuild 1846 BLAKE2B fbdd57c5d8193cd0ca80acd88e44fa1b2ec98b0d31fb10e049f81b3b13fc9a14ad5cad140f6a15e7a3c8abb729592433fb47dd9f0410cfad10ce1b53ef41b7f6 SHA512 58dafa200d68e6253c368f28db95c2ec4b1caedd2e8830a8e3c12e4c2c71619365671732c33fdce1d7c2c24cbd16a8fa7958222b4d5c7438a29b1d02c1a2e35d
-EBUILD texstudio-3.0.0_pre20200601.ebuild 1763 BLAKE2B 07467ce7354ec27afa459d9af5eb0a66dc5be2a5baedfe9c7c2d8ce08b0a6debc566bff74b5e08fc4ffd721d8be18f110b26b3e09947cf5ed0f6555b8115be7a SHA512 b1d4f77572331862f6edb6657ff17892769aa030e937727c13e9789c1087e87c3a0a483644bc5201b4a11aaba6e0a4b88d83214c75e3d40473c4f16fac5aff5b
+EBUILD texstudio-3.0.0_pre20200601.ebuild 1761 BLAKE2B 4806704703f464d461fa388870fb6ab6c9f81140edaacb323ddbf312d41422e9e64239b84d38ddc38b1ed1a24b5c288a0d905e484600dd24f217f65276418458 SHA512 d9ddc869ea4295259c907b2124e3685353c0939b6c1c65d494d9c201a39b0f31afb5d81f18220d768284c5ce5d4eca0eca0f99690636aa166d204ee9358385b4
 EBUILD texstudio-9999.ebuild 1884 BLAKE2B 381765c70b04066aa53d50c402ace018ec79adb50e9af9a198ad867167b5f2f131f4aaa4c836f6a4267da96fcc2d0b75dfa6a8f2707d74a896af25e20aea82e7 SHA512 90966c2bb60be15fab68db843edc48b89edb0db76e0fd7c3bac9fd853e3097c2938511472c4fb84f749d36fbddc5d91b3562ed7fcbe8459fbe11570a4b7679e9
 MISC metadata.xml 411 BLAKE2B e545d68a6bb26046f5e43df2bcc64371e5a4237ef20a83c8811675ddde9dfec1eee8f5dc6405e7005a3ea35e39e2f3bf019d92bbd4b68e5c74524c7e785a2214 SHA512 c82d3d1b0b50af84b34a1c6cc17e19ab50afd45206939abe3c96c2d8b93a69201eeef81c72e1eef56dc717ecdf1d0c67637b59bea94160188a673f233d57458b
diff --git a/app-office/texstudio/texstudio-3.0.0_pre20200601.ebuild b/app-office/texstudio/texstudio-3.0.0_pre20200601.ebuild
index 549dc6356a4c..99ffcd05c551 100644
--- a/app-office/texstudio/texstudio-3.0.0_pre20200601.ebuild
+++ b/app-office/texstudio/texstudio-3.0.0_pre20200601.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/texstudio-org/texstudio/archive/${MY_PV}.tar.gz -> $
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="video"
 
 COMMON_DEPEND="
diff --git a/app-office/upwork/Manifest b/app-office/upwork/Manifest
index bf116ad12503..00b760525d94 100644
--- a/app-office/upwork/Manifest
+++ b/app-office/upwork/Manifest
@@ -1,5 +1,9 @@
 AUX upwork-desktop-r1.patch 480 BLAKE2B a296b0c5274adf65e3c1f1e65a30dea48d147632b1afc39e4688e4b0d23a4735c957ce4d451f040d34ae2996670350bf467bc87008e5814a3c5e9bfc5e717398 SHA512 dce08bf79e672c07fa8c11e00b68e5b4bd2176a606a1192fd6a0dbf9343e99c2aa70909506d71b35b04a3eaf6be0a61f62e65f6a3802a0e17967bfe4dbbd4aef
+AUX upwork-desktop-r2.patch 315 BLAKE2B df27130999a74eaad5a49104434977a8cd898d2d684b37aea3a3e1e19a2d50a4d8aadc842aba6398a2893c024e937bf461273d091c1883249fd99e6b9fad93ca SHA512 bdce0d3f45eabb1c5e13586321bfc30bfda17645b2e785e4a5f809b55db5e1b2040a29b9d8f93c8869180106dbfae9d4afbc9cf1c9943861e6def26ff7491be9
 DIST upwork-5.3.3.860_i386.rpm 74067471 BLAKE2B 6b2092a851e1f35dfa0dc180f225d26aeb5a04edd30eeaca3125480b94fb8504d2005c42a0b86c293c7367c538ef9103bce2a2bb45f5257cb003fd7cd25eb851 SHA512 7dbbbbf7a4254d1213942d836cf944c94b5b6dd7905435c75b1f0225dd362f4bdb3c7ea0716b2fd04fb926d965fd56d21c41f713cf26f2ad6cb240e5f2643394
 DIST upwork-5.3.3.860_x86_64.rpm 72487294 BLAKE2B 56dfedc12b5d0661f01d34238256a372b9e6d760c33ba13474996e4c24050cc9931e592cba91df0719c33c6785e6fe8d63add54986bc86cafad55379a35d9358 SHA512 a3d1c6b36a23743a1b953b7cb956107baacd39984bc9289eff349539235a7e95d0aa80880985522b985dd37de68e284a17b750561ce091166b4186d01c437aba
+DIST upwork-5.4.2.8_i386.rpm 52586152 BLAKE2B 61e1dc1652a4aee6c91b8206d32f6e05e2dcbfa0bbb1af529c1b9b33e2a6bd4226c77707667662ee79c3151dade89c33b3c3a74df18aa14f4ccb0683f41612bb SHA512 69925d3afadfd4944ff813241d5dab27d6bd1e8f0622c7b8c2d686b8024b998a4ee4a8647c3361043dc8a38114e149aae5965bac203480bd85046ec738a1fe8a
+DIST upwork-5.4.2.8_x86_64.rpm 50903574 BLAKE2B 35ebf317157e4f33eca0b957c0fd4040d28338cd09e93c86bb234faf56f61b173e98a8c869c2da79b067b9936f6d5a95d435220dd66f4c057310987e3ab6db10 SHA512 79a91aba88002020f99822e44540f1d98bf06811856a4a4e5cb10a1d9f68cbc78d3c7d6f09035c705a97634e65e81ff72d13d169e6005371717c0455d87e5199
 EBUILD upwork-5.3.3.860.ebuild 1144 BLAKE2B 96badc2df6cce06bd2dfb0981763539c8c773bebd98c06e55598c4b37a0b9cde4f8662d2e8c187fc589ef9417fed0789541ed5332dc72e0b5b94150aa6c50a6f SHA512 e1e097c5a1249f05e71780b22394bd03ada3e5ffd59fd3e8755dbf47af6d85c67656583384ce3be5effafcfc1c953e6df6df22384b708b6b4007b2683df15666
+EBUILD upwork-5.4.2.8.ebuild 1153 BLAKE2B dddd45f474fafadc93c6389d4a15097899584904d0bb741cfdac13b24e4bddb9be6935f3feee86935cfbc5a64214a3e64c9868ab701108255920a2f0dbc96e61 SHA512 19e1c436e45a4194589975155fd39c41b5e75b702f43380cc327a21a5a2baa145acce3e1e51467fd477d5ca71a1ea72acf48fc68346e31669c013099756fef5b
 MISC metadata.xml 601 BLAKE2B d6bb0d933480847c8d5e0ea53b25b009260f8bbc02aafcb2d89525ffe3688c2f2a3d8e0147ace8e51dab5d37b6c25758ecaa9569ffae95d14b3075e57a4d3480 SHA512 4695a6e61e42e30295a1d5c4a676ddc164acf0b8c8642bf825b1376b501527b47039d7bc99b57697ee23364a11cd9c339fa47184c904904d5732d1b6aaf8f153
diff --git a/app-office/upwork/files/upwork-desktop-r2.patch b/app-office/upwork/files/upwork-desktop-r2.patch
new file mode 100644
index 000000000000..1e3f0f1a580a
--- /dev/null
+++ b/app-office/upwork/files/upwork-desktop-r2.patch
@@ -0,0 +1,8 @@
+--- a/usr/share/applications/upwork.desktop	2020-03-10 21:47:46.928089982 -0600
++++ b/usr/share/applications/upwork.desktop	2020-03-10 21:48:36.989429456 -0600
+@@ -8,4 +8,4 @@
+ StartupNotify=false
+ Encoding=UTF-8
+ Comment=Upwork Desktop Application
+-Categories=Utility;
++Categories=GTK;Network;X-Project Management
diff --git a/app-office/upwork/upwork-5.4.2.8.ebuild b/app-office/upwork/upwork-5.4.2.8.ebuild
new file mode 100644
index 000000000000..48ab98c73786
--- /dev/null
+++ b/app-office/upwork/upwork-5.4.2.8.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop pax-utils rpm
+
+DESCRIPTION="Project collaboration and tracking software for upwork.com"
+HOMEPAGE="https://www.upwork.com/"
+SRC_URI="
+	amd64? ( https://updates-desktopapp.upwork.com/binaries/v5_4_2_8_17caa201e7ae4660/upwork-5.4.2.8-1fc24.x86_64.rpm -> ${P}_x86_64.rpm )
+	x86? ( https://updates-desktopapp.upwork.com/binaries/v5_4_2_8_17caa201e7ae4660/upwork-5.4.2.8-1fc24.i386.rpm -> ${P}_i386.rpm )"
+
+LICENSE="ODESK"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="bindist mirror"
+
+RDEPEND="
+	dev-libs/expat
+	dev-libs/nspr
+	dev-libs/nss
+	gnome-base/gconf
+	media-libs/alsa-lib
+	media-libs/freetype
+	sys-apps/dbus
+	sys-libs/libcap
+	x11-libs/gtk+:3[cups]"
+
+S="${WORKDIR}"
+
+PATCHES=( "${FILESDIR}/${PN}-desktop-r2.patch" )
+
+# Binary only distribution
+QA_PREBUILT="*"
+
+src_install() {
+	pax-mark m opt/Upwork/upwork
+
+	insinto /opt
+	doins -r opt/Upwork
+	fperms 0755 /opt/Upwork/upwork
+
+	insinto /usr/share
+	doins -r usr/share/icons
+
+	domenu usr/share/applications/upwork.desktop
+	doicon usr/share/icons/hicolor/128x128/apps/upwork.png
+}
diff --git a/app-office/wps-office/Manifest b/app-office/wps-office/Manifest
index 991dc0a34a34..7f756cf3d6aa 100644
--- a/app-office/wps-office/Manifest
+++ b/app-office/wps-office/Manifest
@@ -1,5 +1,5 @@
-DIST wps-office_11.1.0.9126.XA_amd64.deb 205954802 BLAKE2B 7736d28349fcc6f4d0c69b8f13ec96af42b1de4f073bf14d2c05949cc2d9d51389125d1ef83dee8ebe7cdccb44ba6b70b9425e9397d386e02e0fe8779bf7c029 SHA512 7c2d8b3459ac37ced45b25d19b6ff7f8afca2bae7ee026dfc3ef068f5a1e774baff457ddbcc5d8495f8dca1699ddd5ad67b0f3927ac6e4e99503c67a6dab414c
 DIST wps-office_11.1.0.9505.XA_amd64.deb 212685550 BLAKE2B 56c38f01837c33e55ea2266a6b55781a911becb3af89baa8089c59ae43a565a46558e677c7d84f91ef51e64dd3024f4729027dd0621ea9b4a10188f4e63a1db5 SHA512 d6d7e4fd85fbf24b08281d68ad3be9280d9b337555e328f75db1e53b9ce1bb47b2265b73e2da00df7b1a9b0a9775152920bd439368307f2373f611de6eaf19a7
-EBUILD wps-office-11.1.0.9126.ebuild 1792 BLAKE2B 84f21bd931f053f0827dc43547dd208d2be3f243c270b370ab4e596a2d0442f7b0da2afcd536115384751050051b93e130ec3033f02edee91c62f3efd7be2fce SHA512 7c4287707d9166776cbe0c61a99ef9759438e585fefe885168d405bb64d72fc062ddd6a443fb794e1c600f43062dc38360076f96e678f820bc8f240b87b1e94e
-EBUILD wps-office-11.1.0.9505.ebuild 1792 BLAKE2B 84f21bd931f053f0827dc43547dd208d2be3f243c270b370ab4e596a2d0442f7b0da2afcd536115384751050051b93e130ec3033f02edee91c62f3efd7be2fce SHA512 7c4287707d9166776cbe0c61a99ef9759438e585fefe885168d405bb64d72fc062ddd6a443fb794e1c600f43062dc38360076f96e678f820bc8f240b87b1e94e
+DIST wps-office_11.1.0.9615.XA_amd64.deb 226220962 BLAKE2B 4ef64d1e610bf9eb8cd03b204229d6dbc7d50e1850034aeaa6b80863cf060db8c7ac276f33047b84948af29cfa511ab5141f57d821d01999828a47066281303e SHA512 23a788c592688649a7d3e789934af37e1892b3a817b1ea3689fa88322500a2ef16794623e98b8ab61288ca800925df243579e0b76c5bec1dda0b77d8f704e3db
+EBUILD wps-office-11.1.0.9505.ebuild 1810 BLAKE2B 78271d9b00951c59d0f1e80bd855a738106d1f60fb302567bd2e5a2be309cb195319cc113e63b5e0f19163638e69b7535ae97c23a23e1135a67713995e19bb2d SHA512 0ecc8e561fff1f8bfee3333badec2fb23cd4f5f7720b12e7e4901a22f4ec8ef50d8e1ae21b46ea6cd051eae3ed007b2d55623198473465b6bb02187f34ceac94
+EBUILD wps-office-11.1.0.9615.ebuild 2009 BLAKE2B ceb62af12fd51a28d1eb34096979fcfcf37f202ca2bf91eee35d0ca868a41c62407f22bb19541b71e1c14f4cbc873c8ae5d9dcac470699054cbbdbd90063fca8 SHA512 a9fc91664b3b87b638a5dd8d9d8b97e2bdaa0770af781ded9ac78ca22335579d041f32705df1351732682aa38589985d6a357c223c549e995b140a0dc0b9c033
 MISC metadata.xml 239 BLAKE2B 33a4b7a2007252ef09e319431769f16c7010fc511e2e2ff02853ce5bf064f90b3e3ff088d97510fa0cfdd2dffaf82872f836aff8385efcee22a62d611cc41a21 SHA512 e2741d7308653b7fb13bf9b4af86c5525cea22e23e31925db40ef76a3f228ac5fe520bbf6a0c5b83565e2257e588acaa9a33cc55480138932446642cbbf15623
diff --git a/app-office/wps-office/wps-office-11.1.0.9505.ebuild b/app-office/wps-office/wps-office-11.1.0.9505.ebuild
index 961aa55ae4af..d5f3f6b5f1cd 100644
--- a/app-office/wps-office/wps-office-11.1.0.9505.ebuild
+++ b/app-office/wps-office/wps-office-11.1.0.9505.ebuild
@@ -7,14 +7,15 @@ inherit unpacker xdg
 MY_PV="$(ver_cut 4)"
 
 DESCRIPTION="WPS Office is an office productivity suite"
-HOMEPAGE="http://www.wps.cn/product/wpslinux/ http://wps-community.org/"
+HOMEPAGE="https://www.wps.cn/product/wpslinux/ http://wps-community.org/"
 
 KEYWORDS="~amd64"
 
-SRC_URI="http://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/${MY_PV}/${PN}_${PV}.XA_amd64.deb"
+SRC_URI="https://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/${MY_PV}/${PN}_${PV}.XA_amd64.deb"
 
 SLOT="0"
 RESTRICT="strip mirror" # mirror as explained at bug #547372
+QA_PREBUILT="*"
 LICENSE="WPS-EULA"
 IUSE=""
 
diff --git a/app-office/wps-office/wps-office-11.1.0.9126.ebuild b/app-office/wps-office/wps-office-11.1.0.9615.ebuild
index 961aa55ae4af..9989ac889b6b 100644
--- a/app-office/wps-office/wps-office-11.1.0.9126.ebuild
+++ b/app-office/wps-office/wps-office-11.1.0.9615.ebuild
@@ -7,14 +7,15 @@ inherit unpacker xdg
 MY_PV="$(ver_cut 4)"
 
 DESCRIPTION="WPS Office is an office productivity suite"
-HOMEPAGE="http://www.wps.cn/product/wpslinux/ http://wps-community.org/"
+HOMEPAGE="https://www.wps.cn/product/wpslinux/ http://wps-community.org/"
 
 KEYWORDS="~amd64"
 
-SRC_URI="http://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/${MY_PV}/${PN}_${PV}.XA_amd64.deb"
+SRC_URI="https://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/${MY_PV}/${PN}_${PV}.XA_amd64.deb"
 
 SLOT="0"
 RESTRICT="strip mirror" # mirror as explained at bug #547372
+QA_PREBUILT="*"
 LICENSE="WPS-EULA"
 IUSE=""
 
@@ -23,44 +24,54 @@ IUSE=""
 # ldd /opt/kingsoft/wps-office/office6/wps
 # ldd /opt/kingsoft/wps-office/office6/wpp
 RDEPEND="
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrender
-	x11-libs/libxcb
-	media-libs/fontconfig:1.0
-	media-libs/freetype:2
-	dev-libs/glib:2
-	sys-libs/zlib:0
-	net-print/cups
-	media-libs/libpng-compat:1.2
-	virtual/glu
-
-	dev-libs/libpcre:3
-	dev-libs/libffi
-	media-sound/pulseaudio
 	app-arch/bzip2:0
-	media-libs/libpng:0
+	app-arch/xz-utils
+	app-arch/lz4
+	dev-libs/atk
 	dev-libs/expat
-	sys-apps/util-linux
+	dev-libs/glib:2
 	dev-libs/libbsd
-	x11-libs/libXau
-	x11-libs/libXdmcp
-	sys-apps/dbus
-	x11-libs/libXtst
-	sys-apps/tcp-wrappers
-	media-libs/libsndfile
-	net-libs/libasyncns
+	dev-libs/libffi
 	dev-libs/libgcrypt:0
-	app-arch/xz-utils
-	app-arch/lz4
-	sys-libs/libcap
+	dev-libs/libgpg-error
+	dev-libs/libpcre:3
+	dev-libs/nspr
+	dev-libs/nss
+	media-libs/fontconfig:1.0
+	media-libs/freetype:2
 	media-libs/flac
 	media-libs/libogg
+	media-libs/libsndfile
 	media-libs/libvorbis
-	dev-libs/libgpg-error
+	media-libs/libpng-compat:1.2
+	media-libs/libpng:0
+	media-sound/pulseaudio
+	net-libs/libasyncns
+	net-print/cups
 	sys-apps/attr
+	sys-apps/util-linux
+	sys-apps/dbus
+	sys-apps/tcp-wrappers
+	sys-libs/libcap
+	sys-libs/zlib:0
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:2
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXScrnSaver
+	x11-libs/libXau
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdmcp
+	x11-libs/libXext
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/libXv
+	x11-libs/libxcb
+	x11-libs/pango
+	virtual/glu
 "
 DEPEND=""
 BDEPEND=""
author	V3n3RiX <venerix@redcorelinux.org>	2020-08-25 10:45:55 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-08-25 10:45:55 +0100
commit	3cf7c3ef441822c889356fd1812ebf2944a59851 (patch)
tree	c513fe68548b40365c1c2ebfe35c58ad431cdd77 /app-office
parent	05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff)