gentoo resync : 29.01.2021

23 files changed, 281 insertions, 352 deletions

diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 097fec1322a9..2d191eca65c5 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/calligraplan/Manifest b/app-office/calligraplan/Manifest
index bdd40075e44c..ab4a3042abd6 100644
--- a/app-office/calligraplan/Manifest
+++ b/app-office/calligraplan/Manifest
@@ -1,5 +1,7 @@
 AUX calligraplan-3.2.2-no-khtml.patch 15806 BLAKE2B 92c448c44fc1418877a7abafd2de877b6f9206dfeb60df89a398584ab74a989f226bb0781680b2dcea6f0002e46ad1525fe3de824caf78378616a8a8cad7594f SHA512 979cbaddc5b9827c5223c3b5a2358b22e2aa42a5db6bb68f677a22177a58187956fdce1f3e9cec24de4f3551811fcc4abab3de00f652fed3758ce45cb0e5a949
 AUX calligraplan-3.2.2-qt-5.15.patch 909 BLAKE2B 41571de17ffd56488ab2ee761cbbcb4355f42305c50ba192fac1200c0c51a4f773c283faab465759d65d24a93815ce3633d5b32f6148d3592022ec2499afb0ac SHA512 2c7c4c4e7a1ea526dce287211df4bbd2a8a4fd2d95dc1d85072b1bd78d036733ae8148ff10ca9eb595fbbbf451d6149f36f86175e462a152b2037a62ccb0a012
 DIST calligraplan-3.2.2.tar.xz 3415816 BLAKE2B b02248ac51c4593434f234b574c23c68fe6777787451c5679985143ddd4845ed3b3eae246dc80ead9158ad98d1896e90ca298df443e9aafc536ee15ee9f2992d SHA512 9d4c32926bc4716d881a6c70ba3e53764cd578b7d31e8fde02d8feb70996e806561149d3f34a75deae7c408ad65f8de93f6afa1b00982bcf15c23db6e6992915
+DIST calligraplan-3.3.0.tar.xz 4500032 BLAKE2B 48983bcaad5f8bc60a9e689ab9347731eda6c82eae248df50fa3cdf4a2d9c1882a5f44cda503dcb7ba65452da874256ce4ec3ff2348cf0acd65a9b8a83b63aed SHA512 165bb1d846e8ac96789b5123bd8e352ad77a4ae607d7e06008916f7729a457351c35779b43774f73a6a35bf9401626852cb4dd2ccf16cbcfb38d2abce56bd936
 EBUILD calligraplan-3.2.2-r1.ebuild 2512 BLAKE2B 22d40e0c4b0479aaa6ae9be97825622714634d9addb5fcd62a766bd5e8b7c5bfe85731a25ea222b0cfa179cd5d8e5d38b7ef914c004cbd3d9b3a3ebf1351a31c SHA512 8e8576e7680936583b35a30441bacb7b766a7c22679a657d49ffb702bbfd71d19a86fa182cdd66ca9e33e46a2c0efb0462f36ac7ed04b599e2254837ca8cbb6f
+EBUILD calligraplan-3.3.0.ebuild 2518 BLAKE2B abe74d6eb051184d30a7d573c3947d77515d29e5a08f3e4923075dea676fceea1d8fa6f8dd6452263f81ded9d9563b2110ffb77b7661ce0512a1bc7ecda4c1f5 SHA512 54477688e4a696a76b38dcca1d67ccb679b1b168e66b0ebeab87201e1910494f33061825fb3b6e1d807d93e103ff7408fcf21f7844834a39246014c52b5bb226
 MISC metadata.xml 649 BLAKE2B 24dd20d4a19187e71952aad0d157b7b66adbbd8de24344e2de7aabe714cffd1db1f69f88b34aed13dfadaa62c51b3be7bc057f651d6388a0e98595688db3dc1b SHA512 44d54e0b08e4422a504a0107c73c7cbd2186698f60bc40b2c523d302150de877a86c482edb6b59ac613ef1a4ea2f04f1124ab7ab6e00c42a097a51e55a0a1dcc
diff --git a/app-office/skrooge/skrooge-2.24.0.ebuild b/app-office/calligraplan/calligraplan-3.3.0.ebuild
index cf20ef1b6597..7f8a64d80e36 100644
--- a/app-office/skrooge/skrooge-2.24.0.ebuild
+++ b/app-office/calligraplan/calligraplan-3.3.0.ebuild
@@ -3,96 +3,87 @@
 
 EAPI=7
 
-ECM_HANDBOOK="optional"
+ECM_HANDBOOK="forceoptional"
 ECM_TEST="forceoptional"
 KFMIN=5.74.0
-QTMIN=5.15.1
-VIRTUALX_REQUIRED="test"
+QTMIN=5.15.2
 inherit ecm kde.org
 
-DESCRIPTION="Personal finances manager, aiming at being simple and intuitive"
-HOMEPAGE="https://skrooge.org/"
+DESCRIPTION="Project management application"
+HOMEPAGE="https://calligra.org/plan/"
 
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
+if [[ ${KDE_BUILD_TYPE} == release ]]; then
+	SRC_URI="mirror://kde/stable/calligra/${PV}/${PN}-${PV}.tar.xz"
 	KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="GPL-2"
 SLOT="5"
-IUSE="activities kde ofx"
+IUSE="activities +holidays kwallet X"
 
-BDEPEND="
-	dev-libs/libxslt
-	virtual/pkgconfig
-"
-COMMON_DEPEND="
-	>=app-crypt/qca-2.3.0:2
-	dev-db/sqlcipher
-	dev-libs/grantlee:5
-	>=dev-qt/qtconcurrent-${QTMIN}:5
+# FIXME: Disabled by upstream for good reason
+# Crashes (https://bugs.kde.org/show_bug.cgi?id=311940)
+# $(add_kdeapps_dep akonadi)
+# $(add_kdeapps_dep akonadi-contacts)
+# Currently upstream-disabled:
+# =dev-libs/kproperty-3.0*:5
+# =dev-libs/kreport-3.0*:5
+DEPEND="
+	dev-lang/perl
+	>=dev-libs/kdiagram-2.8.0:5
+	>=dev-qt/designer-${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/qtwebengine-${QTMIN}:5[widgets]
 	>=dev-qt/qtwidgets-${QTMIN}:5
 	>=dev-qt/qtxml-${QTMIN}:5
 	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kcalendarcore-${KFMIN}:5
 	>=kde-frameworks/kconfig-${KFMIN}:5
 	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
 	>=kde-frameworks/kcoreaddons-${KFMIN}:5
 	>=kde-frameworks/kdbusaddons-${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/knewstuff-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${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/kwindowsystem-${KFMIN}:5
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 	activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
-	kde? ( >=kde-frameworks/krunner-${KFMIN}:5 )
-	ofx? ( dev-libs/libofx:= )
-"
-DEPEND="${COMMON_DEPEND}
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	holidays? ( >=kde-frameworks/kholidays-${KFMIN}:5 )
+	kwallet? (
+		>=app-crypt/qca-2.3.0:2
+		>=kde-frameworks/kwallet-${KFMIN}:5
+	)
+	X? (
+		>=dev-qt/qtx11extras-${QTMIN}:5
+		x11-libs/libX11
+	)
 "
-RDEPEND="${COMMON_DEPEND}
-	>=dev-qt/qtquickcontrols-${QTMIN}:5
+RDEPEND="${DEPEND}
+	!app-office/calligra[calligra_features_plan(-)]
+	>=dev-qt/qtsvg-${QTMIN}:5
 "
 
-# hangs + installs files (also requires KF5DesignerPlugin)
 RESTRICT+=" test"
 
 src_configure() {
 	local mycmakeargs=(
-		-DSKG_WEBENGINE=ON
-		-DSKG_DESIGNER=OFF
 		$(cmake_use_find_package activities KF5Activities)
-		$(cmake_use_find_package kde KF5Runner)
-		$(cmake_use_find_package ofx LibOfx)
-		-DSKG_BUILD_TEST=$(usex test)
+		$(cmake_use_find_package holidays KF5Holidays)
+		$(cmake_use_find_package kwallet Qca-qt5)
+		$(cmake_use_find_package kwallet KF5Wallet)
 	)
+	# Qt5DBus can't be disabled because of KF5DBusAddons dependency
 
 	ecm_src_configure
 }
-
-src_test() {
-	local mycmakeargs=(
-		-DSKG_BUILD_TEST=ON
-	)
-	ecm_src_test
-}
diff --git a/app-office/gnumeric/Manifest b/app-office/gnumeric/Manifest
index 514cb0d34fbb..997232eba79e 100644
--- a/app-office/gnumeric/Manifest
+++ b/app-office/gnumeric/Manifest
@@ -1,5 +1,5 @@
 DIST gnumeric-1.12.47.tar.xz 18309764 BLAKE2B 8b800a6749d208a445abfc7189618abb20907118f274b313cf81436ab3665d50edeab4c49b03adea505448138bd32b8d3efcd041eba54342d9fb293c574cac08 SHA512 f6298fee752b062672acc20e18388d7424719d69ce9586888f33be07ca92bbd7d99e46b98e9ab2a546d1954d3113b59a5105d46c4e8a13e65e1ae9acc38391ab
 DIST gnumeric-1.12.48.tar.xz 18329300 BLAKE2B f38fdc14dbe2b45fa3c2ebbfb94d89c85f6c04bdc95b493a760a23ba347fa99d2515f0e7fc0a2f45e31c3f2a3b0c8b425b0fb876f59215e2da76348c5dbe116a SHA512 6c17e95ecd88b43da0f4f23d9c99dad5d0016f9618570a36be5998fa84c144bb5d13749fd9c4fe0c295e3c80d70c717d09763cc9904dfc1df062b96749b73ebc
 EBUILD gnumeric-1.12.47.ebuild 2291 BLAKE2B 773493d673d5aaa1106e4ec80e55370dc5f90fe1f4ea673a53406565771862da27fd1a3194a84e5c9cf30bc6ba5ce11a6232d2ba63c107981ea601c188f788ca SHA512 6894fbdf3b90d821fd3b630d86dc054c705cd9158b605d8f914074dc3ad37b4a9af826a5ba692899f1fff412a752a77a6434a2435b03c40aeaa7eb52b0095f6f
-EBUILD gnumeric-1.12.48.ebuild 2293 BLAKE2B b333b9635420b343fb94eeb9e8fa2eab361261498e54b0cef5066fc964347671849ee5b9baf1f4ccf6a77c72e8c96b26da11f8294c1e342dacc5c9db233cbd9b SHA512 4375b3a95752a79284534153f776ac56d36ff6e132d29457599519130ad887f3e25b2c95f4d9814916440723e84942bee0e45cbccd631dd4c13534a18495a56c
+EBUILD gnumeric-1.12.48.ebuild 2292 BLAKE2B 021be7fbc5be0ea46ae604e2972e7d4be04f3fa139292128681aa8faf7bf4c2b3f376b40638f6eca931f506a6bb72bfb8428a9c12338195481a0f20de531b3af SHA512 17dccd8ff585236e667c287a71868b0fc35cfaee89d4c800b8dd5ed87e928598a3512f39097e987933bc0d78c014d91dc2a6e478e881e5d1ea8006f2106cda5f
 MISC metadata.xml 519 BLAKE2B 07b0ba6ff606de990d5fb97de46aa20f0581ab63f789f2238446e6f87dc93283a0873dfec3ee4a3fd38372aa3fa17e50349abffbd5eb5cc73d4cbdbffe1e5592 SHA512 a03730e0ccc7c2fb4df57f0d63da93e9254c8df99594a26215ff9919302919eb0bfdd21622b9d73f84011c5cd28397cc0b5b2add2fce0624d7a59fc1877601d3
diff --git a/app-office/gnumeric/gnumeric-1.12.48.ebuild b/app-office/gnumeric/gnumeric-1.12.48.ebuild
index 0bee6e045c87..970bffaddbd0 100644
--- a/app-office/gnumeric/gnumeric-1.12.48.ebuild
+++ b/app-office/gnumeric/gnumeric-1.12.48.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.gnumeric.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="+introspection libgda perl"
 REQUIRED_USE="introspection? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/app-office/homebank/Manifest b/app-office/homebank/Manifest
index 6858c07138e2..285c30809fbb 100644
--- a/app-office/homebank/Manifest
+++ b/app-office/homebank/Manifest
@@ -1,9 +1,7 @@
-DIST homebank-5.2.2.tar.gz 2601784 BLAKE2B e0a66cebbdc9247aeba9946c4adf5b6677abb49cd93d212fc8008c44c53a21966ee4fa1291f887196fe3168de992a892d54fe82aec228a88f613b45358076dd2 SHA512 83ccf7f96b1eb9f2e5c134b151dce53790092e2ecb06f5e6a5e50057d6a32cde6cf45b9e98c07a81e7f224d33dae5d98e4693e57c413df675f63d21b418525b0
 DIST homebank-5.2.8.tar.gz 2730743 BLAKE2B e5a1cd143f72cdb09b5e097853c89b2dac8ad3e35e0aa5d0f3372350545d887a96ae630cd8a5cb8c605230e84e4402a2c63cef8af76d00ff2c1875aea2313545 SHA512 e1cb0595f1a5cedad83d1b51223d15ea7f37ced9d14edad1f1af8ad8e0eed2938518ed936981558879b5a1bd8aa80d88f4303e69fff0d6e503a8abe61bf872be
-DIST homebank-5.3.2.tar.gz 2906468 BLAKE2B 0672890c469e9580a2128f130230a73d5bdc9e6b50830b1c0ead4f83d7e83837a2df4f50b49218dac9da6eb89f484a6866fcc748e65d5705ba5691e9772b7977 SHA512 777ee682f816f1b3a8f5d018148d79743be9fd17301d16e9c837e9fd46f8bd67cd393bfe9ef2960d87a7066a7f80fa7b88d7826ce62d4542693d3e09d7d5e887
 DIST homebank-5.4.2.tar.gz 2974448 BLAKE2B 0b6f6ad57633ecf560f821295797e9bcc83bb7f69b7b74ad38792f091593b5ae9dc79693b9d44f46414ee3e6f9e9d4fdc2dd5a174f2a50e79177d68506a2235c SHA512 6c28fed7f7a0019be87cd86d37f52a0ddedb0c2752bd311986a4ddfe33913a34e362eadc69e9238e391009fddb45a3a2b59e1176f2ca3f1901293a1b0989223e
-EBUILD homebank-5.2.2.ebuild 1001 BLAKE2B d6ca5ee5fb7c3159bc737ae6918f1b57309273c496dc44b61f1be2a05ac948c110df1236ff2350ac2596ac584830d4636bbdb99547d535d22a56db168541d615 SHA512 44e549cb811ea5777ce4f465dc1dafee371a9c3b10772579437f71fc126e07257ad83b508fcf33fbd01e73b920cffb12f67ef37574d23a8bb7910680ddf708be
+DIST homebank-5.4.3.tar.gz 3014659 BLAKE2B 7ec6aa1c8bdc7d26bae8ae751200a4ad9effd9aac08bd39a1969897d7904468f60606307be1b6e6587a662fd7874c8f73460e559c6d06820056811dd4e8fb85f SHA512 e2b3b45a6d35205c3d2bf24d4c0c065889fa4e7d92cc9551db873b8b33cc15e6c1dd721936b438db0725509233bf265446b0512e23973cbebae7af4a7dce96ba
 EBUILD homebank-5.2.8.ebuild 1001 BLAKE2B d6ca5ee5fb7c3159bc737ae6918f1b57309273c496dc44b61f1be2a05ac948c110df1236ff2350ac2596ac584830d4636bbdb99547d535d22a56db168541d615 SHA512 44e549cb811ea5777ce4f465dc1dafee371a9c3b10772579437f71fc126e07257ad83b508fcf33fbd01e73b920cffb12f67ef37574d23a8bb7910680ddf708be
-EBUILD homebank-5.3.2.ebuild 1004 BLAKE2B 67a26e9c8dad2696d8fcea1268e0dafe783ccaa2018ae8195cd285d5d32b16f5f08b7c147035b658d46a09c860a97b03637d58f15e4f895d0ae540c77ae31d02 SHA512 95ed79521cb3ceb84557e65093d0da96e8e8ffdb39b30c8fbd1de1ab16a171f8dec4c8b640ff676454d7acb44f5813cef89c3e3658c8d5ca00f7f5e1c11b1438
 EBUILD homebank-5.4.2.ebuild 1004 BLAKE2B 67a26e9c8dad2696d8fcea1268e0dafe783ccaa2018ae8195cd285d5d32b16f5f08b7c147035b658d46a09c860a97b03637d58f15e4f895d0ae540c77ae31d02 SHA512 95ed79521cb3ceb84557e65093d0da96e8e8ffdb39b30c8fbd1de1ab16a171f8dec4c8b640ff676454d7acb44f5813cef89c3e3658c8d5ca00f7f5e1c11b1438
+EBUILD homebank-5.4.3.ebuild 886 BLAKE2B d2b471e9288bd6a0e2339bc08aa14f4502487c393554ccbc6a05abc61cabfefe997f38d73c92019a36c59f89e12aff759122642465f65ed0b4dd2bc47944588a SHA512 877b7d60369f53cab2064ae93f17c75847b322a7e94f3c2e95a0170871dca9466e114c1fa1452e8a4f7bc0661f0509f9bb95f6f67bd3d156d0d7aaf7e9dfded9
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-office/homebank/homebank-5.2.2.ebuild b/app-office/homebank/homebank-5.2.2.ebuild
deleted file mode 100644
index ef8c42748659..000000000000
--- a/app-office/homebank/homebank-5.2.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit xdg-utils gnome2-utils
-
-DESCRIPTION="Free, easy, personal accounting for everyone"
-HOMEPAGE="http://homebank.free.fr/index.php"
-SRC_URI="http://homebank.free.fr/public/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+ofx"
-KEYWORDS="amd64 ppc ~ppc64 x86"
-
-RDEPEND=">=dev-libs/glib-2.39
-	>=net-libs/libsoup-2.26
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	>=x11-libs/gtk+-3.22:3
-	x11-libs/pango
-	ofx? ( >=dev-libs/libofx-0.8.3:= )"
-DEPEND="${RDEPEND}
-	>=dev-lang/perl-5.8.1
-	dev-perl/XML-Parser
-	>=dev-util/intltool-0.40.5
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog README )
-
-src_configure() {
-	econf $(use_with ofx)
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
diff --git a/app-office/homebank/homebank-5.3.2.ebuild b/app-office/homebank/homebank-5.4.3.ebuild
index 02469b83466e..c6fa624fa773 100644
--- a/app-office/homebank/homebank-5.3.2.ebuild
+++ b/app-office/homebank/homebank-5.4.3.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
-inherit xdg-utils gnome2-utils
+inherit xdg
 
 DESCRIPTION="Free, easy, personal accounting for everyone"
 HOMEPAGE="http://homebank.free.fr/index.php"
@@ -20,8 +20,8 @@ RDEPEND=">=dev-libs/glib-2.39
 	>=x11-libs/gtk+-3.22:3
 	x11-libs/pango
 	ofx? ( >=dev-libs/libofx-0.8.3:= )"
-DEPEND="${RDEPEND}
-	>=dev-lang/perl-5.8.1
+DEPEND="${RDEPEND}"
+BDEPEND=">=dev-lang/perl-5.8.1
 	dev-perl/XML-Parser
 	>=dev-util/intltool-0.40.5
 	sys-devel/gettext
@@ -29,22 +29,13 @@ DEPEND="${RDEPEND}
 
 DOCS=( AUTHORS ChangeLog README )
 
-src_configure() {
-	econf $(use_with ofx)
-}
+src_prepare() {
+	default
 
-pkg_preinst() {
-	gnome2_icon_savelist
+	# avoid using eautoreconf
+	sed -i -e 's|\$(datadir)/appdata|\$(datadir)/metainfo|' data/Makefile.{am,in} ||die
 }
 
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
+src_configure() {
+	econf $(use_with ofx)
 }
diff --git a/app-office/kmymoney/Manifest b/app-office/kmymoney/Manifest
index ad473692f057..3fed6a7e1331 100644
--- a/app-office/kmymoney/Manifest
+++ b/app-office/kmymoney/Manifest
@@ -1,5 +1,5 @@
 DIST kmymoney-5.1.0.tar.xz 12005824 BLAKE2B 4eaeefba29d4df85c485d8d94db80b418c0086f6cac81295f1251e3d4883a78c71d0401286a918831ee2a39571a70583675ee303775bffdb3333e11d5624bbf6 SHA512 143161efd708ae05923d68510945c24f08d85cd6482b3e6015c6061bc28c80e095ca56b768e595bfae50ea3340855e021dde5c715546c0641f94adcd91639334
 DIST kmymoney-5.1.1.tar.xz 12059768 BLAKE2B 8b41bce8804d757ba9c801c7b1eeb214a8983c4686a9663a4b5255460139593b7f70e29f08294df810a02eab4190dc6de852be091760981fd84ff8191fda82a3 SHA512 2ed3e47b2e65c9d9e5a11b55f0d425192331b21d64f8a4a4f8921fdd67eac219bf3ae1418026071218d823acc9a36905dc5c499cb0ae2af4ced0e32d1720bf59
 EBUILD kmymoney-5.1.0.ebuild 3369 BLAKE2B 55e993aad336128b461273dcb5d991249f076ce13fac1a3cf76504e336ed0f1d2825016ac8be5aaef78df73252e6f956b507d812f298adc981d4754d19c7d211 SHA512 e2cf60cc5a928ca4d76bbf4869cb4a3f73deda2e6eed3859c9f0b1ce6ad9c0f8f8bc42237d7d5c58b06e16841d31ec00e505570fb5065b78c65a9e9e591da5bc
-EBUILD kmymoney-5.1.1.ebuild 3816 BLAKE2B 48ddaceab24bc8cc412abefd8e0a1b34eaf6019afc1178449cafb1a82d5f581bc2b9eab279f4d186e327042447327b781966029217f1033ac582c2f508c1cdcf SHA512 3aa6b6968ed906d547b913fc40c19af1f17c416ff8f3e26d6421d6221e6d28517e81740e7c1339999b6a7539b9c2ee3a2fc164df53175f36dd501f71cf88fa3e
+EBUILD kmymoney-5.1.1.ebuild 3815 BLAKE2B 6751027f10750616e860cdfed0eaad7e9b663eb114218112d444371c9851d4dc9250bad0ae30d1bb825a898a1da4a466293a0a7be9850d091542d8e4cba734ca SHA512 cb40df3d13de5ad4b27eb1c11cc8e9cb4fcfecb7cd3806e04f43304cde32493671176531a3eff3aa97d744cc8f524ecf83c550d25c2233524ebecf218ba98de7
 MISC metadata.xml 677 BLAKE2B 64f8cdbad4f22f9203f04bbe4a93da432fb7689fc9bbdb072c9f0d16e71b2908ddd95bc452e2fd561981f60cca8638275ef740c00c9a5e1ad020077b0afae97f SHA512 5908450c3761f8bdbfbcc58c3aae5e80737a07ac43107f9c16ba06ee9acae07c60ccbc12f70db7562a807e38e597510cef790220c13204e6e39746528f3fd0c3
diff --git a/app-office/kmymoney/kmymoney-5.1.1.ebuild b/app-office/kmymoney/kmymoney-5.1.1.ebuild
index 79899dc65afd..ff7be37222e5 100644
--- a/app-office/kmymoney/kmymoney-5.1.1.ebuild
+++ b/app-office/kmymoney/kmymoney-5.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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/ledger/Manifest b/app-office/ledger/Manifest
index 37c2539f64de..180cce4502c8 100644
--- a/app-office/ledger/Manifest
+++ b/app-office/ledger/Manifest
@@ -1,5 +1,3 @@
-DIST ledger-3.2.0.tar.gz 790404 BLAKE2B 081ca5d857238aecbeae5a0ba3267864442a8c1772a71b1894f5a9fb33173f9a0bd488ad4db3844fce8172268e516ebb92ba0556ced6e67b2a089fbb5adfde36 SHA512 580f4f39d7c3cd2bd1d05bcc36b127cfb311219f39fe50dbf23f582f73dd986729d4b5fa76bfd89cd5db9bfdfcdd5dca5b9d6b24766650040e45b881726e65ea
 DIST ledger-3.2.1.tar.gz 790959 BLAKE2B a25b08f37c6bcf409fb60e0bcc6e11021515fe17f7eb6f23781bd7a7c16b58ac92d4684e5936901ed87f2f5be4df427bd95fe856f8e7eff1e2609329866de71a SHA512 526c60cee354c9d2ead38cef3b89b349467e41fa3ec0927b51e7246a3352f19f0f81574211f20ba9bac5915590b870b9f9478a103ab661d3d9a10f41c52f4512
-EBUILD ledger-3.2.0.ebuild 2379 BLAKE2B 9351ffa064c471b465fe239b3cd46c86c01897adf1f83083f1a98d093a0b13c4b5357881c6d905896c499a4aceb9f51b23e5330587dfd73912f2122e76077f86 SHA512 5a5b3fd9cc844ac10c1a9f04b899c756bca2d1b7a08a56efbec5bb0b8702d9bda5a74718e66a5236e2baf8d916dc9ea97d0e86a94ec71ba1867950aeb6cfdc28
-EBUILD ledger-3.2.1.ebuild 2383 BLAKE2B 45385c3ad6a7da805e5aea6ee1a44992021fad56424dfd8844ec98a9a43e9458dfb92afdc3dcedde8c323b72b9d8f7ad6224659d0dc0c93f4188a38242fe56b4 SHA512 f9eaea05a81ab082d0bd5e80eac7f1d77a754697a75312cec60fae3dd4e7d749c82de85dde813372fac9e7893f4a2d9d4052251b85f4912295bf872faef6af35
+EBUILD ledger-3.2.1.ebuild 2381 BLAKE2B 4923556c6ba62f484d3c0f47570f5b48fb51644dfa3d2a5767a1ec247bbc0aa470cd56ffa45c1486c04e1bddc14d19c604fe40b546b4e9e64e9ed376a768539c SHA512 91eedd46b66b677631a03b31f035745ad8c5a76936e9b3f645583f1d38bf42e75772bf1f7838381f0dccf08118009b13970927ade3bf96893295feb32e523f4d
 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
deleted file mode 100644
index d9edbeb5e8be..000000000000
--- a/app-office/ledger/ledger-3.2.0.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-CMAKE_REMOVE_MODULES_LIST=( FindPython Support )
-inherit bash-completion-r1 check-reqs cmake python-single-r1
-
-DESCRIPTION="Double-entry accounting system with a command-line reporting interface"
-HOMEPAGE="https://www.ledger-cli.org/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug doc python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RESTRICT="test"
-
-CHECKREQS_MEMORY=8G
-
-RDEPEND="
-	dev-libs/boost:=[python?]
-	dev-libs/gmp:0=
-	dev-libs/mpfr:0=
-	python? (
-		$(python_gen_cond_dep '
-			dev-libs/boost:=[${PYTHON_USEDEP}]
-			dev-python/cheetah3:=[${PYTHON_USEDEP}]
-		')
-		${PYTHON_DEPS}
-	)
-"
-DEPEND="${RDEPEND}
-	dev-libs/utfcpp
-	doc? (
-		dev-texlive/texlive-fontsrecommended
-		sys-apps/texinfo
-		virtual/texi2dvi
-	)
-"
-
-pkg_pretend() {
-	if use python; then
-		check-reqs_pkg_pretend
-	fi
-}
-
-pkg_setup() {
-	if use python; then
-		check-reqs_pkg_setup
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	# Want to type "info ledger" not "info ledger3"
-	sed -i -e 's/ledger3/ledger/g' \
-		doc/{CMakeLists.txt,ledger3.texi} test/CheckTexinfo.py \
-		tools/{cleanup.sh,gendocs.sh,prepare-commit-msg,spellcheck.sh} \
-		|| die "Failed to update info file name in file contents"
-
-	mv doc/ledger{3,}.texi || die "Failed to rename info file name"
-
-	rm -r lib/utfcpp || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_DOCS="$(usex doc)"
-		-DBUILD_WEB_DOCS="$(usex doc)"
-		-DUSE_PYTHON="$(usex python)"
-		-DCMAKE_INSTALL_DOCDIR="/usr/share/doc/${PF}"
-		-DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=ON
-		-DBUILD_DEBUG="$(usex debug)"
-		-DUTFCPP_PATH="${ESYSROOT}/usr/include/utf8cpp"
-	)
-	if use python; then
-		mycmakeargs+=(
-			-DPython_EXECUTABLE="${PYTHON}"
-			-DPython_INCLUDE_DIR="$(python_get_includedir)"
-		)
-	fi
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-
-	use doc && cmake_src_compile doc
-}
-
-src_install() {
-	cmake_src_install
-
-	newbashcomp contrib/${PN}-completion.bash ${PN}
-}
-
-pkg_postinst() {
-	elog
-	elog "Since version 3, vim support is released separately."
-	elog "See https://github.com/ledger/vim-ledger"
-	elog
-	elog "For Emacs mode, emerge app-emacs/ledger-mode"
-}
-
-# rainy day TODO:
-# - IUSE test
diff --git a/app-office/ledger/ledger-3.2.1.ebuild b/app-office/ledger/ledger-3.2.1.ebuild
index 04e737f4bf0e..285a750b03b1 100644
--- a/app-office/ledger/ledger-3.2.1.ebuild
+++ b/app-office/ledger/ledger-3.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 03aa1197d44f..cb494de267e9 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -6,6 +6,7 @@ AUX libreoffice-6.4.7.2-fix-wrong-setting-for-doc-properties.patch 3460 BLAKE2B
 AUX libreoffice-6.4.7.2-icu-68-1.patch 1930 BLAKE2B 20a59bb0141d9e5831963f79ab59aeaf7a137b619b1ad55a3a6825f944f25a241c951164f00ca2c4f90de5713b8b0392768d9fc429d67cc5ac1343972842271f SHA512 501fc1b980727bdbf4e0bfa319a3df16aa065829bcbd9f8c7689de4bbae5ae73535a5547c8d69916966e3b83fdf817159db52f5b617a127eccdb761ed47a4177
 AUX libreoffice-6.4.7.2-icu-68-2.patch 961 BLAKE2B 610ba98ae4c57f79bb6b950081e4b565937d5f9fa38eeed4a086f7790adf65064e3b114aedcfdfa6dd328acd41f43520e4ee033e160f481567452782f92e552c SHA512 5e70548d52d693602f7fe40c2d9486158e5fa3c0d43c8e1ae87a014781966b39219a82c456e71e561d6c2b2c7da258dcb77ba70712b3677801ac28b2a5a1cc82
 AUX libreoffice-7.0.3.1-qt5detect.patch 1065 BLAKE2B bce0bb8d36f903516f437520e0b1a99080984933173ac30686136632a795f16b8e82f7bfb9dfe77b048154cf3616b3c6c96fd7c563284212ce4b3f9a4490f368 SHA512 e4273fcb2140c50c9030ef3ffeb451169c2e04fcf7e43650ad1d0928fa18ebe77dd482e2686fbaf9660aebfc17b9ce22b3dfa76f2248ae4af9bc51826e2785c2
+AUX libreoffice-7.0.4.2-gcc11.patch 824 BLAKE2B 9137f9eaf1695e92e7f326af99534c5a5e18b8416aee2dae92f6e883e8e2a203f0b978de247d433df6d1631004b2771ec4417fd05e2212d76bee34df8c6ba30f SHA512 ebf7fb6451c2b3b1e1d61e60bbfabd6cd4b9a96d559f8e02aaf00fade15071a1b568975b2a3800f58574e4b91ee224f8c8f79b0588105c9e286b5780a602f5e3
 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
@@ -32,7 +33,7 @@ DIST libreoffice-help-6.4.7.2.tar.xz 88296892 BLAKE2B 9ee12ec6aa6d5539408e0206e3
 DIST libreoffice-help-7.0.4.2.tar.xz 110758084 BLAKE2B 0e5478613da0745b34914847137aed240a16fb3ab753935295500f414657a2be27359f6426f089205f614afd43d4b5d0e5d0adcc6240ac3d24c0428cb9c42941 SHA512 ba346fa8ee015479d799d9d0b2a315cb901071b5fba2c4d7eba2eeba41dd4cac72210d12542704220c8cbb82d6a7b37a9285c1933fe2407e8e149510df4d58fe
 DIST skia-m85-e684c6daef6bfb774a325a069eda1f76ca6ac26c.tar.xz 8375536 BLAKE2B 8e3849123ce426a4dc43705537b176df82c6039a23911d75b7b3b26ca44f4a600c96c67c5f4d935a8d6a5064362f7f2167231b2aafbc44533c07299a8980aafe SHA512 4aeba56400d20e5fe234c7927b3d196233e19513a3202e074a88fad0d14d168221574a5a72b8dd9398cf3a9453c46eba4e4ed23d8d2031522b6cb11bc8bb43c1
 EBUILD libreoffice-6.4.7.2.ebuild 17758 BLAKE2B b7ab4b5999623779e9a76787cde54424f2c3d7ef112c5e9af544cbcab500402ad12e82b91433236c68916ed5cd0f2106197bb92854d264c9d39055663bac3f40 SHA512 91c4e17ef404caf7c3ee97a7ae613b7e758cd7acddaa8da56f80adfc07bd960aac0045a9f185067bcf331dc2025f08e09869b630a5f74b26ed99c1c9d78c797f
-EBUILD libreoffice-7.0.4.2.ebuild 19430 BLAKE2B 8b512bb356f3fe1e630e3c63c47d3d3dc2c0ca12cd8d61b51dc68683bfa11e714c1d993a5c6e98c60fd25d0ad70923254945ae9b44815525eda00d1b175a0fb3 SHA512 686dfa78f83072ab2028145e7029890b62e1b0acb24a5acfbc2e0398773345fa2276c1d48063beb63e1e2227b93e7748d9e58463e4ecfa2a9127be6c2fada67d
+EBUILD libreoffice-7.0.4.2.ebuild 19486 BLAKE2B 80d831d00d87445928d0ffd7e63ab5501eb9609d58b11441631f1bbba337c50c28510f38d3a0a5f2b26ae0bfcfc059e923922b18767fa0a6b895d9df1a3d8944 SHA512 bdf38a0fd615c3161c6e84ee0a0fcc97ca3a63f7a9cefb36b7a9d681c78c09db341531d417f792cab5f984a3356dedad236fd375620344e4bd16de0ab57e645a
 EBUILD libreoffice-7.0.9999.ebuild 19430 BLAKE2B 8b512bb356f3fe1e630e3c63c47d3d3dc2c0ca12cd8d61b51dc68683bfa11e714c1d993a5c6e98c60fd25d0ad70923254945ae9b44815525eda00d1b175a0fb3 SHA512 686dfa78f83072ab2028145e7029890b62e1b0acb24a5acfbc2e0398773345fa2276c1d48063beb63e1e2227b93e7748d9e58463e4ecfa2a9127be6c2fada67d
 EBUILD libreoffice-9999.ebuild 19420 BLAKE2B 458578a1b4bab2718e79634b5540f737385acd2e07f2a89eb24f50a54d3a6a6c2e176aed8a3ae5e09d54046482addf05174616d38c06adb77835f14715ef0297 SHA512 927f717106a0d6c2d32dcbc57f0e58322f44f6afb48d851ae63105a4659a454323fd9bf9651a1a3a01837e30adb40d1be607229dfc8344daf933fc9624a1bc4f
 MISC metadata.xml 1221 BLAKE2B 2cc713dbc6d112ac21f8846f9dad48c09972c0d6846a253773280564cf9370934ec798a1579d894d7679c591045542cf2c8cb8a308bf097ce5eac64f40fda3f0 SHA512 c1ab6a23d6fa4ed6b2d77b08c895f653890998a8ed7fb2fa69251adacc9a96e32c0d1298a2b7c287efe85d37a2707e740b6b036174b7b6e39d37a25e3866e957
diff --git a/app-office/libreoffice/files/libreoffice-7.0.4.2-gcc11.patch b/app-office/libreoffice/files/libreoffice-7.0.4.2-gcc11.patch
new file mode 100644
index 000000000000..748a6c21d742
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-7.0.4.2-gcc11.patch
@@ -0,0 +1,31 @@
+From 8830cf86b146b1252ac37f351a23246088d569b0 Mon Sep 17 00:00:00 2001
+From: Jeff Law <law@redhat.com>
+Date: Tue, 3 Nov 2020 08:05:03 -0700
+Subject: include cstddef for gcc11
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Change-Id: I2f845ce9bb660ad6c1eea80ea81dd71add2c0db1
+Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107191
+Tested-by: Jenkins
+Reviewed-by: Caolán McNamara <caolanm@redhat.com>
+---
+ include/o3tl/lru_map.hxx | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/include/o3tl/lru_map.hxx b/include/o3tl/lru_map.hxx
+index c7132fd079c4..96fb3161782d 100644
+--- a/include/o3tl/lru_map.hxx
++++ b/include/o3tl/lru_map.hxx
+@@ -14,6 +14,7 @@
+ #include <cassert>
+ #include <list>
+ #include <unordered_map>
++#include <cstddef>
+ 
+ namespace o3tl
+ {
+-- 
+cgit v1.2.1
+
diff --git a/app-office/libreoffice/libreoffice-7.0.4.2.ebuild b/app-office/libreoffice/libreoffice-7.0.4.2.ebuild
index 1a4ef40f551c..ee1601457119 100644
--- a/app-office/libreoffice/libreoffice-7.0.4.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.0.4.2.ebuild
@@ -292,6 +292,9 @@ PATCHES=(
 	"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
 	"${FILESDIR}/${PN}-6.1-nomancompress.patch"
 	"${FILESDIR}/${PN}-7.0.3.1-qt5detect.patch"
+
+	# 7.0 branch
+	"${FILESDIR}/${PN}-7.0.4.2-gcc11.patch"
 )
 
 S="${WORKDIR}/${PN}-${MY_PV}"
diff --git a/app-office/lyx/Manifest b/app-office/lyx/Manifest
index a3c7c5da9957..cc57b0ac1c49 100644
--- a/app-office/lyx/Manifest
+++ b/app-office/lyx/Manifest
@@ -1,3 +1,5 @@
 DIST lyx-2.3.5.2.tar.xz 16139804 BLAKE2B e6ea7b2fbec330bfe31b8f88e0a5cc25ff65991421f99b04e98d26945bba48a95f389e2a7e6023d4c9720d43f80136682eb40ac4be51799f01e038e4b0fad206 SHA512 90c5459ad0a77568d588e05a360482985988382927583b14914d6a23b788756e957d0237c18b9ab0681dfc2ad7aa34d21e97304e3a74d19ef047c38f692fba03
+DIST lyx-2.3.6.1.tar.xz 16242608 BLAKE2B d59c6db79d7760902f93405e3737974fa9c6bd79c5ab4b02010021532903c76a77701f1f99a0838b4379c548f3f37dcdd9eeb492b733c4162162d868d1d92970 SHA512 233f6c54d4a036ad12f33c6705810bfb99747bdbd015550a8a0a9d7b664d3be50a06dc337191b820c42de4407c5f790efa50c706a45fb2260a71f772fb22c872
 EBUILD lyx-2.3.5.2-r2.ebuild 3939 BLAKE2B e9e2090b6884ff6a0193ee953ff456261e710f2afe5e7cb6e43c27041e6fc44d229b29421c7fb702041d6eff2281c0b0879331534d80fbadab207759df8d4b4f SHA512 21bebd42d86108a6fcb936afc6727bb0b73c7a4868e2140afee1e3f3eee86e7ade6219dc5742d5e3d05f7900c39859413e0a3086fcd38a7e5ff36f4b3b1a871f
+EBUILD lyx-2.3.6.1.ebuild 3938 BLAKE2B 4c889f84d451e2824a4da8be3b7ae99a46ec265f9b080f0ae1d6243a3ca6786e5344483ed9f0c93212dd2c9cfa12e694343fa296100c1ce3e2b10f592cb0547a SHA512 50854ab2be3c56ab1769a29d4e40afceeab8f57a6f3f62dd3147189a809181174ac68ec7b971d756cdf81ac0edef06933c66db621cf726f9f0b115907e6b4916
 MISC metadata.xml 1364 BLAKE2B 7c37ea060d4eb27a8db07c96854404f33cdfa2d662904eca8789b86c6962fb8294b230a07a06db982e16d3adee6450b3d6172f19e3a71d74f3e3d6053bef7714 SHA512 851d5865b1a1c4c0e118e8d739ec7a798fda087410d7ca85646f4c10b7108071527aa45bf18026019169858221609d93a0b4ebc32f899dc0d2742b45e904ff2b
diff --git a/app-office/lyx/lyx-2.3.6.1.ebuild b/app-office/lyx/lyx-2.3.6.1.ebuild
new file mode 100644
index 000000000000..f6c61446572d
--- /dev/null
+++ b/app-office/lyx/lyx-2.3.6.1.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+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"
+IUSE="aspell cups debug dia dot enchant gnumeric html +hunspell +latex monolithic-build nls rcs rtf svg l10n_he"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+BDEPEND="
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+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 )
+	dot? ( media-gfx/graphviz )
+	enchant? ( app-text/enchant:2 )
+	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-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
+	)
+	svg? ( || ( gnome-base/librsvg media-gfx/inkscape ) )
+"
+DEPEND="${RDEPEND}
+	dev-qt/qtconcurrent:5
+"
+
+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 || die
+	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 || die
+	fi
+}
diff --git a/app-office/skrooge/Manifest b/app-office/skrooge/Manifest
index 86020a13a2c9..01de90727d6f 100644
--- a/app-office/skrooge/Manifest
+++ b/app-office/skrooge/Manifest
@@ -1,7 +1,5 @@
 DIST skrooge-2.23.0.tar.xz 22403128 BLAKE2B e8b4e33e80f307f2c7e6c984199c116aee1d7cabe0ac4ee9461ba10289adc0a15ba5e5d8efb93d49ec8f22104462d572a8ee52b08df84d0379fa77ce56a4ddc9 SHA512 4592deb159aa310f36f8950cf0a65d811624b40dc8b05cdefc271b95885bc6db5ac15f7b4c5299b1468ac92b7e560636bf95ddd6d31340993d9184ba0b150a76
-DIST skrooge-2.24.0.tar.xz 22184092 BLAKE2B 84d14fa35665fc1d5326e6212e56569f095b0a22ff2b3df752a8f456e34442edb639c2855b4f1a54cd639c2f9041e8a5e2ccfdf488876ce25dd48f0b0e0721c1 SHA512 e48ad9e657e4f15ab10db38cf1944cfe5a1fe73fa4623ec288b8749de746fc64ccc2534dc2bc7c379db0632107eba17ffc6a39e50de8e52a6800bb86b2ef234d
 DIST skrooge-2.24.6.tar.xz 22187100 BLAKE2B 8657397c1faef949e4d2aa5a23b35433695329e9b00e62f11e4b60b78b3d0e92c32ff93219a4931b9baa08ae1bbdc18285728c97b0d49ca71bad37ee37b01a83 SHA512 a253bdcd966dbb3b0b2b078a88b8de7e9fbdf7700ce91850c0a174c3bb2f56aa04a00250e8164a5e9387699b4a6162052edb4a064293360a3b5ef62c350912df
 EBUILD skrooge-2.23.0-r1.ebuild 2556 BLAKE2B d1c89d00e4e0b8b870a9500fff0bb90a877fbddc8df3f397133d63c5f6d700051d7289bd662edd8921e30796fb978d43c9320ca8e1387025a68c0ae26f9ea685 SHA512 55046b4cffc5a83e7157f77021a8245fd0658ee837b5aee69e5b690ac4302e43a36e78fe3626320bef7ad89f13107e16f42464eec55ffa6a6a643e345ee3560c
-EBUILD skrooge-2.24.0.ebuild 2558 BLAKE2B ccfe31f3ccccddf042c38da794b3f90dd7695e66e28348c711b826c836a7a4e3d8cd98afdddeea9436391b58d2ec04b9840bc5fdc0b953f3d954d44c97a0d7dd SHA512 e95c7ba30049268b3d636d06b31e85abb7a1f808fba637f95aa52c994e1c0e76a9f6f71bb4ecf46b0a23d608ce0d2c2957fe96fc013a7a7a7d012fffc2fec875
-EBUILD skrooge-2.24.6.ebuild 2558 BLAKE2B ccfe31f3ccccddf042c38da794b3f90dd7695e66e28348c711b826c836a7a4e3d8cd98afdddeea9436391b58d2ec04b9840bc5fdc0b953f3d954d44c97a0d7dd SHA512 e95c7ba30049268b3d636d06b31e85abb7a1f808fba637f95aa52c994e1c0e76a9f6f71bb4ecf46b0a23d608ce0d2c2957fe96fc013a7a7a7d012fffc2fec875
+EBUILD skrooge-2.24.6.ebuild 2557 BLAKE2B 42a7c673cf83efbf4ed0471e85e6926097e45e2d876bcb5ad81c338b0fc9a41e89b6b5bbe8e7180a3ce4d7eab134b7edaeba42486e7a83ac6d481febf0c7c036 SHA512 faaf9946cc6eb56a38c0e9588cb4065105b5364525902af0d72c1ce16dbe1e55ae5231bad83af7160f41767dc8d0d1cb62ff525533554d9937c3095bb903e180
 MISC metadata.xml 324 BLAKE2B ffd83d73c861eb5aa5281a859162ba693bd9ac642f7475b28419aa92c512e6caeef1fcecf56faade8b9c6573f9b09c9023dbc7f1a153f59aeea9e4c7dfa30571 SHA512 a5af84ff6c29117ec87f605e4d565a133656a05a9669a6fb2190f6c8706c4cee56c40df024c0160d391ca5e74be7a3d45244a86039cd403b0f60bc0334977a7c
diff --git a/app-office/skrooge/skrooge-2.24.6.ebuild b/app-office/skrooge/skrooge-2.24.6.ebuild
index cf20ef1b6597..34ba45dadeb9 100644
--- a/app-office/skrooge/skrooge-2.24.6.ebuild
+++ b/app-office/skrooge/skrooge-2.24.6.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://skrooge.org/"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/app-office/wps-office/Manifest b/app-office/wps-office/Manifest
index 03e38a4ea948..83a395ac925b 100644
--- a/app-office/wps-office/Manifest
+++ b/app-office/wps-office/Manifest
@@ -1,5 +1,3 @@
-DIST wps-office_11.1.0.9615.XA_amd64.deb 226220962 BLAKE2B 4ef64d1e610bf9eb8cd03b204229d6dbc7d50e1850034aeaa6b80863cf060db8c7ac276f33047b84948af29cfa511ab5141f57d821d01999828a47066281303e SHA512 23a788c592688649a7d3e789934af37e1892b3a817b1ea3689fa88322500a2ef16794623e98b8ab61288ca800925df243579e0b76c5bec1dda0b77d8f704e3db
-DIST wps-office_11.1.0.9719.XA_amd64.deb 225790936 BLAKE2B fea8ccda302605525904d4399b134dec1567b702a9a30f337ae24bd35459512661539be27b4c06ae9fb71f893e4dcb1d906dc1221abc09264dc349cf9bbfe224 SHA512 231d5e824a66c64a41a38d3b421061da8562d53a0c5517b452d57f25dd2bb3252faaf8a3d3ac83f57d916b38cc288c13eaaa20bfba83fc334b6db508db015ce5
-EBUILD wps-office-11.1.0.9615.ebuild 2009 BLAKE2B ceb62af12fd51a28d1eb34096979fcfcf37f202ca2bf91eee35d0ca868a41c62407f22bb19541b71e1c14f4cbc873c8ae5d9dcac470699054cbbdbd90063fca8 SHA512 a9fc91664b3b87b638a5dd8d9d8b97e2bdaa0770af781ded9ac78ca22335579d041f32705df1351732682aa38589985d6a357c223c549e995b140a0dc0b9c033
-EBUILD wps-office-11.1.0.9719.ebuild 2009 BLAKE2B ceb62af12fd51a28d1eb34096979fcfcf37f202ca2bf91eee35d0ca868a41c62407f22bb19541b71e1c14f4cbc873c8ae5d9dcac470699054cbbdbd90063fca8 SHA512 a9fc91664b3b87b638a5dd8d9d8b97e2bdaa0770af781ded9ac78ca22335579d041f32705df1351732682aa38589985d6a357c223c549e995b140a0dc0b9c033
+DIST wps-office_11.1.0.10161.XA_amd64.deb 228984666 BLAKE2B 2b2a5f2048c0e5b292571875197fa51cc5ec25bd59a03bdedad20513b203bc92ea9420881c87352cbe5a0aca25f386f773bb1e1e250fec5ba774b240fc649c95 SHA512 bdc0b8e8c04a904ed5e8f6ecf332db1217c0929dc845b63f13ea074fa508332c5272d087a0502ed92601ab964936c7b458ac5f37a72049d3a5f579649765285f
+EBUILD wps-office-11.1.0.10161.ebuild 2037 BLAKE2B 6d973156070e35aface94ab5033b8da5e426f175ae7da53dcec4bc668c78c1c89a88544a0f4ec78355363d70edda342c7ff29f938be4d5e1a981c95d9c23f6dc SHA512 a8bf0b09a52a617acc117496566767ec509962c3071342545786a5bb32d3d7cb4b6e12260cb83f414bc4adefe4bded828819616cdfd32c64ec3ed52622a7dc42
 MISC metadata.xml 239 BLAKE2B 33a4b7a2007252ef09e319431769f16c7010fc511e2e2ff02853ce5bf064f90b3e3ff088d97510fa0cfdd2dffaf82872f836aff8385efcee22a62d611cc41a21 SHA512 e2741d7308653b7fb13bf9b4af86c5525cea22e23e31925db40ef76a3f228ac5fe520bbf6a0c5b83565e2257e588acaa9a33cc55480138932446642cbbf15623
diff --git a/app-office/wps-office/wps-office-11.1.0.9615.ebuild b/app-office/wps-office/wps-office-11.1.0.10161.ebuild
index 9989ac889b6b..aa409f0236cf 100644
--- a/app-office/wps-office/wps-office-11.1.0.9615.ebuild
+++ b/app-office/wps-office/wps-office-11.1.0.10161.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,7 @@ inherit unpacker xdg
 MY_PV="$(ver_cut 4)"
 
 DESCRIPTION="WPS Office is an office productivity suite"
-HOMEPAGE="https://www.wps.cn/product/wpslinux/ http://wps-community.org/"
+HOMEPAGE="https://www.wps.cn/product/wpslinux/ http://linux.wps.com/"
 
 KEYWORDS="~amd64"
 
@@ -43,7 +43,6 @@ RDEPEND="
 	media-libs/libogg
 	media-libs/libsndfile
 	media-libs/libvorbis
-	media-libs/libpng-compat:1.2
 	media-libs/libpng:0
 	media-sound/pulseaudio
 	net-libs/libasyncns
@@ -84,7 +83,8 @@ src_install() {
 	doexe "${S}"/usr/bin/*
 
 	insinto /usr/share
-	doins -r "${S}"/usr/share/{applications,desktop-directories,icons,mime,templates}
+	# Skip mime subdir to not get prefence over rest of office suites
+	doins -r "${S}"/usr/share/{applications,desktop-directories,icons,templates}
 
 	insinto /opt/kingsoft/wps-office
 	doins -r "${S}"/opt/kingsoft/wps-office/{office6,templates}
diff --git a/app-office/wps-office/wps-office-11.1.0.9719.ebuild b/app-office/wps-office/wps-office-11.1.0.9719.ebuild
deleted file mode 100644
index 9989ac889b6b..000000000000
--- a/app-office/wps-office/wps-office-11.1.0.9719.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit unpacker xdg
-
-MY_PV="$(ver_cut 4)"
-
-DESCRIPTION="WPS Office is an office productivity suite"
-HOMEPAGE="https://www.wps.cn/product/wpslinux/ http://wps-community.org/"
-
-KEYWORDS="~amd64"
-
-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=""
-
-# Deps got from this (listed in order):
-# rpm -qpR wps-office-10.1.0.5707-1.a21.x86_64.rpm
-# ldd /opt/kingsoft/wps-office/office6/wps
-# ldd /opt/kingsoft/wps-office/office6/wpp
-RDEPEND="
-	app-arch/bzip2:0
-	app-arch/xz-utils
-	app-arch/lz4
-	dev-libs/atk
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/libbsd
-	dev-libs/libffi
-	dev-libs/libgcrypt:0
-	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
-	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=""
-
-S="${WORKDIR}"
-
-src_install() {
-	exeinto /usr/bin
-	exeopts -m0755
-	doexe "${S}"/usr/bin/*
-
-	insinto /usr/share
-	doins -r "${S}"/usr/share/{applications,desktop-directories,icons,mime,templates}
-
-	insinto /opt/kingsoft/wps-office
-	doins -r "${S}"/opt/kingsoft/wps-office/{office6,templates}
-
-	fperms 0755 /opt/kingsoft/wps-office/office6/{et,wpp,wps,wpspdf}
-}